@dative-gpi/foundation-shared-components 1.0.139 → 1.0.140-selectable

package/components/fields/FSDateTimeRangeField.vue

@@ -6,7 +6,7 @@
     :color="$props.color"
     :hideHeader="$props.hideHeader"
     :required="$props.required"
-    :editable="$props.editable"
+    :disabled="$props.disabled"
     :readonly="true"
     :rules="$props.rules"
     :messages="messages"
@@ -26,7 +26,7 @@
         <FSButton
           variant="icon"
           icon="mdi-calendar"
-          :editable="$props.editable"
+          :disabled="$props.disabled"
           :color="ColorEnum.Dark"
         />
       </slot>
@@ -41,66 +41,34 @@
       />
     </template>
   </FSTextField>
-  <FSDialogSubmit
+  <FSDateTimeRangeDialog
     :title="$props.label"
     :submitButtonColor="$props.color"
-    @click:submitButton="onSubmit"
-    v-model="dialog"
-  >
-    <template
-      #body
-    >
-      <FSCol>
-        <FSCalendarTwin
-          :color="$props.color"
-          v-model="innerDateRange"
-        />
-        <FSRow>
-          <FSCol>
-            <FSClock
-              :color="$props.color"
-              :date="innerDateLeft"
-              v-model="innerTimeLeft"
-            />
-          </FSCol>
-          <FSCol>
-            <FSClock
-              :color="$props.color"
-              :date="innerDateRight"
-              v-model="innerTimeRight"
-            />
-          </FSCol>
-        </FSRow>
-      </FSCol>
-    </template>
-  </FSDialogSubmit>
+    :dialog="dialog"
+    :modelValue="$props.modelValue"
+    :color="$props.color"
+    @cancel="dialog = false"
+    @update:modelValue="onSubmit($event)"
+  />
 </template>
 
 <script lang="ts">
-import { computed, defineComponent, type PropType, ref, watch } from "vue";
+import { computed, defineComponent, type PropType, ref } from "vue";
 
 import { type ColorBase, ColorEnum } from "@dative-gpi/foundation-shared-components/models";
-import { useAppTimeZone, useDateFormat } from "@dative-gpi/foundation-shared-services/composables";
+import { useDateFormat } from "@dative-gpi/foundation-shared-services/composables";
 import { useRules } from "@dative-gpi/foundation-shared-components/composables";
 
-import FSDialogSubmit from "../FSDialogSubmit.vue";
-import FSCalendarTwin from "../FSCalendarTwin.vue";
+import FSDateTimeRangeDialog from "./FSDateTimeRangeDialog.vue";
 import FSTextField from "./FSTextField.vue";
 import FSButton from "../FSButton.vue";
