cja-phoenix 1.2.20 → 1.2.21

package/dist/module.json

@@ -1,7 +1,7 @@
 {
   "name": "cja-phoenix",
   "configKey": "cja-phoenix",
-  "version": "1.2.20",
+  "version": "1.2.21",
   "builder": {
     "@nuxt/module-builder": "1.0.2",
     "unbuild": "3.6.1"

package/dist/runtime/components/form/SliderInput.d.vue.ts

@@ -1,17 +1,17 @@
-import { type InputHTMLAttributes } from 'vue';
-import type { Lazy, Schema } from 'yup';
+import { type InputHTMLAttributes } from "vue";
+import type { Lazy, Schema } from "yup";
 type __VLS_Props = {
     title?: string;
     label?: string;
     tooltip?: string;
-    layout?: 'vertical' | 'horizontal';
-    size?: 'sm' | 'md' | 'lg';
-    disabled?: InputHTMLAttributes['disabled'];
+    layout?: "vertical" | "horizontal";
+    size?: "sm" | "md" | "lg";
+    disabled?: InputHTMLAttributes["disabled"];
     min: number;
     max: number;
     step: number;
     validation?: Schema | Lazy<any>;
-    validationMode?: 'change' | 'none';
+    validationMode?: "change" | "none";
     errorDisplay?: boolean;
 };
 declare const __VLS_defaultModels: {

package/dist/runtime/components/form/SliderInput.vue

@@ -18,21 +18,12 @@
         v-model="model"
         type="range"
         :aria-label="label || title"
-      >
-      <div
-        v-if="$slots.max || $slots.min"
-        class="label-container"
-      >
-        <div
-          v-if="$slots.min"
-          class="min"
-        >
+      />
+      <div v-if="$slots.max || $slots.min" class="label-container">
+        <div v-if="$slots.min" class="min">
           <slot name="min" />
         </div>
-        <div
-          v-if="$slots.max"
-          class="max"
-        >
+        <div v-if="$slots.max" class="max">
           <slot name="max" />
         </div>
       </div>
@@ -167,7 +158,7 @@ $sliderProgress: calc(
     display: grid;
     grid-template-columns: repeat(2, 1fr);
     gap: 16px;
-    margin-top: 8px;
+    margin-top: 12px;
     font-size: 14px;
     line-height: 18px;
 

package/dist/runtime/components/form/SliderInput.vue.d.ts

@@ -1,17 +1,17 @@
-import { type InputHTMLAttributes } from 'vue';
-import type { Lazy, Schema } from 'yup';
+import { type InputHTMLAttributes } from "vue";
+import type { Lazy, Schema } from "yup";
 type __VLS_Props = {
     title?: string;
     label?: string;
     tooltip?: string;
-    layout?: 'vertical' | 'horizontal';
-    size?: 'sm' | 'md' | 'lg';
-    disabled?: InputHTMLAttributes['disabled'];
+    layout?: "vertical" | "horizontal";
+    size?: "sm" | "md" | "lg";
+    disabled?: InputHTMLAttributes["disabled"];
     min: number;
     max: number;
     step: number;
     validation?: Schema | Lazy<any>;
-    validationMode?: 'change' | 'none';
+    validationMode?: "change" | "none";
     errorDisplay?: boolean;
 };
 declare const __VLS_defaultModels: {

package/dist/runtime/composables/useValidateForm.d.ts

@@ -3,11 +3,9 @@ export declare const useValidateForm: (options: {
     fields?: Ref[];
     onSubmit?: () => void | Promise<void>;
     onError?: () => void;
-    forceValidation?: boolean;
-    submitLock?: boolean;
 }) => {
     validForm: Ref<boolean, boolean>;
-    validate: () => void;
-    submit: () => void;
+    validate: () => Promise<void>;
+    submit: () => Promise<void>;
     submitLock: Ref<boolean, boolean>;
 };

package/dist/runtime/composables/useValidateForm.js

@@ -2,33 +2,31 @@ import { ref } from "vue";
 export const useValidateForm = (options) => {
   const validForm = ref(false);
   const submitLock = ref(false);
-  const validate = () => {
+  const validate = async () => {
     const fields = options.fields?.filter((f) => f.value);
-    fields?.forEach(async (f) => await f.value.validate());
+    if (fields) {
+      for (let i = 0; i < fields.length; i++) {
+        const field = fields[i];
+        await field.value.validate();
+      }
+    }
     validForm.value = fields?.every((f) => f.value.meta.valid) ?? true;
   };
-  const executeCallback = async () => {
+  const submit = async () => {
+    await validate();
     if (validForm.value) {
-      if (options.submitLock && !submitLock.value || !options.submitLock) {
+      if (!submitLock.value) {
+        console.log("Toggle submitLock");
         submitLock.value = true;
+        console.log("Executing callback");
         await options.onSubmit?.();
+        console.log("Toggle submitLock");
         submitLock.value = false;
       }
     } else {
       options.onError?.();
     }
   };
-  const submit = () => {
-    validate();
-    if (options.forceValidation) {
-      setTimeout(() => {
-        validate();
-        executeCallback();
-      }, 1);
-    } else {
-      executeCallback();
-    }
-  };
   return {
     validForm,
     validate,

package/dist/runtime/utils/updateForm.js

@@ -1,6 +1,7 @@
-import { useRuntimeConfig } from "#imports";
+import { useRoute, useRuntimeConfig } from "#imports";
 export const updateForm = (options) => {
   const { apiURL } = useRuntimeConfig().public;
+  const route = useRoute();
   return fetch(new URL("/core/apis/data/updateForm", apiURL), {
     method: "PUT",
     body: JSON.stringify(
@@ -14,7 +15,7 @@ export const updateForm = (options) => {
           sentToDialer: options.sentToDialer || true,
           lastStepNumber: options.step,
           lastStepType: options.formType,
-          lastStepUrl: window.location.pathname + window.location.search + window.location.hash,
+          lastStepUrl: route.fullPath,
           data: JSON.stringify({
             ...options.payload,
             formType: options.formType

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cja-phoenix",
-  "version": "1.2.20",
+  "version": "1.2.21",
   "description": "Phoenix utility",
   "repository": "comparaja/phoenix",
   "license": "MIT",