Master

.github/workflows/build-and-deploy.yml

@@ -29,12 +29,6 @@ jobs:
               id: target_branch
               shell: bash
               run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF##*/})"
-            - uses: haya14busa/action-cond@v1
-              id: deploy_branch
-              with:
-                  cond: ${{ steps.target_branch.outputs.branch == 'master' }}
-                  if_true: 'build'
-                  if_false: dist/${{ steps.target_branch.outputs.branch }}
             - name: Execute build.sh
               run: |
                   sh ./scripts/build.sh
@@ -47,4 +41,4 @@ jobs:
                   github_token: ${{ secrets.GITHUB_TOKEN }}
                   force: true
                   directory: ./build
-                  branch: ${{ steps.deploy_branch.outputs.value }}
+                  branch: dist/${{ steps.target_branch.outputs.branch }}

README.md

@@ -2,9 +2,6 @@
 
 이 Repository 는 [EntryJS](https://github.com/entrylabs/entryjs)에서 사용되는 팝업등의 다양한 기능들을 위해 만들어 졌습니다.
 
-[![Codacy Badge](https://api.codacy.com/project/badge/Grade/9329aa0f9b664532a8a599d2af0f501d)](https://www.codacy.com/project/entrylabs/entry-tool/dashboard?utm_source=github.com&utm_medium=referral&utm_content=entrylabs/entry-tool&utm_campaign=Badge_Grade_Dashboard)
-[![Build Status](https://travis-ci.org/entrylabs/entry-tool.svg?branch=master)](https://travis-ci.org/entrylabs/entry-tool)
-
 :tada:
 
 ## 설치

package.json

@@ -1,10 +1,10 @@
 {
     "name": "@entrylabs/tool",
-    "version": "2.0.4",
+    "version": "2.0.5",
     "license": "MIT",
     "repository": {
         "type": "git",
-        "url": "https://github.com/entrylabs/entry-tool.git"
+        "url": "git+https://github.com/entrylabs/entry-tool.git"
     },
     "engines": {
         "node": ">=8.9.x",

src/components/widget/BillBoard.jsx

@@ -53,11 +53,13 @@ const BillBoard = (props) => {
         ...data,
     };
     if (data.type) {
-        newTableData.type = getBillBoardType(data.type)
+        newTableData.type = data.type;
+        // newTableData.type = getBillBoardType(data.type);
     }
     if (data.types) {
         Object.keys(data.types).forEach((key) => {
-            newTableData.types[key] = getBillBoardType(data.types[key]);
+            newTableData.types[key] = data.types[key];
+            // newTableData.types[key] = getBillBoardType(data.types[key]);
         });
     }
 
@@ -81,9 +83,7 @@ const BillBoard = (props) => {
             <div className={isIframe ? theme.center_chart : theme.center}>
                 <div className={theme.modal}>
                     <div className={theme.head}>
-                        <div className={theme.text}>
-                            {title}
-                        </div>
+                        <div className={theme.text}>{title}</div>
                         <div
                             className={theme.close}
                             id="chart_btn"
@@ -93,8 +93,14 @@ const BillBoard = (props) => {
                         />
                     </div>
                     <div className={theme.body}>
-                        <div className={cn(theme.content, theme.billboard)} style={{ minHeight: '300px' }}>
-                            <div className={theme.description} dangerouslySetInnerHTML={ {__html: description} } />
+                        <div
+                            className={cn(theme.content, theme.billboard)}
+                            style={{ minHeight: '300px' }}
+                        >
+                            <div
+                                className={theme.description}
+                                dangerouslySetInnerHTML={{ __html: description }}
+                            />
                             <div className={theme.graph_box} ref={chartRef} />
                         </div>
                     </div>
@@ -130,6 +136,6 @@ const BillBoard = (props) => {
             </div>
         </div>
     );
-}
+};
 
-export default pure(BillBoard);
+export default pure(BillBoard);

src/components/widget/Chart/Bar.jsx

@@ -1,5 +1,5 @@
 import { useEffect, useRef } from 'react';
-import bb, { bar } from 'billboard.js';
+import bb from 'billboard.js';
 import Theme from '@utils/Theme';
 import '@assets/entry/scss/widget/insight.css';
 import { GRAPH_COLOR } from '@constants/dataAnalytics';

src/components/widget/Chart/ScatterGrid.jsx

@@ -1,6 +1,6 @@
 import { useRef, useEffect } from 'react';
 import { corr } from '@utils/dataAnalytics';
-import bb, { scatter } from 'billboard.js';
+import bb from 'billboard.js';
 import '@assets/entry/scss/widget/insight.css';
 import Theme from '@utils/Theme';
 import _unzip from 'lodash/unzip';
@@ -17,7 +17,7 @@ const ScatterChart = ({ columns, id = 'scatter_matrix', size, zoomIn, opacity })
             columns[1][0] += 'x';
         }
         bb.generate({
-            data: { columns, type: scatter(), xs: { [columns[0][0]]: columns[1][0] } },
+            data: { columns, type: 'scatter', xs: { [columns[0][0]]: columns[1][0] } },
             bindto: chartRef.current,
             axis: {
                 x: { tick: { text: { show: false }, count: 4, padding: 0 } },