@dative-gpi/foundation-core-components 1.0.57 → 1.0.59

package/components/lists/charts/FSBaseChartsList.vue

@@ -4,7 +4,7 @@
     :items="charts"
     :tableCode="$props.tableCode"
     :modelValue="$props.modelValue"
-    @update:modelValue="$emit('update:modelValue', $event)"
+    @update:modelValue="onSelect"
     v-bind="$attrs"
   >
     <template
@@ -117,7 +117,7 @@ export default defineComponent({
       required: true
     }
   },
-  emits: ["update:modelValue"],
+  emits: ["update:modelValue", "update:scope"],
   setup(props, { emit }) {
 
     const { entities: chartOrganisations, fetching: fetchingChartOrganisations, getMany: getManyChartOrganisations } = useChartOrganisations();
@@ -135,7 +135,7 @@ export default defineComponent({
     const charts = computed(() => {
       return chartOrganisations.value.map(c => {
         return {
-          id: `${c.id}_${c.scope}`,
+          id: c.id,
           imageId: c.imageId,
           chartId: c.chartId,
           chartCategoryId: c.chartCategoryId,
@@ -153,7 +153,7 @@ export default defineComponent({
       })
         .concat(chartOrganisationTypes.value.map(c => {
           return {
-            id: `${c.id}_${c.scope}`,
+            id: c.id,
             imageId: c.imageId,
             chartId: c.chartId,
             chartCategoryId: c.chartCategoryId,
@@ -176,12 +176,23 @@ export default defineComponent({
       const item = isSelected(value);
 
       if(item){
-        emit("update:modelValue", props.modelValue.filter(m => m != value))
+        onSelect(props.modelValue.filter(m => m != value))
       }
       else{
-        emit("update:modelValue", [...props.modelValue, value])
+        onSelect([...props.modelValue, value])
       }
     }
+
+    const onSelect = (values: string[] | null) => {
+      if(!values){
+        emit("update:modelValue", [])
+        emit("update:scope", [])
+        return;
+      }
+      const selectedItems = charts.value.filter(i => values.includes(i.id));
+      emit("update:modelValue", selectedItems.map(i => i.id));
+      emit("update:scope", selectedItems.map(i => i.scope));
+    };
  
     watch(() => [props.chartOrganisationFilters,props.chartOrganisationTypeFilters], (next, previous) => {
       if ((!next && !previous) || !_.isEqual(next, previous)) {
@@ -197,6 +208,7 @@ export default defineComponent({
       ColorEnum,
       charts,
       isSelected,
+      onSelect,
       update
     };
   }

package/package.json

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