@dative-gpi/foundation-core-components 1.0.54 → 1.0.56

package/components/lists/alerts/FSBaseAlertsList.vue

@@ -2,7 +2,7 @@
   <FSDataTable
     rowGap="6px"
     :rowColor="criticityColor"
-    :itemTo="routerLink"
+    :itemTo="$props.itemTo"
     :items="alertsOrdered"
     :loading="fetchingAlerts"
     :tableCode="$props.tableCode"
@@ -10,6 +10,15 @@
     @update:modelValue="$emit('update:modelValue', $event)"
     v-bind="$attrs"
   >
+    <template
+      v-for="(_, name) in $slots"
+      v-slot:[name]="slotData"
+    >
+      <slot
+        :name="name"
+        v-bind="slotData"
+      />
+    </template>
     <template
       #toolbar
     >
@@ -208,11 +217,10 @@
 
 <script lang="ts">
 import type { PropType} from "vue";
+import type { RouteLocation } from "vue-router";
 import { computed, defineComponent, ref, watch } from "vue";
 import _ from "lodash";
 
-import { useRouter } from "vue-router";
-
 import type { AlertFilters, AlertInfos } from "@dative-gpi/foundation-core-domain/models";
 import { useDateFormat } from "@dative-gpi/foundation-shared-services/composables";
 import { useAlerts } from "@dative-gpi/foundation-core-services/composables";
