Merge branch 'issue126'

Author: RafaelGB

src/DatabaseView.tsx

@@ -192,6 +192,7 @@ export class DatabaseView extends TextFileView implements HoverParent {
   destroy() {
     LOGGER.info(`=>destroy ${this.file.path}`);
     // Remove draggables from render, as the DOM has already detached
+    this.getStateManager().unregisterView(this);
     this.plugin.removeView(this);
     this.tableContainer.remove();
     LOGGER.info(`<=destroy ${this.file.path}`);

src/StateManager.ts

@@ -19,10 +19,10 @@ export default class StateManager {
   }
 
   registerView(view: DatabaseView) {
-    this.viewSet.clear();
-    this.viewSet.add(view);
-    view.initDatabase();
-
+    if (!this.viewSet.has(view)) {
+      this.viewSet.add(view);
+      view.initDatabase();
+    }
   }
 
   unregisterView(view: DatabaseView) {

src/cdm/TableStateInterface.ts

@@ -24,7 +24,7 @@ export interface ConfigState {
     filters: FilterSettings;
     global: GlobalSettings;
     actions: {
-        alterFilters: (filters: Partial<FilterSettings>) => void;
+        alterFilters: (filters: Partial<FilterSettings>) => Promise<void>;
         alterConfig: (config: Partial<LocalSettings>) => void;
     }
     info: {

src/components/portals/DataviewFiltersPortal.tsx

@@ -22,10 +22,11 @@ import MenuUpIcon from "components/img/MenuUpIcon";
 const DataviewFiltersPortal = (props: DataviewFiltersProps) => {
   const { table } = props;
   const { tableState, view } = table.options.meta;
-  const [ddbbConfig, filters, configActions] = tableState.configState(
-    (state) => [state.ddbbConfig, state.filters, state.actions]
-  );
-
+  const [ddbbConfig, configActions] = tableState.configState((state) => [
+    state.ddbbConfig,
+    state.actions,
+  ]);
+  const filters = tableState.configState((state) => state.filters);
   const columns = tableState.columns((state) => state.columns);
   const dataActions = tableState.data((state) => state.actions);
   const [filtersRef, setFiltersRef] = useState(null);

src/main.ts

@@ -93,6 +93,7 @@ export default class DBFolderPlugin extends Plugin {
 
 		this.registerView(DatabaseCore.FRONTMATTER_KEY, (leaf) => new DatabaseView(leaf, this));
 		this.registerEvents();
+		this.registerCommands();
 		this.registerMonkeyPatches();
 		this.addMarkdownPostProcessor();
 		// Mount an empty component to start; views will be added as we go
@@ -417,7 +418,9 @@ export default class DBFolderPlugin extends Plugin {
 			})
 		);
 	}
-
+	registerCommands() {
+		// TODO - add command to create a new database
+	}
 	/**
 	   * Displays a transcluded .excalidraw image in markdown preview mode
 	   */

src/stateManagement/useConfigStore.ts

@@ -12,11 +12,12 @@ const useConfigStore = (view: DatabaseView) => {
             filters: filters,
             global: global_settings,
             actions: {
-                alterFilters: (partialFilters: Partial<FilterSettings>) =>
+                alterFilters: async (partialFilters: Partial<FilterSettings>) => {
+                    await view.diskConfig.updateFilters(partialFilters);
                     set((state) => {
-                        view.diskConfig.updateFilters(partialFilters);
                         return ({ filters: { ...state.filters, ...partialFilters } });
-                    }),
+                    })
+                },
                 alterConfig: (alteredConfig: Partial<LocalSettings>) =>
                     set((state) => {
                         view.diskConfig.updateConfig(alteredConfig);