@dative-gpi/foundation-core-components 0.0.127 → 0.0.128

package/components/lists/FSDataTable.vue

@@ -33,8 +33,8 @@
 <script lang="ts">
 import { PropType, computed, defineComponent, onUnmounted, ref, watch } from "vue";
 
-import { useUserOrganisationTable, useUpdateUserOrganisationTable } from "@dative-gpi/foundation-core-services/composables";
 import { FSDataTable, FSDataTableColumn, FSDataTableFilter, FSDataTableOrder } from "@dative-gpi/foundation-shared-components/models";
+import { useUserOrganisationTable, useUpdateUserOrganisationTable } from "@dative-gpi/foundation-core-services/composables";
 import { useDebounce, useTables } from "@dative-gpi/foundation-shared-components/composables";
 
 import FSLoadDataTable from "@dative-gpi/foundation-shared-components/components/lists/FSLoadDataTable.vue";
@@ -95,22 +95,26 @@ export default defineComponent({
       })
     });
 
-    const reset = (): void => {
-      if (getTable(props.tableCode)) {
-        table.value = getTable(props.tableCode);
+    const reset = async (): Promise<void> => {
+      const composableTable = getTable(props.tableCode);
+      if (composableTable) {
+        table.value = composableTable;
       }
-      else 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
-        };
+      else {
+        await getUserOrganisationTable(props.tableCode);
+        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
+          };
+        }
       }
     };
 
@@ -180,14 +184,10 @@ export default defineComponent({
 
     watch(() => props.tableCode, () => {
       if (props.tableCode) {
-        getUserOrganisationTable(props.tableCode);
+        reset();
       }
     }, { immediate: true });
 
-    watch(userOrganisationTable, () => {
-      reset();
-    });
-
     return {
       gettingUserOrganisationTable,
       headers,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@dative-gpi/foundation-core-components",
   "sideEffects": false,
-  "version": "0.0.127",
+  "version": "0.0.128",
   "description": "",
   "publishConfig": {
     "access": "public"
@@ -10,11 +10,11 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@dative-gpi/foundation-core-domain": "0.0.127",
-    "@dative-gpi/foundation-core-services": "0.0.127",
-    "@dative-gpi/foundation-shared-components": "0.0.127",
-    "@dative-gpi/foundation-shared-domain": "0.0.127",
-    "@dative-gpi/foundation-shared-services": "0.0.127",
+    "@dative-gpi/foundation-core-domain": "0.0.128",
+    "@dative-gpi/foundation-core-services": "0.0.128",
+    "@dative-gpi/foundation-shared-components": "0.0.128",
+    "@dative-gpi/foundation-shared-domain": "0.0.128",
+    "@dative-gpi/foundation-shared-services": "0.0.128",
     "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": "464227e786eb9133fbbbc22a4309bbf0d226612b"
+  "gitHead": "29d087178fe21c8c415df60c4466755789860cbb"
 }

package/utils/users.ts

@@ -19,7 +19,7 @@ export const userTypeIcon = (type: UserType): string => {
   }
 };
 
-export const UserValidityLabel = (validity: UserValidityState): string => {
+export const userValidityLabel = (validity: UserValidityState): string => {
   switch (validity) {
     case UserValidityState.InvitationNotSent: return $tr("ui.user-validity.invitation-not-sent", "Invitation not sent");
     case UserValidityState.InvitationSent:    return $tr("ui.user-validity.invitation-sent", "Invitation sent");