@dexteel/mesf-core 3.12.2 → 3.12.4

package/CHANGELOG.md

@@ -1,4 +1,8 @@
 # CHANGELOG
+## 3.12.4
+- Remove bugs in Assets Tree Configuration Page
+## 3.12.3
+- Remove bugs in Assets Tree Configuration Page
 ## 3.12.1
 - Added Assets Configuration (Tree with Drag and Drop)
 ## 3.11.9

package/dist/configuration/pages/asset/models/AssetParameters.d.ts

@@ -1,10 +1,11 @@
 export interface AssetParameters {
     id: number;
-    parent: number | null;
+    parent: number;
     text: string;
     data: {
         fileType: string;
         fileSize: string;
     };
     droppable: boolean;
+    isOpen?: boolean;
 }

package/dist/configuration/pages/asset/reducers/ConfigurationAssetReducer.d.ts

@@ -1,6 +1,11 @@
 import { AssetAPI } from "../models/AssetAPI";
+import { AssetParameters } from "../models/AssetParameters";
 export declare const ConfigurationAssetReducer: import("@reduxjs/toolkit").Slice<{
-    allAssetNodes: any;
+    openAssets: {
+        [assetId: string]: string | number;
+        [assetId: number]: string | number;
+    };
+    allAssetNodes: AssetParameters[];
     dataToCreateAsset: AssetAPI;
     allNodesLoading: boolean;
     anchorPoint: any;
@@ -11,9 +16,35 @@ export declare const ConfigurationAssetReducer: import("@reduxjs/toolkit").Slice
     assetTreeName: string | null;
     assetCodes: any;
     assetNodeSelectedInTree: AssetAPI;
+    allAssetLoading: boolean;
 }, {
+    setOpenAssets(state: import("immer/dist/internal").WritableDraft<{
+        openAssets: {
+            [assetId: string]: string | number;
+            [assetId: number]: string | number;
+        };
+        allAssetNodes: AssetParameters[];
+        dataToCreateAsset: AssetAPI;
+        allNodesLoading: boolean;
+        anchorPoint: any;
+        menuContextAssetId: number | undefined;
+        showContextMenu: boolean;
+        showCreateNewContextMenu: boolean;
+        assetTreeId: number | null;
+        assetTreeName: string | null;
+        assetCodes: any;
+        assetNodeSelectedInTree: AssetAPI;
+        allAssetLoading: boolean;
+    }>, { payload }: {
+        payload: any;
+        type: string;
+    }): void;
     setAllAssetNodes(state: import("immer/dist/internal").WritableDraft<{
-        allAssetNodes: any;
+        openAssets: {
+            [assetId: string]: string | number;
+            [assetId: number]: string | number;
+        };
+        allAssetNodes: AssetParameters[];
         dataToCreateAsset: AssetAPI;
         allNodesLoading: boolean;
         anchorPoint: any;
@@ -24,12 +55,17 @@ export declare const ConfigurationAssetReducer: import("@reduxjs/toolkit").Slice
         assetTreeName: string | null;
         assetCodes: any;
         assetNodeSelectedInTree: AssetAPI;
+        allAssetLoading: boolean;
     }>, { payload }: {
         payload: any;
         type: string;
     }): void;
     seAllNodesLoading(state: import("immer/dist/internal").WritableDraft<{
-        allAssetNodes: any;
+        openAssets: {
+            [assetId: string]: string | number;
+            [assetId: number]: string | number;
+        };
+        allAssetNodes: AssetParameters[];
         dataToCreateAsset: AssetAPI;
         allNodesLoading: boolean;
         anchorPoint: any;
@@ -40,12 +76,17 @@ export declare const ConfigurationAssetReducer: import("@reduxjs/toolkit").Slice
         assetTreeName: string | null;
         assetCodes: any;
         assetNodeSelectedInTree: AssetAPI;
+        allAssetLoading: boolean;
     }>, { payload }: {
         payload: any;
         type: string;
     }): void;
     setAnchorPointX(state: import("immer/dist/internal").WritableDraft<{
-        allAssetNodes: any;
+        openAssets: {
+            [assetId: string]: string | number;
+            [assetId: number]: string | number;
+        };
+        allAssetNodes: AssetParameters[];
         dataToCreateAsset: AssetAPI;
         allNodesLoading: boolean;
         anchorPoint: any;
@@ -56,12 +97,17 @@ export declare const ConfigurationAssetReducer: import("@reduxjs/toolkit").Slice
         assetTreeName: string | null;
         assetCodes: any;
         assetNodeSelectedInTree: AssetAPI;
+        allAssetLoading: boolean;
     }>, { payload }: {
         payload: any;
         type: string;
     }): void;
     setAnchorPointY(state: import("immer/dist/internal").WritableDraft<{
-        allAssetNodes: any;
+        openAssets: {
+            [assetId: string]: string | number;
+            [assetId: number]: string | number;
+        };
+        allAssetNodes: AssetParameters[];
         dataToCreateAsset: AssetAPI;
         allNodesLoading: boolean;
         anchorPoint: any;
@@ -72,12 +118,17 @@ export declare const ConfigurationAssetReducer: import("@reduxjs/toolkit").Slice
         assetTreeName: string | null;
         assetCodes: any;
         assetNodeSelectedInTree: AssetAPI;
+        allAssetLoading: boolean;
     }>, { payload }: {
         payload: any;
         type: string;
     }): void;
     setMenuContextAssetId(state: import("immer/dist/internal").WritableDraft<{
-        allAssetNodes: any;
+        openAssets: {
+            [assetId: string]: string | number;
+            [assetId: number]: string | number;
+        };
+        allAssetNodes: AssetParameters[];
         dataToCreateAsset: AssetAPI;
         allNodesLoading: boolean;
         anchorPoint: any;
@@ -88,12 +139,17 @@ export declare const ConfigurationAssetReducer: import("@reduxjs/toolkit").Slice
         assetTreeName: string | null;
         assetCodes: any;
         assetNodeSelectedInTree: AssetAPI;
+        allAssetLoading: boolean;
     }>, { payload }: {
         payload: any;
         type: string;
     }): void;
     setShowContextMenu(state: import("immer/dist/internal").WritableDraft<{
-        allAssetNodes: any;
+        openAssets: {
+            [assetId: string]: string | number;
+            [assetId: number]: string | number;
+        };
+        allAssetNodes: AssetParameters[];
         dataToCreateAsset: AssetAPI;
         allNodesLoading: boolean;
         anchorPoint: any;
@@ -104,12 +160,17 @@ export declare const ConfigurationAssetReducer: import("@reduxjs/toolkit").Slice
         assetTreeName: string | null;
         assetCodes: any;
         assetNodeSelectedInTree: AssetAPI;
+        allAssetLoading: boolean;
     }>, { payload }: {
         payload: any;
         type: string;
     }): void;
     setShowCreateNewContextMenu(state: import("immer/dist/internal").WritableDraft<{
-        allAssetNodes: any;
+        openAssets: {
+            [assetId: string]: string | number;
+            [assetId: number]: string | number;
+        };
+        allAssetNodes: AssetParameters[];
         dataToCreateAsset: AssetAPI;
         allNodesLoading: boolean;
         anchorPoint: any;
@@ -120,12 +181,17 @@ export declare const ConfigurationAssetReducer: import("@reduxjs/toolkit").Slice
         assetTreeName: string | null;
         assetCodes: any;
         assetNodeSelectedInTree: AssetAPI;
+        allAssetLoading: boolean;
     }>, { payload }: {
         payload: any;
         type: string;
     }): void;
     setDataToCreateAsset(state: import("immer/dist/internal").WritableDraft<{
-        allAssetNodes: any;
+        openAssets: {
+            [assetId: string]: string | number;
+            [assetId: number]: string | number;
+        };
+        allAssetNodes: AssetParameters[];
         dataToCreateAsset: AssetAPI;
         allNodesLoading: boolean;
         anchorPoint: any;
@@ -136,12 +202,17 @@ export declare const ConfigurationAssetReducer: import("@reduxjs/toolkit").Slice
         assetTreeName: string | null;
         assetCodes: any;
         assetNodeSelectedInTree: AssetAPI;
+        allAssetLoading: boolean;
     }>, { payload }: {
         payload: any;
         type: string;
     }): void;
     setAssetNameToCreateAsset(state: import("immer/dist/internal").WritableDraft<{
-        allAssetNodes: any;
+        openAssets: {
+            [assetId: string]: string | number;
+            [assetId: number]: string | number;
+        };
+        allAssetNodes: AssetParameters[];
         dataToCreateAsset: AssetAPI;
         allNodesLoading: boolean;
         anchorPoint: any;
@@ -152,12 +223,17 @@ export declare const ConfigurationAssetReducer: import("@reduxjs/toolkit").Slice
         assetTreeName: string | null;
         assetCodes: any;
         assetNodeSelectedInTree: AssetAPI;
+        allAssetLoading: boolean;
     }>, { payload }: {
         payload: any;
         type: string;
     }): void;
     setAssetParentAssetIdToCreateAsset(state: import("immer/dist/internal").WritableDraft<{
-        allAssetNodes: any;
+        openAssets: {
+            [assetId: string]: string | number;
+            [assetId: number]: string | number;
+        };
+        allAssetNodes: AssetParameters[];
         dataToCreateAsset: AssetAPI;
         allNodesLoading: boolean;
         anchorPoint: any;
@@ -168,12 +244,17 @@ export declare const ConfigurationAssetReducer: import("@reduxjs/toolkit").Slice
         assetTreeName: string | null;
         assetCodes: any;
         assetNodeSelectedInTree: AssetAPI;
+        allAssetLoading: boolean;
     }>, { payload }: {
         payload: any;
         type: string;
     }): void;
     setAssetTreeId(state: import("immer/dist/internal").WritableDraft<{
-        allAssetNodes: any;
+        openAssets: {
+            [assetId: string]: string | number;
+            [assetId: number]: string | number;
+        };
+        allAssetNodes: AssetParameters[];
         dataToCreateAsset: AssetAPI;
         allNodesLoading: boolean;
         anchorPoint: any;
@@ -184,12 +265,17 @@ export declare const ConfigurationAssetReducer: import("@reduxjs/toolkit").Slice
         assetTreeName: string | null;
         assetCodes: any;
         assetNodeSelectedInTree: AssetAPI;
+        allAssetLoading: boolean;
     }>, { payload }: {
         payload: any;
         type: string;
     }): void;
     setAssetTreeName(state: import("immer/dist/internal").WritableDraft<{
-        allAssetNodes: any;
+        openAssets: {
+            [assetId: string]: string | number;
+            [assetId: number]: string | number;
+        };
+        allAssetNodes: AssetParameters[];
         dataToCreateAsset: AssetAPI;
         allNodesLoading: boolean;
         anchorPoint: any;
@@ -200,12 +286,17 @@ export declare const ConfigurationAssetReducer: import("@reduxjs/toolkit").Slice
         assetTreeName: string | null;
         assetCodes: any;
         assetNodeSelectedInTree: AssetAPI;
+        allAssetLoading: boolean;
     }>, { payload }: {
         payload: any;
         type: string;
     }): void;
     setAssetCodes(state: import("immer/dist/internal").WritableDraft<{
-        allAssetNodes: any;
+        openAssets: {
+            [assetId: string]: string | number;
+            [assetId: number]: string | number;
+        };
+        allAssetNodes: AssetParameters[];
         dataToCreateAsset: AssetAPI;
         allNodesLoading: boolean;
         anchorPoint: any;
@@ -216,12 +307,17 @@ export declare const ConfigurationAssetReducer: import("@reduxjs/toolkit").Slice
         assetTreeName: string | null;
         assetCodes: any;
         assetNodeSelectedInTree: AssetAPI;
+        allAssetLoading: boolean;
     }>, { payload }: {
         payload: any;
         type: string;
     }): void;
     setAssetNodeSelectedInTree(state: import("immer/dist/internal").WritableDraft<{
-        allAssetNodes: any;
+        openAssets: {
+            [assetId: string]: string | number;
+            [assetId: number]: string | number;
+        };
+        allAssetNodes: AssetParameters[];
         dataToCreateAsset: AssetAPI;
         allNodesLoading: boolean;
         anchorPoint: any;
@@ -232,12 +328,38 @@ export declare const ConfigurationAssetReducer: import("@reduxjs/toolkit").Slice
         assetTreeName: string | null;
         assetCodes: any;
         assetNodeSelectedInTree: AssetAPI;
+        allAssetLoading: boolean;
     }>, { payload }: {
         payload: any;
         type: string;
     }): void;
     setParentAssetNameInNodeSelectedInTree(state: import("immer/dist/internal").WritableDraft<{
-        allAssetNodes: any;
+        openAssets: {
+            [assetId: string]: string | number;
+            [assetId: number]: string | number;
+        };
+        allAssetNodes: AssetParameters[];
+        dataToCreateAsset: AssetAPI;
+        allNodesLoading: boolean;
+        anchorPoint: any;
+        menuContextAssetId: number | undefined;
+        showContextMenu: boolean;
+        showCreateNewContextMenu: boolean;
+        assetTreeId: number | null;
+        assetTreeName: string | null;
+        assetCodes: any;
+        assetNodeSelectedInTree: AssetAPI;
+        allAssetLoading: boolean;
+    }>, { payload }: {
+        payload: any;
+        type: string;
+    }): void;
+    setAllAssetLoading(state: import("immer/dist/internal").WritableDraft<{
+        openAssets: {
+            [assetId: string]: string | number;
+            [assetId: number]: string | number;
+        };
+        allAssetNodes: AssetParameters[];
         dataToCreateAsset: AssetAPI;
         allNodesLoading: boolean;
         anchorPoint: any;
@@ -248,6 +370,7 @@ export declare const ConfigurationAssetReducer: import("@reduxjs/toolkit").Slice
         assetTreeName: string | null;
         assetCodes: any;
         assetNodeSelectedInTree: AssetAPI;
+        allAssetLoading: boolean;
     }>, { payload }: {
         payload: any;
         type: string;

package/dist/configuration/pages/asset/repositories/ConfigurationAssetRepository.d.ts

@@ -7,7 +7,7 @@ export declare const updateAsset: (AssetId: number, ParentAssetId: number) => Pr
     message: any;
     data?: undefined;
 }>;
-export declare const insertAsset: (AssetName: string, ParentAssetId: number, IsAsset: boolean, CanBeDefaultAsset: boolean | null) => Promise<{
+export declare const insertAsset: (AssetName: string, ParentAssetId: number, CanBeDefaultAsset: boolean | null) => Promise<{
     ok: boolean;
     data: any;
     message?: undefined;

package/dist/index.esm.js

@@ -3624,6 +3624,123 @@ var TypeIcon = function (props) {
     }
 };
 
+var DATA_ASSET_INITIAL_VALUES = {
+    AssetId: null,
+    ParentAssetId: 1,
+    AssetName: "",
+    IsAsset: false,
+    CanBeDefaultAsset: false,
+    ParentAssetName: "",
+    IsBranch: null
+};
+
+var ConfigurationAssetInitialState = {
+    openAssets: {},
+    allAssetNodes: [],
+    allNodesLoading: false,
+    anchorPoint: {
+        x: 0,
+        y: 0
+    },
+    dataToCreateAsset: DATA_ASSET_INITIAL_VALUES,
+    menuContextAssetId: undefined,
+    showContextMenu: false,
+    showCreateNewContextMenu: false,
+    assetCodes: {},
+    assetTreeId: 1,
+    assetTreeName: null,
+    assetNodeSelectedInTree: DATA_ASSET_INITIAL_VALUES,
+    allAssetLoading: false
+};
+var ConfigurationAssetReducer = createSlice({
+    name: "__",
+    initialState: ConfigurationAssetInitialState,
+    reducers: {
+        setOpenAssets: function (state, _a) {
+            var payload = _a.payload;
+            state.openAssets = payload;
+        },
+        setAllAssetNodes: function (state, _a) {
+            var payload = _a.payload;
+            state.allAssetNodes = payload;
+        },
+        seAllNodesLoading: function (state, _a) {
+            var payload = _a.payload;
+            state.allNodesLoading = payload;
+        },
+        setAnchorPointX: function (state, _a) {
+            var payload = _a.payload;
+            state.anchorPoint.x = payload;
+        },
+        setAnchorPointY: function (state, _a) {
+            var payload = _a.payload;
+            state.anchorPoint.y = payload;
+        },
+        setMenuContextAssetId: function (state, _a) {
+            var payload = _a.payload;
+            state.menuContextAssetId = payload;
+        },
+        setShowContextMenu: function (state, _a) {
+            var payload = _a.payload;
+            state.showContextMenu = payload;
+        },
+        setShowCreateNewContextMenu: function (state, _a) {
+            var payload = _a.payload;
+            state.showCreateNewContextMenu = payload;
+        },
+        setDataToCreateAsset: function (state, _a) {
+            var payload = _a.payload;
+            state.dataToCreateAsset = payload;
+        },
+        setAssetNameToCreateAsset: function (state, _a) {
+            var payload = _a.payload;
+            state.dataToCreateAsset.AssetName = payload;
+        },
+        setAssetParentAssetIdToCreateAsset: function (state, _a) {
+            var payload = _a.payload;
+            state.dataToCreateAsset.ParentAssetId = payload;
+        },
+        setAssetTreeId: function (state, _a) {
+            var payload = _a.payload;
+            state.assetTreeId = payload;
+        },
+        setAssetTreeName: function (state, _a) {
+            var payload = _a.payload;
+            state.assetTreeName = payload;
+        },
+        setAssetCodes: function (state, _a) {
+            var payload = _a.payload;
+            state.assetCodes = payload;
+        },
+        setAssetNodeSelectedInTree: function (state, _a) {
+            var payload = _a.payload;
+            state.assetNodeSelectedInTree = payload;
+        },
+        setParentAssetNameInNodeSelectedInTree: function (state, _a) {
+            var payload = _a.payload;
+            state.assetNodeSelectedInTree.ParentAssetName = payload;
+        },
+        setAllAssetLoading: function (state, _a) {
+            var payload = _a.payload;
+            state.allAssetLoading = payload;
+        }
+    }
+});
+
+var ConfigurationAssetContext = createContext({
+    state: ConfigurationAssetReducer.getInitialState(),
+    actions: ConfigurationAssetReducer.actions
+});
+var useConfigurationAssetContext = function () { return useContext(ConfigurationAssetContext); };
+var ConfigurationAssetProvider = function (_a) {
+    var children = _a.children;
+    var _b = useComplexState({
+        initialState: ConfigurationAssetReducer.getInitialState(),
+        reducers: ConfigurationAssetReducer.caseReducers
+    }), state = _b[0], actions = _b[1];
+    return (React__default.createElement(ConfigurationAssetContext.Provider, { value: { state: state, actions: actions } }, children));
+};
+
 var useStyles$d = makeStyles$1(function (theme) { return ({
     root: {
         alignItems: "center",
@@ -3668,7 +3785,8 @@ var useStyles$d = makeStyles$1(function (theme) { return ({
 var customStyles = "\n  ul, ol {\n    list-style-type: none;\n    margin: 0;\n    padding: 0;\n  }\n";
 var CustomNode = function (_a) {
     var setContextMenuOver = _a.setContextMenuOver, onDoubleClick = _a.onDoubleClick; _a.testIdPrefix; var isSelected = _a.isSelected, props = __rest(_a, ["setContextMenuOver", "onDoubleClick", "testIdPrefix", "isSelected"]);
-    var _c = props.node, id = _c.id, droppable = _c.droppable, data = _c.data;
+    var _c = useConfigurationAssetContext(), openAssets = _c.state.openAssets, setOpenAssets = _c.actions.setOpenAssets;
+    var _d = props.node, id = _d.id, droppable = _d.droppable, data = _d.data;
     var indent = props.depth * 24;
     var classes = useStyles$d();
     var nodeClasses = "".concat(classes.customNodeRoot, " ").concat(classes.root, " ").concat(isSelected ? classes.selected : "");
@@ -3676,7 +3794,16 @@ var CustomNode = function (_a) {
         props.onClick(e, props.node);
     };
     var handleToggle = function (e) {
+        var _a;
         e.stopPropagation();
+        if (openAssets[id]) {
+            var newOpenAssets = __assign({}, openAssets);
+            delete newOpenAssets[id];
+            setOpenAssets(newOpenAssets);
+        }
+        else {
+            setOpenAssets(__assign(__assign({}, openAssets), (_a = {}, _a[id] = id, _a)));
+        }
         props.onToggle();
     };
     var handleContextMenu = useCallback(function (ev) {
@@ -3821,7 +3948,7 @@ var updateAsset = function (AssetId, ParentAssetId) { return __awaiter(void 0, v
         }
     });
 }); };
-var insertAsset = function (AssetName, ParentAssetId, IsAsset, CanBeDefaultAsset) { return __awaiter(void 0, void 0, void 0, function () {
+var insertAsset = function (AssetName, ParentAssetId, CanBeDefaultAsset) { return __awaiter(void 0, void 0, void 0, function () {
     var apiService, parameters, resp, e_2;
     return __generator(this, function (_a) {
         switch (_a.label) {
@@ -3830,7 +3957,6 @@ var insertAsset = function (AssetName, ParentAssetId, IsAsset, CanBeDefaultAsset
                 parameters = [];
                 parameters.push({ name: "AssetName", value: AssetName });
                 parameters.push({ name: "ParentAssetId", value: ParentAssetId });
-                parameters.push({ name: "IsAsset", value: IsAsset });
                 parameters.push({ name: "CanBeDefaultAsset", value: CanBeDefaultAsset });
                 _a.label = 1;
             case 1:
@@ -3953,117 +4079,11 @@ var TransformAssetModelData = function (node) {
     return model;
 };
 
-var DATA_ASSET_INITIAL_VALUES = {
-    AssetId: null,
-    ParentAssetId: 1,
-    AssetName: "",
-    IsAsset: false,
-    CanBeDefaultAsset: false,
-    ParentAssetName: "",
-    IsBranch: null
-};
-
-var ConfigurationAssetInitialState = {
-    allAssetNodes: [],
-    allNodesLoading: false,
-    anchorPoint: {
-        x: 0,
-        y: 0
-    },
-    dataToCreateAsset: DATA_ASSET_INITIAL_VALUES,
-    menuContextAssetId: undefined,
-    showContextMenu: false,
-    showCreateNewContextMenu: false,
-    assetCodes: {},
-    assetTreeId: 1,
-    assetTreeName: null,
-    assetNodeSelectedInTree: DATA_ASSET_INITIAL_VALUES
-};
-var ConfigurationAssetReducer = createSlice({
-    name: "__",
-    initialState: ConfigurationAssetInitialState,
-    reducers: {
-        setAllAssetNodes: function (state, _a) {
-            var payload = _a.payload;
-            state.allAssetNodes = payload;
-        },
-        seAllNodesLoading: function (state, _a) {
-            var payload = _a.payload;
-            state.allNodesLoading = payload;
-        },
-        setAnchorPointX: function (state, _a) {
-            var payload = _a.payload;
-            state.anchorPoint.x = payload;
-        },
-        setAnchorPointY: function (state, _a) {
-            var payload = _a.payload;
-            state.anchorPoint.y = payload;
-        },
-        setMenuContextAssetId: function (state, _a) {
-            var payload = _a.payload;
-            state.menuContextAssetId = payload;
-        },
-        setShowContextMenu: function (state, _a) {
-            var payload = _a.payload;
-            state.showContextMenu = payload;
-        },
-        setShowCreateNewContextMenu: function (state, _a) {
-            var payload = _a.payload;
-            state.showCreateNewContextMenu = payload;
-        },
-        setDataToCreateAsset: function (state, _a) {
-            var payload = _a.payload;
-            state.dataToCreateAsset = payload;
-        },
-        setAssetNameToCreateAsset: function (state, _a) {
-            var payload = _a.payload;
-            state.dataToCreateAsset.AssetName = payload;
-        },
-        setAssetParentAssetIdToCreateAsset: function (state, _a) {
-            var payload = _a.payload;
-            state.dataToCreateAsset.ParentAssetId = payload;
-        },
-        setAssetTreeId: function (state, _a) {
-            var payload = _a.payload;
-            state.assetTreeId = payload;
-        },
-        setAssetTreeName: function (state, _a) {
-            var payload = _a.payload;
-            state.assetTreeName = payload;
-        },
-        setAssetCodes: function (state, _a) {
-            var payload = _a.payload;
-            state.assetCodes = payload;
-        },
-        setAssetNodeSelectedInTree: function (state, _a) {
-            var payload = _a.payload;
-            state.assetNodeSelectedInTree = payload;
-        },
-        setParentAssetNameInNodeSelectedInTree: function (state, _a) {
-            var payload = _a.payload;
-            state.assetNodeSelectedInTree.ParentAssetName = payload;
-        }
-    }
-});
-
-var ConfigurationAssetContext = createContext({
-    state: ConfigurationAssetReducer.getInitialState(),
-    actions: ConfigurationAssetReducer.actions
-});
-var useConfigurationAssetContext = function () { return useContext(ConfigurationAssetContext); };
-var ConfigurationAssetProvider = function (_a) {
-    var children = _a.children;
-    var _b = useComplexState({
-        initialState: ConfigurationAssetReducer.getInitialState(),
-        reducers: ConfigurationAssetReducer.caseReducers
-    }), state = _b[0], actions = _b[1];
-    return (React__default.createElement(ConfigurationAssetContext.Provider, { value: { state: state, actions: actions } }, children));
-};
-
 var useSearchAssets$1 = function () {
     var _a = useAssetContext().actions, setAllAssets = _a.setAllAssets, setAreasList = _a.setAreasList;
-    var setAllAssetNodes = useConfigurationAssetContext().actions.setAllAssetNodes;
+    var _b = useConfigurationAssetContext().actions, setAllAssetNodes = _b.setAllAssetNodes, setAllAssetLoading = _b.setAllAssetLoading;
     var searchAssets = function () {
+        setAllAssetLoading(true);
         getAssets().then(function (res) {
             var mydataSource = [];
             var rows = get$1(res, "data.tables[0].rows", []);
@@ -4075,6 +4095,7 @@ var useSearchAssets$1 = function () {
                 mydataSource = __spreadArray(__spreadArray([], mydataSource, true), [code], false);
             });
             setAllAssetNodes(mydataSource);
+            setAllAssetLoading(false);
         });
     };
     return { searchAssets: searchAssets };
@@ -4148,9 +4169,10 @@ var useAssetActions = function (_a) {
                         return [2 /*return*/];
                 }
             });
-        }); }, setTimeout(function () {
+        }); });
+        setTimeout(function () {
             searchAssets();
-        }, 100));
+        }, 100);
         setChangedNodes([]);
     };
     var handleSingleSelect = function (node) {
@@ -4322,7 +4344,7 @@ var CreateNewAssetDialog = function (_a) {
                     _a.label = 1;
                 case 1:
                     _a.trys.push([1, 3, , 4]);
-                    return [4 /*yield*/, insertAsset(data.AssetName, data.ParentAssetId, data.IsAsset, data.CanBeDefaultAsset).then(function (res) {
+                    return [4 /*yield*/, insertAsset(data.AssetName, data.ParentAssetId, data.CanBeDefaultAsset).then(function (res) {
                             if (res) {
                                 setIsSubmitLoading(false);
                                 setAssetCreatedSuccess(true);
@@ -4390,12 +4412,7 @@ var CreateNewAssetDialog = function (_a) {
                                 React__default.createElement(Grid, { item: true, md: 12, xs: 12, style: { marginBottom: "8px" } },
                                     React__default.createElement(Grid, { item: true, md: 12, xs: 12, style: { padding: 0, marginTop: 10 } },
                                         React__default.createElement(Controller, { name: "ParentAssetId", control: control, render: function (_a) { return (React__default.createElement(TreePickerControl, { inputTitle: "Asset", title: "Asset Parent", dataSource: assetCodes, value: (assetNodeSelectedInTree === null || assetNodeSelectedInTree === void 0 ? void 0 : assetNodeSelectedInTree.ParentAssetId) || 1, description: (assetNodeSelectedInTree === null || assetNodeSelectedInTree === void 0 ? void 0 : assetNodeSelectedInTree.ParentAssetName) || "Plant", onSelect: changeParentAssetId, selectBranch: true, selectActive: false, selectInternal: false })); } }))),
-                                React__default.createElement(Grid, { container: true, style: { marginTop: "5px", padding: "0 8px" } },
-                                    React__default.createElement(Grid, { item: true, xs: 6, md: 6 },
-                                        React__default.createElement(Controller, { name: "IsAsset", control: control, defaultValue: false, render: function (_a) {
-                                                var field = _a.field;
-                                                return (React__default.createElement(FormControlLabel$1, { className: classes.checkbox, control: React__default.createElement(Checkbox$1, { checked: field.value, onChange: function (e) { return field.onChange(e.target.checked); }, name: "IsAsset", color: "primary" }), label: "Is Asset" }));
-                                            } })),
+                                React__default.createElement(Grid, { container: true, style: { marginTop: "10px 0", padding: "0" } },
                                     React__default.createElement(Grid, { item: true, xs: 6, md: 6 },
                                         React__default.createElement(Controller, { name: "CanBeDefaultAsset", control: control, defaultValue: false, render: function (_a) {
                                                 var field = _a.field;
@@ -4512,7 +4529,7 @@ var ViewerAssetDialog = function (_a) {
                                     React__default.createElement(Grid, { item: true, xs: 6, md: 6 },
                                         React__default.createElement(Controller, { name: "IsBranch", control: control, defaultValue: false, render: function (_a) {
                                                 var field = _a.field;
-                                                return (React__default.createElement(FormControlLabel$1, { className: classes.checkbox, control: React__default.createElement(Checkbox$1, { checked: field.value, onChange: function (e) { return field.onChange(e.target.checked); }, name: "IsAsset", color: "primary", disabled: true }), label: "Has Children" }));
+                                                return (React__default.createElement(FormControlLabel$1, { className: classes.checkbox, control: React__default.createElement(Checkbox$1, { checked: field.value, onChange: function (e) { return field.onChange(e.target.checked); }, name: "IsBranch", color: "primary", disabled: true }), label: "Has Children" }));
                                             } })),
                                     React__default.createElement(Grid, { item: true, xs: 6, md: 6 },
                                         React__default.createElement(Controller, { name: "CanBeDefaultAsset", control: control, defaultValue: false, render: function (_a) {
@@ -4817,11 +4834,20 @@ var AssetViewComponent = function () {
     var _b = useState(false), isDragging = _b[0], setIsDragging = _b[1];
     var _c = useState(false), isCtrlPressing = _c[0], setIsCtrlPressing = _c[1];
     var _d = useState(false), isDoubleClick = _d[0], setIsDoubleClick = _d[1];
-    var _e = useConfigurationAssetContext(), _f = _e.state, allAssetNodes = _f.allAssetNodes, showContextMenu = _f.showContextMenu, showCreateNewContextMenu = _f.showCreateNewContextMenu, assetNodeSelectedInTree = _f.assetNodeSelectedInTree, _g = _f.anchorPoint, x = _g.x, y = _g.y, _h = _e.actions, setShowContextMenu = _h.setShowContextMenu, setShowCreateNewContextMenu = _h.setShowCreateNewContextMenu, setMenuContextAssetId = _h.setMenuContextAssetId, setAnchorPointX = _h.setAnchorPointX, setAnchorPointY = _h.setAnchorPointY, setAssetNodeSelectedInTree = _h.setAssetNodeSelectedInTree;
+    var _e = useConfigurationAssetContext(), _f = _e.state, allAssetNodes = _f.allAssetNodes, openAssets = _f.openAssets, showContextMenu = _f.showContextMenu, showCreateNewContextMenu = _f.showCreateNewContextMenu, assetNodeSelectedInTree = _f.assetNodeSelectedInTree, allAssetLoading = _f.allAssetLoading, _g = _f.anchorPoint, x = _g.x, y = _g.y, _h = _e.actions, setShowContextMenu = _h.setShowContextMenu, setShowCreateNewContextMenu = _h.setShowCreateNewContextMenu, setMenuContextAssetId = _h.setMenuContextAssetId, setAnchorPointX = _h.setAnchorPointX, setAnchorPointY = _h.setAnchorPointY, setAssetNodeSelectedInTree = _h.setAssetNodeSelectedInTree;
     var allAssets = useAssetContext().state.allAssets;
     var _j = useState([]), asset = _j[0], setAsset = _j[1];
     var _k = useState([]), originalAsset = _k[0], setOriginalAsset = _k[1];
-    var _l = useAssetActions({ asset: asset, selectedNodes: selectedNodes, originalAsset: originalAsset, setAsset: setAsset, setSelectedNodes: setSelectedNodes, setIsDragging: setIsDragging, isCtrlPressing: isCtrlPressing, setIsCtrlPressing: setIsCtrlPressing }), handleDrop = _l.handleDrop, handleUpdateAsset = _l.handleUpdateAsset, handleCtrlClick = _l.handleCtrlClick, handleDragStart = _l.handleDragStart, handleDragEnd = _l.handleDragEnd, changedNodes = _l.changedNodes, updatedSuccessfullyMessage = _l.updatedSuccessfullyMessage, setUpdatedSuccessfullyMessage = _l.setUpdatedSuccessfullyMessage, showErrorMessage = _l.showErrorMessage, setShowErrorMessage = _l.setShowErrorMessage;
+    var _l = useAssetActions({
+        asset: asset,
+        selectedNodes: selectedNodes,
+        originalAsset: originalAsset,
+        setAsset: setAsset,
+        setSelectedNodes: setSelectedNodes,
+        setIsDragging: setIsDragging,
+        isCtrlPressing: isCtrlPressing,
+        setIsCtrlPressing: setIsCtrlPressing
+    }), handleDrop = _l.handleDrop, handleUpdateAsset = _l.handleUpdateAsset, handleCtrlClick = _l.handleCtrlClick, handleDragStart = _l.handleDragStart, handleDragEnd = _l.handleDragEnd, changedNodes = _l.changedNodes, updatedSuccessfullyMessage = _l.updatedSuccessfullyMessage, setUpdatedSuccessfullyMessage = _l.setUpdatedSuccessfullyMessage, showErrorMessage = _l.showErrorMessage, setShowErrorMessage = _l.setShowErrorMessage;
     var _m = useState(false), showCreateNewAssetDialog = _m[0], setShowCreateNewAssetDialog = _m[1];
     var _o = useState(false), showViewerAssetDialog = _o[0], setShowViewerAssetDialog = _o[1];
     var _p = useState(false), showRemoveAssetDialog = _p[0], setShowRemoveAssetDialog = _p[1];
@@ -4876,6 +4902,12 @@ var AssetViewComponent = function () {
             setShowViewerAssetDialog(true);
         }
     };
+    var handleOnHideViewer = function () {
+        setShowViewerAssetDialog(false);
+        setIsDoubleClick(false);
+        setShowCreateNewContextMenu(false);
+        setShowContextMenu(false);
+    };
     useEffect(function () {
         var handleKeyDown = function (e) {
             if (e.key.toLowerCase() === "escape") {
@@ -4910,17 +4942,23 @@ var AssetViewComponent = function () {
     useEffect(function () {
         searchAssets();
     }, []);
+    var openAssetsArray = useMemo(function () {
+        return Object.keys(openAssets).map(function (el) { return parseInt(el); });
+    }, [openAssets]);
     return (React__default.createElement("div", { style: { width: "100%", height: "100%" } },
         React__default.createElement("div", { onClick: handleClick },
             React__default.createElement("div", { onContextMenu: handleCreateNewContextMenu },
                 React__default.createElement("div", null,
                     React__default.createElement(Grid$1, { container: true, className: classes.root, style: { padding: 20 } },
                         React__default.createElement(Paper$1, { elevation: 1, style: { width: "100%", padding: "15px 20px", borderRadius: "0.75rem" } },
-                            React__default.createElement(Paper$1, { elevation: 2, style: { width: "100%", padding: "15px 20px 10px", borderRadius: "0.75rem" } },
+                            allAssetLoading ? (React__default.createElement(Grid$1, { container: true, style: { width: "100%", height: "100%" } },
+                                React__default.createElement(Grid$1, { item: true, xs: 12, md: 12, style: { height: "70vh", justifyContent: "center", alignItems: "center" } },
+                                    React__default.createElement("div", { style: { width: "100%", height: "100%", display: "flex", justifyContent: "center", alignItems: "center" } },
+                                        React__default.createElement(LazyLoading, null))))) : (React__default.createElement(Paper$1, { elevation: 2, style: { width: "100%", padding: "15px 20px 10px", borderRadius: "0.75rem" } },
                                 React__default.createElement(Grid$1, { container: true, alignItems: "center" },
                                     React__default.createElement(Grid$1, { container: true, style: { height: "70vh", overflowY: "auto", paddingBottom: 10 } },
                                         React__default.createElement(Grid$1, null,
-                                            React__default.createElement(Tree, { rootId: 0, tree: asset, classes: {
+                                            React__default.createElement(Tree, { rootId: 0, initialOpen: openAssetsArray, tree: asset, enableAnimateExpand: true, classes: {
                                                     root: classes.assetRoot,
                                                     dropTarget: classes.dropTarget
                                                 }, onDrop: handleDrop, onDragStart: handleDragStart, onDragEnd: handleDragEnd, canDrop: function (asset, options) {
@@ -4933,10 +4971,10 @@ var AssetViewComponent = function () {
                                                         return React__default.createElement(MultipleDragPreview, { dragSources: selectedNodes });
                                                     }
                                                     return React__default.createElement(CustomDragPreview, { monitorProps: monitorProps });
-                                                } }))))),
+                                                } })))))),
                             React__default.createElement(CreateNewAssetDialog, { show: showCreateNewAssetDialog, onHide: function () { return setShowCreateNewAssetDialog(false); } }),
                             React__default.createElement(EditAssetDialog, { show: showEditAssetDialog, onHide: function () { return setShowEditAssetDialog(false); } }),
-                            React__default.createElement(ViewerAssetDialog, { show: showViewerAssetDialog, onHide: function () { setShowViewerAssetDialog(false); setIsDoubleClick(false); } }),
+                            React__default.createElement(ViewerAssetDialog, { show: showViewerAssetDialog, onHide: function () { return handleOnHideViewer(); } }),
                             React__default.createElement(RemoveAssetDialog, { show: showRemoveAssetDialog, onHide: function () { return setShowRemoveAssetDialog(false); } }))),
                     React__default.createElement(Snackbar$1, { open: updatedSuccessfullyMessage, autoHideDuration: 2500, onClose: handleClose },
                         React__default.createElement(Alert$3, { severity: "success", onClose: handleClose }, "Asset updated successfully")),
@@ -7533,7 +7571,7 @@ function Configuration() {
                     React__default.createElement(MenuItem, { selected: option === 'shifts', className: "p-0" },
                         React__default.createElement(Link, { to: "/configuration/shifts", className: "nav-link" }, "Shift / Crews")),
                     React__default.createElement(MenuItem, { selected: option === 'asset', className: "p-0" },
-                        React__default.createElement(Link, { to: "/configuration/asset", className: "nav-link" }, "Configuration Tree"))),
+                        React__default.createElement(Link, { to: "/configuration/asset", className: "nav-link" }, "Assets Tree"))),
                 React__default.createElement("h3", { className: "mes-menu-group" }, "Security"),
                 React__default.createElement(MenuList, { className: "mes-submenu" },
                     React__default.createElement(MenuItem, { selected: option === 'users', className: "p-0" },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dexteel/mesf-core",
-  "version": "3.12.2",
+  "version": "3.12.4",
   "author": "Dexteel Team",
   "module": "dist/index.esm.js",
   "typings": "dist/index.d.ts",