@dexteel/mesf-core 6.0.2 → 6.0.4

package/.release-please-manifest.json

@@ -1,3 +1,3 @@
 {
-  ".": "6.0.2"
+  ".": "6.0.4"
 }

package/CHANGELOG.md

@@ -1,3 +1,31 @@
+# Changelog
+
+## [6.0.4](https://github.com/dexteel/mesf-core-frontend/compare/@dexteel/mesf-core-v6.0.3...@dexteel/mesf-core-v6.0.4) (2025-10-02)
+
+
+### Bug Fixes
+
+* **logbook-entry:** Add else in onHide | Preset asset only for new entries ([fa7433c](https://github.com/dexteel/mesf-core-frontend/commit/fa7433c5daa1b4b3d8ab2a490a0610b0ede1a4f7))
+* **logbook-entry:** Add else in onHide | Preset asset only for new entries ([9386c8f](https://github.com/dexteel/mesf-core-frontend/commit/9386c8fbce56d6e0e66becf04dc47bb58d7cf7ba))
+
+## [6.0.3] - 2025-10-02
+
+
+
+# Changelog
+
+## [6.0.3](https://github.com/dexteel/mesf-core-frontend/compare/@dexteel/mesf-core-v6.0.2...@dexteel/mesf-core-v6.0.3) (2025-10-02)
+
+
+### Bug Fixes
+
+* **asset-tree-picker:** Add filterAssets prop | Remove useStyles ([39ec87e](https://github.com/dexteel/mesf-core-frontend/commit/39ec87e4530e92ede44681a664a983dd02df3d20))
+* **entry-viewer:** Use tree and selector | Preselect assetId ([c792f29](https://github.com/dexteel/mesf-core-frontend/commit/c792f29db40e95ab1a434900bdf3fef4b3ab6da9))
+
+## [6.0.2] - 2025-09-30
+
+
+
 # Changelog
 
 ## [6.0.2](https://github.com/dexteel/mesf-core-frontend/compare/@dexteel/mesf-core-v6.0.1...@dexteel/mesf-core-v6.0.2) (2025-09-30)

package/dist/controls/asset-tree-picker/AssetTreePicker.d.ts

@@ -1,9 +1,10 @@
 import React from "react";
 import { FieldError } from "react-hook-form";
-export declare const AssetTreePicker: ({ label, value, onChange, disabled, fieldError, }: {
+export declare const AssetTreePicker: ({ label, value, onChange, disabled, fieldError, filterAssets, }: {
     label?: String;
     value: number | null;
     onChange: (value: number | null) => void;
     disabled?: boolean;
     fieldError?: FieldError | undefined;
+    filterAssets?: boolean;
 }) => React.JSX.Element;

package/dist/index.esm.js

@@ -952,7 +952,7 @@ var ModalTreeFilterControl = function (props) {
             React__default.createElement(Button, { onClick: function () { return handleOk(); }, color: "primary" }, "OK"))));
 };
 
-var useStyles$H = makeStyles(function (theme) { return ({
+var useStyles$G = makeStyles(function (theme) { return ({
     root: {
         width: "100%",
         backgroundColor: theme.palette.background.paper,
@@ -968,7 +968,7 @@ var useStyles$H = makeStyles(function (theme) { return ({
     },
 }); });
 var TreePickerControl = function (props) {
-    var classes = useStyles$H();
+    var classes = useStyles$G();
     var onSelect = props.onSelect, value = props.value; props.styleLabel; var dataSource = props.dataSource, _a = props.inputTitle, inputTitle = _a === void 0 ? "Asset" : _a; props.showPath; var _c = props.multipleSelectNodes, multipleSelectNodes = _c === void 0 ? false : _c, _d = props.showClearButton, showClearButton = _d === void 0 ? false : _d, showAssetTree = props.showAssetTree, onHide = props.onHide, _e = props.listAssetDrawings, listAssetDrawings = _e === void 0 ? [] : _e, onSuccess = props.onSuccess, isLoading = props.isLoading, _f = props.allowSearch, allowSearch = _f === void 0 ? false : _f, other = __rest(props, ["onSelect", "value", "styleLabel", "dataSource", "inputTitle", "showPath", "multipleSelectNodes", "showClearButton", "showAssetTree", "onHide", "listAssetDrawings", "onSuccess", "isLoading", "allowSearch"]);
     var _g = useState(showAssetTree || false), open = _g[0], setOpen = _g[1];
     var handleClickListItem = function (e) {
@@ -1052,7 +1052,7 @@ var TreePickerControl = function (props) {
                 }, onHide: onHide, id: "modal-treeview-filters", title: props.title, keepMounted: true, open: open, onClose: handleClose, isLoading: isLoading, value: value, data: dataSource, onBackdropClick: function () { return setOpen(false); }, multipleSelectNodes: multipleSelectNodes, listAssetDrawings: listAssetDrawings, setListAssetDrawings: listAssetDrawings, onSuccess: onSuccess, allowSearch: allowSearch }, other)))));
 };
 
-var useStyles$G = makeStyles(function (theme) { return ({
+var useStyles$F = makeStyles(function (theme) { return ({
     root: {
         width: "100%",
         backgroundColor: theme.palette.background.paper,
@@ -1103,7 +1103,7 @@ function getNodePath(node, nodeId, parentPath, isRoot) {
     return null;
 }
 var TreePickerControlV2 = function (props) {
-    var classes = useStyles$G();
+    var classes = useStyles$F();
     var value = props.value, onSelect = props.onSelect; props.styleLabel; var dataSource = props.dataSource; props.getOptionName; var _a = props.inputTitle, inputTitle = _a === void 0 ? "Asset" : _a; props.showPath; var _c = props.multipleSelectNodes, multipleSelectNodes = _c === void 0 ? false : _c, _d = props.showClearButton, showClearButton = _d === void 0 ? false : _d, _e = props.showFullPath, showFullPath = _e === void 0 ? false : _e, showAssetTree = props.showAssetTree, onHide = props.onHide, _f = props.listAssetDrawings, listAssetDrawings = _f === void 0 ? [] : _f, onSuccess = props.onSuccess, isLoading = props.isLoading, _g = props.disabled, disabled = _g === void 0 ? false : _g, _h = props.mostUsedCount, mostUsedCount = _h === void 0 ? 0 : _h, _j = props.itemsWithParent, itemsWithParent = _j === void 0 ? [] : _j, _k = props.dialogMaxWidth, dialogMaxWidth = _k === void 0 ? "sm" : _k, _l = props.allowSearch, allowSearch = _l === void 0 ? false : _l, other = __rest(props, ["value", "onSelect", "styleLabel", "dataSource", "getOptionName", "inputTitle", "showPath", "multipleSelectNodes", "showClearButton", "showFullPath", "showAssetTree", "onHide", "listAssetDrawings", "onSuccess", "isLoading", "disabled", "mostUsedCount", "itemsWithParent", "dialogMaxWidth", "allowSearch"]);
     var _m = useState(false), open = _m[0], setOpen = _m[1];
     var handleClickListItem = function (event) {
@@ -1295,7 +1295,7 @@ DataGridControl.propTypes = {
     rows: PropTypes.array,
 };
 
-var useStyles$F = makeStyles(function (theme) { return ({
+var useStyles$E = makeStyles(function (theme) { return ({
     contentWrapper: {
         padding: theme.spacing(2),
     },
@@ -1372,7 +1372,7 @@ var useStyles$F = makeStyles(function (theme) { return ({
 }); });
 var Alert$1 = function (_a) {
     var show = _a.show, variant = _a.variant, dismissible = _a.dismissible, onClose = _a.onClose, children = _a.children;
-    var classes = useStyles$F();
+    var classes = useStyles$E();
     return (React__default.createElement(Collapse, { in: show },
         React__default.createElement(Paper, { className: "".concat(classes.alert, " ").concat(variant === "success" ? classes.success : classes.error), elevation: 0 },
             React__default.createElement("div", { className: classes.alertContent },
@@ -1383,7 +1383,7 @@ var Alert$1 = function (_a) {
 var GenericPanel = function (_a) {
     var _b;
     var title = _a.title, _c = _a.description, description = _c === void 0 ? "" : _c, _d = _a.showPromptSuccess, showPromptSuccess = _d === void 0 ? false : _d, _e = _a.showPromptError, showPromptError = _e === void 0 ? false : _e, _f = _a.onDismissSuccess, onDismissSuccess = _f === void 0 ? function () { return null; } : _f, _g = _a.onDismissError, onDismissError = _g === void 0 ? function () { return null; } : _g, successMessage = _a.successMessage, error = _a.error, children = _a.children;
-    var classes = useStyles$F();
+    var classes = useStyles$E();
     return (React__default.createElement(Box, { className: classes.contentWrapper },
         React__default.createElement(Box, { className: classes.alertContainer },
             React__default.createElement(Alert$1, { show: showPromptError, variant: "danger", dismissible: true, onClose: onDismissError },
@@ -1402,7 +1402,7 @@ var GenericPanel = function (_a) {
 };
 var MasterDetailPanel = function (_a) {
     var title = _a.title, onSave = _a.onSave, onCancel = _a.onCancel, onDelete = _a.onDelete, saveStatus = _a.saveStatus, deleteStatus = _a.deleteStatus, _b = _a.showSave, showSave = _b === void 0 ? true : _b, showDelete = _a.showDelete, children = _a.children;
-    var classes = useStyles$F();
+    var classes = useStyles$E();
     return (React__default.createElement(Box, { className: classes.masterDetailPanel },
         React__default.createElement(Card, { variant: "outlined" },
             React__default.createElement(CardContent, null,
@@ -1415,7 +1415,7 @@ var MasterDetailPanel = function (_a) {
                     showDelete && (React__default.createElement(Button, { variant: "contained", color: "primary", className: classes.button, onClick: onDelete, disabled: !deleteStatus }, "Delete")))))));
 };
 var FilterPanel = function (props) {
-    var classes = useStyles$F();
+    var classes = useStyles$E();
     var onClickExport = props.onClickExport, onClickReset = props.onClickReset, OnClickGo = props.OnClickGo, showButtons = props.showButtons, showExport = props.showExport, _a = props.extraButtons, extraButtons = _a === void 0 ? [] : _a, children = props.children;
     var handleExport = function () {
         if (onClickExport)
@@ -1440,7 +1440,7 @@ var FilterPanel = function (props) {
                     showExport && (React__default.createElement(Button, { variant: "contained", className: "".concat(classes.button, " ").concat(classes.exportButton), onClick: handleExport, startIcon: React__default.createElement(GetAppIcon, null) }, "Excel"))))))));
 };
 var LongFilterPanel = function (props) {
-    var classes = useStyles$F();
+    var classes = useStyles$E();
     var onClickExport = props.onClickExport, onClickReset = props.onClickReset, OnClickGo = props.OnClickGo, showButtons = props.showButtons, showExport = props.showExport, _a = props.extraButtons, extraButtons = _a === void 0 ? [] : _a, children = props.children;
     var handleExport = function () {
         if (onClickExport)
@@ -2044,7 +2044,7 @@ var CustomStatusPanel$1 = function (_a) {
     return (React.createElement(IconButton$1, { onClick: handleNew, color: "primary", style: { marginLeft: -15 } },
         React.createElement(PlaylistAddIcon, { style: { width: 30, height: 30 } })));
 };
-var useStyles$E = makeStyles(function (theme) { return ({
+var useStyles$D = makeStyles(function (theme) { return ({
     root: {
         "& .MuiDataGrid-row": {
             cursor: "pointer",
@@ -2056,7 +2056,7 @@ var useStyles$E = makeStyles(function (theme) { return ({
     },
 }); });
 var TableJobs = function () {
-    var classes = useStyles$E();
+    var classes = useStyles$D();
     var queryClient = useQueryClient();
     var _a = useState(null), jobSelected = _a[0], setJobSelected = _a[1];
     var _b = useState(null), gridApi = _b[0], setGridApi = _b[1];
@@ -2408,7 +2408,7 @@ var useLogTableData = function () {
     return { columnDefs: columnDefs };
 };
 
-var useStyles$D = makeStyles(function (theme) { return ({
+var useStyles$C = makeStyles(function (theme) { return ({
     root: {
         "& .MuiDataGrid-row": {
             cursor: "pointer",
@@ -2438,7 +2438,7 @@ var TimezoneSelector = function (_a) {
             React__default.createElement(MenuItem, { value: "Server" }, "Server"))));
 };
 
-var useStyles$C = makeStyles(function (theme) { return ({
+var useStyles$B = makeStyles(function (theme) { return ({
     title: {
         fontSize: 15,
     },
@@ -2471,7 +2471,7 @@ var formatTime = function (nowTime) {
 var ModalLogSelected = function (_a) {
     var _b;
     var show = _a.show, onHide = _a.onHide, selectedLog = _a.selectedLog, suffixTitle = _a.suffixTitle;
-    var classes = useStyles$C();
+    var classes = useStyles$B();
     return (React__default.createElement(React__default.Fragment, null,
         show && (React__default.createElement(HelmetDexteel, { title: "".concat((_b = selectedLog === null || selectedLog === void 0 ? void 0 : selectedLog.Source) !== null && _b !== void 0 ? _b : "", " - Log Details").concat(suffixTitle ? " - ".concat(suffixTitle) : "") })),
         React__default.createElement(Grid, { container: true, justifyContent: "center", alignItems: "center" },
@@ -2541,7 +2541,7 @@ var getLogTypeByCodeId = function (logTypeCodeId) {
     return get(LOG_TYPE_CODES, "".concat(logTypeCodeId, ".description"), " -");
 };
 var TableLogs = function () {
-    var classes = useStyles$D();
+    var classes = useStyles$C();
     var _a = useState(moment$8().add(-5, "days").hour(0).minute(0).second(0).toDate()), startDate = _a[0], setStartDate = _a[1];
     var _b = useState(moment$8().hour(23).minute(59).second(59).toDate()), endDate = _b[0], setEndDate = _b[1];
     var _c = useState("UTC"), timezone = _c[0], setTimezone = _c[1];
@@ -2883,7 +2883,7 @@ var deleteProfile = function (profileId) { return __awaiter(void 0, void 0, void
     });
 }); };
 
-var useStyles$B = makeStyles(function (theme) { return ({
+var useStyles$A = makeStyles(function (theme) { return ({
     title: {
         fontSize: 15,
     },
@@ -2906,7 +2906,7 @@ var CreateProfile = function (_a) {
     var _d = useState(""), message = _d[0], setMessage = _d[1];
     var _e = useState(false), isSubmitLoading = _e[0], setIsSubmitLoading = _e[1];
     var _f = useState(""), error = _f[0], setError = _f[1];
-    var classes = useStyles$B();
+    var classes = useStyles$A();
     var _g = useForm({ defaultValues: INITIAL_VALUES$3 }), register = _g.register, handleSubmit = _g.handleSubmit, reset = _g.reset, errors = _g.formState.errors;
     var createProfile = useMutation({
         mutationFn: upsertProfile,
@@ -3146,7 +3146,7 @@ var DataTable = function (_a) {
         React__default.createElement(ErrorModal, { error: error, onHide: function () { return setError(""); } })));
 };
 
-var useStyles$A = makeStyles(function (theme) { return ({
+var useStyles$z = makeStyles(function (theme) { return ({
     root: {
         "& .MuiFormLabel-asterisk": {
             display: "none",
@@ -3170,7 +3170,7 @@ var searchActionsOfProfile = function (_a) {
 var ActionsOfProfile = function (_a) {
     var _b;
     var profileForEdit = _a.profileForEdit, show = _a.show, onHide = _a.onHide, suffixTitle = _a.suffixTitle;
-    var classes = useStyles$A();
+    var classes = useStyles$z();
     var _c = useState(false), showNameSnackbar = _c[0], setShowNameSnackbar = _c[1];
     var _d = useState(false), showActionsSnackbar = _d[0], setShowActionsSnackbar = _d[1];
     var _e = useState(false), isSubmitLoading = _e[0], setIsSubmitLoading = _e[1];
@@ -3357,7 +3357,7 @@ var useProfilesOptionsFunctions = function (_a) {
     };
 };
 
-var useStyles$z = makeStyles(function (theme) { return ({
+var useStyles$y = makeStyles(function (theme) { return ({
     buttons: {
         opacity: 0,
         transition: "opacity 0.1s ease-in-out",
@@ -3374,7 +3374,7 @@ var useStyles$z = makeStyles(function (theme) { return ({
 }); });
 var useTableData$5 = function (_a) {
     var setProfileId = _a.setProfileId, setModalProceduresProfile = _a.setModalProceduresProfile, setModalDeleteProfile = _a.setModalDeleteProfile, showContextMenu = _a.showContextMenu;
-    var classes = useStyles$z();
+    var classes = useStyles$y();
     var columnDefs = [
         {
             field: "ProfileName",
@@ -3438,7 +3438,7 @@ var useTableData$5 = function (_a) {
     return { columnDefs: columnDefs };
 };
 
-var useStyles$y = makeStyles(function (theme) { return ({
+var useStyles$x = makeStyles(function (theme) { return ({
     root: {
         "& .ag-icon-menu": {
             display: "none",
@@ -3494,7 +3494,7 @@ var useStyles$y = makeStyles(function (theme) { return ({
     },
 }); });
 var TableProfiles = function () {
-    var classes = useStyles$y();
+    var classes = useStyles$x();
     var _a = useState(false), modalCreateActive = _a[0], setModalCreateActive = _a[1];
     var _b = useState(false), modalProceduresProfile = _b[0], setModalProceduresProfile = _b[1];
     var _c = useState(false), modalDeleteProfile = _c[0], setModalDeleteProfile = _c[1];
@@ -3684,7 +3684,7 @@ var deleteShiftParameters = function (PatternStart) { return __awaiter(void 0, v
     });
 }); };
 
-var useStyles$x = makeStyles(function (theme) { return ({
+var useStyles$w = makeStyles(function (theme) { return ({
     title: {
         fontSize: 15,
     },
@@ -3710,7 +3710,7 @@ var CreateShift = function (_a) {
     var _d = useState(false), open = _d[0], setOpen = _d[1];
     var _e = useState(false), isSubmitLoading = _e[0], setIsSubmitLoading = _e[1];
     var _f = useState(""), error = _f[0], setError = _f[1];
-    var classes = useStyles$x();
+    var classes = useStyles$w();
     var _g = useForm({
         defaultValues: shiftSelected ? shiftSelected : INITIAL_VALUES$2,
     }), control = _g.control, handleSubmit = _g.handleSubmit, reset = _g.reset, watch = _g.watch, setValue = _g.setValue, errors = _g.formState.errors;
@@ -3915,7 +3915,7 @@ var CreateShift = function (_a) {
             React.createElement(Alert, { severity: "success", onClose: handleClose }, "The shift was created successfully"))));
 };
 
-var useStyles$w = makeStyles(function (theme) { return ({
+var useStyles$v = makeStyles(function (theme) { return ({
     title: {
         fontSize: 15,
     },
@@ -3938,7 +3938,7 @@ var useStyles$w = makeStyles(function (theme) { return ({
 var DeleteShift = function (_a) {
     var _b;
     var shiftSelected = _a.shiftSelected, show = _a.show, onHide = _a.onHide, suffixTitle = _a.suffixTitle;
-    var classes = useStyles$w();
+    var classes = useStyles$v();
     var _c = useState(false), open = _c[0], setOpen = _c[1];
     var _d = useState(false), isSubmitLoading = _d[0], setIsSubmitLoading = _d[1];
     var _e = useState(false), deleteAlert = _e[0], setDeleteAlert = _e[1];
@@ -4086,7 +4086,7 @@ var DeleteShift = function (_a) {
             React.createElement(Alert, { severity: "warning", onClose: handleClose }, "The shift was deleted successfully"))));
 };
 
-var useStyles$v = makeStyles(function (theme) { return ({
+var useStyles$u = makeStyles(function (theme) { return ({
     title: {
         fontSize: 15,
     },
@@ -4109,7 +4109,7 @@ var useStyles$v = makeStyles(function (theme) { return ({
 var EditShift = function (_a) {
     var _b;
     var shiftSelected = _a.shiftSelected, show = _a.show, onHide = _a.onHide, suffixTitle = _a.suffixTitle;
-    var classes = useStyles$v();
+    var classes = useStyles$u();
     var _c = useState(false), open = _c[0], setOpen = _c[1];
     var _d = useState(""), error = _d[0], setError = _d[1];
     var _e = useState(false), isSubmitLoading = _e[0], setIsSubmitLoading = _e[1];
@@ -4385,7 +4385,7 @@ var useShiftsOptionsFunctions = function (_a) {
     };
 };
 
-var useStyles$u = makeStyles(function (theme) { return ({
+var useStyles$t = makeStyles(function (theme) { return ({
     root: {
         opacity: 0,
         transition: "opacity 0.1s ease-in-out",
@@ -4402,7 +4402,7 @@ var useStyles$u = makeStyles(function (theme) { return ({
 }); });
 var useTableData$4 = function (_a) {
     var setShiftSelected = _a.setShiftSelected, setOpenModalEditShift = _a.setOpenModalEditShift, setOpenModalDeleteShift = _a.setOpenModalDeleteShift, showContextMenu = _a.showContextMenu;
-    var classes = useStyles$u();
+    var classes = useStyles$t();
     var columnDefs = [
         {
             field: "PatternStart",
@@ -4490,14 +4490,14 @@ var useTableData$4 = function (_a) {
     return { columnDefs: columnDefs };
 };
 
-var useStyles$t = makeStyles(function (theme) { return ({
+var useStyles$s = makeStyles(function (theme) { return ({
     btnModal: {
         display: "flex",
         justifyContent: "flex-end",
     },
 }); });
 var TableShiftsCrews = function () {
-    var classes = useStyles$t();
+    var classes = useStyles$s();
     var gridRef = useRef(null);
     var _a = useState(""); _a[0]; var setError = _a[1];
     var _b = useState(false), openModalNew = _b[0], setOpenModalNew = _b[1];
@@ -5108,22 +5108,7 @@ var AssetSearchInput = function (_a) {
                     } }))); })))));
 };
 
-var useStyles$s = makeStyles(function () { return ({
-    treePickerWrapper: {
-        "& .MuiGrid-root.MuiGrid-container": {
-            "& .MuiGrid-item": {
-                "& .MuiFormControl-root": {
-                    "& .MuiInputBase-root": {
-                        "& .MuiOutlinedInput-notchedOutline": {
-                            border: "2px solid #3F51B5",
-                        },
-                    },
-                },
-            },
-        },
-    },
-}); });
-var buildTreeAssets$2 = function (nodes) {
+var buildTreeAssets$1 = function (nodes) {
     //tree build functions
     var idMapping = nodes.reduce(function (acc, el, i) {
         // console.log(acc)
@@ -5148,11 +5133,12 @@ var buildTreeAssets$2 = function (nodes) {
     return root;
 };
 var AssetTreePicker = function (_a) {
-    var _b = _a.label, label = _b === void 0 ? "Asset" : _b, value = _a.value, onChange = _a.onChange, disabled = _a.disabled, fieldError = _a.fieldError;
-    var classes = useStyles$s();
-    var _c = useState(""), error = _c[0], setError = _c[1];
-    var _d = searchAssets(), data = _d.data, isLoading = _d.isLoading, e = _d.error, isError = _d.isError;
-    var rowsMapped = (Array.isArray(data) ? data : []).map(function (a) {
+    var _b = _a.label, label = _b === void 0 ? "Asset" : _b, value = _a.value, onChange = _a.onChange, disabled = _a.disabled, fieldError = _a.fieldError, _c = _a.filterAssets, filterAssets = _c === void 0 ? false : _c;
+    var _d = useState(""), error = _d[0], setError = _d[1];
+    var _e = searchAssets(), data = _e.data, isLoading = _e.isLoading, e = _e.error, isError = _e.isError;
+    var rowsMapped = (Array.isArray(data) ? data : [])
+        .filter(function (a) { return !filterAssets || a.CanBeDefaultAsset; })
+        .map(function (a) {
         return ({
             id: a.AssetId,
             parentId: a.ParentAssetId,
@@ -5162,7 +5148,7 @@ var AssetTreePicker = function (_a) {
             children: [],
         });
     });
-    var assetTree = buildTreeAssets$2(rowsMapped || []);
+    var assetTree = buildTreeAssets$1(rowsMapped || []);
     useEffect(function () {
         if (e && isError) {
             setError(e.message);
@@ -5175,12 +5161,11 @@ var AssetTreePicker = function (_a) {
     }
     else {
         return (React__default.createElement(React__default.Fragment, null,
-            React__default.createElement("div", { className: classes.treePickerWrapper },
-                React__default.createElement(FormControl, { error: !!fieldError, fullWidth: true },
-                    React__default.createElement(TreePickerControlV2, { inputTitle: label, title: label, dataSource: assetTree, value: value || 0, onSelect: function (value) {
-                            onChange(value);
-                        }, allowSearch: true, selectBranch: true, selectActive: false, selectInternal: false, disabled: disabled, showClearButton: true }),
-                    fieldError && (React__default.createElement(FormHelperText, null, fieldError.message)))),
+            React__default.createElement(FormControl, { error: !!fieldError, fullWidth: true },
+                React__default.createElement(TreePickerControlV2, { inputTitle: label, title: label, dataSource: assetTree, value: value || 0, onSelect: function (value) {
+                        onChange(value);
+                    }, allowSearch: true, selectBranch: true, selectActive: false, selectInternal: false, disabled: disabled }),
+                fieldError && React__default.createElement(FormHelperText, null, fieldError.message)),
             React__default.createElement(ErrorModal, { error: error, onHide: function () { return setError(""); } })));
     }
 };
@@ -15024,7 +15009,7 @@ var upsertEntry = function (_a) { return __awaiter(void 0, [_a], void 0, functio
                     },
                     { name: "Author", value: author },
                 ];
-                if (assetId) {
+                if (assetId || assetId === 0) {
                     parameters.push({ name: "AssetId", value: assetId });
                 }
                 return [4 /*yield*/, apiService.callV2("[LB].[UpsertEntry]", parameters)];
@@ -16204,11 +16189,12 @@ var useEntryViewerStyles$1 = makeStyles(function (theme) { return ({
     },
     paper: {
         width: "100%",
-        height: "100%",
+        height: "101.3%",
         display: "flex",
         flexDirection: "column",
         padding: "20px 20px 10px",
         overflowX: "hidden",
+        marginTop: -8,
     },
     inputEditable: {
         "& .MuiOutlinedInput-root .MuiOutlinedInput-notchedOutline": {
@@ -16220,8 +16206,10 @@ var useEntryViewerStyles$1 = makeStyles(function (theme) { return ({
 
 var moment$4 = getMomentTz();
 var EntryViewer$1 = function (_a) {
-    var entry = _a.entry, show = _a.show, onChangeShow = _a.onChangeShow, onHide = _a.onHide, canEditAsset = _a.canEditAsset, canEditShift = _a.canEditShift, filterAssets = _a.filterAssets, allowAttachments = _a.allowAttachments, shiftsRange = _a.shiftsRange;
+    var entry = _a.entry, show = _a.show, onChangeShow = _a.onChangeShow, onHide = _a.onHide, preselectedAssetId = _a.preselectedAssetId, withAssetFilter = _a.withAssetFilter, canEditAsset = _a.canEditAsset, canEditShift = _a.canEditShift, filterAssets = _a.filterAssets, allowAttachments = _a.allowAttachments, shiftsRange = _a.shiftsRange;
     var classes = useEntryViewerStyles$1();
+    var settings = useUTLSettingsContext().state.settings;
+    var defaultAssetId = Number(get(settings, "DefaultAssetId", 15));
     var shiftIdParam = useParams().shiftId;
     var searchParams = useSearchParams()[0];
     var entryId = searchParams.get("entryId");
@@ -16307,14 +16295,20 @@ var EntryViewer$1 = function (_a) {
         });
     }); };
     useEffect(function () {
-        var _a, _b;
+        var _a, _b, _c;
         if (shiftInfo || !isNewEntry) {
-            var newEntry = __assign(__assign({}, ENTRY_INITIAL_VALUES), { ShiftId: shiftInfo === null || shiftInfo === void 0 ? void 0 : shiftInfo.CurrentShiftId, Shift: (_a = shiftInfo === null || shiftInfo === void 0 ? void 0 : shiftInfo.CurrentShift) !== null && _a !== void 0 ? _a : "", Crew: (_b = shiftInfo === null || shiftInfo === void 0 ? void 0 : shiftInfo.CurrentCrew) !== null && _b !== void 0 ? _b : "", CreateTimestamp: new Date() });
+            var newEntry = __assign(__assign({}, ENTRY_INITIAL_VALUES), { ShiftId: shiftInfo === null || shiftInfo === void 0 ? void 0 : shiftInfo.CurrentShiftId, Shift: (_a = shiftInfo === null || shiftInfo === void 0 ? void 0 : shiftInfo.CurrentShift) !== null && _a !== void 0 ? _a : "", Crew: (_b = shiftInfo === null || shiftInfo === void 0 ? void 0 : shiftInfo.CurrentCrew) !== null && _b !== void 0 ? _b : "", CreateTimestamp: new Date(), AssetId: (_c = preselectedAssetId !== null && preselectedAssetId !== void 0 ? preselectedAssetId : defaultAssetId) !== null && _c !== void 0 ? _c : null });
             reset((isNewEntry ? newEntry : entry) || ENTRY_INITIAL_VALUES);
         }
-    }, [entry, shiftInfo, entryId, reset]);
+    }, [entry, shiftInfo, entryId, reset, defaultAssetId]);
+    useEffect(function () {
+        var _a;
+        if (isNewEntry) {
+            setValue("AssetId", (_a = preselectedAssetId !== null && preselectedAssetId !== void 0 ? preselectedAssetId : defaultAssetId) !== null && _a !== void 0 ? _a : null);
+        }
+    }, [preselectedAssetId, defaultAssetId]);
     return (React__default.createElement(React__default.Fragment, null,
-        (isNewEntry || (entry === null || entry === void 0 ? void 0 : entry.EntryId)) && (React__default.createElement(HelmetDexteel, { title: "".concat(isNewEntry ? "New Entry" : "'".concat(entry === null || entry === void 0 ? void 0 : entry.Title, "' by ").concat(entry === null || entry === void 0 ? void 0 : entry.Author), " - Logbook Entry") })),
+        isNewEntry || (entry === null || entry === void 0 ? void 0 : entry.EntryId) ? (React__default.createElement(HelmetDexteel, { title: "".concat(isNewEntry ? "New Entry" : "'".concat(entry === null || entry === void 0 ? void 0 : entry.Title, "' by ").concat(entry === null || entry === void 0 ? void 0 : entry.Author), " - Logbook Entry") })) : null,
         isNewEntry || (entry === null || entry === void 0 ? void 0 : entry.EntryId) ? (React__default.createElement(Paper, { elevation: 1, className: classes.paper },
             React__default.createElement("form", { onSubmit: handleSubmit(onSubmit), style: {
                     height: "100%",
@@ -16355,7 +16349,7 @@ var EntryViewer$1 = function (_a) {
                             justifyContent: "space-between",
                             margin: 0,
                         } },
-                        React__default.createElement(Grid, { item: true, xs: 12, md: 4, style: { paddingLeft: 0 } },
+                        React__default.createElement(Grid, { item: true, xs: 12, md: 3, style: { paddingLeft: 0 } },
                             React__default.createElement(Controller, { name: "CreateTimestamp", control: control, render: function (_a) {
                                     var value = _a.field.value;
                                     return (React__default.createElement(DateTimePicker, { label: "Creation Time", timezone: TimeService.getInstance().getServerTimeZone(), format: "MM/DD/YYYY HH:mm", value: value ? moment$4(value) : null, disabled: true, slotProps: {
@@ -16363,10 +16357,17 @@ var EntryViewer$1 = function (_a) {
                                                 variant: "outlined",
                                                 size: "small",
                                                 fullWidth: true,
+                                                InputLabelProps: {
+                                                    shrink: true,
+                                                    style: {
+                                                        fontSize: ".875rem",
+                                                        marginTop: -2,
+                                                    },
+                                                },
                                             },
                                         } }));
                                 } })),
-                        canEditShift ? (React__default.createElement(Grid, { item: true, xs: 12, md: 4 },
+                        canEditShift ? (React__default.createElement(Grid, { item: true, xs: 12, md: 3 },
                             React__default.createElement(Controller, { name: "ShiftId", control: control, render: function (_a) {
                                     var _b;
                                     var field = _a.field;
@@ -16388,7 +16389,7 @@ var EntryViewer$1 = function (_a) {
                                                 field.onChange(null);
                                             }
                                         }, value: field.value, disabled: !isNewEntry && show !== "edit", shiftsRange: shiftsRange }));
-                                } }))) : (React__default.createElement(Grid, { item: true, xs: 12, md: 4 },
+                                } }))) : (React__default.createElement(Grid, { item: true, xs: 12, md: 3 },
                             React__default.createElement(Controller, { name: "ShiftId", control: control, render: function (_a) {
                                     var field = _a.field;
                                     return (React__default.createElement(ShiftSelector, { onChange: field.onChange, value: field.value, disabled: true }));
@@ -16400,11 +16401,15 @@ var EntryViewer$1 = function (_a) {
                                     var _b = _a.field, value = _b.value, onChange = _b.onChange, error = _a.fieldState.error;
                                     return (React__default.createElement(TextField, { label: "Author", variant: "outlined", value: value !== null && value !== void 0 ? value : "", onChange: onChange, fullWidth: true, error: !!error, helperText: error === null || error === void 0 ? void 0 : error.message, disabled: !isNewEntry, size: "small" }));
                                 } })),
-                        canEditAsset && (React__default.createElement(Grid, { item: true, md: 2, xs: 12 },
+                        canEditAsset ? (withAssetFilter === "tree" ? (React__default.createElement(Grid, { item: true, md: 4, xs: 12, style: { marginTop: -8 } },
+                            React__default.createElement(Controller, { name: "AssetId", control: control, render: function (_a) {
+                                    var field = _a.field;
+                                    return (React__default.createElement(AssetTreePicker, { label: "Asset", value: field.value || 0, onChange: field.onChange }));
+                                } }))) : withAssetFilter === "selector" ? (React__default.createElement(Grid, { item: true, md: 4, xs: 12 },
                             React__default.createElement(Controller, { name: "AssetId", control: control, render: function (_a) {
                                     var field = _a.field;
                                     return (React__default.createElement(AssetsFilter, { value: field.value, onChange: field.onChange, filterAreaAssets: filterAssets === "area" }));
-                                } })))),
+                                } }))) : null) : null),
                     React__default.createElement(Grid, { container: true, item: true, xs: 12, className: !isNewEntry ? classes.inputEditable : "", style: {
                             flexGrow: 1,
                             height: "calc(100% - 200px)",
@@ -16445,26 +16450,6 @@ var EntryViewer$1 = function (_a) {
         React__default.createElement(ErrorModal, { error: error, onHide: function () { return setError(""); } })));
 };
 
-var buildTreeAssets$1 = function (nodes) {
-    if (nodes === undefined)
-        return;
-    var idMapping = nodes.reduce(function (acc, el, i) {
-        acc[el === null || el === void 0 ? void 0 : el.id] = i;
-        return acc;
-    }, {});
-    var root;
-    nodes.forEach(function (el) {
-        if ((el === null || el === void 0 ? void 0 : el.parentId) === null) {
-            root = el;
-            return;
-        }
-        var parentEl = nodes[idMapping[el.parentId]];
-        if (parentEl) {
-            parentEl.children = __spreadArray(__spreadArray([], ((parentEl === null || parentEl === void 0 ? void 0 : parentEl.children) || []), true), [el], false);
-        }
-    });
-    return root;
-};
 var Filters$1 = function (_a) {
     var withAssetFilter = _a.withAssetFilter, filterAssets = _a.filterAssets, assetId = _a.assetId, _b = _a.setAssetId, setAssetId = _b === void 0 ? function () { } : _b, quickFilter = _a.quickFilter, onQuickFilterChange = _a.onQuickFilterChange;
     useMesfRealtime({
@@ -16472,19 +16457,6 @@ var Filters$1 = function (_a) {
             if (message.replaceAll("[", "").replaceAll("]", "") == "LB.GetEntries") ;
         },
     });
-    var _c = useAssets(), data = _c.data; _c.isLoading;
-    var rowsMapped = (Array.isArray(data) ? data : [])
-        .filter(function (a) { return filterAssets !== "area" || a.CanBeDefaultAsset; })
-        .map(function (a) {
-        return ({
-            id: a.AssetId,
-            name: a.AssetName,
-            parentId: a.ParentAssetId,
-            isLeaf: a.IsLeaf,
-            isActive: true,
-        });
-    });
-    var assets = buildTreeAssets$1(rowsMapped || []);
     return (React__default.createElement(Grid, { container: true, justifyContent: "center", alignItems: "center", component: Paper, spacing: 2, style: {
             display: "flex",
             width: "100%",
@@ -16497,12 +16469,12 @@ var Filters$1 = function (_a) {
                 alignItems: "center",
             } },
             React__default.createElement(ShiftDayNavigatorControl, { preventInit: true, withPaper: false, margin: "0.5rem 1rem 0rem" })),
-        withAssetFilter === "tree" && assets && (React__default.createElement(Grid, { item: true, xs: 12, md: 4, style: {
+        withAssetFilter === "tree" && (React__default.createElement(Grid, { item: true, xs: 12, md: 4, style: {
                 alignItems: "center",
                 justifyContent: "center",
                 marginTop: 6,
             } },
-            React__default.createElement(TreePickerControlV2, { inputTitle: "Asset", title: "Choose Asset", dataSource: assets, value: assetId || 0, description: "", onSelect: function (value) { return setAssetId(value !== null && value !== void 0 ? value : null); }, selectBranch: true, selectActive: false, selectInternal: false, showPath: true, allowSearch: true }))),
+            React__default.createElement(AssetTreePicker, { label: "Asset", value: assetId || 0, onChange: function (value) { return setAssetId(value !== null && value !== void 0 ? value : null); }, filterAssets: filterAssets === "area" }))),
         withAssetFilter === "selector" && (React__default.createElement(Grid, { item: true, xs: 12, md: 4, style: {
                 alignItems: "center",
                 justifyContent: "center",
@@ -16790,7 +16762,7 @@ var Logbook$1 = function () {
                                 : "/logbook/entry/".concat(shiftId || (shiftInfo === null || shiftInfo === void 0 ? void 0 : shiftInfo.CurrentShiftId), "?entryId=").concat(entryId, "&action=view");
                             navigate(targetUrl);
                         }
-                    }, canEditAsset: canEditAsset, canEditShift: canEditShift, filterAssets: filterAssets, allowAttachments: allowAttachments, shiftsRange: shiftsRange, onHide: function (entryId, shouldStayInEditMode) { return __awaiter(void 0, void 0, void 0, function () {
+                    }, preselectedAssetId: assetId, withAssetFilter: withAssetFilter, canEditAsset: canEditAsset, canEditShift: canEditShift, filterAssets: filterAssets, allowAttachments: allowAttachments, shiftsRange: shiftsRange, onHide: function (entryId, shouldStayInEditMode) { return __awaiter(void 0, void 0, void 0, function () {
                         var targetUrl;
                         var _a;
                         return __generator(this, function (_b) {
@@ -16820,18 +16792,23 @@ var Logbook$1 = function () {
                                             // If still not found, try one more refetch
                                             setTimeout(function () { return __awaiter(void 0, void 0, void 0, function () {
                                                 var retryRowNode;
-                                                var _a, _b;
-                                                return __generator(this, function (_c) {
-                                                    switch (_c.label) {
+                                                var _a, _b, _c;
+                                                return __generator(this, function (_d) {
+                                                    switch (_d.label) {
                                                         case 0: return [4 /*yield*/, refetch()];
                                                         case 1:
-                                                            _c.sent();
+                                                            _d.sent();
                                                             retryRowNode = (_a = gridApiRef.current) === null || _a === void 0 ? void 0 : _a.getRowNode(entryId.toString());
                                                             if (retryRowNode) {
                                                                 (_b = gridApiRef.current) === null || _b === void 0 ? void 0 : _b.ensureNodeVisible(retryRowNode);
                                                                 retryRowNode.setSelected(true);
                                                                 setSelectedRowData(retryRowNode.data);
                                                             }
+                                                            else {
+                                                                setShow("");
+                                                                setSelectedRowData(null);
+                                                                (_c = gridApiRef.current) === null || _c === void 0 ? void 0 : _c.deselectAll();
+                                                            }
                                                             return [2 /*return*/];
                                                     }
                                                 });