From d281014a67f14083da14ec0ebfbaadc7bc271903 Mon Sep 17 00:00:00 2001 From: shironegi39 Date: Wed, 11 Sep 2024 08:36:19 +0000 Subject: [PATCH 1/9] JP language support --- apps/app/public/static/locales/ja_JP/commons.json | 2 +- .../src/client/components/Admin/G2GDataTransfer.tsx | 10 +++++++++- apps/app/src/client/components/DataTransferForm.tsx | 9 ++++++++- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/apps/app/public/static/locales/ja_JP/commons.json b/apps/app/public/static/locales/ja_JP/commons.json index f85a86db4f9..1ef59c46ddc 100644 --- a/apps/app/public/static/locales/ja_JP/commons.json +++ b/apps/app/public/static/locales/ja_JP/commons.json @@ -159,6 +159,6 @@ "publish_transfer_key": "移行キーを発行する", "transfer_key_limit": "※ 移行キーの有効期限は発行から1時間となります。", "once_transfer_key_used": "※ 移行キーは一度移行に利用するとそれ以降はご利用いただけなくなります。", - "transfer_to_growi_cloud": "※ GROWI.cloud への移行を実施する場合はこちらをご確認ください。" + "transfer_to_growi_cloud": "※ 詳しくは こちら" } } diff --git a/apps/app/src/client/components/Admin/G2GDataTransfer.tsx b/apps/app/src/client/components/Admin/G2GDataTransfer.tsx index a61650af4a8..1722ffaa594 100644 --- a/apps/app/src/client/components/Admin/G2GDataTransfer.tsx +++ b/apps/app/src/client/components/Admin/G2GDataTransfer.tsx @@ -8,6 +8,7 @@ import { useGenerateTransferKey } from '~/client/services/g2g-transfer'; import { apiv3Get, apiv3Post } from '~/client/util/apiv3-client'; import { toastError, toastSuccess } from '~/client/util/toastr'; import { G2G_PROGRESS_STATUS, type G2GProgress } from '~/interfaces/g2g-transfer'; +import { useGrowiCloudUri, useGrowiAppIdForGrowiCloud } from '~/stores-universal/context'; import { useAdminSocket } from '~/stores/socket-io'; import CustomCopyToClipBoard from '../Common/CustomCopyToClipBoard'; @@ -34,6 +35,8 @@ const G2GDataTransfer = (): JSX.Element => { mongo: G2G_PROGRESS_STATUS.PENDING, attachments: G2G_PROGRESS_STATUS.PENDING, }); + const { data: growiCloudUri } = useGrowiCloudUri(); + const { data: growiAppIdForGrowiCloud } = useGrowiAppIdForGrowiCloud(); // File upload settings // const [fileUploadType, setFileUploadType] = useState('aws'); @@ -123,6 +126,10 @@ const G2GDataTransfer = (): JSX.Element => { } }, [setTransferring, startTransferKey, selectedCollections, optionsMap]); + const growiDataTransferHelpPage = growiCloudUri != null && growiAppIdForGrowiCloud != null + ? 'https://growi.cloud/help/ja/admin-guide/management-cookbook/g2g-transfer.html' + : 'https://docs.growi.org/ja/admin-guide/management-cookbook/g2g-transfer.html'; + // File upload // const onChangeFileUploadTypeHandler = useCallback((e: ChangeEvent, type: string) => { // setFileUploadType(type); @@ -275,7 +282,8 @@ const G2GDataTransfer = (): JSX.Element => {

{t('commons:g2g_data_transfer.transfer_key_limit')}

{t('commons:g2g_data_transfer.once_transfer_key_used')}

-

{t('commons:g2g_data_transfer.transfer_to_growi_cloud')}

