@dexteel/mesf-core 4.11.0 → 4.11.2

package/CHANGELOG.md

@@ -2,6 +2,20 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [4.11.2](https://github.com/dexteel/mesf-core-frontend/compare/v4.11.1...v4.11.2) (2024-05-09)
+
+
+### Bug Fixes
+
+* **Assets Tree:** Fix bug when assets have parent assets with IsActive as false ([b27651e](https://github.com/dexteel/mesf-core-frontend/commit/b27651e6b6777b140fd0b0738408bfcc3fc42f14))
+
+### [4.11.1](https://github.com/dexteel/mesf-core-frontend/compare/v4.11.0...v4.11.1) (2024-05-05)
+
+
+### Bug Fixes
+
+* **TimeService:** Add some try catches and handle utc datetime strings ([b073cd1](https://github.com/dexteel/mesf-core-frontend/commit/b073cd1e1fc3dcceed7a2155ab1a33e21e962805))
+
 ## [4.11.0](https://github.com/dexteel/mesf-core-frontend/compare/v4.10.5...v4.11.0) (2024-05-02)
 
 

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

@@ -4,4 +4,5 @@ export interface AssetCode {
     name: string;
     isLeaf: boolean | null;
     isActive: boolean | null;
+    children: AssetCode[];
 }

package/dist/index.esm.js

@@ -77,7 +77,8 @@ import 'ag-grid-community/styles/ag-theme-alpine.css';
 import ImageIcon from '@material-ui/icons/Image';
 import ListAltIcon from '@material-ui/icons/ListAlt';
 import DescriptionIcon from '@material-ui/icons/Description';
-import { formatInTimeZone } from 'date-fns-tz';
+import { format, fromZonedTime, formatInTimeZone } from 'date-fns-tz';
+import { findIana } from 'windows-iana';
 import FormControlLabel$1 from '@material-ui/core/FormControlLabel';
 import Checkbox$1 from '@material-ui/core/Checkbox';
 import Input from '@material-ui/core/Input';
@@ -4703,28 +4704,29 @@ var useAssetCodes = function () {
             }
             // Use our mapping to locate the parent element in our data array
             var parentEl = nodes[idMapping[el.parentId]];
+            // Handle the case where the element has no parent
+            if (!parentEl) {
+                console.log(el);
+                return;
+            }
             // Add our current el to its parent's `children` array
-            parentEl.children = __spreadArray(__spreadArray([], (parentEl.children || []), true), [el], false);
+            if (!parentEl['children']) {
+                parentEl['children'] = [];
+            }
+            parentEl['children'] = __spreadArray(__spreadArray([], (parentEl['children'] || []), true), [el], false);
         });
         setAssetCodes(root);
     };
     var loadFilterAssets = function () {
-        var mydataSource = [];
-        allAssets.forEach(function (row) {
-            var code = TransformAssetCodeModel(row);
-            mydataSource = __spreadArray(__spreadArray([], mydataSource, true), [code], false);
-        });
-        buildTreeAssets(mydataSource);
-    };
-    var TransformAssetCodeModel = function (data) {
-        var model = {
-            id: data.AssetId,
-            parentId: data.ParentAssetId,
-            name: data.AssetName,
-            isLeaf: data.isLeaf,
-            isActive: true
-        };
-        return model;
+        var nodes = allAssets.map(function (el) { return ({
+            id: el.AssetId,
+            parentId: el.ParentAssetId,
+            name: el.AssetName,
+            isLeaf: !!el.IsLeaf,
+            isActive: true,
+            children: []
+        }); });
+        buildTreeAssets(nodes);
     };
     return { loadFilterAssets: loadFilterAssets };
 };
@@ -7309,16 +7311,45 @@ var TimeService = /** @class */ (function () {
         return TimeService.instance;
     };
     TimeService.prototype.setTimeZone = function (timeZone) {
-        this.timeZone = timeZone;
+        var ianaTimeZones = findIana(timeZone);
+        if (ianaTimeZones.length) {
+            this.timeZone = ianaTimeZones[0];
+        }
+        else {
+            this.timeZone = timeZone;
+        }
     };
-    TimeService.prototype.toUTC = function (datetime) {
-        if (datetime instanceof Date) {
-            return datetime.toUTCString();
+    TimeService.prototype.toUTC = function (datetime, format$1) {
+        try {
+            if (datetime instanceof Date) {
+                return format(datetime, format$1);
+            }
+            return format(fromZonedTime(datetime, TimeService.instance.timeZone), format$1);
+        }
+        catch (e) {
+            console.log({ datetime: datetime, e: e });
+            return '';
         }
-        return new Date(datetime).toUTCString();
     };
     TimeService.prototype.toLocalServerTime = function (datetime, format) {
-        return formatInTimeZone(datetime, TimeService.instance.timeZone, format);
+        try {
+            if (isNil$1(datetime) || !datetime) {
+                return '';
+            }
+            if (typeof datetime === 'string') {
+                if (datetime.includes('Z')) {
+                    datetime = new Date(datetime);
+                }
+                else {
+                    datetime = new Date("".concat(datetime, "Z"));
+                }
+            }
+            return formatInTimeZone(datetime, TimeService.instance.timeZone, format);
+        }
+        catch (e) {
+            console.log({ datetime: datetime, e: e });
+            return '';
+        }
     };
     return TimeService;
 }());