@fishawack/lab-velocity 2.0.0-beta.40 → 2.0.0-beta.42

package/_Build/vue/components/layout/TableSorter.vue

@@ -104,6 +104,7 @@
 
 <script>
 import axios from "axios";
+import { debounce } from "lodash";
 import { ElPagination } from "element-plus";
 import VelButton from "../basic/Button.vue";
 import VelBasic from "../form/basic.vue";
@@ -163,16 +164,28 @@ export default {
             query: {},
             table_data: [],
             table_meta: null,
+            _abortController: null,
         };
     },
 
+    created() {
+        this.debouncedSearch = debounce(this._executeSearch, 300);
+    },
+
+    beforeUnmount() {
+        this.debouncedSearch.cancel();
+        this._abortController?.abort();
+    },
+
     mounted() {
         this.sort = this.jsonData.defaultSort || "-id";
         this.fetchData({ page: 1 }).then((data) => {
-            this.table_data = data.data;
-            this.table_meta = data.meta;
+            if (data) {
+                this.table_data = data.data;
+                this.table_meta = data.meta;
 
-            this.table_curr_page = this.table_meta.current_page;
+                this.table_curr_page = this.table_meta.current_page;
+            }
         });
     },
 
@@ -180,8 +193,10 @@ export default {
         reload() {
             this.fetchData({ page: this.table_meta.current_page }).then(
                 (data) => {
-                    this.table_data = data.data;
-                    this.table_meta = data.meta;
+                    if (data) {
+                        this.table_data = data.data;
+                        this.table_meta = data.meta;
+                    }
                 },
             );
         },
@@ -193,9 +208,14 @@ export default {
                     [`filter[${this.$refs.search.$el.dataset.key}]`]: data,
                 };
             }
