From a1df8ac3f26f3740fb7f7e6a6175ec5153a971b1 Mon Sep 17 00:00:00 2001 From: lflangis Date: Thu, 1 Feb 2024 15:19:46 -0500 Subject: [PATCH] fix: SKFP-934 fix ok button text on cavatica analyse modal --- packages/ui/Release.md | 3 +++ packages/ui/package-lock.json | 4 ++-- packages/ui/package.json | 2 +- .../Widgets/Cavatica/CavaticaAnalyzeModal.tsx | 13 +++++++------ 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/packages/ui/Release.md b/packages/ui/Release.md index 828c21197..af17252dd 100644 --- a/packages/ui/Release.md +++ b/packages/ui/Release.md @@ -1,3 +1,6 @@ +### 8.2.1 2024-02-01 +- fix: SKFP-934 fix ok button text on cavatica analyse modal + ### 8.2.1 2024-01-31 - fix: FLUI-116 fix the operator tooltip in QueryBuild to be on a single line diff --git a/packages/ui/package-lock.json b/packages/ui/package-lock.json index d3a31a5ea..4ef4e11de 100644 --- a/packages/ui/package-lock.json +++ b/packages/ui/package-lock.json @@ -1,12 +1,12 @@ { "name": "@ferlab/ui", - "version": "8.2.1", + "version": "8.2.2", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@ferlab/ui", - "version": "8.2.1", + "version": "8.2.2", "license": "SEE LICENSE IN LICENSE", "dependencies": { "@ant-design/icons": "^4.7.0", diff --git a/packages/ui/package.json b/packages/ui/package.json index 8b9bf2524..1fe044452 100644 --- a/packages/ui/package.json +++ b/packages/ui/package.json @@ -1,6 +1,6 @@ { "name": "@ferlab/ui", - "version": "8.2.1", + "version": "8.2.2", "description": "Core components for scientific research data portals", "publishConfig": { "access": "public" diff --git a/packages/ui/src/components/Widgets/Cavatica/CavaticaAnalyzeModal.tsx b/packages/ui/src/components/Widgets/Cavatica/CavaticaAnalyzeModal.tsx index 5bc3d98f9..650acd2c4 100644 --- a/packages/ui/src/components/Widgets/Cavatica/CavaticaAnalyzeModal.tsx +++ b/packages/ui/src/components/Widgets/Cavatica/CavaticaAnalyzeModal.tsx @@ -50,11 +50,11 @@ export type TCavaticaAnalyseModalDictionary = { export interface ICavaticaAnalyseModal extends ModalFuncProps { bulkImportData: ICavaticaBulkImportData; - projects: ICavaticaProjects; - handleFilesAndFolders: (parentId: string, isProject: boolean) => any; + dictionary?: TCavaticaAnalyseModalDictionary; handleCreateProjectClick?: () => void; + handleFilesAndFolders: (parentId: string, isProject: boolean) => any; handleSubmit: (value: ICavaticaTreeNode) => void; - dictionary?: TCavaticaAnalyseModalDictionary; + projects: ICavaticaProjects; } const aggregateFilesToStudy = (filesToCopy: any[]) => @@ -64,12 +64,12 @@ const aggregateFilesToStudy = (filesToCopy: any[]) => })); const CavaticaAnalyseModal = ({ - projects, bulkImportData, + dictionary = DEFAULT_CAVATICA_ANALYSE_MODAL_DICTIONARY, + handleCreateProjectClick, handleFilesAndFolders, handleSubmit, - handleCreateProjectClick, - dictionary = DEFAULT_CAVATICA_ANALYSE_MODAL_DICTIONARY, + projects, ...rest }: ICavaticaAnalyseModal): JSX.Element => { const { authorizedFiles, files } = bulkImportData; @@ -116,6 +116,7 @@ const CavaticaAnalyseModal = ({ className={styles.cavaticaAnalyseModal} destroyOnClose okButtonProps={{ disabled: selectedTreeNode === undefined }} + okText={dictionary.copyFiles} onOk={() => { if (selectedTreeNode) { handleSubmit(selectedTreeNode);