@vc-shell/framework 1.0.126 → 1.0.128

package/dist/ui/components/organisms/vc-table/vc-table.vue.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"vc-table.vue.d.ts","sourceRoot":"","sources":["../../../../../ui/components/organisms/vc-table/vc-table.vue.ts"],"names":[],"mappings":"AAEA,OAAO,EAWL,QAAQ,EAET,MAAM,KAAK,CAAC;AAOb,OAAO,EAAE,oBAAoB,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAK/E,MAAM,WAAW,WAAW;IAC1B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,YAAY,CAAC,EAAE,MAAM,IAAI,CAAC;CAC3B;AAED,MAAM,WAAW,SAAS;IACxB,CAAC,CAAC,EAAE,MAAM,GAAG,GAAG,CAAC;IACjB,OAAO,CAAC,EAAE,oBAAoB,EAAE,CAAC;CAClC;;;;;;;;;;;;aAw8DY,aAAa,EAAE;;;;;;;mBAp3DS,MAAM;mBAAa,MAAM;;;;sCAs3DzB,oBAAoB,EAAE;;;;;;;;;;;;;;cAqB7C,MAAM;;;WASb,GAAG;;2CA39D2B,GAAG,KAAK,GAAG;;;kBACG,aAAa;cAAO,GAAG;wBAJxD,GAAG,KAAK,GAAG;wBACX;YAAE,UAAU,EAAE,MAAM,IAAI,CAAA;SAAE,KAAK,GAAG;;;cACZ,GAAG;0BAGvB,GAAG,KAAK,GAAG;uBACd,GAAG,KAAK,GAAG;wBACV,GAAG,KAAK,GAAG;;;mBAmEQ,MAAM;mBAAa,MAAM;;;yCAm5D9C,OAAO,KAAK,EAAE,gBAAgB,CAAC,EAAE,CAAC,KAAG,IAAI;;;;;;;;;;;;iBA/B5C,aAAa,EAAE;;;;;;;uBAp3DS,MAAM;uBAAa,MAAM;;;;0CAs3DzB,oBAAoB,EAAE;;;;;;;;;;;;;;kBAqB7C,MAAM;;;oBAQJ,OAAO,KAAK,EAAE,gBAAgB,CAAC,EAAE,CAAC,GAAG,IAAI;WAClD,GAAG;;2CA39D2B,GAAG,KAAK,GAAG;;;kBACG,aAAa;cAAO,GAAG;wBAJxD,GAAG,KAAK,GAAG;wBACX;YAAE,UAAU,EAAE,MAAM,IAAI,CAAA;SAAE,KAAK,GAAG;;;cACZ,GAAG;0BAGvB,GAAG,KAAK,GAAG;uBACd,GAAG,KAAK,GAAG;wBACV,GAAG,KAAK,GAAG;;;mBAmEQ,MAAM;mBAAa,MAAM;;;;;;;;;;;;;;;;;;qBAo3DjD,aAAa,EAAE;;;;;;;2BAp3DS,MAAM;2BAAa,MAAM;;;;8CAs3DzB,oBAAoB,EAAE;;;;;;;;;;;;;;sBAqB7C,MAAM;;;wBAQJ,OAAO,KAAK,EAAE,gBAAgB,CAAC,EAAE,CAAC,GAAG,IAAI;eAClD,GAAG;;+CA39D2B,GAAG,KAAK,GAAG;;;sBACG,aAAa;kBAAO,GAAG;4BAJxD,GAAG,KAAK,GAAG;4BACX;gBAAE,UAAU,EAAE,MAAM,IAAI,CAAA;aAAE,KAAK,GAAG;;;kBACZ,GAAG;8BAGvB,GAAG,KAAK,GAAG;2BACd,GAAG,KAAK,GAAG;4BACV,GAAG,KAAK,GAAG;;;uBAmEQ,MAAM;uBAAa,MAAM;;;;;AAjF9D,wBA0+D2E"}
+{"version":3,"file":"vc-table.vue.d.ts","sourceRoot":"","sources":["../../../../../ui/components/organisms/vc-table/vc-table.vue.ts"],"names":[],"mappings":"AAEA,OAAO,EAWL,QAAQ,EAET,MAAM,KAAK,CAAC;AAOb,OAAO,EAAE,oBAAoB,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAK/E,MAAM,WAAW,WAAW;IAC1B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,YAAY,CAAC,EAAE,MAAM,IAAI,CAAC;CAC3B;AAED,MAAM,WAAW,SAAS;IACxB,CAAC,CAAC,EAAE,MAAM,GAAG,GAAG,CAAC;IACjB,OAAO,CAAC,EAAE,oBAAoB,EAAE,CAAC;CAClC;;;;;;;;;;;;aAg9DY,aAAa,EAAE;;;;;;;mBA53DS,MAAM;mBAAa,MAAM;;;;sCA83DzB,oBAAoB,EAAE;;;;;;;;;;;;;;cAqB7C,MAAM;;;WASb,GAAG;;2CAn+D2B,GAAG,KAAK,GAAG;;;kBACG,aAAa;cAAO,GAAG;wBAJxD,GAAG,KAAK,GAAG;wBACX;YAAE,UAAU,EAAE,MAAM,IAAI,CAAA;SAAE,KAAK,GAAG;;;cACZ,GAAG;0BAGvB,GAAG,KAAK,GAAG;uBACd,GAAG,KAAK,GAAG;wBACV,GAAG,KAAK,GAAG;;;mBAmEQ,MAAM;mBAAa,MAAM;;;yCA25D9C,OAAO,KAAK,EAAE,gBAAgB,CAAC,EAAE,CAAC,KAAG,IAAI;;;;;;;;;;;;iBA/B5C,aAAa,EAAE;;;;;;;uBA53DS,MAAM;uBAAa,MAAM;;;;0CA83DzB,oBAAoB,EAAE;;;;;;;;;;;;;;kBAqB7C,MAAM;;;oBAQJ,OAAO,KAAK,EAAE,gBAAgB,CAAC,EAAE,CAAC,GAAG,IAAI;WAClD,GAAG;;2CAn+D2B,GAAG,KAAK,GAAG;;;kBACG,aAAa;cAAO,GAAG;wBAJxD,GAAG,KAAK,GAAG;wBACX;YAAE,UAAU,EAAE,MAAM,IAAI,CAAA;SAAE,KAAK,GAAG;;;cACZ,GAAG;0BAGvB,GAAG,KAAK,GAAG;uBACd,GAAG,KAAK,GAAG;wBACV,GAAG,KAAK,GAAG;;;mBAmEQ,MAAM;mBAAa,MAAM;;;;;;;;;;;;;;;;;;qBA43DjD,aAAa,EAAE;;;;;;;2BA53DS,MAAM;2BAAa,MAAM;;;;8CA83DzB,oBAAoB,EAAE;;;;;;;;;;;;;;sBAqB7C,MAAM;;;wBAQJ,OAAO,KAAK,EAAE,gBAAgB,CAAC,EAAE,CAAC,GAAG,IAAI;eAClD,GAAG;;+CAn+D2B,GAAG,KAAK,GAAG;;;sBACG,aAAa;kBAAO,GAAG;4BAJxD,GAAG,KAAK,GAAG;4BACX;gBAAE,UAAU,EAAE,MAAM,IAAI,CAAA;aAAE,KAAK,GAAG;;;kBACZ,GAAG;8BAGvB,GAAG,KAAK,GAAG;2BACd,GAAG,KAAK,GAAG;4BACV,GAAG,KAAK,GAAG;;;uBAmEQ,MAAM;uBAAa,MAAM;;;;;AAjF9D,wBAk/D2E"}

