Seek and destroy null values hiding in config

RobinsonZ · Dec 5, 2023 · 97f951e · 97f951e
1 parent b3961e8
commit 97f951e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 22 deletions.
diff --git a/src/renderer/src/components/SlateImporter.tsx b/src/renderer/src/components/SlateImporter.tsx
@@ -184,26 +184,6 @@ export default function SlateImporter() {
           )}
         </Droppable>
       )}
-{/* 
-      {createNote && (
-        <Droppable droppableId={"_IMPORTER"} isDropDisabled={true}>
-          {(provided, snapshot) => (
-            <div ref={provided.innerRef} {...provided.droppableProps}>
-              <>
-                <SlateCard
-                  id={uuidv4()}
-                  columnId="_IMPORTER"
-                  index={index++}
-                  type="note"
-                  text="default text"
-                  allowEdit={createNote}
-                />
-              </>
-              {provided.placeholder}
-            </div>
-          )}
-        </Droppable>
-      )} */}
     </>
   );
 }
diff --git a/src/renderer/src/context/context.tsx b/src/renderer/src/context/context.tsx
@@ -176,14 +176,21 @@ export const SlateDataContext = createContext<FileDatabase>({
   importerFiles: [],
 });
 
+function scrubNulls(cols: SlateColumn[]) {
+  return cols.filter(c => c !== null).map(c => {
+    c.cards = c.cards.filter(card => card !== null);
+    return c
+  })
+}
+
 export function SlateDataProvider(props: PropsWithChildren) {
   const { children } = props;
   const KEY = "slate_cols";
 
   const [data, dispatch] = useImmerReducer<FileDatabase, SlateAction>(
     slateDataReducer,
     {
-      columns: window.electronStore.get(KEY) || [],
+      columns: scrubNulls(window.electronStore.get(KEY) || []),
       importerFiles: [],
     }
   );
@@ -194,7 +201,7 @@ export function SlateDataProvider(props: PropsWithChildren) {
         if (newValue[KEY]) {
           dispatch({
             type: "set_columns",
-            newColumns: newValue[KEY] as SlateColumn[],
+            newColumns: scrubNulls(newValue[KEY] as SlateColumn[]),
           });
         }
       }