@dative-gpi/foundation-core-components 1.1.13 → 1.1.14-fix-last2

package/components/lists/chartOrganisationTypes/FSBaseChartOrganisationTypesList.vue

@@ -70,11 +70,11 @@
       </FSRow>
     </template>
     <template
-      #item.modelsLabels="{ item }"
+      #item.models="{ item }"
     >
       <FSTagGroup
         variant="slide"
-        :tags="item.modelsLabels.map((d: any) => d.label)"
+        :tags="item.models.map((d: any) => d.label)"
         :showRemove="false"
       />
     </template>
@@ -109,7 +109,8 @@ import { getEnumEntries } from "@dative-gpi/foundation-shared-domain/tools";
 import { ColorEnum } from "@dative-gpi/foundation-shared-components/models";
 import { chartTypeLabel, chartIcon } from "@dative-gpi/foundation-shared-components/tools";
 
-import type { ChartModelLabel, ChartOrganisationTypeFilters, ChartOrganisationTypeInfos } from "@dative-gpi/foundation-core-domain/models";
+import type { ModelInfos } from "@dative-gpi/foundation-core-domain/models";
+import type { ChartOrganisationTypeFilters, ChartOrganisationTypeInfos } from "@dative-gpi/foundation-core-domain/models";
 import { useChartOrganisationTypes } from "@dative-gpi/foundation-core-services/composables";
 
 import FSChartTileUI from "@dative-gpi/foundation-shared-components/components/tiles/FSChartTileUI.vue";
