@dative-gpi/foundation-core-components 1.1.9 → 1.1.11

package/components/entities/FSEntityField.vue

@@ -41,7 +41,7 @@ import { defineComponent, ref, type PropType, computed } from "vue";
 
 import { EntityType } from "@dative-gpi/foundation-shared-domain/enums";
 
-import type { DashboardOrganisationFilters, DashboardOrganisationTypeFilters, DeviceOrganisationFilters, FolderFilters, GroupFilters, LocationFilters, ModelFilters, UserOrganisationFilters } from "@dative-gpi/foundation-core-domain/models";
+import type { DashboardOrganisationFilters, DashboardOrganisationTypeFilters, DashboardShallowFilters, DeviceOrganisationFilters, FolderFilters, GroupFilters, GroupingFilters, LocationFilters, ModelFilters, SubgroupingFilters, UserOrganisationFilters } from "@dative-gpi/foundation-core-domain/models";
 
 import FSEntityFieldUI from "@dative-gpi/foundation-shared-components/components/fields/FSEntityFieldUI.vue";
 
@@ -141,7 +141,7 @@ export default defineComponent({
             dashboardOrganisationsIds: props.modelValue,
             dashboardOrganisationTypesIds: props.modelValue,
             dashboardShallowsIds: props.modelValue
-          } satisfies DashboardOrganisationFilters & DashboardOrganisationTypeFilters;
+          } satisfies DashboardOrganisationFilters & DashboardOrganisationTypeFilters & DashboardShallowFilters;
         case EntityType.Group:
           return {
             groupsIds: props.modelValue
@@ -162,6 +162,14 @@ export default defineComponent({
           return {
             modelsIds: props.modelValue
           } satisfies ModelFilters;
+        case EntityType.Grouping:
+          return {
+            groupingsIds: props.modelValue
+          } satisfies GroupingFilters;
+        case EntityType.Subgrouping:
+          return {
+            subgroupingsIds: props.modelValue
+          } satisfies SubgroupingFilters;
         default:
           return undefined;
       };

package/components/entities/FSSelectEntitiesList.vue

@@ -223,7 +223,7 @@ export default defineComponent({
           };
         case EntityType.Grouping:
           return {
-            groupingsFilters: props.filters,
+            groupingFilters: props.filters,
             ...attrs
           };
         case EntityType.Subgrouping:

package/components/entities/FSSimpleEntitiesList.vue

@@ -43,10 +43,10 @@ export default defineComponent({
           return defineAsyncComponent(() => import("../lists/locations/FSSimpleLocationsList.vue"));
         case EntityType.Model:
           return defineAsyncComponent(() => import("../lists/models/FSSimpleModelsList.vue"));
-        case EntityType.Subgrouping:
-          return defineAsyncComponent(() => import("../lists/subgroupings/FSSimpleSubgroupingsList.vue"));
         case EntityType.Grouping:
           return defineAsyncComponent(() => import("../lists/groupings/FSSimpleGroupingsList.vue"));
+        case EntityType.Subgrouping:
+          return defineAsyncComponent(() => import("../lists/subgroupings/FSSimpleSubgroupingsList.vue"));
         default:
           return null;
       };

package/components/lists/groupings/FSBaseGroupingsList.vue

@@ -72,7 +72,7 @@ export default defineComponent({
       type: Function as PropType<(item: GroupingInfos) => Partial<RouteLocation>>,
       required: false
     },
-    groupingsFilters: {
+    groupingFilters: {
       type: Object as PropType<GroupingFilters>,
       required: false,
       default: null
@@ -101,9 +101,9 @@ export default defineComponent({
       return props.modelValue.includes(id);
     };
 
-    watch(() => props.groupingsFilters, (next, previous) => {
+    watch(() => props.groupingFilters, (next, previous) => {
       if ((!next && !previous) || !_.isEqual(next, previous)) {
-        fetchGroupings(props.groupingsFilters);
+        fetchGroupings(props.groupingFilters);
       }
     }, { immediate: true });
 

package/components/lists/userOrganisations/FSBaseUserOrganisationsList.vue

@@ -50,6 +50,13 @@
         :value="item.allowSms"
       />
     </template>
+    <template
+      #item.allowNotifications="{ item }"
+    >
+      <FSIconCheck
+        :value="item.allowNotifications"
+      />
+    </template>
     <template
       #item.tags="{ item }"
     >
@@ -77,6 +84,15 @@
         {{ userTypeLabel(item.userType) }}
       </FSSpan>
     </template>
+    <template
+      #item.lastActivity="{ item }"
+    >
+      <FSSpan
+        font="text-overline"
+      >
+        {{ epochToShortTimeFormat(item.lastActivity) }}
+      </FSSpan>
+    </template>
     <template
       #item.tile="{ index, item, toggleSelect }"
     >
@@ -100,6 +116,7 @@ import _ from "lodash";
 import type { UserOrganisationFilters, UserOrganisationInfos } from "@dative-gpi/foundation-core-domain/models";
 import { userTypeLabel, userValidityLabel } from "@dative-gpi/foundation-core-components/utils";
 import { useUserOrganisations } from "@dative-gpi/foundation-core-services/composables";
+import { useDateFormat } from "@dative-gpi/foundation-shared-services/composables";
 
 import FSDataTable from "../FSDataTable.vue";
 
@@ -149,6 +166,7 @@ export default defineComponent({
   emits: ["update:modelValue"],
   setup(props) {
     const { getMany: fetchUserOrganisations, entities: userOrganisations, fetching: fetchingUserOrganisations } = useUserOrganisations();
+    const { epochToShortTimeFormat } = useDateFormat();
 
     const isSelected = (id: string): boolean => {
       return props.modelValue.includes(id);
@@ -163,6 +181,7 @@ export default defineComponent({
     return {
       fetchingUserOrganisations,
       userOrganisations,
+      epochToShortTimeFormat,
       userValidityLabel,
       userTypeLabel,
       isSelected

package/package.json

@@ -4,7 +4,7 @@
     "url": "https://github.com/Dative-GPI/foundation-shared-ui.git"
   },
   "sideEffects": false,
-  "version": "1.1.9",
+  "version": "1.1.11",
   "description": "",
   "publishConfig": {
     "access": "public"
@@ -13,11 +13,11 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@dative-gpi/foundation-core-domain": "1.1.9",
-    "@dative-gpi/foundation-core-services": "1.1.9",
-    "@dative-gpi/foundation-shared-components": "1.1.9",
-    "@dative-gpi/foundation-shared-domain": "1.1.9",
-    "@dative-gpi/foundation-shared-services": "1.1.9"
+    "@dative-gpi/foundation-core-domain": "1.1.11",
+    "@dative-gpi/foundation-core-services": "1.1.11",
+    "@dative-gpi/foundation-shared-components": "1.1.11",
+    "@dative-gpi/foundation-shared-domain": "1.1.11",
+    "@dative-gpi/foundation-shared-services": "1.1.11"
   },
   "peerDependencies": {
     "@dative-gpi/bones-ui": "^1.0.0",
@@ -29,5 +29,5 @@
     "sass": "1.71.1",
     "sass-loader": "13.3.2"
   },
-  "gitHead": "8038b4a3049af008bc22173c7870de416bce25f1"
+  "gitHead": "88c49955eb1072121652331d9703ca0879d872fe"
 }