@dative-gpi/foundation-core-components 1.0.137 → 1.0.139-chartlists

package/components/lists/chartOrganisationTypes/FSBaseChartOrganisationTypesList.vue

@@ -7,6 +7,8 @@
     :headersOptions="headersOptions"
     :tableCode="$props.tableCode"
     :modelValue="$props.modelValue"
+    :showSelect="$props.editable"
+    :singleSelect="$props.singleSelect"
     @update:modelValue="$emit('update:modelValue', $event)"
     v-bind="$attrs"
   >
@@ -76,16 +78,18 @@
       />
     </template>
     <template
-      #item.tile="{item}"
+      #item.tile="{ item, toggleSelect}"
     >
       <FSChartTileUI
-        variant="standard"
         :label="item.label"
         :category-label="item.chartCategoryLabel"
+        :singleSelect="$props.singleSelect"
+        :editable="$props.editable"
         :icon="item.icon"
         :imageId="item.imageId"
         :type="item.chartType"
-        :color="ColorEnum.Light"
+        :modelValue="isSelected(item.id)"
+        @update:modelValue="toggleSelect(item)"
         :to="$props.itemTo && $props.itemTo(item)"
       />
     </template>
@@ -144,6 +148,16 @@ export default defineComponent({
       type: Array as PropType<string[]>,
       default: () => [],
       required: false
+    },
+    editable: {
+      type: Boolean,
+      required: false,
+      default: true
+    },
+    singleSelect: {
+      type: Boolean,
+      required: false,
+      default: false
     }
   },
   emits: ["update:modelValue"],

package/components/lists/chartOrganisations/FSBaseChartOrganisationsList.vue

@@ -7,6 +7,8 @@
     :headersOptions="headersOptions"
     :tableCode="$props.tableCode"
     :modelValue="$props.modelValue"
+    :singleSelect="$props.singleSelect"
+    :showSelect="$props.editable"
     @update:modelValue="$emit('update:modelValue', $event)"
     v-bind="$attrs"
   >
@@ -61,20 +63,6 @@
         :tags="item.modelsLabels.map((d: any) => d.label)"
       />
     </template>
-    <template
-      #item.tile="{ item }"
-    >
-      <FSChartTileUI
-        variant="standard"
-        :label="item.label"
-        :categoryLabel="item.chartCategoryLabel"
-        :icon="item.icon"
-        :imageId="item.imageId"
-        :type="item.chartType"
-        :color="ColorEnum.Light"
-        :to="$props.itemTo && $props.itemTo(item)"
-      />
-    </template>
     <template
       #item.chartType="{ item }"
     >
@@ -89,6 +77,22 @@
         </FSText>
       </FSRow>
     </template>
+    <template
+      #item.tile="{ item, toggleSelect }"
+    >
+      <FSChartTileUI
+        :label="item.label"
+        :singleSelect="$props.singleSelect"
+        :editable="$props.editable"
+        :categoryLabel="item.chartCategoryLabel"
+        :icon="item.icon"
+        :imageId="item.imageId"
+        :type="item.chartType"
+        :modelValue="isSelected(item.id)"
+        @update:modelValue="toggleSelect(item)"
+        :to="$props.itemTo && $props.itemTo(item)"
+      />
+    </template>
   </FSDataTable>
 </template>
 