+ {/* eslint-disable-next-line react/no-danger */} +

); diff --git a/apps/app/src/client/components/DataTransferForm.tsx b/apps/app/src/client/components/DataTransferForm.tsx index a5f7c18ed26..8d2362499d8 100644 --- a/apps/app/src/client/components/DataTransferForm.tsx +++ b/apps/app/src/client/components/DataTransferForm.tsx @@ -3,12 +3,18 @@ import React from 'react'; import { useTranslation } from 'next-i18next'; import { useGenerateTransferKey } from '~/client/services/g2g-transfer'; +import { useGrowiCloudUri, useGrowiAppIdForGrowiCloud } from '~/stores-universal/context'; import CustomCopyToClipBoard from './Common/CustomCopyToClipBoard'; const DataTransferForm = (): JSX.Element => { const { t } = useTranslation('commons'); const { transferKey, generateTransferKey } = useGenerateTransferKey(); + const { data: growiCloudUri } = useGrowiCloudUri(); + const { data: growiAppIdForGrowiCloud } = useGrowiAppIdForGrowiCloud(); + const growiDataTransferHelpPage = growiCloudUri != null && growiAppIdForGrowiCloud != null + ? 'https://growi.cloud/help/ja/admin-guide/management-cookbook/g2g-transfer.html' + : 'https://docs.growi.org/ja/admin-guide/management-cookbook/g2g-transfer.html'; return (
@@ -33,7 +39,8 @@ const DataTransferForm = (): JSX.Element => {

{t('g2g_data_transfer.transfer_key_limit')}

{t('g2g_data_transfer.once_transfer_key_used')}

-

{t('g2g_data_transfer.transfer_to_growi_cloud')}

+ {/* eslint-disable-next-line react/no-danger */} +

); From 5670c27001548480341642356357ecde10139c09 Mon Sep 17 00:00:00 2001 From: shironegi39 Date: Wed, 11 Sep 2024 11:56:26 +0000 Subject: [PATCH 2/9] Change Variables --- apps/app/src/client/components/Admin/G2GDataTransfer.tsx | 4 +--- apps/app/src/client/components/DataTransferForm.tsx | 5 +---- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/apps/app/src/client/components/Admin/G2GDataTransfer.tsx b/apps/app/src/client/components/Admin/G2GDataTransfer.tsx index 1722ffaa594..8c06906782f 100644 --- a/apps/app/src/client/components/Admin/G2GDataTransfer.tsx +++ b/apps/app/src/client/components/Admin/G2GDataTransfer.tsx @@ -126,9 +126,7 @@ const G2GDataTransfer = (): JSX.Element => { } }, [setTransferring, startTransferKey, selectedCollections, optionsMap]); - const growiDataTransferHelpPage = growiCloudUri != null && growiAppIdForGrowiCloud != null - ? 'https://growi.cloud/help/ja/admin-guide/management-cookbook/g2g-transfer.html' - : 'https://docs.growi.org/ja/admin-guide/management-cookbook/g2g-transfer.html'; + const growiDataTransferHelpPage = growiCloudUri != null && growiAppIdForGrowiCloud != null ? 'growi.cloud' : 'docs.growi.org'; // File upload // const onChangeFileUploadTypeHandler = useCallback((e: ChangeEvent, type: string) => { diff --git a/apps/app/src/client/components/DataTransferForm.tsx b/apps/app/src/client/components/DataTransferForm.tsx index 8d2362499d8..8bbb96cb64a 100644 --- a/apps/app/src/client/components/DataTransferForm.tsx +++ b/apps/app/src/client/components/DataTransferForm.tsx @@ -12,10 +12,7 @@ const DataTransferForm = (): JSX.Element => { const { transferKey, generateTransferKey } = useGenerateTransferKey(); const { data: growiCloudUri } = useGrowiCloudUri(); const { data: growiAppIdForGrowiCloud } = useGrowiAppIdForGrowiCloud(); - const growiDataTransferHelpPage = growiCloudUri != null && growiAppIdForGrowiCloud != null - ? 'https://growi.cloud/help/ja/admin-guide/management-cookbook/g2g-transfer.html' - : 'https://docs.growi.org/ja/admin-guide/management-cookbook/g2g-transfer.html'; - + const growiDataTransferHelpPage = growiCloudUri != null && growiAppIdForGrowiCloud != null ? 'growi.cloud' : 'docs.growi.org'; return (

