@m4l/components 0.1.84 → 0.1.85

package/components/areas/components/AreasViewer/{index.933e506b.js → index.cacec884.js}

@@ -13,11 +13,11 @@ import { a as AREAS_VIEWER_CLASS_NAME } from "../../constants.66529246.js";
 import { shallow } from "zustand/shallow";
 import React__default, { useMemo, useState, useCallback, useEffect } from "react";
 import clsx from "clsx";
-import { u as useAreasStore } from "../../hooks/useAreas/index.b8449343.js";
+import { u as useAreasStore } from "../../hooks/useAreas/index.4baec91c.js";
 import { useModuleDictionary, useEnvironment, useModuleSkeleton, useNetwork, useHostTools, axiosOperation } from "@m4l/core";
-import { I as IconButton } from "../../../mui_extended/IconButton/index.62aea582.js";
-import "../../../mui_extended/Accordion/index.46771196.js";
-import { I as Icon } from "../../../Icon/index.d1402200.js";
+import { I as IconButton } from "../../../mui_extended/IconButton/index.be111a34.js";
+import "../../../mui_extended/Accordion/index.854f4c90.js";
+import { I as Icon } from "../../../Icon/index.c3a579e7.js";
 import { T as Typography } from "../../../mui_extended/Typography/index.443590d6.js";
 import { jsxs, jsx, Fragment } from "react/jsx-runtime";
 import "../../../mui_extended/Avatar/index.75e6ed57.js";
@@ -25,14 +25,15 @@ import "react-router-dom";
 import "@mui/material/Button";
 import { B as Button } from "../../../mui_extended/Button/index.40af964e.js";
 import "../../../mui_extended/CheckBox.38abccd8.js";
-import "../../../mui_extended/Badge/index.cad260fe.js";
-import "../../../Image/index.c18ebf5a.js";
+import "../../../mui_extended/Badge/index.8c2b8b66.js";
+import { I as Image } from "../../../Image/index.c18ebf5a.js";
 import "@mui/lab";
-import { M as MenuActions, a as MemonizedMenuActions } from "../../../mui_extended/MenuActions/index.2493b1b1.js";
+import { M as MenuActions, a as MemonizedMenuActions } from "../../../mui_extended/MenuActions/index.b16e84c1.js";
 import "../../../mui_extended/Popover/index.9f35d0eb.js";
-import "../../../mui_extended/Pager/index.a7f87c96.js";
+import "../../../mui_extended/Stack/index.0e53197c.js";
+import "../../../mui_extended/Tab/index.c1dc7bbf.js";
+import "../../../mui_extended/Pager/index.5b77fa4c.js";
 import { useResponsiveDesktop, useHostTheme, useFormatter, useLocales, useFirstRender } from "@m4l/graphics";
-import "../../../mui_extended/Tab/index.756fe693.js";
 import "../../../mui_extended/Tooltip/index.5a795dcd.js";
 import { I as ICONS } from "../../icons.8266ccc8.js";
 import { g as getAreasDictionary, D as DICCTIONARY } from "../../dictionary.afb7e3d9.js";
@@ -41,58 +42,57 @@ import debounce from "lodash/debounce";
 import { L as LinearProgress } from "../../../mui_extended/LinearProgress/index.c92b9ba9.js";
 import { W as WindowToolsMFProvider } from "../../contexts/WindowToolsMFContext/index.8f3e2a04.js";
 import { D as DynamicMFParmsProvider } from "../../contexts/DynamicMFParmsContext/index.1607c78e.js";
