@plusscommunities/pluss-maintenance-web-forms 1.1.37-beta.3 → 1.1.37-beta.4

package/dist/index.cjs.js

@@ -5850,6 +5850,7 @@ const AnalyticsHub = _ref => {
   }, [startTime, endTime, userType, userCategory, selectedSites]);
   const getData = async () => {
     try {
+      setFailedSites([]);
       if (comparisonMode) {
         setComparisonData({
           requests: [],
@@ -5984,7 +5985,8 @@ const AnalyticsHub = _ref => {
   }, "Export CSV")), failedSites.length > 0 && /*#__PURE__*/React__default["default"].createElement(Components.Text, {
     type: "help",
     style: {
-      color: Colours.COLOUR_RED
+      color: Colours.COLOUR_RED,
+      marginTop: 8
     }
   }, "Data unavailable for: ", failedSites.join(", ")), /*#__PURE__*/React__default["default"].createElement("div", {
     className: "analyticsSection dashboardSection_content"

package/dist/index.esm.js

@@ -5819,6 +5819,7 @@ const AnalyticsHub = _ref => {
   }, [startTime, endTime, userType, userCategory, selectedSites]);
   const getData = async () => {
     try {
+      setFailedSites([]);
       if (comparisonMode) {
         setComparisonData({
           requests: [],
@@ -5953,7 +5954,8 @@ const AnalyticsHub = _ref => {
   }, "Export CSV")), failedSites.length > 0 && /*#__PURE__*/React.createElement(Components.Text, {
     type: "help",
     style: {
-      color: Colours.COLOUR_RED
+      color: Colours.COLOUR_RED,
+      marginTop: 8
     }
   }, "Data unavailable for: ", failedSites.join(", ")), /*#__PURE__*/React.createElement("div", {
     className: "analyticsSection dashboardSection_content"

package/dist/index.umd.js

@@ -5839,6 +5839,7 @@
     }, [startTime, endTime, userType, userCategory, selectedSites]);
     const getData = async () => {
       try {
+        setFailedSites([]);
         if (comparisonMode) {
           setComparisonData({
             requests: [],
@@ -5973,7 +5974,8 @@
     }, "Export CSV")), failedSites.length > 0 && /*#__PURE__*/React__default["default"].createElement(Components.Text, {
       type: "help",
       style: {
-        color: Colours.COLOUR_RED
+        color: Colours.COLOUR_RED,
+        marginTop: 8
       }
     }, "Data unavailable for: ", failedSites.join(", ")), /*#__PURE__*/React__default["default"].createElement("div", {
       className: "analyticsSection dashboardSection_content"

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@plusscommunities/pluss-maintenance-web-forms",
-	"version": "1.1.37-beta.3",
+	"version": "1.1.37-beta.4",
 	"description": "Extension package to enable maintenance on Pluss Communities Platform",
 	"main": "dist/index.cjs.js",
 	"scripts": {

package/src/components/AnalyticsHub.js

@@ -81,107 +81,112 @@ const AnalyticsHub = ({
 
 	const getData = async () => {
 		try {
-		if (comparisonMode) {
-			setComparisonData({
-				requests: [],
-				completedRequests: [],
-				comments: [],
-				isLoading: true,
-			});
-			const multiSiteResultsObj = await Analytics.fetchMultiSiteData(
-				selectedSites,
-				async (site) => {
-					const { data } = await analyticsActions.getAggregateEntityStats(
+			setFailedSites([]);
+			if (comparisonMode) {
+				setComparisonData({
+					requests: [],
+					completedRequests: [],
+					comments: [],
+					isLoading: true,
+				});
+				const multiSiteResultsObj = await Analytics.fetchMultiSiteData(
+					selectedSites,
+					async (site) => {
+						const { data } = await analyticsActions.getAggregateEntityStats(
+							site,
+							values.analyticsKey,
+							startTime,
+							endTime,
+							true,
+							{ userType, userCategory },
+						);
+						return data;
+					},
+				);
+				const roles = auth.user.Roles;
+				const failed = Object.entries(multiSiteResultsObj)
+					.filter(([, data]) => data === null)
+					.map(([site]) => Helper.getSiteNameFromRoles(site, roles));
+				setFailedSites(failed);
+				const multiSiteResults = Object.entries(multiSiteResultsObj)
+					.filter(([, data]) => data !== null)
+					.map(([site, data]) => ({ site, data }));
+				const buildComparison = (activityKey, countType) =>
+					multiSiteResults.map((result) => ({
+						name: Helper.getSiteNameFromRoles(result.site, roles),
+						value: Analytics.countActivities(
+							result.data,
+							activityKey,
+							countType,
+						),
+					}));
+				setComparisonData({
+					requests: buildComparison("Request", "total"),
+					completedRequests: buildComparison("RequestCompleted", "unique"),
+					comments: buildComparison("Comment", "total"),
+					isLoading: false,
+				});
+			} else {
+				setAnalyticsData(getInitialState());
+				const site =
+					selectedSites && selectedSites.length === 1
+						? selectedSites[0]
+						: auth.site;
+				const timeDifference = endTime - startTime;
+				const [currentStatsResponse, prevStatsResponse] = await Promise.all([
+					analyticsActions.getAggregateEntityStats(
 						site,
 						values.analyticsKey,
 						startTime,
 						endTime,
 						true,
 						{ userType, userCategory },
-					);
-					return data;
-				},
-			);
-			const roles = auth.user.Roles;
-			const failed = Object.entries(multiSiteResultsObj)
-				.filter(([, data]) => data === null)
-				.map(([site]) => Helper.getSiteNameFromRoles(site, roles));
-			setFailedSites(failed);
-			const multiSiteResults = Object.entries(multiSiteResultsObj)
-				.filter(([, data]) => data !== null)
-				.map(([site, data]) => ({ site, data }));
-			const buildComparison = (activityKey, countType) =>
-				multiSiteResults.map((result) => ({
-					name: Helper.getSiteNameFromRoles(result.site, roles),
-					value: Analytics.countActivities(result.data, activityKey, countType),
-				}));
-			setComparisonData({
-				requests: buildComparison("Request", "total"),
-				completedRequests: buildComparison("RequestCompleted", "unique"),
-				comments: buildComparison("Comment", "total"),
-				isLoading: false,
-			});
-		} else {
-			setAnalyticsData(getInitialState());
-			const site =
-				selectedSites && selectedSites.length === 1
-					? selectedSites[0]
-					: auth.site;
-			const timeDifference = endTime - startTime;
-			const [currentStatsResponse, prevStatsResponse] = await Promise.all([
-				analyticsActions.getAggregateEntityStats(
-					site,
-					values.analyticsKey,
-					startTime,
-					endTime,
-					true,
-					{ userType, userCategory },
-				),
-				analyticsActions.getAggregateEntityStats(
-					site,
-					values.analyticsKey,
-					startTime - timeDifference,
-					startTime,
-					true,
-					{ userType, userCategory },
-				),
-			]);
+					),
+					analyticsActions.getAggregateEntityStats(
+						site,
+						values.analyticsKey,
+						startTime - timeDifference,
+						startTime,
+						true,
+						{ userType, userCategory },
+					),
+				]);
 
-			const data = {
-				requests: Analytics.countActivities(
-					currentStatsResponse.data,
-					"Request",
-					"total",
-				),
-				prevRequests: Analytics.countActivities(
-					prevStatsResponse.data,
-					"Request",
-					"total",
-				),
-				completedRequests: Analytics.countActivities(
-					currentStatsResponse.data,
-					"RequestCompleted",
-					"unique",
-				),
-				prevCompletedRequests: Analytics.countActivities(
-					prevStatsResponse.data,
-					"RequestCompleted",
-					"unique",
-				),
-				comments: Analytics.countActivities(
-					currentStatsResponse.data,
-					"Comment",
-					"total",
-				),
-				prevComments: Analytics.countActivities(
-					prevStatsResponse.data,
-					"Comment",
-					"total",
-				),
-				isLoading: false,
-			};
-			setAnalyticsData(data);
-		}
+				const data = {
+					requests: Analytics.countActivities(
+						currentStatsResponse.data,
+						"Request",
+						"total",
+					),
+					prevRequests: Analytics.countActivities(
+						prevStatsResponse.data,
+						"Request",
+						"total",
+					),
+					completedRequests: Analytics.countActivities(
+						currentStatsResponse.data,
+						"RequestCompleted",
+						"unique",
+					),
+					prevCompletedRequests: Analytics.countActivities(
+						prevStatsResponse.data,
+						"RequestCompleted",
+						"unique",
+					),
+					comments: Analytics.countActivities(
+						currentStatsResponse.data,
+						"Comment",
+						"total",
+					),
+					prevComments: Analytics.countActivities(
+						prevStatsResponse.data,
+						"Comment",
+						"total",
+					),
+					isLoading: false,
+				};
+				setAnalyticsData(data);
+			}
 		} catch (err) {
 			if (comparisonMode) {
 				setComparisonData((prev) => ({ ...prev, isLoading: false }));
@@ -266,7 +271,7 @@ const AnalyticsHub = ({
 				</Components.Button>
 			</div>
 			{failedSites.length > 0 && (
-				<Components.Text type="help" style={{ color: Colours.COLOUR_RED }}>
+				<Components.Text type="help" style={{ color: Colours.COLOUR_RED, marginTop: 8 }}>
 					Data unavailable for: {failedSites.join(", ")}
 				</Components.Text>
 			)}