@plusscommunities/pluss-core-web 1.4.17-beta.0 → 1.4.18

package/dist/index.cjs.js

@@ -8,10 +8,10 @@ var _ = require('lodash');
 var axios = require('axios');
 var awsAmplify = require('aws-amplify');
 var _defineProperty = require('@babel/runtime/helpers/defineProperty');
+var moment = require('moment');
 var React = require('react');
 var $ = require('jquery');
 var Cookies = require('js-cookie');
-var moment = require('moment');
 var _classCallCheck = require('@babel/runtime/helpers/classCallCheck');
 var _createClass = require('@babel/runtime/helpers/createClass');
 var _inherits = require('@babel/runtime/helpers/inherits');
@@ -40,10 +40,10 @@ var _regeneratorRuntime__default = /*#__PURE__*/_interopDefaultLegacy(_regenerat
 var ___default = /*#__PURE__*/_interopDefaultLegacy(_);
 var axios__default = /*#__PURE__*/_interopDefaultLegacy(axios);
 var _defineProperty__default = /*#__PURE__*/_interopDefaultLegacy(_defineProperty);
+var moment__default = /*#__PURE__*/_interopDefaultLegacy(moment);
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 var $__default = /*#__PURE__*/_interopDefaultLegacy($);
 var Cookies__default = /*#__PURE__*/_interopDefaultLegacy(Cookies);
-var moment__default = /*#__PURE__*/_interopDefaultLegacy(moment);
 var _classCallCheck__default = /*#__PURE__*/_interopDefaultLegacy(_classCallCheck);
 var _createClass__default = /*#__PURE__*/_interopDefaultLegacy(_createClass);
 var _inherits__default = /*#__PURE__*/_interopDefaultLegacy(_inherits);
@@ -64,6 +64,7 @@ var CoreConfig = {
     baseStage: '',
     baseAPIUrl: '',
     baseUploadsUrl: '',
+    baseLibraryUrl: '',
     uploadBucket: '',
     colourBrandingMain: '',
     colourBrandingOff: '',
@@ -544,18 +545,95 @@ var getAnalyticsFilterOptions = function getAnalyticsFilterOptions() {
     text: 'Last 30 days',
     dayCount: 30,
     prevText: 'previous 30 days'
+  }, {
+    text: 'Last 90 days',
+    dayCount: 90,
+    prevText: 'previous 90 days'
   }, {
     text: 'Custom Range',
     dayCount: 0,
     prevText: 'previous * days'
   }];
 };
