@vc-shell/framework 1.0.313 → 1.0.315

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vc-shell/framework",
-  "version": "1.0.313",
+  "version": "1.0.315",
   "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.313",
-    "@vc-shell/config-generator": "^1.0.313",
-    "@vc-shell/ts-config": "^1.0.313",
+    "@vc-shell/api-client-generator": "^1.0.315",
+    "@vc-shell/config-generator": "^1.0.315",
+    "@vc-shell/ts-config": "^1.0.315",
     "@vitejs/plugin-vue": "5.0.3",
     "cypress-signalr-mock": "^1.5.0",
     "sass": "^1.69.6",

package/shared/components/sidebar/sidebar.vue

@@ -19,14 +19,11 @@
         },
       ]"
     >
-      <slot name="header">
-        <div class="sidebar__header">
-          <VcIcon
-            icon="fas fa-times"
-            size="xl"
-            @click.stop="$emit('close')"
-          ></VcIcon>
-        </div>
+      <slot
+        name="header"
+        :header="header"
+      >
+        <component :is="header" />
       </slot>
 
       <slot name="content"></slot>
@@ -38,6 +35,9 @@
 </template>
 
 <script lang="ts" setup>
+import { h } from "vue";
+import { VcIcon } from "../../../ui/components";
+
 export interface Props {
   position?: "left" | "right";
   render: "always" | "mobile" | "desktop";
@@ -48,12 +48,16 @@ export interface Emits {
   (event: "close"): void;
 }
 
-defineEmits<Emits>();
+const emit = defineEmits<Emits>();
 
 withDefaults(defineProps<Props>(), {
   position: "right",
   render: "always",
 });
+
+const header = h("div", { class: "sidebar__header" }, [
+  h(VcIcon, { icon: "fas fa-times", size: "xl", onClick: () => emit("close") }),
+]);
 </script>
 
 <style lang="scss">

package/shared/components/user-dropdown-button/user-dropdown-button.vue

@@ -76,6 +76,35 @@
         render="mobile"
         @close="toggle"
       >
+        <template #header="{ header }">
+          <div class="vc-user-dropdown-button__header-wrap">
+            <div class="vc-user-dropdown-button__header">
+              <div
+                v-if="avatarUrl"
+                class="vc-user-dropdown-button__avatar"
+                :style="imageHandler"
+              ></div>
+              <VcIcon
+                v-else
+                icon="fas fa-user-circle"
+                size="xxl"
+                class="vc-user-dropdown-button__icon"
+              />
+              <div class="vc-user-dropdown-button__info">
+                <div class="vc-user-dropdown-button__name">
+                  {{ name || user?.userName }}
+                </div>
+                <div class="vc-user-dropdown-button__role">
+                  {{
+                    (role && $t(`SHELL.USER.ROLE.${role}`)) ||
+                    (user?.isAdministrator ? $t("SHELL.USER.ROLE.ADMINISTRATOR") : "")
+                  }}
+                </div>
+              </div>
+            </div>
+            <component :is="header" />
+          </div>
+        </template>
         <template #content>
           <div
             v-if="menu && opened"
@@ -228,6 +257,14 @@ const imageHandler = computed(() => {
     @apply tw-flex tw-justify-between tw-items-center tw-flex-auto tw-px-4 tw-bg-[--user-dropdown-wrap-bg] tw-gap-3;
   }
 
+  &__header {
+    @apply tw-flex tw-justify-between tw-items-center tw-px-3 tw-py-3 tw-bg-[--user-dropdown-wrap-bg] tw-gap-3;
+  }
+
+  &__header-wrap {
+    @apply tw-flex tw-justify-between tw-items-center;
+  }
+
   &__avatar {
     @apply tw-rounded-full tw-overflow-hidden tw-w-[34px] tw-h-[34px] tw-bg-[color:var(--user-dropdown-account-info-role-color)]
     tw-bg-cover tw-bg-center tw-shrink-0;

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

@@ -54,17 +54,13 @@ export default defineComponent({
     watch(
       () => props.modelValue,
       (newVal) => {
-        if (!_.isEqual(internalFormData, newVal)) {
-          Object.assign(internalFormData, toRefs(newVal));
-        }
+        Object.assign(internalFormData, toRefs(newVal));
       },
       { deep: true, immediate: true },
     );
 
     function updateFormData(newVal: ToRefs<unknown>) {
-      if (!_.isEqual(newVal, internalFormData)) {
-        ctx.emit("update:modelValue", unrefNested(newVal));
-      }
+      ctx.emit("update:modelValue", unrefNested(newVal));
     }
 
     return () =>

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

@@ -125,13 +125,12 @@ export default {
 
     return () => {
       return properties && properties.length
-        ? properties?.map((field) =>
-            h(
-              field.component as Component,
-              Object.assign(unrefNested(field.props), {
-                class: unrefNested(props.baseProps).classNames ?? "",
-              }),
-            ),
+        ? properties.map((field) =>
+            h(field.component as Component, {
+              ...unrefNested(field.props),
+              class: unrefNested(props.baseProps).classNames ?? "",
+              key: field.props.key,
+            }),
           )
         : null;
     };

package/shared/modules/dynamic/factories/base/useDetailsFactory.ts

@@ -1,4 +1,4 @@
-import { ComputedRef, MaybeRef, computed, ref, watch } from "vue";
+import { ComputedRef, MaybeRef, computed, ref, watch, toRaw } from "vue";
 import * as _ from "lodash-es";
 import { useForm, useIsFormValid } from "vee-validate";
 import { useAsync, useLoading } from "../../../../../core/composables";
@@ -74,14 +74,41 @@ export const useDetailsFactory = <Item extends { id?: string }>(factoryParams: U
       }),
     );
 
+    function normalizeData(data: unknown): unknown {
+      if (
+        data === null ||
+        data === undefined ||
+        data === "" ||
+        (Array.isArray(data) && data.length === 0) ||
+        (typeof data === "object" && data !== null && Object.keys(data).length === 0)
+      ) {
+        return undefined;
+      }
+
+      if (Array.isArray(data)) {
+        return data.map((item) => normalizeData(item));
+      }
+
+      if (typeof data === "object") {
+        const normalizedObj: Record<string, unknown> = {};
+        for (const key in data) {
+          if (Object.prototype.hasOwnProperty.call(data, key)) {
+            normalizedObj[key] = normalizeData(data[key as keyof typeof data]);
+          }
+        }
+        return normalizedObj;
+      }
+
+      return data;
+    }
+
     watch(
-      [() => item, () => itemTemp],
+      [() => item.value, () => itemTemp.value],
       ([state, stateCopy]) => {
-        isModified.value = !_.isEqualWith(stateCopy.value, state.value, (a, b) => {
-          if (a === undefined && b === null) return true;
-          if (a === null && b === undefined) return true;
-          return undefined; // Use default comparison for other cases
-        });
+        const normalizedState = normalizeData(state);
+        const normalizedStateCopy = normalizeData(stateCopy);
+
+        isModified.value = !_.isEqual(normalizedState, normalizedStateCopy);
       },
       { deep: true },
     );

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

@@ -490,7 +490,7 @@ function onKeyDown(e: KeyboardEvent) {
   const keypressed = e.key;
 
   if (props.type === "number" || props.type === "integer") {
-    if (keypressed === "-" || keypressed === "e") {
+    if (keypressed === "-" || keypressed === "e" || keypressed === "+") {
       e.preventDefault();
     }
   }

package/dist/external-providers-C5TviitJ.js

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