@vc-shell/framework 1.0.228 → 1.0.230

package/dist/ui/components/organisms/vc-dynamic-property/vc-dynamic-property.vue.d.ts

@@ -14,12 +14,12 @@ declare const _default: <T extends {
         max?: number | undefined;
         regex?: string | undefined;
     } | undefined;
-    property: T;
     "onUpdate:model-value"?: ((data: {
         readonly value: any;
         readonly dictionary?: any[] | undefined;
         readonly locale?: string | undefined;
     }) => any) | undefined;
+    property: T;
     multivalue?: boolean | undefined;
     optionsGetter: (propertyId: string, keyword?: string, locale?: string) => Promise<any[] | undefined> | any[] | undefined;
     valueType: string;
@@ -52,12 +52,12 @@ declare const _default: <T extends {
             max?: number | undefined;
             regex?: string | undefined;
         } | undefined;
-        property: T;
         "onUpdate:model-value"?: ((data: {
             readonly value: any;
             readonly dictionary?: any[] | undefined;
             readonly locale?: string | undefined;
         }) => any) | undefined;
+        property: T;
         multivalue?: boolean | undefined;
         optionsGetter: (propertyId: string, keyword?: string, locale?: string) => Promise<any[] | undefined> | any[] | undefined;
         valueType: string;
@@ -94,12 +94,12 @@ declare const _default: <T extends {
                 max?: number | undefined;
                 regex?: string | undefined;
             } | undefined;
-            property: T;
             "onUpdate:model-value"?: ((data: {
                 readonly value: any;
                 readonly dictionary?: any[] | undefined;
                 readonly locale?: string | undefined;
             }) => any) | undefined;
+            property: T;
             multivalue?: boolean | undefined;
             optionsGetter: (propertyId: string, keyword?: string, locale?: string) => Promise<any[] | undefined> | any[] | undefined;
             valueType: string;

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