From e30356cded6d5ba369f60aa4568519594abb4977 Mon Sep 17 00:00:00 2001 From: shironegi39 Date: Wed, 11 Sep 2024 12:06:41 +0000 Subject: [PATCH 3/9] EN language support --- apps/app/public/static/locales/en_US/commons.json | 2 +- apps/app/src/client/components/Admin/G2GDataTransfer.tsx | 2 +- apps/app/src/client/components/DataTransferForm.tsx | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/app/public/static/locales/en_US/commons.json b/apps/app/public/static/locales/en_US/commons.json index eb6c0c50080..61b5f07335c 100644 --- a/apps/app/public/static/locales/en_US/commons.json +++ b/apps/app/public/static/locales/en_US/commons.json @@ -157,6 +157,6 @@ "publish_transfer_key": "Publish transfer key", "transfer_key_limit": "Transfer keys are valid for 1 hour after issuance.", "once_transfer_key_used": "Once the transfer key is used for transfer, it cannot be used for any other transfer.", - "transfer_to_growi_cloud": "If you wish to transfer to GROWI.cloud, please click here." + "transfer_to_growi_cloud": "For more details, please click here." } } diff --git a/apps/app/src/client/components/Admin/G2GDataTransfer.tsx b/apps/app/src/client/components/Admin/G2GDataTransfer.tsx index 8c06906782f..8599300d5d9 100644 --- a/apps/app/src/client/components/Admin/G2GDataTransfer.tsx +++ b/apps/app/src/client/components/Admin/G2GDataTransfer.tsx @@ -126,7 +126,7 @@ const G2GDataTransfer = (): JSX.Element => { } }, [setTransferring, startTransferKey, selectedCollections, optionsMap]); - const growiDataTransferHelpPage = growiCloudUri != null && growiAppIdForGrowiCloud != null ? 'growi.cloud' : 'docs.growi.org'; + const growiDataTransferHelpPage = growiCloudUri != null && growiAppIdForGrowiCloud != null ? 'growi.cloud/help' : 'docs.growi.org'; // File upload // const onChangeFileUploadTypeHandler = useCallback((e: ChangeEvent, type: string) => { diff --git a/apps/app/src/client/components/DataTransferForm.tsx b/apps/app/src/client/components/DataTransferForm.tsx index 8bbb96cb64a..6fba545604c 100644 --- a/apps/app/src/client/components/DataTransferForm.tsx +++ b/apps/app/src/client/components/DataTransferForm.tsx @@ -12,7 +12,7 @@ const DataTransferForm = (): JSX.Element => { const { transferKey, generateTransferKey } = useGenerateTransferKey(); const { data: growiCloudUri } = useGrowiCloudUri(); const { data: growiAppIdForGrowiCloud } = useGrowiAppIdForGrowiCloud(); - const growiDataTransferHelpPage = growiCloudUri != null && growiAppIdForGrowiCloud != null ? 'growi.cloud' : 'docs.growi.org'; + const growiDataTransferHelpPage = growiCloudUri != null && growiAppIdForGrowiCloud != null ? 'growi.cloud/help' : 'docs.growi.org'; return (

