@dative-gpi/foundation-core-components 0.0.69 → 0.0.70

package/components/lists/FSDataTable.vue

@@ -28,8 +28,8 @@
 import { defineComponent, onMounted, onUnmounted, ref, Ref, watch } from "vue";
 import { useRouter } from "vue-router";
 
+import { useUserOrganisationTable, useUpdateUserOrganisationTable } from "@dative-gpi/foundation-core-services/composables";
 import { FSDataTableColumn, FSDataTableFilter, FSDataTableOrder } from "@dative-gpi/foundation-shared-components/models";
-import { useTable, useUpdateTable } from "@dative-gpi/foundation-core-services/composables";
 import { useDebounce } from "@dative-gpi/foundation-shared-components/composables";
 
 import FSLoadDataTable from "@dative-gpi/foundation-shared-components/components/lists/FSLoadDataTable.vue";
@@ -48,9 +48,9 @@ export default defineComponent({
     }
   },
   setup(props) {
-    const { get, getting, entity } = useTable();
+    const { get, getting, entity } = useUserOrganisationTable();
+    const { update } = useUpdateUserOrganisationTable();
     const { debounce, cancel } = useDebounce();
-    const { update } = useUpdateTable();
     const router = useRouter();
 
     const innerHeaders: Ref<FSDataTableColumn[]> = ref([]);
@@ -65,7 +65,10 @@ export default defineComponent({
         const query = JSON.parse(router.currentRoute.value.query[props.tableCode] as string);
         innerHeaders.value = query.columns;
         innerRowsPerPage.value = query.rowsPerPage;
-        innerSortBy.value = query.sortBy;
+        innerSortBy.value = query.sortByKey ? {
+          key: query.sortByKey,
+          order: query.sortByOrder
+        } : null;
         innerMode.value = query.mode;
         innerFilters.value = query.filters;
         innerPage.value = query.page;
@@ -73,7 +76,10 @@ export default defineComponent({
       else {
         innerHeaders.value = entity.value.columns;
         innerRowsPerPage.value = entity.value.rowsPerPage;
-        innerSortBy.value = entity.value.sortBy;
+        innerSortBy.value = entity.value.sortByKey ? {
+          key: entity.value.sortByKey,
+          order: entity.value.sortByOrder
+        } : null;
         innerMode.value = entity.value.mode;
       }
     };
@@ -117,7 +123,8 @@ export default defineComponent({
           index: column.index
         })),
         rowsPerPage: innerRowsPerPage.value,
-        sortBy: innerSortBy.value,
+        sortByKey: innerSortBy.value?.key,
+        sortByOrder: innerSortBy.value?.order,
         mode: innerMode.value
       });
     };
@@ -130,7 +137,8 @@ export default defineComponent({
             [props.tableCode]: JSON.stringify({
               columns: innerHeaders.value,
               rowsPerPage: innerRowsPerPage.value,
-              sortBy: innerSortBy.value,
+              sortByKey: innerSortBy.value?.key,
+              sortByOrder: innerSortBy.value?.order,
               mode: innerMode.value,
               filters: innerFilters.value,
               page: innerPage.value

package/components/tiles/FSUserOrganisationTile.vue

@@ -0,0 +1,80 @@
+<template>
+    <FSLoadTile
+      v-if="getting"
+      :editable="$props.editable"
+      :modelValue="modelValue"
+      @update:modelValue="(value) => $emit('update:modelValue', value)"
+    />
+    <FSGroupTileUI
+      v-else-if="entity"
+      :imageId="entity.imageId"
+      :name="name"
+      :roleLabel="entity.roleLabel"
+      :roleIcon="entity.roleIcon"
+      :editable="$props.editable"
+      :modelValue="modelValue"
+      @update:modelValue="(value) => $emit('update:modelValue', value)"
+      v-bind="$attrs"
+    />
+  </template>
+  
+<script lang="ts">
+import { computed, defineComponent, onMounted, watch } from "vue";
+  
+import { useUserOrganisation } from "@dative-gpi/foundation-core-services/composables";
+  
+import FSUserOrganisationTileUI from "@dative-gpi/foundation-shared-components/components/tiles/FSUserOrganisationTileUI.vue";
+import FSLoadTile from "@dative-gpi/foundation-shared-components/components/tiles/FSLoadTile.vue";
+import { UserType } from "@dative-gpi/foundation-core-domain/models";
+  
+export default defineComponent({
+  name: "FSUserOrganisationTile",
+  components: {
+    FSUserOrganisationTileUI,
+    FSLoadTile
+  },
+  props: {
+    userOrganisationId: {
+      type: String,
+      required: true
+    },
+    modelValue: {
+      type: Boolean,
+      required: false,
+      default: false
+    },
+    editable: {
+      type: Boolean,
+      required: false,
+      default: true
+    }
+  },
+  setup(props) {
+    const { get, getting, entity } = useUserOrganisation();
+
+    const name = computed((): string => {
+      if (entity.value) {
+        switch (entity.value.userType) {
+          case UserType.User: return entity.value.name;
+          default: return entity.value.label;
+        }
+      }
+      return "";
+    });
+
+    onMounted(() => {
+      get(props.userOrganisationId);
+    });
+
+    watch(() => props.userOrganisationId, () => {
+      get(props.userOrganisationId);
+    });
+
+    return {
+      getting,
+      entity,
+      name
+    };
+  }
+});
+</script>

package/package.json

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