@@ -271,13 +279,16 @@ export default defineComponent({
     tableCode: {
       type: String,
       required: true
+    },
+    itemTo: {
+      type: Function as PropType<(item: AlertInfos) => Partial<RouteLocation>>,
+      required: false
     }
   },
   emits: ["update:modelValue"],
   setup(props) {
     const { getMany: getManyAlerts, entities: alerts, fetching : fetchingAlerts } = useAlerts();
     const { epochToShortTimeFormat } = useDateFormat();
-    const router = useRouter();
 
     const innerNotTreatedOnly = ref<boolean | undefined>(props.notAcknowledged);
     const innerHidePending = ref<boolean | undefined>(props.hidePending);
@@ -289,10 +300,6 @@ export default defineComponent({
       return AlertTools.criticityColor(row.criticity);
     };
 
-    const routerLink = (item: any) => {
-      router.push({ name: "alert", params: { entityId: item.id } });
-    };
-
     const alertsOrdered = computed(() => {
       const als = [...alerts.value]
       return  als.sort((a: AlertInfos, b: AlertInfos) => {
@@ -334,8 +341,7 @@ export default defineComponent({
       endDate,
       innerHidePending,
       epochToShortTimeFormat,
-      criticityColor,
-      routerLink
+      criticityColor
     };
   }
 });

package/components/lists/dashboardOrganisationTypes/FSBaseDashboardOrganisationTypesList.vue

@@ -0,0 +1,164 @@
+<template>
+  <FSDataTable
+    :items="dashboardOrganisationTypes"
+    :itemTo="$props.itemTo"
+    :tableCode="$props.tableCode"
+    :modelValue="$props.modelValue"
+    @update:modelValue="$emit('update:modelValue', $event)"
+    v-bind="$attrs"
+  >
+    <template
+      v-for="(_, name) in $slots"
+      v-slot:[name]="slotData"
+    >
+      <slot
+        :name="name"
+        v-bind="slotData"
+      />
+    </template>
+    <template
+      #item.main="{ item }"
+    >
+      <FSRow>
+        <FSIcon
+          v-if="item.id === organisationMainDashboardId"
+        >
+          mdi-account-group-outline
+        </FSIcon>
+        <FSIcon
+          v-if="item.id === userOrganisationMainDashboardId"
+        >
+          mdi-home
+        </FSIcon>
+      </FSRow>
+    </template>
+    <template
+      #item.icon="{ item }"
+    >
+      <FSIcon>
+        {{ item.icon }}
+      </FSIcon>
+    </template>
+    <template
+      #item.organisationTypeLabel="{ item }"
+    >
+      <FSText
+        v-if="item.organisationTypeId"
+        :label="item.organisationTypeLabel"
+      />
+      <FSChip
+        v-else
+        variant="standard"
+        :label="$tr('ui.common.all', 'All')"
+      />
+    </template>
+    <template
+      #item.tile="{ item, toggleSelect }"
+    >
+      <FSDashboardOrganisationTypeTileUI
+        :bottomColor="item.colors"
+        :to="$props.itemTo && $props.itemTo(item)"
+        :modelValue="isSelected(item.id)"
+        @update:modelValue="toggleSelect(item)"
+        v-bind="item"
+      />
+    </template>
+  </FSDataTable>
+</template>
+
+<script lang="ts">
+import type { PropType} from "vue";
+import type { RouteLocation } from "vue-router";
+import { computed, defineComponent, onMounted, watch } from "vue";
+import _ from "lodash";
+
+import { useAppOrganisationId, useCurrentUserOrganisation, useDashboardOrganisationTypes } from "@dative-gpi/foundation-core-services/composables";
+import type { DashboardOrganisationTypeFilters, DashboardOrganisationTypeInfos } from "@dative-gpi/foundation-core-domain/models";
+import { useOrganisation } from "@dative-gpi/foundation-shared-services/composables";
+
+import FSDataTable from "../FSDataTable.vue";
+import FSIcon from "@dative-gpi/foundation-shared-components/components/FSIcon.vue";
+import FSRow from "@dative-gpi/foundation-shared-components/components/FSRow.vue";
+import FSText from "@dative-gpi/foundation-shared-components/components/FSText.vue";
+import FSChip from "@dative-gpi/foundation-shared-components/components/FSChip.vue";
+import FSDashboardOrganisationTypeTileUI from "@dative-gpi/foundation-shared-components/components/tiles/FSDashboardOrganisationTypeTileUI.vue";
+
+export default defineComponent({
+  name: "FSBaseDashboardOrganisationTypesList",
+  components: {
+    FSDataTable,
+    FSIcon,
+    FSRow,
+    FSText,
+    FSChip,
+    FSDashboardOrganisationTypeTileUI
+  },
+  props: {
+    dashboardOrganisationTypeFilters: {
+      type: Object as PropType<DashboardOrganisationTypeFilters>,
+      default: undefined,
+      required: false
+    },
+    itemTo: {
+      type: Function as PropType<(item: DashboardOrganisationTypeInfos) => Partial<RouteLocation>>,
+      required: false
+    },
+    modelValue: {
+      type: Array as PropType<string[]>,
+      required: false,
+      default: () => []
+    },
+    tableCode: {
+      type: String,
+      required: true
+    },
+  },
+  setup(props) {
+    const { getMany: getDashboardOrganisationTypes, entities: dashboardOrganisationTypes } = useDashboardOrganisationTypes();
+    const { fetch: fetchUserOrganisation, entity: userOrganisation } = useCurrentUserOrganisation();
+    const { get: fetchOrganisation, entity: organisation } = useOrganisation();
+    const { organisationId } = useAppOrganisationId();
+
+    const userOrganisationMainDashboardId = computed((): string | null => {
+      if (userOrganisation.value) {
+        return userOrganisation.value.mainDashboardId;
+      }
+      return null;
+    });
+
+    const organisationMainDashboardId = computed((): string | null => {
+      if (organisation.value) {
+        return organisation.value.mainDashboardId;
+      }
+      return null;
+    });
+  
+    const isSelected = (id: string): boolean => {
+      return props.modelValue.includes(id);
+    };
+
+    onMounted(() => {
+      fetchUserOrganisation();
+    });
+
+    watch(organisationId, () => {
+      if (organisationId.value) {
+        fetchOrganisation(organisationId.value);
+      }
+    }, { immediate: true });
+
+    watch(() => props.dashboardOrganisationTypeFilters, (next, previous) => {
+      if ((!next && !previous) || !_.isEqual(next, previous)) {
+        getDashboardOrganisationTypes(props.dashboardOrganisationTypeFilters);
+      }
+    }, { immediate: true });
+
+    return {
+      userOrganisationMainDashboardId,
+      organisationMainDashboardId,
+      dashboardOrganisationTypes,
+      isSelected,
+    };
+  }
+});
+</script>

package/components/lists/dashboards/FSBaseDashboardsList.vue

@@ -123,7 +123,12 @@ export default defineComponent({
     tableCode: {
       type: String,
       required: true
-    }
+    },
+    modelValue: {
+      type: Array as PropType<string[]>,
+      default: () => [],
+      required: false
+    },
   },
   emits: ["update:modelValue", "update:type"],
   setup(props, { emit }) {
@@ -134,7 +139,7 @@ export default defineComponent({
     const { entity: organisation, get: getOrganisation } = useOrganisation();
     const { organisationId } = useAppOrganisationId();
 
-    const selecteds = ref<string[]>([]);
+    const selecteds = ref<string[]>(props.modelValue);
 
     const items = computed((): DashboardsListItem[] => {
       return _.sortBy([

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@dative-gpi/foundation-core-components",
   "sideEffects": false,
-  "version": "1.0.54",
+  "version": "1.0.56",
   "description": "",
   "publishConfig": {
     "access": "public"
@@ -10,11 +10,11 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@dative-gpi/foundation-core-domain": "1.0.54",
-    "@dative-gpi/foundation-core-services": "1.0.54",
-    "@dative-gpi/foundation-shared-components": "1.0.54",
-    "@dative-gpi/foundation-shared-domain": "1.0.54",
-    "@dative-gpi/foundation-shared-services": "1.0.54"
+    "@dative-gpi/foundation-core-domain": "1.0.56",
+    "@dative-gpi/foundation-core-services": "1.0.56",
+    "@dative-gpi/foundation-shared-components": "1.0.56",
+    "@dative-gpi/foundation-shared-domain": "1.0.56",
+    "@dative-gpi/foundation-shared-services": "1.0.56"
   },
   "peerDependencies": {
     "@dative-gpi/bones-ui": "^0.0.75",
@@ -26,5 +26,5 @@
     "sass": "1.71.1",
     "sass-loader": "13.3.2"
   },
-  "gitHead": "332546e736d95d481dc97c06af935200d8344b2c"
+  "gitHead": "c77d95e9a7724fa4a39d94b0b2bd0fa9d4fbdefc"
 }