@@ -1 +1 @@
-{"version":3,"file":"vc-dynamic-property.vue.d.ts","sourceRoot":"","sources":["../../../../../ui/components/organisms/vc-dynamic-property/vc-dynamic-property.vue.ts"],"names":[],"mappings":";;;;;UA6bU,MAAM;gBAZA,GAAG;cAML,OAAO;;;;;;;;;cAPP,CAAC;;wBApXkC,GAAG;;;;;mBAsXjC,CACb,UAAU,EAAE,MAAM,EAClB,OAAO,CAAC,EAAE,MAAM,EAChB,MAAM,CAAC,EAAE,MAAM,KACZ,QAAQ,GAAG,EAAE,GAAG,SAAS,CAAC,GAAG,GAAG,EAAE,GAAG,SAAS;eAKxC,MAAM;;;;;;;;;WAuBd,GAAG;;;wBAtZuC,GAAG;;;;yCAqZpC,OAAO,KAAK,EAAE,gBAAgB,CAAC,EAAE,CAAC,KAAG,IAAI;;;cApB/C,MAAM;oBAZA,GAAG;kBAML,OAAO;;;;;;;;;kBAPP,CAAC;;4BApXkC,GAAG;;;;;uBAsXjC,CACb,UAAU,EAAE,MAAM,EAClB,OAAO,CAAC,EAAE,MAAM,EAChB,MAAM,CAAC,EAAE,MAAM,KACZ,QAAQ,GAAG,EAAE,GAAG,SAAS,CAAC,GAAG,GAAG,EAAE,GAAG,SAAS;mBAKxC,MAAM;;;;;;;;;oBAsBL,OAAO,KAAK,EAAE,gBAAgB,CAAC,EAAE,CAAC,GAAG,IAAI;WAClD,GAAG;;;wBAtZuC,GAAG;;;;;;;;;;kBAiY1C,MAAM;wBAZA,GAAG;sBAML,OAAO;;;;;;;;;sBAPP,CAAC;;gCApXkC,GAAG;;;;;2BAsXjC,CACb,UAAU,EAAE,MAAM,EAClB,OAAO,CAAC,EAAE,MAAM,EAChB,MAAM,CAAC,EAAE,MAAM,KACZ,QAAQ,GAAG,EAAE,GAAG,SAAS,CAAC,GAAG,GAAG,EAAE,GAAG,SAAS;uBAKxC,MAAM;;;;;;;;;wBAsBL,OAAO,KAAK,EAAE,gBAAgB,CAAC,EAAE,CAAC,GAAG,IAAI;eAClD,GAAG;;;4BAtZuC,GAAG;;;;;;AAnDpD,wBA8c2E;AAQ3E,KAAK,cAAc,CAAC,CAAC,IAAI;KAAG,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;CAAG,GAAG,EAAE,CAAC"}
+{"version":3,"file":"vc-dynamic-property.vue.d.ts","sourceRoot":"","sources":["../../../../../ui/components/organisms/vc-dynamic-property/vc-dynamic-property.vue.ts"],"names":[],"mappings":";;;;;UA6bU,MAAM;gBAZA,GAAG;cAML,OAAO;;;;;;;;;;wBA3X4B,GAAG;;;;cAoXtC,CAAC;;mBAEI,CACb,UAAU,EAAE,MAAM,EAClB,OAAO,CAAC,EAAE,MAAM,EAChB,MAAM,CAAC,EAAE,MAAM,KACZ,QAAQ,GAAG,EAAE,GAAG,SAAS,CAAC,GAAG,GAAG,EAAE,GAAG,SAAS;eAKxC,MAAM;;;;;;;;;WAuBd,GAAG;;;wBAtZuC,GAAG;;;;yCAqZpC,OAAO,KAAK,EAAE,gBAAgB,CAAC,EAAE,CAAC,KAAG,IAAI;;;cApB/C,MAAM;oBAZA,GAAG;kBAML,OAAO;;;;;;;;;;4BA3X4B,GAAG;;;;kBAoXtC,CAAC;;uBAEI,CACb,UAAU,EAAE,MAAM,EAClB,OAAO,CAAC,EAAE,MAAM,EAChB,MAAM,CAAC,EAAE,MAAM,KACZ,QAAQ,GAAG,EAAE,GAAG,SAAS,CAAC,GAAG,GAAG,EAAE,GAAG,SAAS;mBAKxC,MAAM;;;;;;;;;oBAsBL,OAAO,KAAK,EAAE,gBAAgB,CAAC,EAAE,CAAC,GAAG,IAAI;WAClD,GAAG;;;wBAtZuC,GAAG;;;;;;;;;;kBAiY1C,MAAM;wBAZA,GAAG;sBAML,OAAO;;;;;;;;;;gCA3X4B,GAAG;;;;sBAoXtC,CAAC;;2BAEI,CACb,UAAU,EAAE,MAAM,EAClB,OAAO,CAAC,EAAE,MAAM,EAChB,MAAM,CAAC,EAAE,MAAM,KACZ,QAAQ,GAAG,EAAE,GAAG,SAAS,CAAC,GAAG,GAAG,EAAE,GAAG,SAAS;uBAKxC,MAAM;;;;;;;;;wBAsBL,OAAO,KAAK,EAAE,gBAAgB,CAAC,EAAE,CAAC,GAAG,IAAI;eAClD,GAAG;;;4BAtZuC,GAAG;;;;;;AAnDpD,wBA8c2E;AAQ3E,KAAK,cAAc,CAAC,CAAC,IAAI;KAAG,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;CAAG,GAAG,EAAE,CAAC"}

package/dist/ui/components/organisms/vc-gallery/_internal/vc-gallery-preview/vc-gallery-preview.vue.d.ts

@@ -17,8 +17,8 @@ declare const _default: import("vue").DefineComponent<__VLS_WithDefaults<__VLS_T
 }>>> & {
     onClose?: (() => any) | undefined;
 }, {
-    index: number;
     images: ICommonAsset[];
+    index: number;
 }, {}>;
 export default _default;
 type __VLS_NonUndefinedable<T> = T extends undefined ? never : T;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vc-shell/framework",
-  "version": "1.0.228",
+  "version": "1.0.230",
   "type": "module",
   "main": "./dist/framework.js",
   "types": "./dist/index.d.ts",
