@dexteel/mesf-core 3.5.2 → 3.6.1

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # CHANGELOG
-## 3.5.1
+## 3.6.1
+- Fix exports of UserReducer by updating Typescript version
+## 3.6.0
+- For AreaSelector in Navbar:
+  - Replace usage of SP when getting Areas and expose DefaultTreeId state
+- Fix some styling of nabvar
+## 3.5.1-2
 - Change Area to Area name in navbar
 ## 3.5.0
 - Add AreaSelector to navbar (optional). **REQUIRES mesf-core@7d51f66352b48508ddb4efc8f70ff68774df2834** 

package/dist/account/AuthProvider.d.ts

@@ -1,17 +1,17 @@
 import React from 'react';
 export declare const AuthContext: React.Context<any>;
-export declare type AuthConfig = {
+export type AuthConfig = {
     guestIsEnabled: boolean;
     useEmailAndPassword: boolean;
     useAzureAD: boolean;
     AzureConfig: AzureConfig;
 };
-export declare type AzureConfig = {
+export type AzureConfig = {
     clientId: string;
     authority: string;
     redirectUri: string;
 };
-declare type AuthProviderProps = {
+type AuthProviderProps = {
     children: any;
     authConfig: AuthConfig;
 };

package/dist/account/models/login.models.d.ts

@@ -1,10 +1,10 @@
 import { AuthConfig } from "../AuthProvider";
-export declare type LoginParams = {
+export type LoginParams = {
     setToken?: Function;
     authConfig: AuthConfig;
 };
-declare type Permission = string;
-export declare type UserMESData = {
+type Permission = string;
+export type UserMESData = {
     id: number;
     firstName: string;
     lastName: string;

package/dist/configuration/pages/job/JobsPage.d.ts

@@ -1,4 +1,4 @@
 /// <reference types="react" />
-declare type Props = {};
+type Props = {};
 export declare const Jobs: (prop: Props) => JSX.Element;
 export {};

package/dist/configuration/pages/job/components/JobsTable/customHooks/TableDataJobs/useJobsTableData.d.ts

@@ -1,5 +1,5 @@
 import { GridColumns } from "@material-ui/data-grid";
-declare type Props = {
+type Props = {
     getJobsFromAPI: () => Promise<void>;
     setMessageLoading: Function;
     setMessageSuccesful: Function;

package/dist/configuration/pages/job/index.d.ts

@@ -1,4 +1,4 @@
 /// <reference types="react" />
-declare type Props = {};
+type Props = {};
 declare const JobsPage: (props: Props) => JSX.Element;
 export default JobsPage;

package/dist/configuration/pages/log/LogsPage.d.ts

@@ -1,4 +1,4 @@
 /// <reference types="react" />
-declare type Props = {};
+type Props = {};
 export declare const Logs: (prop: Props) => JSX.Element;
 export {};

package/dist/configuration/pages/log/components/Filters/codeFilter.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="react" />
-declare type Props = {
+type Props = {
     LogTypeCode: number | string | null;
     setLogTypeCodeFilter: (logTypeCode: number | string | null) => void;
 };

package/dist/configuration/pages/log/components/Filters/dateFilter.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="react" />
-declare type Props = {
+type Props = {
     date: Date;
     setDate: (date: Date) => void;
     label: string | undefined;

package/dist/configuration/pages/log/components/Filters/searchFilter.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="react" />
-declare type Props = {
+type Props = {
     search: string;
     setSearch: Function;
 };

package/dist/configuration/pages/log/components/ModalLogSelected/ModalLogSelected.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="react" />
 import { Log } from '../../models/Log';
-declare type Props = {
+type Props = {
     show: boolean;
     onHide: (show: boolean) => void;
     selectedLog: Log | undefined;

package/dist/configuration/pages/log/components/hook/useGetLogsFromAPI.d.ts

@@ -1,4 +1,4 @@
-declare type Props = {
+type Props = {
     Start: Date;
     End: Date;
     Search: string;

package/dist/configuration/pages/log/index.d.ts

@@ -1,4 +1,4 @@
 /// <reference types="react" />
-declare type Props = {};
+type Props = {};
 declare const LogsPage: (props: Props) => JSX.Element;
 export default LogsPage;

package/dist/configuration/pages/profiles/ProfilesPage.d.ts

@@ -1,4 +1,4 @@
 /// <reference types="react" />
-declare type Props = {};
+type Props = {};
 export declare const Profiles: (prop: Props) => JSX.Element;
 export {};

package/dist/configuration/pages/profiles/components/Create/CreateProfile.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="react" />
-declare type Props = {
+type Props = {
     show: boolean;
     onHide: () => void;
     getProfilesFromAPI: Function;

package/dist/configuration/pages/profiles/components/Delete/DeleteProfile.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="react" />
 import { Profile } from '../../models/Profile';
-declare type Props = {
+type Props = {
     profileForDelete: Profile | null;
     show: boolean;
     onHide: (shouldUpdate: boolean) => void;

package/dist/configuration/pages/profiles/components/Edit/EditProfile.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="react" />
 import { Profile } from '../../models/Profile';
-declare type Props = {
+type Props = {
     profileForEdit: Profile | null;
     show: boolean;
     onHide: (shouldUpdate: boolean) => void;

package/dist/configuration/pages/profiles/components/ProfilesTable/TableProfiles.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="react" />
-declare type Props = {
+type Props = {
     getProfilesFromAPI: Function;
     isLoading: boolean;
 };

package/dist/configuration/pages/profiles/components/ProfilesTable/customHooks/useTableData.d.ts

@@ -1,6 +1,6 @@
 import { GridColDef } from "@material-ui/data-grid";
 import { Profile } from '../../../models/Profile';
-declare type Props = {
+type Props = {
     setProfileForEdit: (profile: Profile) => void;
     setModalEditPermissionsProfile: (showModal: boolean) => void;
     setProfileForDelete: (profile: Profile) => void;

package/dist/configuration/pages/profiles/components/common/Permissions/hooks/useGetPermissionsEffect.d.ts

@@ -1,5 +1,5 @@
 import { Permission } from "../../../../models/Permission";
-declare type Props = {
+type Props = {
     setIsLoading: (isLoading: boolean) => void;
     setPermissions: (permissions: Permission[]) => void;
 };

package/dist/configuration/pages/profiles/components/common/Permissions/hooks/useHandleAsignedPermission.d.ts

@@ -1,4 +1,4 @@
-declare type Props = {
+type Props = {
     asignedPermissions: number[];
     onChange: Function;
 };

package/dist/configuration/pages/profiles/components/common/Permissions/hooks/useIsPermissionInherited.d.ts

@@ -1,4 +1,4 @@
-declare type Props = {
+type Props = {
     profilesToProfiles: number[];
 };
 export declare const useIsPermissionInherited: ({ profilesToProfiles }: Props) => (PermissionId: number) => boolean;

package/dist/configuration/pages/profiles/components/common/Pickers/PermissionsPicker.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="react" />
-declare type Props = {
+type Props = {
     value: number[];
     onChange: Function;
     profileForDelete: number | null;

package/dist/configuration/pages/profiles/components/common/Pickers/ProfilesPicker.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="react" />
-declare type Props = {
+type Props = {
     value: number[];
     onChange: Function;
     profileForDelete: number | null;

package/dist/configuration/pages/profiles/components/common/Profiles/hook/useGetProfilesEffect.d.ts

@@ -1,5 +1,5 @@
 import { Profile } from "../../../../models/Profile";
-declare type Props = {
+type Props = {
     setIsLoading: (isLoading: boolean) => void;
     setProfiles: (permissions: Profile[]) => void;
 };

package/dist/configuration/pages/profiles/components/common/hooks/useGetColorByPermissionId.d.ts

@@ -1,4 +1,4 @@
-declare type Props = {
+type Props = {
     profilesToProfiles: number[];
 };
 export declare const useGetColorByPermissionId: ({ profilesToProfiles }: Props) => (PermissionId: number) => string | false;

package/dist/configuration/pages/profiles/index.d.ts

@@ -1,4 +1,4 @@
 /// <reference types="react" />
-declare type Props = {};
+type Props = {};
 declare const UsersPage: (props: Props) => JSX.Element;
 export default UsersPage;

package/dist/configuration/pages/shifCrew/ShiftsCrewsPage.d.ts

@@ -1,4 +1,4 @@
 /// <reference types="react" />
-declare type Props = {};
+type Props = {};
 export declare const ShiftsCrews: (prop: Props) => JSX.Element;
 export {};

package/dist/configuration/pages/shifCrew/components/Create/CreateShift.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="react" />
-declare type Props = {
+type Props = {
     show: boolean;
     onHide: () => void;
     getShiftsCrewsFromAPI: Function;

package/dist/configuration/pages/shifCrew/components/Delete/DeleteShift.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="react" />
-declare type Props = {
+type Props = {
     show: boolean;
     onHide: (shouldUpdate: boolean) => void;
 };

package/dist/configuration/pages/shifCrew/components/Edit/EditShift.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="react" />
-declare type Props = {
+type Props = {
     show: boolean;
     onHide: (shouldUpdate: boolean) => void;
 };

package/dist/configuration/pages/shifCrew/components/TableShifts.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="react" />
-declare type Props = {
+type Props = {
     getShiftsCrewsFromAPI: Function;
     isLoading: boolean;
 };

package/dist/configuration/pages/shifCrew/components/customHooks/useTableShift.d.ts

@@ -1,5 +1,5 @@
 import { GridColDef } from "@material-ui/data-grid";
-declare type Props = {
+type Props = {
     setModalEditShift: Function;
     setModalDeleteShift: Function;
 };

package/dist/configuration/pages/shifCrew/index.d.ts

@@ -1,4 +1,4 @@
 /// <reference types="react" />
-declare type Props = {};
+type Props = {};
 declare const ShiftsCrewsPage: (props: Props) => JSX.Element;
 export default ShiftsCrewsPage;

package/dist/configuration/pages/users/UsersPage.d.ts

@@ -1,4 +1,4 @@
 /// <reference types="react" />
-declare type Props = {};
+type Props = {};
 export declare const Users: (prop: Props) => JSX.Element;
 export {};

package/dist/configuration/pages/users/components/ChangePassword/ChangePassword.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="react" />
-declare type Props = {
+type Props = {
     show: boolean;
     userId: number | null;
     onHide: (shouldUpdate: boolean) => void;

package/dist/configuration/pages/users/components/Create/CreateUser.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="react" />
-declare type Props = {
+type Props = {
     show: boolean;
     onHide: () => void;
     getUsersFromAPI: Function;

package/dist/configuration/pages/users/components/Delete/DeleteUser.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="react" />
-declare type Props = {
+type Props = {
     userIdForDelete: number | null;
     show: boolean;
     onHide: (shouldUpdate: boolean) => void;

package/dist/configuration/pages/users/components/EditUser/EditUser.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="react" />
-declare type Props = {
+type Props = {
     userIdForEdit: number | null;
     show: boolean;
     onHide: (shouldUpdate: boolean) => void;

package/dist/configuration/pages/users/components/UsersDataTable/TableUsers.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="react" />
-declare type Props = {
+type Props = {
     getUsersFromAPI: Function;
     isLoading: boolean;
 };

package/dist/configuration/pages/users/components/UsersDataTable/customHooks/useTableData.d.ts

@@ -1,5 +1,5 @@
 import { GridColDef } from '@material-ui/data-grid';
-declare type Props = {
+type Props = {
     setModalEditDataUser: Function;
     setModalDeleteUser: Function;
     setUserIdForEdit: Function;

package/dist/configuration/pages/users/components/common/ProfilesPicker.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="react" />
-declare type Props = {
+type Props = {
     value: number[];
     onChange: Function;
     userIdForDelete: number | null;

package/dist/configuration/pages/users/index.d.ts

@@ -1,4 +1,4 @@
 /// <reference types="react" />
-declare type Props = {};
+type Props = {};
 declare const UsersPage: (props: Props) => JSX.Element;
 export default UsersPage;

package/dist/configurationMenu.d.ts

@@ -1,5 +1,5 @@
 import React from "react";
-declare type SectionComponent = {
+type SectionComponent = {
     path: string;
     sidebar: React.FunctionComponent;
     main: React.FunctionComponent;
@@ -9,7 +9,7 @@ export interface SidebarType extends React.FunctionComponent<{
     option?: string;
 }> {
 }
-export declare type ConfigurationsType = [
+export type ConfigurationsType = [
     SectionComponent[],
     SidebarType
 ];

package/dist/context/userContext.d.ts

@@ -4,18 +4,22 @@ export declare const useUserContext: () => {
         userLastName: string;
         userId: number | null;
         defaultAreaId: string | number | null;
-        listAllAssets: import("../models/Asset").Asset[];
-        listAllAssetsExtensions: import("../models/Area").Area[];
-        areasList: any[];
+        defaultAreaName: string | null;
+        defaultTreeId: string | number | null;
+        defaultTreeName: string | null;
+        areasList: import("../models/Area").Area[];
+        treeIdChanged: boolean;
     };
     actions: import("@reduxjs/toolkit").CaseReducerActions<{
         setUserId(state: import("immer/dist/internal").WritableDraft<{
             userLastName: string;
             userId: number | null;
             defaultAreaId: string | number | null;
-            listAllAssets: import("../models/Asset").Asset[];
-            listAllAssetsExtensions: import("../models/Area").Area[];
-            areasList: any[];
+            defaultAreaName: string | null;
+            defaultTreeId: string | number | null;
+            defaultTreeName: string | null;
+            areasList: import("../models/Area").Area[];
+            treeIdChanged: boolean;
         }>, { payload }: {
             payload: any;
             type: string;
@@ -24,9 +28,11 @@ export declare const useUserContext: () => {
             userLastName: string;
             userId: number | null;
             defaultAreaId: string | number | null;
-            listAllAssets: import("../models/Asset").Asset[];
-            listAllAssetsExtensions: import("../models/Area").Area[];
-            areasList: any[];
+            defaultAreaName: string | null;
+            defaultTreeId: string | number | null;
+            defaultTreeName: string | null;
+            areasList: import("../models/Area").Area[];
+            treeIdChanged: boolean;
         }>, { payload }: {
             payload: any;
             type: string;
@@ -35,31 +41,63 @@ export declare const useUserContext: () => {
             userLastName: string;
             userId: number | null;
             defaultAreaId: string | number | null;
-            listAllAssets: import("../models/Asset").Asset[];
-            listAllAssetsExtensions: import("../models/Area").Area[];
-            areasList: any[];
+            defaultAreaName: string | null;
+            defaultTreeId: string | number | null;
+            defaultTreeName: string | null;
+            areasList: import("../models/Area").Area[];
+            treeIdChanged: boolean;
         }>, { payload }: {
             payload: any;
             type: string;
         }): void;
-        setListAllAssets(state: import("immer/dist/internal").WritableDraft<{
+        setDefaultAreaName(state: import("immer/dist/internal").WritableDraft<{
             userLastName: string;
             userId: number | null;
             defaultAreaId: string | number | null;
-            listAllAssets: import("../models/Asset").Asset[];
-            listAllAssetsExtensions: import("../models/Area").Area[];
-            areasList: any[];
+            defaultAreaName: string | null;
+            defaultTreeId: string | number | null;
+            defaultTreeName: string | null;
+            areasList: import("../models/Area").Area[];
+            treeIdChanged: boolean;
         }>, { payload }: {
             payload: any;
             type: string;
         }): void;
-        setListAllAssetsExtensions(state: import("immer/dist/internal").WritableDraft<{
+        setDefaultTreeId(state: import("immer/dist/internal").WritableDraft<{
             userLastName: string;
             userId: number | null;
             defaultAreaId: string | number | null;
-            listAllAssets: import("../models/Asset").Asset[];
-            listAllAssetsExtensions: import("../models/Area").Area[];
-            areasList: any[];
+            defaultAreaName: string | null;
+            defaultTreeId: string | number | null;
+            defaultTreeName: string | null;
+            areasList: import("../models/Area").Area[];
+            treeIdChanged: boolean;
+        }>, { payload }: {
+            payload: any;
+            type: string;
+        }): void;
+        setDefaultTreeName(state: import("immer/dist/internal").WritableDraft<{
+            userLastName: string;
+            userId: number | null;
+            defaultAreaId: string | number | null;
+            defaultAreaName: string | null;
+            defaultTreeId: string | number | null;
+            defaultTreeName: string | null;
+            areasList: import("../models/Area").Area[];
+            treeIdChanged: boolean;
+        }>, { payload }: {
+            payload: any;
+            type: string;
+        }): void;
+        setTreeIdChanged(state: import("immer/dist/internal").WritableDraft<{
+            userLastName: string;
+            userId: number | null;
+            defaultAreaId: string | number | null;
+            defaultAreaName: string | null;
+            defaultTreeId: string | number | null;
+            defaultTreeName: string | null;
+            areasList: import("../models/Area").Area[];
+            treeIdChanged: boolean;
         }>, { payload }: {
             payload: any;
             type: string;
@@ -68,9 +106,11 @@ export declare const useUserContext: () => {
             userLastName: string;
             userId: number | null;
             defaultAreaId: string | number | null;
-            listAllAssets: import("../models/Asset").Asset[];
-            listAllAssetsExtensions: import("../models/Area").Area[];
-            areasList: any[];
+            defaultAreaName: string | null;
+            defaultTreeId: string | number | null;
+            defaultTreeName: string | null;
+            areasList: import("../models/Area").Area[];
+            treeIdChanged: boolean;
         }>, { payload }: {
             payload: any;
             type: string;

package/dist/controls/filters/filters.d.ts

@@ -1,5 +1,5 @@
 import { Component } from "react";
-declare type TreePickerControlProps = {
+type TreePickerControlProps = {
     onSelect: (value: string, description: string, findNode: any) => void;
     [key: string]: any;
 };
@@ -11,7 +11,7 @@ export declare class SimplePasswordControl extends Component<any> {
     render(): JSX.Element;
 }
 export declare const formatNumber: (value: number) => string;
-export declare type NumericTextControlProps = {
+export type NumericTextControlProps = {
     value: any;
     title: any;
     styleLabel: any;

package/dist/controls/panels.d.ts

@@ -1,5 +1,5 @@
 import { Component, MouseEventHandler } from "react";
-declare type GenericPanelProps = {
+type GenericPanelProps = {
     title: string;
     description: string;
     showPromptSuccess?: boolean;
@@ -13,7 +13,7 @@ declare type GenericPanelProps = {
 /********************MATERIAL UI STYLES********************************** */
 /************************************************************************* */
 declare const GenericPanel: ({ title, description, showPromptSuccess, showPromptError, onDismissSuccess, onDismissError, successMessage, error, children, }: GenericPanelProps) => JSX.Element;
-declare type MasterDetailPanelProps = {
+type MasterDetailPanelProps = {
     title: string;
     onSave: MouseEventHandler;
     onCancel: MouseEventHandler;
@@ -27,11 +27,11 @@ declare class MasterDetailPanel extends Component<MasterDetailPanelProps> {
     useStyles(): (props?: any) => import("@material-ui/styles").ClassNameMap<"root">;
     render(): JSX.Element;
 }
-declare type ExtraButton = {
+type ExtraButton = {
     name: string;
     onClick: MouseEventHandler;
 };
-declare type FilterPanelProps = {
+type FilterPanelProps = {
     onClickExport?: Function;
     onClickReset: Function;
     OnClickGo: Function;

package/dist/hooks/useSearchAssets.d.ts

@@ -1,4 +1,3 @@
 export declare const useSearchAssets: () => {
-    searchAssets: () => void;
-    searchAssetExtension: () => void;
+    searchAreas: () => void;
 };

package/dist/index.esm.js

@@ -34,8 +34,8 @@ import MenuList from '@material-ui/core/MenuList';
 import PersonPinCircleIcon from '@material-ui/icons/PersonPinCircle';
 import { useComplexState } from 'use-complex-state';
 import { createSlice } from '@reduxjs/toolkit';
-import moment from 'moment';
 import { get, useForm, Controller } from 'react-hook-form';
+import moment from 'moment';
 import DialogContentText from '@material-ui/core/DialogContentText';
 import Snackbar from '@material-ui/core/Snackbar';
 import CircularProgress from '@material-ui/core/CircularProgress';
@@ -5113,7 +5113,7 @@ var getUser = function (UserId, UserName) { return __awaiter(void 0, void 0, voi
         }
     });
 }); };
-var getUTLSettings = function () { return __awaiter(void 0, void 0, void 0, function () {
+var getAreas = function () { return __awaiter(void 0, void 0, void 0, function () {
     var apiService, resp, e_2;
     return __generator(this, function (_a) {
         switch (_a.label) {
@@ -5122,7 +5122,7 @@ var getUTLSettings = function () { return __awaiter(void 0, void 0, void 0, func
                 _a.label = 1;
             case 1:
                 _a.trys.push([1, 3, , 4]);
-                return [4 /*yield*/, apiService.call("[MMS].[GetUTLSettings]", [])];
+                return [4 /*yield*/, apiService.call("[MMS].[GetAreas]", [])];
             case 2:
                 resp = _a.sent();
                 return [2 /*return*/, {
@@ -5136,19 +5136,16 @@ var getUTLSettings = function () { return __awaiter(void 0, void 0, void 0, func
         }
     });
 }); };
-var upsertDefaultAreaId = function (UserId, DefaultAreaId) { return __awaiter(void 0, void 0, void 0, function () {
-    var apiService, parameters, resp, e_3;
+var getUTLSettings = function () { return __awaiter(void 0, void 0, void 0, function () {
+    var apiService, resp, e_3;
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
                 apiService = new MESApiService();
-                parameters = [];
-                parameters.push({ name: "UserId", value: UserId });
-                parameters.push({ name: "DefaultAreaId", value: DefaultAreaId });
                 _a.label = 1;
             case 1:
                 _a.trys.push([1, 3, , 4]);
-                return [4 /*yield*/, apiService.call("[MES].[UpsertDefaultAreaId]", parameters)];
+                return [4 /*yield*/, apiService.call("[MMS].[GetUTLSettings]", [])];
             case 2:
                 resp = _a.sent();
                 return [2 /*return*/, {
@@ -5162,16 +5159,19 @@ var upsertDefaultAreaId = function (UserId, DefaultAreaId) { return __awaiter(vo
         }
     });
 }); };
-var getAssets = function () { return __awaiter(void 0, void 0, void 0, function () {
-    var apiService, resp, e_4;
+var upsertDefaultAreaId = function (UserId, DefaultAreaId) { return __awaiter(void 0, void 0, void 0, function () {
+    var apiService, parameters, resp, e_4;
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
                 apiService = new MESApiService();
+                parameters = [];
+                parameters.push({ name: "UserId", value: UserId });
+                parameters.push({ name: "DefaultAreaId", value: DefaultAreaId });
                 _a.label = 1;
             case 1:
                 _a.trys.push([1, 3, , 4]);
-                return [4 /*yield*/, apiService.call("[MMS].[GetAssets]", [])];
+                return [4 /*yield*/, apiService.call("[MES].[UpsertDefaultAreaId]", parameters)];
             case 2:
                 resp = _a.sent();
                 return [2 /*return*/, {
@@ -5184,29 +5184,6 @@ var getAssets = function () { return __awaiter(void 0, void 0, void 0, function
             case 4: return [2 /*return*/];
         }
     });
-}); };
-var GetAssetsExtension = function () { return __awaiter(void 0, void 0, void 0, function () {
-    var apiService, resp, e_5;
-    return __generator(this, function (_a) {
-        switch (_a.label) {
-            case 0:
-                apiService = new MESApiService();
-                _a.label = 1;
-            case 1:
-                _a.trys.push([1, 3, , 4]);
-                return [4 /*yield*/, apiService.call("[MMS].[GetAssetsExtension]", [])];
-            case 2:
-                resp = _a.sent();
-                return [2 /*return*/, {
-                        ok: true,
-                        data: resp
-                    }];
-            case 3:
-                e_5 = _a.sent();
-                return [2 /*return*/, { ok: false, message: e_5.toString() }];
-            case 4: return [2 /*return*/];
-        }
-    });
 }); };
 
 function ChangePassword(props) {
@@ -5846,9 +5823,11 @@ var UserInitialState = {
     userLastName: "",
     userId: null,
     defaultAreaId: null,
-    listAllAssets: [],
-    listAllAssetsExtensions: [],
-    areasList: []
+    defaultAreaName: "",
+    defaultTreeId: null,
+    defaultTreeName: null,
+    areasList: [],
+    treeIdChanged: false
 };
 var UserReducer = createSlice({
     name: "__",
@@ -5866,13 +5845,21 @@ var UserReducer = createSlice({
             var payload = _a.payload;
             state.defaultAreaId = payload;
         },
-        setListAllAssets: function (state, _a) {
+        setDefaultAreaName: function (state, _a) {
             var payload = _a.payload;
-            state.listAllAssets = payload;
+            state.defaultAreaName = payload;
         },
-        setListAllAssetsExtensions: function (state, _a) {
+        setDefaultTreeId: function (state, _a) {
             var payload = _a.payload;
-            state.listAllAssetsExtensions = payload;
+            state.defaultTreeId = payload;
+        },
+        setDefaultTreeName: function (state, _a) {
+            var payload = _a.payload;
+            state.defaultTreeName = payload;
+        },
+        setTreeIdChanged: function (state, _a) {
+            var payload = _a.payload;
+            state.treeIdChanged = payload;
         },
         setAreasList: function (state, _a) {
             var payload = _a.payload;
@@ -5913,26 +5900,17 @@ function MESFMain(_a) {
 }
 
 var useSearchAssets = function () {
-    var _a = useUserContext().actions, setListAllAssets = _a.setListAllAssets, setListAllAssetsExtensions = _a.setListAllAssetsExtensions;
-    var searchAssets = function () {
-        getAssets().then(function (res) {
-            if (res) {
-                var rowsSource = get(res, "data.tables[0].rows", []);
-                setListAllAssets(rowsSource);
-            }
-        });
-    };
-    var searchAssetExtension = function () {
-        GetAssetsExtension().then(function (res) {
+    var setAreasList = useUserContext().actions.setAreasList;
+    var searchAreas = function () {
+        getAreas().then(function (res) {
             if (res) {
-                var rowsSource = get(res, "data.tables[0].rows", []);
-                setListAllAssetsExtensions(rowsSource);
+                var areasSource = get(res, "data.tables[0].rows", []);
+                setAreasList(areasSource);
             }
         });
     };
     return {
-        searchAssets: searchAssets,
-        searchAssetExtension: searchAssetExtension
+        searchAreas: searchAreas
     };
 };
 
@@ -5980,58 +5958,65 @@ var AreaSelector = function () {
     var _a = useState(false), open = _a[0], setOpen = _a[1];
     var _b = useState(false); _b[0]; _b[1];
     var _c = useState(''); _c[0]; _c[1];
-    var _d = useSearchAssets(), searchAssets = _d.searchAssets, searchAssetExtension = _d.searchAssetExtension;
-    var _e = useToken(); _e.getUserName; var getUserId = _e.getUserId;
-    var _f = useUserContext(), _g = _f.state, userId = _g.userId, listAllAssetsExtensions = _g.listAllAssetsExtensions, defaultAreaId = _g.defaultAreaId, listAllAssets = _g.listAllAssets, areasList = _g.areasList, _h = _f.actions, setDefaultAreaId = _h.setDefaultAreaId, setUserId = _h.setUserId, setAreasList = _h.setAreasList;
-    var _j = React__default.useState(true), fullWidth = _j[0]; _j[1];
-    var _k = React__default.useState('sm'), maxWidth = _k[0]; _k[1];
+    var _d = useState(false), areaChanged = _d[0], setAreaChanged = _d[1];
+    var searchAreas = useSearchAssets().searchAreas;
+    var getUserId = useToken().getUserId;
+    var _e = useUserContext(), _f = _e.state, userId = _f.userId, defaultAreaId = _f.defaultAreaId, defaultAreaName = _f.defaultAreaName, areasList = _f.areasList, defaultTreeId = _f.defaultTreeId, _g = _e.actions, setDefaultAreaId = _g.setDefaultAreaId, setDefaultAreaName = _g.setDefaultAreaName, setUserId = _g.setUserId, setDefaultTreeId = _g.setDefaultTreeId, setDefaultTreeName = _g.setDefaultTreeName, setTreeIdChanged = _g.setTreeIdChanged;
+    var _h = React__default.useState(true), fullWidth = _h[0]; _h[1];
+    var _j = React__default.useState('sm'), maxWidth = _j[0]; _j[1];
     var classes = useStyles();
-    var _l = useState(defaultAreaId), defaultAreaIdToChange = _l[0], setDefaultAreaIdToChange = _l[1];
+    var _k = useState(defaultAreaId), defaultAreaIdToChange = _k[0], setDefaultAreaIdToChange = _k[1];
+    var _l = useState(defaultAreaName), defaultAreaNameToChange = _l[0], setDefaultAreaNameToChange = _l[1];
+    var _m = useState(defaultTreeId), defaultTreeIdToChange = _m[0], setDefaultTreeIdToChange = _m[1];
+    var defaultAreaIdFromAPI = useDefaultAreaId();
     var onClose = function (value) { return setOpen(value); };
     var changeAreaActive = function () {
         setOpen(true);
     };
-    useEffect(searchAssets, []);
-    useEffect(searchAssetExtension, []);
-    useEffect(function () {
-        var allAreas = listAllAssetsExtensions.filter(function (area) { return area.IsArea == true; });
-        setAreasList(allAreas);
-    }, [listAllAssetsExtensions]);
-    var defaultAreaIdFromAPI = useDefaultAreaId();
-    useEffect(function () {
-        setUserId(getUserId());
-    }, []);
-    useEffect(function () {
-        defaultAreaIdFromAPI();
-    }, [userId]);
     var handleCancel = function () {
-        onClose(false);
         setDefaultAreaIdToChange(defaultAreaId);
+        setDefaultAreaNameToChange(defaultAreaName);
+        onClose(false);
     };
     var handleClose = function () {
-        setOpen(false);
         setDefaultAreaIdToChange(defaultAreaId);
+        setDefaultAreaNameToChange(defaultAreaName);
+        setOpen(false);
     };
-    var getAreaNameById = function (areaId) {
-        var _a;
-        return (_a = listAllAssets.find(function (a) { return a.AssetId === areaId; })) === null || _a === void 0 ? void 0 : _a.AssetName;
+    var handleChangeAreaId = function (areaId, areName, areaDefaultTreeId) {
+        setDefaultAreaIdToChange(areaId);
+        setDefaultAreaNameToChange(areName);
+        setDefaultTreeIdToChange(areaDefaultTreeId);
     };
-    var handleChangeAreaId = function (area) {
-        setDefaultAreaIdToChange(area);
+    var handleChangeDefaultAreaId = function () {
+        setAreaChanged(true);
+        upsertDefaultAreaId(userId, defaultAreaIdToChange);
+        setDefaultAreaId(defaultAreaIdToChange);
+        setDefaultAreaName(defaultAreaNameToChange);
+        setDefaultTreeId(defaultTreeIdToChange);
+        setOpen(false);
     };
-    var handleChangeDefaultAreaId = function () { return __awaiter(void 0, void 0, void 0, function () {
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0: return [4 /*yield*/, upsertDefaultAreaId(userId, defaultAreaIdToChange)];
-                case 1:
-                    _a.sent();
-                    setDefaultAreaId(defaultAreaIdToChange);
-                    localStorage.setItem("areaId", defaultAreaIdToChange);
-                    setOpen(false);
-                    return [2 /*return*/];
+    useEffect(function () {
+        setUserId(getUserId());
+    }, []);
+    useEffect(searchAreas, []);
+    useEffect(function () {
+        defaultAreaIdFromAPI();
+    }, [userId]);
+    useEffect(function () {
+        if (!areaChanged) {
+            if (defaultAreaId) {
+                var areaSelected = areasList.find(function (area) { return area.AssetId === defaultAreaId; });
+                setDefaultTreeId(areaSelected === null || areaSelected === void 0 ? void 0 : areaSelected.DefaultTreeId);
+                setDefaultAreaName(areaSelected === null || areaSelected === void 0 ? void 0 : areaSelected.AssetName);
+                setDefaultTreeName(areaSelected === null || areaSelected === void 0 ? void 0 : areaSelected.Title);
             }
-        });
-    }); };
+        }
+        else {
+            setAreaChanged(false);
+            setTreeIdChanged(true);
+        }
+    }, [defaultAreaId]);
     return (React__default.createElement(React__default.Fragment, null,
         React__default.createElement(Nav, { className: "mx-2" },
             React__default.createElement(Nav.Link, null,
@@ -6041,20 +6026,20 @@ var AreaSelector = function () {
                         "textOverflow": "ellipsis", "whiteSpace": "nowrap"
                     }, onClick: changeAreaActive },
                     React__default.createElement(PersonPinCircleIcon, { style: { marginLeft: "-5px" } }),
-                    getAreaNameById(defaultAreaId) || "Pick Area"))),
+                    defaultAreaName || "Pick Area"))),
         React__default.createElement(Dialog$1, { fullWidth: fullWidth, maxWidth: maxWidth, onClose: handleClose, "aria-labelledby": "confirmation-dialog-title", open: open, className: classes.root },
             React__default.createElement(DialogTitle$2, { id: "confirmation-dialog-title" }, "AREA"),
             React__default.createElement(DialogContent$2, { dividers: true },
                 React__default.createElement("h6", { className: classes.title, id: "contained-modal-title-vcenter", style: { marginBottom: 0 } }, "Current Area"),
                 React__default.createElement(Grid$1, { container: true },
                     React__default.createElement(Grid$1, { item: true, md: 12, xs: 12, style: { marginTop: 5 } },
-                        React__default.createElement(TextField$1, { variant: "outlined", disabled: true, value: getAreaNameById(defaultAreaIdToChange), fullWidth: true, margin: "dense", autoComplete: 'off', style: { color: "#000 !important" } }),
+                        React__default.createElement(TextField$1, { variant: "outlined", disabled: true, value: defaultAreaNameToChange, fullWidth: true, margin: "dense", autoComplete: 'off', style: { color: "#000 !important" } }),
                         React__default.createElement("h6", { className: classes.title, id: "contained-modal-title-vcenter", style: { marginBottom: 0, marginTop: 5 } }, "Change Default Area"),
                         React__default.createElement(Grid$1, { item: true, md: 12, xs: 12, style: { marginTop: 10 } },
                             React__default.createElement(Grid$1, { item: true, md: 12, xs: 12, style: { height: "45vh", border: "1px solid rgba(0, 0, 0, 0.26)", borderRadius: "2px", overflowY: "scroll" } },
                                 React__default.createElement(List, { dense: true, style: { padding: 0 } }, areasList.map(function (area) {
-                                    return (React__default.createElement(ListItem, { button: true, key: "Area-".concat(area.AssetId), onClick: function () { return handleChangeAreaId(area.AssetId); }, style: { cursor: "pointer", width: "100%" } },
-                                        React__default.createElement(ListItemText, { primary: getAreaNameById(area.AssetId) })));
+                                    return (React__default.createElement(ListItem, { button: true, key: "Area-".concat(area.AssetId), onClick: function () { return handleChangeAreaId(area.AssetId, area.AssetName, area.DefaultTreeId); }, style: { cursor: "pointer", width: "100%" } },
+                                        React__default.createElement(ListItemText, { primary: area.AssetName })));
                                 }))))))),
             React__default.createElement(DialogActions$2, null,
                 React__default.createElement(Button, { autoFocus: true, onClick: handleCancel, color: "primary" }, "Cancel"),

package/dist/models/Area.d.ts

@@ -1,4 +1,15 @@
 export interface Area {
     AssetId: number;
-    IsArea: boolean | null;
+    ParentAssetId: number | null;
+    AssetName: string;
+    IsAsset: boolean;
+    Code: null;
+    Class: null;
+    Criticality: null;
+    isTaskListRoot: boolean;
+    SvgMap: null;
+    MarkDownText: null | string;
+    IsArea: boolean;
+    DefaultTreeId: number;
+    Title: string;
 }

package/dist/reducers/UserReducer.d.ts

@@ -1,20 +1,23 @@
 import { Area } from "../models/Area";
-import { Asset } from "../models/Asset";
 export declare const UserReducer: import("@reduxjs/toolkit").Slice<{
     userLastName: string;
     userId: number | null;
     defaultAreaId: number | string | null;
-    listAllAssets: Asset[];
-    listAllAssetsExtensions: Area[];
-    areasList: any[];
+    defaultAreaName: string | null;
+    defaultTreeId: number | string | null;
+    defaultTreeName: string | null;
+    areasList: Area[];
+    treeIdChanged: boolean;
 }, {
     setUserId(state: import("immer/dist/internal").WritableDraft<{
         userLastName: string;
         userId: number | null;
         defaultAreaId: number | string | null;
-        listAllAssets: Asset[];
-        listAllAssetsExtensions: Area[];
-        areasList: any[];
+        defaultAreaName: string | null;
+        defaultTreeId: number | string | null;
+        defaultTreeName: string | null;
+        areasList: Area[];
+        treeIdChanged: boolean;
     }>, { payload }: {
         payload: any;
         type: string;
@@ -23,9 +26,11 @@ export declare const UserReducer: import("@reduxjs/toolkit").Slice<{
         userLastName: string;
         userId: number | null;
         defaultAreaId: number | string | null;
-        listAllAssets: Asset[];
-        listAllAssetsExtensions: Area[];
-        areasList: any[];
+        defaultAreaName: string | null;
+        defaultTreeId: number | string | null;
+        defaultTreeName: string | null;
+        areasList: Area[];
+        treeIdChanged: boolean;
     }>, { payload }: {
         payload: any;
         type: string;
@@ -34,31 +39,63 @@ export declare const UserReducer: import("@reduxjs/toolkit").Slice<{
         userLastName: string;
         userId: number | null;
         defaultAreaId: number | string | null;
-        listAllAssets: Asset[];
-        listAllAssetsExtensions: Area[];
-        areasList: any[];
+        defaultAreaName: string | null;
+        defaultTreeId: number | string | null;
+        defaultTreeName: string | null;
+        areasList: Area[];
+        treeIdChanged: boolean;
     }>, { payload }: {
         payload: any;
         type: string;
     }): void;
-    setListAllAssets(state: import("immer/dist/internal").WritableDraft<{
+    setDefaultAreaName(state: import("immer/dist/internal").WritableDraft<{
         userLastName: string;
         userId: number | null;
         defaultAreaId: number | string | null;
-        listAllAssets: Asset[];
-        listAllAssetsExtensions: Area[];
-        areasList: any[];
+        defaultAreaName: string | null;
+        defaultTreeId: number | string | null;
+        defaultTreeName: string | null;
+        areasList: Area[];
+        treeIdChanged: boolean;
     }>, { payload }: {
         payload: any;
         type: string;
     }): void;
-    setListAllAssetsExtensions(state: import("immer/dist/internal").WritableDraft<{
+    setDefaultTreeId(state: import("immer/dist/internal").WritableDraft<{
         userLastName: string;
         userId: number | null;
         defaultAreaId: number | string | null;
-        listAllAssets: Asset[];
-        listAllAssetsExtensions: Area[];
-        areasList: any[];
+        defaultAreaName: string | null;
+        defaultTreeId: number | string | null;
+        defaultTreeName: string | null;
+        areasList: Area[];
+        treeIdChanged: boolean;
+    }>, { payload }: {
+        payload: any;
+        type: string;
+    }): void;
+    setDefaultTreeName(state: import("immer/dist/internal").WritableDraft<{
+        userLastName: string;
+        userId: number | null;
+        defaultAreaId: number | string | null;
+        defaultAreaName: string | null;
+        defaultTreeId: number | string | null;
+        defaultTreeName: string | null;
+        areasList: Area[];
+        treeIdChanged: boolean;
+    }>, { payload }: {
+        payload: any;
+        type: string;
+    }): void;
+    setTreeIdChanged(state: import("immer/dist/internal").WritableDraft<{
+        userLastName: string;
+        userId: number | null;
+        defaultAreaId: number | string | null;
+        defaultAreaName: string | null;
+        defaultTreeId: number | string | null;
+        defaultTreeName: string | null;
+        areasList: Area[];
+        treeIdChanged: boolean;
     }>, { payload }: {
         payload: any;
         type: string;
@@ -67,9 +104,11 @@ export declare const UserReducer: import("@reduxjs/toolkit").Slice<{
         userLastName: string;
         userId: number | null;
         defaultAreaId: number | string | null;
-        listAllAssets: Asset[];
-        listAllAssetsExtensions: Area[];
-        areasList: any[];
+        defaultAreaName: string | null;
+        defaultTreeId: number | string | null;
+        defaultTreeName: string | null;
+        areasList: Area[];
+        treeIdChanged: boolean;
     }>, { payload }: {
         payload: any;
         type: string;

package/dist/repositorie/MESF-frontend-Repositorie.d.ts

@@ -7,16 +7,7 @@ export declare const getUser: (UserId: number, UserName: string | null) => Promi
     message: any;
     data?: undefined;
 }>;
-export declare const getUTLSettings: () => Promise<{
-    ok: boolean;
-    data: any;
-    message?: undefined;
-} | {
-    ok: boolean;
-    message: any;
-    data?: undefined;
-}>;
-export declare const upsertDefaultAreaId: (UserId: number, DefaultAreaId: number | null) => Promise<{
+export declare const getAreas: () => Promise<{
     ok: boolean;
     data: any;
     message?: undefined;
@@ -25,7 +16,7 @@ export declare const upsertDefaultAreaId: (UserId: number, DefaultAreaId: number
     message: any;
     data?: undefined;
 }>;
-export declare const getAssets: () => Promise<{
+export declare const getUTLSettings: () => Promise<{
     ok: boolean;
     data: any;
     message?: undefined;
@@ -34,7 +25,7 @@ export declare const getAssets: () => Promise<{
     message: any;
     data?: undefined;
 }>;
-export declare const GetAssetsExtension: () => Promise<{
+export declare const upsertDefaultAreaId: (UserId: number, DefaultAreaId: number | null) => Promise<{
     ok: boolean;
     data: any;
     message?: undefined;

package/dist/services/ApiService.d.ts

@@ -1,20 +1,20 @@
-declare type ExportColumn = {
+type ExportColumn = {
     columnName?: string;
     caption?: string;
     order?: number;
 };
-declare type ExportSheet = {
+type ExportSheet = {
     order?: number;
     resultSetIndex?: number;
     sheetName?: string;
     showAllColumns?: boolean;
     columns?: ExportColumn[];
 };
-declare type ExportStructure = {
+type ExportStructure = {
     showAllSheets?: boolean;
     sheets?: ExportSheet[];
 };
-export declare type spParameter = {
+export type spParameter = {
     name: string;
     value: string | number | boolean | null | Date;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dexteel/mesf-core",
-  "version": "3.5.2",
+  "version": "3.6.1",
   "author": "Dexteel Team",
   "module": "dist/index.esm.js",
   "typings": "dist/index.d.ts",
@@ -51,7 +51,7 @@
     "rollup-plugin-typescript2": "^0.31.2",
     "string-to-color": "^2.2.2",
     "tslib": "^2.3.1",
-    "typescript": "^4.5.5",
+    "typescript": "^4.9.4",
     "use-complex-state": "^1.1.0"
   },
   "peerDependencies": {