+var countActivities = function countActivities(data, activityKey, countType) {
+  var count = 0;
+  var set = new Set();
+  data.forEach(function (entry) {
+    var stats = entry.Stats;
+
+    for (var entity in stats) {
+      var entityStats = stats[entity];
+
+      switch (countType) {
+        case 'unique':
+          if (entityStats[activityKey]) {
+            set.add(entity);
+          }
+
+          break;
+
+        case 'total':
+          if (entityStats[activityKey]) {
+            count += entityStats[activityKey];
+          }
+
+          break;
+      }
+    }
+  });
+
+  switch (countType) {
+    case 'unique':
+      return set.size;
+
+    case 'total':
+      return count;
+
+    default:
+      return 0;
+  }
+};
+var generateDateRangeObjects = function generateDateRangeObjects(startTime, endTime) {
+  var startDate = moment__default['default'](startTime);
+  var endDate = moment__default['default'](endTime);
+  var dates = {};
+
+  while (startDate.isSameOrBefore(endDate)) {
+    var dateString = startDate.format('DD-MM-YYYY');
+    dates[dateString] = {
+      Date: dateString,
+      Timestamp: startDate.valueOf(),
+      Stats: {}
+    };
+    startDate.add(1, 'days');
+  }
+
+  return dates;
+};
+var generateDateActivities = function generateDateActivities(data, activityKey, countType, startTime, endTime) {
+  var dates = generateDateRangeObjects(startTime, endTime);
+  var result = [];
+  Object.keys(dates).forEach(function (d) {
+    var dateToUse = ___default['default'].find(data, function (date) {
+      return date.Date === d;
+    }) || dates[d];
+    var compiledValue = {
+      date: d,
+      value: countActivities([dateToUse], activityKey, countType)
+    };
+    result.push(compiledValue);
+  });
+  return result;
+};
 
 var analytics = /*#__PURE__*/Object.freeze({
   __proto__: null,
   compileStats: compileStats,
   getInsight: getInsight,
-  getAnalyticsFilterOptions: getAnalyticsFilterOptions
+  getAnalyticsFilterOptions: getAnalyticsFilterOptions,
+  countActivities: countActivities,
+  generateDateRangeObjects: generateDateRangeObjects,
+  generateDateActivities: generateDateActivities
 });
 
 var getUrl = function getUrl(baseAction, action, query) {
@@ -686,9 +764,11 @@ var getThumb300 = function getThumb300(url) {
     return url.replace('/uploads/', '/uploads-thumb/').replace('/general/', '/general300/').replace('/uploads1400/', '/uploads-thumb/').replace('/general1400/', '/general300/');
   }
 
-  var baseUploadsUrl = CoreConfig.env.baseUploadsUrl;
+  var _Config$env = CoreConfig.env,
+      baseUploadsUrl = _Config$env.baseUploadsUrl,
+      baseLibraryUrl = _Config$env.baseLibraryUrl;
 
-  if (url.indexOf(baseUploadsUrl) !== -1) {
+  if (url.indexOf(baseUploadsUrl) !== -1 || url.indexOf(baseLibraryUrl) !== -1) {
     var extension = getExtension(url);
     var urlToUse = url;
 
@@ -6908,7 +6988,7 @@ var ImageInputComponent = /*#__PURE__*/function (_Component) {
       }
 
       return {
-        backgroundImage: "url(".concat(image, ")")
+        backgroundImage: "url(".concat(getThumb300(image), ")")
       };
     }
   }, {
@@ -7305,6 +7385,7 @@ var ImageInputComponent = /*#__PURE__*/function (_Component) {
     value: function renderLibraryImage(image, index, allowDelete) {
       var _this7 = this;
 
+      console.log(image);
       var classes = 'imageInput imageInput-hasImage imageInput-libraryImage';
 
       if (image.Selected) {
@@ -8531,6 +8612,10 @@ var AnalyticsFilter = /*#__PURE__*/function (_PureComponent) {
 
     _defineProperty__default['default'](_assertThisInitialized__default['default'](_this), "renderOptions", function () {
       return _this.state.filterOptions.map(function (ev) {
+        if (_this.props.hideOptions && ___default['default'].includes(_this.props.hideOptions, ev.dayCount)) {
+          return null;
+        }
+
         return /*#__PURE__*/React__default['default'].createElement(reactBootstrap.MenuItem, {
           key: ev.dayCount,
           eventKey: ev.dayCount,

package/dist/index.esm.js

@@ -4,10 +4,10 @@ import _ from 'lodash';
 import axios from 'axios';
 import { Auth, Storage } from 'aws-amplify';
 import _defineProperty from '@babel/runtime/helpers/defineProperty';
+import moment from 'moment';
 import React, { Component, PureComponent } from 'react';
 import $ from 'jquery';
 import Cookies from 'js-cookie';
-import moment from 'moment';
 import _classCallCheck from '@babel/runtime/helpers/classCallCheck';
 import _createClass from '@babel/runtime/helpers/createClass';
 import _inherits from '@babel/runtime/helpers/inherits';
@@ -34,6 +34,7 @@ var CoreConfig = {
     baseStage: '',
     baseAPIUrl: '',
     baseUploadsUrl: '',
+    baseLibraryUrl: '',
     uploadBucket: '',
     colourBrandingMain: '',
     colourBrandingOff: '',
@@ -514,18 +515,95 @@ var getAnalyticsFilterOptions = function getAnalyticsFilterOptions() {
     text: 'Last 30 days',
     dayCount: 30,
     prevText: 'previous 30 days'
+  }, {
+    text: 'Last 90 days',
+    dayCount: 90,
+    prevText: 'previous 90 days'
   }, {
     text: 'Custom Range',
     dayCount: 0,
     prevText: 'previous * days'
   }];
 };
+var countActivities = function countActivities(data, activityKey, countType) {
+  var count = 0;
+  var set = new Set();
+  data.forEach(function (entry) {
+    var stats = entry.Stats;
+
+    for (var entity in stats) {
+      var entityStats = stats[entity];
+
+      switch (countType) {
+        case 'unique':
+          if (entityStats[activityKey]) {
+            set.add(entity);
+          }
+
+          break;
+
+        case 'total':
+          if (entityStats[activityKey]) {
+            count += entityStats[activityKey];
+          }
+
+          break;
+      }
+    }
+  });
+
+  switch (countType) {
+    case 'unique':
+      return set.size;
+
+    case 'total':
+      return count;
+
+    default:
+      return 0;
+  }
+};
+var generateDateRangeObjects = function generateDateRangeObjects(startTime, endTime) {
+  var startDate = moment(startTime);
+  var endDate = moment(endTime);
+  var dates = {};
+
+  while (startDate.isSameOrBefore(endDate)) {
+    var dateString = startDate.format('DD-MM-YYYY');
+    dates[dateString] = {
+      Date: dateString,
+      Timestamp: startDate.valueOf(),
+      Stats: {}
+    };
+    startDate.add(1, 'days');
+  }
+
+  return dates;
+};
+var generateDateActivities = function generateDateActivities(data, activityKey, countType, startTime, endTime) {
+  var dates = generateDateRangeObjects(startTime, endTime);
+  var result = [];
+  Object.keys(dates).forEach(function (d) {
+    var dateToUse = _.find(data, function (date) {
+      return date.Date === d;
+    }) || dates[d];
+    var compiledValue = {
+      date: d,
+      value: countActivities([dateToUse], activityKey, countType)
+    };
+    result.push(compiledValue);
+  });
+  return result;
+};
 
 var analytics = /*#__PURE__*/Object.freeze({
   __proto__: null,
   compileStats: compileStats,
   getInsight: getInsight,
-  getAnalyticsFilterOptions: getAnalyticsFilterOptions
+  getAnalyticsFilterOptions: getAnalyticsFilterOptions,
+  countActivities: countActivities,
+  generateDateRangeObjects: generateDateRangeObjects,
+  generateDateActivities: generateDateActivities
 });
 
 var getUrl = function getUrl(baseAction, action, query) {
@@ -656,9 +734,11 @@ var getThumb300 = function getThumb300(url) {
     return url.replace('/uploads/', '/uploads-thumb/').replace('/general/', '/general300/').replace('/uploads1400/', '/uploads-thumb/').replace('/general1400/', '/general300/');
   }
 
-  var baseUploadsUrl = CoreConfig.env.baseUploadsUrl;
+  var _Config$env = CoreConfig.env,
+      baseUploadsUrl = _Config$env.baseUploadsUrl,
+      baseLibraryUrl = _Config$env.baseLibraryUrl;
 
-  if (url.indexOf(baseUploadsUrl) !== -1) {
+  if (url.indexOf(baseUploadsUrl) !== -1 || url.indexOf(baseLibraryUrl) !== -1) {
     var extension = getExtension(url);
     var urlToUse = url;
 
@@ -6878,7 +6958,7 @@ var ImageInputComponent = /*#__PURE__*/function (_Component) {
       }
 
       return {
-        backgroundImage: "url(".concat(image, ")")
+        backgroundImage: "url(".concat(getThumb300(image), ")")
       };
     }
   }, {
@@ -7275,6 +7355,7 @@ var ImageInputComponent = /*#__PURE__*/function (_Component) {
     value: function renderLibraryImage(image, index, allowDelete) {
       var _this7 = this;
 
+      console.log(image);
       var classes = 'imageInput imageInput-hasImage imageInput-libraryImage';
 
       if (image.Selected) {
@@ -8501,6 +8582,10 @@ var AnalyticsFilter = /*#__PURE__*/function (_PureComponent) {
 
     _defineProperty(_assertThisInitialized(_this), "renderOptions", function () {
       return _this.state.filterOptions.map(function (ev) {
+        if (_this.props.hideOptions && _.includes(_this.props.hideOptions, ev.dayCount)) {
+          return null;
+        }
+
         return /*#__PURE__*/React.createElement(MenuItem, {
           key: ev.dayCount,
           eventKey: ev.dayCount,

package/dist/index.umd.js

@@ -1,8 +1,8 @@
 (function (global, factory) {
-  typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@babel/runtime/helpers/asyncToGenerator'), require('@babel/runtime/regenerator'), require('lodash'), require('axios'), require('aws-amplify'), require('@babel/runtime/helpers/defineProperty'), require('react'), require('jquery'), require('js-cookie'), require('moment'), require('@babel/runtime/helpers/classCallCheck'), require('@babel/runtime/helpers/createClass'), require('@babel/runtime/helpers/inherits'), require('@babel/runtime/helpers/possibleConstructorReturn'), require('@babel/runtime/helpers/getPrototypeOf'), require('react-fontawesome'), require('@babel/runtime/helpers/extends'), require('@babel/runtime/helpers/assertThisInitialized'), require('react-redux'), require('react-textarea-autosize'), require('@babel/runtime/helpers/toConsumableArray'), require('@babel/runtime/helpers/typeof'), require('react-dropzone'), require('react-router'), require('react-bootstrap'), require('@crello/react-lottie'), require('react-csv'), require('@babel/runtime/helpers/objectWithoutProperties'), require('react-color'), require('tinycolor2')) :
-  typeof define === 'function' && define.amd ? define(['exports', '@babel/runtime/helpers/asyncToGenerator', '@babel/runtime/regenerator', 'lodash', 'axios', 'aws-amplify', '@babel/runtime/helpers/defineProperty', 'react', 'jquery', 'js-cookie', 'moment', '@babel/runtime/helpers/classCallCheck', '@babel/runtime/helpers/createClass', '@babel/runtime/helpers/inherits', '@babel/runtime/helpers/possibleConstructorReturn', '@babel/runtime/helpers/getPrototypeOf', 'react-fontawesome', '@babel/runtime/helpers/extends', '@babel/runtime/helpers/assertThisInitialized', 'react-redux', 'react-textarea-autosize', '@babel/runtime/helpers/toConsumableArray', '@babel/runtime/helpers/typeof', 'react-dropzone', 'react-router', 'react-bootstrap', '@crello/react-lottie', 'react-csv', '@babel/runtime/helpers/objectWithoutProperties', 'react-color', 'tinycolor2'], factory) :
-  (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global['@plusscommunities/pluss-core-web'] = {}, global._asyncToGenerator, global._regeneratorRuntime, global._, global.axios, global.awsAmplify, global._defineProperty, global.React, global.$, global.Cookies, global.moment, global._classCallCheck, global._createClass, global._inherits, global._possibleConstructorReturn, global._getPrototypeOf, global.FontAwesome, global._extends, global._assertThisInitialized, global.reactRedux, global.Textarea, global._toConsumableArray, global._typeof, global.Dropzone, global.reactRouter, global.reactBootstrap, global.reactLottie, global.reactCsv, global._objectWithoutProperties, global.reactColor, global.tinycolor));
-}(this, (function (exports, _asyncToGenerator, _regeneratorRuntime, _, axios, awsAmplify, _defineProperty, React, $, Cookies, moment, _classCallCheck, _createClass, _inherits, _possibleConstructorReturn, _getPrototypeOf, FontAwesome, _extends, _assertThisInitialized, reactRedux, Textarea, _toConsumableArray, _typeof, Dropzone, reactRouter, reactBootstrap, reactLottie, reactCsv, _objectWithoutProperties, reactColor, tinycolor) { 'use strict';
+  typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@babel/runtime/helpers/asyncToGenerator'), require('@babel/runtime/regenerator'), require('lodash'), require('axios'), require('aws-amplify'), require('@babel/runtime/helpers/defineProperty'), require('moment'), require('react'), require('jquery'), require('js-cookie'), require('@babel/runtime/helpers/classCallCheck'), require('@babel/runtime/helpers/createClass'), require('@babel/runtime/helpers/inherits'), require('@babel/runtime/helpers/possibleConstructorReturn'), require('@babel/runtime/helpers/getPrototypeOf'), require('react-fontawesome'), require('@babel/runtime/helpers/extends'), require('@babel/runtime/helpers/assertThisInitialized'), require('react-redux'), require('react-textarea-autosize'), require('@babel/runtime/helpers/toConsumableArray'), require('@babel/runtime/helpers/typeof'), require('react-dropzone'), require('react-router'), require('react-bootstrap'), require('@crello/react-lottie'), require('react-csv'), require('@babel/runtime/helpers/objectWithoutProperties'), require('react-color'), require('tinycolor2')) :
+  typeof define === 'function' && define.amd ? define(['exports', '@babel/runtime/helpers/asyncToGenerator', '@babel/runtime/regenerator', 'lodash', 'axios', 'aws-amplify', '@babel/runtime/helpers/defineProperty', 'moment', 'react', 'jquery', 'js-cookie', '@babel/runtime/helpers/classCallCheck', '@babel/runtime/helpers/createClass', '@babel/runtime/helpers/inherits', '@babel/runtime/helpers/possibleConstructorReturn', '@babel/runtime/helpers/getPrototypeOf', 'react-fontawesome', '@babel/runtime/helpers/extends', '@babel/runtime/helpers/assertThisInitialized', 'react-redux', 'react-textarea-autosize', '@babel/runtime/helpers/toConsumableArray', '@babel/runtime/helpers/typeof', 'react-dropzone', 'react-router', 'react-bootstrap', '@crello/react-lottie', 'react-csv', '@babel/runtime/helpers/objectWithoutProperties', 'react-color', 'tinycolor2'], factory) :
+  (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global['@plusscommunities/pluss-core-web'] = {}, global._asyncToGenerator, global._regeneratorRuntime, global._, global.axios, global.awsAmplify, global._defineProperty, global.moment, global.React, global.$, global.Cookies, global._classCallCheck, global._createClass, global._inherits, global._possibleConstructorReturn, global._getPrototypeOf, global.FontAwesome, global._extends, global._assertThisInitialized, global.reactRedux, global.Textarea, global._toConsumableArray, global._typeof, global.Dropzone, global.reactRouter, global.reactBootstrap, global.reactLottie, global.reactCsv, global._objectWithoutProperties, global.reactColor, global.tinycolor));
+}(this, (function (exports, _asyncToGenerator, _regeneratorRuntime, _, axios, awsAmplify, _defineProperty, moment, React, $, Cookies, _classCallCheck, _createClass, _inherits, _possibleConstructorReturn, _getPrototypeOf, FontAwesome, _extends, _assertThisInitialized, reactRedux, Textarea, _toConsumableArray, _typeof, Dropzone, reactRouter, reactBootstrap, reactLottie, reactCsv, _objectWithoutProperties, reactColor, tinycolor) { 'use strict';
 
   function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -11,10 +11,10 @@
   var ___default = /*#__PURE__*/_interopDefaultLegacy(_);
   var axios__default = /*#__PURE__*/_interopDefaultLegacy(axios);
   var _defineProperty__default = /*#__PURE__*/_interopDefaultLegacy(_defineProperty);
+  var moment__default = /*#__PURE__*/_interopDefaultLegacy(moment);
   var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
   var $__default = /*#__PURE__*/_interopDefaultLegacy($);
   var Cookies__default = /*#__PURE__*/_interopDefaultLegacy(Cookies);
-  var moment__default = /*#__PURE__*/_interopDefaultLegacy(moment);
   var _classCallCheck__default = /*#__PURE__*/_interopDefaultLegacy(_classCallCheck);
   var _createClass__default = /*#__PURE__*/_interopDefaultLegacy(_createClass);
   var _inherits__default = /*#__PURE__*/_interopDefaultLegacy(_inherits);
@@ -35,6 +35,7 @@
       baseStage: '',
       baseAPIUrl: '',
       baseUploadsUrl: '',
+      baseLibraryUrl: '',
       uploadBucket: '',
       colourBrandingMain: '',
       colourBrandingOff: '',
@@ -515,18 +516,95 @@
       text: 'Last 30 days',
       dayCount: 30,
       prevText: 'previous 30 days'
+    }, {
+      text: 'Last 90 days',
+      dayCount: 90,
+      prevText: 'previous 90 days'
     }, {
       text: 'Custom Range',
       dayCount: 0,
       prevText: 'previous * days'
     }];
   };
+  var countActivities = function countActivities(data, activityKey, countType) {
+    var count = 0;
+    var set = new Set();
+    data.forEach(function (entry) {
+      var stats = entry.Stats;
+
+      for (var entity in stats) {
+        var entityStats = stats[entity];
+
+        switch (countType) {
+          case 'unique':
+            if (entityStats[activityKey]) {
+              set.add(entity);
+            }
+
+            break;
+
+          case 'total':
+            if (entityStats[activityKey]) {
+              count += entityStats[activityKey];
+            }
+
+            break;
+        }
+      }
+    });
+
+    switch (countType) {
+      case 'unique':
+        return set.size;
+
+      case 'total':
+        return count;
+
+      default:
+        return 0;
+    }
+  };
+  var generateDateRangeObjects = function generateDateRangeObjects(startTime, endTime) {
+    var startDate = moment__default['default'](startTime);
+    var endDate = moment__default['default'](endTime);
+    var dates = {};
+
+    while (startDate.isSameOrBefore(endDate)) {
+      var dateString = startDate.format('DD-MM-YYYY');
+      dates[dateString] = {
+        Date: dateString,
+        Timestamp: startDate.valueOf(),
+        Stats: {}
+      };
+      startDate.add(1, 'days');
+    }
+
+    return dates;
+  };
+  var generateDateActivities = function generateDateActivities(data, activityKey, countType, startTime, endTime) {
+    var dates = generateDateRangeObjects(startTime, endTime);
+    var result = [];
+    Object.keys(dates).forEach(function (d) {
+      var dateToUse = ___default['default'].find(data, function (date) {
+        return date.Date === d;
+      }) || dates[d];
+      var compiledValue = {
+        date: d,
+        value: countActivities([dateToUse], activityKey, countType)
+      };
+      result.push(compiledValue);
+    });
+    return result;
+  };
 
   var analytics = /*#__PURE__*/Object.freeze({
     __proto__: null,
     compileStats: compileStats,
     getInsight: getInsight,
-    getAnalyticsFilterOptions: getAnalyticsFilterOptions
+    getAnalyticsFilterOptions: getAnalyticsFilterOptions,
+    countActivities: countActivities,
+    generateDateRangeObjects: generateDateRangeObjects,
+    generateDateActivities: generateDateActivities
   });
 
   var getUrl = function getUrl(baseAction, action, query) {
@@ -657,9 +735,11 @@
       return url.replace('/uploads/', '/uploads-thumb/').replace('/general/', '/general300/').replace('/uploads1400/', '/uploads-thumb/').replace('/general1400/', '/general300/');
     }
 
-    var baseUploadsUrl = CoreConfig.env.baseUploadsUrl;
+    var _Config$env = CoreConfig.env,
+        baseUploadsUrl = _Config$env.baseUploadsUrl,
+        baseLibraryUrl = _Config$env.baseLibraryUrl;
 
-    if (url.indexOf(baseUploadsUrl) !== -1) {
+    if (url.indexOf(baseUploadsUrl) !== -1 || url.indexOf(baseLibraryUrl) !== -1) {
       var extension = getExtension(url);
       var urlToUse = url;
 
@@ -6879,7 +6959,7 @@
         }
 
         return {
-          backgroundImage: "url(".concat(image, ")")
+          backgroundImage: "url(".concat(getThumb300(image), ")")
         };
       }
     }, {
@@ -7276,6 +7356,7 @@
       value: function renderLibraryImage(image, index, allowDelete) {
         var _this7 = this;
 
+        console.log(image);
         var classes = 'imageInput imageInput-hasImage imageInput-libraryImage';
 
         if (image.Selected) {
@@ -8502,6 +8583,10 @@
 
       _defineProperty__default['default'](_assertThisInitialized__default['default'](_this), "renderOptions", function () {
         return _this.state.filterOptions.map(function (ev) {
+          if (_this.props.hideOptions && ___default['default'].includes(_this.props.hideOptions, ev.dayCount)) {
+            return null;
+          }
+
           return /*#__PURE__*/React__default['default'].createElement(reactBootstrap.MenuItem, {
             key: ev.dayCount,
             eventKey: ev.dayCount,

package/package.json

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

package/src/analytics.js

@@ -1,4 +1,5 @@
 import _ from 'lodash';
+import moment from 'moment';
 
 export const compileStats = (stats) => {
   const totalStats = {};
@@ -64,6 +65,11 @@ export const getAnalyticsFilterOptions = () => {
       dayCount: 30,
       prevText: 'previous 30 days',
     },
+    {
+      text: 'Last 90 days',
+      dayCount: 90,
+      prevText: 'previous 90 days',
+    },
     {
       text: 'Custom Range',
       dayCount: 0,
@@ -71,3 +77,72 @@ export const getAnalyticsFilterOptions = () => {
     },
   ];
 };
+
+export const countActivities = (data, activityKey, countType) => {
+  let count = 0;
+  let set = new Set();
+
+  data.forEach((entry) => {
+    const stats = entry.Stats;
+
+    for (const entity in stats) {
+      const entityStats = stats[entity];
+
+      switch (countType) {
+        case 'unique':
+          if (entityStats[activityKey]) {
+            set.add(entity);
+          }
+          break;
+        case 'total':
+          if (entityStats[activityKey]) {
+            count += entityStats[activityKey];
+          }
+          break;
+        default:
+          break;
+      }
+    }
+  });
+
+  switch (countType) {
+    case 'unique':
+      return set.size;
+    case 'total':
+      return count;
+    default:
+      return 0;
+  }
+};
+
+export const generateDateRangeObjects = (startTime, endTime) => {
+  const startDate = moment(startTime);
+  const endDate = moment(endTime);
+  const dates = {};
+
+  while (startDate.isSameOrBefore(endDate)) {
+    const dateString = startDate.format('DD-MM-YYYY');
+    dates[dateString] = {
+      Date: dateString,
+      Timestamp: startDate.valueOf(),
+      Stats: {},
+    };
+    startDate.add(1, 'days');
+  }
+
+  return dates;
+};
+
+export const generateDateActivities = (data, activityKey, countType, startTime, endTime) => {
+  const dates = generateDateRangeObjects(startTime, endTime);
+
+  const result = [];
+
+  Object.keys(dates).forEach((d) => {
+    const dateToUse = _.find(data, (date) => date.Date === d) || dates[d];
+    const compiledValue = { date: d, value: countActivities([dateToUse], activityKey, countType) };
+
+    result.push(compiledValue);
+  });
+  return result;
+};

package/src/components/AnalyticsFilter.js

@@ -23,6 +23,9 @@ class AnalyticsFilter extends PureComponent {
 
   renderOptions = () => {
     return this.state.filterOptions.map((ev) => {
+      if (this.props.hideOptions && _.includes(this.props.hideOptions, ev.dayCount)) {
+        return null;
+      }
       return (
         <MenuItem key={ev.dayCount} eventKey={ev.dayCount} active={this.state.selectedFilter === ev}>
           {ev.text}

package/src/components/ImageInput.js

@@ -117,7 +117,7 @@ class ImageInputComponent extends Component {
     if (this.props.noCompress) {
       return { backgroundImage: `url(${image})`, backgroundSize: 'contain' };
     }
-    return { backgroundImage: `url(${image})` };
+    return { backgroundImage: `url(${getThumb300(image)})` };
   }
 
   getAccept = () => {
@@ -619,6 +619,7 @@ class ImageInputComponent extends Component {
   }
 
   renderLibraryImage(image, index, allowDelete) {
+    console.log(image);
     let classes = 'imageInput imageInput-hasImage imageInput-libraryImage';
     if (image.Selected) {
       classes += ' imageInput-librarySelected';

package/src/config.js

@@ -3,6 +3,7 @@ const CoreConfig = {
     baseStage: '',
     baseAPIUrl: '',
     baseUploadsUrl: '',
+    baseLibraryUrl: '',
     uploadBucket: '',
     colourBrandingMain: '',
     colourBrandingOff: '',

package/src/helper/files/getThumb300.js

@@ -16,9 +16,9 @@ const getThumb300 = (url) => {
       .replace('/general1400/', '/general300/');
   }
 
-  const { baseUploadsUrl } = Config.env;
+  const { baseUploadsUrl, baseLibraryUrl } = Config.env;
 
-  if (url.indexOf(baseUploadsUrl) !== -1) {
+  if (url.indexOf(baseUploadsUrl) !== -1 || url.indexOf(baseLibraryUrl) !== -1) {
     const extension = getExtension(url);
     let urlToUse = url;
     if (extension !== 'jpg') {