@dative-gpi/foundation-core-components 0.0.119 → 0.0.121

package/components/lists/FSDataTable.vue

@@ -4,12 +4,12 @@
   />
   <FSDataTableUI
     v-else
-    :headers="innerHeaders"
-    :mode="innerMode"
-    :sortBy="innerSortBy"
-    :rowsPerPage="innerRowsPerPage"
-    :filters="innerFilters"
-    :page="innerPage"
+    :headers="table.headers"
+    :mode="table.mode"
+    :sortBy="table.sortBy"
+    :rowsPerPage="table.rowsPerPage"
+    :filters="table.filters"
+    :page="table.page"
     @update:headers="updateHeaders"
     @update:mode="updateMode"
     @update:sortBy="updateSortBy"
@@ -31,12 +31,11 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, onUnmounted, ref, Ref, watch } from "vue";
-import { useRouter } from "vue-router";
+import { defineComponent, onUnmounted, ref, watch } from "vue";
 
 import { useUserOrganisationTable, useUpdateUserOrganisationTable } from "@dative-gpi/foundation-core-services/composables";
-import { FSDataTableColumn, FSDataTableFilter, FSDataTableOrder } from "@dative-gpi/foundation-shared-components/models";
-import { useDebounce } from "@dative-gpi/foundation-shared-components/composables";
+import { FSDataTable, FSDataTableColumn, FSDataTableFilter, FSDataTableOrder } from "@dative-gpi/foundation-shared-components/models";
+import { useDebounce, useTables } from "@dative-gpi/foundation-shared-components/composables";
 
 import FSLoadDataTable from "@dative-gpi/foundation-shared-components/components/lists/FSLoadDataTable.vue";
 import FSDataTableUI from "@dative-gpi/foundation-shared-components/components/lists/FSDataTableUI.vue";
