@northern.tech/store 0.38.0 → 0.39.0

package/dist/thunks.js

@@ -22,7 +22,7 @@ import Api from "./api/general-api.js";
 import { changeNotificationSetting, getDeviceAlerts, getDeviceMonitorConfig, getIssueCountsByType, getLatestDeviceAlerts } from "./monitorSlice/thunks.js";
 import { cancelFileUpload, checkReleasesExistence, createArtifact, editArtifact, generateManifest, getArtifactInstallCount, getArtifactUrl, getDeltaGenerationJobDetails, getDeltaGenerationJobs, getExistingManifestTags, getExistingReleaseTags, getExistingSoftwareTags, getManifest, getManifests, getRelease, getReleases, getSoftware, getSoftwareList, getUpdateTypes, removeArtifact, removeManifest, removeManifests, removeRelease, removeReleases, selectManifest, selectRelease, setManifestsListState, setReleaseTags, setReleasesListState, setReleasesTags, setSingleReleaseTags, setSoftwareListState, updateManifestInfo, updateReleaseInfo, uploadArtifact, uploadManifest } from "./releasesSlice/thunks.js";
 import Api$1 from "./api/users-api.js";
-import { attributeDuplicateFilter, customSort, dateRangeToUnix, deepCompare, duplicateFilter, extractErrorMessage, getDemoDeviceAddress, getSnackbarMessage, isEmpty, standardizePhases } from "@northern.tech/utils/helpers";
+import { attributeDuplicateFilter, customSort, dateRangeToUnix, deepCompare, duplicateFilter, extractErrorMessage, getDemoDeviceAddress, isEmpty, standardizePhases } from "@northern.tech/utils/helpers";
 import Cookies from "universal-cookie";
 import dayjs from "dayjs";
 import Tracking from "@northern.tech/utils/tracking";
@@ -709,7 +709,8 @@ const reduceReceivedDevices = (devices, ids, state, status) => devices.reduce((a
 	device.created_ts = getEarliestTs(getEarliestTs(system.created_ts, device.created_ts), stateDevice.created_ts);
 	device.updated_ts = device.attributes ? device.updated_ts : stateDevice.updated_ts;
 	device.isNew = new Date(device.created_ts) > new Date(state.app.newThreshold);
-	device.isOffline = new Date(device.check_in_time_rounded) < new Date(state.app.offlineThreshold) || device.check_in_time_rounded === void 0;
+	const lastCheckIn = device.check_in_time_exact ?? device.check_in_time_rounded;
+	device.isOffline = new Date(lastCheckIn) < new Date(state.app.offlineThreshold) || lastCheckIn === void 0;
 	device.attributes = device.attributes ? {
 		...storedAttributes,
 		...inventory
@@ -1181,7 +1182,15 @@ const getDevicesWithAuth = createAppAsyncThunk(`${sliceName$2}/getDevicesWithAut
 	dispatch(actions$2.receivedDevices(devicesById));
 	return receivedDevices;
 });
-const updateDeviceAuth = createAppAsyncThunk(`${sliceName$2}/updateDeviceAuth`, ({ deviceId, authId, status }, { dispatch, getState }) => Api.put(`${deviceAuthV2}/devices/${deviceId}/auth/${authId}/status`, { status }).then(() => Promise.all([dispatch(getDeviceAuth(deviceId)), dispatch(setSnackbar$2("Device authorization status was updated successfully"))])).catch((err) => commonErrorHandler(err, "There was a problem updating the device authorization status:", dispatch)).then(() => Promise.resolve(dispatch(actions$2.maybeUpdateDevicesByStatus({
+const getSnackbarMessage = (skipped, done, failed = 0) => {
+	pluralize.addIrregularRule("its", "their");
+	const skipText = skipped ? `${skipped} ${pluralize("devices", skipped)} ${pluralize("have", skipped)} more than one pending authset. Expand ${pluralize("this", skipped)} ${pluralize("device", skipped)} to individually adjust ${pluralize("their", skipped)} authorization status. ` : "";
+	const failedText = failed ? `${failed} ${pluralize("device", failed)} could not be updated. You may have reached your device limit. ` : "";
+	return `${done ? `${done} ${pluralize("device", done)} ${pluralize("was", done)} updated successfully. ` : ""}${skipText}${failedText}`;
+};
+const updateDeviceAuth = createAppAsyncThunk(`${sliceName$2}/updateDeviceAuth`, ({ deviceId, authId, status }, { dispatch, getState }) => Api.put(`${deviceAuthV2}/devices/${deviceId}/auth/${authId}/status`, { status }).then(() => Promise.all([dispatch(getDeviceAuth(deviceId)), dispatch(setSnackbar$2("Device authorization status was updated successfully"))])).catch((err) => {
+	return commonErrorHandler(err, err.response?.status === 422 ? "Device limit reached: You have reached your limit of accepted devices." : "There was a problem updating the device authorization status:", dispatch);
+}).then(() => Promise.resolve(dispatch(actions$2.maybeUpdateDevicesByStatus({
 	deviceId,
 	authId
 })))).finally(() => dispatch(setDeviceListState({ refreshTrigger: !getDeviceListState(getState()).refreshTrigger }))));
@@ -1199,15 +1208,17 @@ const updateDevicesAuth = createAppAsyncThunk(`${sliceName$2}/updateDevicesAuth`
 			})).unwrap().catch((err) => commonErrorHandler(err, "The action was stopped as there was a problem updating a device authorization status: ", dispatch, "", false));
 		});
 		return Promise.allSettled(deviceAuthUpdates).then((results) => {
-			const { skipped, count } = results.reduce((accu, item) => {
-				if (item.status === "rejected") accu.skipped = accu.skipped + 1;
+			const { skipped, failed, count } = results.reduce((accu, item) => {
+				if (item.status === "rejected") if (item.reason) accu.failed = accu.failed + 1;
+				else accu.skipped = accu.skipped + 1;
 				else accu.count = accu.count + 1;
 				return accu;
 			}, {
 				skipped: 0,
+				failed: 0,
 				count: 0
 			});
-			return dispatch(setSnackbar$2(getSnackbarMessage(skipped, count)));
+			return dispatch(setSnackbar$2(getSnackbarMessage(skipped, count, failed)));
 		});
 	});
 });