@vc-shell/framework 1.2.4-beta.3 → 1.2.4-beta.5

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

@@ -1,110 +1,110 @@
-import { useI18n } from "vue-i18n";
-import { Component, ExtractPropTypes, computed, h, onMounted, ref, unref } from "vue";
-import componentProps from "@shared/modules/dynamic/components/fields/props";
-import { StatusSchema } from "@shared/modules/dynamic/types";
-import { StatusField } from "@shared/modules/dynamic/components/factories";
-import { VcIcon } from "@ui/components";
-import { unrefNested } from "@shared/modules/dynamic/helpers/unrefNested";
-import VcButton from "@ui/components/atoms/vc-button/vc-button.vue";
-
-export default {
-  name: "StatusField",
-  props: componentProps,
-  setup(props: ExtractPropTypes<typeof componentProps> & { element: StatusSchema }) {
-    const { t } = useI18n({ useScope: "global" });
-    const hasOverflow = ref(false);
-    const isExpanded = ref(false);
-    const contentRef = ref<HTMLElement | null>(null);
-
-    const toggle = () => {
-      isExpanded.value = !isExpanded.value;
-    };
-
-    const checkOverflow = () => {
-      if (contentRef.value) {
-        hasOverflow.value = contentRef.value.scrollHeight > 100;
-      }
-    };
-
-    onMounted(() => {
-      checkOverflow();
-    });
-
-    return () => {
-      const slotContent = computed(() => {
-        if (props.element.content && typeof props.element.content === "string") {
-          return t(props.element.content);
-        } else if (
-          typeof props.element.content === "object" &&
-          "method" in props.element.content &&
-          props.element.content?.method
-        ) {
-          const method = unref(props.bladeContext.scope)?.[props.element.content?.method];
-          if (typeof method === "function") {
-            return method();
-          } else {
-            return method;
-          }
-        }
-
-        return null;
-      });
-
-      const field = StatusField({
-        props: Object.assign(
-          {
-            variant: props.element.variant,
-            outline: props.element.outline,
-            extend: props.element.extend,
-          },
-          unrefNested(props.baseProps),
-          {
-            class: unrefNested(props.baseProps).classNames ?? "",
-          },
-        ),
-        slots: {
-          default: () => {
-            return h("div", { class: "tw-flex tw-flex-row tw-items-center" }, [
-              props.element.icon
-                ? h(VcIcon, {
-                    icon: props.element.icon,
-                    size: props.element.iconSize,
-                    variant: props.element.iconVariant,
-                    class: "tw-mr-3",
-                  })
-                : undefined,
-              h("div", { class: "tw-flex tw-flex-col", style: "text-align: start;" }, [
-                h("div", { class: "tw-font-bold" }, computed(() => t(props.element.title ?? "")).value),
-                h(
-                  "div",
-                  {
-                    class: {
-                      "tw-overflow-hidden": true,
-                      "tw-max-h-[100px] tw-line-clamp-4": !isExpanded.value,
-                      "tw-max-h-[100%]": isExpanded.value,
-                    },
-                    ref: contentRef,
-                  },
-                  slotContent.value,
-                ),
-                hasOverflow.value
-                  ? h(VcButton, { text: true, class: "tw-self-end", onClick: toggle }, () =>
-                      isExpanded.value
-                        ? t("COMPONENTS.ATOMS.VC_STATUS.SHOW_LESS")
-                        : t("COMPONENTS.ATOMS.VC_STATUS.SHOW_MORE"),
-                    )
-                  : undefined,
-              ]),
-            ]);
-          },
-        },
-      });
-
-      return h(
-        field.component as Component,
-        { ...field.props, class: props.element.extend ? "tw-w-full tw-box-border" : "tw-flex tw-self-start" },
-        field.slots,
-      );
-    };
-  },
-};
+import { useI18n } from "vue-i18n";
+import { Component, ExtractPropTypes, computed, h, onMounted, ref, unref } from "vue";
+import componentProps from "@shared/modules/dynamic/components/fields/props";
+import { StatusSchema } from "@shared/modules/dynamic/types";
+import { StatusField } from "@shared/modules/dynamic/components/factories";
+import { VcIcon } from "@ui/components/atoms/vc-icon";
+import { unrefNested } from "@shared/modules/dynamic/helpers/unrefNested";
+import VcButton from "@ui/components/atoms/vc-button/vc-button.vue";
+
+export default {
+  name: "StatusField",
+  props: componentProps,
+  setup(props: ExtractPropTypes<typeof componentProps> & { element: StatusSchema }) {
+    const { t } = useI18n({ useScope: "global" });
+    const hasOverflow = ref(false);
+    const isExpanded = ref(false);
+    const contentRef = ref<HTMLElement | null>(null);
+
+    const toggle = () => {
+      isExpanded.value = !isExpanded.value;
+    };
+
+    const checkOverflow = () => {
+      if (contentRef.value) {
+        hasOverflow.value = contentRef.value.scrollHeight > 100;
+      }
+    };
+
+    onMounted(() => {
+      checkOverflow();
+    });
+
+    return () => {
+      const slotContent = computed(() => {
+        if (props.element.content && typeof props.element.content === "string") {
+          return t(props.element.content);
+        } else if (
+          typeof props.element.content === "object" &&
+          "method" in props.element.content &&
+          props.element.content?.method
+        ) {
+          const method = unref(props.bladeContext.scope)?.[props.element.content?.method];
+          if (typeof method === "function") {
+            return method();
+          } else {
+            return method;
+          }
+        }
+
+        return null;
+      });
+
+      const field = StatusField({
+        props: Object.assign(
+          {
+            variant: props.element.variant,
+            outline: props.element.outline,
+            extend: props.element.extend,
+          },
+          unrefNested(props.baseProps),
+          {
+            class: unrefNested(props.baseProps).classNames ?? "",
+          },
+        ),
+        slots: {
+          default: () => {
+            return h("div", { class: "tw-flex tw-flex-row tw-items-center" }, [
+              props.element.icon
+                ? h(VcIcon, {
+                    icon: props.element.icon,
+                    size: props.element.iconSize,
+                    variant: props.element.iconVariant,
+                    class: "tw-mr-3",
+                  })
+                : undefined,
+              h("div", { class: "tw-flex tw-flex-col", style: "text-align: start;" }, [
+                h("div", { class: "tw-font-bold" }, computed(() => t(props.element.title ?? "")).value),
+                h(
+                  "div",
+                  {
+                    class: {
+                      "tw-overflow-hidden": true,
+                      "tw-max-h-[100px] tw-line-clamp-4": !isExpanded.value,
+                      "tw-max-h-[100%]": isExpanded.value,
+                    },
+                    ref: contentRef,
+                  },
+                  slotContent.value,
+                ),
+                hasOverflow.value
+                  ? h(VcButton, { text: true, class: "tw-self-end", onClick: toggle }, () =>
+                      isExpanded.value
+                        ? t("COMPONENTS.ATOMS.VC_STATUS.SHOW_LESS")
+                        : t("COMPONENTS.ATOMS.VC_STATUS.SHOW_MORE"),
+                    )
+                  : undefined,
+              ]),
+            ]);
+          },
+        },
+      });
+
+      return h(
+        field.component as Component,
+        { ...field.props, class: props.element.extend ? "tw-w-full tw-box-border" : "tw-flex tw-self-start" },
+        field.slots,
+      );
+    };
+  },
+};

package/shared/modules/dynamic/composables/useFilterBuilder/index.ts

@@ -18,8 +18,12 @@ import {
 } from "vue";
 import * as _ from "lodash-es";
 import { Checkbox, InputField, Switch, SelectField, RadioButton } from "@shared/modules/dynamic/components/factories";
-import { AsyncAction } from "@core/composables";
-import { VcButton, VcCol, VcContainer, VcLabel, VcRow } from "@ui/components";
+import { AsyncAction } from "@core/composables/useAsync";
+import { VcButton } from "@ui/components/atoms/vc-button";
+import { VcCol } from "@ui/components/atoms/vc-col";
+import { VcContainer } from "@ui/components/atoms/vc-container";
+import { VcLabel } from "@ui/components/atoms/vc-label";
+import { VcRow } from "@ui/components/atoms/vc-row";
 import { useI18n } from "vue-i18n";
 import { FilterBase, FilterCheckbox, FilterDateInput, FilterRadio, FilterSelect, FilterSwitch } from "@shared/modules/dynamic/types";
 

package/shared/modules/dynamic/composables/useToolbarReducer/index.ts

@@ -1,5 +1,5 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
-import { IBladeToolbar } from "@core/types";
+import type { IBladeToolbar } from "@core/types";
 import * as _ from "lodash-es";
 import { SettingsSchema, ToolbarSchema } from "@shared/modules/dynamic/types";
 import { BaseBladeScope, DetailsBladeContext, ListBladeContext } from "@shared/modules/dynamic/factories/types";

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

@@ -1,7 +1,8 @@
 import { ComputedRef, MaybeRef, computed, ref, watch } from "vue";
 import * as _ from "lodash-es";
 import { useForm, useIsFormValid } from "vee-validate";
-import { useAsync, useLoading } from "@core/composables";
+import { useAsync } from "@core/composables/useAsync";
+import { useLoading } from "@core/composables/useLoading";
 import type { ItemId, IValidationState, UseDetails } from "@shared/modules/dynamic/factories/types";
 import { createUnrefFn } from "@vueuse/core";
 

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

@@ -1,7 +1,8 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import { Ref, computed, ref } from "vue";
 import { CustomQuery, UseList } from "@shared/modules/dynamic/factories/types";
-import { useAsync, useLoading } from "@core/composables";
+import { useAsync } from "@core/composables/useAsync";
+import { useLoading } from "@core/composables/useLoading";
 
 interface ISearchResult<T> {
   totalCount?: number;

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

@@ -1,15 +1,16 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import { ComputedRef, MaybeRef, Ref, UnwrapNestedRefs } from "vue";
-import { AsyncAction, IUseDynamicProperties } from "@core/composables";
+import { AsyncAction } from "@core/composables/useAsync";
+import { IUseDynamicProperties } from "@core/composables/useDynamicProperties";
 import { SettingsDetails, SettingsGrid, SettingsSchema } from "@shared/modules/dynamic/types";
-import {
+import type {
   AssetsHandler,
   IActionBuilderResult,
   IBladeToolbar,
   ICommonAsset,
   ITableColumns,
 } from "@core/types";
-import { useBladeNavigation } from "@shared/components";
+import { useBladeNavigation } from "@shared/components/blade-navigation/composables";
 import { FormContext } from "vee-validate";
 import { Breadcrumbs } from "@ui/types";
 import { DynamicBladeForm, DynamicBladeList } from "@shared/modules/dynamic/pages";

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

@@ -12,7 +12,7 @@ import { i18n } from "@core/plugins/i18n";
 import { methodHandler } from "@shared/modules/dynamic/helpers/methodHandler";
 import { toRefs } from "@vueuse/core";
 import { unrefNested } from "@shared/modules/dynamic/helpers/unrefNested";
-import { usePermissions } from "@core/composables";
+import { usePermissions } from "@core/composables/usePermissions";
 
 const { hasAccess } = usePermissions();
 

package/shared/modules/dynamic/index.ts

@@ -6,7 +6,8 @@ import * as _ from "lodash-es";
 import { handleOverrides } from "@shared/modules/dynamic/helpers/override";
 import { reactiveComputed } from "@vueuse/core";
 import { kebabToPascal } from "@core/utilities";
-import { BladeInstanceConstructor, notification } from "@shared";
+import type { BladeInstanceConstructor } from "@shared/components/blade-navigation/types";
+import { notification } from "@shared/components/notifications/core/notification";
 import { createAppModule } from "@core/plugins";
 import { ComponentProps } from "@shared/utilities/vueUtils";
 import { Router } from "vue-router";

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

@@ -87,21 +87,23 @@ import {
 import { DynamicDetailsSchema, FormContentSchema, SettingsSchema } from "@shared/modules/dynamic/types";
 import { IsBladeEditableKey } from "@shared/modules/dynamic/keys";
 import { reactiveComputed, toReactive, useMounted } from "@vueuse/core";
-import {
+import type {
   DetailsBladeContext,
   DetailsBaseBladeScope,
-  IParentCallArgs,
   UseDetails,
-  usePopup,
-  useBladeNavigation,
-  CoreBladeExposed,
-} from "@shared";
+} from "@shared/modules/dynamic/factories/types";
+import type { IParentCallArgs, CoreBladeExposed } from "@shared/components/blade-navigation/types";
+import { usePopup } from "@shared/components/popup-handler/composables/usePopup";
+import { useBladeNavigation } from "@shared/components/blade-navigation/composables";
 import SchemaRender from "@shared/modules/dynamic/components/SchemaRender";
-import { VcDropdown, VcImage } from "@ui/components";
+import { VcDropdown } from "@ui/components/molecules/vc-dropdown";
+import { VcImage } from "@ui/components/atoms/vc-image";
 import { useToolbarReducer } from "@shared/modules/dynamic/composables/useToolbarReducer";
 import { useBeforeUnload } from "@core/composables/useBeforeUnload";
-import { useLanguages, useNotifications, useBlade } from "@core/composables";
-import { notification } from "@shared/components";
+import { useLanguages } from "@core/composables/useLanguages";
+import { useNotifications } from "@core/composables/useNotifications";
+import { useBlade } from "@core/composables/useBlade";
+import { notification } from "@shared/components/notifications/core/notification";
 import { useWidgets } from "@core/composables/useWidgets";
 import { BladeInstance } from "@framework/injection-keys";
 
@@ -544,11 +546,11 @@ defineExpose({
     @apply tw-text-[color:var(--dynamic-form-decline-color)] tw-mr-3;
   }
 
-  .vc-app_mobile &__inner {
+  .vc-app--mobile &__inner {
     @apply tw-flex-col;
   }
 
-  .vc-app_mobile &__content {
+  .vc-app--mobile &__content {
     @apply tw-border-r-0 tw-border-b tw-border-solid tw-border-b-[--dynamic-form-mobile-border] tw-overflow-visible;
   }
 }

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

@@ -152,16 +152,17 @@ import { DynamicGridSchema, ListContentSchema, SettingsSchema } from "@shared/mo
 import { IsBladeEditableKey } from "@shared/modules/dynamic/keys";
 import useFilterBuilder from "@shared/modules/dynamic/composables/useFilterBuilder";
 import { useTableTemplates } from "@shared/modules/dynamic/composables";
-import { useFunctions } from "@core/composables";
+import { useFunctions } from "@core/composables/useFunctions";
 import { IActionBuilderResult, ITableColumns } from "@core/types";
 import { useToolbarReducer } from "@shared/modules/dynamic/composables/useToolbarReducer";
-import { useBladeNavigation, usePopup } from "@shared/components";
+import { useBladeNavigation } from "@shared/components/blade-navigation/composables";
+import { usePopup } from "@shared/components/popup-handler/composables/usePopup";
 import { ListBaseBladeScope, ListBladeContext, UseList } from "@shared/modules/dynamic/factories/types";
-import { IParentCallArgs } from "@shared";
+import type { IParentCallArgs } from "@shared/components/blade-navigation/types";
 import { reactiveComputed, toReactive, useMounted } from "@vueuse/core";
 import { safeIn } from "@shared/modules/dynamic/helpers/safeIn";
 import { useWidgets } from "@core/composables/useWidgets";
-import { useBlade } from "@core/composables";
+import { useBlade } from "@core/composables/useBlade";
 
 export interface Props {
   expanded?: boolean;

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

@@ -1,19 +1,17 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
-import {
-  VcButton,
-  VcCard,
-  VcField,
-  VcGallery,
-  VcIcon,
-  VcImage,
-  VcInput,
-  VcMultivalue,
-  VcRating,
-  VcStatus,
-  VcPagination,
-  VcInputCurrency,
-} from "@ui/components";
-import { IActionBuilderResult, ITableColumns, IValidationRules, MenuItemConfig } from "@core/types";
+import { VcButton } from "@ui/components/atoms/vc-button";
+import { VcCard } from "@ui/components/atoms/vc-card";
+import { VcField } from "@ui/components/molecules/vc-field";
+import { VcGallery } from "@ui/components/organisms/vc-gallery";
+import { VcIcon } from "@ui/components/atoms/vc-icon";
+import { VcImage } from "@ui/components/atoms/vc-image";
+import { VcInput } from "@ui/components/molecules/vc-input";
+import { VcMultivalue } from "@ui/components/molecules/vc-multivalue";
+import { VcRating } from "@ui/components/molecules/vc-rating";
+import { VcStatus } from "@ui/components/atoms/vc-status";
+import { VcPagination } from "@ui/components/molecules/vc-pagination";
+import { VcInputCurrency } from "@ui/components/molecules/vc-input-currency";
+import type { IActionBuilderResult, ITableColumns, IValidationRules, MenuItemConfig } from "@core/types";
 import type { ComponentProps } from "@shared/utilities/vueUtils";
 
 export type KeysOfUnion<T> = T extends T ? keyof T : never;

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

@@ -1,26 +1,24 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import { Raw } from "vue";
-import {
-  VcButton,
-  VcCard,
-  VcCheckbox,
-  VcDynamicProperty,
-  VcEditor,
-  VcField,
-  VcGallery,
-  VcImage,
-  VcInput,
-  VcInputCurrency,
-  VcSelect,
-  VcStatus,
-  VcVideo,
-  VcTextarea,
-  VcMultivalue,
-  VcSwitch,
-  VcTable,
-  VcRating,
-  VcRadioButton,
-} from "@ui/components";
+import { VcButton } from "@ui/components/atoms/vc-button";
+import { VcCard } from "@ui/components/atoms/vc-card";
+import { VcCheckbox } from "@ui/components/molecules/vc-checkbox";
+import { VcDynamicProperty } from "@ui/components/organisms/vc-dynamic-property";
+import { VcEditor } from "@ui/components/molecules/vc-editor";
+import { VcField } from "@ui/components/molecules/vc-field";
+import { VcGallery } from "@ui/components/organisms/vc-gallery";
+import { VcImage } from "@ui/components/atoms/vc-image";
+import { VcInput } from "@ui/components/molecules/vc-input";
+import { VcInputCurrency } from "@ui/components/molecules/vc-input-currency";
+import { VcSelect } from "@ui/components/molecules/vc-select";
+import { VcStatus } from "@ui/components/atoms/vc-status";
+import { VcVideo } from "@ui/components/atoms/vc-video";
+import { VcTextarea } from "@ui/components/molecules/vc-textarea";
+import { VcMultivalue } from "@ui/components/molecules/vc-multivalue";
+import { VcSwitch } from "@ui/components/molecules/vc-switch";
+import { VcTable } from "@ui/components/organisms/vc-table";
+import { VcRating } from "@ui/components/molecules/vc-rating";
+import { VcRadioButton } from "@ui/components/molecules/vc-radio-button";
 import type { ComponentProps, ComponentEmit, ComponentSlots } from "vue-component-type-helpers";
 
 type FromGenericEventsToProps<T extends Record<string, any>> =

package/shared/pages/ForgotPasswordPage/components/forgot-password/ForgotPassword.vue

@@ -7,7 +7,7 @@
   >
     <!-- Request form -->
     <template v-if="!forgotPasswordRequestSent">
-      <VcForm @submit.prevent="forgot">
+      <VcForm @submit="forgot">
         <Field
           v-slot="{ errorMessage, handleChange, errors }"
           :label="t('FORGOT_PASSWORD.FIELDS.EMAIL.LABEL')"