Merge branch 'v2' into v2-develop

gisce · Sep 4, 2024 · 5e72468 · 5e72468
2 parents d190614 + 7bed715
commit 5e72468
Show file tree

Hide file tree

Showing 10 changed files with 41 additions and 11 deletions.
diff --git a/.storybook/styles.css b/.storybook/styles.css
@@ -164689,3 +164689,7 @@ div.markdown-typography-edit-content.markdown-typography-rtl {
   margin: 0 20px 0 0;
   padding: 0 4px 0 0;
 }
+
+.ant-btn-compact-first-item {
+  flex-grow: 1;
+}
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@gisce/react-ooui",
-  "version": "2.18.0-rc.1",
+  "version": "2.19.0",
   "engines": {
     "node": "20.5.0"
   },
@@ -35,7 +35,7 @@
   "dependencies": {
     "@ant-design/plots": "^1.0.9",
     "@gisce/fiber-diagram": "2.1.1",
-    "@gisce/ooui": "2.9.0",
+    "@gisce/ooui": "2.10.0",
     "@gisce/react-formiga-components": "1.8.0",
     "@gisce/react-formiga-table": "1.5.0",
     "@monaco-editor/react": "^4.4.5",

diff --git a/src/actionbar/FormActionBar.tsx b/src/actionbar/FormActionBar.tsx
@@ -181,6 +181,16 @@ function FormActionBar({ toolbar }: { toolbar: any }) {
     }
   }
 
+  function tryDuplicate() {
+    showConfirmDialog({
+      confirmMessage: t("confirmDuplicate"),
+      t,
+      onOk: () => {
+        duplicate();
+      },
+    });
+  }
+
   function tryDelete() {
     showConfirmDialog({
       confirmMessage: t("confirmRemoveItem"),
@@ -297,7 +307,7 @@ function FormActionBar({ toolbar }: { toolbar: any }) {
           formIsLoading
         }
         loading={duplicatingItem}
-        onClick={duplicate}
+        onClick={tryDuplicate}
       />
       <ActionButton
         icon={<DeleteOutlined />}

diff --git a/src/actionbar/TreeActionBar.tsx b/src/actionbar/TreeActionBar.tsx
@@ -109,6 +109,16 @@ function TreeActionBar(props: Props) {
     searchTreeNameSearch !== undefined &&
     searchTreeNameSearch.trim().length > 0;
 
+  function tryDuplicate() {
+    showConfirmDialog({
+      confirmMessage: t("confirmDuplicate"),
+      t,
+      onOk: () => {
+        duplicate();
+      },
+    });
+  }
+
   function tryDelete() {
     showConfirmDialog({
       confirmMessage: t("confirmRemove"),
@@ -231,7 +241,7 @@ function TreeActionBar(props: Props) {
               treeIsLoading
             }
             loading={duplicatingItem}
-            onClick={duplicate}
+            onClick={tryDuplicate}
           />
           <ActionButton
             icon={<DeleteOutlined />}

diff --git a/src/context/ContentRootContext.tsx b/src/context/ContentRootContext.tsx
@@ -361,6 +361,7 @@ const ContentRootProvider = (
           {children}
           <Modal
             title={t("generatingReport")}
+            zIndex={9999}
             open={reportGenerating}
             footer={null}
             closable={false}

diff --git a/src/locales/ca_ES.ts b/src/locales/ca_ES.ts
@@ -99,4 +99,6 @@ export default {
   allRecordsSelected: "Hi ha {totalRecords} registres seleccionats.",
   openInSameWindow: "Obrir en la pestanya actual",
   openInNewTab: "Obrir en una nova pestanya",
+  confirmDuplicate:
+    "Estàs segur de volguer duplicar els registre/s seleccionats?",
 };
diff --git a/src/locales/en_US.ts b/src/locales/en_US.ts
@@ -96,4 +96,5 @@ export default {
   allRecordsSelected: "Hi ha {totalRecords} registres seleccionats.",
   openInSameWindow: "Open in the current tab",
   openInNewTab: "Open in a new tab",
+  confirmDuplicate: "Are you sure you want to duplicate the selected item/s?",
 };
diff --git a/src/locales/es_ES.ts b/src/locales/es_ES.ts
@@ -101,4 +101,6 @@ export default {
   allRecordsSelected: "Hay {totalRecords} registros seleccionados.",
   openInSameWindow: "Abrir en la pestaña actual",
   openInNewTab: "Abrir en una nueva pestaña",
+  confirmDuplicate:
+    "Estás seguro de querer duplicar el registro/s seleccionado/s?",
 };
diff --git a/src/widgets/custom/ButtonGroup.tsx b/src/widgets/custom/ButtonGroup.tsx
@@ -76,7 +76,7 @@ export const ButtonGroup = (props: ButtonGroupProps) => {
     return null;
   } else if (ooui.buttons.length > 1) {
     return (
-      <Field ooui={new FieldOoui({ ...{ ooui } })}>
+      <Field ooui={new FieldOoui({ ...{ defaultButton } })}>
         <Dropdown.Button
           disabled={!activated || readOnly}
           onClick={onClick}