fix: start page add more tabs dialog

greenbone · Nov 28, 2024 · c7fbc5c · c7fbc5c
1 parent 65a18b5
commit c7fbc5c
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 29 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/web/pages/start/confirmremovedialog.jsx b/src/web/pages/start/confirmremovedialog.jsx
@@ -11,7 +11,9 @@ import PropTypes from 'web/utils/proptypes';
 
 import Dialog from 'web/components/dialog/dialog';
 import DialogContent from 'web/components/dialog/content';
-import DialogTwoButtonFooter from 'web/components/dialog/twobuttonfooter';
+import DialogTwoButtonFooter, {
+  DELETE_ACTION,
+} from 'web/components/dialog/twobuttonfooter';
 
 import useTranslation from 'web/hooks/useTranslation';
 
@@ -43,6 +45,7 @@ const ConfirmRemoveDialog = ({
           rightButtonTitle={_('Remove')}
           onLeftButtonClick={onDeny}
           onRightButtonClick={() => onConfirm(dashboardId)}
+          rightButtonAction={DELETE_ACTION}
         />
       </DialogContent>
     </Dialog>

diff --git a/src/web/pages/start/newdashboarddialog.jsx b/src/web/pages/start/newdashboarddialog.jsx
@@ -3,8 +3,6 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-import React from 'react';
-
 import PropTypes from 'web/utils/proptypes';
 
 import SaveDialog from 'web/components/dialog/savedialog';
@@ -71,12 +69,9 @@ const EMPTY_DISPLAYS = [];
 
 const NewDashboardDialog = ({additionalDisplayChoices, onClose, onSave}) => {
   const [_] = useTranslation();
-  const defaultDisplayChoices = [
-    {
-      label: _('Default'),
-      key: 'default',
-      value: DEFAULT_DISPLAYS,
-    },
+
+  const uniqueDisplayChoices = [
+    {label: _('Default'), key: 'default', value: DEFAULT_DISPLAYS},
     {
       label: _('Scan Displays'),
       key: 'scan-displays',
@@ -92,26 +87,34 @@ const NewDashboardDialog = ({additionalDisplayChoices, onClose, onSave}) => {
       key: 'secinfo-displays',
       value: SECINFO_DEFAULT_DISPLAYS,
     },
-    {
-      label: _('Empty'),
-      key: 'empty',
-      value: EMPTY_DISPLAYS,
-    },
-    ...additionalDisplayChoices,
-  ];
+    {label: _('Empty'), key: 'empty', value: EMPTY_DISPLAYS},
+    ...additionalDisplayChoices.map(choice => ({
+      label: choice.label,
+      key: `${choice.label}-${JSON.stringify(choice.value)}`,
+      value: choice.value,
+    })),
+  ].filter(
+    (choice, index, self) =>
+      index === self.findIndex(item => item.key === choice.key),
+  );
+
   return (
     <SaveDialog
       buttonTitle={_('Add')}
       title={_('Add new Dashboard')}
-      defaultValues={{
-        title: _('Unnamed'),
-        defaultDisplays: DEFAULT_DISPLAYS,
-      }}
+      defaultValues={{title: _('Unnamed'), defaultDisplays: 'default'}}
       onClose={onClose}
-      onSave={onSave}
+      onSave={values =>
+        onSave({
+          ...values,
+          defaultDisplays: uniqueDisplayChoices.find(
+            choice => choice.key === values.defaultDisplays,
+          )?.value,
+        })
+      }
     >
       {({values, onValueChange}) => (
-        <React.Fragment>
+        <>
           <FormGroup title={_('Dashboard Title')}>
             <TextField
               name="title"
@@ -123,12 +126,15 @@ const NewDashboardDialog = ({additionalDisplayChoices, onClose, onSave}) => {
           <FormGroup title={_('Initial Displays')}>
             <Select
               name="defaultDisplays"
-              items={defaultDisplayChoices}
+              items={uniqueDisplayChoices.map(({label, key}) => ({
+                label,
+                value: key,
+              }))}
               value={values.defaultDisplays}
               onChange={onValueChange}
             />
           </FormGroup>
-        </React.Fragment>
+        </>
       )}
     </SaveDialog>
   );
@@ -137,14 +143,12 @@ const NewDashboardDialog = ({additionalDisplayChoices, onClose, onSave}) => {
 NewDashboardDialog.propTypes = {
   additionalDisplayChoices: PropTypes.arrayOf(
     PropTypes.shape({
-      label: PropTypes.toString,
-      value: PropTypes.array,
+      label: PropTypes.string.isRequired,
+      value: PropTypes.array.isRequired,
     }),
-  ),
+  ).isRequired,
   onClose: PropTypes.func.isRequired,
   onSave: PropTypes.func.isRequired,
 };
 
 export default NewDashboardDialog;
-
-// vim: set ts=2 sw=2 tw=80: