@vc-shell/framework 1.0.320 → 1.0.322

package/dist/ui/components/organisms/vc-blade/vc-blade.stories.d.ts

@@ -44,44 +44,7 @@ declare const _default: {
             close: () => void;
             expand: () => void;
             collapse: () => void;
-        }, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps & Readonly<import("vue").ExtractPropTypes<{
-            title: {
-                type: import("vue").PropType<string>;
-            };
-            icon: {
-                type: import("vue").PropType<string>;
-            };
-            width: {
-                type: import("vue").PropType<string | number>;
-                default: string;
-            };
-            expanded: {
-                type: import("vue").PropType<boolean>;
-            };
-            closable: {
-                type: import("vue").PropType<boolean>;
-                default: boolean;
-            };
-            subtitle: {
-                type: import("vue").PropType<string>;
-            };
-            expandable: {
-                type: import("vue").PropType<boolean>;
-                default: boolean;
-            };
-            toolbarItems: {
-                type: import("vue").PropType<import("../../../..").IBladeToolbar[]>;
-                default: () => never[];
-            };
-            modified: {
-                type: import("vue").PropType<boolean>;
-                default: undefined;
-            };
-        }>> & Readonly<{
-            onClose?: (() => any) | undefined;
-            onExpand?: (() => any) | undefined;
-            onCollapse?: (() => any) | undefined;
-        }>, {
+        }, import("vue").PublicProps, {
             width: string | number;
             closable: boolean;
             expandable: boolean;

package/dist/ui/components/organisms/vc-blade/vc-blade.stories.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"vc-blade.stories.d.ts","sourceRoot":"","sources":["../../../../../ui/components/organisms/vc-blade/vc-blade.stories.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAQ,OAAO,EAAE,MAAM,iBAAiB,CAAC;AACrD,OAAO,EAAE,OAAO,EAAE,MAAM,IAAI,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAG7B,wBAuBiC;AAEjC,eAAO,MAAM,OAAO,EAAE,OAAO,CAAC,OAAO,OAAO,CAM1C,CAAC;AAEH,eAAO,MAAM,cAAc,EAAE,OAAO,CAAC,OAAO,OAAO,CAOjD,CAAC;AAEH,eAAO,MAAM,gBAAgB,EAAE,OAAO,CAAC,OAAO,OAAO,CAMnD,CAAC;AAEH,eAAO,MAAM,aAAa,EAAE,OAAO,CAAC,OAAO,OAAO,CAShD,CAAC;AAEH,eAAO,MAAM,eAAe,EAAE,OAAO,CAAC,OAAO,OAAO,CASlD,CAAC;AAEH,eAAO,MAAM,mBAAmB,EAAE,OAAO,CAAC,OAAO,OAAO,CAMtD,CAAC"}
+{"version":3,"file":"vc-blade.stories.d.ts","sourceRoot":"","sources":["../../../../../ui/components/organisms/vc-blade/vc-blade.stories.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAQ,OAAO,EAAE,MAAM,iBAAiB,CAAC;AACrD,OAAO,EAAE,OAAO,EAAE,MAAM,IAAI,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAG7B,wBAuBiC;AAEjC,eAAO,MAAM,OAAO,EAAE,OAAO,CAAC,OAAO,OAAO,CAM1C,CAAC;AAEH,eAAO,MAAM,cAAc,EAAE,OAAO,CAAC,OAAO,OAAO,CAOjD,CAAC;AAEH,eAAO,MAAM,gBAAgB,EAAE,OAAO,CAAC,OAAO,OAAO,CAMnD,CAAC;AAEH,eAAO,MAAM,aAAa,EAAE,OAAO,CAAC,OAAO,OAAO,CAShD,CAAC;AAEH,eAAO,MAAM,eAAe,EAAE,OAAO,CAAC,OAAO,OAAO,CASlD,CAAC;AAEH,eAAO,MAAM,mBAAmB,EAAE,OAAO,CAAC,OAAO,OAAO,CAMtD,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vc-shell/framework",
-  "version": "1.0.320",
+  "version": "1.0.322",
   "type": "module",
   "main": "./dist/framework.js",
   "types": "./dist/index.d.ts",
@@ -59,9 +59,9 @@
   },
   "devDependencies": {
     "@types/dompurify": "^3.0.5",
-    "@vc-shell/api-client-generator": "^1.0.320",
-    "@vc-shell/config-generator": "^1.0.320",
-    "@vc-shell/ts-config": "^1.0.320",
+    "@vc-shell/api-client-generator": "^1.0.322",
+    "@vc-shell/config-generator": "^1.0.322",
+    "@vc-shell/ts-config": "^1.0.322",
     "@vitejs/plugin-vue": "5.0.3",
     "cypress-signalr-mock": "^1.5.0",
     "sass": "^1.69.6",

package/shared/components/blade-navigation/composables/useBladeNavigation/index.ts

@@ -244,12 +244,6 @@ const useBladeNavigationSingleton = createSharedComposable(() => {
       for (let i = 0; i < children.length; i++) {
         const element = children[i];
 
-        const position = navigationInstance.blades.value.findIndex((x) => x.type.name === element.type.name);
-
-        if (navigationInstance.blades.value[position - 1]) {
-          navigationInstance.blades.value[position - 1].props.param = undefined;
-        }
-
         if (element.props?.navigation?.onBeforeClose) {
           const result = await element.props.navigation.onBeforeClose();
 
@@ -263,9 +257,19 @@ const useBladeNavigationSingleton = createSharedComposable(() => {
       }
 
       if (!isPrevented) {
-        if (index > 0 && navigationInstance.blades.value[index - 1]?.props?.navigation?.isVisible === false) {
-          navigationInstance.blades.value[index - 1].props.navigation.isVisible = true;
+        const prevBlade = navigationInstance.blades.value[index - 1];
+
+        if (index > 0 && prevBlade?.props?.navigation?.isVisible === false) {
+          prevBlade.props.navigation.isVisible = true;
         }
+
+        if (
+          prevBlade &&
+          toValue(prevBlade.props?.param) === toValue(navigationInstance.blades.value[index]?.props?.param)
+        ) {
+          prevBlade.props.param = undefined;
+        }
+
         navigationInstance.blades.value.splice(index);
       }
 
@@ -547,10 +551,7 @@ export function useBladeNavigation(): IUseBladeNavigation {
           reactifyObject({
             blade: registeredWorkspaceComponent as unknown as BladeInstanceConstructor,
             param: computed(() => {
-              if (
-                navigationInstance.blades.value.length > 1 &&
-                registeredRouteComponent?.type.moduleUid === registeredWorkspaceComponent.type.moduleUid
-              ) {
+              if (registeredRouteComponent?.type.moduleUid === registeredWorkspaceComponent.type.moduleUid) {
                 return param;
               }
               return undefined;

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

@@ -56,12 +56,19 @@ const upsertHelper = (overrides: OverridesSchema, schemaCopy: { [key: string]: D
             valueByPath = current;
           }
 
-          if (Array.isArray(valueByPath) && valueByPath.length && typeof args.value === "object") {
+          if (
+            Array.isArray(valueByPath) &&
+            valueByPath.length &&
+            typeof args.value === "object" &&
+            !Array.isArray(args.value)
+          ) {
             const findIndex = _.findIndex(valueByPath, { id: args.value.id });
 
             const spliced = valueByPath /* @ts-expect-error  - toSpliced is not parsed correctly by ts */
               .toSpliced(findIndex >= 0 ? findIndex : (args.index ?? 0), findIndex >= 0 ? 1 : 0, args.value);
             _.set(clonedSchema, currentPath, spliced);
+          } else if (Array.isArray(valueByPath) && valueByPath.length) {
+            _.set(clonedSchema, currentPath, [...valueByPath, args.value]);
           } else {
             _.set(clonedSchema, currentPath, args.value);
           }

package/shared/modules/dynamic/index.ts

@@ -1,12 +1,12 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import * as pages from "./pages";
-import { App, Component, SetupContext, defineComponent } from "vue";
+import { App, Component, SetupContext, defineComponent, watch } from "vue";
 import { DynamicSchema, OverridesSchema } from "./types";
 import * as _ from "lodash-es";
 import { handleOverrides } from "./helpers/override";
 import { reactiveComputed } from "@vueuse/core";
 import { kebabToPascal } from "../../../core/utilities";
-import { BladeInstanceConstructor } from "../../index";
+import { BladeInstanceConstructor, notification } from "../../index";
 import { createAppModule } from "../../../core/plugins";
 import { ComponentProps } from "./../../utilities/vueUtils";
 import { Router } from "vue-router";
@@ -38,7 +38,7 @@ const createAppModuleWrapper = (args: {
   return createAppModule(
     { [bladeName]: bladeComponent },
     appModuleContent?.locales,
-    appModuleContent?.notificationTemplates,
+    appModuleContent?.notificationTemplates as { [key: string]: Component & { notifyType: string } },
     appModuleContent?.moduleComponents,
   );
 };
@@ -71,6 +71,7 @@ const createBladeInstanceConstructor = (
     menuItem: ("menuItem" in json.settings && json.settings.menuItem) ?? undefined,
     moduleUid: args.moduleUid,
     routable: json.settings.routable ?? true,
+    notifyType: json.settings.pushNotificationType,
     composables: existingComposables ? { ...existingComposables, ...args.composables } : args.composables,
     setup: (props: ComponentProps<typeof bladeComponent>, ctx: SetupContext) =>
       (bladeComponent?.setup &&
@@ -222,24 +223,36 @@ export function createDynamicAppModule(args: {
       | undefined,
   ): void;
 } {
-  let schemaCopy: { [key: string]: DynamicSchema } = {};
+  let schemaCopy: { [key: string]: DynamicSchema & { moduleUid: string } } = {};
 
   if (args.schema && Object.keys(args.schema).length > 0) {
+    const moduleUid = _.uniqueId("module_");
     Object.entries(args.schema).forEach(([, schema]) => {
       if (schema.settings && schema.settings.id) {
-        schemaCopy[schema.settings.id] = _.cloneDeep(schema);
+        schemaCopy[schema.settings.id] = { ..._.cloneDeep(schema), moduleUid };
         registeredSchemas[schema.settings.id] = schemaCopy[schema.settings.id];
       }
     });
   } else {
     // Use registered schemas if new ones are not provided
-    schemaCopy = _.cloneDeep({ ...registeredSchemas });
+    schemaCopy = _.cloneDeep({ ...registeredSchemas }) as { [key: string]: DynamicSchema & { moduleUid: string } };
   }
 
   if (args.overrides) {
-    schemaCopy = handleOverrides(args.overrides, schemaCopy);
+    schemaCopy = handleOverrides(args.overrides, schemaCopy) as {
+      [key: string]: DynamicSchema & { moduleUid: string };
+    };
+
+    const newUid = _.uniqueId("module_");
+    const newSchemas = Object.entries(schemaCopy).reduce(
+      (acc, [key, schema]) => {
+        acc[key] = { ...schema, moduleUid: newUid };
+        return acc;
+      },
+      {} as { [key: string]: DynamicSchema & { moduleUid: string } },
+    );
 
-    Object.assign(registeredSchemas, schemaCopy);
+    Object.assign(registeredSchemas, newSchemas);
   }
 
   // Validation
@@ -259,8 +272,6 @@ export function createDynamicAppModule(args: {
         moduleComponents: args?.moduleComponents,
       };
 
-      const moduleUid = _.uniqueId("module_");
-
       const getComposables = (bladeId: string) => {
         const composable = schemaCopy[bladeId]?.settings.composable;
 
@@ -286,7 +297,7 @@ export function createDynamicAppModule(args: {
           mixin,
           json: JsonSchema,
           options,
-          moduleUid,
+          moduleUid: JsonSchema.moduleUid,
         };
 
         if (installedBladeIds.has(bladeId)) {

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

@@ -16,14 +16,12 @@
       v-if="bladeOptions"
       #actions
     >
-      <div class="tw-flex tw-flex-row tw-items-center tw-gap-3 tw-max-w-1/2 tw-w-full">
-        <template
-          v-for="(value, key, index) in bladeOptions"
-          :key="`blade-actions-slot-${key}-${index}`"
-        >
-          <component :is="value" />
-        </template>
-      </div>
+      <template
+        v-for="(value, key, index) in bladeOptions"
+        :key="`blade-actions-slot-${key}-${index}`"
+      >
+        <component :is="value" />
+      </template>
     </template>
 
     <div class="blade-content-wrapper">
@@ -313,7 +311,7 @@ const bladeMultilanguage = reactiveComputed(() => {
             outline: false,
             offset: {
               mainAxis: -2,
-              crossAxis: -12,
+              crossAxis: -15,
             },
             placement: "bottom-end",
             "onUpdate:modelValue": (e: string) => {
@@ -332,7 +330,7 @@ const bladeMultilanguage = reactiveComputed(() => {
                     "div",
                     {
                       class:
-                        "tw-flex tw-items-center tw-justify-center tw-bg-[--primary-100] tw-w-8 tw-h-8 tw-rounded-l-full hover:tw-bg-[--primary-200]",
+                        "tw-flex tw-items-center tw-justify-center tw-bg-[--primary-100] tw-w-8 tw-h-8 tw-rounded-full tw-mr-1 hover:tw-bg-[--primary-200]",
                     },
                     [h(VcImage, { src: scope.opt.flag, class: "tw-w-6 tw-h-6", emptyIcon: "" })],
                   );
@@ -527,7 +525,7 @@ defineExpose({
 .language-selector-container {
   position: absolute;
   top: 0;
-  right: -5px;
+  right: 0;
   z-index: 10;
 }
 

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

@@ -225,25 +225,8 @@ const selectedIds = shallowRef<string[]>([]);
 const itemsProxy = ref<Record<string, any>[]>();
 const isMixinReady = ref(false);
 
-const { moduleNotifications, markAsRead } = useNotifications(settings.value?.pushNotificationType);
 const { setNavigationQuery, getNavigationQuery } = useBladeNavigation();
 
-watch(
-  moduleNotifications,
-  (newVal) => {
-    newVal.forEach((message) => {
-      if (message.title && props.composables) {
-        notification.success(message.title, {
-          onClose() {
-            markAsRead(message);
-          },
-        });
-      }
-    });
-  },
-  { deep: true },
-);
-
 const tableData =
   props.composables &&
   computed(() => props.model?.content.find((type: ListContentSchema) => type.component === "vc-table"));

package/ui/components/atoms/vc-button/vc-button.vue

@@ -102,7 +102,7 @@ function onClick(e: Event): void {
   --button-padding-hor: 14px;
   --button-padding-hor-small: 14px;
   --button-padding-vert: 10px;
-  --button-padding-vert-small: 2px;
+  --button-padding-vert-small: 7px;
 
   --button-height: 36px;
   --button-height-small: 28px;
@@ -135,7 +135,7 @@ $variants: primary, warning, danger;
         @apply tw-py-[var(--button-padding-vert-small)] tw-min-h-[var(--button-height-small)] tw-px-[var(--button-padding-hor-small)] tw-font-normal tw-text-xs;
 
         .vc-button__icon + .vc-button__title {
-          @apply tw-ml-1;
+          @apply tw-ml-2;
         }
       }
 

package/ui/components/atoms/vc-container/vc-container.vue

@@ -34,6 +34,7 @@
         'vc-container__inner_touching': touching,
       }"
       :style="{ top: topOffset + 'px' }"
+      @scroll="onScroll"
     >
       <slot></slot>
     </div>
@@ -52,6 +53,7 @@ export interface Props {
 
 export interface Emits {
   (event: "scroll:ptr"): void;
+  (event: "scroll", e: Event): void;
 }
 
 const props = defineProps<Props>();
@@ -109,6 +111,10 @@ function onTouchend() {
   }
 }
 
+function onScroll(e: Event) {
+  emit("scroll", e);
+}
+
 onMounted(() => {
   const observer = new ResizeObserver(() => {
     scroll.value = (component.value && component.value.clientHeight < component.value.scrollHeight) as boolean;

package/ui/components/molecules/vc-input/vc-input.vue

@@ -116,6 +116,7 @@
                   class="vc-input__input"
                   @keydown="onKeyDown"
                   @blur="handleBlur"
+                  @focus="handleFocus"
                 />
               </template>
             </slot>
@@ -332,6 +333,7 @@ export interface Emits {
    */
   (event: "update:modelValue", value: string | number | Date | null | undefined): void;
   (event: "blur", value: Event): void;
+  (event: "focus"): void;
 }
 
 const props = withDefaults(defineProps<Props>(), {
@@ -545,6 +547,10 @@ function handleBlur(e: Event) {
 function focus() {
   inputRef.value?.focus();
 }
+
+function handleFocus() {
+  emit("focus");
+}
 </script>
 
 <style lang="scss">

package/ui/components/molecules/vc-textarea/vc-textarea.vue

@@ -26,6 +26,7 @@
     <!-- Textarea field -->
     <div class="vc-textarea__field-wrapper">
       <textarea
+        ref="textareaRef"
         class="vc-textarea__field"
         :placeholder="placeholder"
         :value="modelValue"
@@ -47,6 +48,7 @@
 </template>
 
 <script lang="ts" setup>
+import { ref } from "vue";
 import { VcHint, VcLabel } from "./../../";
 
 export interface Props {
@@ -78,10 +80,16 @@ withDefaults(defineProps<Props>(), {
 
 const emit = defineEmits<Emits>();
 
+const textareaRef = ref<HTMLTextAreaElement>();
+
 function onInput(e: Event) {
   const newValue = (e.target as HTMLInputElement).value;
   emit("update:modelValue", newValue);
 }
+
+defineExpose({
+  focus: () => textareaRef.value?.focus(),
+});
 </script>
 
 <style lang="scss">

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

@@ -169,7 +169,7 @@ function onClose(): void {
   @apply tw-shrink-0 tw-h-[var(--blade-header-height)] tw-bg-[color:var(--blade-header-background-color)] tw-flex tw-items-center tw-py-0 tw-px-4 tw-border-solid tw-border-b tw-border-b-[color:var(--blade-header-border-color)];
 
   &__actions {
-    @apply tw-w-auto tw-max-w-[50%] tw-grow tw-basis-0 tw-overflow-hidden;
+    @apply tw-grow tw-basis-0 tw-overflow-hidden tw-flex tw-justify-end;
   }
 
   &__status {
@@ -193,7 +193,7 @@ function onClose(): void {
   }
 
   &__content {
-    @apply tw-overflow-hidden tw-grow tw-basis-0;
+    @apply tw-overflow-hidden tw-grow tw-basis-0 tw-shrink-0;
   }
 
   &__title {

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

@@ -348,23 +348,23 @@ const { open } = usePopup({
   }
 
   &__widget-toggle {
-    @apply tw-flex tw-flex-auto;
+    @apply tw-flex;
 
     &--desktop {
-      @apply tw-flex-col tw-justify-end;
+      @apply tw-flex-col tw-justify-end tw-max-h-14 tw-h-full tw-mt-auto;
     }
 
     &--mobile {
-      @apply tw-w-12 tw-max-w-12 tw-bg-[color:var(--blade-background-color)] tw-items-center tw-justify-center tw-px-4 tw-ml-auto;
+      @apply tw-w-12 tw-max-w-12 tw-bg-[color:var(--blade-background-color)] tw-items-center tw-justify-center tw-px-4 tw-ml-auto tw-mt-0;
     }
   }
 
   &__toggle-icon {
-    @apply tw-self-center tw-justify-self-center tw-text-[color:var(--blade-icon-color)] tw-cursor-pointer hover:tw-text-[color:var(--blade-icon-hover-color)];
+    @apply tw-flex-auto tw-items-center tw-self-center tw-justify-self-center tw-text-[color:var(--blade-icon-color)] tw-cursor-pointer hover:tw-text-[color:var(--blade-icon-hover-color)];
+    @apply tw-flex #{!important};
   }
 
   &__toggle-icon--desktop {
-    @apply tw-mb-4;
   }
 }
 

package/dist/external-providers-Dd3QYSAe.js

@@ -1,4 +0,0 @@
-import { b as f } from "./index-CuqIbypI.js";
-export {
-  f as default
-};