-import FSClock from "../FSClock.vue";
-import FSCol from "../FSCol.vue";
-import FSRow from "../FSRow.vue";
 
 export default defineComponent({
   name: "FSDateTimeRangeField",
   components: {
-    FSDialogSubmit,
-    FSCalendarTwin,
+    FSDateTimeRangeDialog,
     FSTextField,
-    FSButton,
-    FSClock,
-    FSCol,
-    FSRow
+    FSButton
   },
   props: {
     label: {
@@ -138,24 +106,19 @@ export default defineComponent({
       required: false,
       default: () => []
     },
-    editable: {
+    disabled: {
       type: Boolean,
       required: false,
-      default: true
+      default: false
     }
   },
   emits: ["update:modelValue"],
   setup(props, { emit }) {
-    const { getUserOffset } = useAppTimeZone();
     const { epochToShortTimeFormat } = useDateFormat();
     const { validateOn, getMessages } = useRules();
 
     const dialog = ref(false);
 
-    const innerDateRange = ref<number[] | null>(null);
-    const innerTimeRight = ref(0);
-    const innerTimeLeft = ref(0);
-
     const toShortTimeFormat = computed((): string => {
       if (!props.modelValue || !Array.isArray(props.modelValue) || !props.modelValue.length) {
         return "";
@@ -163,88 +126,32 @@ export default defineComponent({
       return props.modelValue.map((epoch) => epochToShortTimeFormat(epoch)).join(" - ");
     });
 
-    const innerDateLeft = computed((): number | null => {
-      if (innerDateRange.value && Array.isArray(innerDateRange.value) && innerDateRange.value.length) {
-        return innerDateRange.value[0];
-      }
-      return null;
-    });
-
-    const innerDateRight= computed((): number | null => {
-      if (innerDateRange.value && Array.isArray(innerDateRange.value) && innerDateRange.value.length > 1) {
-        return innerDateRange.value[1];
-      }
-      return null;
-    });
-
     const messages = computed((): string[] => getMessages(props.modelValue, props.rules, true));
 
     const onClick = (): void => {
-      if (props.editable) {
+      if (!props.disabled) {
         dialog.value = true;
       }
     };
 
-    const onClear = (): void => {
-      emit("update:modelValue", null);
-      innerTimeLeft.value = 0;
-      innerTimeRight.value = 0;
-      innerDateRange.value = null;
-    };
-
-    const onSubmit = (): void => {
-      if (innerDateRange.value && Array.isArray(innerDateRange.value) && innerDateRange.value.length > 1) {
-        emit("update:modelValue", [innerDateRange.value[0] + innerTimeLeft.value, innerDateRange.value[1] + innerTimeRight.value]);
-      }
+    const onSubmit = (value: number[]): void => {
+      emit("update:modelValue", value);
       dialog.value = false;
     };
 
-    const reset = (): void => {
-      if (props.modelValue && Array.isArray(props.modelValue)) {
-        // FSClock just gives two numbers without consideration for the time zone
-        // We must adjust the time to the user's time zone
-        switch (props.modelValue.length) {
-          case 0: {
-            break;
-          }
-          case 1: {
-            innerTimeLeft.value = Math.floor((props.modelValue[0] + getUserOffset(props.modelValue[0])) % (24 * 60 * 60 * 1000));
-            innerDateRange.value = [props.modelValue[0] - innerTimeLeft.value];
-            break;
-          }
-          default: {
-            innerTimeLeft.value = Math.floor((props.modelValue[0] + getUserOffset(props.modelValue[0])) % (24 * 60 * 60 * 1000));
-            innerTimeRight.value = Math.floor((props.modelValue[1] + getUserOffset(props.modelValue[1])) % (24 * 60 * 60 * 1000));
-            innerDateRange.value = [props.modelValue[0] - innerTimeLeft.value, props.modelValue[1] - innerTimeRight.value];
-            break;
-          }
-        }
-      }
-      else {
-        innerDateRange.value = null;
-        innerTimeLeft.value = 0;
-        innerTimeRight.value = 0;
-      }
+    const onClear = (): void => {
+      emit("update:modelValue", null);
     };
 
-    watch(() => props.modelValue, () => {
-      reset();
-    }, { immediate: true });
-
     return {
       toShortTimeFormat,
-      innerDateLeft,
-      innerTimeLeft,
-      innerDateRight,
-      innerTimeRight,
-      innerDateRange,
       validateOn,
       ColorEnum,
       messages,
       dialog,
       onSubmit,
       onClear,
-      onClick
+      onClick,
     };
   }
 });

package/components/fields/FSEntityFieldUI.vue

@@ -3,7 +3,7 @@
     :description="$props.description"
     :hideHeader="$props.hideHeader"
     :required="$props.required"
-    :editable="$props.editable"
+    :disabled="$props.disabled"
     :label="$props.label"
     :messages="messages"
   >
@@ -14,7 +14,7 @@
         :wrap="false"
       >
         <FSSelectField
-          :editable="$props.editable"
+          :disabled="$props.disabled"
           :items="actualEntityTypes"
           :hideHeader="true"
           :clearable="false"
@@ -27,7 +27,7 @@
           <FSButton
             icon="mdi-pencil"
             :label="$tr('ui.common.edit', 'Edit')"
-            :editable="$props.editable"
+            :disabled="$props.disabled"
             @click="$emit('click:select')"
           />
         </template>
@@ -37,7 +37,7 @@
           <FSButton
             icon="mdi-plus-circle-multiple-outline"
             :label="$tr('ui.common.select', 'Select')"
-            :editable="$props.editable"
+            :disabled="$props.disabled"
             @click="$emit('click:select')"
           />
         </template>
@@ -170,10 +170,10 @@ export default defineComponent({
       required: false,
       default: null
     },
-    editable: {
+    disabled: {
       type: Boolean,
       required: false,
-      default: true
+      default: false
     },
     entityType: {
       type: Number as PropType<EntityType>,

package/components/fields/FSGradientField.vue

@@ -6,7 +6,7 @@
       :label="$props.label"
       :description="$props.description"
       :required="$props.required"
-      :editable="$props.editable"
+      :disabled="$props.disabled"
       v-bind="$attrs"
     >
       <FSRow>
@@ -15,14 +15,14 @@
           :allowOpacity="$props.allowOpacity"
           :modelValue="$props.modelValue[colorIndex - 1]"
           :required="$props.required"
-          :editable="$props.editable"
+          :disabled="$props.disabled"
           :key="colorIndex"
           @update:modelValue="$emit('update:modelValue', $props.modelValue.map((color, i) => colorIndex === i + 1 ? $event : color))"
         />
       </FSRow>
       <FSSelectField
         class="fs-gradient-field-select"
-        :editable="$props.editable"
+        :disabled="$props.disabled"
         :clearable="false"
         :items="items"
         modelValue="custom"
@@ -92,10 +92,10 @@ export default defineComponent({
       required: false,
       default: false
     },
-    editable: {
+    disabled: {
       type: Boolean,
       required: false,
-      default: true
+      default: false
     },
     allowOpacity: {
       type: Boolean,

package/components/fields/FSIconField.vue

@@ -5,7 +5,7 @@
       :description="$props.description"
       :hideHeader="$props.hideHeader"
       :required="$props.required"
-      :editable="$props.editable"
+      :disabled="$props.disabled"
       :rules="$props.rules"
       :messages="messages"
       :validateOn="validateOn"
@@ -34,7 +34,7 @@
       :activeColor="$props.activeColor"
       :modelValue="$props.modelValue"
       :required="$props.required"
-      :editable="$props.editable"
+      :disabled="$props.disabled"
       :values="icons"
       @update:modelValue="$emit('update:modelValue', $event)"
     />
@@ -42,7 +42,7 @@
 </template>
 
 <script lang="ts">
-import type { PropType} from "vue";
+import type { PropType, StyleValue } from "vue";
 import { computed, defineComponent, ref, watch } from "vue";
 
 import { Icons, sortByLevenshteinDistance } from "@dative-gpi/foundation-shared-components/utils";
@@ -119,10 +119,10 @@ export default defineComponent({
       required: false,
       default: () => []
     },
-    editable: {
+    disabled: {
       type: Boolean,
       required: false,
-      default: true
+      default: false
     }
   },
   emits: ["update:modelValue"],
@@ -138,7 +138,7 @@ export default defineComponent({
     const innerValue = ref<string | null>(null);
 
     const style = computed((): StyleValue => {
-      if (!props.editable) {
+      if (props.disabled) {
         return {
           "--fs-icon-field-color": lights.dark
         };

package/components/fields/FSMagicConfigField.vue

@@ -3,10 +3,11 @@
     class="fs-magic-config-field"
   >
     <component
+      v-if="$props.type"
       class="fs-magic-config-field-value"
       :is="get($props.type)"
       :label="$tr('ui.common.value', 'Value')"
-      :editable="$props.editable"
+      :disabled="$props.disabled"
       :required="true"
       :rules="rules"
       :modelValue="valueToInput"
@@ -17,7 +18,7 @@
     >
       <FSTranslateField
         :label="$tr('ui.common.label', 'Label')"
-        :editable="$props.editable"
+        :disabled="$props.disabled"
         :modelValue="$props.labelDefault"
         :translations="$props.translations"
         @update:modelValue="$emit('update:labelDefault', $event)"
@@ -80,10 +81,10 @@ export default defineComponent({
       required: false,
       default: () => []
     },
-    editable: {
+    disabled: {
       type: Boolean,
       required: false,
-      default: true
+      default: false
     }
   },
   emits: ["click:remove", "click:add", "update:modelValue", "update:labelDefault", "update:translations"],

package/components/fields/FSNumberField.vue

@@ -2,7 +2,7 @@
   <FSTextField
     class="fs-number-field"
     minWidth="80px"
-    :editable="$props.editable"
+    :disabled="$props.disabled"
     :modelValue="$props.modelValue?.toString()"
     @update:modelValue="onUpdate"
     v-bind="$attrs"
@@ -35,10 +35,10 @@ export default defineComponent({
       required: false,
       default: null
     },
-    editable: {
+    disabled: {
       type: Boolean,
       required: false,
-      default: true
+      default: false
     }
   },
   emits: ["update:modelValue"],

package/components/fields/FSPasswordField.vue

@@ -1,7 +1,7 @@
 <template>
   <FSTextField
     :type="type"
-    :editable="$props.editable"
+    :disabled="$props.disabled"
     :modelValue="$props.modelValue"
     @update:modelValue="$emit('update:modelValue', $event)"
     v-bind="$attrs"
@@ -20,7 +20,7 @@
     >
       <FSButton
         variant="icon"
-        :editable="$props.editable"
+        :disabled="$props.disabled"
         :color="ColorEnum.Dark"
         :icon="icon"
         @click="onToggle"
@@ -33,7 +33,7 @@
 </template>
 
 <script lang="ts">
-import { computed, defineComponent, type PropType, ref } from "vue";
+import { computed, defineComponent, ref, type PropType, type StyleValue } from "vue";
 
 import { useColors } from "@dative-gpi/foundation-shared-components/composables";
 import { ColorEnum } from "@dative-gpi/foundation-shared-components/models";
@@ -53,10 +53,10 @@ export default defineComponent({
       required: false,
       default: null
     },
-    editable: {
+    disabled: {
       type: Boolean,
       required: false,
-      default: true
+      default: false
     }
   },
   emits: ["update:modelValue"],
@@ -69,7 +69,7 @@ export default defineComponent({
     const stars = ref(true);
 
     const style = computed((): StyleValue => {
-      if (!props.editable) {
+      if (props.disabled) {
         return {
           "--fs-password-field-cursor"   : "default",
           "--fs-password-field-color": lights.dark,
@@ -88,7 +88,7 @@ export default defineComponent({
     const icon = computed((): string => stars.value ? "mdi-eye-off-outline" : "mdi-eye-outline");
 
     const onToggle = (): void => {
-      if (!props.editable) {
+      if (props.disabled) {
         return;
       }
       stars.value = !stars.value;

package/components/fields/FSRichTextField.vue

@@ -30,7 +30,7 @@
         </FSRow>
       </slot>
       <FSRow
-        v-if="$props.editable"
+        v-if="!$props.disabled"
         align="center-right"
         :wrap="false"
       >
@@ -193,7 +193,7 @@
       <div
         class="fs-rich-text-field-content"
         :data-variable-values="variableValues"
-        :contenteditable="!readonly && $props.editable && !loading"
+        :contenteditable="!readonly && !$props.disabled && !loading"
         :data-readonly="$props.variant === 'readonly'"
         :id="id"
       />
@@ -204,7 +204,7 @@
     </div>
 
     <FSTextField
-      v-if="isLink && !readonly && $props.editable"
+      v-if="isLink && !readonly && !$props.disabled"
       :hideHeader="true"
       @keypress.enter.stop="toggleLink"
       v-model="linkUrl"
@@ -310,10 +310,10 @@ export default defineComponent({
       required: false,
       default: () => ({})
     },
-    editable: {
+    disabled: {
       type: Boolean,
       required: false,
-      default: true
+      default: false
     }
   },
   emits: ["update:modelValue"],
@@ -400,7 +400,7 @@ export default defineComponent({
       }
       switch (props.variant) {
         case "standard": {
-          if (!props.editable) {
+          if (props.disabled) {
             return {
               "--fs-rich-text-field-undo-cursor"        : "default",
               "--fs-rich-text-field-icon-cursor"        : "default",
@@ -450,7 +450,7 @@ export default defineComponent({
     });
 
     const toolbarColors = computed((): { [code: string]: string } => {
-      if (props.editable) {
+      if (!props.disabled) {
         return {
           undo: canUndo.value ? darks.base : lights.base,
           bold: isBold.value ? darks.base : lights.base,
@@ -501,11 +501,11 @@ export default defineComponent({
           return;
         }
         const editorModelValue = JSON.stringify(editorState.toJSON());
-        if(editorModelValue === emptyLexicalState) {
+        if(editorModelValue === emptyLexicalState && props.modelValue !== null) {
           emit("update:modelValue", null);
           return;
         }
-        if(editorModelValue !== props.modelValue) {
+        if(editorModelValue !== emptyLexicalState && editorModelValue !== props.modelValue) {
           emit("update:modelValue", editorModelValue);
         }
       });
@@ -674,21 +674,16 @@ export default defineComponent({
         return;
       }
       if (props.modelValue != null) {
-        editor.update(() => {
-          if (typeof props.modelValue === "string") {
-            if (props.modelValue !== "") {
-              editor.setEditorState(editor.parseEditorState(props.modelValue!));
-            }
-          }
-          else {
-            editor.setEditorState(editor.parseEditorState(JSON.stringify(props.modelValue)));
-          }
-        });
-        return;
+        if (typeof props.modelValue === "string" && props.modelValue !== "") {
+          editor.setEditorState(editor.parseEditorState(props.modelValue!));
+          return;
+        }
+        if (typeof props.modelValue === "object") {
+          editor.setEditorState(editor.parseEditorState(JSON.stringify(props.modelValue)));
+          return;
+        }
       }
-      editor.update(() => {
-        editor.setEditorState(editor.parseEditorState(emptyLexicalState));
-      });
+      editor.setEditorState(editor.parseEditorState(emptyLexicalState));
     }
 
     watch(() => props.modelValue, () => {