@fishawack/lab-velocity 2.0.0-beta.43 → 2.0.0-beta.45

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

@@ -0,0 +1,78 @@
+import { h } from "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: "description",
+    },
+    {
+        key: "company_id",
+        label: "Company",
+        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,
+        },
+    },
+    {
+        key: "roles",
+        initial: ({ model }) => model?.roles.map((val) => val.id) || [],
+        preparation: ({ form }) =>
+            form.roles?.map((d) => (typeof d === "object" ? d.value : d)),
+        render: {
+            read: ({ model }) =>
+                h(
+                    !model.overrides_roles_and_permissions ||
+                        model.roles.length === 1
+                        ? Chip
+                        : Chips,
+                    !model.overrides_roles_and_permissions
+                        ? {
+                              name: "inherited",
+                              label: "Inherited",
+                          }
+                        : 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,
+                }),
+        },
+    },
+];

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

@@ -1,21 +1,17 @@
 import { merge } from "lodash";
-import { h, resolveComponent } from "vue";
+import { h } from "vue";
 import axios from "axios";
 import { throttle } from "lodash";
 
-import { columns } from "../../../resource/index.js";
+import { columns, defaultResource, meta } from "../../../resource/index.js";
 import userResource from "../PUsers/resource.js";
-import { defaultResource, meta } from "../../../resource/index.js";
+import teamsColumns from "./columns.js";
 
 import VelFormRole from "../../../../components/layout/FormRole.vue";
-import Chip from "../../../../components/layout/Chip.vue";
-import Chips from "../../../../components/layout/Chips.vue";
 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",
@@ -33,303 +29,223 @@ export default [
             },
         },
         auditable: true,
+        trashable: true,
         permissions: {
             create: ({ $store }) => $store.getters.can("write teams"),
             edit: ({ $store }) => $store.getters.can("write teams"),
             delete: ({ $store }) => $store.getters.can("delete teams"),
         },
