@plusscommunities/pluss-core-web 1.4.19 → 1.4.20

package/dist/index.cjs.js

@@ -549,6 +549,10 @@ var getAnalyticsFilterOptions = function getAnalyticsFilterOptions() {
     text: 'Last 90 days',
     dayCount: 90,
     prevText: 'previous 90 days'
+  }, {
+    text: 'Last 365 days',
+    dayCount: 365,
+    prevText: 'previous 365 days'
   }, {
     text: 'Custom Range',
     dayCount: 0,
@@ -572,6 +576,15 @@ var countActivities = function countActivities(data, activityKey, countType) {
 
           break;
 
+        case 'uniquearray':
+          if (entityStats[activityKey]) {
+            ___default['default'].values(entityStats[activityKey]).forEach(function (value) {
+              set.add(value);
+            });
+          }
+
+          break;
+
         case 'total':
           if (entityStats[activityKey]) {
             count += entityStats[activityKey];
@@ -584,6 +597,8 @@ var countActivities = function countActivities(data, activityKey, countType) {
 
   switch (countType) {
     case 'unique':
+    case 'uniquearray':
+      console.log(countType, set);
       return set.size;
 
     case 'total':
@@ -594,6 +609,7 @@ var countActivities = function countActivities(data, activityKey, countType) {
   }
 };
 var generateDateRangeObjects = function generateDateRangeObjects(startTime, endTime) {
+  var groupBy = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'day';
   var startDate = moment__default['default'](startTime);
   var endDate = moment__default['default'](endTime);
   var dates = {};
@@ -605,24 +621,42 @@ var generateDateRangeObjects = function generateDateRangeObjects(startTime, endT
       Timestamp: startDate.valueOf(),
       Stats: {}
     };
-    startDate.add(1, 'days');
+    startDate.add(1, groupBy);
   }
 
   return dates;
 };
 var generateDateActivities = function generateDateActivities(data, activityKey, countType, startTime, endTime) {
-  var dates = generateDateRangeObjects(startTime, endTime);
+  var groupBy = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : 'day';
+  var dates = generateDateRangeObjects(startTime, endTime, groupBy);
   var result = [];
+  var formatToUse = 'DD-MM-YYYY';
+  var labelFormat = 'D MMM';
+
+  switch (groupBy) {
+    case 'month':
+      formatToUse = 'MM-YYYY';
+      labelFormat = 'MMMM';
+      break;
+
+    case 'week':
+      formatToUse = 'w-gggg';
+      labelFormat = '[Week of] D MMM';
+      break;
+  }
+
   Object.keys(dates).forEach(function (d) {
-    var dateToUse = ___default['default'].find(data, function (date) {
-      return date.Date === d;
-    }) || dates[d];
+    var datesToUse = ___default['default'].filter(data, function (date) {
+      return moment__default['default'](date.Date, 'DD-MM-YYYY').format(formatToUse) === moment__default['default'](d, 'DD-MM-YYYY').format(formatToUse);
+    }) || [dates[d]];
     var compiledValue = {
       date: d,
-      value: countActivities([dateToUse], activityKey, countType)
+      label: moment__default['default'](d, 'DD-MM-YYYY').format(labelFormat),
+      value: countActivities(datesToUse, activityKey, countType)
     };
     result.push(compiledValue);
   });
+  console.log(result);
   return result;
 };
 
@@ -8690,7 +8724,7 @@ var AnalyticsFilter = /*#__PURE__*/function (_PureComponent) {
   _createClass__default['default'](AnalyticsFilter, [{
     key: "render",
     value: function render() {
-      return /*#__PURE__*/React__default['default'].createElement("div", null, /*#__PURE__*/React__default['default'].createElement("div", {
+      return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement("div", {
         className: "analyticsFilter__dropDown"
       }, /*#__PURE__*/React__default['default'].createElement(reactBootstrap.DropdownButton, {
         id: "secondLevelSort",

package/dist/index.esm.js

@@ -519,6 +519,10 @@ var getAnalyticsFilterOptions = function getAnalyticsFilterOptions() {
     text: 'Last 90 days',
     dayCount: 90,
     prevText: 'previous 90 days'
+  }, {
+    text: 'Last 365 days',
+    dayCount: 365,
+    prevText: 'previous 365 days'
   }, {
     text: 'Custom Range',
     dayCount: 0,
@@ -542,6 +546,15 @@ var countActivities = function countActivities(data, activityKey, countType) {
 
           break;
 
+        case 'uniquearray':
+          if (entityStats[activityKey]) {
+            _.values(entityStats[activityKey]).forEach(function (value) {
+              set.add(value);
+            });
+          }
+
+          break;
+
         case 'total':
           if (entityStats[activityKey]) {
             count += entityStats[activityKey];
@@ -554,6 +567,8 @@ var countActivities = function countActivities(data, activityKey, countType) {
 
   switch (countType) {
     case 'unique':
+    case 'uniquearray':
+      console.log(countType, set);
       return set.size;
 
     case 'total':
@@ -564,6 +579,7 @@ var countActivities = function countActivities(data, activityKey, countType) {
   }
 };
 var generateDateRangeObjects = function generateDateRangeObjects(startTime, endTime) {
+  var groupBy = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'day';
   var startDate = moment(startTime);
   var endDate = moment(endTime);
   var dates = {};
@@ -575,24 +591,42 @@ var generateDateRangeObjects = function generateDateRangeObjects(startTime, endT
       Timestamp: startDate.valueOf(),
       Stats: {}
     };
-    startDate.add(1, 'days');
+    startDate.add(1, groupBy);
   }
 
   return dates;
 };
 var generateDateActivities = function generateDateActivities(data, activityKey, countType, startTime, endTime) {
-  var dates = generateDateRangeObjects(startTime, endTime);
+  var groupBy = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : 'day';
+  var dates = generateDateRangeObjects(startTime, endTime, groupBy);
   var result = [];
+  var formatToUse = 'DD-MM-YYYY';
+  var labelFormat = 'D MMM';
+
+  switch (groupBy) {
+    case 'month':
+      formatToUse = 'MM-YYYY';
+      labelFormat = 'MMMM';
+      break;
+
+    case 'week':
+      formatToUse = 'w-gggg';
+      labelFormat = '[Week of] D MMM';
+      break;
+  }
+
   Object.keys(dates).forEach(function (d) {
-    var dateToUse = _.find(data, function (date) {
-      return date.Date === d;
-    }) || dates[d];
+    var datesToUse = _.filter(data, function (date) {
+      return moment(date.Date, 'DD-MM-YYYY').format(formatToUse) === moment(d, 'DD-MM-YYYY').format(formatToUse);
+    }) || [dates[d]];
     var compiledValue = {
       date: d,
-      value: countActivities([dateToUse], activityKey, countType)
+      label: moment(d, 'DD-MM-YYYY').format(labelFormat),
+      value: countActivities(datesToUse, activityKey, countType)
     };
     result.push(compiledValue);
   });
+  console.log(result);
   return result;
 };
 
@@ -8660,7 +8694,7 @@ var AnalyticsFilter = /*#__PURE__*/function (_PureComponent) {
   _createClass(AnalyticsFilter, [{
     key: "render",
     value: function render() {
-      return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", {
+      return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
         className: "analyticsFilter__dropDown"
       }, /*#__PURE__*/React.createElement(DropdownButton, {
         id: "secondLevelSort",

package/dist/index.umd.js

@@ -520,6 +520,10 @@
       text: 'Last 90 days',
       dayCount: 90,
       prevText: 'previous 90 days'
+    }, {
+      text: 'Last 365 days',
+      dayCount: 365,
+      prevText: 'previous 365 days'
     }, {
       text: 'Custom Range',
       dayCount: 0,
@@ -543,6 +547,15 @@
 
             break;
 
+          case 'uniquearray':
+            if (entityStats[activityKey]) {
+              ___default['default'].values(entityStats[activityKey]).forEach(function (value) {
+                set.add(value);
+              });
+            }
+
+            break;
+
           case 'total':
             if (entityStats[activityKey]) {
               count += entityStats[activityKey];
@@ -555,6 +568,8 @@
 
     switch (countType) {
       case 'unique':
+      case 'uniquearray':
+        console.log(countType, set);
         return set.size;
 
       case 'total':
@@ -565,6 +580,7 @@
     }
   };
   var generateDateRangeObjects = function generateDateRangeObjects(startTime, endTime) {
+    var groupBy = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'day';
     var startDate = moment__default['default'](startTime);
     var endDate = moment__default['default'](endTime);
     var dates = {};
@@ -576,24 +592,42 @@
         Timestamp: startDate.valueOf(),
         Stats: {}
       };
-      startDate.add(1, 'days');
+      startDate.add(1, groupBy);
     }
 
     return dates;
   };
   var generateDateActivities = function generateDateActivities(data, activityKey, countType, startTime, endTime) {
-    var dates = generateDateRangeObjects(startTime, endTime);
+    var groupBy = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : 'day';
+    var dates = generateDateRangeObjects(startTime, endTime, groupBy);
     var result = [];
+    var formatToUse = 'DD-MM-YYYY';
+    var labelFormat = 'D MMM';
+
+    switch (groupBy) {
+      case 'month':
+        formatToUse = 'MM-YYYY';
+        labelFormat = 'MMMM';
+        break;
+
+      case 'week':
+        formatToUse = 'w-gggg';
+        labelFormat = '[Week of] D MMM';
+        break;
+    }
+
     Object.keys(dates).forEach(function (d) {
-      var dateToUse = ___default['default'].find(data, function (date) {
-        return date.Date === d;
-      }) || dates[d];
+      var datesToUse = ___default['default'].filter(data, function (date) {
+        return moment__default['default'](date.Date, 'DD-MM-YYYY').format(formatToUse) === moment__default['default'](d, 'DD-MM-YYYY').format(formatToUse);
+      }) || [dates[d]];
       var compiledValue = {
         date: d,
-        value: countActivities([dateToUse], activityKey, countType)
+        label: moment__default['default'](d, 'DD-MM-YYYY').format(labelFormat),
+        value: countActivities(datesToUse, activityKey, countType)
       };
       result.push(compiledValue);
     });
+    console.log(result);
     return result;
   };
 
@@ -8661,7 +8695,7 @@
     _createClass__default['default'](AnalyticsFilter, [{
       key: "render",
       value: function render() {
-        return /*#__PURE__*/React__default['default'].createElement("div", null, /*#__PURE__*/React__default['default'].createElement("div", {
+        return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement("div", {
           className: "analyticsFilter__dropDown"
         }, /*#__PURE__*/React__default['default'].createElement(reactBootstrap.DropdownButton, {
           id: "secondLevelSort",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plusscommunities/pluss-core-web",
-  "version": "1.4.19",
+  "version": "1.4.20",
   "description": "Core extension package for Pluss Communities platform",
   "main": "dist/index.cjs.js",
   "scripts": {

package/src/analytics.js

@@ -70,6 +70,11 @@ export const getAnalyticsFilterOptions = () => {
       dayCount: 90,
       prevText: 'previous 90 days',
     },
+    {
+      text: 'Last 365 days',
+      dayCount: 365,
+      prevText: 'previous 365 days',
+    },
     {
       text: 'Custom Range',
       dayCount: 0,
@@ -94,6 +99,13 @@ export const countActivities = (data, activityKey, countType) => {
             set.add(entity);
           }
           break;
+        case 'uniquearray':
+          if (entityStats[activityKey]) {
+            _.values(entityStats[activityKey]).forEach((value) => {
+              set.add(value);
+            });
+          }
+          break;
         case 'total':
           if (entityStats[activityKey]) {
             count += entityStats[activityKey];
@@ -107,6 +119,8 @@ export const countActivities = (data, activityKey, countType) => {
 
   switch (countType) {
     case 'unique':
+    case 'uniquearray':
+      console.log(countType, set);
       return set.size;
     case 'total':
       return count;
@@ -115,7 +129,7 @@ export const countActivities = (data, activityKey, countType) => {
   }
 };
 
-export const generateDateRangeObjects = (startTime, endTime) => {
+export const generateDateRangeObjects = (startTime, endTime, groupBy = 'day') => {
   const startDate = moment(startTime);
   const endDate = moment(endTime);
   const dates = {};
@@ -127,22 +141,43 @@ export const generateDateRangeObjects = (startTime, endTime) => {
       Timestamp: startDate.valueOf(),
       Stats: {},
     };
-    startDate.add(1, 'days');
+    startDate.add(1, groupBy);
   }
 
   return dates;
 };
 
-export const generateDateActivities = (data, activityKey, countType, startTime, endTime) => {
-  const dates = generateDateRangeObjects(startTime, endTime);
+export const generateDateActivities = (data, activityKey, countType, startTime, endTime, groupBy = 'day') => {
+  const dates = generateDateRangeObjects(startTime, endTime, groupBy);
 
   const result = [];
+  let formatToUse = 'DD-MM-YYYY';
+  let labelFormat = 'D MMM';
+  switch (groupBy) {
+    case 'month':
+      formatToUse = 'MM-YYYY';
+      labelFormat = 'MMMM';
+      break;
+    case 'week':
+      formatToUse = 'w-gggg';
+      labelFormat = '[Week of] D MMM';
+      break;
+    default:
+      break;
+  }
 
   Object.keys(dates).forEach((d) => {
-    const dateToUse = _.find(data, (date) => date.Date === d) || dates[d];
-    const compiledValue = { date: d, value: countActivities([dateToUse], activityKey, countType) };
+    const datesToUse = _.filter(data, (date) => {
+      return moment(date.Date, 'DD-MM-YYYY').format(formatToUse) === moment(d, 'DD-MM-YYYY').format(formatToUse);
+    }) || [dates[d]];
+    const compiledValue = {
+      date: d,
+      label: moment(d, 'DD-MM-YYYY').format(labelFormat),
+      value: countActivities(datesToUse, activityKey, countType),
+    };
 
     result.push(compiledValue);
   });
+  console.log(result);
   return result;
 };

package/src/components/AnalyticsFilter.js

@@ -78,7 +78,7 @@ class AnalyticsFilter extends PureComponent {
 
   render() {
     return (
-      <div>
+      <>
         <div className="analyticsFilter__dropDown">
           <DropdownButton
             id="secondLevelSort"
@@ -106,7 +106,7 @@ class AnalyticsFilter extends PureComponent {
             <DatePicker hideTop selectedDate={this.state.endDate} selectDate={this.endDateChanged} />
           </div>
         )}
-      </div>
+      </>
     );
   }
 }