Fix resource-array props not removed when input is empty

atomicdata-dev · Jun 25, 2024 · 45b74ec · 45b74ec
1 parent 4bf258f
commit 45b74ec
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 12 deletions.
diff --git a/browser/CHANGELOG.md b/browser/CHANGELOG.md
@@ -13,6 +13,7 @@ This changelog covers all five packages, as they are (for now) updated as a whol
 - [#896](https://github.com/atomicdata-dev/atomic-server/issues/896) Fix an issue where sidebar items require a double tap on iOS.
 - Updated the look & feel of the sidebar a bit.
 - [#893](https://github.com/atomicdata-dev/atomic-server/issues/893) Fix tables not showing any rows when viewing from a different server.
+- Fix an issue where the resource-array properties would be set to an empty array instead of removing the property when removing all items in the input.
 
 ### @tomic/react
 

diff --git a/browser/data-browser/src/components/SideBar/DriveSwitcher.tsx b/browser/data-browser/src/components/SideBar/DriveSwitcher.tsx
@@ -91,7 +91,7 @@ export function DriveSwitcher() {
         disabled: !agent,
       },
     ],
-    [savedDrivesMap, drive, historyMap],
+    [savedDrivesMap, drive, historyMap, agent],
   );
 
   return <DropdownMenu trigger={Trigger} items={items} />;

diff --git a/browser/data-browser/src/components/forms/InputResourceArray.tsx b/browser/data-browser/src/components/forms/InputResourceArray.tsx
@@ -41,14 +41,14 @@ export default function InputResourceArray({
   }
 
   function handleClear() {
-    setArray([]);
+    setArray(undefined);
   }
 
   const handleRemoveRowList = useIndexDependantCallback(
     (index: number) => () => {
       const newArray = [...array];
       newArray.splice(index, 1);
-      setArray(newArray);
+      setArray(newArray.length === 0 ? undefined : newArray);
     },
     array,
     [setArray],

diff --git a/browser/data-browser/src/views/OntologyPage/PropertyDatatypePicker.tsx b/browser/data-browser/src/views/OntologyPage/PropertyDatatypePicker.tsx
@@ -19,6 +19,12 @@ const options = Object.entries(reverseDatatypeMapping)
   }))
   .filter(x => x.value !== 'unknown-datatype');
 
+const isResourceLike = (datatype: string) => {
+  return (
+    datatype === Datatype.ATOMIC_URL || datatype === Datatype.RESOURCEARRAY
+  );
+};
+
 export function PropertyDatatypePicker({
   resource,
   disabled,
@@ -30,12 +36,6 @@ export function PropertyDatatypePicker({
     commit: true,
   });
 
-  const isResourceLike = (datatype: string) => {
-    return (
-      datatype === Datatype.ATOMIC_URL || datatype === Datatype.RESOURCEARRAY
-    );
-  };
-
   const clearInapplicableProps = (datatype: string) => {
     if (!isResourceLike(datatype)) {
       setClassType(undefined);

diff --git a/browser/e2e/tests/filePicker.spec.ts b/browser/e2e/tests/filePicker.spec.ts
@@ -42,8 +42,6 @@ const createModel = async (page: Page) => {
 
   await expect(page.locator(`h1:has-text("${ONTOLOGY_NAME}")`)).toBeVisible();
 
-  page.getByRole('button', { name: 'Edit', exact: true }).click();
-
   await page.getByRole('button', { name: 'Add class', exact: true }).click();
   await page.getByPlaceholder('shortname').fill('robot');
   await page.getByRole('button', { name: 'Save' }).click();

diff --git a/browser/e2e/tests/ontology.spec.ts b/browser/e2e/tests/ontology.spec.ts
@@ -36,7 +36,6 @@ test.describe('Ontology', async () => {
     await page.locator('dialog[open] button:has-text("Create")').click();
     await expect(page.locator(`h1:has-text("${ontologyName}")`)).toBeVisible();
 
-    await page.getByRole('button', { name: 'Edit', exact: true }).click();
     await page
       .getByTestId('markdown-editor')
       .fill('Data model for youtube thumbnail editor');