@fishawack/lab-velocity 2.0.0-beta.35 → 2.0.0-beta.37

package/_Build/vue/components/form/Select.vue

@@ -20,6 +20,7 @@
             :remote-method="endpoint ? handleSearch : undefined"
             :loading="initialLoading"
             :empty-values="[null, undefined]"
+            :value-key="effectiveValueKey"
             @change="handleInput"
             @clear="$emit('clear')"
             @blur="$emit('blur')"
@@ -27,25 +28,14 @@
         >
             <template #default>
                 <slot name="default">
-                    <template v-if="!currentOptions[0]?.label">
-                        <el-option
-                            v-for="(label, value) in currentOptions"
-                            :key="value"
-                            :label="label"
-                            :value="castValue(value)"
-                        >
-                        </el-option>
-                    </template>
-                    <template v-else>
-                        <el-option
-                            v-for="option in currentOptions"
-                            :key="option.value"
-                            :label="option.label"
-                            :disabled="option.disabled"
-                            :value="option"
-                        >
-                        </el-option>
-                    </template>
+                    <el-option
+                        v-for="option in currentOptions"
+                        :key="option[effectiveValueKey]"
+                        :label="option[labelKey]"
+                        :disabled="option.disabled"
+                        :value="option"
+                    >
+                    </el-option>
                 </slot>
             </template>
             <template v-if="endpoint" #loading>
@@ -117,7 +107,7 @@ export default {
         },
         valueKey: {
             type: String,
-            default: "id",
+            default: null,
         },
         searchParam: {
             type: String,
@@ -155,6 +145,14 @@ export default {
             }
             return this.options;
         },
+        effectiveValueKey() {
+            // If valueKey was explicitly provided, use it
+            if (this.valueKey !== null) {
+                return this.valueKey;
+            }
+            // Otherwise, use "id" for endpoints, "value" for static options
+            return this.endpoint ? "id" : "value";
+        },
     },
 
     mounted() {
@@ -215,35 +213,28 @@ export default {
     },
 
     methods: {
-        castValue(value) {
-            if (
-                !_.isNull(value) &&
-                typeof value === "string" &&
-                value !== "" &&
-                !isNaN(Number(value))
-            ) {
-                return parseInt(value);
-            }
-            return value;
-        },
-
         async handleVisibleChange(visible) {
             // Load data when dropdown is opened for the first time
             if (visible && this.endpoint && !this.initialLoadDone) {
-                await this.fetchOptions(1, "");
-                this.initialLoadDone = true;
+                await this.handleSearch("");
             }
         },
 
         async handleSearch(query) {
             if (!this.endpoint) return;
-            if (query === this.lastSearchQuery) return;
 
-            this.searchQuery = query;
-            this.lastSearchQuery = query;
-            this.currentPage = 1;
-            this.asyncOptions = [];
-            await this.fetchOptions(1, query);
+            // For initial load, allow empty query even if it matches lastSearchQuery
+            if (!this.initialLoadDone || query !== this.lastSearchQuery) {
+                this.searchQuery = query;
+                this.lastSearchQuery = query;
+                this.currentPage = 1;
+                this.asyncOptions = [];
+                await this.fetchOptions(1, query);
+
+                if (!this.initialLoadDone) {
+                    this.initialLoadDone = true;
+                }
+            }
         },
 
         handleEndReached(direction) {
@@ -280,18 +271,11 @@ export default {
                 const data = response.data.data || [];
                 const meta = response.data.meta;
 
-                // Transform API data to option format
-                const newOptions = data.map((item) => ({
-                    label: item[this.labelKey],
-                    value: item[this.valueKey],
-                    disabled: item.disabled || false,
-                }));
-
                 // If it's the first page, replace options, otherwise append
                 if (page === 1) {
-                    this.asyncOptions = newOptions;
+                    this.asyncOptions = data;
                 } else {
-                    this.asyncOptions = [...this.asyncOptions, ...newOptions];
+                    this.asyncOptions = [...this.asyncOptions, ...data];
                 }
 
                 this.currentPage = page;

package/_Build/vue/modules/resource/Children/create.vue

@@ -51,7 +51,7 @@ export default {
             if (this.resource.form.submit) {
                 await this.resource.form.submit(this);
             } else {
-                const hold = this.form.data();
+                const hold = JSON.parse(JSON.stringify(this.form.data()));
 
                 try {
                     this.form.populate(this.resource.form.preparation(this));

package/_Build/vue/modules/resource/Children/edit.vue

@@ -76,7 +76,7 @@ export default {
             if (this.resource.form.submit) {
                 await this.resource.form.submit(this);
             } else {
-                const hold = this.form.data();
+                const hold = JSON.parse(JSON.stringify(this.form.data()));
 
                 try {
                     this.form.populate(this.resource.form.preparation(this));

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@fishawack/lab-velocity",
-    "version": "2.0.0-beta.35",
+    "version": "2.0.0-beta.37",
     "description": "Avalere Health branded style system",
     "scripts": {
         "setup": "npm ci || npm i && npm run content",