@dative-gpi/foundation-shared-components 0.0.110 → 0.0.111

package/components/FSEditImage.vue

@@ -43,12 +43,12 @@
           :wrap="false"
         >
           <FSImage
-            v-if="$props.imageId || realSource"
+            v-if="$props.imageId || $props.modelValue"
             :aspectRatio="$props.aspectRatio"
             :height="$props.height"
             :width="$props.width"
             :imageId="$props.imageId"
-            :imageB64="realSource"
+            :imageB64="$props.modelValue"
           />
           <FSCard
             v-else
@@ -106,7 +106,7 @@
       </FSRow>
     </FSCard>
     <FSRow
-      v-else-if="$props.imageId || realSource"
+      v-else-if="$props.imageId || $props.modelValue"
       :width="$props.width"
       class="fs-edit-image-full"
     >
@@ -115,7 +115,7 @@
         :height="$props.height"
         :width="$props.width"
         :imageId="$props.imageId"
-        :imageB64="realSource"
+        :imageB64="$props.modelValue"
       />
       <FSRow
         class="fs-edit-image-full-toolbar"
@@ -203,6 +203,11 @@ export default defineComponent({
       required: false,
       default: null
     },
+    label: {
+      type: String as PropType<string | null>,
+      required: false,
+      default: null
+    },
     imageId: {
       type: String as PropType<string | null>,
       required: false,
@@ -232,11 +237,6 @@ export default defineComponent({
       type: Boolean,
       required: false,
       default: false
-    },
-    label: {
-      type: String as PropType<string | null>,
-      required: false,
-      default: null
     }
   },
   emits: ["update:modelValue", "update:imageId"],
@@ -260,13 +260,6 @@ export default defineComponent({
       };
     });
 
-    const realSource = computed(() => {
-      if (fileSelected.value && fileSelected.value.fileName) {
-        return fileSelected.value.fileContent as string;
-      }
-      return props.modelValue;
-    });
-
     const onUpload = async (payload: File) => {
       const content = (await readFile(payload)) as string;
       fileSelected.value.fileName = payload.name;
@@ -292,7 +285,6 @@ export default defineComponent({
       invisibleButtonRef,
       fileSelected,
       isExtraSmall,
-      realSource,
       style,
       onUpload,
       onRemove

package/components/FSForm.vue

@@ -47,9 +47,14 @@ export default defineComponent({
       await (formRef.value as any).validate();
       emit("update:modelValue", !!((formRef.value as any).isValid ?? true));
       emit("submit", !!((formRef.value as any).isValid ?? true));
-      
     }; 
 
+    const validate = async () => {
+      submitted.value = true;
+      await (formRef.value as any).validate();
+      emit("update:modelValue", !!((formRef.value as any).isValid ?? true));
+    };
+
     provide("validateOn", validateOn);
     provide("submitted", submitted);
 
@@ -57,7 +62,8 @@ export default defineComponent({
       validateOn,
       submitted,
       formRef,
-      onSubmit
+      onSubmit,
+      validate
     };
   }
 });

package/components/lists/FSDataTableUI.vue

@@ -79,6 +79,7 @@
       </FSCol>
       <FSDivider
         v-if="showFiltersDivider"
+        :size="['30px', '24px']"
         :vertical="true"
       />
       <FSCol>
@@ -89,7 +90,7 @@
             v-if="showFilters && resetable"
             variant="standard"
             :label="$tr('ui.data-table.reset-filters', 'Reset')"
-            :height="[30, 24]"
+            :height="['30px', '24px']"
             :color="ColorEnum.Error"
             :editable="true"
             @click="resetFilter"
@@ -944,8 +945,19 @@ export default defineComponent({
           }
           return {
             ...c,
-            sort: (a: any, b: any): number => JSON.stringify(a)
-              .localeCompare(JSON.stringify(b), undefined, { numeric: true })
+            sort: (a: any, b: any): number =>{
+              if (a === undefined && b === undefined) {
+                return 0;
+              }
+              if (a === undefined) {
+                return -1;
+              }
+              if (b === undefined) {
+                return 1;
+              }
+              return JSON.stringify(a)
+                .localeCompare(JSON.stringify(b), undefined, { numeric: true })
+            }
           };
         })
     });
@@ -1420,7 +1432,7 @@ export default defineComponent({
       emit("update:rowsPerPage", innerRowsPerPage.value);
     });
 
-    watch(() => props.headers, () => {
+    watch([() => props.headers, () => props.items], () => {
       computeFilters();
     });
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@dative-gpi/foundation-shared-components",
   "sideEffects": false,
-  "version": "0.0.110",
+  "version": "0.0.111",
   "description": "",
   "publishConfig": {
     "access": "public"
@@ -10,8 +10,8 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@dative-gpi/foundation-shared-domain": "0.0.110",
-    "@dative-gpi/foundation-shared-services": "0.0.110",
+    "@dative-gpi/foundation-shared-domain": "0.0.111",
+    "@dative-gpi/foundation-shared-services": "0.0.111",
     "@fontsource/montserrat": "^5.0.16",
     "@lexical/clipboard": "^0.12.5",
     "@lexical/history": "^0.12.5",
@@ -32,5 +32,5 @@
     "sass": "^1.69.5",
     "sass-loader": "^13.3.2"
   },
-  "gitHead": "8a2d3dd65f3e61ed359d517dc060537fb47b0123"
+  "gitHead": "6856c1334706daad1394d57eeb456f1f4497389e"
 }