@dative-gpi/foundation-core-components 0.0.189 → 0.0.190

package/components/autocompletes/FSAutocompleteLocation.vue

@@ -53,8 +53,8 @@ import type { PropType } from "vue";
 import { computed, defineComponent } from "vue";
 
 import { useAutocomplete } from "@dative-gpi/foundation-shared-components/composables";
-import { useLocations } from "@dative-gpi/foundation-core-services/composables";
-import type { LocationFilters } from "@dative-gpi/foundation-core-domain/models";
+import { useLocations } from "@dative-gpi/foundation-shared-services/composables";
+import type { LocationFilters } from "@dative-gpi/foundation-shared-domain/models";
 
 import FSAutocompleteField from "@dative-gpi/foundation-shared-components/components/fields/FSAutocompleteField.vue";
 import FSIcon from "@dative-gpi/foundation-shared-components/components/FSIcon.vue";

package/components/lists/FSDataTable.vue

@@ -25,12 +25,10 @@
 </template>
 
 <script lang="ts">
-import type { PropType} from "vue";
-import { computed, defineComponent, onUnmounted, ref, watch } from "vue";
+import { computed, defineComponent, onUnmounted, type PropType, watch } from "vue";
 
-import { useUserOrganisationTable, useUpdateUserOrganisationTable } from "@dative-gpi/foundation-core-services/composables";
+import { useUserOrganisationTable, useUpdateUserOrganisationTable, useDataTables } from "@dative-gpi/foundation-core-services/composables";
 import { useDebounce, useTables } from "@dative-gpi/foundation-shared-components/composables";
-import type { FSDataTable } from "@dative-gpi/foundation-shared-components/models";
 
 import FSLoadDataTable from "@dative-gpi/foundation-shared-components/components/lists/FSLoadDataTable.vue";
 import FSDataTableUI from "@dative-gpi/foundation-shared-components/components/lists/FSDataTableUI.vue";
@@ -63,87 +61,38 @@ export default defineComponent({
     }
   },
   setup(props) {
-    const { get: getUserOrganisationTable, getting: gettingUserOrganisationTable, entity: userOrganisationTable } = useUserOrganisationTable();
+    const { get: getUserOrganisationTable, getting: gettingUserOrganisationTable } = useUserOrganisationTable();
+    const { initialized, table, updateTable, computeTable, onTableCodeChange } = useDataTables();
     const { update: updateUserOrganisationTable } = useUpdateUserOrganisationTable();
     const { getTable, setTable } = useTables();
     const { debounce, cancel } = useDebounce();
 
-    const initialized = ref(false);
-
-    const table = ref<FSDataTable>({
-      headers: [],
-      mode: "table",
-      sortBy: null,
-      rowsPerPage: 10,
-      filters: {},
-      page: 1
-    });
-
-    const computedTable = computed(() => ({
-      ...table.value,
-      headers: table.value.headers.map(header => ({
-        ...header,
-        sort: header.value && props.customSorts[header.value] || null,
-        sortRaw: header.value && props.customSortRaws[header.value] || null 
-      }))
-    }));
-
-    const updateTable = (): void => {
-      if (table.value) {
-        setTable(props.tableCode, table.value);
-        updateUserOrganisationTable(props.tableCode, {
-          columns: table.value.headers.map(column => ({
-            columnId: column.columnId,
-            hidden: column.hidden,
-            index: column.index
-          })),
-          rowsPerPage: table.value.rowsPerPage,
-          sortByKey: table.value.sortBy?.key ?? null,
-          sortByOrder: table.value.sortBy?.order ?? null,
-          mode: table.value.mode
-        });
-      }
-    };
+    const computedTable = computed(() => computeTable(props.customSorts, props.customSortRaws));
 
     onUnmounted(() => {
       cancel();
-      updateTable();
+      update();
     });
 
+    const update = () => {
+      updateTable(
+        updateUserOrganisationTable,
+        setTable,
+        props.tableCode
+      );
+    }
+
     watch(() => props.tableCode, async (): Promise<void> => {
-      if (props.tableCode) {
-        const composableTable = getTable(props.tableCode);
-        if (composableTable) {
-          table.value = composableTable;
-        }
-        else {
-          try {
-            await getUserOrganisationTable(props.tableCode);
-          }
-          catch {
-            // Do nothing
-          }
-          if (userOrganisationTable.value) {
-            table.value = {
-              headers: userOrganisationTable.value.columns,
-              sortBy: {
-                key: userOrganisationTable.value.sortByKey,
-                order: userOrganisationTable.value.sortByOrder
-              },
-              mode: userOrganisationTable.value.mode,
-              rowsPerPage: userOrganisationTable.value.rowsPerPage,
-              filters: {},
-              page: 1
-            }
-          }
-        }
-      }
-      initialized.value = true;
+      onTableCodeChange(
+        getUserOrganisationTable,
+        getTable,
+        props.tableCode
+      );
     }, { immediate: true });
 
     watch(() => table.value, () => {
       if (table.value && initialized.value) {
-        debounce(updateTable, props.debounceTime);
+        debounce(update, props.debounceTime);
       }
     }, { deep: true });
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@dative-gpi/foundation-core-components",
   "sideEffects": false,
-  "version": "0.0.189",
+  "version": "0.0.190",
   "description": "",
   "publishConfig": {
     "access": "public"
@@ -10,11 +10,11 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@dative-gpi/foundation-core-domain": "0.0.189",
-    "@dative-gpi/foundation-core-services": "0.0.189",
-    "@dative-gpi/foundation-shared-components": "0.0.189",
-    "@dative-gpi/foundation-shared-domain": "0.0.189",
-    "@dative-gpi/foundation-shared-services": "0.0.189"
+    "@dative-gpi/foundation-core-domain": "0.0.190",
+    "@dative-gpi/foundation-core-services": "0.0.190",
+    "@dative-gpi/foundation-shared-components": "0.0.190",
+    "@dative-gpi/foundation-shared-domain": "0.0.190",
+    "@dative-gpi/foundation-shared-services": "0.0.190"
   },
   "peerDependencies": {
     "@dative-gpi/bones-ui": "^0.0.75",
@@ -26,5 +26,5 @@
     "sass": "1.71.1",
     "sass-loader": "13.3.2"
   },
-  "gitHead": "ba53009e38ffce4d79563a89b19312c5544ef6fa"
+  "gitHead": "226125292c2f5ed27334b3bdee88b1877a9d9d6a"
 }