@plusscommunities/pluss-circles-web-groups 1.5.11-beta.3 → 1.5.11-beta.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. package/dist/index.cjs.js +3 -1
  2. package/dist/index.esm.js +3 -1
  3. package/dist/index.umd.js +3 -1
  4. package/package.json +1 -1
  5. package/package.json-e +1 -1
  6. package/src/components/AnalyticsHub.js +136 -131
package/dist/index.cjs.js CHANGED
@@ -2044,6 +2044,7 @@ const AnalyticsHub = _ref => {
2044
2044
  }, [startTime, endTime, userType, userCategory, selectedSites]);
2045
2045
  const getData = async () => {
2046
2046
  try {
2047
+ setFailedSites([]);
2047
2048
  if (comparisonMode) {
2048
2049
  setComparisonData({
2049
2050
  messages: [],
@@ -2196,7 +2197,8 @@ const AnalyticsHub = _ref => {
2196
2197
  }, "Export CSV")), failedSites.length > 0 && /*#__PURE__*/React__default["default"].createElement(Components$1.Text, {
2197
2198
  type: "help",
2198
2199
  style: {
2199
- color: Colours$1.COLOUR_RED
2200
+ color: Colours$1.COLOUR_RED,
2201
+ marginTop: 8
2200
2202
  }
2201
2203
  }, "Data unavailable for: ", failedSites.join(", ")), /*#__PURE__*/React__default["default"].createElement("div", {
2202
2204
  className: "analyticsSection dashboardSection_content"
package/dist/index.esm.js CHANGED
@@ -2013,6 +2013,7 @@ const AnalyticsHub = _ref => {
2013
2013
  }, [startTime, endTime, userType, userCategory, selectedSites]);
2014
2014
  const getData = async () => {
2015
2015
  try {
2016
+ setFailedSites([]);
2016
2017
  if (comparisonMode) {
2017
2018
  setComparisonData({
2018
2019
  messages: [],
@@ -2165,7 +2166,8 @@ const AnalyticsHub = _ref => {
2165
2166
  }, "Export CSV")), failedSites.length > 0 && /*#__PURE__*/React.createElement(Components$1.Text, {
2166
2167
  type: "help",
2167
2168
  style: {
2168
- color: Colours$1.COLOUR_RED
2169
+ color: Colours$1.COLOUR_RED,
2170
+ marginTop: 8
2169
2171
  }
2170
2172
  }, "Data unavailable for: ", failedSites.join(", ")), /*#__PURE__*/React.createElement("div", {
2171
2173
  className: "analyticsSection dashboardSection_content"
package/dist/index.umd.js CHANGED
@@ -2034,6 +2034,7 @@
2034
2034
  }, [startTime, endTime, userType, userCategory, selectedSites]);
2035
2035
  const getData = async () => {
2036
2036
  try {
2037
+ setFailedSites([]);
2037
2038
  if (comparisonMode) {
2038
2039
  setComparisonData({
2039
2040
  messages: [],
@@ -2186,7 +2187,8 @@
2186
2187
  }, "Export CSV")), failedSites.length > 0 && /*#__PURE__*/React__default["default"].createElement(Components$1.Text, {
2187
2188
  type: "help",
2188
2189
  style: {
2189
- color: Colours$1.COLOUR_RED
2190
+ color: Colours$1.COLOUR_RED,
2191
+ marginTop: 8
2190
2192
  }
2191
2193
  }, "Data unavailable for: ", failedSites.join(", ")), /*#__PURE__*/React__default["default"].createElement("div", {
2192
2194
  className: "analyticsSection dashboardSection_content"
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@plusscommunities/pluss-circles-web-groups",
3
- "version": "1.5.11-beta.3",
3
+ "version": "1.5.11-beta.4",
4
4
  "description": "Extension package to enable circles on Pluss Communities Platform",
5
5
  "main": "dist/index.cjs.js",
6
6
  "scripts": {
package/package.json-e CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@plusscommunities/pluss-circles-web",
3
- "version": "1.5.11-beta.3",
3
+ "version": "1.5.11-beta.4",
4
4
  "description": "Extension package to enable circles on Pluss Communities Platform",
5
5
  "main": "dist/index.cjs.js",
6
6
  "scripts": {
package/src/components/AnalyticsHub.js CHANGED
@@ -93,143 +93,148 @@ const AnalyticsHub = ({
93
93
 
94
94
  const getData = async () => {
95
95
  try {
96
- if (comparisonMode) {
97
- setComparisonData({
98
- messages: [],
99
- staffMessages: [],
100
- residentMessages: [],
101
- groupMessages: [],
102
- privateMessages: [],
103
- activeGroups: [],
104
- isLoading: true,
105
- });
106
- const multiSiteResultsObj = await Analytics.fetchMultiSiteData(
107
- selectedSites,
108
- async (site) => {
109
- const { data } = await analyticsActions.getAggregateEntityStats(
96
+ setFailedSites([]);
97
+ if (comparisonMode) {
98
+ setComparisonData({
99
+ messages: [],
100
+ staffMessages: [],
101
+ residentMessages: [],
102
+ groupMessages: [],
103
+ privateMessages: [],
104
+ activeGroups: [],
105
+ isLoading: true,
106
+ });
107
+ const multiSiteResultsObj = await Analytics.fetchMultiSiteData(
108
+ selectedSites,
109
+ async (site) => {
110
+ const { data } = await analyticsActions.getAggregateEntityStats(
111
+ site,
112
+ values.entityKey,
113
+ startTime,
114
+ endTime,
115
+ true,
116
+ { userType, userCategory },
117
+ );
118
+ return data;
119
+ },
120
+ );
121
+ const roles = auth.user.Roles;
122
+ const failed = Object.entries(multiSiteResultsObj)
123
+ .filter(([, data]) => data === null)
124
+ .map(([site]) => Helper.getSiteNameFromRoles(site, roles));
125
+ setFailedSites(failed);
126
+ const multiSiteResults = Object.entries(multiSiteResultsObj)
127
+ .filter(([, data]) => data !== null)
128
+ .map(([site, data]) => ({ site, data }));
129
+ const buildComparison = (activityKey, countType) =>
130
+ multiSiteResults.map((result) => ({
131
+ name: Helper.getSiteNameFromRoles(result.site, roles),
132
+ value: Analytics.countActivities(
133
+ result.data,
134
+ activityKey,
135
+ countType,
136
+ ),
137
+ }));
138
+ setComparisonData({
139
+ messages: buildComparison("Message", "total"),
140
+ staffMessages: buildComparison("StaffMessage", "total"),
141
+ residentMessages: buildComparison("ResidentMessage", "total"),
142
+ groupMessages: buildComparison("GroupMessage", "total"),
143
+ privateMessages: buildComparison("PrivateMessage", "total"),
144
+ activeGroups: buildComparison("GroupMessage", "unique"),
145
+ isLoading: false,
146
+ });
147
+ } else {
148
+ setAnalyticsData(getInitialState());
149
+ const site =
150
+ selectedSites && selectedSites.length === 1
151
+ ? selectedSites[0]
152
+ : auth.site;
153
+ const timeDifference = endTime - startTime;
154
+ const [currentStatsResponse, prevStatsResponse] = await Promise.all([
155
+ analyticsActions.getAggregateEntityStats(
110
156
  site,
111
157
  values.entityKey,
112
158
  startTime,
113
159
  endTime,
114
160
  true,
115
161
  { userType, userCategory },
116
- );
117
- return data;
118
- },
119
- );
120
- const roles = auth.user.Roles;
121
- const failed = Object.entries(multiSiteResultsObj)
122
- .filter(([, data]) => data === null)
123
- .map(([site]) => Helper.getSiteNameFromRoles(site, roles));
124
- setFailedSites(failed);
125
- const multiSiteResults = Object.entries(multiSiteResultsObj)
126
- .filter(([, data]) => data !== null)
127
- .map(([site, data]) => ({ site, data }));
128
- const buildComparison = (activityKey, countType) =>
129
- multiSiteResults.map((result) => ({
130
- name: Helper.getSiteNameFromRoles(result.site, roles),
131
- value: Analytics.countActivities(result.data, activityKey, countType),
132
- }));
133
- setComparisonData({
134
- messages: buildComparison("Message", "total"),
135
- staffMessages: buildComparison("StaffMessage", "total"),
136
- residentMessages: buildComparison("ResidentMessage", "total"),
137
- groupMessages: buildComparison("GroupMessage", "total"),
138
- privateMessages: buildComparison("PrivateMessage", "total"),
139
- activeGroups: buildComparison("GroupMessage", "unique"),
140
- isLoading: false,
141
- });
142
- } else {
143
- setAnalyticsData(getInitialState());
144
- const site =
145
- selectedSites && selectedSites.length === 1
146
- ? selectedSites[0]
147
- : auth.site;
148
- const timeDifference = endTime - startTime;
149
- const [currentStatsResponse, prevStatsResponse] = await Promise.all([
150
- analyticsActions.getAggregateEntityStats(
151
- site,
152
- values.entityKey,
153
- startTime,
154
- endTime,
155
- true,
156
- { userType, userCategory },
157
- ),
158
- analyticsActions.getAggregateEntityStats(
159
- site,
160
- values.entityKey,
161
- startTime - timeDifference,
162
- startTime,
163
- true,
164
- { userType, userCategory },
165
- ),
166
- ]);
162
+ ),
163
+ analyticsActions.getAggregateEntityStats(
164
+ site,
165
+ values.entityKey,
166
+ startTime - timeDifference,
167
+ startTime,
168
+ true,
169
+ { userType, userCategory },
170
+ ),
171
+ ]);
167
172
 
168
- const data = {
169
- messages: Analytics.countActivities(
170
- currentStatsResponse.data,
171
- "Message",
172
- "total",
173
- ),
174
- prevMessages: Analytics.countActivities(
175
- prevStatsResponse.data,
176
- "Message",
177
- "total",
178
- ),
179
- staffMessages: Analytics.countActivities(
180
- currentStatsResponse.data,
181
- "StaffMessage",
182
- "total",
183
- ),
184
- prevStaffMessages: Analytics.countActivities(
185
- prevStatsResponse.data,
186
- "StaffMessage",
187
- "total",
188
- ),
189
- residentMessages: Analytics.countActivities(
190
- currentStatsResponse.data,
191
- "ResidentMessage",
192
- "total",
193
- ),
194
- prevResidentMessages: Analytics.countActivities(
195
- prevStatsResponse.data,
196
- "ResidentMessage",
197
- "total",
198
- ),
199
- groupMessages: Analytics.countActivities(
200
- currentStatsResponse.data,
201
- "GroupMessage",
202
- "total",
203
- ),
204
- prevGroupMessages: Analytics.countActivities(
205
- prevStatsResponse.data,
206
- "GroupMessage",
207
- "total",
208
- ),
209
- privateMessages: Analytics.countActivities(
210
- currentStatsResponse.data,
211
- "PrivateMessage",
212
- "total",
213
- ),
214
- prevPrivateMessages: Analytics.countActivities(
215
- prevStatsResponse.data,
216
- "PrivateMessage",
217
- "total",
218
- ),
219
- activeGroups: Analytics.countActivities(
220
- currentStatsResponse.data,
221
- "GroupMessage",
222
- "unique",
223
- ),
224
- prevActiveGroups: Analytics.countActivities(
225
- prevStatsResponse.data,
226
- "GroupMessage",
227
- "unique",
228
- ),
229
- isLoading: false,
230
- };
231
- setAnalyticsData(data);
232
- }
173
+ const data = {
174
+ messages: Analytics.countActivities(
175
+ currentStatsResponse.data,
176
+ "Message",
177
+ "total",
178
+ ),
179
+ prevMessages: Analytics.countActivities(
180
+ prevStatsResponse.data,
181
+ "Message",
182
+ "total",
183
+ ),
184
+ staffMessages: Analytics.countActivities(
185
+ currentStatsResponse.data,
186
+ "StaffMessage",
187
+ "total",
188
+ ),
189
+ prevStaffMessages: Analytics.countActivities(
190
+ prevStatsResponse.data,
191
+ "StaffMessage",
192
+ "total",
193
+ ),
194
+ residentMessages: Analytics.countActivities(
195
+ currentStatsResponse.data,
196
+ "ResidentMessage",
197
+ "total",
198
+ ),
199
+ prevResidentMessages: Analytics.countActivities(
200
+ prevStatsResponse.data,
201
+ "ResidentMessage",
202
+ "total",
203
+ ),
204
+ groupMessages: Analytics.countActivities(
205
+ currentStatsResponse.data,
206
+ "GroupMessage",
207
+ "total",
208
+ ),
209
+ prevGroupMessages: Analytics.countActivities(
210
+ prevStatsResponse.data,
211
+ "GroupMessage",
212
+ "total",
213
+ ),
214
+ privateMessages: Analytics.countActivities(
215
+ currentStatsResponse.data,
216
+ "PrivateMessage",
217
+ "total",
218
+ ),
219
+ prevPrivateMessages: Analytics.countActivities(
220
+ prevStatsResponse.data,
221
+ "PrivateMessage",
222
+ "total",
223
+ ),
224
+ activeGroups: Analytics.countActivities(
225
+ currentStatsResponse.data,
226
+ "GroupMessage",
227
+ "unique",
228
+ ),
229
+ prevActiveGroups: Analytics.countActivities(
230
+ prevStatsResponse.data,
231
+ "GroupMessage",
232
+ "unique",
233
+ ),
234
+ isLoading: false,
235
+ };
236
+ setAnalyticsData(data);
237
+ }
233
238
  } catch (err) {
234
239
  if (comparisonMode) {
235
240
  setComparisonData((prev) => ({ ...prev, isLoading: false }));
@@ -331,7 +336,7 @@ const AnalyticsHub = ({
331
336
  </Components.Button>
332
337
  </div>
333
338
  {failedSites.length > 0 && (
334
- <Components.Text type="help" style={{ color: Colours.COLOUR_RED }}>
339
+ <Components.Text type="help" style={{ color: Colours.COLOUR_RED, marginTop: 8 }}>
335
340
  Data unavailable for: {failedSites.join(", ")}
336
341
  </Components.Text>
337
342
  )}