@northern.tech/store 0.30.1 → 0.30.2

package/dist/thunks.js

@@ -14,7 +14,7 @@ import { getFeatures, getHostedAnnouncement, getSearchState } from "./appSlice/s
 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, getComparisonCompatibleVersion, mapDeviceAttributes, mapFiltersToTerms, mapTermsToFilters, mergePermissions, parseSubscriptionPreview, progress } from "./utils.js";
+import { convertDeviceListStateToFilters, convertToBackendSPLimits, extractErrorMessage as extractErrorMessage$1, filtersFilter, getComparisonCompatibleVersion, 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";
@@ -220,12 +220,45 @@ const trackDeploymentCreation = (totalDeploymentCount, hasDeployments, trial_exp
 		});
 	}
 };
+const cleanPhases = (phases) => phases?.map(({ batch_size, batch_size_devices, start_ts }) => stripUndefined({
+	batch_size,
+	batch_size_devices,
+	start_ts
+}));
 const MAX_PREVIOUS_PHASES_COUNT = 5;
 const createDeployment = createAppAsyncThunk(`${sliceName$1}/createDeployment`, ({ newDeployment, hasNewRetryDefault = false }, { dispatch, getState }) => {
 	let request;
-	if ("filter_id" in newDeployment && newDeployment.filter_id) request = Api.post(`${deploymentsApiUrlV2}/deployments`, newDeployment);
-	else if ("group" in newDeployment && newDeployment.group) request = Api.post(`${deploymentsApiUrl}/deployments/group/${newDeployment.group}`, newDeployment);
-	else request = Api.post(`${deploymentsApiUrl}/deployments`, newDeployment);
+	const { name, artifact_name, retries, update_control_map, autogenerate_delta } = newDeployment;
+	const common = stripUndefined({
+		name,
+		artifact_name,
+		phases: cleanPhases(newDeployment.phases),
+		retries,
+		update_control_map,
+		autogenerate_delta
+	});
+	if ("filter_id" in newDeployment && newDeployment.filter_id) {
+		const { filter_id, max_devices } = newDeployment;
+		request = Api.post(`${deploymentsApiUrlV2}/deployments`, stripUndefined({
+			...common,
+			filter_id,
+			max_devices
+		}));
+	} else if ("group" in newDeployment && newDeployment.group) {
+		const { force_installation, group } = newDeployment;
+		request = Api.post(`${deploymentsApiUrl}/deployments/group/${group}`, stripUndefined({
+			...common,
+			force_installation
+		}));
+	} else {
+		const { devices, all_devices, force_installation } = newDeployment;
+		request = Api.post(`${deploymentsApiUrl}/deployments`, stripUndefined({
+			...common,
+			devices,
+			all_devices,
+			force_installation
+		}));
+	}
 	const totalDeploymentCount = Object.values(getDeploymentsByStatus$1(getState())).reduce((accu, item) => accu + item.total, 0);
 	const { hasDeployments } = getGlobalSettings$1(getState());
 	const { trial_expiration } = getOrganization(getState());
@@ -1610,10 +1643,11 @@ const getTargetLocation = (key) => {
 };
 const devLocations = ["localhost", "docker.mender.io"];
 const createOrganizationTrial = createAppAsyncThunk(`${sliceName$4}/createOrganizationTrial`, async (data, { dispatch }) => {
-	const { key } = locations[data.location];
+	const { location, tos: _tos, ...trialPayload } = data;
+	const { key } = locations[location];
 	const targetLocation = getTargetLocation(key);
 	const target = `${targetLocation}${tenantadmApiUrlv2}/tenants/trial`;
-	const { headers } = await Api.postUnauthorized(target, data).catch((err) => {
+	const { headers } = await Api.postUnauthorized(target, trialPayload).catch((err) => {
 		if (err.response?.status >= 400 && err.response?.status < 500) dispatch(setSnackbar$1({
 			message: err.response.data.error,
 			autoHideDuration: TIMEOUTS.fiveSeconds
@@ -2033,10 +2067,18 @@ const removeUser = createAppAsyncThunk(`${sliceName$5}/removeUser`, (userId, { d
 	dispatch(getUserList()),
 	dispatch(setSnackbar(userActions.remove.successMessage))
 ])).catch((err) => userActionErrorHandler(err, "remove", dispatch)));
-const editUser = createAppAsyncThunk(`${sliceName$5}/editUser`, ({ id, ...userData }, { dispatch, getState }) => Api.put(`${useradmApiUrl}/users/${id}`, userData).then(() => Promise.all([dispatch(actions$5.updatedUser({
-	...userData,
-	id: id === "me" ? getCurrentUser(getState()).id : id
-})), dispatch(setSnackbar(userActions.edit.successMessage))])).catch((err) => userActionErrorHandler(err, "edit", dispatch)));
+const editUser = createAppAsyncThunk(`${sliceName$5}/editUser`, ({ id, email, password, current_password, roles }, { dispatch, getState }) => {
+	const userData = stripUndefined({
+		email,
+		password,
+		current_password,
+		roles
+	});
+	return Api.put(`${useradmApiUrl}/users/${id}`, userData).then(() => Promise.all([dispatch(actions$5.updatedUser({
+		...userData,
+		id: id === "me" ? getCurrentUser(getState()).id : id
+	})), dispatch(setSnackbar(userActions.edit.successMessage))])).catch((err) => userActionErrorHandler(err, "edit", dispatch));
+});
 const checkEmailExists = createAppAsyncThunk(`${sliceName$5}/checkEmailExists`, async (email) => {
 	return (await Api.get(`${useradmApiUrl}/users/exists?email=${encodeURIComponent(email)}`)).data.exists;
 });