From 7292c562b281ca25dae29afc87b84bf0b55d9f15 Mon Sep 17 00:00:00 2001 From: shironegi39 Date: Thu, 12 Sep 2024 05:34:09 +0000 Subject: [PATCH 4/9] Languages Support --- apps/app/public/static/locales/fr_FR/commons.json | 2 +- apps/app/public/static/locales/ja_JP/commons.json | 2 +- apps/app/public/static/locales/zh_CN/commons.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/app/public/static/locales/fr_FR/commons.json b/apps/app/public/static/locales/fr_FR/commons.json index 3771c037ee5..365feb89978 100644 --- a/apps/app/public/static/locales/fr_FR/commons.json +++ b/apps/app/public/static/locales/fr_FR/commons.json @@ -157,6 +157,6 @@ "publish_transfer_key": "Publier la clé de transfert", "transfer_key_limit": "Les clés de transfert sont valides durant une heure.", "once_transfer_key_used": "Les clés de transfert sont à usage unique.", - "transfer_to_growi_cloud": "Si vous souhaitez transférer depuis GROWI.cloud, cliquez ici." + "transfer_to_growi_cloud": "Pour plus de détails, veuillez cliquer ici." } } diff --git a/apps/app/public/static/locales/ja_JP/commons.json b/apps/app/public/static/locales/ja_JP/commons.json index 1ef59c46ddc..2c2a25c7521 100644 --- a/apps/app/public/static/locales/ja_JP/commons.json +++ b/apps/app/public/static/locales/ja_JP/commons.json @@ -159,6 +159,6 @@ "publish_transfer_key": "移行キーを発行する", "transfer_key_limit": "※ 移行キーの有効期限は発行から1時間となります。", "once_transfer_key_used": "※ 移行キーは一度移行に利用するとそれ以降はご利用いただけなくなります。", - "transfer_to_growi_cloud": "※ 詳しくは こちら" + "transfer_to_growi_cloud": "※ 詳しくは こちら" } } diff --git a/apps/app/public/static/locales/zh_CN/commons.json b/apps/app/public/static/locales/zh_CN/commons.json index 9108400f2d3..9711cf12c74 100644 --- a/apps/app/public/static/locales/zh_CN/commons.json +++ b/apps/app/public/static/locales/zh_CN/commons.json @@ -160,6 +160,6 @@ "publish_transfer_key": "发布迁移密钥", "transfer_key_limit": "迁移密钥在签发后一小时内有效。", "once_transfer_key_used": "一旦迁移密钥被用于迁移，它将不再可用于进一步的迁移。", - "transfer_to_growi_cloud": "如果您希望迁移到GROWI.cloud，请点击这里。" + "transfer_to_growi_cloud": "有关更多详情，请点击此处。" } } From f02b84c46f64c6529ca1fbf76fcd05cd2e1de3f3 Mon Sep 17 00:00:00 2001 From: shironegi39 Date: Thu, 12 Sep 2024 06:46:49 +0000 Subject: [PATCH 5/9] Variable Change --- apps/app/public/static/locales/en_US/commons.json | 2 +- apps/app/public/static/locales/fr_FR/commons.json | 2 +- apps/app/public/static/locales/ja_JP/commons.json | 2 +- apps/app/public/static/locales/zh_CN/commons.json | 2 +- apps/app/src/client/components/Admin/G2GDataTransfer.tsx | 4 ++-- apps/app/src/client/components/DataTransferForm.tsx | 4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/apps/app/public/static/locales/en_US/commons.json b/apps/app/public/static/locales/en_US/commons.json index 61b5f07335c..4aad37987e1 100644 --- a/apps/app/public/static/locales/en_US/commons.json +++ b/apps/app/public/static/locales/en_US/commons.json @@ -157,6 +157,6 @@ "publish_transfer_key": "Publish transfer key", "transfer_key_limit": "Transfer keys are valid for 1 hour after issuance.", "once_transfer_key_used": "Once the transfer key is used for transfer, it cannot be used for any other transfer.", - "transfer_to_growi_cloud": "For more details, please click here." + "transfer_to_growi_cloud": "For more details, please click here." } } diff --git a/apps/app/public/static/locales/fr_FR/commons.json b/apps/app/public/static/locales/fr_FR/commons.json index 365feb89978..7328b4e9725 100644 --- a/apps/app/public/static/locales/fr_FR/commons.json +++ b/apps/app/public/static/locales/fr_FR/commons.json @@ -157,6 +157,6 @@ "publish_transfer_key": "Publier la clé de transfert", "transfer_key_limit": "Les clés de transfert sont valides durant une heure.", "once_transfer_key_used": "Les clés de transfert sont à usage unique.", - "transfer_to_growi_cloud": "Pour plus de détails, veuillez cliquer ici." + "transfer_to_growi_cloud": "Pour plus de détails, veuillez cliquer ici." } } diff --git a/apps/app/public/static/locales/ja_JP/commons.json b/apps/app/public/static/locales/ja_JP/commons.json index 2c2a25c7521..6077adc75bc 100644 --- a/apps/app/public/static/locales/ja_JP/commons.json +++ b/apps/app/public/static/locales/ja_JP/commons.json @@ -159,6 +159,6 @@ "publish_transfer_key": "移行キーを発行する", "transfer_key_limit": "※ 移行キーの有効期限は発行から1時間となります。", "once_transfer_key_used": "※ 移行キーは一度移行に利用するとそれ以降はご利用いただけなくなります。", - "transfer_to_growi_cloud": "※ 詳しくは こちら" + "transfer_to_growi_cloud": "※ 詳しくは こちら" } } diff --git a/apps/app/public/static/locales/zh_CN/commons.json b/apps/app/public/static/locales/zh_CN/commons.json index 9711cf12c74..5fb67e84a61 100644 --- a/apps/app/public/static/locales/zh_CN/commons.json +++ b/apps/app/public/static/locales/zh_CN/commons.json @@ -160,6 +160,6 @@ "publish_transfer_key": "发布迁移密钥", "transfer_key_limit": "迁移密钥在签发后一小时内有效。", "once_transfer_key_used": "一旦迁移密钥被用于迁移，它将不再可用于进一步的迁移。", - "transfer_to_growi_cloud": "有关更多详情，请点击此处。" + "transfer_to_growi_cloud": "有关更多详情，请点击此处。" } } diff --git a/apps/app/src/client/components/Admin/G2GDataTransfer.tsx b/apps/app/src/client/components/Admin/G2GDataTransfer.tsx index 8599300d5d9..59f6c0a6d23 100644 --- a/apps/app/src/client/components/Admin/G2GDataTransfer.tsx +++ b/apps/app/src/client/components/Admin/G2GDataTransfer.tsx @@ -126,7 +126,7 @@ const G2GDataTransfer = (): JSX.Element => { } }, [setTransferring, startTransferKey, selectedCollections, optionsMap]); - const growiDataTransferHelpPage = growiCloudUri != null && growiAppIdForGrowiCloud != null ? 'growi.cloud/help' : 'docs.growi.org'; + const growiHelpUrl = growiCloudUri != null && growiAppIdForGrowiCloud != null ? 'growi.cloud/help' : 'docs.growi.org'; // File upload // const onChangeFileUploadTypeHandler = useCallback((e: ChangeEvent, type: string) => { @@ -281,7 +281,7 @@ const G2GDataTransfer = (): JSX.Element => {

{t('commons:g2g_data_transfer.transfer_key_limit')}

{t('commons:g2g_data_transfer.once_transfer_key_used')}

{/* eslint-disable-next-line react/no-danger */} -

