track selected objects rather than their IDs

src/devtools/components/main-content/object-store-view/DeleteObjectsButton.tsx

@@ -1,29 +1,25 @@
 import { createMemo, Match, Show, Switch } from "solid-js";
 
 import UnstyledButton from "@/devtools/components/buttons/UnstyledButton";
-import {
-  SelectedObjectID,
-  useTableMutationContext,
-} from "@/devtools/components/main-content/object-store-view/table-mutation-context";
+import { useTableMutationContext } from "@/devtools/components/main-content/object-store-view/table-mutation-context";
 import CloseIcon from "@/devtools/components/svg-icons/CloseIcon";
 import DeleteIcon from "@/devtools/components/svg-icons/DeleteIcon";
 import LoadingIcon from "@/devtools/components/svg-icons/LoadingIcon";
+import { getIndexedDBKey } from "@/devtools/utils/grid-options";
 import {
   DATA_MUTATION_ERROR_MSG,
   generateRequestID,
 } from "@/devtools/utils/inspected-window-helpers";
-import { ActiveObjectStore, DataValue } from "@/devtools/utils/types";
+import { ActiveObjectStore, TableColumn } from "@/devtools/utils/types";
 
 import styles from "./DeleteObjectsButton.module.css";
 
-export default function DeleteObjectsButton(props: {
-  activeStore: ActiveObjectStore;
-}) {
+export default function DeleteObjectsButton(props: DeleteObjectsButtonProps) {
   const { tableMutationStore, setErrorMsg, deleteOperation, deleteData } =
     useTableMutationContext();
-  const canDelete = () => tableMutationStore.selectedObjectIDs.length > 0;
+  const canDelete = () => tableMutationStore.selectedObjects.length > 0;
   const deletionMsg = () => {
-    const count = tableMutationStore.selectedObjectIDs.length;
+    const count = tableMutationStore.selectedObjects.length;
     if (count === 1) {
       return "Are you sure you want to delete the selected object?";
     } else if (count > 1) {
@@ -34,7 +30,9 @@ export default function DeleteObjectsButton(props: {
   };
   const validObjectKeys = createMemo(() => {
     try {
-      return getObjectKeys(tableMutationStore.selectedObjectIDs);
+      return tableMutationStore.selectedObjects.map((obj) =>
+        getIndexedDBKey(props.keypath, props.columns, obj),
+      );
     } catch {
       return [];
     }
@@ -111,21 +109,8 @@ export default function DeleteObjectsButton(props: {
   );
 }
 
-function getObjectKeys(objectIDs: SelectedObjectID[]) {
-  return objectIDs.map((objectID) => {
-    return objectID.map((cell) => {
-      if (
-        cell.datatype !== "string" &&
-        cell.datatype !== "number" &&
-        cell.datatype !== "timestamp" &&
-        cell.datatype !== "json_data" &&
-        cell.datatype !== "date"
-      ) {
-        throw new Error("Invalid key column datatype");
-      }
-      if (cell.value == null) throw new Error("Invalid key column value");
-
-      return { datatype: cell.datatype, value: cell.value } as DataValue;
-    });
-  });
+interface DeleteObjectsButtonProps {
+  activeStore: ActiveObjectStore;
+  keypath: string[];
+  columns: TableColumn[];
 }

src/devtools/components/main-content/object-store-view/Table.tsx

@@ -40,7 +40,6 @@ import { getUnsupportedColdef } from "@/devtools/utils/coldef-unsupported";
 import {
   convertGetterValueToRowDataValue,
   getIndexedDBKey,
-  getSelectedObjectID,
   parseBooleanNull,
   updateRowData,
 } from "@/devtools/utils/grid-options";
@@ -64,7 +63,7 @@ export default function Table(props: TableProps) {
 
   const {
     setErrorMsg,
-    setSelectedObjectIDs,
+    setSelectedObjects,
     updateOperation,
     updateField,
     deleteOperation,
@@ -178,10 +177,7 @@ export default function Table(props: TableProps) {
       },
       onSelectionChanged(params: SelectionChangedEvent) {
         const nodes = params.selectedNodes || [];
-        const selectedObjectIDs = nodes.map((node) => {
-          return getSelectedObjectID(node, props.keypath, props.columns);
-        });
-        setSelectedObjectIDs(selectedObjectIDs);
+        setSelectedObjects(nodes.map((node) => node.data));
       },
       readOnlyEdit: true,
       onCellEditRequest: async (params: CellEditRequestEvent) => {
@@ -263,13 +259,10 @@ export default function Table(props: TableProps) {
     // delete the rows from the table on deletion success in indexedDB
     if (deleteOperation.isSuccess) {
       untrack(() => {
-        const rows = tableMutationStore.selectedObjectIDs.map((row) => {
-          return Object.fromEntries(
-            row.map(({ name, value }) => [name, value]),
-          );
+        gridApi.applyTransaction({
+          remove: tableMutationStore.selectedObjects,
         });
-        gridApi.applyTransaction({ remove: rows });
-        setSelectedObjectIDs([]);
+        setSelectedObjects([]);
         resetDeleteOperation();
       });
     }
@@ -286,7 +279,7 @@ export default function Table(props: TableProps) {
     });
     batch(() => {
       // reset selected rows and error msg on table reload
-      setSelectedObjectIDs([]);
+      setSelectedObjects([]);
       setErrorMsg(null);
     });
   });

src/devtools/components/main-content/object-store-view/TableStateWrapper.tsx

@@ -27,7 +27,11 @@ export default function TableStateWrapper() {
             <TableSettingsWrapper>
               <TableSearch />
               <Show when={data().rows?.length}>
-                <DeleteObjectsButton activeStore={data().activeStore} />
+                <DeleteObjectsButton
+                  activeStore={data().activeStore}
+                  keypath={data().keypath}
+                  columns={data().columns}
+                />
               </Show>
               <AddObjectsButton />
               <TableSettingsButton />

src/devtools/components/main-content/object-store-view/table-mutation-context.tsx

@@ -14,8 +14,7 @@ import {
   DataCreationRequest,
   DataDeletionRequest,
   DataUpdateRequest,
-  TableColumnDatatype,
-  TableColumnValue,
+  TableRow,
 } from "@/devtools/utils/types";
 
 const TableMutationContext = createContext<TableMutationContextType>();
@@ -35,12 +34,12 @@ export function TableMutationContextProvider(props: FlowProps) {
   const [tableMutationStore, setTableMutationStore] =
     createStore<TableMutationStore>({
       errorMsg: null,
-      selectedObjectIDs: [],
+      selectedObjects: [],
     });
   const setErrorMsg = (msg: string | null) =>
     setTableMutationStore("errorMsg", msg);
-  const setSelectedObjectIDs = (selectedObjectIDs: SelectedObjectID[]) => {
-    setTableMutationStore("selectedObjectIDs", selectedObjectIDs);
+  const setSelectedObjects = (selectedObjects: TableRow[]) => {
+    setTableMutationStore("selectedObjects", selectedObjects);
   };
 
   const { mutation: updateOperation, mutate: updateField } =
@@ -78,15 +77,15 @@ export function TableMutationContextProvider(props: FlowProps) {
   const { activeObjectStore } = useActiveObjectStoreContext();
   createEffect(() => {
     activeObjectStore();
-    setTableMutationStore({ errorMsg: null, selectedObjectIDs: [] });
+    setTableMutationStore({ errorMsg: null, selectedObjects: [] });
   });
 
   return (
     <TableMutationContext.Provider
       value={{
         tableMutationStore,
         setErrorMsg,
-        setSelectedObjectIDs,
+        setSelectedObjects,
         updateOperation,
         updateField,
         deleteOperation,
@@ -105,7 +104,7 @@ export function TableMutationContextProvider(props: FlowProps) {
 interface TableMutationContextType {
   tableMutationStore: TableMutationStore;
   setErrorMsg: (msg: string | null) => void;
-  setSelectedObjectIDs: (selectedObjectIDs: SelectedObjectID[]) => void;
+  setSelectedObjects: (selectedObjects: TableRow[]) => void;
   updateOperation: Mutation;
   updateField: (params: DataUpdateRequest) => Promise<void>;
   deleteOperation: Mutation;
@@ -118,11 +117,5 @@ interface TableMutationContextType {
 
 interface TableMutationStore {
   errorMsg: string | null;
-  selectedObjectIDs: SelectedObjectID[];
+  selectedObjects: TableRow[];
 }
-
-export type SelectedObjectID = {
-  name: string;
-  datatype: TableColumnDatatype;
-  value: TableColumnValue;
-}[];

src/devtools/utils/grid-options.ts

@@ -1,6 +1,5 @@
-import { GridApi, IRowNode } from "ag-grid-community";
+import { GridApi } from "ag-grid-community";
 
-import { SelectedObjectID } from "@/devtools/components/main-content/object-store-view/table-mutation-context";
 import {
   DataValue,
   TableColumn,
@@ -97,21 +96,3 @@ export function convertGetterValueToRowDataValue(
     return value;
   }
 }
-
-export function getSelectedObjectID(
-  node: IRowNode,
-  keypath: string[],
-  columns: TableColumn[],
-): SelectedObjectID {
-  const objectID = JSON.parse(node.id!) as TableColumnValue[];
-
-  return objectID.map((value, index) => {
-    const colName = keypath[index];
-    const column = columns.find((col) => col.name === colName);
-    return {
-      value,
-      name: colName,
-      datatype: column!.datatype,
-    };
-  });
-}