-import "../../../../contexts/ModalContext/index.51da83de.js";
-import "../../../../contexts/RHFormContext/index.b9266262.js";
-import "../../../GridLayout/subcomponents/Griditem/index.6c68811f.js";
-import "../../../GridLayout/index.c55f16eb.js";
-import { R as Responsive } from "../../../GridLayout/subcomponents/Responsive/index.a6e33b8d.js";
-import { S as SizeProvider } from "../../../GridLayout/subcomponents/SizeProvider/index.bfa05dfa.js";
-import { R as ROW_HEIGTH_GRIDLAYOUT, M as MARGIN_GRIDLAYOUT, P as PADDING_GRIDLAYOUT } from "../../contexts/AreasContext/index.230d1584.js";
+import "../../../../contexts/ModalContext/index.1ea79d7e.js";
+import "../../../../contexts/RHFormContext/index.e019f87d.js";
+import "../../../GridLayout/subcomponents/Griditem/index.58168132.js";
+import { S as SizeProvider } from "../../../GridLayout/index.2383aaf9.js";
+import { R as Responsive } from "../../../GridLayout/subcomponents/Responsive/index.a6642437.js";
+import { R as ROW_HEIGTH_GRIDLAYOUT, M as MARGIN_GRIDLAYOUT, P as PADDING_GRIDLAYOUT } from "../../contexts/AreasContext/index.6f56b1da.js";
 import "../../../animate/index.4e9774a6.js";
 import "framer-motion";
 import "../../../animate/LoadingScreen/index.1d0c4307.js";
 import "../../../animate/PropagateLoader/index.7fab43c8.js";
-import "../AreasAdmin/index.8ab71eb9.js";
-import "../../../ScrollBar/index.d4410cb5.js";
+import "../AreasAdmin/index.f505897a.js";
+import "../../../ScrollBar/index.1247c1c5.js";
 import "zustand";
 import "react-hook-form";
-import "../../../hook-form/RHFAutocomplete/index.d5afb409.js";
-import "../../../HelperText/index.a47ff233.js";
-import "../../../hook-form/RHFAutocompleteAsync/index.a4f00088.js";
-import "../../../hook-form/RHFCheckbox/index.9bf6edb0.js";
+import "../../../hook-form/RHFAutocomplete/index.aca6984f.js";
+import "../../../HelperText/index.8b5911d1.js";
+import "../../../hook-form/RHFAutocompleteAsync/index.8511bcf8.js";
+import "../../../hook-form/RHFCheckbox/index.0f45e6b0.js";
 import "@mui/x-date-pickers";
-import "../../../hook-form/RHFDateTime/index.a2c1ed2c.js";
-import "../../../hook-form/RHFTextField/index.5a0fa776.js";
-import "../../../hook-form/RHFPeriod/index.b5204ce2.js";
-import "../../../Period/index.e129cdec.js";
-import "../../../CommonActions/components/Actions/index.e70e8779.js";
+import "../../../hook-form/RHFDateTime/index.07412ef0.js";
+import "../../../hook-form/RHFTextField/index.94c8c59b.js";
+import "../../../hook-form/RHFPeriod/index.15b8f11e.js";
+import "../../../Period/index.061c9b2f.js";
+import "../../../CommonActions/components/Actions/index.c91c27f9.js";
 import { c as cjs } from "../../../../react-draggable.7abb5d0a.js";
 import { R as ResizeableWindow } from "../../../Resizeable/index.9a9c79a4.js";
-import "../../../modal/index.6f281ef8.js";
+import "../../../modal/index.c7e4beba.js";
 import "lodash/isString";
 import "react-dropzone";
-import "../../../hook-form/RHFUpload/index.b36539d6.js";
-import "../../../DataGrid/index.1d0a3dec.js";
+import "../../../hook-form/RHFUpload/index.7ef1e124.js";
+import "../../../DataGrid/index.37e14e83.js";
 import "react-dnd";
 import "react-dnd-html5-backend";
-import "../../../DataGrid/subcomponents/Actions/index.a8fc9f6a.js";
+import "../../../DataGrid/subcomponents/Actions/index.155c63af.js";
 import "../../../DataGrid/subcomponents/editors/TextEditor/index.91380a55.js";
-import "../../../DynamicFilter/index.912679cc.js";
+import "../../../DynamicFilter/index.a8c2609c.js";
 import "yup";
 import "lodash";