-        ...merge(
-            columns([
-                {
-                    key: "name",
-                    sortable: true,
-                },
-                {
-                    key: "description",
-                },
-                {
-                    key: "company_id",
-                    label: "Company",
-                    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,
+        ...merge(columns(teamsColumns), {
+            index: {
+                layout: [
+                    ...defaultResource.index.layout,
+                    () =>
+                        h(VelRoleLegend, {
+                            class: "mt-5",
                         }),
-                    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,
-                    },
-                },
-                {
-                    key: "roles",
-                    initial: ({ model }) =>
-                        model?.roles.map((val) => val.id) || [],
-                    preparation: ({ form }) =>
-                        form.roles?.map((d) =>
-                            typeof d === "object" ? d.value : d,
-                        ),
-                    render: {
-                        read: ({ model }) =>
-                            h(
-                                !model.overrides_roles_and_permissions ||
-                                    model.roles.length === 1
-                                    ? Chip
-                                    : Chips,
-                                !model.overrides_roles_and_permissions
-                                    ? {
-                                          name: "inherited",
-                                          label: "Inherited",
-                                      }
-                                    : 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,
-                            }),
-                    },
-                },
-            ]),
-            {
-                index: {
-                    layout: [
-                        ...defaultResource.index.layout,
-                        () =>
-                            h(VelRoleLegend, {
-                                class: "mt-5",
-                            }),
-                    ],
-                },
-                show: {
-                    tabs: [
-                        ...defaultResource.show.tabs,
-                        ({ model }) => ({
-                            label: "Access control",
-                            component: h(VelFormRole, {
-                                overrides:
-                                    model.overrides_roles_and_permissions,
-                                form: { roles: model.roles.map((d) => d.id) },
-                                readonly: true,
-                            }),
+                ],
+            },
+            show: {
+                tabs: [
+                    ...defaultResource.show.tabs,
+                    ({ model }) => ({
+                        label: "Access control",
+                        component: h(VelFormRole, {
+                            overrides: model.overrides_roles_and_permissions,
+                            form: { roles: model.roles.map((d) => d.id) },
+                            readonly: true,
                         }),
-                        (props) => {
-                            const { model, $store, $router, $route, ...rest } =
-                                props;
-
-                            return {
-                                label: "Members",
-                                component: h({
-                                    data: () => ({
-                                        scoped: true,
-                                    }),
-                                    mounted() {
-                                        this.emitter.on("reload-teams", () => {
-                                            this.reload();
-                                        });
-                                    },
-                                    beforeUnmount() {
-                                        this.emitter.off("reload-teams");
-                                    },
-                                    methods: {
-                                        reload: throttle(function () {
-                                            this.$refs.members.reload();
-                                            this.$refs.users.reload();
-                                        }, 1000),
-                                    },
-                                    render() {
-                                        return h("div", [
-                                            h("h3", "Members"),
-                                            (() => {
-                                                const resource = meta(
-                                                    ...userResource,
-                                                );
-
-                                                resource.api.params.index = ({
-                                                    $route,
-                                                }) => ({
-                                                    include: "company",
-                                                    "filter[teams.id]":
-                                                        $route.params.teamsId,
-                                                });
-
-                                                resource.table.actions = [
-                                                    ({ model }) =>
-                                                        h({
-                                                            data: () => ({
-                                                                loading: false,
-                                                            }),
-                                                            render() {
-                                                                return h(
-                                                                    VelButton,
-                                                                    {
-                                                                        tag: "a",
-                                                                        size: "small",
-                                                                        type: "warning",
-                                                                        loading:
-                                                                            this
-                                                                                .loading,
-                                                                        onClick:
-                                                                            async () => {
-                                                                                this.loading = true;
-
-                                                                                await axios.delete(
-                                                                                    `api/teams/${$route.params.teamsId}/users/${model.id}`,
-                                                                                );
-
-                                                                                this.emitter.emit(
-                                                                                    "reload-teams",
-                                                                                );
-                                                                            },
-                                                                    },
-                                                                    "Remove",
-                                                                );
-                                                            },
+                    }),
+                    (props) => {
+                        const { model, $store, $router, $route, ...rest } =
+                            props;
+
+                        return {
+                            label: "Members",
+                            component: h({
+                                data: () => ({
+                                    scoped: true,
+                                }),
+                                mounted() {
+                                    this.emitter.on("reload-teams", () => {
+                                        this.reload();
+                                    });
+                                },
+                                beforeUnmount() {
+                                    this.emitter.off("reload-teams");
+                                },
+                                methods: {
+                                    reload: throttle(function () {
+                                        this.$refs.members.reload();
+                                        this.$refs.users.reload();
+                                    }, 1000),
+                                },
+                                render() {
+                                    return h("div", [
+                                        h("h3", "Members"),
+                                        (() => {
+                                            const resource = meta(
+                                                ...userResource,
+                                            );
+
+                                            resource.api.params.index = ({
+                                                $route,
+                                            }) => ({
+                                                include: "company",
+                                                "filter[teams.id]":
+                                                    $route.params.teamsId,
+                                            });
+
+                                            resource.table.actions = [
+                                                ({ model }) =>
+                                                    h({
+                                                        data: () => ({
+                                                            loading: false,
                                                         }),
-                                                ];
-
-                                                const props = {
-                                                    model,
-                                                    $store,
-                                                    $router,
-                                                    $route,
-                                                    ...rest,
-                                                    resource,
-                                                };
-
-                                                return h(
-                                                    VelTableSorter,
-                                                    merge(
-                                                        resource.index.structure(
-                                                            props,
-                                                        ),
-                                                        {
-                                                            ref: "members",
+                                                        render() {
+                                                            return h(
+                                                                VelButton,
+                                                                {
+                                                                    tag: "a",
+                                                                    size: "small",
+                                                                    type: "warning",
+                                                                    loading:
+                                                                        this
+                                                                            .loading,
+                                                                    onClick:
+                                                                        async () => {
+                                                                            this.loading = true;
+
+                                                                            await axios.delete(
+                                                                                `api/teams/${$route.params.teamsId}/users/${model.id}`,
+                                                                            );
+
+                                                                            this.emitter.emit(
+                                                                                "reload-teams",
+                                                                            );
+                                                                        },
+                                                                },
+                                                                "Remove",
+                                                            );
                                                         },
+                                                    }),
+                                            ];
+
+                                            const props = {
+                                                model,
+                                                $store,
+                                                $router,
+                                                $route,
+                                                ...rest,
+                                                resource,
+                                            };
+
+                                            return h(
+                                                VelTableSorter,
+                                                merge(
+                                                    resource.index.structure(
+                                                        props,
                                                     ),
-                                                );
-                                            })(),
-                                            h("h3", "Users"),
-                                            h(VelCheckbox, {
-                                                label: "Only show users from this company",
-                                                class: "mt-2",
-                                                modelValue: this.scoped,
-                                                "onUpdate:modelValue": (
-                                                    value,
-                                                ) => {
-                                                    this.scoped = value;
-                                                    this.$nextTick(() => {
-                                                        this.$refs.users.reload();
-                                                    });
-                                                },
-                                            }),
-                                            (() => {
-                                                const resource = meta(
-                                                    ...userResource,
-                                                );
-
-                                                resource.api.params.index = ({
-                                                    $route,
-                                                }) => ({
-                                                    include: "company",
-                                                    "filter[company_id]": this
-                                                        .scoped
-                                                        ? $route.params
-                                                              .companiesId
-                                                        : null,
-                                                    "filter[teams.id]": `!${$route.params.teamsId}`,
+                                                    {
+                                                        ref: "members",
+                                                    },
+                                                ),
+                                            );
+                                        })(),
+                                        h("h3", "Users"),
+                                        h(VelCheckbox, {
+                                            label: "Only show users from this company",
+                                            class: "mt-2",
+                                            modelValue: this.scoped,
+                                            "onUpdate:modelValue": (value) => {
+                                                this.scoped = value;
+                                                this.$nextTick(() => {
+                                                    this.$refs.users.reload();
                                                 });
-
-                                                resource.table.actions = [
-                                                    ({ model }) =>
-                                                        h({
-                                                            data: () => ({
-                                                                loading: false,
-                                                            }),
-                                                            render() {
-                                                                return h(
-                                                                    VelButton,
-                                                                    {
-                                                                        tag: "a",
-                                                                        size: "small",
-                                                                        type: "primary",
-                                                                        loading:
-                                                                            this
-                                                                                .loading,
-                                                                        onClick:
-                                                                            async () => {
-                                                                                this.loading = true;
-
-                                                                                await axios.post(
-                                                                                    `api/teams/${$route.params.teamsId}/users`,
-                                                                                    {
-                                                                                        id: model.id,
-                                                                                    },
-                                                                                );
-
-                                                                                this.emitter.emit(
-                                                                                    "reload-teams",
-                                                                                );
-                                                                            },
-                                                                    },
-                                                                    "Add",
-                                                                );
-                                                            },
+                                            },
+                                        }),
+                                        (() => {
+                                            const resource = meta(
+                                                ...userResource,
+                                            );
+
+                                            resource.api.params.index = ({
+                                                $route,
+                                            }) => ({
+                                                include: "company",
+                                                "filter[company_id]": this
+                                                    .scoped
+                                                    ? $route.params.companiesId
+                                                    : null,
+                                                "filter[teams.id]": `!${$route.params.teamsId}`,
+                                            });
+
+                                            resource.table.actions = [
+                                                ({ model }) =>
+                                                    h({
+                                                        data: () => ({
+                                                            loading: false,
                                                         }),
-                                                ];
-
-                                                const props = {
-                                                    model,
-                                                    $store,
-                                                    $router,
-                                                    $route,
-                                                    ...rest,
-                                                    resource,
-                                                };
-
-                                                return h(
-                                                    VelTableSorter,
-                                                    merge(
-                                                        resource.index.structure(
-                                                            props,
-                                                        ),
-                                                        {
-                                                            ref: "users",
+                                                        render() {
+                                                            return h(
+                                                                VelButton,
+                                                                {
+                                                                    tag: "a",
+                                                                    size: "small",
+                                                                    type: "primary",
+                                                                    loading:
+                                                                        this
+                                                                            .loading,
+                                                                    onClick:
+                                                                        async () => {
+                                                                            this.loading = true;
+
+                                                                            await axios.post(
+                                                                                `api/teams/${$route.params.teamsId}/users`,
+                                                                                {
+                                                                                    id: model.id,
+                                                                                },
+                                                                            );
+
+                                                                            this.emitter.emit(
+                                                                                "reload-teams",
+                                                                            );
+                                                                        },
+                                                                },
+                                                                "Add",
+                                                            );
                                                         },
+                                                    }),
+                                            ];
+
+                                            const props = {
+                                                model,
+                                                $store,
+                                                $router,
+                                                $route,
+                                                ...rest,
+                                                resource,
+                                            };
+
+                                            return h(
+                                                VelTableSorter,
+                                                merge(
+                                                    resource.index.structure(
+                                                        props,
                                                     ),
-                                                );
-                                            })(),
-                                        ]);
-                                    },
-                                }),
-                            };
-                        },
-                    ],
-                },
+                                                    {
+                                                        ref: "users",
+                                                    },
+                                                ),
+                                            );
+                                        })(),
+                                    ]);
+                                },
+                            }),
+                        };
+                    },
+                ],
             },
-        ),
+        }),
     },
 ];