@@ -168,8 +169,8 @@ export default defineComponent({
     const { entities: chartOrganisationTypes, fetching: fetchingChartOrganisationTypes, getMany: getManyChartOrganisationTypes } = useChartOrganisationTypes();
 
     const headersOptions = computed(() => ({
-      modelsLabels: {
-        fixedFilters: chartOrganisationTypes.value.map(c => c.modelsLabels).reduce((acc, models) => {
+      models: {
+        fixedFilters: chartOrganisationTypes.value.map(c => c.models).reduce((acc, models) => {
           for (const m of models) {
             if (!acc.map((m) => m.id).includes(m.id)) {
               acc.push(m);
@@ -183,7 +184,7 @@ export default defineComponent({
           value: '',
           text: '--'
         }),
-        methodFilter: (value: string, items: ChartModelLabel[]) => (items.length == 0 && value == '') || (items.length  > 0 && items.some(ml => ml.id == value))
+        methodFilter: (value: string, items: ModelInfos[]) => (items.length == 0 && value == '') || (items.length  > 0 && items.some(ml => ml.id == value))
       },
       chartType: {
         fixedFilters: getEnumEntries(ChartType).map(e => ({

package/components/lists/chartOrganisations/FSBaseChartOrganisationsList.vue

@@ -56,11 +56,11 @@
       />
     </template>
     <template
-      #item.modelsLabels="{ item }"
+      #item.models="{ item }"
     >
       <FSTagGroup
         variant="slide"
-        :tags="item.modelsLabels.map((d: any) => d.label)"
+        :tags="item.models.map((d: any) => d.label)"
         :showRemove="false"
       />
     </template>
@@ -109,7 +109,8 @@ import { getEnumEntries } from "@dative-gpi/foundation-shared-domain/tools";
 import { ColorEnum } from "@dative-gpi/foundation-shared-components/models";
 import { chartTypeLabel, chartIcon } from "@dative-gpi/foundation-shared-components/tools";
 
-import type { ChartModelLabel, ChartOrganisationFilters, ChartOrganisationInfos } from "@dative-gpi/foundation-core-domain/models";
+import type { ModelInfos } from "@dative-gpi/foundation-core-domain/models";
+import type { ChartOrganisationFilters, ChartOrganisationInfos } from "@dative-gpi/foundation-core-domain/models";
 import { useChartOrganisations } from "@dative-gpi/foundation-core-services/composables";
 
 import FSRow from "@dative-gpi/foundation-shared-components/components/FSRow.vue";
@@ -168,8 +169,8 @@ export default defineComponent({
     const { entities: chartOrganisations, fetching: fetchingChartOrganisations, getMany: getManyChartOrganisations } = useChartOrganisations();
 
     const headersOptions = computed(() => ({
-      modelsLabels: {
-        fixedFilters: chartOrganisations.value.map(c => c.modelsLabels).reduce((acc, models) => {
+      models: {
+        fixedFilters: chartOrganisations.value.map(c => c.models).reduce((acc, models) => {
           for (const m of models) {
             if (!acc.map((m) => m.id).includes(m.id)) {
               acc.push(m);
@@ -183,7 +184,7 @@ export default defineComponent({
           value: '',
           text: '--'
         }),
-        methodFilter: (value: string, items: ChartModelLabel[]) => (items.length == 0 && value == '') || (items.length  > 0 && items.some(ml => ml.id == value))
+        methodFilter: (value: string, items: ModelInfos[]) => (items.length == 0 && value == '') || (items.length  > 0 && items.some(ml => ml.id == value))
       },
       chartType: {
         fixedFilters: getEnumEntries(ChartType).map(e => ({

package/components/lists/charts/FSBaseChartsList.vue

@@ -68,14 +68,6 @@
         </FSText>
       </FSRow>
     </template>
-    <template
-      #item.modelsLabels="{ item }"
-    >
-      <FSTagGroup
-        :showRemove="false"
-        :tags="item.modelsLabels.map((d: any) => d.label)"
-      />
-    </template>
     <template
       #item.scope="{ item }"
     >
@@ -113,7 +105,8 @@ import { ChartOrigin, ChartType } from "@dative-gpi/foundation-shared-domain/enu
 import { getEnumEntries } from "@dative-gpi/foundation-shared-domain/tools";
 import { ColorEnum } from "@dative-gpi/foundation-shared-components/models";
 
-import type { ChartModelLabel, ChartOrganisationFilters, ChartOrganisationTypeFilters } from "@dative-gpi/foundation-core-domain/models";
+import type { ModelInfos } from "@dative-gpi/foundation-core-domain/models";
+import type { ChartOrganisationFilters, ChartOrganisationTypeFilters } from "@dative-gpi/foundation-core-domain/models";
 import { useChartOrganisations, useChartOrganisationTypes } from "@dative-gpi/foundation-core-services/composables";
 
 import FSChartTileUI from "@dative-gpi/foundation-shared-components/components/tiles/FSChartTileUI.vue";
@@ -199,7 +192,7 @@ export default defineComponent({
         tags: c.tags,
         multiple: c.multiple,
         chartType: c.chartType,
-        modelsLabels: c.modelsLabels
+        models: c.models
       })).concat(chartOrganisationTypes.value.map(c => ({
         id: c.id,
         imageId: c.imageId,
@@ -214,13 +207,13 @@ export default defineComponent({
         tags: c.tags,
         multiple: c.multiple,
         chartType: c.chartType,
-        modelsLabels: c.modelsLabels
+        models: c.models
       })));
     });
 
     const headersOptions = computed(() => ({
-      modelsLabels: {
-        fixedFilters: chartOrganisationTypes.value.map(c => c.modelsLabels).reduce((acc, models) => {
+      models: {
+        fixedFilters: chartOrganisationTypes.value.map(c => c.models).reduce((acc, models) => {
           for(const m of models){
             if(!acc.map((m) => m.id).includes(m.id)){
               acc.push(m);
@@ -234,7 +227,7 @@ export default defineComponent({
           value: '',
           text: '--'
         }),
-        methodFilter: (value: string, items: ChartModelLabel[]) => (items.length == 0 && value == '') || (items.length  > 0 && items.some(ml => ml.id == value))
+        methodFilter: (value: string, items: ModelInfos[]) => (items.length == 0 && value == '') || (items.length  > 0 && items.some(ml => ml.id == value))
       },
       chartType: {
         fixedFilters: getEnumEntries(ChartType).map(e => ({

package/components/lists/userOrganisations/FSBaseUserOrganisationsList.vue

@@ -90,7 +90,7 @@
       <FSSpan
         font="text-overline"
       >
-        {{ epochToShortTimeFormat(item.lastActivity) }}
+        {{ formatLastActivity(item.lastActivity) }}
       </FSSpan>
     </template>
     <template
@@ -114,9 +114,8 @@ import { type RouteLocation } from "vue-router";
 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 { userTypeLabel, userValidityLabel,formatLastActivity } 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";
 
@@ -166,7 +165,6 @@ 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);
@@ -181,10 +179,10 @@ export default defineComponent({
     return {
       fetchingUserOrganisations,
       userOrganisations,
-      epochToShortTimeFormat,
       userValidityLabel,
       userTypeLabel,
-      isSelected
+      isSelected,
+      formatLastActivity,
     };
   }
 });

package/package.json

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

package/utils/users.ts

@@ -1,7 +1,10 @@
+import { useDateFormat } from "@dative-gpi/foundation-shared-services/composables";
 import { useTranslations as useTranslationsProvider } from "@dative-gpi/bones-ui/composables";
 import { UserType, UserValidityState } from "@dative-gpi/foundation-shared-domain/enums";
+import { isoToEpoch } from "@dative-gpi/foundation-shared-domain/tools";
 
 const { $tr } = useTranslationsProvider();
+const { epochToShortTimeFormat } = useDateFormat();
 
 export const userTypeLabel = (type: UserType): string => {
   switch (type) {
@@ -29,4 +32,12 @@ export const userValidityLabel = (validity: UserValidityState): string => {
     case UserValidityState.AccountValidated:  return $tr("ui.user-validity.account-validated", "Validated");
     default:                                  return "";
   }
-}
+}
+
+export const formatLastActivity = (value?: string | null): string => {
+    if (!value) {
+      return "";
+    }
+    const timestamp = isoToEpoch(value);
+    return epochToShortTimeFormat(timestamp);
+};