@northern.tech/store 0.46.4 → 0.47.0

package/dist/thunks.js

@@ -1,5 +1,5 @@
 import { ADDONS, PLANS, locations } from "./appSlice/constants.js";
-import { A as iotManagerBaseURL, B as tenantadmApiUrlv2, C as deviceConnect, D as inventoryApiUrl, E as headerNames, Ft as UNGROUPED_GROUP, H as uiPermissionsByArea, I as scopedPermissionAreas, J as READ_STATES, K as useradmApiUrlv2, M as maxSessionAge, O as inventoryApiUrlV2, P as rolesById, Pt as TIMEOUTS, Q as settingsKeys, R as ssoIdpApiUrlv1, S as deviceConfig, T as emptyUiPermissions, U as uiPermissionsById, V as twoFAStates, W as useradmApiUrl, Y as USER_LOGOUT, Z as itemUiPermissionsReducer, _ as defaultPermissionSets, _t as DEPLOYMENT_STATES, a as APPLICATION_JWT_CONTENT_TYPE, b as deploymentsApiUrlV2, d as PermissionTypes, f as SORTING_OPTIONS, g as auditLogsApiUrl, gt as DEPLOYMENT_ROUTES, i as APPLICATION_JSON_CONTENT_TYPE, jt as EXTERNAL_PROVIDER, k as inventoryApiUrlV2alpha1, l as DEVICE_LIST_DEFAULTS, m as apiRoot, n as ALL_DEVICE_STATES, nt as SSO_TYPES, r as ALL_SOFTWARE, rt as TENANT_LIST_DEFAULT, s as DEVICE_FILTERING_OPTIONS, u as DEVICE_STATES, v as deploymentsApiUrl, vt as DEPLOYMENT_TYPES, w as emptyRole, x as deviceAuthV2, xt as deploymentPrototype } from "./constants-D5hACLhF.js";
+import { A as iotManagerBaseURL, B as tenantadmApiUrlv2, C as deviceConnect, D as inventoryApiUrl, E as headerNames, Ft as UNGROUPED_GROUP, H as uiPermissionsByArea, I as scopedPermissionAreas, J as READ_STATES, K as useradmApiUrlv2, M as maxSessionAge, O as inventoryApiUrlV2, P as rolesById, Q as settingsKeys, R as ssoIdpApiUrlv1, S as deviceConfig, T as emptyUiPermissions, U as uiPermissionsById, V as twoFAStates, W as useradmApiUrl, Y as USER_LOGOUT, Z as itemUiPermissionsReducer, _ as defaultPermissionSets, _t as DEPLOYMENT_STATES, a as APPLICATION_JWT_CONTENT_TYPE, b as deploymentsApiUrlV2, d as PermissionTypes, f as SORTING_OPTIONS, g as auditLogsApiUrl, gt as DEPLOYMENT_ROUTES, i as APPLICATION_JSON_CONTENT_TYPE, jt as EXTERNAL_PROVIDER, k as inventoryApiUrlV2alpha1, l as DEVICE_LIST_DEFAULTS, m as apiRoot, n as ALL_DEVICE_STATES, nt as SSO_TYPES, r as ALL_SOFTWARE, rt as TENANT_LIST_DEFAULT, s as DEVICE_FILTERING_OPTIONS, u as DEVICE_STATES, v as deploymentsApiUrl, vt as DEPLOYMENT_TYPES, w as emptyRole, x as deviceAuthV2, xt as deploymentPrototype } from "./constants-DjiC_FnZ.js";
 import { onboardingSteps, orderedOnboardingSteps } from "./onboardingSlice/constants.js";
 import { rootfsImageVersion } from "./releasesSlice/constants.js";
 import { actions } from "./appSlice/index.js";
@@ -22,6 +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 { TIMEOUTS } from "@northern.tech/utils/constants";
 import { attributeDuplicateFilter, customSort, dateRangeToUnix, deepCompare, duplicateFilter, extractErrorMessage, getDemoDeviceAddress, isEmpty, standardizePhases } from "@northern.tech/utils/helpers";
 import Cookies from "universal-cookie";
 import dayjs from "dayjs";
@@ -1800,23 +1801,15 @@ const getIntegrations = createAppAsyncThunk(`${sliceName$4}/getIntegrations`, (_
 	}, []);
 	return Promise.resolve(dispatch(actions$4.receiveExternalDeviceIntegrations(integrations)));
 }));
-const getWebhookEvents = createAppAsyncThunk(`${sliceName$4}/getWebhookEvents`, (config = {}, { dispatch, getState }) => {
-	const { integrationId, isFollowUp, knownTotal = 0, page = defaultPage, perPage = defaultPerPage } = config;
+const getWebhookEvents = createAppAsyncThunk(`${sliceName$4}/getWebhookEvents`, async (config = {}, { dispatch }) => {
+	const { integrationId, page = defaultPage, perPage = defaultPerPage } = config;
 	const integrationFilter = integrationId ? `&integration_id=${integrationId}` : "";
-	return Api.get(`${iotManagerBaseURL}/events?page=${page}&per_page=${perPage}${integrationFilter}`).catch((err) => commonErrorHandler(err, "There was an error retrieving activity for this integration", dispatch, commonErrorFallback)).then(({ data }) => {
-		const tasks = [Promise.resolve(dispatch(actions$4.receiveWebhookEvents({
-			value: isFollowUp ? getState().organization.webhooks.events : data,
-			total: isFollowUp ? knownTotal + data.length : (page - 1) * perPage + data.length
-		})))];
-		if (data.length >= perPage && !isFollowUp) tasks.push(dispatch(getWebhookEvents({
-			integrationId,
-			isFollowUp: true,
-			knownTotal: page * perPage,
-			page: page + 1,
-			perPage: 1
-		})));
-		return Promise.all(tasks);
-	});
+	const { data, headers } = await Api.get(`${iotManagerBaseURL}/events?page=${page}&per_page=${perPage}${integrationFilter}`).catch((err) => commonErrorHandler(err, "There was an error retrieving activity for this integration", dispatch, commonErrorFallback));
+	const total = Number(headers[headerNames.total] || data.length);
+	return dispatch(actions$4.receiveWebhookEvents({
+		value: data,
+		total
+	}));
 });
 const ssoConfigActions = {
 	create: {