package/dist/utils/isInDemoMode.d.ts

@@ -0,0 +1,2 @@
+declare const originalFetch: ((input: RequestInfo | URL, init?: RequestInit | undefined) => Promise<Response>) & typeof fetch;
+//# sourceMappingURL=isInDemoMode.d.ts.map

package/dist/utils/isInDemoMode.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"isInDemoMode.d.ts","sourceRoot":"","sources":["../../utils/isInDemoMode.ts"],"names":[],"mappings":"AACA,QAAA,MAAe,aAAa,kGAAW,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vc-shell/framework",
-  "version": "1.0.126",
+  "version": "1.0.128",
   "main": "./dist/framework.mjs",
   "module": "./dist/framework.mjs",
   "types": "./dist/index.d.ts",
@@ -57,9 +57,9 @@
     "whatwg-fetch": "^3.6.2"
   },
   "devDependencies": {
-    "@vc-shell/api-client-generator": "^1.0.126",
-    "@vc-shell/config-generator": "^1.0.126",
-    "@vc-shell/ts-config": "^1.0.126",
+    "@vc-shell/api-client-generator": "^1.0.128",
+    "@vc-shell/config-generator": "^1.0.128",
+    "@vc-shell/ts-config": "^1.0.128",
     "@vitejs/plugin-vue": "^4.2.3",
     "sass": "^1.62.1",
     "typescript": "^5.2.2",

package/shared/components/app-switcher/composables/useAppSwitcher/index.ts

@@ -32,7 +32,7 @@ export function useAppSwitcher(): IUseAppSwitcher {
   }
 
   function switchApp(app: AppDescriptor) {
-    if (app.permission && hasAccess(app.permission)) {
+    if (hasAccess(app.permission)) {
       if (app.relativeUrl) {
         window.location.href = window.location.origin + app.relativeUrl;
       }

package/shared/modules/dynamic/index.ts

@@ -70,17 +70,19 @@ const register = (
 
   const BladeInstanceConstructor = defineComponent({
     ...bladeComponent,
-    name: bladeName,
     isWorkspace: "isWorkspace" in json.settings && json.settings.isWorkspace,
     setup: (props: ComponentProps<typeof bladeComponent>, ctx) =>
       (bladeComponent?.setup &&
         bladeComponent.setup(
-          reactiveComputed(() => ({
-            ...props,
-            model: json,
-            composables: args.composables,
-          })) as any,
-          reactiveComputed(() => ctx) as any
+          Object.assign(
+            {},
+            reactiveComputed(() => props),
+            {
+              model: json,
+              composables: args.composables,
+            } as any
+          ),
+          ctx
         )) ??
       {},
   });

package/shared/modules/dynamic/pages/dynamic-blade-list.vue

@@ -27,7 +27,7 @@
         class="tw-grow tw-basis-0"
         :loading="loading"
         :expanded="expanded"
-        :columns="(tableData?.columns as ITableColumns[])"
+        :columns="(table?.columns as ITableColumns[])"
         :state-key="stateKey"
         :items="(itemsProxy as Record<string, any>[])"
         :multiselect="isWidgetView ? false : tableData?.multiselect"
@@ -156,6 +156,7 @@ import { ListBaseBladeScope, ListBladeContext, UseList } from "../factories/type
 import { IParentCallArgs } from "../../../index";
 import * as _ from "lodash-es";
 import { useMounted } from "@vueuse/core";
+import { safeIn } from "../helpers/safeIn";
 
 export interface Props {
   expanded?: boolean;
@@ -205,6 +206,13 @@ const itemsProxy = ref<Record<string, any>[]>();
 const modified = ref(false);
 
 const { moduleNotifications, markAsRead } = useNotifications(settings.value?.pushNotificationType);
+const { load, remove, items, loading, pagination, query, scope } = props.composables?.[
+  props.model?.settings?.composable ?? ""
+]({
+  emit,
+  props,
+  mounted: useMounted(),
+}) as UseList<Record<string, any>[], Record<string, any>, ListBaseBladeScope>;
 
 watch(
   moduleNotifications,
@@ -230,9 +238,30 @@ const stateKey = computed(() => {
 
   throw new Error('Table id is not defined. Please provide "id" property in table schema');
 });
+
+const calculateColumns = (columns: ListContentSchema["columns"]) => {
+  const result = columns?.map((column) => {
+    if (typeof column.visible !== "boolean" && column.visible?.method) {
+      const result =
+        typeof scope?.value[column.visible?.method] === "function"
+          ? scope?.value[column.visible?.method]()
+          : scope?.value[column.visible?.method];
+
+      console.log("result", result);
+
+      column.visible = result;
+    }
+    return column;
+  });
+
+  console.log(result);
+
+  return result;
+};
+
 const table = computed(() => {
   const tableScope = {
-    columns: tableData.value?.columns,
+    columns: calculateColumns(tableData.value?.columns),
   };
 
   return tableScope;
@@ -247,14 +276,6 @@ const bladeOptions = reactive({
   empty: resolveTemplateComponent("emptyTemplate"),
 });
 
-const { load, remove, items, loading, pagination, query, scope } = props.composables?.[
-  props.model?.settings?.composable ?? ""
-]({
-  emit,
-  props,
-  mounted: useMounted(),
-}) as UseList<Record<string, any>[], Record<string, any>, ListBaseBladeScope>;
-
 if (props.isWidgetView) {
   query.value.take = 5;
 }

package/shared/modules/dynamic/types/index.ts

@@ -114,13 +114,18 @@ export interface ListContentSchema {
   filter?: FilterSchema;
   multiselect?: boolean;
   header?: boolean;
-  columns?: (ITableColumns & {
+  columns?: (Omit<ITableColumns, "visible"> & {
     id: string;
     title: string;
     sortable?: boolean;
     alwaysVisible?: boolean;
     type?: string;
     customTemplate?: GridTemplateOverride;
+    visible?:
+      | boolean
+      | {
+          method: string;
+        };
   })[];
   reorderableRows?: boolean;
   mobileTemplate?: {

package/ui/components/organisms/vc-table/vc-table.vue

@@ -643,9 +643,13 @@ const headerCheckbox = computed({
 
 const filteredCols = computed(() => {
   return defaultColumns.value.filter((x) => {
-    if (("visible" in x && x.visible) || !("visible" in x)) {
-      return props.expanded ? x : x.alwaysVisible;
+    if (x.visible === false) {
+      return false;
     }
+    if (!props.expanded) {
+      return x.alwaysVisible;
+    }
+    return x;
   });
 });
 
@@ -1039,6 +1043,10 @@ function restoreState() {
         return {
           ...item,
           title: column.title,
+          visible: column.visible,
+          sortable: column.sortable,
+          alwaysVisible: column.alwaysVisible,
+          type: column.type,
         };
       }
       return item;