@@ -61,108 +60,93 @@ export default defineComponent({
   setup(props) {
     const { get: getUserOrganisationTable, getting: gettingUserOrganisationTable, entity: userOrganisationTable } = useUserOrganisationTable();
     const { update: updateUserOrganisationTable } = useUpdateUserOrganisationTable();
+    const { getTable, setTable } = useTables();
     const { debounce, cancel } = useDebounce();
-    const router = useRouter();
 
-    const innerHeaders: Ref<FSDataTableColumn[]> = ref([]);
-    const innerSortBy: Ref<FSDataTableOrder | null> = ref(null);
-    const innerMode: Ref<"table" | "iterator"> = ref("table");
-    const innerRowsPerPage = ref(10);
-
-    const innerFilters = ref<{ [key: string]: FSDataTableFilter[] }>({});
-    const innerPage = ref(1);
+    const table = ref<FSDataTable | null>({
+      headers: [],
+      mode: "table",
+      sortBy: null,
+      rowsPerPage: 10,
+      filters: {},
+      page: 1
+    });
 
     const reset = (): void => {
-      console.log("reset");
-      if (router && router.currentRoute.value.meta[props.tableCode]) {
-        console.log("tableCode found");
-        console.log(router.currentRoute.value.meta[props.tableCode]);
-
-        const meta = router.currentRoute.value.meta[props.tableCode] as any;
-        innerHeaders.value = meta.columns;
-        innerRowsPerPage.value = meta.rowsPerPage;
-        innerSortBy.value = meta.sortBy;
-        innerMode.value = meta.mode;
-        
-        innerFilters.value = meta.filters;
-        innerPage.value = meta.page;
+      if (getTable(props.tableCode)) {
+        table.value = getTable(props.tableCode);
       }
       else if (userOrganisationTable.value) {
-        console.log("tableCode not found");
-        console.log(userOrganisationTable.value);
-
-        innerHeaders.value = userOrganisationTable.value.columns;
-        innerRowsPerPage.value = userOrganisationTable.value.rowsPerPage;
-        if (userOrganisationTable.value.sortByKey && userOrganisationTable.value.sortByOrder) {
-          innerSortBy.value = {
+        table.value = {
+          headers: userOrganisationTable.value.columns,
+          sortBy: {
             key: userOrganisationTable.value.sortByKey,
             order: userOrganisationTable.value.sortByOrder
-          };
-        }
-        innerMode.value = userOrganisationTable.value.mode;
+          },
+          mode: userOrganisationTable.value.mode,
+          rowsPerPage: userOrganisationTable.value.rowsPerPage,
+          filters: {},
+          page: 1
+        };
       }
     };
 
     const updateHeaders = (value: FSDataTableColumn[]): void => {
-      innerHeaders.value = value;
-      debounce(updateTable, props.debounceTime);
+      if (table.value) {
+        table.value.headers = value;
+        debounce(updateTable, props.debounceTime);
+      }
     };
 
     const updateMode = (value: "table" | "iterator"): void => {
-      innerMode.value = value;
-      debounce(updateTable, props.debounceTime);
+      if (table.value) {
+        table.value.mode = value;
+        debounce(updateTable, props.debounceTime);
+      }
     };
 
     const updateSortBy = (value: FSDataTableOrder | null): void => {
-      innerSortBy.value = value;
-      debounce(updateTable, props.debounceTime);
+      if (table.value) {
+        table.value.sortBy = value;
+        debounce(updateTable, props.debounceTime);
+      }
     };
 
     const updateRowsPerPage = (value: -1 | 10 | 30): void => {
-      innerRowsPerPage.value = value;
-      debounce(updateTable, props.debounceTime);
+      if (table.value) {
+        table.value.rowsPerPage = value;
+        debounce(updateTable, props.debounceTime);
+      }
     };
 
     const updateFilters = (value: { [key: string]: FSDataTableFilter[] }): void => {
-      innerFilters.value = value;
-      updateRouter();
+      if (table.value) {
+        table.value.filters = value;
+        setTable(props.tableCode, table.value);
+      }
     };
 
     const updatePage = (value: number): void => {
-      innerPage.value = value;
-      updateRouter();
+      if (table.value) {
+        table.value.page = value;
+        setTable(props.tableCode, table.value);
+      }
     };
 
     const updateTable = (): void => {
-      updateRouter();
-      updateUserOrganisationTable(props.tableCode, {
-        columns: innerHeaders.value.map(column => ({
-          columnId: column.columnId,
-          hidden: column.hidden,
-          index: column.index
-        })),
-        rowsPerPage: innerRowsPerPage.value,
-        sortByKey: innerSortBy.value?.key ?? null,
-        sortByOrder: innerSortBy.value?.order ?? null,
-        mode: innerMode.value
-      });
-    };
-
-    const updateRouter = (): void => {
-      console.log("updateRouter");
-      if (router) {
-        router.currentRoute.value.meta = {
-          ...router.currentRoute.value.meta,
-          [props.tableCode]: {
-            columns: innerHeaders.value,
-            filters: innerFilters.value,
-            rowsPerPage: innerRowsPerPage.value,
-            sortBy: innerSortBy.value,
-            mode: innerMode.value,
-            page: innerPage.value
-          }
-        };
-        console.log(router.currentRoute.value.meta[props.tableCode]);
+      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
+        });
       }
     };
 
@@ -183,12 +167,7 @@ export default defineComponent({
 
     return {
       gettingUserOrganisationTable,
-      innerRowsPerPage,
-      innerFilters,
-      innerHeaders,
-      innerSortBy,
-      innerMode,
-      innerPage,
+      table,
       updateRowsPerPage,
       updateFilters,
       updateHeaders,

package/components/tiles/FSDashboardOrganisationTile.vue

@@ -7,11 +7,12 @@
   />
   <FSDashboardOrganisationTileUI
     v-else-if="entity"
-    :label="entity.label"
     :code="entity.code"
-    :bottomColor="entity.colors"
     :icon="entity.icon"
+    :label="entity.label"
+    :imageId="entity.imageId"
     :editable="$props.editable"
+    :bottomColor="entity.colors"
     :modelValue="$props.modelValue"
     @update:modelValue="(value) => $emit('update:modelValue', value)"
     v-bind="$attrs"

package/components/tiles/FSDashboardOrganisationTypeTile.vue

@@ -7,11 +7,12 @@
   />
   <FSDashboardOrganisationTypeTileUI
     v-else-if="entity"
-    :label="entity.label"
     :code="entity.code"
-    :bottomColor="entity.colors"
     :icon="entity.icon"
+    :label="entity.label"
+    :imageId="entity.imageId"
     :editable="$props.editable"
+    :bottomColor="entity.colors"
     :modelValue="$props.modelValue"
     @update:modelValue="(value) => $emit('update:modelValue', value)"
     v-bind="$attrs"

package/components/tiles/FSDashboardShallowTile.vue

@@ -7,11 +7,12 @@
   />
   <FSDashboardShallowTileUI
     v-else-if="entity"
-    :label="entity.label"
-    :code="entity.code"
-    :bottomColor="entity.colors"
     :icon="entity.icon"
+    :code="entity.code"
+    :label="entity.label"
+    :imageId="entity.imageId"
     :editable="$props.editable"
+    :bottomColor="entity.colors"
     :modelValue="$props.modelValue"
     @update:modelValue="(value) => $emit('update:modelValue', value)"
     v-bind="$attrs"

package/components/tiles/FSFolderTile.vue

@@ -11,6 +11,7 @@
     :code="entity.code"
     :bottomColor="entity.colors"
     :icon="entity.icon"
+    :imageId="entity.imageId"
     :editable="$props.editable"
     :modelValue="$props.modelValue"
     @update:modelValue="(value) => $emit('update:modelValue', value)"

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@dative-gpi/foundation-core-components",
   "sideEffects": false,
-  "version": "0.0.119",
+  "version": "0.0.121",
   "description": "",
   "publishConfig": {
     "access": "public"
@@ -10,11 +10,11 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@dative-gpi/foundation-core-domain": "0.0.119",
-    "@dative-gpi/foundation-core-services": "0.0.119",
-    "@dative-gpi/foundation-shared-components": "0.0.119",
-    "@dative-gpi/foundation-shared-domain": "0.0.119",
-    "@dative-gpi/foundation-shared-services": "0.0.119",
+    "@dative-gpi/foundation-core-domain": "0.0.121",
+    "@dative-gpi/foundation-core-services": "0.0.121",
+    "@dative-gpi/foundation-shared-components": "0.0.121",
+    "@dative-gpi/foundation-shared-domain": "0.0.121",
+    "@dative-gpi/foundation-shared-services": "0.0.121",
     "color": "^4.2.3",
     "vue": "^3.4.23",
     "vuedraggable": "^4.1.0"
@@ -24,5 +24,5 @@
     "sass": "^1.69.5",
     "sass-loader": "^13.3.2"
   },
-  "gitHead": "f23ab1e0c8f72006dbf52bb826add56337f4da9b"
+  "gitHead": "305cafbeb6046ce65f2b4917b319f4d36ebbcf00"
 }