@@ -144,7 +148,17 @@ export default defineComponent({
       type: Array as PropType<string[]>,
       default: () => [],
       required: false
-    }
+    },
+    editable: {
+      type: Boolean,
+      required: false,
+      default: true
+    },
+    singleSelect: {
+      type: Boolean,
+      required: false,
+      default: false
+    },
   },
   emits: ["update:modelValue"],
   setup(props) {

package/components/lists/charts/FSBaseChartsList.vue

@@ -4,6 +4,8 @@
     :loading="fetchingChartOrganisationTypes || fetchingChartOrganisations"
     :headersOptions="headersOptions"
     :items="charts"
+    :showSelect="$props.editable"
+    :singleSelect="$props.singleSelect"
     :tableCode="$props.tableCode"
     :modelValue="$props.modelValue"
     @update:modelValue="onSelect"
@@ -75,16 +77,19 @@
       />
     </template>
     <template
-      #item.tile="{ item }"
+      #item.tile="{ item, toggleSelect }"
     >
       <FSChartTileUI
-        variant="standard"
         :label="item.label"
         :categoryLabel="item.chartCategoryLabel"
         :icon="item.icon"
         :imageId="item.imageId"
         :type="item.chartType"
-        :color="isSelected(item.id) ? ColorEnum.Primary : ColorEnum.Light"
+        :singleSelect="$props.singleSelect"
+        :editable="$props.editable"
+        :activeColor="ColorEnum.Primary"
+        :modelValue="isSelected(item.id)"
+        @update:modelValue="toggleSelect(item)"
         @click="update(item.id)"
       />
     </template>
@@ -141,6 +146,16 @@ export default defineComponent({
       type: Array as PropType<string[]>,
       default: () => [],
       required: false
+    },
+    editable: {
+      type: Boolean,
+      required: false,
+      default: true
+    },
+    singleSelect: {
+      type: Boolean,
+      required: false,
+      default: false
     }
   },
   emits: ["update", "update:modelValue", "update:scope"],
@@ -219,11 +234,14 @@ export default defineComponent({
     }));
 
     const update = (value : string) => {
-      const item = isSelected(value);
-      if (item) {
+      const valueUnselected = isSelected(value);
+      if (valueUnselected) {
         onSelect(props.modelValue.filter(m => m != value));
       }
-      else {
+      else if(props.singleSelect){
+        onSelect([value]);
+      }
+      else{
         onSelect([...props.modelValue, value]);
       }
     }

package/components/lists/dashboards/FSSimpleDashboardsList.vue

@@ -9,9 +9,8 @@
 <script lang="ts">
 import { defineComponent, type PropType, watch, computed } from "vue";
 
-import type { DashboardOrganisationFilters } from "@dative-gpi/foundation-core-domain/models";
-import { useDashboardOrganisations } from "@dative-gpi/foundation-core-services/composables";
-import { useDashboardOrganisationTypes } from "@dative-gpi/foundation-core-services/composables";
+import type { DashboardOrganisationFilters, DashboardOrganisationTypeFilters } from "@dative-gpi/foundation-core-domain/models";
+import { useDashboardOrganisations, useDashboardOrganisationTypes } from "@dative-gpi/foundation-core-services/composables";
 
 import FSSimpleList from "@dative-gpi/foundation-shared-components/components/lists/FSSimpleList.vue";
 
@@ -27,7 +26,7 @@ export default defineComponent({
       default: () => ({})
     },
     dashboardOrganisationTypeFilters: {
-      type: Object as PropType<DashboardOrganisationFilters>,
+      type: Object as PropType<DashboardOrganisationTypeFilters>,
       required: false,
       default: () => ({})
     }

package/components/lists/reports/FSBaseReportExecutionsList.vue

@@ -0,0 +1,137 @@
+<template>
+  <FSDataTable
+    defaultMode="table"
+    :loading="fetchingReportExecutions"
+    :headersOptions="headersOptions"
+    :items="reportExecutions"
+    :tableCode="tableCode"
+    :groupBy="groupByExecutionDate"
+    :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.state="{ item }"
+    >
+      <FSRow
+        align="center-left"
+        :wrap="false"
+      >
+        <FSIcon
+          :color="getColorByState(item.state)"
+        >
+          {{ getIconByState(item.state) }}
+        </FSIcon>
+        <FSText
+          font="text-overline"
+          :color="getColorByState(item.state)"
+        >
+          {{ getLabelByState(item.state) }} 
+        </FSText>
+      </FSRow>
+    </template> 
+    <template
+      #item.executedAt="{ item }"
+    >
+      <FSSpan
+        font="text-overline"
+      >
+        {{ epochToShortTimeOnlyFormat(item.executedAt) }}
+      </FSSpan>
+    </template>
+    <template
+      #item.users="{ item }"
+    >
+      <FSChipGroup
+        variant="slide"
+        :labels="item.users"
+      />
+    </template>
+  </FSDataTable>
+</template>
+  
+  <script lang="ts">
+import { defineComponent, type PropType, computed, watch } from "vue";
+import _ from "lodash";
+
+import { getEnumEntries } from "@dative-gpi/foundation-shared-domain/tools";
+import { JobState } from "@dative-gpi/foundation-shared-domain/enums";
+import { getLabelByState, getColorByState, getIconByState } from "@dative-gpi/foundation-shared-components/tools";
+import { useDateFormat } from "@dative-gpi/foundation-shared-services/composables";
+
+import type { ReportExecutionFilters } from "@dative-gpi/foundation-core-domain/models";
+import { useReportExecutions } from "@dative-gpi/foundation-core-services/composables";
+  
+import FSChipGroup from "@dative-gpi/foundation-shared-components/components/FSChipGroup.vue";
+
+export default defineComponent({
+  name: "FSBaseReportExecutionsList",
+  components: {
+    FSChipGroup
+  },
+  props: {
+    tableCode: {
+      type: String as PropType<string | null>,
+      required: false,
+      default: null
+    },
+    reportExecutionsFilters: {
+      type: Object as PropType<ReportExecutionFilters>,
+      required: false,
+      default: null
+    },
+    modelValue: {
+      type: Array as PropType<string[]>,
+      required: false
+    }
+  },
+  emits: ["update:modelValue"],
+  setup(props) {
+    const { epochToLongTimeFormat, epochToLongDateFormat, epochToShortTimeOnlyFormat } = useDateFormat();
+    const { getMany: fetchReportExecutions, fetching: fetchingReportExecutions, entities: reportExecutions } = useReportExecutions();
+
+    const groupByExecutionDate = {
+      key: "executedAtGroup",
+      order: "desc"
+    };
+
+    const headersOptions = computed(() => ({
+      state: {
+        fixedFilters: getEnumEntries(JobState).map(e => ({
+          value: e.value,
+          text: getLabelByState(e.value)
+        })),
+        methodFilter: (value: JobState, item: JobState) => value == item
+      }
+    }));
+    
+    watch(() => props.reportExecutionsFilters, (next, previous) => {
+      if ((!next && !previous) || !_.isEqual(next, previous)) {
+        fetchReportExecutions(props.reportExecutionsFilters);
+      }
+    }, { immediate: true });
+  
+    return {
+      fetchingReportExecutions,
+      groupByExecutionDate,
+      reportExecutions,
+      headersOptions,
+      getColorByState,
+      getIconByState,
+      getLabelByState,
+      epochToLongTimeFormat,
+      epochToLongDateFormat,
+      epochToShortTimeOnlyFormat
+    };
+  }
+});
+  </script>

package/components/lists/reports/FSBaseReportsList.vue

@@ -0,0 +1,135 @@
+<template>
+  <FSDataTable
+    defaultMode="table"
+    :loading="fetchingReports"
+    :items="reports"
+    :showSelect="$props.editable"
+    :tableCode="tableCode"
+    :itemTo="$props.itemTo"
+    :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.icon="{ item }"
+    >
+      <FSIcon >
+        {{ item.icon }}
+      </FSIcon>
+    </template>
+    <template
+      #item.lastExecution="{ item }"
+    >
+      <FSSpan
+        font="text-overline"
+      >
+        {{ epochToLongTimeFormat(item.lastExecution) }}
+      </FSSpan>
+    </template>
+    <template
+      #item.nextExecution="{ item }"
+    >
+      <FSSpan
+        font="text-overline"
+      >
+        {{ epochToLongTimeFormat(item.nextExecution) }}
+      </FSSpan>
+    </template>
+    <template
+      #item.createdAt="{ item }"
+    >
+      <FSSpan
+        font="text-overline"
+      >
+        {{ epochToLongTimeFormat(item.createdAt) }}
+      </FSSpan>
+    </template>
+    <template
+      #item.userIds="{ item }"
+    >
+      <FSChipUserOrganisationsList
+        :userOrganisationIds="item.userIds"
+        :wrapped="false"
+      />
+    </template>
+  </FSDataTable>
+</template>
+
+<script lang="ts">
+import _ from "lodash";
+import type { RouteLocation } from "vue-router";
+import { defineComponent, type PropType, watch } from "vue";
+
+import { useDateFormat } from "@dative-gpi/foundation-shared-services/composables";
+
+import { useReports } from "@dative-gpi/foundation-core-services/composables";
+import type { ReportFilters, ReportInfos } from "@dative-gpi/foundation-core-domain/models";
+
+import FSChipUserOrganisationsList from "../userOrganisations/FSChipUserOrganisationsList.vue";
+
+
+export default defineComponent({
+  name: "FSBaseReportsList",
+  components: {
+    FSChipUserOrganisationsList
+  },
+  props: {
+    tableCode: {
+      type: String as PropType<string | null>,
+      required: false,
+      default: null
+    },
+    reportsFilters: {
+      type: Object as PropType<ReportFilters>,
+      required: false,
+      default: null
+    },
+    editable: {
+      type: Boolean,
+      required: false,
+      default: true
+    },
+    itemTo: {
+      type: Function as PropType<(item: ReportInfos) => Partial<RouteLocation>>,
+      required: false
+    },
+    singleSelect: {
+      type: Boolean,
+      required: false,
+      default: false
+    },
+    modelValue: {
+      type: Array as PropType<string[]>,
+      default: () => [],
+      required: false
+    }
+  },
+  emits: ["update:modelValue"],
+  setup(props) {
+    const { epochToLongTimeFormat } = useDateFormat();
+    const { getMany: fetchReports, fetching: fetchingReports, entities: reports } = useReports();
+    
+
+    watch(() => props.reportsFilters, (next, previous) => {
+      if ((!next && !previous) || !_.isEqual(next, previous)) {
+        fetchReports(props.reportsFilters);
+      }
+    }, { immediate: true });
+
+    return {
+      fetchingReports,
+      reports,
+      epochToLongTimeFormat
+    };
+  }
+});
+</script>

package/components/lists/userOrganisations/FSChipUserOrganisationsList.vue

@@ -0,0 +1,61 @@
+<template>
+  <FSRow
+    v-if="fetching"
+  >
+    <FSLoader
+      v-for="i in 4"
+      :key="i"
+      variant="chip"
+      height="12px"
+    />
+  </FSRow>
+  <FSChipGroup
+    v-else
+    :color="ColorEnum.Light"
+    :labels="userOrganisations?.map(u => u.name)"
+    v-bind="$attrs"
+  />
+</template>
+  
+  <script lang="ts">
+import { defineComponent, watch, type PropType } from "vue";
+  
+import { ColorEnum } from "@dative-gpi/foundation-shared-components/models";
+import { useUserOrganisations } from "@dative-gpi/foundation-core-services/composables";
+
+import FSRow from "@dative-gpi/foundation-shared-components/components/FSRow.vue";
+import FSLoader from "@dative-gpi/foundation-shared-components/components/FSLoader.vue";
+import FSChipGroup from "@dative-gpi/foundation-shared-components/components/FSChipGroup.vue";
+  
+export default defineComponent({
+  name: "FSChipUserOrganisationsList",
+  components: {
+    FSChipGroup,
+    FSLoader,
+    FSRow
+  },
+  props: {
+    userOrganisationIds: {
+      type: Array as PropType<string[]>,
+      required: false
+    }
+  },
+  setup(props) {
+    const {getMany: fetchUserOrganisations, fetching, entities: userOrganisations} = useUserOrganisations();
+    
+    watch(() => props.userOrganisationIds, async () => {
+      if(props.userOrganisationIds && props.userOrganisationIds.length > 0){
+        fetchUserOrganisations({
+          userOrganisationsIds: props.userOrganisationIds
+        });
+      }
+    }, {immediate: true});
+  
+    return {
+      userOrganisations,
+      ColorEnum,
+      fetching
+    };
+  }
+});
+</script>

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@dative-gpi/foundation-core-components",
   "sideEffects": false,
-  "version": "1.0.137",
+  "version": "1.0.139-chartlists",
   "description": "",
   "publishConfig": {
     "access": "public"
@@ -10,11 +10,11 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@dative-gpi/foundation-core-domain": "1.0.137",
-    "@dative-gpi/foundation-core-services": "1.0.137",
-    "@dative-gpi/foundation-shared-components": "1.0.137",
-    "@dative-gpi/foundation-shared-domain": "1.0.137",
-    "@dative-gpi/foundation-shared-services": "1.0.137"
+    "@dative-gpi/foundation-core-domain": "1.0.139-chartlists",
+    "@dative-gpi/foundation-core-services": "1.0.139-chartlists",
+    "@dative-gpi/foundation-shared-components": "1.0.139-chartlists",
+    "@dative-gpi/foundation-shared-domain": "1.0.139-chartlists",
+    "@dative-gpi/foundation-shared-services": "1.0.139-chartlists"
   },
   "peerDependencies": {
     "@dative-gpi/bones-ui": "^1.0.0",
@@ -26,5 +26,5 @@
     "sass": "1.71.1",
     "sass-loader": "13.3.2"
   },
-  "gitHead": "676162c4362dd556d5ef714f7b17a047ad7f2bad"
+  "gitHead": "d6d4df26014365b637a93c3e05c616616159a6f7"
 }