From 92c277c69f3c0c6ea42ac3dae691f18d1a8c8159 Mon Sep 17 00:00:00 2001 From: JY Kim Date: Thu, 25 Jul 2024 10:38:03 +0900 Subject: [PATCH 1/8] Update build-and-deploy.yml --- .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 c4a8b2f51666da63212505ebb9c5df3e240269f3 Mon Sep 17 00:00:00 2001 From: JY Kim Date: Thu, 25 Jul 2024 10:44:29 +0900 Subject: [PATCH 2/8] 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 3f8cca01a5dfa2d65d2157d3d21bbdb2744b16e1 Mon Sep 17 00:00:00 2001 From: JY Kim Date: Thu, 25 Jul 2024 10:53:04 +0900 Subject: [PATCH 3/8] Update build-and-deploy.yml --- .github/workflows/build-and-deploy.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-and-deploy.yml b/.github/workflows/build-and-deploy.yml index 17982f3a..8cbf6763 100644 --- a/.github/workflows/build-and-deploy.yml +++ b/.github/workflows/build-and-deploy.yml @@ -29,6 +29,12 @@ 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 @@ -41,4 +47,4 @@ jobs: github_token: ${{ secrets.GITHUB_TOKEN }} force: true directory: ./build - branch: dist/${{ steps.target_branch.outputs.branch }} + branch: ${{ steps.deploy_branch.outputs.value }} From 243394cf32322ad8819e5571adf97f2468eeaa43 Mon Sep 17 00:00:00 2001 From: JY Kim Date: Thu, 25 Jul 2024 10:55:55 +0900 Subject: [PATCH 4/8] 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 6b3be82b287ae5b703356219e106c596082d6862 Mon Sep 17 00:00:00 2001 From: lee Date: Mon, 19 Aug 2024 17:22:31 +0900 Subject: [PATCH 5/8] style-loader version upgrade --- package.json | 2 +- pnpm-lock.yaml | 25 +++++++++++++------------ 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/package.json b/package.json index 2b3da2d4..1f812d44 100644 --- a/package.json +++ b/package.json @@ -107,7 +107,6 @@ "rimraf": "^2.6.2", "safe-umd-webpack-plugin": "^4.0.0", "sass-loader": "^7.1.0", - "style-loader": "0.19.0", "styled-components": "^3.4.2", "sw-precache-webpack-plugin": "0.11.4", "url-loader": "0.6.2", @@ -139,6 +138,7 @@ "react-slick": "^0.23.2", "redux-form": "^7.4.2", "reselect": "^4.0.0", + "style-loader": "^4.0.0", "xlsx": "^0.16.9" }, "files": [ diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 70df4ce1..6f07141f 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -71,6 +71,9 @@ importers: reselect: specifier: ^4.0.0 version: 4.1.8 + style-loader: + specifier: ^4.0.0 + version: 4.0.0(webpack@5.91.0(webpack-cli@5.1.4)) xlsx: specifier: ^0.16.9 version: 0.16.9 @@ -303,9 +306,6 @@ importers: sass-loader: specifier: ^7.1.0 version: 7.3.1(webpack@5.91.0(webpack-cli@5.1.4)) - style-loader: - specifier: 0.19.0 - version: 0.19.0 styled-components: specifier: ^3.4.2 version: 3.4.10(react@17.0.2) @@ -7988,14 +7988,16 @@ packages: strongly-connected-components@1.0.1: resolution: {integrity: sha512-i0TFx4wPcO0FwX+4RkLJi1MxmcTv90jNZgxMu9XRnMXMeFUY1VJlIoXpZunPUvUUqbCT1pg5PEkFqqpcaElNaA==} - style-loader@0.19.0: - resolution: {integrity: sha512-9mx9sC9nX1dgP96MZOODpGC6l1RzQBITI2D5WJhu+wnbrSYVKLGuy14XJSLVQih/0GFrPpjelt+s//VcZQ2Evw==} - engines: {node: '>= 0.12.0'} - style-loader@0.20.3: resolution: {integrity: sha512-2I7AVP73MvK33U7B9TKlYZAqdROyMXDYSMvHLX43qy3GCOaJNiV6i0v/sv9idWIaQ42Yn2dNv79Q5mKXbKhAZg==} engines: {node: '>= 0.12.0'} + style-loader@4.0.0: + resolution: {integrity: sha512-1V4WqhhZZgjVAVJyt7TdDPZoPBPNHbekX4fWnCJL1yQukhCeZhJySUL+gL9y6sNdN95uEOS83Y55SqHcP7MzLA==} + engines: {node: '>= 18.12.0'} + peerDependencies: + webpack: ^5.27.0 + styled-components@3.4.10: resolution: {integrity: sha512-TA8ip8LoILgmSAFd3r326pKtXytUUGu5YWuqZcOQVwVVwB6XqUMn4MHW2IuYJ/HAD81jLrdQed8YWfLSG1LX4Q==} peerDependencies: @@ -18885,16 +18887,15 @@ snapshots: strongly-connected-components@1.0.1: {} - style-loader@0.19.0: - dependencies: - loader-utils: 1.4.2 - schema-utils: 0.3.0 - style-loader@0.20.3: dependencies: loader-utils: 1.4.2 schema-utils: 0.4.7 + style-loader@4.0.0(webpack@5.91.0(webpack-cli@5.1.4)): + dependencies: + webpack: 5.91.0(webpack-cli@5.1.4) + styled-components@3.4.10(react@17.0.2): dependencies: buffer: 5.7.1 From a440999e9b14a940d26815fd72d54310c3a200c1 Mon Sep 17 00:00:00 2001 From: Tnks2U Date: Wed, 21 Aug 2024 14:17:25 +0900 Subject: [PATCH 6/8] =?UTF-8?q?feat:=20=EC=B9=B4=EB=93=9C=EB=B7=B0=20?= =?UTF-8?q?=ED=8C=9D=EC=97=85=20alert=EB=A9=94=EC=8B=9C=EC=A7=80=20?= =?UTF-8?q?=EC=A4=84=EB=B0=94=EA=BF=88=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/entry/scss/popup.scss | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/assets/entry/scss/popup.scss b/src/assets/entry/scss/popup.scss index bd673f6a..02a5a42d 100644 --- a/src/assets/entry/scss/popup.scss +++ b/src/assets/entry/scss/popup.scss @@ -917,7 +917,8 @@ font-size: 14px; color: #000; letter-spacing: -0.32px; - line-height: 16px; + line-height: 1.29; + white-space: pre-line; } .caution_dsc:before { position: absolute; From ba5ffb1e3189541a58444be71a7cd3d49a088d38 Mon Sep 17 00:00:00 2001 From: Tnks2U Date: Wed, 21 Aug 2024 14:21:44 +0900 Subject: [PATCH 7/8] =?UTF-8?q?refactor,=20feat:=20alertMsg=20=EB=B6=88?= =?UTF-8?q?=EB=9F=AC=EC=98=A4=EA=B8=B0=20=EB=A1=9C=EC=A7=81=20=EB=A6=AC?= =?UTF-8?q?=ED=8C=A9=ED=86=A0=EB=A7=81,=20hw=5Flite=EC=8B=9C=20=EB=B2=84?= =?UTF-8?q?=ED=8A=BC=EB=AA=85=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../popup/Contents/Select/BigICON/index.jsx | 32 +++++++++++++++---- 1 file changed, 25 insertions(+), 7 deletions(-) diff --git a/src/components/popup/Contents/Select/BigICON/index.jsx b/src/components/popup/Contents/Select/BigICON/index.jsx index de54e263..e8d764c0 100644 --- a/src/components/popup/Contents/Select/BigICON/index.jsx +++ b/src/components/popup/Contents/Select/BigICON/index.jsx @@ -8,9 +8,23 @@ import { connect } from 'react-redux'; import { triggerEvent } from '@actions/index'; import { EMIT_TYPES as Types } from '@constants'; +const ALERT_MSG_KEY = { + aiUtilize: 'template.aiUtilize_block_descriptions', + hw_lite: 'template.hardware_lite_descriptions', + 'entry-js': 'template.expansion_block_descriptions', +}; + const Index = (props) => { const theme = Theme.getStyle('popup'); - const { data = [], imageBaseUrl, applySelected, submit, selected, HeaderButtonPortal, popupAlertMessage } = props; + const { + data = [], + imageBaseUrl, + applySelected, + submit, + selected, + HeaderButtonPortal, + popupAlertMessage, + } = props; useEffect(() => { applySelected(data.filter((item) => item.active)); @@ -23,13 +37,13 @@ const Index = (props) => { return false; }); - const alertMsgKey = useMemo(() => { + const popupType = useMemo(() => { if (imageBaseUrl.includes('aiUtilize')) { - return 'template.aiUtilize_block_descriptions'; + return 'aiUtilize'; } else if (imageBaseUrl.includes('hw_lite')) { - return 'template.hardware_lite_descriptions'; + return 'hw_lite'; } else if (imageBaseUrl.includes('entry-js')) { - return 'template.expansion_block_descriptions'; + return 'entry-js'; } else { console.error('Error, incorrect imageBaseUrl : ', imageBaseUrl); } @@ -38,7 +52,9 @@ const Index = (props) => { return (

BIG ICON LIST

-

{popupAlertMessage || CommonUtils.getLang(alertMsgKey)}

+

+ {popupAlertMessage || CommonUtils.getLang(ALERT_MSG_KEY[popupType])} +

    {data.map((item) => ( @@ -57,7 +73,9 @@ const Index = (props) => { role="button" onClick={CommonUtils.handleClick(() => submit({ selected }))} > - {CommonUtils.getLang('Buttons.load')} + {CommonUtils.getLang( + popupType === 'hw_lite' ? 'Buttons.select' : 'Buttons.load' + )}
From 581154a5fd63351374a2248fe0e13946b0fb1390 Mon Sep 17 00:00:00 2001 From: Tnks2U Date: Wed, 21 Aug 2024 16:23:18 +0900 Subject: [PATCH 8/8] =?UTF-8?q?feat:=20=EB=B8=8C=EB=9D=BC=EC=9A=B0?= =?UTF-8?q?=EC=A0=80=EB=A1=9C=20=EC=97=B0=EA=B2=B0=ED=95=98=EA=B8=B0?= =?UTF-8?q?=EC=8B=9C=20=EC=A4=91=EB=B3=B5=EC=84=A0=ED=83=9D=20=EB=B6=88?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../popup/Contents/Select/BigICON/Item.jsx | 4 ++++ .../popup/Contents/Select/BigICON/index.jsx | 21 +++++++++++++------ 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/src/components/popup/Contents/Select/BigICON/Item.jsx b/src/components/popup/Contents/Select/BigICON/Item.jsx index 98d7c61f..6e41dbe0 100644 --- a/src/components/popup/Contents/Select/BigICON/Item.jsx +++ b/src/components/popup/Contents/Select/BigICON/Item.jsx @@ -16,6 +16,7 @@ const Index = ({ select, deselect, useLangKey = true, + allowDuplicate = true, }) => { const theme = Theme.getStyle('popup'); const { imageName, sponserText, linkBox } = item; @@ -31,6 +32,9 @@ const Index = ({ selected.splice(index, 1); } } else { + if (!allowDuplicate && selected.length >= 0) { + selected = []; + } selected.push(item, () => select(item)); } applySelected(selected); diff --git a/src/components/popup/Contents/Select/BigICON/index.jsx b/src/components/popup/Contents/Select/BigICON/index.jsx index e8d764c0..2094da67 100644 --- a/src/components/popup/Contents/Select/BigICON/index.jsx +++ b/src/components/popup/Contents/Select/BigICON/index.jsx @@ -1,4 +1,4 @@ -import { useEffect, useMemo } from 'react'; +import { useEffect, useMemo, useState } from 'react'; import Item from './Item'; import { CommonUtils } from '@utils/Common'; import Theme from '@utils/Theme'; @@ -25,6 +25,7 @@ const Index = (props) => { HeaderButtonPortal, popupAlertMessage, } = props; + const [itemSelected, setItemSelected] = useState(true); useEffect(() => { applySelected(data.filter((item) => item.active)); @@ -49,6 +50,8 @@ const Index = (props) => { } }, [imageBaseUrl]); + const isHwLite = popupType === 'hw_lite'; + return (

BIG ICON LIST

@@ -63,19 +66,25 @@ const Index = (props) => { item={item} imageBaseUrl={imageBaseUrl} useLangKey={useLangKey} + allowDuplicate={isHwLite ? false : true} // 수정 /> ))}
submit({ selected }))} + onClick={CommonUtils.handleClick(() => { + if (itemSelected) { + submit({ selected }); + setItemSelected(false); + } + })} > - {CommonUtils.getLang( - popupType === 'hw_lite' ? 'Buttons.select' : 'Buttons.load' - )} + {CommonUtils.getLang(isHwLite ? 'Buttons.select' : 'Buttons.load')}