+

); diff --git a/apps/app/src/client/components/DataTransferForm.tsx b/apps/app/src/client/components/DataTransferForm.tsx index 6fba545604c..5aa84e8a831 100644 --- a/apps/app/src/client/components/DataTransferForm.tsx +++ b/apps/app/src/client/components/DataTransferForm.tsx @@ -12,7 +12,7 @@ const DataTransferForm = (): JSX.Element => { const { transferKey, generateTransferKey } = useGenerateTransferKey(); const { data: growiCloudUri } = useGrowiCloudUri(); const { data: growiAppIdForGrowiCloud } = useGrowiAppIdForGrowiCloud(); - const growiDataTransferHelpPage = growiCloudUri != null && growiAppIdForGrowiCloud != null ? 'growi.cloud/help' : 'docs.growi.org'; + const growiHelpUrl = growiCloudUri != null && growiAppIdForGrowiCloud != null ? 'growi.cloud/help' : 'docs.growi.org'; return (

@@ -37,7 +37,7 @@ const DataTransferForm = (): JSX.Element => {

{t('g2g_data_transfer.transfer_key_limit')}

{t('g2g_data_transfer.once_transfer_key_used')}

{/* eslint-disable-next-line react/no-danger */} -

+

); From 37c6ae602afd8d276ce93e1d6ba376d6747e7c5a Mon Sep 17 00:00:00 2001 From: shironegi39 Date: Thu, 12 Sep 2024 08:07:26 +0000 Subject: [PATCH 6/9] Change method to SWRHook --- .../client/components/Admin/G2GDataTransfer.tsx | 6 ++---- .../src/client/components/DataTransferForm.tsx | 7 +++---- apps/app/src/stores-universal/context.tsx | 15 +++++++++++++++ 3 files changed, 20 insertions(+), 8 deletions(-) diff --git a/apps/app/src/client/components/Admin/G2GDataTransfer.tsx b/apps/app/src/client/components/Admin/G2GDataTransfer.tsx index 59f6c0a6d23..bc81750c711 100644 --- a/apps/app/src/client/components/Admin/G2GDataTransfer.tsx +++ b/apps/app/src/client/components/Admin/G2GDataTransfer.tsx @@ -8,7 +8,7 @@ import { useGenerateTransferKey } from '~/client/services/g2g-transfer'; import { apiv3Get, apiv3Post } from '~/client/util/apiv3-client'; import { toastError, toastSuccess } from '~/client/util/toastr'; import { G2G_PROGRESS_STATUS, type G2GProgress } from '~/interfaces/g2g-transfer'; -import { useGrowiCloudUri, useGrowiAppIdForGrowiCloud } from '~/stores-universal/context'; +import { useIsGrowiHelpUrl } from '~/stores-universal/context'; import { useAdminSocket } from '~/stores/socket-io'; import CustomCopyToClipBoard from '../Common/CustomCopyToClipBoard'; @@ -35,8 +35,6 @@ const G2GDataTransfer = (): JSX.Element => { mongo: G2G_PROGRESS_STATUS.PENDING, attachments: G2G_PROGRESS_STATUS.PENDING, }); - const { data: growiCloudUri } = useGrowiCloudUri(); - const { data: growiAppIdForGrowiCloud } = useGrowiAppIdForGrowiCloud(); // File upload settings // const [fileUploadType, setFileUploadType] = useState('aws'); @@ -126,7 +124,7 @@ const G2GDataTransfer = (): JSX.Element => { } }, [setTransferring, startTransferKey, selectedCollections, optionsMap]); - const growiHelpUrl = growiCloudUri != null && growiAppIdForGrowiCloud != null ? 'growi.cloud/help' : 'docs.growi.org'; + const { data: growiHelpUrl } = useIsGrowiHelpUrl(); // File upload // const onChangeFileUploadTypeHandler = useCallback((e: ChangeEvent, type: string) => { diff --git a/apps/app/src/client/components/DataTransferForm.tsx b/apps/app/src/client/components/DataTransferForm.tsx index 5aa84e8a831..ea2f72f5e40 100644 --- a/apps/app/src/client/components/DataTransferForm.tsx +++ b/apps/app/src/client/components/DataTransferForm.tsx @@ -3,16 +3,15 @@ import React from 'react'; import { useTranslation } from 'next-i18next'; import { useGenerateTransferKey } from '~/client/services/g2g-transfer'; -import { useGrowiCloudUri, useGrowiAppIdForGrowiCloud } from '~/stores-universal/context'; +import { useIsGrowiHelpUrl } from '~/stores-universal/context'; import CustomCopyToClipBoard from './Common/CustomCopyToClipBoard'; const DataTransferForm = (): JSX.Element => { const { t } = useTranslation('commons'); const { transferKey, generateTransferKey } = useGenerateTransferKey(); - const { data: growiCloudUri } = useGrowiCloudUri(); - const { data: growiAppIdForGrowiCloud } = useGrowiAppIdForGrowiCloud(); - const growiHelpUrl = growiCloudUri != null && growiAppIdForGrowiCloud != null ? 'growi.cloud/help' : 'docs.growi.org'; + const { data: growiHelpUrl } = useIsGrowiHelpUrl(); + return (

diff --git a/apps/app/src/stores-universal/context.tsx b/apps/app/src/stores-universal/context.tsx index c020cb75720..d1064013895 100644 --- a/apps/app/src/stores-universal/context.tsx +++ b/apps/app/src/stores-universal/context.tsx @@ -285,3 +285,18 @@ export const useAcceptedUploadFileType = (): SWRResponse => { + const { data: growiCloudUri } = useGrowiCloudUri(); + const { data: growiAppIdForGrowiCloud } = useGrowiAppIdForGrowiCloud(); + + return useSWRImmutable( + [growiCloudUri, growiAppIdForGrowiCloud], + ([growiCloudUri, growiAppIdForGrowiCloud]) => { + if (growiCloudUri != null && growiAppIdForGrowiCloud != null) { + return 'growi.cloud/help'; + } + return 'docs.growi.org'; + }, + ); +}; From 41ff64ea4e352f86c169e5aef5840969e8c038f8 Mon Sep 17 00:00:00 2001 From: shironegi39 Date: Thu, 12 Sep 2024 08:18:35 +0000 Subject: [PATCH 7/9] Change custom hook name --- apps/app/src/client/components/Admin/G2GDataTransfer.tsx | 4 ++-- apps/app/src/client/components/DataTransferForm.tsx | 4 ++-- apps/app/src/stores-universal/context.tsx | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/apps/app/src/client/components/Admin/G2GDataTransfer.tsx b/apps/app/src/client/components/Admin/G2GDataTransfer.tsx index bc81750c711..82ffaf7c25a 100644 --- a/apps/app/src/client/components/Admin/G2GDataTransfer.tsx +++ b/apps/app/src/client/components/Admin/G2GDataTransfer.tsx @@ -8,7 +8,7 @@ import { useGenerateTransferKey } from '~/client/services/g2g-transfer'; import { apiv3Get, apiv3Post } from '~/client/util/apiv3-client'; import { toastError, toastSuccess } from '~/client/util/toastr'; import { G2G_PROGRESS_STATUS, type G2GProgress } from '~/interfaces/g2g-transfer'; -import { useIsGrowiHelpUrl } from '~/stores-universal/context'; +import { useGrowiHelpUrl } from '~/stores-universal/context'; import { useAdminSocket } from '~/stores/socket-io'; import CustomCopyToClipBoard from '../Common/CustomCopyToClipBoard'; @@ -124,7 +124,7 @@ const G2GDataTransfer = (): JSX.Element => { } }, [setTransferring, startTransferKey, selectedCollections, optionsMap]); - const { data: growiHelpUrl } = useIsGrowiHelpUrl(); + const { data: growiHelpUrl } = useGrowiHelpUrl(); // File upload // const onChangeFileUploadTypeHandler = useCallback((e: ChangeEvent, type: string) => { diff --git a/apps/app/src/client/components/DataTransferForm.tsx b/apps/app/src/client/components/DataTransferForm.tsx index ea2f72f5e40..74d598ada35 100644 --- a/apps/app/src/client/components/DataTransferForm.tsx +++ b/apps/app/src/client/components/DataTransferForm.tsx @@ -3,14 +3,14 @@ import React from 'react'; import { useTranslation } from 'next-i18next'; import { useGenerateTransferKey } from '~/client/services/g2g-transfer'; -import { useIsGrowiHelpUrl } from '~/stores-universal/context'; +import { useGrowiHelpUrl } from '~/stores-universal/context'; import CustomCopyToClipBoard from './Common/CustomCopyToClipBoard'; const DataTransferForm = (): JSX.Element => { const { t } = useTranslation('commons'); const { transferKey, generateTransferKey } = useGenerateTransferKey(); - const { data: growiHelpUrl } = useIsGrowiHelpUrl(); + const { data: growiHelpUrl } = useGrowiHelpUrl(); return (

