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

package/dist/index.cjs.js

@@ -6,12 +6,12 @@ var _asyncToGenerator = require('@babel/runtime/helpers/asyncToGenerator');
 var _regeneratorRuntime = require('@babel/runtime/regenerator');
 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 awsAmplify = require('aws-amplify');
 var _classCallCheck = require('@babel/runtime/helpers/classCallCheck');
 var _createClass = require('@babel/runtime/helpers/createClass');
 var _inherits = require('@babel/runtime/helpers/inherits');
@@ -79,75 +79,7 @@ var CoreConfig = {
     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;
@@ -156,28 +88,29 @@ var CoreConfig = {
 
 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();
         }
@@ -237,28 +170,30 @@ var unauthedFunction = function unauthedFunction(request) {
 };
 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() {
@@ -267,19 +202,19 @@ var getCurrentUserSub = /*#__PURE__*/function () {
 }();
 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');
             }
@@ -1720,35 +1655,31 @@ function CanvasImageUploader(options) {
 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();
           }
@@ -1762,15 +1693,6 @@ var fileActions = {
 
     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();
@@ -1784,14 +1706,6 @@ var fileActions = {
   //     };
   //   });
   // },
-  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) {
@@ -4926,7 +4840,7 @@ function _createSuper$u(Derived) { var hasNativeReflectConstruct = _isNativeRefl
 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) {
@@ -4948,17 +4862,17 @@ var FileInputComponent = /*#__PURE__*/function (_Component) {
     _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;
       }
@@ -5052,7 +4966,7 @@ var FileInputComponent = /*#__PURE__*/function (_Component) {
                 return _this.props.handleFile(file, newInputs);
 
               case 9:
-                _this.checkSetDisplayValue(input, '');
+                _this.checkSetDisplayValue(input, "");
 
                 _context.next = 24;
                 break;
@@ -5074,7 +4988,7 @@ var FileInputComponent = /*#__PURE__*/function (_Component) {
               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
@@ -5119,7 +5033,7 @@ var FileInputComponent = /*#__PURE__*/function (_Component) {
   }, {
     key: "setValue",
     value: function setValue(val) {
-      if (typeof val === 'string') {
+      if (typeof val === "string") {
         this.setState({
           inputs: [{
             uploadingImage: false,
@@ -5145,20 +5059,20 @@ var FileInputComponent = /*#__PURE__*/function (_Component) {
   }, {
     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;
@@ -5167,10 +5081,10 @@ var FileInputComponent = /*#__PURE__*/function (_Component) {
     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",
@@ -5189,7 +5103,7 @@ var FileInputComponent = /*#__PURE__*/function (_Component) {
     key: "removeFile",
     value: function removeFile(input) {
       var newState = {};
-      input.value = '';
+      input.value = "";
 
       var newInputs = ___default['default'].clone(this.state.inputs);
 
@@ -5298,7 +5212,7 @@ var FileInputComponent = /*#__PURE__*/function (_Component) {
           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",
@@ -5324,7 +5238,7 @@ var FileInputComponent = /*#__PURE__*/function (_Component) {
       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);
@@ -9346,7 +9260,7 @@ var AudienceSelector = /*#__PURE__*/function (_Component) {
           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
@@ -9354,7 +9268,7 @@ var AudienceSelector = /*#__PURE__*/function (_Component) {
       });
       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)
@@ -9362,7 +9276,7 @@ var AudienceSelector = /*#__PURE__*/function (_Component) {
       });
       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)
@@ -9396,26 +9310,26 @@ var AudienceSelector = /*#__PURE__*/function (_Component) {
 
     _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 || []
@@ -9445,7 +9359,7 @@ var AudienceSelector = /*#__PURE__*/function (_Component) {
   }, {
     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
         });
@@ -9465,9 +9379,9 @@ var AudienceSelector = /*#__PURE__*/function (_Component) {
           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;
     }
   }, {
@@ -9512,9 +9426,9 @@ var AudienceSelector = /*#__PURE__*/function (_Component) {
       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);
     }
   }, {
@@ -9522,8 +9436,8 @@ var AudienceSelector = /*#__PURE__*/function (_Component) {
     value: function onChangeOption(type) {
       this.setState({
         AudienceType: type,
-        Type: '',
-        Category: '',
+        Type: "",
+        Category: "",
         includeList: [],
         excludeList: [],
         AudienceTagList: []
@@ -9536,57 +9450,57 @@ var AudienceSelector = /*#__PURE__*/function (_Component) {
       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");
           }
         });
       }
@@ -9599,11 +9513,11 @@ var AudienceSelector = /*#__PURE__*/function (_Component) {
       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;
     }
   }, {
@@ -9629,7 +9543,7 @@ var AudienceSelector = /*#__PURE__*/function (_Component) {
         return typeObject.displayName;
       }
 
-      return '';
+      return "";
     }
   }, {
     key: "getTagTitle",
@@ -9644,7 +9558,7 @@ var AudienceSelector = /*#__PURE__*/function (_Component) {
         return tag.Title;
       }
 
-      return '';
+      return "";
     }
   }, {
     key: "getUserTypes",
@@ -9665,7 +9579,7 @@ var AudienceSelector = /*#__PURE__*/function (_Component) {
               return c.Key === e.category;
             });
 
-            var shortName = category ? "(".concat(category.ShortName, ") ") : '';
+            var shortName = category ? "(".concat(category.ShortName, ") ") : "";
             e.Title = "".concat(shortName, " ").concat(e.Title);
           }
         });
@@ -9674,10 +9588,10 @@ var AudienceSelector = /*#__PURE__*/function (_Component) {
         };
 
         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";
           });
         }
 
@@ -9689,15 +9603,15 @@ var AudienceSelector = /*#__PURE__*/function (_Component) {
     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) {
@@ -9711,10 +9625,10 @@ var AudienceSelector = /*#__PURE__*/function (_Component) {
             _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",
@@ -9739,7 +9653,7 @@ var AudienceSelector = /*#__PURE__*/function (_Component) {
         return typeObject.Title;
       }
 
-      return '';
+      return "";
     }
   }, {
     key: "validateCategory",
@@ -9759,7 +9673,7 @@ var AudienceSelector = /*#__PURE__*/function (_Component) {
   }, {
     key: "showUserPickers",
     value: function showUserPickers(isInclude) {
-      if (isInclude && this.state.AudienceType === 'User') {
+      if (isInclude && this.state.AudienceType === "User") {
         return true;
       }
 
@@ -9771,15 +9685,15 @@ var AudienceSelector = /*#__PURE__*/function (_Component) {
         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;
       }
 
@@ -9790,15 +9704,15 @@ var AudienceSelector = /*#__PURE__*/function (_Component) {
     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) {
@@ -9812,10 +9726,10 @@ var AudienceSelector = /*#__PURE__*/function (_Component) {
             _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",
@@ -9889,12 +9803,12 @@ var AudienceSelector = /*#__PURE__*/function (_Component) {
       }, /*#__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),
@@ -9926,12 +9840,12 @@ var AudienceSelector = /*#__PURE__*/function (_Component) {
       }, /*#__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),
@@ -9992,7 +9906,7 @@ var AudienceSelector = /*#__PURE__*/function (_Component) {
   }, {
     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, {
@@ -10010,17 +9924,17 @@ var AudienceSelector = /*#__PURE__*/function (_Component) {
       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,
@@ -10040,7 +9954,7 @@ var AudienceSelector = /*#__PURE__*/function (_Component) {
         },
         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,
@@ -10060,7 +9974,7 @@ var AudienceSelector = /*#__PURE__*/function (_Component) {
         },
         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",