@dative-gpi/foundation-shared-components 1.0.16 → 1.0.17

package/components/FSEditImage.vue

@@ -1,298 +1,53 @@
 <template>
-  <FSCol
-    gap="8px"
-  >
-    <slot
-      v-if="!$props.hideHeader"
-      name="label"
-    >
-      <FSRow
-        :wrap="false"
-      >
-        <FSSpan
-          v-if="$props.label"
-          class="fs-edit-image-label"
-          font="text-overline"
-          :style="style"
-        >
-          {{ $props.label }}
-        </FSSpan>
-        <FSSpan
-          v-if="$props.label && $props.required"
-          class="fs-edit-image-label"
-          style="margin-left: -8px;"
-          font="text-overline"
-          :ellipsis="false"
-          :style="style"
-        >
-          *
-        </FSSpan>
-      </FSRow>
-    </slot>
-    <FSCard
-      v-if="['standard'].includes($props.variant)"
-      padding="12px"
-      width="100%"
-    >
-      <FSRow
-        align="center-left"
-        :wrap="false"
-      >
-        <FSRow
-          gap="24px"
-          :wrap="false"
-        >
-          <FSImage
-            v-if="$props.imageId || $props.modelValue"
-            :aspectRatio="$props.aspectRatio"
-            :height="$props.height"
-            :width="$props.width"
-            :imageId="$props.imageId"
-            :imageB64="$props.modelValue"
-          />
-          <FSCard
-            v-else
-            borderStyle="dashed"
-            :aspectRatio="$props.aspectRatio"
-            :height="$props.height"
-            :width="$props.width"
-          />
-          <FSCol
-            align="center-left"
-            height="fill"
-            width="hug"
-            gap="10px"
-          >
-            <FSText
-              v-if="fileSelected && fileSelected.fileName"
-              font="text-body"
-              :lineClamp="2"
-            >
-              {{ fileSelected.fileName }}
-            </FSText>
-            <FSCol
-              gap="0px"
-            >
-              <FSText
-                class="fs-edit-image-overline"
-                font="text-overline"
-                :style="style"
-              >
-                {{ $tr('ui.edit-image.format', 'PNG or JPG format') }}
-              </FSText>
-              <FSText
-                class="fs-edit-image-overline"
-                font="text-overline"
-                :style="style"
-              >
-                {{ $tr('ui.edit-image.size', '10 MB Maximum') }}
-              </FSText>
-            </FSCol>
-          </FSCol>
-        </FSRow>
-        <v-spacer />
-        <FSRow
-          width="hug"
-        >
-          <FSButtonFileMini
-            accept="image/*"
-            :readFile="false"
-            @update:metadata="onUpload"
-          />
-          <FSButtonRemoveMini
-            @click="onRemove"
-          />
-        </FSRow>
-      </FSRow>
-    </FSCard>
-    <FSRow
-      v-else-if="$props.imageId || $props.modelValue"
-      :width="$props.width"
-      class="fs-edit-image-full"
-    >
-      <FSImage
-        :aspectRatio="$props.aspectRatio"
-        :height="$props.height"
-        :width="$props.width"
-        :imageId="$props.imageId"
-        :imageB64="$props.modelValue"
-      />
-      <FSRow
-        class="fs-edit-image-full-toolbar"
-        padding="4px"
-      >
-        <FSButtonFileMini
-          accept="image/*"
-          :readFile="false"
-          @update:metadata="onUpload"
-        />
-        <FSButtonRemoveMini
-          @click="onRemove"
-        />
-      </FSRow>
-    </FSRow>
-    <FSClickable
-      v-else
-      borderStyle="dashed"
-      variant="background"
-      :height="$props.height"
-      :width="$props.width"
-      @click="() => invisibleButtonRef.input.click()"
-    >
-      <FSRow
-        align="center-center"
-        :wrap="false"
-      >
-        <FSIcon>
-          mdi-plus-box-outline
-        </FSIcon>
-        <FSText
-          font="text-body"
-          :lineClamp="2"
-        >
-          {{ $tr('ui.edit-image.add-image', 'Add an image.') }}
-        </FSText>
-        <FSButtonFileMini
-          class="fs-edit-image-hidden-button"
-          ref="invisibleButtonRef"
-          accept="image/*"
-          :readFile="false"
-          @update:metadata="onUpload"
-        />
-      </FSRow>
-    </FSClickable>
-  </FSCol>
+  <FSEditImageUI
+    :source="source"
+    :blurHash="image"
+    @error="onError"
+    @update:source="$emit('update:imageId', $event)"
+    v-bind="$attrs"
+  />
 </template>
 
 <script lang="ts">
