Merge pull request Ferlab-Ste-Justine#385 from Ferlab-Ste-Justine/fea…

…t/SKFP-934/cavatica-bulk fix: SKFP-934 fix ok button text on cavatica analyse modal
lflangis · Feb 1, 2024 · db8cbc2 · db8cbc2
2 parents cc5d7b2 + a1df8ac
commit db8cbc2
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 9 deletions.
diff --git 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
diff --git 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
@@ -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);