fix adding dropdown fields to section

opendatahub-io · Nov 7, 2024 · f19e0d1 · f19e0d1
1 parent 7023236
commit f19e0d1
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 5 deletions.
diff --git a/frontend/src/pages/connectionTypes/manage/ManageConnectionTypeFieldsTable.tsx b/frontend/src/pages/connectionTypes/manage/ManageConnectionTypeFieldsTable.tsx
@@ -119,7 +119,7 @@ const ManageConnectionTypeFieldsTable: React.FC<Props> = ({ fields, onFieldsChan
                   onAddField={() => {
                     const nextSectionIndex = index + findSectionFields(index, fields).length;
                     if (nextSectionIndex >= 0) {
-                      setModalField({ index: nextSectionIndex });
+                      setModalField({ index: nextSectionIndex + 1 });
                     } else {
                       setModalField({});
                     }

diff --git a/frontend/src/pages/connectionTypes/manage/advanced/DropdownAdvancedPropertiesForm.tsx b/frontend/src/pages/connectionTypes/manage/advanced/DropdownAdvancedPropertiesForm.tsx
@@ -36,11 +36,17 @@ const DropdownAdvancedPropertiesForm: React.FC<AdvancedFieldProps<DropdownField>
     // filter out empty rows for validation (they will be removed on save)
     const itemsWithoutEmptyRows =
       properties.items?.filter((item) => item.label || item.value) ?? [];
-    const duplicateLabels = itemsWithoutEmptyRows.find((item1, index1) =>
-      properties.items?.find((item2, index2) => item1.label === item2.label && index1 !== index2),
+    const duplicateLabels = itemsWithoutEmptyRows.some(
+      (item1, index1) =>
+        item1.label &&
+        itemsWithoutEmptyRows.some(
+          (item2, index2) => item1.label === item2.label && index1 !== index2,
+        ),
     );
-    const duplicateValues = itemsWithoutEmptyRows.find((item1, index1) =>
-      properties.items?.find((item2, index2) => item1.value === item2.value && index1 !== index2),
+    const duplicateValues = itemsWithoutEmptyRows.some((item1, index1) =>
+      itemsWithoutEmptyRows.some(
+        (item2, index2) => item1.value === item2.value && index1 !== index2,
+      ),
     );
     const noMissingValues = itemsWithoutEmptyRows.every((item) => item.value);
 

diff --git a/...c/pages/connectionTypes/manage/advanced/__tests__/DropdownAdvancedPropertiesForm.spec.tsx b/...c/pages/connectionTypes/manage/advanced/__tests__/DropdownAdvancedPropertiesForm.spec.tsx
@@ -201,4 +201,24 @@ describe('DropdownFieldAdvancedPropertiesForm', () => {
     expect(screen.getByText('a already exists.')).toBeVisible();
     expect(screen.getByText('b already exists.')).toBeVisible();
   });
+
+  it('should validate to true with empty rows', async () => {
+    render(
+      <DropdownAdvancedPropertiesForm
+        properties={{
+          variant: 'single',
+          items: [
+            { label: '', value: 'v1' },
+            { label: '', value: '' },
+            { label: '', value: 'v2' },
+          ],
+        }}
+        field={field}
+        onChange={onChange}
+        onValidate={onValidate}
+      />,
+    );
+
+    expect(onValidate).toHaveBeenCalledWith(true);
+  });
 });