@plusscommunities/pluss-maintenance-web-forms 1.1.37-beta.0 → 1.1.37-beta.2

package/dist/index.cjs.js

@@ -5802,6 +5802,7 @@ const AnalyticsHub = _ref => {
   } = _ref;
   const [analyticsData, setAnalyticsData] = React.useState(getInitialState());
   const [isExportOpen, setIsExportOpen] = React.useState(false);
+  const [failedSites, setFailedSites] = React.useState([]);
   const [comparisonData, setComparisonData] = React.useState({
     requests: [],
     completedRequests: [],
@@ -5822,7 +5823,10 @@ const AnalyticsHub = _ref => {
   const exportColumns = [{
     label: "Select All",
     key: ""
-  }, {
+  }, ...(comparisonMode ? [{
+    label: "Site",
+    key: "site"
+  }] : []), {
     label: "Start Date",
     key: "startDate"
   }, {
@@ -5858,14 +5862,25 @@ const AnalyticsHub = _ref => {
         });
         return data;
       });
-      const multiSiteResults = Object.entries(multiSiteResultsObj).map(_ref2 => {
-        let [site, data] = _ref2;
+      const roles = auth.user.Roles;
+      const failed = Object.entries(multiSiteResultsObj).filter(_ref2 => {
+        let [, data] = _ref2;
+        return data === null;
+      }).map(_ref3 => {
+        let [site] = _ref3;
+        return Helper.getSiteNameFromRoles(site, roles);
+      });
+      setFailedSites(failed);
+      const multiSiteResults = Object.entries(multiSiteResultsObj).filter(_ref4 => {
+        let [, data] = _ref4;
+        return data !== null;
+      }).map(_ref5 => {
+        let [site, data] = _ref5;
         return {
           site,
           data
         };
       });
-      const roles = auth.user.Roles;
       const buildComparison = (activityKey, countType) => multiSiteResults.map(result => ({
         name: Helper.getSiteNameFromRoles(result.site, roles),
         value: Analytics$1.countActivities(result.data, activityKey, countType)
@@ -5903,6 +5918,17 @@ const AnalyticsHub = _ref => {
     return comparisonMode ? !comparisonData.isLoading : !analyticsData.isLoading;
   };
   const getExportSource = () => {
+    if (comparisonMode) {
+      const sites = comparisonData.requests || [];
+      return sites.map((site, i) => ({
+        site: site.name,
+        startDate: moment__default["default"](startTime + 1).format("D-MM-YYYY"),
+        endDate: moment__default["default"](endTime).format("D-MM-YYYY"),
+        requests: site.value,
+        completedRequests: comparisonData.completedRequests[i] && comparisonData.completedRequests[i].value || 0,
+        comments: comparisonData.comments[i] && comparisonData.comments[i].value || 0
+      }));
+    }
     return [{
       startDate: moment__default["default"](startTime + 1).format("D-MM-YYYY"),
       endDate: moment__default["default"](endTime).format("D-MM-YYYY"),
@@ -5916,13 +5942,14 @@ const AnalyticsHub = _ref => {
       return null;
     }
     const source = getExportSource();
+    const filterSuffix = [userType, userCategory].filter(Boolean).map(f => f.toLowerCase().replace(/\s+/g, '-')).join('_');
     return /*#__PURE__*/React__default["default"].createElement(Components.ExportCsvPopup, {
       onClose: () => {
         setIsExportOpen(false);
       },
       columns: exportColumns,
       source: source,
-      filename: "".concat(values.analyticsKey, "analytics_").concat(source[0].startDate, "_").concat(source[0].endDate, ".csv")
+      filename: "".concat(values.analyticsKey, "analytics").concat(comparisonMode ? '_comparison' : '').concat(filterSuffix ? "_".concat(filterSuffix) : '', "_").concat(source[0].startDate, "_").concat(source[0].endDate, ".csv")
     });
   };
   return /*#__PURE__*/React__default["default"].createElement("div", {
@@ -5939,7 +5966,12 @@ const AnalyticsHub = _ref => {
     },
     isActive: isReadyToOpenCSV(),
     leftIcon: "file-code-o"
-  }, "Export CSV")), /*#__PURE__*/React__default["default"].createElement("div", {
+  }, "Export CSV")), failedSites.length > 0 && /*#__PURE__*/React__default["default"].createElement(Components.Text, {
+    type: "help",
+    style: {
+      color: '#c02743'
+    }
+  }, "Data unavailable for: ", failedSites.join(', ')), /*#__PURE__*/React__default["default"].createElement("div", {
     className: "analyticsSection dashboardSection_content"
   }, (() => {
     const chartSuffix = [selectedSites && selectedSites.length > 0 ? "&sites=".concat(selectedSites.join(",")) : "", userType ? "&userType=".concat(encodeURIComponent(userType)) : "", userCategory ? "&userCategory=".concat(encodeURIComponent(userCategory)) : ""].join("");

package/dist/index.esm.js

@@ -5771,6 +5771,7 @@ const AnalyticsHub = _ref => {
   } = _ref;
   const [analyticsData, setAnalyticsData] = useState(getInitialState());
   const [isExportOpen, setIsExportOpen] = useState(false);
+  const [failedSites, setFailedSites] = useState([]);
   const [comparisonData, setComparisonData] = useState({
     requests: [],
     completedRequests: [],
@@ -5791,7 +5792,10 @@ const AnalyticsHub = _ref => {
   const exportColumns = [{
     label: "Select All",
     key: ""
-  }, {
+  }, ...(comparisonMode ? [{
+    label: "Site",
+    key: "site"
+  }] : []), {
     label: "Start Date",
     key: "startDate"
   }, {
@@ -5827,14 +5831,25 @@ const AnalyticsHub = _ref => {
         });
         return data;
       });
-      const multiSiteResults = Object.entries(multiSiteResultsObj).map(_ref2 => {
-        let [site, data] = _ref2;
+      const roles = auth.user.Roles;
+      const failed = Object.entries(multiSiteResultsObj).filter(_ref2 => {
+        let [, data] = _ref2;
+        return data === null;
+      }).map(_ref3 => {
+        let [site] = _ref3;
+        return Helper.getSiteNameFromRoles(site, roles);
+      });
+      setFailedSites(failed);
+      const multiSiteResults = Object.entries(multiSiteResultsObj).filter(_ref4 => {
+        let [, data] = _ref4;
+        return data !== null;
+      }).map(_ref5 => {
+        let [site, data] = _ref5;
         return {
           site,
           data
         };
       });
-      const roles = auth.user.Roles;
       const buildComparison = (activityKey, countType) => multiSiteResults.map(result => ({
         name: Helper.getSiteNameFromRoles(result.site, roles),
         value: Analytics$1.countActivities(result.data, activityKey, countType)
@@ -5872,6 +5887,17 @@ const AnalyticsHub = _ref => {
     return comparisonMode ? !comparisonData.isLoading : !analyticsData.isLoading;
   };
   const getExportSource = () => {
+    if (comparisonMode) {
+      const sites = comparisonData.requests || [];
+      return sites.map((site, i) => ({
+        site: site.name,
+        startDate: moment(startTime + 1).format("D-MM-YYYY"),
+        endDate: moment(endTime).format("D-MM-YYYY"),
+        requests: site.value,
+        completedRequests: comparisonData.completedRequests[i] && comparisonData.completedRequests[i].value || 0,
+        comments: comparisonData.comments[i] && comparisonData.comments[i].value || 0
+      }));
+    }
     return [{
       startDate: moment(startTime + 1).format("D-MM-YYYY"),
       endDate: moment(endTime).format("D-MM-YYYY"),
@@ -5885,13 +5911,14 @@ const AnalyticsHub = _ref => {
       return null;
     }
     const source = getExportSource();
+    const filterSuffix = [userType, userCategory].filter(Boolean).map(f => f.toLowerCase().replace(/\s+/g, '-')).join('_');
     return /*#__PURE__*/React.createElement(Components.ExportCsvPopup, {
       onClose: () => {
         setIsExportOpen(false);
       },
       columns: exportColumns,
       source: source,
-      filename: "".concat(values.analyticsKey, "analytics_").concat(source[0].startDate, "_").concat(source[0].endDate, ".csv")
+      filename: "".concat(values.analyticsKey, "analytics").concat(comparisonMode ? '_comparison' : '').concat(filterSuffix ? "_".concat(filterSuffix) : '', "_").concat(source[0].startDate, "_").concat(source[0].endDate, ".csv")
     });
   };
   return /*#__PURE__*/React.createElement("div", {
@@ -5908,7 +5935,12 @@ const AnalyticsHub = _ref => {
     },
     isActive: isReadyToOpenCSV(),
     leftIcon: "file-code-o"
-  }, "Export CSV")), /*#__PURE__*/React.createElement("div", {
+  }, "Export CSV")), failedSites.length > 0 && /*#__PURE__*/React.createElement(Components.Text, {
+    type: "help",
+    style: {
+      color: '#c02743'
+    }
+  }, "Data unavailable for: ", failedSites.join(', ')), /*#__PURE__*/React.createElement("div", {
     className: "analyticsSection dashboardSection_content"
   }, (() => {
     const chartSuffix = [selectedSites && selectedSites.length > 0 ? "&sites=".concat(selectedSites.join(",")) : "", userType ? "&userType=".concat(encodeURIComponent(userType)) : "", userCategory ? "&userCategory=".concat(encodeURIComponent(userCategory)) : ""].join("");

package/dist/index.umd.js

@@ -5791,6 +5791,7 @@
     } = _ref;
     const [analyticsData, setAnalyticsData] = React.useState(getInitialState());
     const [isExportOpen, setIsExportOpen] = React.useState(false);
+    const [failedSites, setFailedSites] = React.useState([]);
     const [comparisonData, setComparisonData] = React.useState({
       requests: [],
       completedRequests: [],
@@ -5811,7 +5812,10 @@
     const exportColumns = [{
       label: "Select All",
       key: ""
-    }, {
+    }, ...(comparisonMode ? [{
+      label: "Site",
+      key: "site"
+    }] : []), {
       label: "Start Date",
       key: "startDate"
     }, {
@@ -5847,14 +5851,25 @@
           });
           return data;
         });
-        const multiSiteResults = Object.entries(multiSiteResultsObj).map(_ref2 => {
-          let [site, data] = _ref2;
+        const roles = auth.user.Roles;
+        const failed = Object.entries(multiSiteResultsObj).filter(_ref2 => {
+          let [, data] = _ref2;
+          return data === null;
+        }).map(_ref3 => {
+          let [site] = _ref3;
+          return Helper.getSiteNameFromRoles(site, roles);
+        });
+        setFailedSites(failed);
+        const multiSiteResults = Object.entries(multiSiteResultsObj).filter(_ref4 => {
+          let [, data] = _ref4;
+          return data !== null;
+        }).map(_ref5 => {
+          let [site, data] = _ref5;
           return {
             site,
             data
           };
         });
-        const roles = auth.user.Roles;
         const buildComparison = (activityKey, countType) => multiSiteResults.map(result => ({
           name: Helper.getSiteNameFromRoles(result.site, roles),
           value: Analytics$1.countActivities(result.data, activityKey, countType)
@@ -5892,6 +5907,17 @@
       return comparisonMode ? !comparisonData.isLoading : !analyticsData.isLoading;
     };
     const getExportSource = () => {
+      if (comparisonMode) {
+        const sites = comparisonData.requests || [];
+        return sites.map((site, i) => ({
+          site: site.name,
+          startDate: moment__default["default"](startTime + 1).format("D-MM-YYYY"),
+          endDate: moment__default["default"](endTime).format("D-MM-YYYY"),
+          requests: site.value,
+          completedRequests: comparisonData.completedRequests[i] && comparisonData.completedRequests[i].value || 0,
+          comments: comparisonData.comments[i] && comparisonData.comments[i].value || 0
+        }));
+      }
       return [{
         startDate: moment__default["default"](startTime + 1).format("D-MM-YYYY"),
         endDate: moment__default["default"](endTime).format("D-MM-YYYY"),
@@ -5905,13 +5931,14 @@
         return null;
       }
       const source = getExportSource();
+      const filterSuffix = [userType, userCategory].filter(Boolean).map(f => f.toLowerCase().replace(/\s+/g, '-')).join('_');
       return /*#__PURE__*/React__default["default"].createElement(Components.ExportCsvPopup, {
         onClose: () => {
           setIsExportOpen(false);
         },
         columns: exportColumns,
         source: source,
-        filename: "".concat(values.analyticsKey, "analytics_").concat(source[0].startDate, "_").concat(source[0].endDate, ".csv")
+        filename: "".concat(values.analyticsKey, "analytics").concat(comparisonMode ? '_comparison' : '').concat(filterSuffix ? "_".concat(filterSuffix) : '', "_").concat(source[0].startDate, "_").concat(source[0].endDate, ".csv")
       });
     };
     return /*#__PURE__*/React__default["default"].createElement("div", {
@@ -5928,7 +5955,12 @@
       },
       isActive: isReadyToOpenCSV(),
       leftIcon: "file-code-o"
-    }, "Export CSV")), /*#__PURE__*/React__default["default"].createElement("div", {
+    }, "Export CSV")), failedSites.length > 0 && /*#__PURE__*/React__default["default"].createElement(Components.Text, {
+      type: "help",
+      style: {
+        color: '#c02743'
+      }
+    }, "Data unavailable for: ", failedSites.join(', ')), /*#__PURE__*/React__default["default"].createElement("div", {
       className: "analyticsSection dashboardSection_content"
     }, (() => {
       const chartSuffix = [selectedSites && selectedSites.length > 0 ? "&sites=".concat(selectedSites.join(",")) : "", userType ? "&userType=".concat(encodeURIComponent(userType)) : "", userCategory ? "&userCategory=".concat(encodeURIComponent(userCategory)) : ""].join("");

package/package.json

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

package/src/components/AnalyticsHub.js

@@ -36,6 +36,7 @@ const AnalyticsHub = ({
 }) => {
 	const [analyticsData, setAnalyticsData] = useState(getInitialState());
 	const [isExportOpen, setIsExportOpen] = useState(false);
+	const [failedSites, setFailedSites] = useState([]);
 	const [comparisonData, setComparisonData] = useState({
 		requests: [],
 		completedRequests: [],
@@ -63,6 +64,7 @@ const AnalyticsHub = ({
 
 	const exportColumns = [
 		{ label: "Select All", key: "" },
+		...(comparisonMode ? [{ label: "Site", key: "site" }] : []),
 		{ label: "Start Date", key: "startDate" },
 		{ label: "End Date", key: "endDate" },
 		{ label: `${values.textSingularName}s`, key: "requests" },
@@ -99,10 +101,14 @@ const AnalyticsHub = ({
 					return data;
 				},
 			);
-			const multiSiteResults = Object.entries(multiSiteResultsObj).map(
-				([site, data]) => ({ site, 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),
@@ -184,6 +190,17 @@ const AnalyticsHub = ({
 	};
 
 	const getExportSource = () => {
+		if (comparisonMode) {
+			const sites = comparisonData.requests || [];
+			return sites.map((site, i) => ({
+				site: site.name,
+				startDate: moment(startTime + 1).format("D-MM-YYYY"),
+				endDate: moment(endTime).format("D-MM-YYYY"),
+				requests: site.value,
+				completedRequests: (comparisonData.completedRequests[i] && comparisonData.completedRequests[i].value) || 0,
+				comments: (comparisonData.comments[i] && comparisonData.comments[i].value) || 0,
+			}));
+		}
 		return [
 			{
 				startDate: moment(startTime + 1).format("D-MM-YYYY"),
@@ -200,6 +217,7 @@ const AnalyticsHub = ({
 			return null;
 		}
 		const source = getExportSource();
+		const filterSuffix = [userType, userCategory].filter(Boolean).map((f) => f.toLowerCase().replace(/\s+/g, '-')).join('_');
 		return (
 			<Components.ExportCsvPopup
 				onClose={() => {
@@ -207,7 +225,7 @@ const AnalyticsHub = ({
 				}}
 				columns={exportColumns}
 				source={source}
-				filename={`${values.analyticsKey}analytics_${source[0].startDate}_${source[0].endDate}.csv`}
+				filename={`${values.analyticsKey}analytics${comparisonMode ? '_comparison' : ''}${filterSuffix ? `_${filterSuffix}` : ''}_${source[0].startDate}_${source[0].endDate}.csv`}
 			/>
 		);
 	};
@@ -232,6 +250,11 @@ const AnalyticsHub = ({
 					Export CSV
 				</Components.Button>
 			</div>
+			{failedSites.length > 0 && (
+				<Components.Text type="help" style={{ color: '#c02743' }}>
+					Data unavailable for: {failedSites.join(', ')}
+				</Components.Text>
+			)}
 			<div className="analyticsSection dashboardSection_content">
 				{(() => {
 					const chartSuffix = [