From a476d264ac17128b39fb7863a9de76c1808679de Mon Sep 17 00:00:00 2001 From: JY Kim Date: Tue, 16 Jul 2024 17:57:39 +0900 Subject: [PATCH 1/8] =?UTF-8?q?billboard=20=EC=B0=A8=ED=8A=B8=20type=20?= =?UTF-8?q?=EC=A3=BC=EC=9E=85=20=EB=B0=A9=EC=8B=9D=20=EB=B3=80=EA=B2=BD=20?= =?UTF-8?q?(#440)=20(#441)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: kim jeong yong --- package.json | 2 +- src/components/widget/Chart/Bar.jsx | 4 ++-- src/components/widget/Chart/Histogram.jsx | 4 ++-- src/components/widget/Chart/Line.jsx | 4 ++-- src/components/widget/Chart/Pie.jsx | 4 ++-- src/components/widget/Chart/Plotly.jsx | 2 +- src/components/widget/Chart/Scatter.jsx | 4 ++-- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/package.json b/package.json index db62de3b..3461d54b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@entrylabs/tool", - "version": "2.0.2", + "version": "2.0.3", "license": "MIT", "repository": { "type": "git", diff --git a/src/components/widget/Chart/Bar.jsx b/src/components/widget/Chart/Bar.jsx index 1c291d99..dc04b704 100644 --- a/src/components/widget/Chart/Bar.jsx +++ b/src/components/widget/Chart/Bar.jsx @@ -43,7 +43,7 @@ const Bar = ({ chart, table, size }) => { const theme = Theme.getStyle('popup'); const chartRef = useRef(null); const { id, xIndex = -1, order, categoryIndexes = [], type } = chart; - + useEffect(() => { if (!isDrawable(chart)) { return; @@ -66,7 +66,7 @@ const Bar = ({ chart, table, size }) => { }, data: { columns, - type: bar(), + type: 'bar', }, axis: { x: { diff --git a/src/components/widget/Chart/Histogram.jsx b/src/components/widget/Chart/Histogram.jsx index e2418f20..d6a7ae03 100644 --- a/src/components/widget/Chart/Histogram.jsx +++ b/src/components/widget/Chart/Histogram.jsx @@ -1,5 +1,5 @@ import { useEffect, useRef } from 'react'; -import bb, { areaStep } 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'; @@ -30,7 +30,7 @@ const Histogram = ({ chart, table, size }) => { data: { x: 'histogram_chart_x', columns: getHistogramChart(table, categoryIndexes, bin, boundary), - type: areaStep(), + type: 'area-step', }, axis: { x: { diff --git a/src/components/widget/Chart/Line.jsx b/src/components/widget/Chart/Line.jsx index 2777424a..997102b9 100644 --- a/src/components/widget/Chart/Line.jsx +++ b/src/components/widget/Chart/Line.jsx @@ -1,5 +1,5 @@ import { useEffect, useRef } from 'react'; -import bb, { line } 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'; @@ -64,7 +64,7 @@ const Line = ({ chart, table, size }) => { }, data: { columns, - type: line(), + type: 'line', }, axis: { x: { diff --git a/src/components/widget/Chart/Pie.jsx b/src/components/widget/Chart/Pie.jsx index ae0371f7..9600a418 100644 --- a/src/components/widget/Chart/Pie.jsx +++ b/src/components/widget/Chart/Pie.jsx @@ -1,5 +1,5 @@ import { useEffect, useRef } from 'react'; -import bb, { pie } 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'; @@ -32,7 +32,7 @@ const Pie = ({ table, chart, size }) => { pieChart[0], ...pieChart.slice(1).map((value, index) => [index, value[1]]), ], - type: pie(), + type: 'pie', }, axis: { x: { diff --git a/src/components/widget/Chart/Plotly.jsx b/src/components/widget/Chart/Plotly.jsx index 864d7393..8212caa0 100644 --- a/src/components/widget/Chart/Plotly.jsx +++ b/src/components/widget/Chart/Plotly.jsx @@ -1,4 +1,4 @@ -import { useState, useRef, useEffect, useCallback } from 'react'; +import { useState, useRef, useEffect } from 'react'; import Plotly from 'react-plotly.js'; import Theme from '@utils/Theme'; import { corr } from '@utils/dataAnalytics'; diff --git a/src/components/widget/Chart/Scatter.jsx b/src/components/widget/Chart/Scatter.jsx index 769c64b7..7c727a69 100644 --- a/src/components/widget/Chart/Scatter.jsx +++ b/src/components/widget/Chart/Scatter.jsx @@ -1,5 +1,5 @@ import { useEffect, useRef } from 'react'; -import bb, { scatter } from 'billboard.js'; +import bb from 'billboard.js'; import Theme from '@utils/Theme'; import '@assets/entry/scss/widget/insight.css'; import { GRAPH_COLOR, SCATTER_POINT_PATTERN } from '@constants/dataAnalytics'; @@ -41,7 +41,7 @@ const Scatter = ({ chart, table, size }) => { data: { xs: scatterXs(columns), columns, - type: scatter(), + type: 'scatter', }, axis: { x: { From 14fffbe272a75d801f4c6d2e989cc8a323295b79 Mon Sep 17 00:00:00 2001 From: JY Kim Date: Thu, 25 Jul 2024 10:38:24 +0900 Subject: [PATCH 2/8] Update build-and-deploy.yml (#445) --- .github/workflows/build-and-deploy.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build-and-deploy.yml b/.github/workflows/build-and-deploy.yml index 91070ef5..8cbf6763 100644 --- a/.github/workflows/build-and-deploy.yml +++ b/.github/workflows/build-and-deploy.yml @@ -6,6 +6,7 @@ on: - develop-hw - develop2 - develop + - master jobs: build-and-deploy: From a06b0de381e70df2c32421450b1fcd05c3b15a15 Mon Sep 17 00:00:00 2001 From: JY Kim Date: Thu, 25 Jul 2024 10:45:05 +0900 Subject: [PATCH 3/8] change build-and-deploy.yml (#446) * Update build-and-deploy.yml * Update build-and-deploy.yml --- .github/workflows/build-and-deploy.yml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/.github/workflows/build-and-deploy.yml b/.github/workflows/build-and-deploy.yml index 8cbf6763..17982f3a 100644 --- a/.github/workflows/build-and-deploy.yml +++ b/.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 }} From e9be01d67a39452e0ac6c0c6628669f2eecc124f Mon Sep 17 00:00:00 2001 From: JY Kim Date: Thu, 25 Jul 2024 10:56:25 +0900 Subject: [PATCH 4/8] =?UTF-8?q?=EC=9A=B4=EC=98=81=20=EB=B0=98=EC=98=81=20(?= =?UTF-8?q?#447)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Update build-and-deploy.yml * Update build-and-deploy.yml * Update build-and-deploy.yml * Update deploy.sh --- scripts/deploy.sh | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/scripts/deploy.sh b/scripts/deploy.sh index b7f92714..038f33d5 100644 --- a/scripts/deploy.sh +++ b/scripts/deploy.sh @@ -10,10 +10,12 @@ cd build git config user.name "Entry Dev" git config user.email "entrydev@nts-corp.com" -git checkout -b "$deployName" -# git push --delete "https://${GH_TOKEN}@${GH_REF}" "$deployName" +if [ "$branchName" = "master" ] +then + git checkout -b build +else + git checkout -b "$deployName" +fi + git add . git commit -m "Entry Tool deploy $deployName" -# git push --force --quiet "https://${GH_TOKEN}@${GH_REF}" "$deployName" - -#curl -d '{"tag_name": "v$DATEFMT","target_commitish": "build","name": "v$DATEFMT","body": "Description of the release","draft": false,"prerelease": false}' -X POST "https://developer.github.com/v3/repos/kimokim/entryjs/releases" From 5f04ed34d121787998a194288f00c698c599f6d0 Mon Sep 17 00:00:00 2001 From: JY Kim Date: Fri, 26 Jul 2024 16:18:26 +0900 Subject: [PATCH 5/8] Update README.md --- README.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/README.md b/README.md index 427ab7e6..28531038 100644 --- a/README.md +++ b/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: ## 설치 From 8769fc0d546b822a984fed511b5b7cad30befb2e Mon Sep 17 00:00:00 2001 From: JY Kim Date: Thu, 5 Sep 2024 11:21:50 +0900 Subject: [PATCH 6/8] =?UTF-8?q?=EC=9D=B4=EC=8A=88=208703=20=EC=B2=98?= =?UTF-8?q?=EB=A6=AC=20(#452)=20(#453)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: usbsync --- src/components/widget/BillBoard.jsx | 24 +++++++++++++-------- src/components/widget/Chart/Bar.jsx | 2 +- src/components/widget/Chart/ScatterGrid.jsx | 4 ++-- 3 files changed, 18 insertions(+), 12 deletions(-) diff --git a/src/components/widget/BillBoard.jsx b/src/components/widget/BillBoard.jsx index 980108be..77649c47 100644 --- a/src/components/widget/BillBoard.jsx +++ b/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) => {
-
- {title} -
+
{title}
{ />
-
-
+
+
@@ -130,6 +136,6 @@ const BillBoard = (props) => {
); -} +}; -export default pure(BillBoard); \ No newline at end of file +export default pure(BillBoard); diff --git a/src/components/widget/Chart/Bar.jsx b/src/components/widget/Chart/Bar.jsx index dc04b704..a3fe3a97 100644 --- a/src/components/widget/Chart/Bar.jsx +++ b/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'; diff --git a/src/components/widget/Chart/ScatterGrid.jsx b/src/components/widget/Chart/ScatterGrid.jsx index b77c5256..76550a02 100644 --- a/src/components/widget/Chart/ScatterGrid.jsx +++ b/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 } }, From e4fab06d1c177ad8a3ac9a42ef6cec2b6e0c94cb Mon Sep 17 00:00:00 2001 From: JY Kim Date: Fri, 6 Sep 2024 12:25:05 +0900 Subject: [PATCH 7/8] Update package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 1f812d44..b2484a8e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@entrylabs/tool", - "version": "2.0.4", + "version": "2.0.5", "license": "MIT", "repository": { "type": "git", From 3485be0f9ade324e5ab1cf23a5a55cc7bd8a9d23 Mon Sep 17 00:00:00 2001 From: usbsync Date: Fri, 6 Sep 2024 12:30:18 +0900 Subject: [PATCH 8/8] npm pkg fix --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b2484a8e..e4842447 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "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",