@northern.tech/store 0.36.2 → 0.36.3

package/dist/thunks.js

@@ -14,7 +14,7 @@ import { getHostedAnnouncement, getSearchState } from "./appSlice/selectors.js";
 import { getDeploymentsById, getDeploymentsByStatus as getDeploymentsByStatus$1 } from "./deploymentsSlice/selectors.js";
 import { getAcceptedDevices, getDeviceById as getDeviceById$1, getDeviceCountsByStatus, getDeviceFilters, getDeviceListState, getDeviceReports, getDevicesById, getGroupsById, getSelectedGroup } from "./devicesSlice/selectors.js";
 import { getAuditlogState, getDeviceTwinIntegrations, getOrganization, getSpLimits, getTenantsList } from "./organizationSlice/selectors.js";
-import { convertDeviceListStateToFilters, convertToBackendSPLimits, extractErrorMessage as extractErrorMessage$1, filtersFilter, mapDeviceAttributes, mapFiltersToTerms, mapTermsToFilters, mergePermissions, parseSubscriptionPreview, progress, stripUndefined } from "./utils.js";
+import { convertDeviceListStateToFilters, convertToBackendSPLimits, dispatchDelayed, extractErrorMessage as extractErrorMessage$1, filtersFilter, mapDeviceAttributes, mapFiltersToTerms, mapTermsToFilters, mergePermissions, parseSubscriptionPreview, progress, stripUndefined } from "./utils.js";
 import { getCurrentUser, getGlobalSettings as getGlobalSettings$1, getIdAttribute, getOfflineThresholdSettings, getRolesById, getSelectedDeviceAttribute, getTooltipsState, getUserSettings as getUserSettings$1, getUsersById } from "./usersSlice/selectors.js";
 import { getDeviceReportsForUser, getOnboardingState as getOnboardingState$1, getTenantCapabilities, getUserCapabilities } from "./commonSelectors.js";
 import { commonErrorFallback, commonErrorHandler, createAppAsyncThunk } from "./store.js";
@@ -1048,7 +1048,7 @@ const initializeDistributionData = (report, groups, devices, totalDeviceCount) =
 	const { deviceIds, total = 0 } = groups[group] || {};
 	const distributionByAttribute = (deviceIds ? deviceIds.map((id) => devices[id]) : Object.values(devices)).reduce((accu, item) => {
 		if (!item.attributes || item.status !== DEVICE_STATES.accepted) return accu;
-		const attributeValue = item.attributes[effectiveAttribute];
+		const attributeValue = item.attributes[effectiveAttribute] ?? "";
 		if (!accu[attributeValue]) accu[attributeValue] = 0;
 		accu[attributeValue] = accu[attributeValue] + 1;
 		return accu;
@@ -1085,6 +1085,7 @@ const getReportDataWithoutBackendSupport = createAppAsyncThunk(`${sliceName$2}/g
 	const acceptedDevices = getAcceptedDevices(getState());
 	const { accepted: acceptedDevicesCount } = getDeviceCountsByStatus(getState());
 	const { deviceIds = [], filters = [], total = 0 } = getGroupsById(getState())[group] || {};
+	const hasAttributeData = (group ? deviceIds : acceptedDevices.deviceIds).every((id) => devicesById[id]?.attributes?.[effectiveAttribute] !== void 0);
 	let groupDevicesRequest = Promise.resolve({ payload: {
 		groupName: "",
 		group: {
@@ -1092,14 +1093,14 @@ const getReportDataWithoutBackendSupport = createAppAsyncThunk(`${sliceName$2}/g
 			total: Object.keys(devicesById).length
 		}
 	} });