-import "../../../LanguagePopover/index.807f5272.js";
-import "../../../NavLink/index.ff5a939c.js";
-import "../../../NoItemSelected/index.23dfc897.js";
-import "../../../ObjectLogs/index.dc02715d.js";
+import "../../../LanguagePopover/index.7681b08e.js";
+import "../../../NavLink/index.bb879650.js";
+import "../../../NoItemSelected/index.a2807715.js";
+import "../../../ObjectLogs/index.2ed38a84.js";
 import "../../../../react-json-view.57125fcf.js";
-import "../../../PaperForm/index.249c2404.js";
+import "../../../PaperForm/index.989377a5.js";
 import "../../../Page/index.4237c241.js";
-import "../../../PropertyValue/index.93e40532.js";
+import "../../../PropertyValue/index.ac46f441.js";
 import "../../../SplitLayout/index.9ef430f6.js";
 import "../../../../react-splitter-layout.8b1655c8.js";
-import "../../../SideBar/index.327679a6.js";
-import "../../../AppBar/index.43f8b54f.js";
-import "../../../AccountPopover/index.bbeb9142.js";
+import "../../../SideBar/index.e0587639.js";
+import "../../../AppBar/index.291da9fd.js";
+import "../../../AccountPopover/index.35c29a55.js";
 const areasViewerClasses = generateUtilityClasses(AREAS_VIEWER_CLASS_NAME, [
   "root",
   "areaRoot",
@@ -131,7 +131,7 @@ const areasViewerClasses = generateUtilityClasses(AREAS_VIEWER_CLASS_NAME, [
   "panelWindowsRoot",
   "panelWindowsButtonContainer",
   "containerLinearProgress",
-  "areasPopoverListWindows",
+  "resizeHandle",
   "selected",
   "colapsed",
   "selectedWindow",
@@ -180,7 +180,7 @@ const useAreasViewerUtilityClasses = (ownerState) => {
     windowToastyClose: ["windowToastyClose"],
     panelWindowsRoot: ["panelWindowsRoot"],
     panelWindowsButtonContainer: ["panelWindowsButtonContainer"],
-    areasPopoverListWindows: ["areasPopoverListWindows"]
+    resizeHandle: ["resizeHandle"]
   };
   return unstable_composeClasses(slots, getComponentUtilityClass(AREAS_VIEWER_CLASS_NAME), {});
 };
@@ -604,56 +604,6 @@ const WindowPopUpsList = (props) => {
     return null;
   }
 };
-const PanelWindowPopUp = (props) => {
-  const {
-    currentAreaId
-  } = props;
-  const {
-    host_static_assets,
-    environment_assets
-  } = useEnvironment();
-  const windowsLayouts = useAreasStore((state) => state.hashAreas[currentAreaId].layoutItemsIds.filter((li) => state.hashWindows[li].emergeType === "layout").map((lim) => {
-    const w = state.hashWindows[lim];
-    return {
-      i: w.windowId,
-      url_icon: w.url_icon,
-      title: w.title
-    };
-  }), shallow);
-  const theme = useTheme();
-  const {
-    maximizeLayout
-  } = useAreasStore((state) => state.areaActions);
-  const onTouched = (layoutId) => {
-    maximizeLayout(currentAreaId, layoutId);
-  };
-  const menuActions = windowsLayouts.map((element) => {
-    return {
-      onClick: () => onTouched(element.i),
-      label: element.title,
-      urlIcon: element.url_icon
-    };
-  });
-  return /* @__PURE__ */ jsx(Fragment, {
-    children: menuActions.length > 0 ? /* @__PURE__ */ jsx(MenuActions, {
-      urlIcon: `${host_static_assets}/${environment_assets}/frontend/components/areas/assets/icons/${ICONS.MODULE}`,
-      arrowType: "no-arrow",
-      marginTop: "12px!important",
-      marginLeft: "14px!important",
-      anchorOrigin: {
-        vertical: "bottom",
-        horizontal: "right"
-      },
-      transformOrigin: {
-        vertical: "top",
-        horizontal: "right"
-      },
-      menuActions,
-      className: areasViewerClasses.areasPopoverListWindows,
-      menuActionSx: theme.components?.M4LAreasAdminMobilePopoverOptions?.styleOverrides
-    }) : null
-  });
-};
 function Header(props) {
   const {
     areaId,
@@ -672,12 +622,6 @@ function Header(props) {
       window2.fnQueryClose
     ];
   }, shallow);
-  const currentAreaId = useAreasStore((state) => state.currentAreaId, shallow);
-  const areas = useAreasStore((state) => state.areas.map((a) => ({
-    id: a,
-    name: state.hashAreas[a].name
-  })), shallow);
-  const currentArea = areas.find((area) => area.id === currentAreaId);
   const {
     saveModuleCookies,
     resetModuleCookies
@@ -769,9 +713,7 @@ function Header(props) {
             horizontal: "right"
           },
           menuActions
-        }), maximizedId && emergeType === "layout" && currentArea ? /* @__PURE__ */ jsx(PanelWindowPopUp, {
-          currentAreaId: currentArea.id
-        }) : null, !colapsed && (emergeType === "layout" || emergeType === "popup") && /* @__PURE__ */ jsx(IconButton, {
+        }), !colapsed && (emergeType === "layout" || emergeType === "popup") && /* @__PURE__ */ jsx(IconButton, {
           className: "m4l_draggableCancel",
           onClick: maxNormalize,
           "aria-label": "click",
@@ -1375,29 +1317,31 @@ const Window = (props) => {
   });
 };
 React__default.memo(Window);
-const ResponsiveGridLayout = SizeProvider(Responsive);
-const AreaGridLayout = (props) => {
+const ResizeHandle = React__default.forwardRef((props, ref) => {
   const {
-    areaId
+    handleAxis,
+    ...restProps
   } = props;
   const {
     host_static_assets,
     environment_assets
   } = useEnvironment();
-  const ResizeHandle = React__default.forwardRef((props2, ref) => {
-    const {
-      handleAxis,
-      ...restProps
-    } = props2;
-    return /* @__PURE__ */ jsx("div", {
-      ref,
-      className: `react-resizable-handle react-resizable-handle-${handleAxis}`,
-      ...restProps,
-      children: /* @__PURE__ */ jsx(Icon, {
-        src: `${host_static_assets}/${environment_assets}/frontend/components/areas/assets/icons/control_size.svg`
-      })
-    });
+  return /* @__PURE__ */ jsx("div", {
+    ref,
+    className: clsx(`react-resizable-handle react-resizable-handle-${handleAxis}`, areasViewerClasses.resizeHandle),
+    ...restProps,
+    children: /* @__PURE__ */ jsx(Image, {
+      width: "12px",
+      height: "12px",
+      src: `${host_static_assets}/${environment_assets}/frontend/components/areas/assets/icons/control_size.svg`
+    })
   });
+});
+const ResponsiveGridLayout = SizeProvider(Responsive);
+const AreaGridLayout = (props) => {
+  const {
+    areaId
+  } = props;
   const hashLayoutItems = useAreasStore((state) => state.hashAreas[areaId].layoutItemsIds, shallow);
   const layouts = useAreasStore((state) => state.hashAreas[areaId].layouts, shallow);
   const breakpoints = useAreasStore((state) => state.hashAreas[areaId].breakpoints, shallow);
@@ -1599,15 +1543,17 @@ const WindowModal = (props) => {
 };
 const MemonizedWindowModal = React__default.memo(WindowModal);
 function AreasViewer() {
-  const areas = useAreasStore((state) => state.areas, shallow);
-  const windowsModals = useAreasStore((state) => state.windowsModals);
-  const hashWindowsModals = useAreasStore((state) => state.hashWindowsModals);
-  const currentArea = useAreasStore((state) => state.currentAreaId);
-  const status = useAreasStore((state) => state.ownerState.status);
-  const classesRoot = useAreasStore((state) => state.viwerClasses.root);
+  const areas = useAreasStore((state2) => state2.areasIds, shallow);
+  const windowsModals = useAreasStore((state2) => state2.windowsModals);
+  const hashWindowsModals = useAreasStore((state2) => state2.hashWindowsModals);
+  const currentArea = useAreasStore((state2) => state2.currentAreaId);
+  const status = useAreasStore((state2) => state2.ownerState.status);
+  const classesRoot = useAreasStore((state2) => state2.viwerClasses.root);
+  const state = useAreasStore((state2) => state2);
+  console.log("Areas state >>>>", state);
   const {
     init
-  } = useAreasStore((state) => state.areasActions);
+  } = useAreasStore((state2) => state2.areasActions);
   return /* @__PURE__ */ jsxs(Fragment, {
     children: [/* @__PURE__ */ jsx(AreasViewerRoot, {
       className: classesRoot,

package/components/areas/components/AreasViewer/subcomponents/Area/subcomponents/AreaGridLayout/subcomponents/ResizeHandle/index.d.ts

@@ -0,0 +1,4 @@
+import React from "react";
+export declare const ResizeHandle: React.ForwardRefExoticComponent<{
+    handleAxis?: string | undefined;
+} & React.RefAttributes<HTMLInputElement>>;

package/components/areas/components/{index.9e48d8ff.js → index.6d5dfeec.js}

@@ -1,30 +1,31 @@
 import "react";
 import "@m4l/core";
 import "@mui/material";
-import "../../Icon/index.d1402200.js";
+import "../../Icon/index.c3a579e7.js";
 import "clsx";
 import "react/jsx-runtime";
-import "../../mui_extended/IconButton/index.62aea582.js";
+import "../../mui_extended/IconButton/index.be111a34.js";
 import "@m4l/graphics";
 import "zustand";
-import "../contexts/AreasContext/index.230d1584.js";
-import "./AreasAdmin/index.8ab71eb9.js";
+import "../contexts/AreasContext/index.6f56b1da.js";
+import "./AreasAdmin/index.f505897a.js";
 import "zustand/shallow";
-import "../../ScrollBar/index.d4410cb5.js";
-import "../../mui_extended/Accordion/index.46771196.js";
+import "../../ScrollBar/index.1247c1c5.js";
+import "../../mui_extended/Accordion/index.854f4c90.js";
 import "../../mui_extended/Typography/index.443590d6.js";
 import "../../mui_extended/Avatar/index.75e6ed57.js";
 import "react-router-dom";
 import "@mui/material/Button";
 import "../../mui_extended/Button/index.40af964e.js";
 import "../../mui_extended/CheckBox.38abccd8.js";
-import "../../mui_extended/Badge/index.cad260fe.js";
+import "../../mui_extended/Badge/index.8c2b8b66.js";
 import "../../Image/index.c18ebf5a.js";
 import "@mui/lab";
-import "../../mui_extended/MenuActions/index.2493b1b1.js";
+import "../../mui_extended/MenuActions/index.b16e84c1.js";
 import "../../mui_extended/Popover/index.9f35d0eb.js";
-import "../../mui_extended/Pager/index.a7f87c96.js";
-import "../../mui_extended/Tab/index.756fe693.js";
+import "../../mui_extended/Stack/index.0e53197c.js";
+import "../../mui_extended/Tab/index.c1dc7bbf.js";
+import "../../mui_extended/Pager/index.5b77fa4c.js";
 import "../../mui_extended/Tooltip/index.5a795dcd.js";
-import "./AreasViewer/index.933e506b.js";
+import "./AreasViewer/index.cacec884.js";
 import "../../LinearProgressIndeterminate/index.60dabc06.js";

package/components/areas/contexts/AreasContext/helper.d.ts

@@ -2,8 +2,8 @@ import { WritableDraft } from 'immer/dist/internal';
 import type { Area, AreasStateWithActions } from './types';
 import type { WindowState, WindowStateProps } from '../../types';
 export declare const ROW_HEIGTH_GRIDLAYOUT = 20;
-export declare const PADDING_GRIDLAYOUT = 3;
-export declare const MARGIN_GRIDLAYOUT = 3;
+export declare const PADDING_GRIDLAYOUT = 4;
+export declare const MARGIN_GRIDLAYOUT = 4;
 export declare const DEBOUCED_SAVE_TIME = 500;
 export declare const THROTTLE_RESIZE_TIME = 300;
 export declare const COOKIE_BREAKPOINT_LAYOUTS = "layoutPros";
@@ -31,7 +31,7 @@ export declare const DEFAULT_LAYOUTS: {
 };
 import { Layouts } from '../../../GridLayout/types';
 export declare const DEFAULT_WINDOW: Pick<WindowState, 'status' | 'moduleActions' | 'cookies' | 'loading' | 'toasties' | 'toastyCount' | 'hashToasties'>;
-export declare const DEFAULT_AREA: Omit<Area, 'id' | 'name' | 'loadWindows' | 'viewMode'>;
+export declare const DEFAULT_AREA: Omit<Area, 'id' | 'name' | 'viewMode'>;
 /**
  * @description Función de apoyo que crea un área de trabajo,
  *  El Id del area sale de concatenar la fecha actual con un número aleeatorio de 3 digitos

package/components/areas/contexts/AreasContext/{index.230d1584.js → index.6f56b1da.js}

@@ -5,19 +5,20 @@ import { useResponsiveDesktop, useFirstRender } from "@m4l/graphics";
 import { useHostTools, useModuleDictionary, useNetwork, useModuleSkeleton, EmitEvents } from "@m4l/core";
 import { devtools } from "zustand/middleware";
 import { immer } from "zustand/middleware/immer";
-import { u as useAreasViewerUtilityClasses } from "../../components/AreasViewer/index.933e506b.js";
-import { u as useAreasAdminUtilityClasses } from "../../components/AreasAdmin/index.8ab71eb9.js";
+import { u as useAreasViewerUtilityClasses } from "../../components/AreasViewer/index.cacec884.js";
+import { u as useAreasAdminUtilityClasses } from "../../components/AreasAdmin/index.f505897a.js";
 import { c as createDynamicMFStore } from "../DynamicMFParmsContext/index.1607c78e.js";
 import { g as getAreasDictionary, D as DICCTIONARY } from "../../dictionary.afb7e3d9.js";
 import "clsx";
-import "../../../GridLayout/subcomponents/Griditem/index.6c68811f.js";
-import { z as isEqualLayouts } from "../../../GridLayout/index.c55f16eb.js";
+import "../../../GridLayout/subcomponents/Griditem/index.58168132.js";
+import { z as isEqualLayouts } from "../../../GridLayout/index.2383aaf9.js";
 import { jsx } from "react/jsx-runtime";
-import { a as addLayoutItemToBreakPointIfNoExists, b as addLayoutItemToBreakPoints, c as cloneLayouts } from "../../../GridLayout/subcomponents/Responsive/index.a6e33b8d.js";
+import { a as addLayoutItemToBreakPointIfNoExists, b as addLayoutItemToBreakPoints, c as cloneLayouts } from "../../../GridLayout/subcomponents/Responsive/index.a6642437.js";
 import { debounce, cloneDeep } from "lodash";
+import { useNavigate } from "react-router-dom";
 const ROW_HEIGTH_GRIDLAYOUT = 20;
-const PADDING_GRIDLAYOUT = 3;
-const MARGIN_GRIDLAYOUT = 3;
+const PADDING_GRIDLAYOUT = 4;
+const MARGIN_GRIDLAYOUT = 4;
 const DEBOUCED_SAVE_TIME = 500;
 const COOKIE_BREAKPOINT_LAYOUTS = "layoutPros";
 const COOKIE_WINDOWS = "windows";
@@ -41,18 +42,19 @@ const DEFAULT_AREA = {
   currentLayoutId: "",
   currentPopUpId: "",
   breakpoints: BREAKPOINT_SIZES,
-  cols: NORMALIZED_COLS
+  cols: NORMALIZED_COLS,
+  loadWindows: false
 };
 const addArea = (state) => {
   const areaId = `area_${new Date().getTime()}_${(Math.random() * 1e3).toFixed(0)}`;
   const labelNewArea = state.getLabel(getAreasDictionary(DICCTIONARY.label_new_area));
   let isFree;
   let name = `${labelNewArea} 1`;
-  for (let indexNames = 1; indexNames <= state.areas.length + 1; indexNames++) {
-    name = `${labelNewArea} ${indexNames + state.areas.length}`;
+  for (let indexNames = 1; indexNames <= state.areasIds.length + 1; indexNames++) {
+    name = `${labelNewArea} ${indexNames + state.areasIds.length}`;
     isFree = true;
-    for (let index = 0; index < state.areas.length; index++) {
-      if (state.hashAreas[state.areas[index]].name === name) {
+    for (let index = 0; index < state.areasIds.length; index++) {
+      if (state.hashAreas[state.areasIds[index]].name === name) {
         isFree = false;
         break;
       }
@@ -64,11 +66,11 @@ const addArea = (state) => {
   const newArea = {
     id: areaId,
     name,
-    loadWindows: false,
     ...DEFAULT_AREA
   };
-  state.areas.push(areaId);
+  state.areasIds.push(areaId);
   state.hashAreas[areaId] = newArea;
+  state.currentModuleId = "";
   if (state.loadAreasFromNetwork) {
     state.networkOperation({
       method: "POST",
@@ -250,7 +252,7 @@ const createAreasStore = (initProps) => {
     adminClasses: useAreasAdminUtilityClasses(initProps.ownerState),
     currentAreaId: "",
     currentModuleId: "",
-    areas: [],
+    areasIds: [],
     hashAreas: {},
     hashWindows: {},
     hashWindowsModals: {},
@@ -263,63 +265,49 @@ const createAreasStore = (initProps) => {
         ...startProps,
         areasActions: {
           init: () => {
-            if (get().ownerState.status === "init") {
-              if (!get().loadAreasFromNetwork) {
-                get().areasActions.addArea();
-                set((state) => {
-                  state.ownerState.status = "loaded";
-                  updateOwnerStateClasses(state);
-                });
-              } else {
-                set((state) => {
-                  state.ownerState.status = "loading";
-                  updateOwnerStateClasses(state);
-                  state.networkOperation({
-                    method: "GET",
-                    endPoint: `areas`,
-                    parms: {},
-                    toastSuccess: false
-                  }).then((response) => {
-                    set((otherState) => {
-                      if (response?.data && Array.isArray(response.data) && response.data.length > 0) {
-                        for (let i = 0; i < response.data.length; i++) {
-                          const newArea = {
-                            ...DEFAULT_AREA,
-                            ...response.data[i],
-                            loadWindows: true
-                          };
-                          otherState.hashAreas[newArea.id] = newArea;
-                          otherState.areas.push(newArea.id);
-                        }
-                      } else {
-                        addArea(otherState);
-                      }
-                    });
-                  }).finally(() => {
-                    set((state2) => {
-                      state2.ownerState.status = "loaded";
-                      updateOwnerStateClasses(state2);
-                    });
-                    if (get().areas.length > 0) {
-                      get().areasActions.selectArea(get().areas[0]);
-                    }
-                  });
-                });
-              }
+            if (get().ownerState.status !== "init") {
+              return;
+            }
+            if (!get().loadAreasFromNetwork) {
+              get().areasActions.addArea();
+              set((state) => {
+                state.ownerState.status = "loaded";
+                updateOwnerStateClasses(state);
+              });
+              return;
             }
-          },
-          editArea: (areaId, newName) => {
             set((state) => {
-              if (state.hashAreas[areaId]) {
-                purgeToastsArea(state, areaId);
-                state.hashAreas[areaId].name = newName;
-                state.networkOperation({
-                  method: "PATCH",
-                  endPoint: `areas/${areaId}`,
-                  data: { name: newName },
-                  toastSuccess: false,
-                  toastError: false
-                });
+              state.ownerState.status = "loading";
+              updateOwnerStateClasses(state);
+            });
+            get().networkOperation({
+              method: "GET",
+              endPoint: `areas`,
+              parms: {},
+              toastSuccess: false
+            }).then((response) => {
+              set((state) => {
+                if (response?.data && Array.isArray(response.data) && response.data.length > 0) {
+                  for (let i = 0; i < response.data.length; i++) {
+                    const newArea = {
+                      ...DEFAULT_AREA,
+                      ...response.data[i],
+                      loadWindows: true
+                    };
+                    state.hashAreas[newArea.id] = newArea;
+                    state.areasIds.push(newArea.id);
+                  }
+                } else {
+                  addArea(state);
+                }
+              });
+            }).finally(() => {
+              set((state) => {
+                state.ownerState.status = "loaded";
+                updateOwnerStateClasses(state);
+              });
+              if (get().areasIds.length > 0 && get().currentAreaId === "") {
+                get().areasActions.selectArea(get().areasIds[0]);
               }
             });
           },
@@ -331,25 +319,42 @@ const createAreasStore = (initProps) => {
             get().areasActions.selectArea(newId);
             return newId;
           },
+          editArea: (areaId, newName) => {
+            set((state) => {
+              if (state.hashAreas[areaId]) {
+                state.hashAreas[areaId].name = newName;
+                if (state.loadAreasFromNetwork) {
+                  state.networkOperation({
+                    method: "PATCH",
+                    endPoint: `areas/${areaId}`,
+                    data: { name: newName },
+                    toastSuccess: false,
+                    toastError: false
+                  });
+                }
+              }
+            });
+          },
           deleteArea: (areaId) => {
             let selectNewAreaId = "";
             set((state) => {
-              const removeIndex = state.areas.indexOf(areaId);
+              const ha = state.hashAreas[areaId];
+              if (!ha || state.areasIds.length < 2) {
+                return;
+              }
+              purgeToastsArea(state, areaId);
+              const removeIndex = state.areasIds.indexOf(areaId);
               if (removeIndex > -1) {
                 for (const key in state.hashWindows) {
                   if (state.hashWindows[key].areaId === areaId) {
                     delete state.hashWindows[key];
                   }
                 }
-                state.areas.splice(removeIndex, 1);
+                state.areasIds.splice(removeIndex, 1);
                 delete state.hashAreas[areaId];
               }
               if (state.currentAreaId === areaId) {
-                if (state.areas.length > 0) {
-                  selectNewAreaId = state.areas[0];
-                } else {
-                  state.currentAreaId = "";
-                }
+                selectNewAreaId = state.areasIds[0];
               }
               if (state.loadAreasFromNetwork) {
                 state.networkOperation({
@@ -652,6 +657,12 @@ const createAreasStore = (initProps) => {
           selectLayout: (areaId, layoutId) => {
             set((state) => {
               const area = state.hashAreas[areaId];
+              const moduleId = state.hashWindows[layoutId].moduleId;
+              const searchParams = new URLSearchParams(window.location.search);
+              searchParams.set("module", moduleId);
+              state.navigate({
+                search: `?${searchParams.toString()}`
+              });
               if (state.hashWindows[layoutId].emergeType === "layout") {
                 area.currentLayoutId = layoutId;
                 state.currentModuleId = state.hashWindows[layoutId].moduleId;
@@ -1035,6 +1046,7 @@ function AreasProvider(props) {
   } = useNetwork();
   const isDesktop = useResponsiveDesktop();
   const isSkeleton = useModuleSkeleton();
+  const navigate = useNavigate();
   const isFirstRender = useFirstRender([getLabel]);
   const areasStoreRef = useRef();
   if (!areasStoreRef.current) {
@@ -1043,6 +1055,7 @@ function AreasProvider(props) {
       loadAreasFromNetwork,
       loadCookiesFromNetwork,
       networkOperation,
+      navigate,
       ownerState: {
         status: "init",
         isMobile: !isDesktop,
@@ -1061,7 +1074,7 @@ function AreasProvider(props) {
   } = useStore(areasStoreRef.current, (state) => state.areasActions, shallow);
   const addWindow = useCallback((newWindow) => {
     const currentAreaId = areasStoreRef.current?.getState().currentAreaId;
-    const areas = areasStoreRef.current?.getState().areas;
+    const areas = areasStoreRef.current?.getState().areasIds;
     if (currentAreaId && areas) {
       areasStoreRef.current?.getState().areaActions.addWindow(newWindow);
     }