diff --git a/apps/app/src/stores-universal/context.tsx b/apps/app/src/stores-universal/context.tsx index d1064013895..78c5a30b099 100644 --- a/apps/app/src/stores-universal/context.tsx +++ b/apps/app/src/stores-universal/context.tsx @@ -286,7 +286,7 @@ export const useAcceptedUploadFileType = (): SWRResponse => { +export const useGrowiHelpUrl = (): SWRResponse<'growi.cloud/help' | 'docs.growi.org', Error> => { const { data: growiCloudUri } = useGrowiCloudUri(); const { data: growiAppIdForGrowiCloud } = useGrowiAppIdForGrowiCloud(); From 7795fd538c7fc2cbaffab8d44e02842ff5a68a4a Mon Sep 17 00:00:00 2001 From: shironegi39 Date: Thu, 12 Sep 2024 08:29:29 +0000 Subject: [PATCH 8/9] Variable Change --- apps/app/public/static/locales/en_US/commons.json | 2 +- apps/app/public/static/locales/fr_FR/commons.json | 2 +- apps/app/public/static/locales/ja_JP/commons.json | 2 +- apps/app/public/static/locales/zh_CN/commons.json | 2 +- apps/app/src/client/components/Admin/G2GDataTransfer.tsx | 4 ++-- apps/app/src/client/components/DataTransferForm.tsx | 4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/apps/app/public/static/locales/en_US/commons.json b/apps/app/public/static/locales/en_US/commons.json index 4aad37987e1..3e9e92d8e9c 100644 --- a/apps/app/public/static/locales/en_US/commons.json +++ b/apps/app/public/static/locales/en_US/commons.json @@ -157,6 +157,6 @@ "publish_transfer_key": "Publish transfer key", "transfer_key_limit": "Transfer keys are valid for 1 hour after issuance.", "once_transfer_key_used": "Once the transfer key is used for transfer, it cannot be used for any other transfer.", - "transfer_to_growi_cloud": "For more details, please click here." + "transfer_to_growi_cloud": "For more details, please click here." } } diff --git a/apps/app/public/static/locales/fr_FR/commons.json b/apps/app/public/static/locales/fr_FR/commons.json index 7328b4e9725..205f1532148 100644 --- a/apps/app/public/static/locales/fr_FR/commons.json +++ b/apps/app/public/static/locales/fr_FR/commons.json @@ -157,6 +157,6 @@ "publish_transfer_key": "Publier la clé de transfert", "transfer_key_limit": "Les clés de transfert sont valides durant une heure.", "once_transfer_key_used": "Les clés de transfert sont à usage unique.", - "transfer_to_growi_cloud": "Pour plus de détails, veuillez cliquer ici." + "transfer_to_growi_cloud": "Pour plus de détails, veuillez cliquer ici." } } diff --git a/apps/app/public/static/locales/ja_JP/commons.json b/apps/app/public/static/locales/ja_JP/commons.json index 6077adc75bc..cd201e5ec03 100644 --- a/apps/app/public/static/locales/ja_JP/commons.json +++ b/apps/app/public/static/locales/ja_JP/commons.json @@ -159,6 +159,6 @@ "publish_transfer_key": "移行キーを発行する", "transfer_key_limit": "※ 移行キーの有効期限は発行から1時間となります。", "once_transfer_key_used": "※ 移行キーは一度移行に利用するとそれ以降はご利用いただけなくなります。", - "transfer_to_growi_cloud": "※ 詳しくは こちら" + "transfer_to_growi_cloud": "※ 詳しくは こちら" } } diff --git a/apps/app/public/static/locales/zh_CN/commons.json b/apps/app/public/static/locales/zh_CN/commons.json index 5fb67e84a61..677f7c63bca 100644 --- a/apps/app/public/static/locales/zh_CN/commons.json +++ b/apps/app/public/static/locales/zh_CN/commons.json @@ -160,6 +160,6 @@ "publish_transfer_key": "发布迁移密钥", "transfer_key_limit": "迁移密钥在签发后一小时内有效。", "once_transfer_key_used": "一旦迁移密钥被用于迁移，它将不再可用于进一步的迁移。", - "transfer_to_growi_cloud": "有关更多详情，请点击此处。" + "transfer_to_growi_cloud": "有关更多详情，请点击此处。" } } diff --git a/apps/app/src/client/components/Admin/G2GDataTransfer.tsx b/apps/app/src/client/components/Admin/G2GDataTransfer.tsx index 82ffaf7c25a..48ab8d88c5e 100644 --- a/apps/app/src/client/components/Admin/G2GDataTransfer.tsx +++ b/apps/app/src/client/components/Admin/G2GDataTransfer.tsx @@ -124,7 +124,7 @@ const G2GDataTransfer = (): JSX.Element => { } }, [setTransferring, startTransferKey, selectedCollections, optionsMap]); - const { data: growiHelpUrl } = useGrowiHelpUrl(); + const { data: growiHelpDomain } = useGrowiHelpUrl(); // File upload // const onChangeFileUploadTypeHandler = useCallback((e: ChangeEvent, type: string) => { @@ -279,7 +279,7 @@ const G2GDataTransfer = (): JSX.Element => {

