@dative-gpi/foundation-core-components 1.0.142-alert-filter → 1.0.142-role

package/components/entities/FSEntityField.vue

@@ -139,7 +139,8 @@ export default defineComponent({
         case EntityType.Dashboard:
           return {
             dashboardOrganisationsIds: props.modelValue,
-            dashboardOrganisationTypesIds: props.modelValue
+            dashboardOrganisationTypesIds: props.modelValue,
+            dashboardShallowsIds: props.modelValue
           } satisfies DashboardOrganisationFilters & DashboardOrganisationTypeFilters;
         case EntityType.Group:
           return {

package/components/entities/FSSelectEntitiesList.vue

@@ -114,7 +114,8 @@ export default defineComponent({
         case EntityType.Dashboard:
           return {
             dashboardOrganisationsIds: props.modelValue,
-            dashboardOrganisationTypesIds: props.modelValue
+            dashboardOrganisationTypesIds: props.modelValue,
+            dashboardShallowsIds: props.modelValue
           } satisfies DashboardOrganisationFilters & DashboardOrganisationTypeFilters;
         case EntityType.Group:
           return {

package/components/lists/alerts/FSBaseAlertsList.vue

@@ -318,11 +318,21 @@ export default defineComponent({
 
     watch(() => [props.alertFilters, props.notAcknowledged, props.hidePending], (next, previous) => {
       if (!_.isEqual(next, previous)) {
-        getManyAlerts({
-          ...props.alertFilters,
-          acknowledged: props.notAcknowledged ? false : undefined,
-          statuses: props.hidePending ? [AlertStatus.Unresolved, AlertStatus.Triggered, AlertStatus.Resolved, AlertStatus.Untriggered, AlertStatus.Abandoned] : undefined
-        });
+        if(props.notAcknowledged){
+          getManyAlerts({
+            ...props.alertFilters,
+            acknowledged: false,
+            statuses: [AlertStatus.Unresolved, AlertStatus.Triggered],
+          });
+        }
+        else{
+          getManyAlerts({
+            ...props.alertFilters,
+            statuses: props.hidePending ?
+              [AlertStatus.Unresolved, AlertStatus.Resolved, AlertStatus.Triggered] : props.alertFilters?.statuses
+          }); // TODO, gérer les conditions pour que les alertes s'affichent ici notamment lorsqu'elles sont acquittées
+          // la FilterFactory gère pas ces conditions correctement
+        }
       }
     }, { immediate: true });
 

package/components/lists/dashboards/FSSimpleDashboardsList.vue

@@ -8,10 +8,14 @@
 
 <script lang="ts">
 import { defineComponent, type PropType, watch, computed } from "vue";
+import _ from "lodash";
 
 import type { DashboardOrganisationFilters, DashboardOrganisationTypeFilters } from "@dative-gpi/foundation-core-domain/models";
 import { useDashboardOrganisations, useDashboardOrganisationTypes, useDashboardShallows } from "@dative-gpi/foundation-core-services/composables";
 
+import { DashboardType } from '@dative-gpi/foundation-shared-domain/enums';
+import type { DashboardsListItem } from '@dative-gpi/foundation-core-components/utils';
+
 import FSSimpleList from "@dative-gpi/foundation-shared-components/components/lists/FSSimpleList.vue";
 
 export default defineComponent({
@@ -31,7 +35,7 @@ export default defineComponent({
       default: () => ({})
     },
     dashboardShallowFilters: {
-      type: Object as PropType<DashboardOrganisationTypeFilters>,
+      type: Object as PropType<DashboardShallowFilters>,
       required: false,
       default: () => ({})
     }
@@ -51,8 +55,21 @@ export default defineComponent({
       || fetchingDashboardOrganisationTypes.value
       || fetchingDashboardShallows.value);
     
-    const dashboards = computed(() => {
-      return [...dashboardOrganisations.value, ...dashboardOrganisationTypes.value, ...dashboardShallows.value];
+    const dashboards = computed((): DashboardsListItem[] => {
+      return _.sortBy([
+        ...dashboardOrganisationTypes.value.map(g => ({
+          ...g,
+          dashboardType: DashboardType.OrganisationType
+        })) satisfies DashboardsListItem[],
+        ...dashboardOrganisations.value.map(d => ({
+          ...d,
+          dashboardType: DashboardType.Organisation
+        })) as DashboardsListItem[],
+        ...dashboardShallows.value.map(d => ({
+          ...d,
+          dashboardType: DashboardType.Shallow
+        })) as DashboardsListItem[]
+      ], d => d.label);
     });
 
     const fetch = () => {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@dative-gpi/foundation-core-components",
   "sideEffects": false,
-  "version": "1.0.142-alert-filter",
+  "version": "1.0.142-role",
   "description": "",
   "publishConfig": {
     "access": "public"
@@ -10,11 +10,11 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@dative-gpi/foundation-core-domain": "1.0.142-alert-filter",
-    "@dative-gpi/foundation-core-services": "1.0.142-alert-filter",
-    "@dative-gpi/foundation-shared-components": "1.0.142-alert-filter",
-    "@dative-gpi/foundation-shared-domain": "1.0.142-alert-filter",
-    "@dative-gpi/foundation-shared-services": "1.0.142-alert-filter"
+    "@dative-gpi/foundation-core-domain": "1.0.142-role",
+    "@dative-gpi/foundation-core-services": "1.0.142-role",
+    "@dative-gpi/foundation-shared-components": "1.0.142-role",
+    "@dative-gpi/foundation-shared-domain": "1.0.142-role",
+    "@dative-gpi/foundation-shared-services": "1.0.142-role"
   },
   "peerDependencies": {
     "@dative-gpi/bones-ui": "^1.0.0",
@@ -26,5 +26,5 @@
     "sass": "1.71.1",
     "sass-loader": "13.3.2"
   },
-  "gitHead": "fc7d2bb3d95be32c651fb346d41ab9c662558489"
+  "gitHead": "071352c70ea94f5fc39e1ad8d9c058b9e1da95b9"
 }