+            this.debouncedSearch();
+        },
+        _executeSearch() {
             this.fetchData({}).then((data) => {
-                this.table_data = data.data;
-                this.table_meta = data.meta;
+                if (data) {
+                    this.table_data = data.data;
+                    this.table_meta = data.meta;
+                }
             });
         },
         handleSort(data) {
@@ -206,12 +226,17 @@ export default {
                     data.order === "ascending" ? data.prop : "-" + data.prop;
             }
             this.fetchData({}).then((data) => {
-                this.table_data = data.data;
-                this.table_meta = data.meta;
+                if (data) {
+                    this.table_data = data.data;
+                    this.table_meta = data.meta;
+                }
             });
         },
 
         fetchData: function ({ page = "1" }) {
+            this._abortController?.abort();
+            this._abortController = new AbortController();
+
             return axios
                 .get(`${this.$props.jsonData.api}`, {
                     params: {
@@ -220,9 +245,12 @@ export default {
                         ...this.query,
                         ...this.apiParams,
                     },
+                    signal: this._abortController.signal,
                 })
                 .then((res) => res.data)
-                .catch(console.log);
+                .catch((err) => {
+                    if (!axios.isCancel(err)) console.log(err);
+                });
         },
 
         getStatusLabel(status) {
@@ -238,8 +266,10 @@ export default {
 
         handleCurrentPageChange(val) {
             this.fetchData({ page: val }).then((data) => {
-                this.table_data = data.data;
-                this.table_meta = data.meta;
+                if (data) {
+                    this.table_data = data.data;
+                    this.table_meta = data.meta;
+                }
             });
         },
 

package/_Build/vue/modules/AuthModule/js/router.js

@@ -1,22 +1,22 @@
 "use strict";
 
-import { merge } from "lodash";
-
 import { h } from "vue";
 import { RouterView } from "vue-router";
 
 import { routes as resourceRoutes } from "../../resource/index.js";
 
-import userResource from "../routes/PUsers/resource.js";
-import companyResource from "../routes/PCompanies/resource.js";
-import teamResource from "../routes/PTeams/resource.js";
+import defaultUserResource from "../routes/PUsers/resource.js";
+import defaultCompanyResource from "../routes/PCompanies/resource.js";
+import defaultTeamResource from "../routes/PTeams/resource.js";
+import defaultIntegrationResource from "../routes/PIntegrations/resource.js";
 
 // Admin routes export - minimal auth flow (headless login only)
 export function adminRoutes(node, overrides = {}) {
     const {
-        userResource: overrideUserResource = {},
-        companyResource: overrideCompanyResource = {},
-        teamResource: overrideTeamResource = {},
+        userResource = defaultUserResource,
+        companyResource = defaultCompanyResource,
+        teamResource = defaultTeamResource,
+        integrationResource = defaultIntegrationResource,
     } = overrides;
 
     return [
@@ -53,34 +53,18 @@ export function adminRoutes(node, overrides = {}) {
                 },
             ],
         },
-        ...resourceRoutes(
-            node,
-            ...merge(userResource, [undefined, overrideUserResource]),
-        ),
-        ...resourceRoutes(
-            node,
-            ...merge(companyResource, [undefined, overrideCompanyResource]),
-            [
-                ...resourceRoutes(
-                    node,
-                    ...merge(teamResource, [
-                        undefined,
-                        merge(overrideCompanyResource, {
-                            routeName: "companies.teams",
-                        }),
-                    ]),
-                ),
-            ],
-        ),
-        ...resourceRoutes(
-            node,
-            ...merge(teamResource, [
-                undefined,
-                merge(overrideCompanyResource, {
-                    routeName: "teams",
-                }),
-            ]),
-        ),
+        ...resourceRoutes(node, ...userResource),
+        ...resourceRoutes(node, ...companyResource, [
+            ...resourceRoutes(node, teamResource[0], {
+                ...teamResource[1],
+                routeName: "companies.teams",
+            }),
+        ]),
+        ...resourceRoutes(node, teamResource[0], {
+            ...teamResource[1],
+            routeName: "teams",
+        }),
+        ...resourceRoutes(node, ...integrationResource),
     ];
 }
 

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

@@ -0,0 +1,268 @@
+import { h, resolveComponent } from "vue";
+import { ElInput } from "element-plus";
+
+import VelBasic from "../../../../components/form/basic.vue";
+import VelButton from "../../../../components/basic/Button.vue";
+import VelSelect from "../../../../components/form/Select.vue";
+import VelFormRole from "../../../../components/layout/FormRole.vue";
+import Chip from "../../../../components/layout/Chip.vue";
+import Chips from "../../../../components/layout/Chips.vue";
+
+export default [
+    {
+        key: "name",
+        sortable: true,
+    },
+    {
+        key: "primary_contact",
+        label: "Primary Contact",
+        condition: {
+            table: false,
+            form: {
+                write: ({ method }) => method === "patch",
+            },
+        },
+        preparation: ({ form }) => form.primary_contact?.id,
+        render: {
+            read: ({ model }) => h("span", model.primary_contact?.name),
+            write: ({ $route }) =>
+                h(VelSelect, {
+                    endpoint: `api/users`,
+                    params: {
+                        "filter[company_id]": $route.params.companiesId,
+                    },
+                    labelKey: "name",
+                    filterable: true,
+                    searchParam: "name",
+                }),
+        },
+    },
+    {
+        key: "primary_contact_email",
+        label: "Primary Contact Email",
+        condition: {
+            table: false,
+            form: false,
+        },
+        render: {
+            read: ({ model }) => h("span", model.primary_contact?.email),
+        },
+    },
+    {
+        key: "primary_contact_contacted",
+        label: "Primary Contact Contacted",
+        condition: {
+            table: false,
+            form: false,
+        },
+        render: {
+            read: ({ model }) =>
+                h("span", String(!!model.primary_contact_contacted)),
+        },
+    },
+    {
+        key: "domains",
+        condition: {
+            table: false,
+        },
+        initial: ({ model }) => model?.domains || [],
+        render: {
+            read: ({ model }) => h("span", model.domains.join(", ")),
+            write: ({ form }) =>
+                h("div", { class: "form__group vel-basic" }, [
+                    h("p", { class: "my-0" }, [
+                        "Domain/s ",
+                        h("sup", { class: "color-status-red-100" }, "*"),
+                    ]),
+                    h(
+                        "ul",
+                        { class: "list-none pl-0 mt mb-2" },
+                        form.domains.map((domain, index) =>
+                            h("li", { key: index, class: "mb-0.5" }, [
+                                h(
+                                    ElInput,
+                                    {
+                                        modelValue: form.domains[index],
+                                        "onUpdate:modelValue": (val) => {
+                                            form.domains[index] = val;
+                                        },
+                                        placeholder: "avalerehealth.com",
+                                    },
+                                    {
+                                        prepend: () => "@",
+                                        append: () =>
+                                            h(
+                                                VelButton,
+                                                {
+                                                    type: "danger",
+                                                    onClick: () =>
+                                                        form.domains.splice(
+                                                            index,
+                                                            1,
+                                                        ),
+                                                },
+                                                () =>
+                                                    h(
+                                                        resolveComponent(
+                                                            "GSvg",
+                                                        ),
+                                                        {
+                                                            class: "vel-icon",
+                                                            name: "icon-trash",
+                                                        },
+                                                    ),
+                                            ),
+                                    },
+                                ),
+                                form.errors?.has?.(`domains.${index}`) &&
+                                    h(
+                                        "small",
+                                        {
+                                            class: "form__error vel-basic__error",
+                                        },
+                                        form.errors.first(`domains.${index}`),
+                                    ),
+                            ]),
+                        ),
+                    ),
+                    h("div", [
+                        h(
+                            VelButton,
+                            {
+                                onClick: () => form.domains.push(""),
+                            },
+                            () => [
+                                "Add Domain ",
+                                h(resolveComponent("GIcon"), {
+                                    name: "icon-plus",
+                                    embed: true,
+                                    asis: true,
+                                    class: "fill-0 icon--0.5 ml",
+                                }),
+                            ],
+                        ),
+                    ]),
+                ]),
+        },
+    },
+    {
+        key: "seats",
+        label: "Available Seats",
+        type: "number",
+        min: 0,
+        condition: {
+            table: false,
+        },
+    },
+    {
+        key: "user_count",
+        label: "Total Users",
+        width: "150",
+        condition: {
+            form: false,
+        },
+    },
+    {
+        key: "sso_enabled",
+        label: "SSO Enabled",
+        condition: {
+            table: false,
+            form: false,
+        },
+    },
+    {
+        key: "roles",
+        label: "Role",
+        condition: {
+            description: false,
+            form: {
+                write: ({ $store }) => $store.getters.can("edit roles"),
+            },
+        },
+        initial: ({ model }) =>
+            model?.roles.map((val) => ({
+                label: val.label,
+                value: val.id,
+            })) || [],
+        preparation: ({ form }) =>
+            form.roles.map((d) => (typeof d === "object" ? d.value : d)),
+        render: {
+            read: ({ model }) =>
+                h(
+                    model.roles.length === 1 ? Chip : Chips,
+                    model.roles.length === 1
+                        ? {
+                              name: model.roles[0].name,
+                              label: model.roles[0].label,
+                          }
+                        : { array: model.roles },
+                ),
+            write: ({ model, form }) =>
+                h(VelFormRole, {
+                    overrides: model?.overrides_roles_and_permissions,
+                    form,
+                }),
+        },
+    },
+    {
+        key: "sso_type",
+        label: "Provider",
+        condition: {
+            table: false,
+            description: false,
+            form: {
+                write: ({ $store }) => $store.getters.can("edit sso"),
+            },
+        },
+        initial: ({ model }) => model?.sso_type || undefined,
+        preparation: ({ form }) => form.sso_type?.value,
+        render: {
+            write: () =>
+                h(VelSelect, {
+                    clearable: true,
+                    class: "mt-2",
+                    options: [
+                        { value: "azure", label: "azure" },
+                        { value: "google", label: "google" },
+                    ],
+                }),
+        },
+    },
+    {
+        key: "sso_client_id",
+        label: "Key",
+        condition: {
+            table: false,
+            description: false,
+            form: {
+                write: ({ $store }) => $store.getters.can("edit sso"),
+            },
+        },
+        initial: ({ model }) => model?.sso_client_id || undefined,
+    },
+    {
+        key: "sso_tenant",
+        label: "Tenant",
+        condition: {
+            table: false,
+            description: false,
+            form: {
+                write: ({ $store }) => $store.getters.can("edit sso"),
+            },
+        },
+        initial: ({ model }) => model?.sso_tenant || undefined,
+    },
+    {
+        key: "sso_client_secret",
+        label: "Secret",
+        type: "password",
+        condition: {
+            table: false,
+            description: false,
+            form: {
+                write: ({ $store }) => $store.getters.can("edit sso"),
+            },
+        },
+        initial: ({ model }) => model?.sso_client_secret || undefined,
+    },
+];