@plusscommunities/pluss-core-web 1.6.9-auth.0 → 1.6.10-beta.1

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('@babel/runtime/helpers/defineProperty'), require('moment'), require('react'), require('jquery'), require('js-cookie'), require('aws-amplify'), 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('@fortawesome/react-fontawesome'), require('@crello/react-lottie'), require('react-csv'), require('@babel/runtime/helpers/objectWithoutProperties'), require('react-color'), require('tinycolor2'), require('react-router-dom'), require('@fortawesome/free-solid-svg-icons')) :
-  typeof define === 'function' && define.amd ? define(['exports', '@babel/runtime/helpers/asyncToGenerator', '@babel/runtime/regenerator', 'lodash', 'axios', '@babel/runtime/helpers/defineProperty', 'moment', 'react', 'jquery', 'js-cookie', 'aws-amplify', '@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', '@fortawesome/react-fontawesome', '@crello/react-lottie', 'react-csv', '@babel/runtime/helpers/objectWithoutProperties', 'react-color', 'tinycolor2', 'react-router-dom', '@fortawesome/free-solid-svg-icons'], factory) :
-  (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global['@plusscommunities/pluss-core-web'] = {}, global._asyncToGenerator, global._regeneratorRuntime, global._, global.axios, global._defineProperty, global.moment, global.React, global.$, global.Cookies, global.awsAmplify, 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.reactFontawesome, global.reactLottie, global.reactCsv, global._objectWithoutProperties, global.reactColor, global.tinycolor, global.reactRouterDom, global.freeSolidSvgIcons));
-}(this, (function (exports, _asyncToGenerator, _regeneratorRuntime, _, axios, _defineProperty, moment, React, $, Cookies, awsAmplify, _classCallCheck, _createClass, _inherits, _possibleConstructorReturn, _getPrototypeOf, FontAwesome, _extends, _assertThisInitialized, reactRedux, Textarea, _toConsumableArray, _typeof, Dropzone, reactRouter, reactBootstrap, reactFontawesome, reactLottie, reactCsv, _objectWithoutProperties, reactColor, tinycolor, reactRouterDom, freeSolidSvgIcons) { '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('@fortawesome/react-fontawesome'), require('@crello/react-lottie'), require('react-csv'), require('@babel/runtime/helpers/objectWithoutProperties'), require('react-color'), require('tinycolor2'), require('react-router-dom'), require('@fortawesome/free-solid-svg-icons')) :
+  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', '@fortawesome/react-fontawesome', '@crello/react-lottie', 'react-csv', '@babel/runtime/helpers/objectWithoutProperties', 'react-color', 'tinycolor2', 'react-router-dom', '@fortawesome/free-solid-svg-icons'], 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.reactFontawesome, global.reactLottie, global.reactCsv, global._objectWithoutProperties, global.reactColor, global.tinycolor, global.reactRouterDom, global.freeSolidSvgIcons));
+}(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, reactFontawesome, reactLottie, reactCsv, _objectWithoutProperties, reactColor, tinycolor, reactRouterDom, freeSolidSvgIcons) { 'use strict';
 
   function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -47,75 +47,7 @@
       defaultAllowComments: true,
       makeApiKey: '',
       logo: '',
-      clientName: '',
-      AuthStrategy: {
-        getAccessToken: function () {
-          var _getAccessToken = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee() {
-            return _regeneratorRuntime__default['default'].wrap(function _callee$(_context) {
-              while (1) {
-                switch (_context.prev = _context.next) {
-                  case 0:
-                    return _context.abrupt("return", null);
-
-                  case 1:
-                  case "end":
-                    return _context.stop();
-                }
-              }
-            }, _callee);
-          }));
-
-          function getAccessToken() {
-            return _getAccessToken.apply(this, arguments);
-          }
-
-          return getAccessToken;
-        }(),
-        getCurrentUserId: function () {
-          var _getCurrentUserId = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee2() {
-            return _regeneratorRuntime__default['default'].wrap(function _callee2$(_context2) {
-              while (1) {
-                switch (_context2.prev = _context2.next) {
-                  case 0:
-                    return _context2.abrupt("return", null);
-
-                  case 1:
-                  case "end":
-                    return _context2.stop();
-                }
-              }
-            }, _callee2);
-          }));
-
-          function getCurrentUserId() {
-            return _getCurrentUserId.apply(this, arguments);
-          }
-
-          return getCurrentUserId;
-        }(),
-        hasActiveSession: function () {
-          var _hasActiveSession = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee3() {
-            return _regeneratorRuntime__default['default'].wrap(function _callee3$(_context3) {
-              while (1) {
-                switch (_context3.prev = _context3.next) {
-                  case 0:
-                    return _context3.abrupt("return", false);
-
-                  case 1:
-                  case "end":
-                    return _context3.stop();
-                }
-              }
-            }, _callee3);
-          }));
-
-          function hasActiveSession() {
-            return _hasActiveSession.apply(this, arguments);
-          }
-
-          return hasActiveSession;
-        }()
-      }
+      clientName: ''
     },
     init: function init(environment) {
       CoreConfig.env = environment;
@@ -124,28 +56,29 @@
 
   var getSessionTokenAWS = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee(prefix) {
-      var token;
+      var data, token;
       return _regeneratorRuntime__default['default'].wrap(function _callee$(_context) {
         while (1) {
           switch (_context.prev = _context.next) {
             case 0:
               _context.next = 2;
-              return CoreConfig.env.AuthStrategy.getAccessToken();
+              return awsAmplify.Auth.currentSession();
 
             case 2:
-              token = _context.sent;
+              data = _context.sent;
+              token = data.getAccessToken().getJwtToken();
 
               if (!___default['default'].isUndefined(prefix)) {
-                _context.next = 5;
+                _context.next = 6;
                 break;
               }
 
               return _context.abrupt("return", token);
 
-            case 5:
+            case 6:
               return _context.abrupt("return", "".concat(prefix, " ").concat(token));
 
-            case 6:
+            case 7:
             case "end":
               return _context.stop();
           }
@@ -205,28 +138,30 @@
   };
   var getCurrentUserSub = /*#__PURE__*/function () {
     var _ref3 = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee3() {
+      var user;
       return _regeneratorRuntime__default['default'].wrap(function _callee3$(_context3) {
         while (1) {
           switch (_context3.prev = _context3.next) {
             case 0:
               _context3.prev = 0;
               _context3.next = 3;
-              return CoreConfig.env.AuthStrategy.getCurrentUserId();
+              return awsAmplify.Auth.currentUserInfo();
 
             case 3:
-              return _context3.abrupt("return", _context3.sent);
+              user = _context3.sent;
+              return _context3.abrupt("return", user.id);
 
-            case 6:
-              _context3.prev = 6;
+            case 7:
+              _context3.prev = 7;
               _context3.t0 = _context3["catch"](0);
               return _context3.abrupt("return", null);
 
-            case 9:
+            case 10:
             case "end":
               return _context3.stop();
           }
         }
-      }, _callee3, null, [[0, 6]]);
+      }, _callee3, null, [[0, 7]]);
     }));
 
     return function getCurrentUserSub() {
@@ -235,19 +170,19 @@
   }();
   var checkLoggedIn = /*#__PURE__*/function () {
     var _ref4 = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee4(self) {
-      var isLoggedIn;
+      var user;
       return _regeneratorRuntime__default['default'].wrap(function _callee4$(_context4) {
         while (1) {
           switch (_context4.prev = _context4.next) {
             case 0:
               _context4.prev = 0;
               _context4.next = 3;
-              return CoreConfig.env.AuthStrategy.hasActiveSession();
+              return awsAmplify.Auth.currentAuthenticatedUser();
 
             case 3:
-              isLoggedIn = _context4.sent;
+              user = _context4.sent;
 
-              if (!isLoggedIn) {
+              if (___default['default'].isUndefined(user) || user == null || user.username == null) {
                 console.log('redirecting to login');
                 self.props.history.push('/login');
               }
@@ -1688,35 +1623,31 @@
   var fileActions = {
     uploadMediaAsync: function () {
       var _uploadMediaAsync = _asyncToGenerator__default['default']( /*#__PURE__*/_regeneratorRuntime__default['default'].mark(function _callee(file, filename) {
-        var newFilename, signedUrlRes, baseUploadsUrl;
+        var newFilename, userId, url, _Config$env, baseUploadsUrl, uploadBucket;
+
         return _regeneratorRuntime__default['default'].wrap(function _callee$(_context) {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
                 newFilename = filename.replace(/[^a-z0-9+.]+/gi, '').toLowerCase();
                 _context.next = 3;
-                return authedFunction({
-                  method: 'GET',
-                  url: getUrl('media', 'get/presignedurl', {
-                    filename: newFilename,
-                    contentType: file.type
-                  })
-                });
+                return getCurrentUserSub();
 
               case 3:
-                signedUrlRes = _context.sent;
-                _context.next = 6;
-                return axios__default['default'].put(signedUrlRes.data.url, file, {
-                  headers: {
-                    'Content-Type': file.type
-                  }
+                userId = _context.sent;
+                url = "uploads/users/".concat(userId, "/public/").concat(randomString(), "/").concat(newFilename);
+                _Config$env = CoreConfig.env, baseUploadsUrl = _Config$env.baseUploadsUrl, uploadBucket = _Config$env.uploadBucket;
+                _context.next = 8;
+                return awsAmplify.Storage.put(url, file, {
+                  level: 'public',
+                  bucket: uploadBucket
                 });
 
-              case 6:
-                baseUploadsUrl = CoreConfig.env.baseUploadsUrl;
-                return _context.abrupt("return", "".concat(baseUploadsUrl).concat(signedUrlRes.data.key));
-
               case 8:
+                console.log('uploaded file', "".concat(baseUploadsUrl).concat(url));
+                return _context.abrupt("return", "".concat(baseUploadsUrl).concat(url));
+
+              case 10:
               case "end":
                 return _context.stop();
             }
@@ -1730,15 +1661,6 @@
 
       return uploadMediaAsync;
     }(),
-    // uploadMediaAsync: async (file, filename) => {
-    //   const newFilename = filename.replace(/[^a-z0-9+.]+/gi, '').toLowerCase();
-    //   const userId = await getCurrentUserSub();
-    //   const url = `uploads/users/${userId}/public/${randomString()}/${newFilename}`;
-    //   const { baseUploadsUrl, uploadBucket } = Config.env;
-    //   await Storage.put(url, file, { level: 'public', bucket: uploadBucket });
-    //   console.log('uploaded file', `${baseUploadsUrl}${url}`);
-    //   return `${baseUploadsUrl}${url}`;
-    // },
     // readBase64: async (file) => {
     //   return new Promise((resolve, reject) => {
     //     var reader = new FileReader();
@@ -1752,14 +1674,6 @@
     //     };
     //   });
     // },
-    getPresignedUrl: function getPresignedUrl(filename) {
-      return authedFunction({
-        method: 'GET',
-        url: getUrl('media', 'get/presignedurl', {
-          filename: filename
-        })
-      });
-    },
     compressImage: function compressImage(file, maxSize, quality, noCompress) {
       return new Promise(function (resolve, reject) {
         if (noCompress) {
@@ -4894,7 +4808,7 @@
   function _isNativeReflectConstruct$u() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
   var DEFAULT_INPUT$1 = {
     uploadingFile: false,
-    value: ''
+    value: ""
   };
 
   var FileInputComponent = /*#__PURE__*/function (_Component) {
@@ -4916,17 +4830,17 @@
       _defineProperty__default['default'](_assertThisInitialized__default['default'](_this), "state", {
         inputs: [{
           uploadingFile: false,
-          value: ''
+          value: ""
         }]
       });
 
       _defineProperty__default['default'](_assertThisInitialized__default['default'](_this), "getAccept", function () {
-        if (_typeof__default['default'](_this.props.accept) === 'object') {
+        if (_typeof__default['default'](_this.props.accept) === "object") {
           return _this.props.accept;
         }
 
-        if (typeof _this.props.accept === 'string') {
-          var accept = _defineProperty__default['default']({}, _this.props.accept, [".".concat(___default['default'].last(_this.props.accept.split('/')))]);
+        if (typeof _this.props.accept === "string") {
+          var accept = _defineProperty__default['default']({}, _this.props.accept, [".".concat(___default['default'].last(_this.props.accept.split("/")))]);
 
           return accept;
         }
@@ -5020,7 +4934,7 @@
                   return _this.props.handleFile(file, newInputs);
 
                 case 9:
-                  _this.checkSetDisplayValue(input, '');
+                  _this.checkSetDisplayValue(input, "");
 
                   _context.next = 24;
                   break;
@@ -5042,7 +4956,7 @@
                 case 20:
                   _context.prev = 20;
                   _context.t0 = _context["catch"](12);
-                  console.log('handleFile error', _context.t0);
+                  console.log("handleFile error", _context.t0);
 
                   _this.setState({
                     uploadingFile: false
@@ -5087,7 +5001,7 @@
     }, {
       key: "setValue",
       value: function setValue(val) {
-        if (typeof val === 'string') {
+        if (typeof val === "string") {
           this.setState({
             inputs: [{
               uploadingImage: false,
@@ -5113,20 +5027,20 @@
     }, {
       key: "getClassNames",
       value: function getClassNames(input, inputsLength) {
-        var classes = 'clearfix imageInput';
+        var classes = "clearfix imageInput";
 
         if (input.uploadingFile) {
-          classes += ' imageInput-uploading';
+          classes += " imageInput-uploading";
         } else if (!___default['default'].isEmpty(input.value) && !this.props.onlyAllowUpload) {
-          classes += ' imageInput-hasImage';
+          classes += " imageInput-hasImage";
         }
 
         if (inputsLength === 1) {
-          classes += ' imageInput-only';
+          classes += " imageInput-only";
         }
 
         if (this.props.style && this.props.style.height && this.props.style.height < 150) {
-          classes += ' imageInput-condensed';
+          classes += " imageInput-condensed";
         }
 
         return classes;
@@ -5135,10 +5049,10 @@
       key: "getErrorState",
       value: function getErrorState() {
         if (!___default['default'].isUndefined(this.props.showError) && this.props.showError()) {
-          return ' imageInput_upload--error';
+          return " imageInput_upload--error";
         }
 
-        return '';
+        return "";
       }
     }, {
       key: "checkSetDisplayValue",
@@ -5157,7 +5071,7 @@
       key: "removeFile",
       value: function removeFile(input) {
         var newState = {};
-        input.value = '';
+        input.value = "";
 
         var newInputs = ___default['default'].clone(this.state.inputs);
 
@@ -5266,7 +5180,7 @@
             className: "imageInput_upload ".concat(_this3.getErrorState()),
             style: _objectSpread$f({}, _this3.props.style)
           }, getRootProps()), /*#__PURE__*/React__default['default'].createElement("input", getInputProps()), /*#__PURE__*/React__default['default'].createElement("div", {
-            className: "".concat(isDragActive ? 'imageInput_dropZoneActive' : '')
+            className: "".concat(isDragActive ? "imageInput_dropZoneActive" : "")
           }, !_this3.props.simpleStyle && /*#__PURE__*/React__default['default'].createElement("img", {
             src: "https://s3-ap-southeast-2.amazonaws.com/pluss60-dev-media/pluss/document.svg",
             className: "imageInput_icon",
@@ -5292,7 +5206,7 @@
         var _this4 = this;
 
         return /*#__PURE__*/React__default['default'].createElement("div", {
-          className: "imageInputContainer clearfix ".concat(inputs.length === 1 ? 'imageInputContainer-noPadding' : '', " ").concat(this.props.simpleStyle ? 'imageInputContainer-simple' : ''),
+          className: "imageInputContainer clearfix ".concat(inputs.length === 1 ? "imageInputContainer-noPadding" : "", " ").concat(this.props.simpleStyle ? "imageInputContainer-simple" : ""),
           style: _objectSpread$f({}, this.props.style)
         }, inputs.map(function (input, index) {
           return _this4.renderInput(input, index, inputs.length);
@@ -9314,7 +9228,7 @@
             AudienceTagList = _this$state.AudienceTagList;
         var categoryTags = categories.map(function (c) {
           return {
-            AudienceType: 'Category',
+            AudienceType: "Category",
             AudienceTypeSelection: c.Key,
             Id: "category_".concat(c.Key),
             Title: c.Title
@@ -9322,7 +9236,7 @@
         });
         var userTypeTags = types.map(function (t) {
           return {
-            AudienceType: 'UserType',
+            AudienceType: "UserType",
             AudienceTypeSelection: t.typeName,
             Id: "userType_".concat(t.typeName),
             Title: "User Type: ".concat(t.displayName)
@@ -9330,7 +9244,7 @@
         });
         var userTagTags = tagList.map(function (t) {
           return {
-            AudienceType: 'UserTags',
+            AudienceType: "UserTags",
             AudienceTypeSelection: t.Id,
             Id: "userTag_".concat(t.Id),
             Title: "User Tag: ".concat(t.Title)
@@ -9364,26 +9278,26 @@
 
       _this.state = {
         categories: [{
-          Title: 'All Primary Users',
-          Key: 'resident',
-          ShortName: 'Primary'
+          Title: "All Primary Users",
+          Key: "resident",
+          ShortName: "Primary"
         }, {
-          Title: 'All Staff Users',
-          Key: 'staff',
-          ShortName: 'Staff'
+          Title: "All Staff Users",
+          Key: "staff",
+          ShortName: "Staff"
         }, {
-          Title: 'All Linked Users',
-          Key: 'family',
-          ShortName: 'Linked'
+          Title: "All Linked Users",
+          Key: "family",
+          ShortName: "Linked"
         }],
         types: [],
-        AudienceType: props.audienceType || 'All',
+        AudienceType: props.audienceType || "All",
         showInclude: false,
         includeList: [],
         showExclude: false,
         excludeList: [],
-        Type: '',
-        Category: '',
+        Type: "",
+        Category: "",
         userList: [],
         tagList: [],
         AudienceTagList: props.audienceTypeSelection || []
@@ -9413,7 +9327,7 @@
     }, {
       key: "onSubmit",
       value: function onSubmit() {
-        if (this.state.AudienceType === 'User' && ___default['default'].isEmpty(this.state.includeList)) {
+        if (this.state.AudienceType === "User" && ___default['default'].isEmpty(this.state.includeList)) {
           this.setState({
             showInclude: true
           });
@@ -9433,9 +9347,9 @@
             Category = _this$state2.Category,
             Tag = _this$state2.Tag,
             Type = _this$state2.Type;
-        if (AudienceType === 'Custom') return AudienceTagList || [];
-        if (AudienceType === 'Category') return Category;
-        if (AudienceType === 'UserTags') return Tag;
+        if (AudienceType === "Custom") return AudienceTagList || [];
+        if (AudienceType === "Category") return Category;
+        if (AudienceType === "UserTags") return Tag;
         return Type;
       }
     }, {
@@ -9480,9 +9394,9 @@
         var newState = {
           AudienceType: type
         };
-        if (type === 'Custom') newState.AudienceTagList = selection;
-        if (type === 'UserType') newState.Type = selection;
-        if (type === 'Category') newState.Category = selection;
+        if (type === "Custom") newState.AudienceTagList = selection;
+        if (type === "UserType") newState.Type = selection;
+        if (type === "Category") newState.Category = selection;
         this.setState(newState);
       }
     }, {
@@ -9490,8 +9404,8 @@
       value: function onChangeOption(type) {
         this.setState({
           AudienceType: type,
-          Type: '',
-          Category: '',
+          Type: "",
+          Category: "",
           includeList: [],
           excludeList: [],
           AudienceTagList: []
@@ -9504,57 +9418,57 @@
         var _this4 = this;
 
         var options = [{
-          Label: 'All users',
-          Value: 'All',
+          Label: "All users",
+          Value: "All",
           onChange: function onChange() {
-            return _this4.onChangeOption('All');
+            return _this4.onChangeOption("All");
           }
         }];
 
         if (this.props.custom) {
           options.push({
-            Label: 'Custom',
-            Value: 'Custom',
+            Label: "Custom",
+            Value: "Custom",
             onChange: function onChange() {
-              return _this4.onChangeOption('Custom');
+              return _this4.onChangeOption("Custom");
             }
           });
         } else {
           options.push({
-            Label: 'By user category',
-            Value: 'Category',
+            Label: "By user category",
+            Value: "Category",
             onChange: function onChange() {
-              return _this4.onChangeOption('Category');
+              return _this4.onChangeOption("Category");
             }
           });
         }
 
         if (!this.props.disallowUserType) {
           options.push({
-            Label: 'By user type',
-            Value: 'UserType',
+            Label: "By user type",
+            Value: "UserType",
             onChange: function onChange() {
-              return _this4.onChangeOption('UserType');
+              return _this4.onChangeOption("UserType");
             }
           });
         }
 
         if (this.props.allowTags) {
           options.push({
-            Label: 'By user tag',
-            Value: 'UserTags',
+            Label: "By user tag",
+            Value: "UserTags",
             onChange: function onChange() {
-              return _this4.onChangeOption('UserTags');
+              return _this4.onChangeOption("UserTags");
             }
           });
         }
 
         if (!this.props.disallowSingleUsers) {
           options.push({
-            Label: 'To single users',
-            Value: 'User',
+            Label: "To single users",
+            Value: "User",
             onChange: function onChange() {
-              return _this4.onChangeOption('User');
+              return _this4.onChangeOption("User");
             }
           });
         }
@@ -9567,11 +9481,11 @@
         var _this$state3 = this.state,
             AudienceType = _this$state3.AudienceType,
             includeList = _this$state3.includeList;
-        if (AudienceType === 'Custom' && !this.validateCustom()) return false;
-        if (AudienceType === 'Category' && !this.validateCategory()) return false;
-        if (AudienceType === 'UserType' && !this.validateType()) return false;
-        if (AudienceType === 'User' && ___default['default'].isEmpty(includeList)) return false;
-        if (AudienceType === 'UserTags' && !this.validateTag()) return false;
+        if (AudienceType === "Custom" && !this.validateCustom()) return false;
+        if (AudienceType === "Category" && !this.validateCategory()) return false;
+        if (AudienceType === "UserType" && !this.validateType()) return false;
+        if (AudienceType === "User" && ___default['default'].isEmpty(includeList)) return false;
+        if (AudienceType === "UserTags" && !this.validateTag()) return false;
         return true;
       }
     }, {
@@ -9597,7 +9511,7 @@
           return typeObject.displayName;
         }
 
-        return '';
+        return "";
       }
     }, {
       key: "getTagTitle",
@@ -9612,7 +9526,7 @@
           return tag.Title;
         }
 
-        return '';
+        return "";
       }
     }, {
       key: "getUserTypes",
@@ -9633,7 +9547,7 @@
                 return c.Key === e.category;
               });
 
-              var shortName = category ? "(".concat(category.ShortName, ") ") : '';
+              var shortName = category ? "(".concat(category.ShortName, ") ") : "";
               e.Title = "".concat(shortName, " ").concat(e.Title);
             }
           });
@@ -9642,10 +9556,10 @@
           };
 
           if (!___default['default'].some(res.data, function (t) {
-            return t.category === 'family';
+            return t.category === "family";
           })) {
             newState.categories = ___default['default'].filter(_this7.state.categories, function (c) {
-              return c.Key !== 'family';
+              return c.Key !== "family";
             });
           }
 
@@ -9657,15 +9571,15 @@
       value: function getUserList() {
         var _this8 = this;
 
-        if (this.state.AudienceType === 'UserType' && !___default['default'].isEmpty(this.state.Type)) {
+        if (this.state.AudienceType === "UserType" && !___default['default'].isEmpty(this.state.Type)) {
           var users = [];
           this.state.userList.forEach(function (element) {
             if (element.type !== _this8.state.Type) users.push(element);
           });
-          return ___default['default'].sortBy(users, 'displayName');
+          return ___default['default'].sortBy(users, "displayName");
         }
 
-        if (this.state.AudienceType === 'Category' && !___default['default'].isEmpty(this.state.Category)) {
+        if (this.state.AudienceType === "Category" && !___default['default'].isEmpty(this.state.Category)) {
           var _users = [];
 
           var types = ___default['default'].filter(this.state.types, function (type) {
@@ -9679,10 +9593,10 @@
               _users.push(element);
             }
           });
-          return ___default['default'].sortBy(_users, 'displayName');
+          return ___default['default'].sortBy(_users, "displayName");
         }
 
-        return ___default['default'].sortBy(this.state.userList, 'displayName');
+        return ___default['default'].sortBy(this.state.userList, "displayName");
       }
     }, {
       key: "selectCat",
@@ -9707,7 +9621,7 @@
           return typeObject.Title;
         }
 
-        return '';
+        return "";
       }
     }, {
       key: "validateCategory",
@@ -9727,7 +9641,7 @@
     }, {
       key: "showUserPickers",
       value: function showUserPickers(isInclude) {
-        if (isInclude && this.state.AudienceType === 'User') {
+        if (isInclude && this.state.AudienceType === "User") {
           return true;
         }
 
@@ -9739,15 +9653,15 @@
           return false;
         }
 
-        if (isInclude && this.state.AudienceType === 'All') {
+        if (isInclude && this.state.AudienceType === "All") {
           return false;
         }
 
-        if (!isInclude && this.state.AudienceType === 'User') {
+        if (!isInclude && this.state.AudienceType === "User") {
           return false;
         }
 
-        if (this.state.AudienceType === 'Category' && ___default['default'].isEmpty(this.state.Category) || this.state.AudienceType === 'UserType' && ___default['default'].isEmpty(this.state.Type)) {
+        if (this.state.AudienceType === "Category" && ___default['default'].isEmpty(this.state.Category) || this.state.AudienceType === "UserType" && ___default['default'].isEmpty(this.state.Type)) {
           return false;
         }
 
@@ -9758,15 +9672,15 @@
       value: function getUserExcludeList() {
         var _this10 = this;
 
-        if (this.state.AudienceType === 'UserType' && !___default['default'].isEmpty(this.state.Type)) {
+        if (this.state.AudienceType === "UserType" && !___default['default'].isEmpty(this.state.Type)) {
           var users = [];
           this.state.userList.forEach(function (element) {
             if (element.type === _this10.state.Type) users.push(element);
           });
-          return ___default['default'].sortBy(users, 'displayName');
+          return ___default['default'].sortBy(users, "displayName");
         }
 
-        if (this.state.AudienceType === 'Category' && !___default['default'].isEmpty(this.state.Category)) {
+        if (this.state.AudienceType === "Category" && !___default['default'].isEmpty(this.state.Category)) {
           var _users2 = [];
 
           var types = ___default['default'].filter(this.state.types, function (type) {
@@ -9780,10 +9694,10 @@
               _users2.push(element);
             }
           });
-          return ___default['default'].sortBy(_users2, 'displayName');
+          return ___default['default'].sortBy(_users2, "displayName");
         }
 
-        return ___default['default'].sortBy(this.state.userList, 'displayName');
+        return ___default['default'].sortBy(this.state.userList, "displayName");
       }
     }, {
       key: "addToInc",
@@ -9857,12 +9771,12 @@
         }, /*#__PURE__*/React__default['default'].createElement(Text, {
           type: "formTitleSmall",
           className: "marginBottom-16"
-        }, "Exclude Users From Selection ", "(".concat(this.state.excludeList.length, ")"))), /*#__PURE__*/React__default['default'].createElement(FontAwesome__default['default'], {
+        }, "Exclude Users From Selection", " ", "(".concat(this.state.excludeList.length, ")"))), /*#__PURE__*/React__default['default'].createElement(FontAwesome__default['default'], {
           style: {
             color: COLOUR_DUSK,
             fontSize: 12
           },
-          name: this.state.showExclude ? 'chevron-up' : 'chevron-down'
+          name: this.state.showExclude ? "chevron-up" : "chevron-down"
         })), this.state.showExclude && /*#__PURE__*/React__default['default'].createElement(exportObj$1, {
           add: this.addToEx.bind(this),
           remove: this.removeUserEx.bind(this),
@@ -9894,12 +9808,12 @@
         }, /*#__PURE__*/React__default['default'].createElement(Text, {
           type: "formTitleSmall",
           className: "marginBottom-16"
-        }, this.state.AudienceType !== 'User' ? 'Add Other' : 'Select', " Users ", "(".concat(this.state.includeList.length, ")"))), /*#__PURE__*/React__default['default'].createElement(FontAwesome__default['default'], {
+        }, this.state.AudienceType !== "User" ? "Add Other" : "Select", " ", "Users ", "(".concat(this.state.includeList.length, ")"))), /*#__PURE__*/React__default['default'].createElement(FontAwesome__default['default'], {
           style: {
             color: COLOUR_DUSK,
             fontSize: 12
           },
-          name: this.state.showInclude ? 'chevron-up' : 'chevron-down'
+          name: this.state.showInclude ? "chevron-up" : "chevron-down"
         })), this.state.showInclude && /*#__PURE__*/React__default['default'].createElement(exportObj$1, {
           add: this.addToInc.bind(this),
           remove: this.removeUserInc.bind(this),
@@ -9960,7 +9874,7 @@
     }, {
       key: "renderCustom",
       value: function renderCustom() {
-        if (this.state.AudienceType !== 'Custom') return null;
+        if (this.state.AudienceType !== "Custom") return null;
         return /*#__PURE__*/React__default['default'].createElement("div", {
           className: "optionsContent_bottom"
         }, /*#__PURE__*/React__default['default'].createElement(Text, {
@@ -9978,17 +9892,17 @@
         return /*#__PURE__*/React__default['default'].createElement("div", null, /*#__PURE__*/React__default['default'].createElement(Text, {
           type: "formTitleSmall",
           className: "marginBottom-16"
-        }, this.props.title || 'Target Audience'), /*#__PURE__*/React__default['default'].createElement(RadioButton, {
+        }, this.props.title || "Target Audience"), /*#__PURE__*/React__default['default'].createElement(RadioButton, {
           isActive: this.state.AudienceType,
           rowStyle: {
-            flexDirection: 'column'
+            flexDirection: "column"
           },
           buttonStyle: {
             marginBottom: 8
           },
           options: this.getOptions(),
           disabled: this.props.disabled
-        }), this.state.AudienceType === 'Category' && /*#__PURE__*/React__default['default'].createElement(DropdownInput, {
+        }), this.state.AudienceType === "Category" && /*#__PURE__*/React__default['default'].createElement(DropdownInput, {
           id: "typeSelect" // label='User Category'
           ,
           alwaysShowLabel: true,
@@ -10008,7 +9922,7 @@
           },
           isRequired: true,
           disabled: this.props.disabled
-        }), this.state.AudienceType === 'UserType' && /*#__PURE__*/React__default['default'].createElement(DropdownInput, {
+        }), this.state.AudienceType === "UserType" && /*#__PURE__*/React__default['default'].createElement(DropdownInput, {
           id: "typeSelect" // label='User Type'
           ,
           alwaysShowLabel: true,
@@ -10028,7 +9942,7 @@
           },
           isRequired: true,
           disabled: this.props.disabled
-        }), this.state.AudienceType === 'UserTags' && /*#__PURE__*/React__default['default'].createElement(DropdownInput, {
+        }), this.state.AudienceType === "UserTags" && /*#__PURE__*/React__default['default'].createElement(DropdownInput, {
           id: "tagSelect",
           alwaysShowLabel: true,
           placeholder: "User Tag",