-	if (group && (!(deviceIds.length && total) || deviceIds.length !== total || !deviceIds.every((id) => !!devicesById[id]))) groupDevicesRequest = filters.length ? dispatch(getAllDynamicGroupDevices({
+	if (group && (!(deviceIds.length && total) || deviceIds.length !== total || !deviceIds.every((id) => !!devicesById[id]) || !hasAttributeData)) groupDevicesRequest = filters.length ? dispatch(getAllDynamicGroupDevices({
 		group,
 		attribute: effectiveAttribute
 	})).unwrap() : dispatch(getAllGroupDevices({
 		group,
 		attribute: effectiveAttribute
 	})).unwrap();
-	else if (!group && (acceptedDevices.deviceIds.length !== acceptedDevicesCount || !acceptedDevices.deviceIds.every((id) => !!devicesById[id]))) groupDevicesRequest = dispatch(getAllDevicesByStatus({
+	else if (!group && (acceptedDevices.deviceIds.length !== acceptedDevicesCount || !acceptedDevices.deviceIds.every((id) => !!devicesById[id]) || !hasAttributeData)) groupDevicesRequest = dispatch(getAllDevicesByStatus({
 		status: DEVICE_STATES.accepted,
 		attribute: effectiveAttribute
 	})).unwrap();
@@ -1244,7 +1245,12 @@ const applyDeviceConfig = createAppAsyncThunk(`${sliceName$2}/applyDeviceConfig`
 			...device.config,
 			deployment_id: data.deployment_id
 		}
-	}))), new Promise((resolve) => setTimeout(() => resolve(dispatch(getSingleDeployment(data.deployment_id))), TIMEOUTS.oneSecond))];
+	})))];
+	dispatchDelayed({
+		action: getSingleDeployment(data.deployment_id),
+		delay: TIMEOUTS.oneSecond,
+		dispatch
+	});
 	if (isDefault && canManageUsers) {
 		const { previous } = getGlobalSettings$1(getState()).defaultDeviceConfig ?? {};
 		tasks.push(dispatch(saveGlobalSettings({ defaultDeviceConfig: {
@@ -1701,7 +1707,14 @@ const addTenant = createAppAsyncThunk(`${sliceName$4}/createTenant`, (selectionS
 	return Api.post(`${tenantadmApiUrlv2}/tenants`, {
 		...rest,
 		device_limits
-	}).then(() => Promise.all([dispatch(setSnackbar$1("Tenant was created successfully.")), new Promise((resolve) => setTimeout(() => resolve(dispatch(getTenants())), TIMEOUTS.oneSecond))])).catch((err) => commonErrorHandler(err, "There was an error creating tenant", dispatch, commonErrorFallback));
+	}).then(() => {
+		dispatch(setSnackbar$1("Tenant was created successfully."));
+		dispatchDelayed({
+			action: getTenants(),
+			delay: TIMEOUTS.oneSecond,
+			dispatch
+		});
+	}).catch((err) => commonErrorHandler(err, "There was an error creating tenant", dispatch, commonErrorFallback));
 });
 const tenantListRetrieval = async (config) => {
 	const { page, perPage } = config;
@@ -1744,19 +1757,27 @@ const editTenant = createAppAsyncThunk(`${sliceName$4}/editDeviceLimit`, ({ devi
 	return Api.put(`${tenantadmApiUrlv2}/tenants/${id}/child`, {
 		device_limits,
 		name
-	}).catch((err) => commonErrorHandler(err, `Device Limit cannot be changed`, dispatch)).then(() => Promise.all([
-		dispatch(setSnackbar$1("Tenant was changed successfully")),
-		dispatch(getUserOrganization()),
-		new Promise((resolve) => setTimeout(() => resolve(dispatch(getTenants())), TIMEOUTS.oneSecond))
-	]));
+	}).catch((err) => commonErrorHandler(err, `Device Limit cannot be changed`, dispatch)).then(() => {
+		dispatch(setSnackbar$1("Tenant was changed successfully"));
+		dispatch(getUserOrganization());
+		dispatchDelayed({
+			action: getTenants(),
+			delay: TIMEOUTS.oneSecond,
+			dispatch
+		});
+	});
 });
 const editBillingProfile = createAppAsyncThunk(`${sliceName$4}/editBillingProfileEmail`, ({ billingProfile }, { dispatch }) => Api.patch(`${tenantadmApiUrlv2}/billing/profile`, billingProfile).catch((err) => commonErrorHandler(err, `Failed to change billing profile`, dispatch)).then(() => Promise.all([dispatch(setSnackbar$1("Billing Profile was changed successfully")), dispatch(getUserBilling())])));
 const createBillingProfile = createAppAsyncThunk(`${sliceName$4}/createBillingProfileEmail`, ({ billingProfile }, { dispatch }) => Api.post(`${tenantadmApiUrlv2}/billing/profile`, billingProfile).catch((err) => commonErrorHandler(err, `Failed to create billing profile`, dispatch)).then(() => Promise.all([dispatch(setSnackbar$1("Billing Profile was created successfully")), dispatch(getUserBilling())])));
-const removeTenant = createAppAsyncThunk(`${sliceName$4}/editDeviceLimit`, ({ id }, { dispatch }) => Api.post(`${tenantadmApiUrlv2}/tenants/${id}/remove/start`).catch((err) => commonErrorHandler(err, `There was an error removing the tenant`, dispatch)).then(() => Promise.all([
-	dispatch(setSnackbar$1("The tenant was removed successfully")),
-	dispatch(getUserOrganization()),
-	new Promise((resolve) => setTimeout(() => resolve(dispatch(getTenants())), TIMEOUTS.oneSecond))
-])));
+const removeTenant = createAppAsyncThunk(`${sliceName$4}/editDeviceLimit`, ({ id }, { dispatch }) => Api.post(`${tenantadmApiUrlv2}/tenants/${id}/remove/start`).catch((err) => commonErrorHandler(err, `There was an error removing the tenant`, dispatch)).then(async () => {
+	dispatch(setSnackbar$1("The tenant was removed successfully"));
+	await dispatch(getUserOrganization()).unwrap();
+	dispatchDelayed({
+		action: getTenants(),
+		delay: TIMEOUTS.oneSecond,
+		dispatch
+	});
+}));
 const getUserOrganization = createAppAsyncThunk(`${sliceName$4}/getUserOrganization`, (_, { dispatch, getState }) => Api.get(`${tenantadmApiUrlv1}/user/tenant?tiers=true`).then((res) => {
 	const { addons, plan, trial } = res.data;
 	const { addons: currentAddons, id: currentId, plan: currentPlan, trial: currentTrial } = getOrganization(getState());
@@ -2455,7 +2476,10 @@ const setAllTooltipsReadState = createAppAsyncThunk(`${sliceName$5}/toggleHelpti
 const submitUserFeedback = createAppAsyncThunk(`${sliceName$5}/submitFeedback`, ({ formId, feedback }, { dispatch }) => Api.post(`${useradmApiUrlv2}/support/feedback/${formId}`, feedback).then(() => {
 	if (formId === "product") {
 		dispatch(saveUserSettings({ feedbackCollectedAt: (/* @__PURE__ */ new Date()).toISOString().split("T")[0] }));
-		setTimeout(() => dispatch(actions$5.setShowFeedbackDialog(false)), TIMEOUTS.threeSeconds);
+		dispatchDelayed({
+			action: actions$5.setShowFeedbackDialog(false),
+			dispatch
+		});
 	}
 }));
 //#endregion