{t('commons:g2g_data_transfer.transfer_key_limit')}

{t('commons:g2g_data_transfer.once_transfer_key_used')}

{/* eslint-disable-next-line react/no-danger */} -

+

); diff --git a/apps/app/src/client/components/DataTransferForm.tsx b/apps/app/src/client/components/DataTransferForm.tsx index 74d598ada35..f5c576a21b7 100644 --- a/apps/app/src/client/components/DataTransferForm.tsx +++ b/apps/app/src/client/components/DataTransferForm.tsx @@ -10,7 +10,7 @@ import CustomCopyToClipBoard from './Common/CustomCopyToClipBoard'; const DataTransferForm = (): JSX.Element => { const { t } = useTranslation('commons'); const { transferKey, generateTransferKey } = useGenerateTransferKey(); - const { data: growiHelpUrl } = useGrowiHelpUrl(); + const { data: growiHelpDomain } = useGrowiHelpUrl(); return (
@@ -36,7 +36,7 @@ const DataTransferForm = (): JSX.Element => {

{t('g2g_data_transfer.transfer_key_limit')}

{t('g2g_data_transfer.once_transfer_key_used')}

{/* eslint-disable-next-line react/no-danger */} -

+

); From ada4bba4120f4694adb13e37c0781d9187a9a630 Mon Sep 17 00:00:00 2001 From: shironegi39 Date: Thu, 12 Sep 2024 08:31:03 +0000 Subject: [PATCH 9/9] Change custom hook name --- apps/app/src/client/components/Admin/G2GDataTransfer.tsx | 4 ++-- apps/app/src/client/components/DataTransferForm.tsx | 4 ++-- apps/app/src/stores-universal/context.tsx | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/apps/app/src/client/components/Admin/G2GDataTransfer.tsx b/apps/app/src/client/components/Admin/G2GDataTransfer.tsx index 48ab8d88c5e..515d1b6d0bc 100644 --- a/apps/app/src/client/components/Admin/G2GDataTransfer.tsx +++ b/apps/app/src/client/components/Admin/G2GDataTransfer.tsx @@ -8,7 +8,7 @@ import { useGenerateTransferKey } from '~/client/services/g2g-transfer'; import { apiv3Get, apiv3Post } from '~/client/util/apiv3-client'; import { toastError, toastSuccess } from '~/client/util/toastr'; import { G2G_PROGRESS_STATUS, type G2GProgress } from '~/interfaces/g2g-transfer'; -import { useGrowiHelpUrl } from '~/stores-universal/context'; +import { useGrowiHelpDomain } from '~/stores-universal/context'; import { useAdminSocket } from '~/stores/socket-io'; import CustomCopyToClipBoard from '../Common/CustomCopyToClipBoard'; @@ -124,7 +124,7 @@ const G2GDataTransfer = (): JSX.Element => { } }, [setTransferring, startTransferKey, selectedCollections, optionsMap]); - const { data: growiHelpDomain } = useGrowiHelpUrl(); + const { data: growiHelpDomain } = useGrowiHelpDomain(); // File upload // const onChangeFileUploadTypeHandler = useCallback((e: ChangeEvent, type: string) => { diff --git a/apps/app/src/client/components/DataTransferForm.tsx b/apps/app/src/client/components/DataTransferForm.tsx index f5c576a21b7..e52a0609f98 100644 --- a/apps/app/src/client/components/DataTransferForm.tsx +++ b/apps/app/src/client/components/DataTransferForm.tsx @@ -3,14 +3,14 @@ import React from 'react'; import { useTranslation } from 'next-i18next'; import { useGenerateTransferKey } from '~/client/services/g2g-transfer'; -import { useGrowiHelpUrl } from '~/stores-universal/context'; +import { useGrowiHelpDomain } from '~/stores-universal/context'; import CustomCopyToClipBoard from './Common/CustomCopyToClipBoard'; const DataTransferForm = (): JSX.Element => { const { t } = useTranslation('commons'); const { transferKey, generateTransferKey } = useGenerateTransferKey(); - const { data: growiHelpDomain } = useGrowiHelpUrl(); + const { data: growiHelpDomain } = useGrowiHelpDomain(); return (
diff --git a/apps/app/src/stores-universal/context.tsx b/apps/app/src/stores-universal/context.tsx index 78c5a30b099..c0c3046bede 100644 --- a/apps/app/src/stores-universal/context.tsx +++ b/apps/app/src/stores-universal/context.tsx @@ -286,7 +286,7 @@ export const useAcceptedUploadFileType = (): SWRResponse => { +export const useGrowiHelpDomain = (): SWRResponse<'growi.cloud/help' | 'docs.growi.org', Error> => { const { data: growiCloudUri } = useGrowiCloudUri(); const { data: growiAppIdForGrowiCloud } = useGrowiAppIdForGrowiCloud();