Bulkedit workgroup reset (#1594)

swisstopo · Oct 21, 2024 · cef17ce · cef17ce
2 parents 7896e87 + 4967846
commit cef17ce
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/src/client/cypress/e2e/mainPage/bulkedit.cy.js b/src/client/cypress/e2e/mainPage/bulkedit.cy.js
@@ -131,8 +131,8 @@ describe("Test the borehole bulk edit feature.", () => {
     cy.get(".MuiAccordionSummary-expandIconWrapper").click({ multiple: true, force: true });
     setInput("custom.project_name", "new name");
     setSelect("workgroup", 1);
-    setSelect("restriction", 3);
-    setSelect("national_interest", 1);
+    setSelect("restriction", 2);
+    setSelect("national_interest", 0);
 
     let visibleCount = 0;
 

diff --git a/src/client/src/components/form/formSelect.tsx b/src/client/src/components/form/formSelect.tsx
@@ -16,6 +16,7 @@ export interface FormSelectProps {
   sx?: SxProps;
   className?: string;
   onUpdate?: (value: number | boolean | null) => void;
+  canReset?: boolean;
 }
 
 export interface FormSelectValue {
@@ -41,12 +42,13 @@ export const FormSelect: FC<FormSelectProps> = ({
   sx,
   className,
   onUpdate,
+  canReset = true, // option to disable reset in dropdown without using the required rule and error display
 }) => {
   const { t } = useTranslation();
   const { control } = useFormContext();
 
   const menuItems: FormSelectMenuItem[] = [];
-  if (!required) {
+  if (!required && canReset) {
     menuItems.push({ key: 0, value: undefined, label: t("reset"), italic: true });
   }
 

diff --git a/src/client/src/components/legacyComponents/bulkedit/bulkEditForm.tsx b/src/client/src/components/legacyComponents/bulkedit/bulkEditForm.tsx
@@ -100,9 +100,6 @@ export const BulkEditForm = ({ selected, loadBoreholes }: BulkEditFormProps) =>
     (field: BulkEditFormField, newValue: BulkEditFormValue) => {
       const fieldName = field.api ?? field.fieldName;
       let updatedValue: BulkEditFormValue = newValue;
-      if (field.type === FormValueType.Boolean) {
-        updatedValue = newValue === 1 ? true : newValue === 0 ? false : undefined;
-      }
       if (field.type === FormValueType.Number) {
         updatedValue = parseFloat(newValue as string);
       }
@@ -131,9 +128,10 @@ export const BulkEditForm = ({ selected, loadBoreholes }: BulkEditFormProps) =>
     const entryIndex = fieldsToUpdate.findIndex(([key]) => key === fieldName);
     if (entryIndex !== -1) {
       setFieldsToUpdate([...fieldsToUpdate.filter(f => f[0] !== fieldName)]);
-      formMethods.resetField(fieldName);
       if (fieldName === "workgroup") {
         setWorkgroupId(null);
+      } else {
+        formMethods.resetField(fieldName);
       }
     }
   };
@@ -155,6 +153,7 @@ export const BulkEditForm = ({ selected, loadBoreholes }: BulkEditFormProps) =>
       if (field.type === FormValueType.Domain) {
         return (
           <FormDomainSelect
+            canReset={false}
             fieldName={field.api ?? field.fieldName}
             label={field.fieldName}
             schemaName={field?.domain ?? field.api ?? field.fieldName}
@@ -168,6 +167,7 @@ export const BulkEditForm = ({ selected, loadBoreholes }: BulkEditFormProps) =>
       if (field.type === FormValueType.Boolean) {
         return (
           <FormBooleanSelect
+            canReset={false}
             fieldName={field.api ?? field.fieldName}
             label={field.fieldName}
             onUpdate={e => {