@fishawack/lab-velocity 2.0.0-beta.36 → 2.0.0-beta.38

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,30 +28,22 @@
         >
             <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>
                 <div class="el-select-dropdown__loading">Loading...</div>
             </template>
+            <template #label="{ value }">
+                {{ value[labelKey] }}
+            </template>
         </el-select>
     </XInput>
 </template>
@@ -117,7 +110,7 @@ export default {
         },
         valueKey: {
             type: String,
-            default: "id",
+            default: null,
         },
         searchParam: {
             type: String,
@@ -155,6 +148,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 +216,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 +274,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/AuthModule/js/router.js

@@ -63,10 +63,24 @@ export function adminRoutes(node, overrides = {}) {
             [
                 ...resourceRoutes(
                     node,
-                    ...merge(teamResource, [undefined, overrideTeamResource]),
+                    ...merge(teamResource, [
+                        undefined,
+                        merge(overrideCompanyResource, {
+                            routeName: "companies.teams",
+                        }),
+                    ]),
                 ),
             ],
         ),
+        ...resourceRoutes(
+            node,
+            ...merge(teamResource, [
+                undefined,
+                merge(overrideCompanyResource, {
+                    routeName: "teams",
+                }),
+            ]),
+        ),
     ];
 }
 

package/_Build/vue/modules/AuthModule/routes/PCompanies/resource.js

@@ -199,7 +199,7 @@ export default [
                                             size: "large",
                                             onClick: () => {
                                                 $router.push({
-                                                    name: `${resource.slug}.create`,
+                                                    name: `companies.${resource.routeName}.create`,
                                                 });
                                             },
                                         },

package/_Build/vue/modules/AuthModule/routes/PTeams/resource.js

@@ -15,6 +15,7 @@ import VelRoleLegend from "../../../../components/layout/RoleLegend.vue";
 import VelTableSorter from "../../../../components/layout/TableSorter.vue";
 import VelButton from "../../../../components/basic/Button.vue";
 import VelCheckbox from "../../../../components/form/Checkbox.vue";
+import VelSelect from "../../../../components/form/Select.vue";
 
 export default [
     "teams",
@@ -48,12 +49,33 @@ export default [
                 {
                     key: "company_id",
                     label: "Company",
-                    class: "hidden",
+                    endpoint: "api/companies",
+                    labelKey: "name",
+                    filterable: true,
+                    searchParam: "name",
+                    condition: {
+                        form: {
+                            write: ({ $route, model }) =>
+                                !$route.params.companiesId && !model?.company,
+                        },
+                    },
+                    initial: ({ model, $route }) =>
+                        model?.company ||
+                        ($route.params.companiesId && {
+                            id: $route.params.companiesId,
+                        }),
+                    preparation: ({ form }) => form.company_id?.id,
                     render: {
                         read: ({ model }) => h("span", model.company.name),
+                        write: () => h(VelSelect),
+                    },
+                },
+                {
+                    key: "user_count",
+                    label: "Users",
+                    condition: {
+                        form: false,
                     },
-                    initial: ({ $route, model }) =>
-                        model?.company_id || $route.params.companiesId || null,
                 },
                 {
                     key: "roles",

package/package.json

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