@@ -60,9 +60,9 @@
   "devDependencies": {
     "@types/dompurify": "^3.0.5",
     "@types/quill": "^2.0.14",
-    "@vc-shell/api-client-generator": "^1.0.228",
-    "@vc-shell/config-generator": "^1.0.228",
-    "@vc-shell/ts-config": "^1.0.228",
+    "@vc-shell/api-client-generator": "^1.0.230",
+    "@vc-shell/config-generator": "^1.0.230",
+    "@vc-shell/ts-config": "^1.0.230",
     "@vitejs/plugin-vue": "^5.0.3",
     "sass": "^1.69.6",
     "shx": "^0.3.4",

package/shared/modules/dynamic/components/SchemaRender.ts

@@ -19,6 +19,7 @@ import { visibilityHandler } from "../helpers/visibilityHandler";
 import { toValue } from "@vueuse/core";
 import { safeIn } from "../helpers/safeIn";
 import { unrefNested } from "../helpers/unrefNested";
+import { usePermissions } from "../../../../core/composables";
 
 const schemeRenderProps = {
   context: {
@@ -48,6 +49,7 @@ export default defineComponent({
   setup(props: ExtractPropTypes<typeof schemeRenderProps>, ctx) {
     const { currentLocale } = toRefs(props);
     const internalFormData = reactive({});
+    const { hasAccess } = usePermissions();
 
     watch(
       () => props.modelValue,
@@ -70,6 +72,12 @@ export default defineComponent({
         "div",
         { class: "tw-flex tw-flex-col tw-gap-4" },
         props.uiSchema.reduce((arr, field): VNode[] => {
+          console.log(field.id, field.permissions, hasAccess(field.permissions));
+
+          if (safeIn("permissions", field) && !hasAccess(field.permissions)) {
+            return arr;
+          }
+
           if (
             safeIn("visibility", field) &&
             field.visibility?.method &&

package/shared/modules/dynamic/components/fields/InputCurrency.ts

@@ -15,8 +15,11 @@ export default {
   setup(props: ExtractPropTypes<typeof componentProps> & { element: InputCurrencySchema }) {
     return () => {
       const options =
-        toValue(getModel(props.element.options, props.fieldContext ?? {})) ||
-        toValue(unref(props.bladeContext.scope)?.[props.element.options]);
+        (safeIn("options", props.element) &&
+          props.element.options &&
+          (toValue(getModel(props.element.options, props.fieldContext ?? {})) ||
+            toValue(unref(props.bladeContext.scope)?.[props.element.options]))) ??
+        undefined;
 
       const contextProperty =
         safeIn("optionProperty", props.element) &&
@@ -34,6 +37,7 @@ export default {
           {},
           {
             option: toValue(scopedProperty ?? contextProperty),
+            currencyDisplay: props.element.currencyDisplay,
             optionLabel: props.element.optionLabel,
             optionValue: props.element.optionValue,
             options,

package/shared/modules/dynamic/helpers/nodeBuilder.ts

@@ -12,6 +12,9 @@ import { i18n } from "./../../../../core/plugins/i18n";
 import { visibilityHandler } from "./visibilityHandler";
 import { toRefs } from "@vueuse/core";
 import { unrefNested } from "./unrefNested";
+import { usePermissions } from "../../../../core/composables";
+
+const { hasAccess } = usePermissions();
 
 function disabledHandler(
   disabled: { method?: string } | boolean,
@@ -165,6 +168,10 @@ function nodeBuilder<
     if (toValue(model) && Array.isArray(toValue(model))) {
       return toValue(model).map((modelItem: ToRefs<{ [x: string]: unknown; id: string }>) => {
         return controlSchema.fields.reduce((arr, fieldItem) => {
+          if (safeIn("permissions", fieldItem) && !hasAccess(fieldItem.permissions)) {
+            return arr;
+          }
+
           if (
             safeIn("visibility", fieldItem) &&
             fieldItem.visibility?.method &&
@@ -190,6 +197,10 @@ function nodeBuilder<
 
     return [
       controlSchema.fields.reduce((arr, field) => {
+        if (safeIn("permissions", field) && !hasAccess(field.permissions)) {
+          return arr;
+        }
+
         if (
           safeIn("visibility", field) &&
           field.visibility?.method &&

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

@@ -13,6 +13,7 @@ import {
 } from "./../../../../ui/components";
 import { ITableColumns, IValidationRules, MenuItemConfig } from "../../../../core/types";
 import type { ComponentProps } from "./../../../utilities/vueUtils";
+import VcInputCurrency from "../../../../ui/components/molecules/vc-input-currency/vc-input-currency.vue";
 
 export type KeysOfUnion<T> = T extends T ? keyof T : never;
 
@@ -65,6 +66,11 @@ export type ToolbarSchema = {
   title?: string;
   icon?: string;
   method: string;
+  /**
+   * Permissions for the toolbar button. If the user does not have the required permissions, the toolbar button will not be displayed.
+   * @type {string | string[]}
+   */
+  permissions?: string | string[];
 };
 
 export interface SettingsBase {
@@ -277,6 +283,11 @@ export interface SchemaBase {
    * Adds horizontal separator after component.
    */
   horizontalSeparator?: boolean;
+  /**
+   * Permissions for the component. If the user does not have the required permissions, the component will not be displayed.
+   * @type {string | string[]}
+   */
+  permissions?: string | string[];
 }
 
 /**
@@ -477,7 +488,8 @@ export interface InputSchema extends SchemaBase {
  *  Video schema interface.
  * @interface
  */
-export interface VideoSchema extends Pick<SchemaBase, "id" | "property" | "label" | "visibility" | "tooltip"> {
+export interface VideoSchema
+  extends Pick<SchemaBase, "id" | "property" | "label" | "visibility" | "tooltip" | "permissions"> {
   /**
    * Component type for video.
    * @type {"vc-video"}
@@ -490,7 +502,10 @@ export interface VideoSchema extends Pick<SchemaBase, "id" | "property" | "label
  * @interface
  */
 export interface FieldSchema
-  extends Pick<SchemaBase, "id" | "property" | "label" | "visibility" | "tooltip" | "horizontalSeparator"> {
+  extends Pick<
+    SchemaBase,
+    "id" | "property" | "label" | "visibility" | "tooltip" | "horizontalSeparator" | "permissions"
+  > {
   /**
    * Component type for field.
    * @type {"vc-field"}
@@ -525,7 +540,7 @@ export interface FieldSchema
  * Image schema interface.
  * @interface
  */
-export interface ImageSchema extends Pick<SchemaBase, "id" | "property" | "visibility"> {
+export interface ImageSchema extends Pick<SchemaBase, "id" | "property" | "visibility" | "permissions"> {
   /**
    * Component type for image.
    * @type {"vc-image"}
@@ -562,7 +577,7 @@ export interface ImageSchema extends Pick<SchemaBase, "id" | "property" | "visib
  * Status schema interface.
  * @interface
  */
-export interface StatusSchema extends Pick<SchemaBase, "id" | "visibility" | "horizontalSeparator"> {
+export interface StatusSchema extends Pick<SchemaBase, "id" | "visibility" | "horizontalSeparator" | "permissions"> {
   /**
    * Component type for status.
    * @type {"vc-status"}
@@ -630,7 +645,7 @@ export interface InputCurrencySchema extends Omit<SchemaBase, "multilanguage"> {
    * List of currency options to be displayed in the dropdown.
    * @description Array should be defined in the blade `scope`.
    */
-  options: string;
+  options?: string;
   /**
    * Name of property that holds currency value.
    * @type {string}
@@ -657,6 +672,10 @@ export interface InputCurrencySchema extends Omit<SchemaBase, "multilanguage"> {
    * Text below control.
    */
   hint?: string;
+  /**
+   * How to show the currency.
+   */
+  currencyDisplay?: ComponentProps<typeof VcInputCurrency>["currencyDisplay"];
 }
 
 /**
@@ -686,7 +705,7 @@ export interface EditorSchema extends Omit<SchemaBase, "onBlur"> {
  * @interface
  */
 export interface DynamicPropertiesSchema
-  extends Pick<SchemaBase, "id" | "disabled" | "property" | "visibility" | "horizontalSeparator"> {
+  extends Pick<SchemaBase, "id" | "disabled" | "property" | "visibility" | "horizontalSeparator" | "permissions"> {
   /**
    * The component type for dynamic properties.
    * @type {"vc-dynamic-properties"}
@@ -745,7 +764,8 @@ export interface GallerySchema
  * Interface for a card schema.
  * @interface
  */
-export interface CardSchema extends RequiredBy<Pick<SchemaBase, "id" | "label" | "visibility">, "label"> {
+export interface CardSchema
+  extends RequiredBy<Pick<SchemaBase, "id" | "label" | "visibility" | "permissions">, "label"> {
   /**
    * Component type for the card.
    * @type {"vc-card"}
@@ -784,7 +804,7 @@ export interface CardSchema extends RequiredBy<Pick<SchemaBase, "id" | "label" |
   variant?: ComponentProps<typeof VcCard>["variant"];
 }
 
-export interface WidgetsSchema extends Pick<SchemaBase, "id" | "horizontalSeparator"> {
+export interface WidgetsSchema extends Pick<SchemaBase, "id" | "horizontalSeparator" | "permissions"> {
   component: "vc-widgets";
   children: string[];
 }
@@ -842,7 +862,7 @@ export interface RadioButtonSchema extends Omit<SchemaBase, "multilanguage" | "p
  * Fieldset schema interface.
  * @interface
  */
-export interface FieldsetSchema extends Pick<SchemaBase, "id" | "visibility" | "horizontalSeparator"> {
+export interface FieldsetSchema extends Pick<SchemaBase, "id" | "visibility" | "horizontalSeparator" | "permissions"> {
   /**
    * Component type for the fieldset.
    * @type {"vc-fieldset"}
@@ -896,7 +916,7 @@ export interface SwitchSchema extends Omit<SchemaBase, "placeholder" | "multilan
 }
 
 export type TableSchema = Omit<ListContentSchema, "filter"> &
-  Pick<SchemaBase, "id" | "property" | "visibility"> & {
+  Pick<SchemaBase, "id" | "property" | "visibility" | "permissions"> & {
     /**
      * Configuration for the add new row button in the table.
      * Used when table is in editing mode.
@@ -923,7 +943,7 @@ export type TableSchema = Omit<ListContentSchema, "filter"> &
  * Button schema interface.
  * @interface
  */
-export interface ButtonSchema extends Pick<SchemaBase, "id" | "disabled" | "visibility"> {
+export interface ButtonSchema extends Pick<SchemaBase, "id" | "disabled" | "visibility" | "permissions"> {
   /**
    * Component type.
    * @type {"vc-button"}
@@ -981,7 +1001,7 @@ export interface ButtonSchema extends Pick<SchemaBase, "id" | "disabled" | "visi
  * Custom component schema interface.
  * @interface
  */
-export interface CustomComponentSchema extends Pick<SchemaBase, "id" | "visibility"> {
+export interface CustomComponentSchema extends Pick<SchemaBase, "id" | "visibility" | "permissions"> {
   /**
    * Component type for custom component.
    * @type {vc-custom}
@@ -1000,7 +1020,7 @@ export interface CustomComponentSchema extends Pick<SchemaBase, "id" | "visibili
 export interface RatingSchema
   extends Pick<
     SchemaBase,
-    "id" | "visibility" | "label" | "property" | "tooltip" | "horizontalSeparator" | "placeholder"
+    "id" | "visibility" | "label" | "property" | "tooltip" | "horizontalSeparator" | "placeholder" | "permissions"
   > {
   /**
    * Component type for rating.

package/ui/components/organisms/vc-blade/_internal/vc-blade-toolbar/vc-blade-toolbar.vue

@@ -10,7 +10,7 @@
         :key="item.id"
       >
         <VcBladeToolbarButton
-          v-if="item.isVisible === undefined || item.isVisible"
+          v-if="$hasAccess(item.permissions) && (item.isVisible === undefined || item.isVisible)"
           :is-expanded="isExpanded"
           :icon="item.icon"
           :title="unref(item.title)"