-import { computed, defineComponent, type PropType, ref, type StyleValue, watch } from "vue";
+import { computed, defineComponent, type PropType } from "vue";
 
-import { useBreakpoints, useColors } from "@dative-gpi/foundation-shared-components/composables";
-import { ColorEnum, type FileImage } from "@dative-gpi/foundation-shared-components/models";
-import { useFiles } from "@dative-gpi/foundation-shared-services/composables";
+import { IMAGE_RAW_URL } from "@dative-gpi/foundation-shared-services/config";
 
-import FSButtonRemoveMini from "./buttons/FSButtonRemoveMini.vue";
-import FSButtonFileMini from "./buttons/FSButtonFileMini.vue";
-import FSClickable from "./FSClickable.vue";
-import FSImage from "./FSImage.vue";
-import FSCard from "./FSCard.vue";
-import FSText from "./FSText.vue";
-import FSCol from "./FSCol.vue";
-import FSRow from "./FSRow.vue";
+import { useImage } from "@dative-gpi/foundation-shared-services/composables";
+
+import FSEditImageUI from "./FSEditImageUI.vue";
 
 export default defineComponent({
   name: "FSEditImage",
   components: {
-    FSButtonRemoveMini,
-    FSButtonFileMini,
-    FSClickable,
-    FSImage,
-    FSCard,
-    FSText,
-    FSCol,
-    FSRow
+    FSEditImageUI
   },
   props: {
-    height: {
-      type: [Array, String, Number] as PropType<string[] | number[] | string | number | null>,
-      required: false,
-      default: null
-    },
-    width: {
-      type: [Array, String, Number] as PropType<string[] | number[] | string | number | null>,
-      required: false,
-      default: null
-    },
-    label: {
-      type: String as PropType<string | null>,
-      required: false,
-      default: null
-    },
     imageId: {
       type: String as PropType<string | null>,
       required: false,
       default: null
-    },
-    aspectRatio: {
-      type: String as PropType<string | null>,
-      required: false,
-      default: null
-    },
-    modelValue: {
-      type: String as PropType<string | null>,
-      required: false,
-      default: null
-    },
-    variant: {
-      type: String as PropType<"standard" | "full">,
-      required: false,
-      default: "standard"
-    },
-    hideHeader: {
-      type: Boolean,
-      required: false,
-      default: false
-    },
-    required: {
-      type: Boolean,
-      required: false,
-      default: false
     }
   },
-  emits: ["update:modelValue", "update:imageId"],
-  setup(props, { emit }) {
-    const { isExtraSmall } = useBreakpoints();
-    const { getColors } = useColors();
-    const { readFile } = useFiles();
-
-    const fileSelected = ref<FileImage>({ fileName: "", fileContent: null });
-    const invisibleButtonRef = ref<HTMLFormElement | null>(null);
-
-    const errors = getColors(ColorEnum.Error);
-    const lights = getColors(ColorEnum.Light);
-    const darks = getColors(ColorEnum.Dark);
-
-    const style = computed((): StyleValue => ({
-      "--fs-edit-image-overline-text-color": lights.dark,
-      "--fs-edit-image-color"              : darks.base,
-      "--fs-edit-image-error-color"        : errors.base
-    }));
-
-    const onUpload = async (payload: File) => {
-      const content = (await readFile(payload)) as string;
-      fileSelected.value.fileName = payload.name;
-      fileSelected.value.fileContent = content;
-      emit("update:modelValue", content.substring(content.indexOf(',') + 1));
+  emits: ["update:imageId"],
+  setup(props) {
+    const { get: getImage, entity: image } = useImage();
+    
+    const source = computed(() => {
+      return props.imageId ? IMAGE_RAW_URL(props.imageId) : null;
+    })
+
+    const onError = (): void => {
       if (props.imageId) {
-        emit("update:imageId", null);
+        console.log("onError");
+        getImage(props.imageId);
       }
     };
 
-    const onRemove = () => {
-      fileSelected.value.fileName = "";
-      fileSelected.value.fileContent = null;
-      if (props.modelValue) {
-        emit("update:modelValue", null);
-      }
-      else {
-        emit("update:imageId", null);
-      }
-    };
-
-    watch(() => props.modelValue, () => {
-      if (!props.modelValue) {
-        fileSelected.value.fileName = "";
-        fileSelected.value.fileContent = null;
-      }
-    });
-
     return {
-      invisibleButtonRef,
-      fileSelected,
-      isExtraSmall,
-      style,
-      onUpload,
-      onRemove
+      image,
+      source,
+      onError
     };
   }
 });

package/components/FSEditImageUI.vue

@@ -0,0 +1,301 @@
+<template>
+  <FSCol
+    gap="8px"
+  >
+    <slot
+      v-if="!$props.hideHeader"
+      name="label"
+    >
+      <FSRow
+        :wrap="false"
+      >
+        <FSSpan
+          v-if="$props.label"
+          class="fs-edit-image-label"
+          font="text-overline"
+          :style="style"
+        >
+          {{ $props.label }}
+        </FSSpan>
+        <FSSpan
+          v-if="$props.label && $props.required"
+          class="fs-edit-image-label"
+          style="margin-left: -8px;"
+          font="text-overline"
+          :ellipsis="false"
+          :style="style"
+        >
+          *
+        </FSSpan>
+      </FSRow>
+    </slot>
+    <FSCard
+      v-if="['standard'].includes($props.variant)"
+      padding="12px"
+      width="100%"
+    >
+      <FSRow
+        align="center-left"
+        :wrap="false"
+      >
+        <FSRow
+          gap="24px"
+          :wrap="false"
+        >
+          <FSImageUI
+            v-if="$props.source || $props.modelValue"
+            :aspectRatio="$props.aspectRatio"
+            :height="$props.height"
+            :width="$props.width"
+            :source="$props.source"
+            :imageB64="$props.modelValue"
+            v-bind="$attrs"
+          />
+          <FSCard
+            v-else
+            borderStyle="dashed"
+            :aspectRatio="$props.aspectRatio"
+            :height="$props.height"
+            :width="$props.width"
+          />
+          <FSCol
+            align="center-left"
+            height="fill"
+            width="hug"
+            gap="10px"
+          >
+            <FSText
+              v-if="fileSelected && fileSelected.fileName"
+              font="text-body"
+              :lineClamp="2"
+            >
+              {{ fileSelected.fileName }}
+            </FSText>
+            <FSCol
+              gap="0px"
+            >
+              <FSText
+                class="fs-edit-image-overline"
+                font="text-overline"
+                :style="style"
+              >
+                {{ $tr('ui.edit-image.format', 'PNG or JPG format') }}
+              </FSText>
+              <FSText
+                class="fs-edit-image-overline"
+                font="text-overline"
+                :style="style"
+              >
+                {{ $tr('ui.edit-image.size', '10 MB Maximum') }}
+              </FSText>
+            </FSCol>
+          </FSCol>
+        </FSRow>
+        <v-spacer />
+        <FSRow
+          width="hug"
+        >
+          <FSButtonFileMini
+            accept="image/*"
+            :readFile="false"
+            @update:metadata="onUpload"
+          />
+          <FSButtonRemoveMini
+            @click="onRemove"
+          />
+        </FSRow>
+      </FSRow>
+    </FSCard>
+    <FSRow
+      v-else-if="$props.source || $props.modelValue"
+      :width="$props.width"
+      class="fs-edit-image-full"
+    >
+      <FSImageUI
+        :aspectRatio="$props.aspectRatio"
+        :height="$props.height"
+        :width="$props.width"
+        :source="$props.source"
+        :imageB64="$props.modelValue"
+        v-bind="$attrs"
+      />
+      <FSRow
+        class="fs-edit-image-full-toolbar"
+        padding="4px"
+      >
+        <FSButtonFileMini
+          accept="image/*"
+          :readFile="false"
+          @update:metadata="onUpload"
+        />
+        <FSButtonRemoveMini
+          @click="onRemove"
+        />
+      </FSRow>
+    </FSRow>
+    <FSClickable
+      v-else
+      borderStyle="dashed"
+      variant="background"
+      :height="$props.height"
+      :width="$props.width"
+      @click="() => invisibleButtonRef.input.click()"
+    >
+      <FSRow
+        align="center-center"
+        :wrap="false"
+      >
+        <FSIcon>
+          mdi-plus-box-outline
+        </FSIcon>
+        <FSText
+          font="text-body"
+          :lineClamp="2"
+        >
+          {{ $tr('ui.edit-image.add-image', 'Add an image.') }}
+        </FSText>
+        <FSButtonFileMini
+          class="fs-edit-image-hidden-button"
+          ref="invisibleButtonRef"
+          accept="image/*"
+          :readFile="false"
+          @update:metadata="onUpload"
+        />
+      </FSRow>
+    </FSClickable>
+  </FSCol>
+</template>
+
+<script lang="ts">
+import { computed, defineComponent, type PropType, ref, type StyleValue, watch } from "vue";
+
+import { useBreakpoints, useColors } from "@dative-gpi/foundation-shared-components/composables";
+import { ColorEnum, type FileImage } from "@dative-gpi/foundation-shared-components/models";
+import { useFiles } from "@dative-gpi/foundation-shared-services/composables";
+
+import FSButtonRemoveMini from "./buttons/FSButtonRemoveMini.vue";
+import FSButtonFileMini from "./buttons/FSButtonFileMini.vue";
+import FSClickable from "./FSClickable.vue";
+import FSImageUI from "./FSImageUI.vue";
+import FSCard from "./FSCard.vue";
+import FSText from "./FSText.vue";
+import FSCol from "./FSCol.vue";
+import FSRow from "./FSRow.vue";
+
+export default defineComponent({
+  name: "FSEditImageUI",
+  components: {
+    FSButtonRemoveMini,
+    FSButtonFileMini,
+    FSClickable,
+    FSImageUI,
+    FSCard,
+    FSText,
+    FSCol,
+    FSRow
+  },
+  props: {
+    height: {
+      type: [Array, String, Number] as PropType<string[] | number[] | string | number | null>,
+      required: false,
+      default: null
+    },
+    width: {
+      type: [Array, String, Number] as PropType<string[] | number[] | string | number | null>,
+      required: false,
+      default: null
+    },
+    label: {
+      type: String as PropType<string | null>,
+      required: false,
+      default: null
+    },
+    source: {
+      type: String as PropType<string | null>,
+      required: false,
+      default: null
+    },
+    aspectRatio: {
+      type: String as PropType<string | null>,
+      required: false,
+      default: null
+    },
+    modelValue: {
+      type: String as PropType<string | null>,
+      required: false,
+      default: null
+    },
+    variant: {
+      type: String as PropType<"standard" | "full">,
+      required: false,
+      default: "standard"
+    },
+    hideHeader: {
+      type: Boolean,
+      required: false,
+      default: false
+    },
+    required: {
+      type: Boolean,
+      required: false,
+      default: false
+    }
+  },
+  emits: ["update:modelValue", "update:source"],
+  setup(props, { emit }) {
+    const { isExtraSmall } = useBreakpoints();
+    const { getColors } = useColors();
+    const { readFile } = useFiles();
+
+    const fileSelected = ref<FileImage>({ fileName: "", fileContent: null });
+    const invisibleButtonRef = ref<HTMLFormElement | null>(null);
+
+    const errors = getColors(ColorEnum.Error);
+    const lights = getColors(ColorEnum.Light);
+    const darks = getColors(ColorEnum.Dark);
+
+    const style = computed((): StyleValue => ({
+      "--fs-edit-image-overline-text-color": lights.dark,
+      "--fs-edit-image-color"              : darks.base,
+      "--fs-edit-image-error-color"        : errors.base
+    }));
+
+    const onUpload = async (payload: File) => {
+      const content = (await readFile(payload)) as string;
+      fileSelected.value.fileName = payload.name;
+      fileSelected.value.fileContent = content;
+      emit("update:modelValue", content.substring(content.indexOf(',') + 1));
+      if (props.source) {
+        emit("update:source", null);
+      }
+    };
+
+    const onRemove = () => {
+      fileSelected.value.fileName = "";
+      fileSelected.value.fileContent = null;
+      if (props.modelValue) {
+        emit("update:modelValue", null);
+      }
+      else {
+        emit("update:source", null);
+      }
+    };
+
+    watch(() => props.modelValue, () => {
+      if (!props.modelValue) {
+        fileSelected.value.fileName = "";
+        fileSelected.value.fileContent = null;
+      }
+    });
+
+    return {
+      invisibleButtonRef,
+      fileSelected,
+      isExtraSmall,
+      style,
+      onUpload,
+      onRemove
+    };
+  }
+});
+</script>

package/components/FSImage.vue

@@ -1,6 +1,6 @@
 <template>
   <FSImageUI
-    :blurhash="image"
+    :blurHash="image"
     :source="source"
     @error="onError"
     v-bind="$attrs"

package/components/fields/FSTranslateRichTextField.vue

@@ -41,16 +41,16 @@
     >
       <FSButton
         prependIcon="mdi-cancel"
+        width="100%"
         :label="$tr('ui.translateRichTextField.cancelButton.label', 'Cancel')"
-        :fullWidth="true"
         @click="onCancelTranslations"
       />
       <FSButton
         v-if="$props.editable"
         prependIcon="mdi-check"
         color="primary"
+        width="100%"
         :label="$tr('ui.translateRichTextField.validateButton.label', 'Validate translations')"
-        :fullWidth="true"
         @click="onSubmitTranslations"
       />
     </FSRow>
@@ -68,8 +68,8 @@
       <FSButton
         prependIcon="mdi-translate"
         color="primary"
+        width="100%"
         :label="$tr('ui.translateRichTextField.translateButton.label', 'Manage translations')"
-        :fullWidth="true"
         @click="() => $emit('update:translationsExpanded', true)"
       />
     </template>

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@dative-gpi/foundation-shared-components",
   "sideEffects": false,
-  "version": "1.0.16",
+  "version": "1.0.17",
   "description": "",
   "publishConfig": {
     "access": "public"
@@ -10,8 +10,8 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@dative-gpi/foundation-shared-domain": "1.0.16",
-    "@dative-gpi/foundation-shared-services": "1.0.16"
+    "@dative-gpi/foundation-shared-domain": "1.0.17",
+    "@dative-gpi/foundation-shared-services": "1.0.17"
   },
   "peerDependencies": {
     "@dative-gpi/bones-ui": "^0.0.75",
@@ -35,5 +35,5 @@
     "sass": "1.71.1",
     "sass-loader": "13.3.2"
   },
-  "gitHead": "ed54fe2f03db8e7af8bbf5fcc585a2b4cd52f52e"
+  "gitHead": "83f8eb02faf9ad8eb20422e4f02a5da6ec46e2d2"
 }