@dexteel/mesf-core 7.13.2 → 7.14.0

package/dist/index.esm.js

@@ -1141,9 +1141,9 @@ class MESApiService {
     }
 }
 
-const getUsers = () => __awaiter(void 0, void 0, void 0, function* () {
+const getUsers = (signal) => __awaiter(void 0, void 0, void 0, function* () {
     const apiService = new MESApiService();
-    const resp = yield apiService.callV2("[SEC].[GetUsers]", []);
+    const resp = yield apiService.callV2("[SEC].[GetUsers]", [], signal);
     if (resp.ok) {
         return get(resp, "data.tables[0].rows", []);
     }
@@ -1151,13 +1151,13 @@ const getUsers = () => __awaiter(void 0, void 0, void 0, function* () {
         throw new Error(resp.message || "Error fetching users");
     }
 });
-const getDataUser = (_a) => __awaiter(void 0, [_a], void 0, function* ({ userId }) {
+const getDataUser = (params, signal) => __awaiter(void 0, void 0, void 0, function* () {
     const apiService = new MESApiService();
     const parameters = [
-        { name: "UserId", value: userId },
+        { name: "UserId", value: params.userId },
         { name: "UserName", value: null },
     ];
-    const resp = yield apiService.callV2("[SEC].[GetUser]", parameters);
+    const resp = yield apiService.callV2("[SEC].[GetUser]", parameters, signal);
     if (resp.ok) {
         return get(resp, "data.tables[0].rows", []);
     }
@@ -1205,9 +1205,9 @@ const upsertUser = (user) => __awaiter(void 0, void 0, void 0, function* () {
         throw new Error(resp.message || "Error when upsert user data");
     }
 });
-const getAuthTypes = () => __awaiter(void 0, void 0, void 0, function* () {
+const getAuthTypes = (signal) => __awaiter(void 0, void 0, void 0, function* () {
     const apiService = new MESApiService();
-    const resp = yield apiService.callV2("[SEC].[GetAuthTypes]", []);
+    const resp = yield apiService.callV2("[SEC].[GetAuthTypes]", [], signal);
     if (resp.ok) {
         return get(resp, "data.tables[0].rows", 0);
     }
@@ -1532,9 +1532,9 @@ const dxtServerTimeZone = () => TimeService.getInstance().getServerTimeZone;
 const dxtToUTC = TimeService.getInstance().toUTC;
 const dxtToLocalServerTime = TimeService.getInstance().toLocalServerTime;
 
-const getAssets$1 = () => __awaiter(void 0, void 0, void 0, function* () {
+const getAssets$1 = (signal) => __awaiter(void 0, void 0, void 0, function* () {
     const apiService = new MESApiService();
-    const resp = yield apiService.callV2("[MES].[GetAssets]", []);
+    const resp = yield apiService.callV2("[MES].[GetAssets]", [], signal);
     if (resp.ok) {
         return get(resp, "data.tables[0].rows", []);
     }
@@ -1542,9 +1542,9 @@ const getAssets$1 = () => __awaiter(void 0, void 0, void 0, function* () {
         throw new Error(resp.message || "Error fetching assets");
     }
 });
-const getUTLSettings = () => __awaiter(void 0, void 0, void 0, function* () {
+const getUTLSettings = (signal) => __awaiter(void 0, void 0, void 0, function* () {
     const apiService = new MESApiService();
-    const resp = yield apiService.callV2("[UTL].[GetSettings]", []);
+    const resp = yield apiService.callV2("[UTL].[GetSettings]", [], signal);
     if (resp.ok) {
         return get(resp, "data.tables[0].rows", []);
     }
@@ -1564,7 +1564,7 @@ const upsertDefaultAreaId = (UserId, DefaultAreaId) => __awaiter(void 0, void 0,
 const useSearchAssets = () => {
     return useQuery({
         queryKey: ["assets"],
-        queryFn: () => getAssets$1(),
+        queryFn: ({ signal }) => getAssets$1(signal),
     });
 };
 
@@ -3254,7 +3254,7 @@ const AssetSelector = ({ value, onChange, disabled = false, }) => {
 const searchAuthTypes = () => {
     return useQuery({
         queryKey: ["authTypes"],
-        queryFn: () => getAuthTypes(),
+        queryFn: ({ signal }) => getAuthTypes(signal),
     });
 };
 const ITEM_HEIGHT$1 = 48;
@@ -3306,9 +3306,9 @@ const AuthTypeSelector = ({ value, onChange, disabled }) => {
 };
 
 //fx obtener profiles
-const getProfiles = () => __awaiter(void 0, void 0, void 0, function* () {
+const getProfiles = (signal) => __awaiter(void 0, void 0, void 0, function* () {
     const apiService = new MESApiService();
-    const resp = yield apiService.callV2("[SEC].[GetProfiles]", []);
+    const resp = yield apiService.callV2("[SEC].[GetProfiles]", [], signal);
     if (resp.ok) {
         return get(resp, "data.tables[0].rows", []);
     }
@@ -3328,10 +3328,10 @@ const upsertProfile = (_a) => __awaiter(void 0, [_a], void 0, function* ({ Profi
     }
 });
 // PROFILES PROCEDURES
-const getActions = () => __awaiter(void 0, void 0, void 0, function* () {
+const getActions = (signal) => __awaiter(void 0, void 0, void 0, function* () {
     const apiService = new MESApiService();
     const parameters = [];
-    const resp = yield apiService.callV2("[SEC].[GetActions]", parameters);
+    const resp = yield apiService.callV2("[SEC].[GetActions]", parameters, signal);
     if (resp.ok) {
         return get(resp, "data.tables[0].rows", []);
     }
@@ -3339,10 +3339,12 @@ const getActions = () => __awaiter(void 0, void 0, void 0, function* () {
         throw new Error(resp.message || "Error fetching actions");
     }
 });
-const getActionsByProfileId = (profileId) => __awaiter(void 0, void 0, void 0, function* () {
+const getActionsByProfileId = (params, signal) => __awaiter(void 0, void 0, void 0, function* () {
     const apiService = new MESApiService();
-    const parameters = [{ name: "ProfileId", value: profileId }];
-    const resp = yield apiService.callV2("[SEC].[GetActionsByProfileId]", parameters);
+    const parameters = [
+        { name: "ProfileId", value: params.profileId },
+    ];
+    const resp = yield apiService.callV2("[SEC].[GetActionsByProfileId]", parameters, signal);
     if (resp.ok) {
         return get(resp, "data.tables[0].rows", []);
     }
@@ -3604,7 +3606,7 @@ const DeleteProfile = ({ profile, show, onHide, suffixTitle, }) => {
 const searchActions = () => {
     return useQuery({
         queryKey: ["actions"],
-        queryFn: () => getActions(),
+        queryFn: ({ signal }) => getActions(signal),
     });
 };
 const DataTable = ({ actionsOfProfile, onSelectionChanged }) => {
@@ -3698,9 +3700,9 @@ const DataTable = ({ actionsOfProfile, onSelectionChanged }) => {
 const searchActionsOfProfile = ({ profileId, }) => {
     return useQuery({
         queryKey: ["actions", profileId],
-        queryFn: () => {
+        queryFn: ({ signal }) => {
             if (profileId) {
-                return getActionsByProfileId(profileId);
+                return getActionsByProfileId({ profileId }, signal);
             }
             else {
                 return [];
@@ -3960,7 +3962,7 @@ const useTableData$7 = ({ setProfileId, setModalProceduresProfile, setModalDelet
 const useSearchProfiles = () => {
     return useQuery({
         queryKey: ["profiles"],
-        queryFn: () => getProfiles(),
+        queryFn: ({ signal }) => getProfiles(signal),
     });
 };
 const TableProfiles = () => {
@@ -4065,7 +4067,7 @@ const TableProfiles = () => {
 const searchProfiles = () => {
     return useQuery({
         queryKey: ["profiles"],
-        queryFn: () => getProfiles(),
+        queryFn: ({ signal }) => getProfiles(signal),
     });
 };
 const Profiles = () => {
@@ -4222,7 +4224,7 @@ const CreateUser = ({ show, onHide, suffixTitle }) => {
 const useSearchUser = ({ userId }) => {
     return useQuery({
         queryKey: ["user", userId],
-        queryFn: () => getDataUser({ userId: userId }),
+        queryFn: ({ signal }) => getDataUser({ userId: userId }, signal),
         enabled: !!userId,
     });
 };
@@ -4855,7 +4857,7 @@ const useUsersOptionsFunctions = ({ setUserId, setShowEditModal, setShowDeleteMo
 const useSearchUsers = () => {
     return useQuery({
         queryKey: ["users"],
-        queryFn: () => getUsers(),
+        queryFn: ({ signal }) => getUsers(signal),
     });
 };
 const TableUsers = () => {
@@ -4984,7 +4986,7 @@ const TableUsers = () => {
 const searchUser = ({ userId }) => {
     return useQuery({
         queryKey: ["user", userId],
-        queryFn: () => getDataUser({ userId: userId }),
+        queryFn: ({ signal }) => getDataUser({ userId: userId }, signal),
         enabled: !!userId,
     });
 };
@@ -6753,9 +6755,9 @@ const ExcelIcon = (props) => {
 };
 
 //const moment = getMomentTz();
-const getJobs = () => __awaiter(void 0, void 0, void 0, function* () {
+const getJobs = (signal) => __awaiter(void 0, void 0, void 0, function* () {
     const apiService = new MESApiService();
-    const resp = yield apiService.callV2("[SYSTEM].[GetJobsStatus]", []);
+    const resp = yield apiService.callV2("[SYSTEM].[GetJobsStatus]", [], signal);
     if (resp.ok) {
         let rows = get(resp, "data.tables[0].rows", []);
         rows = rows.map((job) => (Object.assign(Object.assign({}, job), { LastStarted: job.LastStarted
@@ -7131,7 +7133,7 @@ const useJobsTableData = ({ setShowModal, setJobSelected, showContextMenu, }) =>
 const useSearchJobs = () => {
     return useQuery({
         queryKey: ["jobs"],
-        queryFn: () => getJobs(),
+        queryFn: ({ signal }) => getJobs(signal),
     });
 };
 const CustomStatusPanel$1 = ({ handleNew }) => (React.createElement(IconButton$1, { onClick: handleNew, color: "primary", style: { marginLeft: -15 } },
@@ -7341,29 +7343,28 @@ const JobsPage = (props) => {
         React.createElement(Jobs, null)));
 };
 
-// Get all tags that have been used in logs
-const getLogTags = (context) => __awaiter(void 0, void 0, void 0, function* () {
+const getLogTags = (params, signal) => __awaiter(void 0, void 0, void 0, function* () {
     var _a;
     const apiService = new MESApiService();
     const tomorrow = new Date();
     tomorrow.setDate(tomorrow.getDate() + 1);
-    const parameters = context
+    const parameters = params
         ? [
-            { name: "Start", value: context.startDate },
-            { name: "End", value: (_a = context.endDate) !== null && _a !== void 0 ? _a : tomorrow },
+            { name: "Start", value: params.startDate },
+            { name: "End", value: (_a = params.endDate) !== null && _a !== void 0 ? _a : tomorrow },
             {
                 name: "LogTypeCode",
-                value: context.logTypeCode === "A" ? null : context.logTypeCode,
+                value: params.logTypeCode === "A" ? null : params.logTypeCode,
             },
             {
                 name: "TagFilters",
-                value: context.tagFilters.length > 0
-                    ? JSON.stringify(context.tagFilters)
+                value: params.tagFilters.length > 0
+                    ? JSON.stringify(params.tagFilters)
                     : null,
             },
         ]
         : [];
-    const resp = yield apiService.callV2("[SYSTEM].[GetLogTags]", parameters);
+    const resp = yield apiService.callV2("[SYSTEM].[GetLogTags]", parameters, signal);
     if (resp.ok) {
         const rows = get(resp, "data.tables[0].rows", []);
         return rows;
@@ -7372,24 +7373,23 @@ const getLogTags = (context) => __awaiter(void 0, void 0, void 0, function* () {
         throw new Error(resp.message || "Error fetching log tags");
     }
 });
-// Get all distinct values for a specific tag
-const getLogTagValues = (tagName, context) => __awaiter(void 0, void 0, void 0, function* () {
-    var _a;
+const getLogTagValues = (params, signal) => __awaiter(void 0, void 0, void 0, function* () {
+    var _a, _b;
     const apiService = new MESApiService();
     const tomorrow = new Date();
     tomorrow.setDate(tomorrow.getDate() + 1);
     // When getting values for a tag, exclude that tag from the filter context
     // so we show all possible values that match the OTHER filters
-    const otherTagFilters = context === null || context === void 0 ? void 0 : context.tagFilters.filter((f) => f.TagName !== tagName);
+    const otherTagFilters = params === null || params === void 0 ? void 0 : params.tagFilters.filter((f) => f.TagName !== params.tagName);
     const parameters = [
-        { name: "TagName", value: tagName },
-        ...(context
+        { name: "TagName", value: (_a = params === null || params === void 0 ? void 0 : params.tagName) !== null && _a !== void 0 ? _a : "" },
+        ...(params
             ? [
-                { name: "Start", value: context.startDate },
-                { name: "End", value: (_a = context.endDate) !== null && _a !== void 0 ? _a : tomorrow },
+                { name: "Start", value: params.startDate },
+                { name: "End", value: (_b = params.endDate) !== null && _b !== void 0 ? _b : tomorrow },
                 {
                     name: "LogTypeCode",
-                    value: context.logTypeCode === "A" ? null : context.logTypeCode,
+                    value: params.logTypeCode === "A" ? null : params.logTypeCode,
                 },
                 {
                     name: "TagFilters",
@@ -7400,7 +7400,7 @@ const getLogTagValues = (tagName, context) => __awaiter(void 0, void 0, void 0,
             ]
             : []),
     ];
-    const resp = yield apiService.callV2("[SYSTEM].[GetLogTagValues]", parameters);
+    const resp = yield apiService.callV2("[SYSTEM].[GetLogTagValues]", parameters, signal);
     if (resp.ok) {
         const rows = get(resp, "data.tables[0].rows", []);
         return rows;
@@ -7419,9 +7419,11 @@ const useSearchLogTags = ({ startDate, endDate, logTypeCode, tagFilters, }) => {
             startDate.getTime(),
             endDate === null || endDate === void 0 ? void 0 : endDate.getTime(),
             logTypeCode,
-            tagFilters,
+            JSON.stringify(tagFilters),
         ],
-        queryFn: () => getLogTags({ startDate, endDate, logTypeCode, tagFilters }),
+        queryFn: ({ signal }) => getLogTags({ startDate, endDate, logTypeCode, tagFilters }, signal),
+        enabled: !!startDate,
+        staleTime: 10000,
     });
 };
 const useSearchLogTagValues = ({ tagName, startDate, endDate, logTypeCode, tagFilters, }) => {
@@ -7429,13 +7431,14 @@ const useSearchLogTagValues = ({ tagName, startDate, endDate, logTypeCode, tagFi
         queryKey: [
             "logTagValues",
             tagName,
-            startDate,
-            endDate,
+            startDate.getTime(),
+            endDate === null || endDate === void 0 ? void 0 : endDate.getTime(),
             logTypeCode,
-            tagFilters,
+            JSON.stringify(tagFilters),
         ],
-        queryFn: () => getLogTagValues(tagName, { startDate, endDate, logTypeCode, tagFilters }),
+        queryFn: ({ signal }) => getLogTagValues({ tagName, startDate, endDate, logTypeCode, tagFilters }, signal),
         enabled: !!tagName,
+        staleTime: 10000,
     });
 };
 const TagFilter = ({ tagFilters, setTagFilters, filterContext, }) => {
@@ -7726,18 +7729,20 @@ const useLogTableData = () => {
 };
 
 //fx obtener logs
-const getLogs = (_a) => __awaiter(void 0, [_a], void 0, function* ({ startDate, endDate, logTypeCode, tagFilters, }) {
+const getLogs = (params, signal) => __awaiter(void 0, void 0, void 0, function* () {
     const apiService = new MESApiService();
     const tomorrow = new Date();
     tomorrow.setDate(tomorrow.getDate() + 1);
-    const end = endDate ? endDate : tomorrow;
-    const tagFiltersJson = tagFilters && tagFilters.length > 0 ? JSON.stringify(tagFilters) : null;
+    const end = params.endDate ? params.endDate : tomorrow;
+    const tagFiltersJson = params.tagFilters && params.tagFilters.length > 0
+        ? JSON.stringify(params.tagFilters)
+        : null;
     const parameters = [
-        { name: "Start", value: startDate },
+        { name: "Start", value: params.startDate },
         { name: "End", value: end },
         {
             name: "LogTypeCode",
-            value: logTypeCode === "A" ? null : logTypeCode,
+            value: params.logTypeCode === "A" ? null : params.logTypeCode,
         },
         { name: "TagFilters", value: tagFiltersJson },
     ];
@@ -7852,14 +7857,22 @@ const useLogsOptionsFunctions = ({ setSelectedLog, setShowLogModal, handleResetB
 
 const useSearchLogs = ({ startDate, endDate, logTypeCode, autoRefresh, tagFilters, }) => {
     return useQuery({
-        queryKey: ["logs", startDate, endDate, logTypeCode, tagFilters],
-        queryFn: () => getLogs({
+        queryKey: [
+            "logs",
+            startDate.getTime(),
+            endDate === null || endDate === void 0 ? void 0 : endDate.getTime(),
+            logTypeCode,
+            JSON.stringify(tagFilters),
+        ],
+        queryFn: ({ signal }) => getLogs({
             startDate,
             endDate,
             logTypeCode,
             tagFilters,
         }),
         refetchInterval: autoRefresh ? 5000 : false,
+        enabled: !!startDate && (!!endDate || autoRefresh),
+        staleTime: 10000,
     });
 };
 const getLogTypeByCodeId = (logTypeCodeId) => {
@@ -7944,6 +7957,12 @@ const TableLogs = () => {
         setShowLogModal,
         handleResetButtonClick,
     });
+    const filterContext = useMemo(() => ({
+        startDate,
+        endDate,
+        logTypeCode: logTypeCode.join(","),
+        tagFilters,
+    }), [startDate, endDate, logTypeCode, tagFilters]);
     useEffect(() => {
         registerConfig({
             id: "TableLogs",
@@ -8011,12 +8030,7 @@ const TableLogs = () => {
                                 React.createElement(Grid2, { size: { md: 1, xs: 12 }, style: { paddingTop: 8 } },
                                     React.createElement(Button, { variant: "contained", color: "inherit", onClick: handleResetButtonClick, fullWidth: true }, "Reset")),
                                 React.createElement(Grid2, { size: { md: 12, xs: 12 }, sx: { mt: 1 } },
-                                    React.createElement(TagFilter, { tagFilters: tagFilters, setTagFilters: setTagFilters, filterContext: {
-                                            startDate,
-                                            endDate,
-                                            logTypeCode: logTypeCode.join(","),
-                                            tagFilters,
-                                        } })))))),
+                                    React.createElement(TagFilter, { tagFilters: tagFilters, setTagFilters: setTagFilters, filterContext: filterContext })))))),
                 React.createElement(Grid2, { size: { md: 12, xs: 12 }, style: {
                         height: "70vh",
                     } },
@@ -8044,9 +8058,9 @@ const ProfilesPage = (props) => {
     return React.createElement(Profiles, null);
 };
 
-const getShiftParameters = () => __awaiter(void 0, void 0, void 0, function* () {
+const getShiftParameters = (signal) => __awaiter(void 0, void 0, void 0, function* () {
     const apiService = new MESApiService();
-    const resp = yield apiService.callV2("[MES].[GetShiftParameters]", []);
+    const resp = yield apiService.callV2("[MES].[GetShiftParameters]", [], signal);
     if (resp.ok) {
         return get(resp, "data.tables[0].rows", []);
     }
@@ -8755,7 +8769,7 @@ const useTableData$5 = ({ setShiftSelected, setOpenModalEditShift, setOpenModalD
 const useSearchShifts = () => {
     return useQuery({
         queryKey: ["shifts"],
-        queryFn: () => getShiftParameters(),
+        queryFn: ({ signal }) => getShiftParameters(signal),
     });
 };
 const TableShiftsCrews = () => {
@@ -9412,7 +9426,7 @@ const EditSetting = ({ settingSelected, show, onHide, suffixTitle, }) => {
 const useSearchSettings = () => {
     return useQuery({
         queryKey: ["settings"],
-        queryFn: () => getUTLSettings(),
+        queryFn: ({ signal }) => getUTLSettings(signal),
     });
 };
 const TableSettings = () => {
@@ -9507,7 +9521,7 @@ const TableSettings = () => {
 const searchSettings = () => {
     return useQuery({
         queryKey: ["settings"],
-        queryFn: () => getUTLSettings(),
+        queryFn: ({ signal }) => getUTLSettings(signal),
     });
 };
 const SettingsPage = () => {
@@ -9813,9 +9827,9 @@ const ChatComponent = () => {
                     React__default.createElement(Button, { type: "submit", variant: "contained", color: "primary", disabled: !connectionState.isConnected || !user || !message, endIcon: React__default.createElement(Send, null), fullWidth: true, size: "medium" }, "Send"))))));
 };
 
-const getQueryCacheInvalidations = () => __awaiter(void 0, void 0, void 0, function* () {
+const getQueryCacheInvalidations = (signal) => __awaiter(void 0, void 0, void 0, function* () {
     const apiService = new MESApiService();
-    const resp = yield apiService.callV2("[SYSTEM].[GetQueryCacheInvalidations]", []);
+    const resp = yield apiService.callV2("[SYSTEM].[GetQueryCacheInvalidations]", [], signal);
     if (resp.ok) {
         let cacheInvalidations = get(resp, "data.tables[0].rows", []);
         let actions = get(resp, "data.tables[1].rows", []);
@@ -9848,7 +9862,7 @@ const upsertQueryCacheInvalidations = (_a) => __awaiter(void 0, [_a], void 0, fu
 const searchQueryCacheInvalidations = () => {
     return useQuery({
         queryKey: ["queryCacheInvalidations"],
-        queryFn: () => getQueryCacheInvalidations(),
+        queryFn: ({ signal }) => getQueryCacheInvalidations(signal),
     });
 };
 const QueryCacheInvalidations = () => {
@@ -10793,10 +10807,10 @@ const useSeriesMinMax = (series, tagIds) => {
 
 const getIhPath = () => localStorage.getItem("ihPath") || "[mssql2022].[IH_100020].[ih]";
 //tags
-const getTagsTree = () => __awaiter(void 0, void 0, void 0, function* () {
+const getTagsTree = (signal) => __awaiter(void 0, void 0, void 0, function* () {
     const apiService = new MESApiService();
     const parameters = [];
-    const resp = yield apiService.callV2(getIhPath() + ".[GetTagsTree]", parameters);
+    const resp = yield apiService.callV2(getIhPath() + ".[GetTagsTree]", parameters, signal);
     if (resp.ok) {
         return get(resp, "data.tables[0].rows", []);
     }
@@ -10869,10 +10883,10 @@ const saveTagDefaults = (_a) => __awaiter(void 0, [_a], void 0, function* ({ tag
     }
 });
 //views
-const getViews = (Search) => __awaiter(void 0, void 0, void 0, function* () {
+const getViews = (params, signal) => __awaiter(void 0, void 0, void 0, function* () {
     const apiService = new MESApiService();
-    const parameters = [{ name: "Search", value: Search }];
-    const resp = yield apiService.callV2(getIhPath() + ".[GetViews]", parameters);
+    const parameters = [{ name: "Search", value: params.Search }];
+    const resp = yield apiService.callV2(getIhPath() + ".[GetViews]", parameters, signal);
     if (resp.ok) {
         return get(resp, "data.tables[0].rows", []);
     }
@@ -10904,10 +10918,10 @@ const deleteView = (ViewId) => __awaiter(void 0, void 0, void 0, function* () {
     }
 });
 //viewTags
-const getViewTags = (ViewId) => __awaiter(void 0, void 0, void 0, function* () {
+const getViewTags = (params, signal) => __awaiter(void 0, void 0, void 0, function* () {
     const apiService = new MESApiService();
-    const parameters = [{ name: "ViewId", value: ViewId }];
-    const resp = yield apiService.callV2(getIhPath() + ".[GetViewTags]", parameters);
+    const parameters = [{ name: "ViewId", value: params.viewId }];
+    const resp = yield apiService.callV2(getIhPath() + ".[GetViewTags]", parameters, signal);
     if (resp.ok) {
         return get(resp, "data.tables[0].rows", []);
     }
@@ -12200,7 +12214,7 @@ const CustomDragPreview = (props) => {
 const useSearchTagsTree = () => {
     return useQuery({
         queryKey: ["tagsTree-v2"],
-        queryFn: () => getTagsTree(),
+        queryFn: ({ signal }) => getTagsTree(signal),
         enabled: false, // Only fetch when explicitly called
     });
 };
@@ -14934,16 +14948,16 @@ const TrendingChartV2 = ({ series = [], customOptions, isLoading = false, onChar
 const useSearchViews = ({ autoRefresh = false, }) => {
     return useQuery({
         queryKey: ["views-v2"],
-        queryFn: () => getViews(null),
+        queryFn: ({ signal }) => getViews({ Search: null }, signal),
         refetchInterval: autoRefresh ? 10000 : false,
     });
 };
 const useSearchViewTags = ({ viewId }) => {
     return useQuery({
         queryKey: ["viewTags-v2", viewId],
-        queryFn: () => {
+        queryFn: ({ signal }) => {
             if (viewId) {
-                return getViewTags(viewId);
+                return getViewTags({ viewId }, signal);
             }
             return [];
         },
@@ -15480,13 +15494,13 @@ const upsertEntry$1 = (_a) => __awaiter(void 0, [_a], void 0, function* ({ asset
         throw new Error(resp.message || "Error upserting entry");
     }
 });
-const deleteEntry$1 = (EntryId) => __awaiter(void 0, void 0, void 0, function* () {
+const deleteEntry$1 = (entryId) => __awaiter(void 0, void 0, void 0, function* () {
     const apiService = new MESApiService();
     // First, get all attachments for this entry to identify files to delete
     let attachmentsToDelete = [];
     try {
-        if (EntryId) {
-            attachmentsToDelete = yield getEntryAttachments$1(EntryId);
+        if (entryId) {
+            attachmentsToDelete = yield getEntryAttachments$1({ entryId });
         }
     }
     catch (error) {
@@ -15494,7 +15508,7 @@ const deleteEntry$1 = (EntryId) => __awaiter(void 0, void 0, void 0, function* (
         console.warn("Failed to get attachments for entry deletion:", error);
     }
     // Delete the entry (this will cascade delete attachment records)
-    const parameters = [{ name: "EntryId", value: EntryId }];
+    const parameters = [{ name: "EntryId", value: entryId }];
     const resp = yield apiService.callV2("[LB].[DeleteEntry]", parameters);
     if (!resp.ok) {
         throw new Error(resp.message || "Error deleting entry");
@@ -15529,9 +15543,11 @@ const deleteUploadFile$1 = (uploadFileId) => __awaiter(void 0, void 0, void 0, f
     }
 });
 // Attachment management functions
-const getEntryAttachments$1 = (entryId) => __awaiter(void 0, void 0, void 0, function* () {
+const getEntryAttachments$1 = (params, signal) => __awaiter(void 0, void 0, void 0, function* () {
     const apiService = new MESApiService();
-    const parameters = [{ name: "EntryId", value: entryId }];
+    const parameters = [
+        { name: "EntryId", value: params.entryId },
+    ];
     const resp = yield apiService.callV2("[LB].[GetEntryAttachments]", parameters);
     if (resp.ok) {
         let rows = get(resp, "data.tables[0].rows", []);
@@ -15819,9 +15835,9 @@ const RemoveEntryDialog$1 = ({ entry, show, onHide }) => {
         React__default.createElement(ErrorModal, { error: error, onHide: () => setError("") })));
 };
 
-const getAssets = () => __awaiter(void 0, void 0, void 0, function* () {
+const getAssets = (signal) => __awaiter(void 0, void 0, void 0, function* () {
     const apiService = new MESApiService();
-    const resp = yield apiService.callV2("[MES].[GetAssets]", []);
+    const resp = yield apiService.callV2("[MES].[GetAssets]", [], signal);
     if (resp.ok) {
         return get(resp, "data.tables[0].rows", []);
     }
@@ -15833,7 +15849,7 @@ const getAssets = () => __awaiter(void 0, void 0, void 0, function* () {
 const useAssets = (onError) => {
     return useQuery({
         queryKey: ["assets"],
-        queryFn: () => getAssets(),
+        queryFn: ({ signal }) => getAssets(signal),
         onError: onError,
     });
 };
@@ -15862,15 +15878,16 @@ const AssetsFilter = ({ label = "Asset", value, onChange, filterAreaAssets = fal
 };
 
 const moment$d = getMomentTz();
-const getShifts = (shiftId) => __awaiter(void 0, void 0, void 0, function* () {
+const getShifts = (params, signal) => __awaiter(void 0, void 0, void 0, function* () {
+    var _a;
     const apiService = new MESApiService();
     const parameters = [
         {
             name: "ShiftId",
-            value: shiftId !== null && shiftId !== void 0 ? shiftId : null,
+            value: (_a = params.shiftId) !== null && _a !== void 0 ? _a : null,
         },
     ];
-    const resp = yield apiService.callV2(`[MES].[GetShiftByParameters]`, parameters);
+    const resp = yield apiService.callV2(`[MES].[GetShiftByParameters]`, parameters, signal);
     if (resp.ok) {
         let rows = get(resp, "data.tables[0].rows", []);
         rows = rows.map((row) => {
@@ -15958,7 +15975,7 @@ const ShiftAutocomplete = ({ currentShiftId, value, onShiftSelected, disabled, s
 const useShifts = (shiftId) => {
     return useQuery({
         queryKey: ["shifts", shiftId],
-        queryFn: () => getShifts(shiftId),
+        queryFn: ({ signal }) => getShifts({ shiftId }, signal),
     });
 };
 const ShiftSelector = ({ label = "Shift - Crew", value, onChange = () => { }, fieldError, disabled = false, }) => {
@@ -16113,7 +16130,7 @@ const AttachmentModal$1 = ({ open, onClose, entryId, isEditing, entryData, onEnt
     // Query for fetching attachments
     const { data: attachments = [], isLoading, error: fetchError, } = useQuery({
         queryKey: ["entryAttachments", currentEntryId],
-        queryFn: () => getEntryAttachments$1(currentEntryId),
+        queryFn: ({ signal }) => getEntryAttachments$1({ entryId: currentEntryId }),
         enabled: !!currentEntryId && currentEntryId > 0,
     });
     // Mutations
@@ -16409,7 +16426,7 @@ const ContentInput$1 = ({ value, onChange, isEditing, UpdateTimestamp, UpdatedBy
     // Query for fetching attachment count
     const { data: attachments = [], error: attachmentError } = useQuery({
         queryKey: ["entryAttachments", effectiveEntryId],
-        queryFn: () => getEntryAttachments$1(effectiveEntryId),
+        queryFn: ({ signal }) => getEntryAttachments$1({ entryId: effectiveEntryId }),
         enabled: !!effectiveEntryId && effectiveEntryId > 0,
         retry: 1,
         onError: (err) => {
@@ -17128,14 +17145,14 @@ const MESFLogbookEntry$1 = () => {
 };
 
 const moment$9 = getMomentTz();
-const getEntriesReport$1 = (_a) => __awaiter(void 0, [_a], void 0, function* ({ startShiftId, endShiftId, assetId, }) {
+const getEntriesReport$1 = (params, signal) => __awaiter(void 0, void 0, void 0, function* () {
     const apiService = new MESApiService();
     const parameters = [
-        { name: "StartShiftId", value: startShiftId },
-        { name: "EndShiftId", value: endShiftId },
+        { name: "StartShiftId", value: params.startShiftId },
+        { name: "EndShiftId", value: params.endShiftId },
     ];
-    if (assetId) {
-        parameters.push({ name: "AssetId", value: assetId });
+    if (params.assetId) {
+        parameters.push({ name: "AssetId", value: params.assetId });
     }
     const resp = yield apiService.callV2("[LB].[GetEntries]", parameters);
     if (resp.ok) {
@@ -17155,7 +17172,7 @@ const getEntriesReport$1 = (_a) => __awaiter(void 0, [_a], void 0, function* ({
 const useEntriesReport$1 = ({ startShiftId, endShiftId, assetId, }) => {
     return useQuery({
         queryKey: ["entriesReport", startShiftId, endShiftId, assetId],
-        queryFn: () => getEntriesReport$1({ startShiftId, endShiftId, assetId }),
+        queryFn: ({ signal }) => getEntriesReport$1({ startShiftId, endShiftId, assetId }),
         enabled: !!startShiftId && !!endShiftId && !!assetId,
     });
 };
@@ -17742,14 +17759,14 @@ const useGridDefinitions = ({ OnEdit, OnSend }) => {
 };
 
 const moment$6 = getMomentTz();
-const getEntries = (_a) => __awaiter(void 0, [_a], void 0, function* ({ shiftId, sectionIds, signal, }) {
+const getEntries = (params, signal) => __awaiter(void 0, void 0, void 0, function* () {
     const apiService = new MESApiService();
     const parameters = [
-        { name: "ShiftId", value: shiftId },
+        { name: "ShiftId", value: params.shiftId },
     ];
     // Pass comma-separated sectionIds for multi-select filter
-    if (sectionIds && sectionIds.length > 0) {
-        parameters.push({ name: "SectionIds", value: sectionIds.join(",") });
+    if (params.sectionIds && params.sectionIds.length > 0) {
+        parameters.push({ name: "SectionIds", value: params.sectionIds.join(",") });
     }
     // Use SWV.GetSectionLogbookEntries which extends LB.GetEntries with section info
     const resp = yield apiService.callV2("[SWV].[GetSectionLogbookEntries]", parameters, signal);
@@ -17794,13 +17811,13 @@ const upsertEntry = (_a) => __awaiter(void 0, [_a], void 0, function* ({ assetId
         throw new Error(resp.message || "Error upserting entry");
     }
 });
-const deleteEntry = (EntryId) => __awaiter(void 0, void 0, void 0, function* () {
+const deleteEntry = (entryId) => __awaiter(void 0, void 0, void 0, function* () {
     const apiService = new MESApiService();
     // First, get all attachments for this entry to identify files to delete
     let attachmentsToDelete = [];
     try {
-        if (EntryId) {
-            attachmentsToDelete = yield getEntryAttachments(EntryId);
+        if (entryId) {
+            attachmentsToDelete = yield getEntryAttachments({ entryId });
         }
     }
     catch (error) {
@@ -17808,7 +17825,7 @@ const deleteEntry = (EntryId) => __awaiter(void 0, void 0, void 0, function* ()
         console.warn("Failed to get attachments for entry deletion:", error);
     }
     // Delete the entry (this will cascade delete attachment records)
-    const parameters = [{ name: "EntryId", value: EntryId }];
+    const parameters = [{ name: "EntryId", value: entryId }];
     const resp = yield apiService.callV2("[LB].[DeleteEntry]", parameters);
     if (!resp.ok) {
         throw new Error(resp.message || "Error deleting entry");
@@ -17843,9 +17860,11 @@ const deleteUploadFile = (uploadFileId) => __awaiter(void 0, void 0, void 0, fun
     }
 });
 // Attachment management functions
-const getEntryAttachments = (entryId) => __awaiter(void 0, void 0, void 0, function* () {
+const getEntryAttachments = (params, signal) => __awaiter(void 0, void 0, void 0, function* () {
     const apiService = new MESApiService();
-    const parameters = [{ name: "EntryId", value: entryId }];
+    const parameters = [
+        { name: "EntryId", value: params.entryId },
+    ];
     const resp = yield apiService.callV2("[LB].[GetEntryAttachments]", parameters);
     if (resp.ok) {
         let rows = get(resp, "data.tables[0].rows", []);
@@ -17909,7 +17928,7 @@ const deleteUploadFileInBackground = (uploadFileId) => __awaiter(void 0, void 0,
 const useEntries = ({ shiftId, sectionIds }) => {
     return useQuery({
         queryKey: ["entries", shiftId, sectionIds],
-        queryFn: ({ signal }) => getEntries({ shiftId, sectionIds, signal }),
+        queryFn: ({ signal }) => getEntries({ shiftId, sectionIds }, signal),
     });
 };
 const routeLogbookEntry = "/logbook/entry";
@@ -18437,7 +18456,7 @@ const AttachmentModal = ({ open, onClose, entryId, isEditing, entryData, onEntry
     // Query for fetching attachments
     const { data: attachments = [], isLoading, error: fetchError, } = useQuery({
         queryKey: ["entryAttachments", currentEntryId],
-        queryFn: () => getEntryAttachments(currentEntryId),
+        queryFn: ({ signal }) => getEntryAttachments({ entryId: currentEntryId }),
         enabled: !!currentEntryId && currentEntryId > 0,
     });
     // Mutations
@@ -18733,7 +18752,7 @@ const ContentInput = ({ value, onChange, isEditing, UpdateTimestamp, UpdatedBy,
     // Query for fetching attachment count
     const { data: attachments = [], error: attachmentError } = useQuery({
         queryKey: ["entryAttachments", effectiveEntryId],
-        queryFn: () => getEntryAttachments(effectiveEntryId),
+        queryFn: ({ signal }) => getEntryAttachments({ entryId: effectiveEntryId }),
         enabled: !!effectiveEntryId && effectiveEntryId > 0,
         retry: 1,
         onError: (err) => {
@@ -19469,18 +19488,18 @@ const MESFLogbookEntry = () => {
 };
 
 const moment$2 = getMomentTz();
-const getEntriesReport = (_a) => __awaiter(void 0, [_a], void 0, function* ({ startShiftId, endShiftId, assetId, sectionIds, signal, }) {
+const getEntriesReport = (params, signal) => __awaiter(void 0, void 0, void 0, function* () {
     const apiService = new MESApiService();
     const parameters = [
-        { name: "StartShiftId", value: startShiftId },
-        { name: "EndShiftId", value: endShiftId },
+        { name: "StartShiftId", value: params.startShiftId },
+        { name: "EndShiftId", value: params.endShiftId },
     ];
-    if (assetId) {
-        parameters.push({ name: "AssetId", value: assetId });
+    if (params.assetId) {
+        parameters.push({ name: "AssetId", value: params.assetId });
     }
     // Pass comma-separated sectionIds for multi-select filter
-    if (sectionIds && sectionIds.length > 0) {
-        parameters.push({ name: "SectionIds", value: sectionIds.join(",") });
+    if (params.sectionIds && params.sectionIds.length > 0) {
+        parameters.push({ name: "SectionIds", value: params.sectionIds.join(",") });
     }
     // Use SWV.GetSectionLogbookEntries which extends LB.GetEntries with section info
     const resp = yield apiService.callV2("[SWV].[GetSectionLogbookEntries]", parameters, signal);
@@ -19506,8 +19525,7 @@ const useEntriesReport = ({ startShiftId, endShiftId, assetId, sectionIds, }) =>
             endShiftId,
             assetId,
             sectionIds,
-            signal,
-        }),
+        }, signal),
     });
 };