@plusscommunities/pluss-core-web 1.2.5 → 1.2.9-beta.0

package/dist/index.umd.js

@@ -8286,7 +8286,8 @@
 
         if (disabled) {
           return /*#__PURE__*/React__default['default'].createElement("div", {
-            className: "timepicker disabled"
+            className: "timepicker disabled",
+            style: this.props.style
           }, /*#__PURE__*/React__default['default'].createElement("span", {
             className: "timepicker__span",
             style: this.props.inputStyle
@@ -8294,7 +8295,8 @@
         }
 
         return /*#__PURE__*/React__default['default'].createElement("div", {
-          className: "timepicker ".concat(this.props.className)
+          className: "timepicker ".concat(this.props.className),
+          style: this.props.style
         }, /*#__PURE__*/React__default['default'].createElement("input", {
           className: "timepicker__input",
           maxLength: "2",
@@ -8828,42 +8830,22 @@
 
     var _super = _createSuper$4(AudienceSelector);
 
-    function AudienceSelector() {
+    function AudienceSelector(props) {
       var _this;
 
       _classCallCheck__default['default'](this, AudienceSelector);
 
-      for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-        args[_key] = arguments[_key];
-      }
+      _this = _super.call(this, props);
 
-      _this = _super.call.apply(_super, [this].concat(args));
+      _defineProperty__default['default'](_assertThisInitialized__default['default'](_this), "onChangeSelection", function () {
+        var _this$props = _this.props,
+            updateValidation = _this$props.updateValidation,
+            onChange = _this$props.onChange;
 
-      _defineProperty__default['default'](_assertThisInitialized__default['default'](_this), "state", {
-        categories: [{
-          Title: 'All Primary Users',
-          Key: 'resident',
-          ShortName: 'Primary'
-        }, {
-          Title: 'All Staff Users',
-          Key: 'staff',
-          ShortName: 'Staff'
-        }, {
-          Title: 'All Linked Users',
-          Key: 'family',
-          ShortName: 'Linked'
-        }],
-        types: [],
-        AudienceType: 'All',
-        showInclude: false,
-        includeList: [],
-        showExclude: false,
-        excludeList: [],
-        Type: '',
-        Category: '',
-        userList: [],
-        tagList: [],
-        AudienceTagList: []
+        var isValid = _this.validateAudienceSelection();
+
+        if (updateValidation) updateValidation(isValid);
+        if (onChange) onChange(_this.getAudienceType(), _this.getAudienceTypeSelection(), isValid);
       });
 
       _defineProperty__default['default'](_assertThisInitialized__default['default'](_this), "selectTag", function (key) {
@@ -8873,9 +8855,7 @@
           excludeList: []
         });
 
-        setTimeout(function () {
-          _this.props.updateValidation(_this.validateAudienceSelection());
-        }, 50);
+        setTimeout(_this.onChangeSelection, 50);
       });
 
       _defineProperty__default['default'](_assertThisInitialized__default['default'](_this), "validateCustom", function () {
@@ -8883,6 +8863,7 @@
       });
 
       _defineProperty__default['default'](_assertThisInitialized__default['default'](_this), "getAvailableAudienceTags", function () {
+        var includeSelected = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
         var _this$state = _this.state,
             categories = _this$state.categories,
             types = _this$state.types,
@@ -8912,7 +8893,8 @@
             Title: "User Tag: ".concat(t.Title)
           };
         });
-        return [].concat(_toConsumableArray__default['default'](categoryTags), _toConsumableArray__default['default'](userTypeTags), _toConsumableArray__default['default'](userTagTags)).filter(function (t) {
+        var result = [].concat(_toConsumableArray__default['default'](categoryTags), _toConsumableArray__default['default'](userTypeTags), _toConsumableArray__default['default'](userTagTags));
+        return includeSelected ? result : result.filter(function (t) {
           return !___default['default'].some(AudienceTagList, function (at) {
             return at.Id === t.Id;
           });
@@ -8924,9 +8906,7 @@
 
         _this.setState({
           AudienceTagList: AudienceTagList
-        }, function () {
-          return _this.props.updateValidation(_this.validateAudienceSelection());
-        });
+        }, _this.onChangeSelection);
       });
 
       _defineProperty__default['default'](_assertThisInitialized__default['default'](_this), "onDetachAudienceTag", function (tag) {
@@ -8936,26 +8916,58 @@
 
         _this.setState({
           AudienceTagList: AudienceTagList
-        }, function () {
-          return _this.props.updateValidation(_this.validateAudienceSelection());
-        });
+        }, _this.onChangeSelection);
       });
 
+      _this.state = {
+        categories: [{
+          Title: 'All Primary Users',
+          Key: 'resident',
+          ShortName: 'Primary'
+        }, {
+          Title: 'All Staff Users',
+          Key: 'staff',
+          ShortName: 'Staff'
+        }, {
+          Title: 'All Linked Users',
+          Key: 'family',
+          ShortName: 'Linked'
+        }],
+        types: [],
+        AudienceType: props.audienceType || 'All',
+        showInclude: false,
+        includeList: [],
+        showExclude: false,
+        excludeList: [],
+        Type: '',
+        Category: '',
+        userList: [],
+        tagList: [],
+        AudienceTagList: props.audienceTypeSelection || []
+      };
       return _this;
     }
 
     _createClass__default['default'](AudienceSelector, [{
       key: "componentDidMount",
       value: function componentDidMount() {
-        var _this$props = this.props,
-            disallowUserType = _this$props.disallowUserType,
-            custom = _this$props.custom,
-            disallowSingleUsers = _this$props.disallowSingleUsers,
-            allowTags = _this$props.allowTags;
+        var _this$props2 = this.props,
+            disallowUserType = _this$props2.disallowUserType,
+            custom = _this$props2.custom,
+            disallowSingleUsers = _this$props2.disallowSingleUsers,
+            allowTags = _this$props2.allowTags;
         if (!disallowUserType || custom) this.getUserTypes();
         if (!disallowSingleUsers) this.getUsers();
         if (allowTags || custom) this.getUserTags();
       }
+    }, {
+      key: "componentDidUpdate",
+      value: function componentDidUpdate(prevProps) {
+        var newState = {};
+        if (prevProps.audienceType !== this.props.audienceType) newState.AudienceType = this.props.audienceType;
+        if (!___default['default'].isEqual(prevProps.audienceTypeSelection, this.props.audienceTypeSelection)) newState.AudienceTagList = this.props.audienceTypeSelection;
+        if (!___default['default'].isEmpty(newState)) this.setState(newState);
+      }
     }, {
       key: "onSubmit",
       value: function onSubmit() {
@@ -8979,12 +8991,7 @@
             Category = _this$state2.Category,
             Tag = _this$state2.Tag,
             Type = _this$state2.Type;
-        if (AudienceType === 'Custom') return AudienceTagList.map(function (at) {
-          return {
-            AudienceType: at.AudienceType,
-            AudienceTypeSelection: at.AudienceTypeSelection
-          };
-        });
+        if (AudienceType === 'Custom') return AudienceTagList || [];
         if (AudienceType === 'Category') return Category;
         if (AudienceType === 'UserTags') return Tag;
         return Type;
@@ -9039,29 +9046,26 @@
     }, {
       key: "onChangeOption",
       value: function onChangeOption(type) {
-        var _this4 = this;
-
         this.setState({
           AudienceType: type,
           Type: '',
           Category: '',
           includeList: [],
-          excludeList: []
+          excludeList: [],
+          AudienceTagList: []
         });
-        setTimeout(function () {
-          _this4.props.updateValidation(_this4.validateAudienceSelection());
-        }, 50);
+        setTimeout(this.onChangeSelection, 50);
       }
     }, {
       key: "getOptions",
       value: function getOptions() {
-        var _this5 = this;
+        var _this4 = this;
 
         var options = [{
           Label: 'All users',
           Value: 'All',
           onChange: function onChange() {
-            return _this5.onChangeOption('All');
+            return _this4.onChangeOption('All');
           }
         }];
 
@@ -9070,7 +9074,7 @@
             Label: 'Custom',
             Value: 'Custom',
             onChange: function onChange() {
-              return _this5.onChangeOption('Custom');
+              return _this4.onChangeOption('Custom');
             }
           });
         } else {
@@ -9078,7 +9082,7 @@
             Label: 'By user category',
             Value: 'Category',
             onChange: function onChange() {
-              return _this5.onChangeOption('Category');
+              return _this4.onChangeOption('Category');
             }
           });
         }
@@ -9088,7 +9092,7 @@
             Label: 'By user type',
             Value: 'UserType',
             onChange: function onChange() {
-              return _this5.onChangeOption('UserType');
+              return _this4.onChangeOption('UserType');
             }
           });
         }
@@ -9098,7 +9102,7 @@
             Label: 'By user tag',
             Value: 'UserTags',
             onChange: function onChange() {
-              return _this5.onChangeOption('UserTags');
+              return _this4.onChangeOption('UserTags');
             }
           });
         }
@@ -9108,7 +9112,7 @@
             Label: 'To single users',
             Value: 'User',
             onChange: function onChange() {
-              return _this5.onChangeOption('User');
+              return _this4.onChangeOption('User');
             }
           });
         }
@@ -9131,24 +9135,20 @@
     }, {
       key: "selectType",
       value: function selectType(key) {
-        var _this6 = this;
-
         this.setState({
           Type: key,
           includeList: [],
           excludeList: []
         });
-        setTimeout(function () {
-          _this6.props.updateValidation(_this6.validateAudienceSelection());
-        }, 50);
+        setTimeout(this.onChangeSelection, 50);
       }
     }, {
       key: "getTypeTitle",
       value: function getTypeTitle() {
-        var _this7 = this;
+        var _this5 = this;
 
         var typeObject = ___default['default'].find(this.state.types, function (t) {
-          return t.typeName === _this7.state.Type;
+          return t.typeName === _this5.state.Type;
         });
 
         if (typeObject) {
@@ -9160,10 +9160,10 @@
     }, {
       key: "getTagTitle",
       value: function getTagTitle() {
-        var _this8 = this;
+        var _this6 = this;
 
         var tag = ___default['default'].find(this.state.tagList, function (t) {
-          return t.Id === _this8.state.Tag;
+          return t.Id === _this6.state.Tag;
         });
 
         if (tag) {
@@ -9175,10 +9175,10 @@
     }, {
       key: "getUserTypes",
       value: function getUserTypes() {
-        var _this9 = this;
+        var _this7 = this;
 
         typeActions.getUserTypes(this.props.auth.site).then(function (res) {
-          _this9.props.setAuth({
+          _this7.props.setAuth({
             userTypes: ___default['default'].cloneDeep(res.data)
           });
 
@@ -9187,7 +9187,7 @@
             e.Key = e.typeName;
 
             if (e.category) {
-              var category = ___default['default'].find(_this9.state.categories, function (c) {
+              var category = ___default['default'].find(_this7.state.categories, function (c) {
                 return c.Key === e.category;
               });
 
@@ -9196,7 +9196,7 @@
             }
           });
 
-          _this9.setState({
+          _this7.setState({
             types: res.data
           });
         }).catch(function (error) {});
@@ -9204,12 +9204,12 @@
     }, {
       key: "getUserList",
       value: function getUserList() {
-        var _this10 = this;
+        var _this8 = this;
 
         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);
+            if (element.type !== _this8.state.Type) users.push(element);
           });
           return ___default['default'].sortBy(users, 'displayName');
         }
@@ -9218,7 +9218,7 @@
           var _users = [];
 
           var types = ___default['default'].filter(this.state.types, function (type) {
-            return type.category === _this10.state.Category;
+            return type.category === _this8.state.Category;
           }).map(function (type) {
             return type.typeName;
           });
@@ -9236,24 +9236,20 @@
     }, {
       key: "selectCat",
       value: function selectCat(key, e) {
-        var _this11 = this;
-
         this.setState({
           Category: key,
           includeList: [],
           excludeList: []
         });
-        setTimeout(function () {
-          _this11.props.updateValidation(_this11.validateAudienceSelection());
-        }, 50);
+        setTimeout(this.onChangeSelection, 50);
       }
     }, {
       key: "getCatTitle",
       value: function getCatTitle() {
-        var _this12 = this;
+        var _this9 = this;
 
         var typeObject = ___default['default'].find(this.state.categories, function (t) {
-          return t.Key === _this12.state.Category;
+          return t.Key === _this9.state.Category;
         });
 
         if (typeObject) {
@@ -9309,12 +9305,12 @@
     }, {
       key: "getUserExcludeList",
       value: function getUserExcludeList() {
-        var _this13 = this;
+        var _this10 = this;
 
         if (this.state.AudienceType === 'UserType' && !___default['default'].isEmpty(this.state.Type)) {
           var users = [];
           this.state.userList.forEach(function (element) {
-            if (element.type === _this13.state.Type) users.push(element);
+            if (element.type === _this10.state.Type) users.push(element);
           });
           return ___default['default'].sortBy(users, 'displayName');
         }
@@ -9323,7 +9319,7 @@
           var _users2 = [];
 
           var types = ___default['default'].filter(this.state.types, function (type) {
-            return type.category === _this13.state.Category;
+            return type.category === _this10.state.Category;
           }).map(function (type) {
             return type.typeName;
           });
@@ -9341,8 +9337,6 @@
     }, {
       key: "addToInc",
       value: function addToInc(user) {
-        var _this14 = this;
-
         var list = _toConsumableArray__default['default'](this.state.includeList);
 
         list.push({
@@ -9353,23 +9347,17 @@
         this.setState({
           includeList: list
         });
-        setTimeout(function () {
-          _this14.props.updateValidation(_this14.validateAudienceSelection());
-        }, 50);
+        setTimeout(this.onChangeSelection, 50);
       }
     }, {
       key: "removeUserInc",
       value: function removeUserInc(user) {
-        var _this15 = this;
-
         this.setState({
           includeList: ___default['default'].filter(this.state.includeList, function (ev) {
             return ev.Id !== user.Id;
           })
         });
-        setTimeout(function () {
-          _this15.props.updateValidation(_this15.validateAudienceSelection());
-        }, 50);
+        setTimeout(this.onChangeSelection, 50);
       }
     }, {
       key: "addToEx",
@@ -9397,7 +9385,7 @@
     }, {
       key: "renderExcludes",
       value: function renderExcludes() {
-        var _this16 = this;
+        var _this11 = this;
 
         if (!this.showUserPickers(false)) {
           return null;
@@ -9409,8 +9397,8 @@
         }, /*#__PURE__*/React__default['default'].createElement("div", {
           className: "flex flex-between pointer",
           onClick: function onClick() {
-            _this16.setState({
-              showExclude: !_this16.state.showExclude
+            _this11.setState({
+              showExclude: !_this11.state.showExclude
             });
           }
         }, /*#__PURE__*/React__default['default'].createElement("div", {
@@ -9434,7 +9422,7 @@
     }, {
       key: "renderIncludes",
       value: function renderIncludes() {
-        var _this17 = this;
+        var _this12 = this;
 
         if (!this.showUserPickers(true)) {
           return null;
@@ -9446,8 +9434,8 @@
         }, /*#__PURE__*/React__default['default'].createElement("div", {
           className: "flex flex-between pointer",
           onClick: function onClick() {
-            _this17.setState({
-              showInclude: !_this17.state.showInclude
+            _this12.setState({
+              showInclude: !_this12.state.showInclude
             });
           }
         }, /*#__PURE__*/React__default['default'].createElement("div", {
@@ -9471,7 +9459,7 @@
     }, {
       key: "renderAssignedAudiences",
       value: function renderAssignedAudiences() {
-        var _this18 = this;
+        var _this13 = this;
 
         var AudienceTagList = this.state.AudienceTagList;
         var maxWidth = this.props.maxWidth;
@@ -9490,7 +9478,7 @@
             text: t.Title,
             rightIcon: "remove",
             rightClick: function rightClick() {
-              return _this18.onDetachAudienceTag(t);
+              return _this13.onDetachAudienceTag(t);
             }
           });
         }));
@@ -9498,7 +9486,7 @@
     }, {
       key: "renderAvailableAudiences",
       value: function renderAvailableAudiences() {
-        var _this19 = this;
+        var _this14 = this;
 
         var maxWidth = this.props.maxWidth;
         var tags = this.getAvailableAudienceTags();
@@ -9513,7 +9501,7 @@
             className: "marginLeft-16 marginBottom-8",
             text: t.Title,
             onClick: function onClick() {
-              return _this19.onAttachAudienceTag(t);
+              return _this14.onAttachAudienceTag(t);
             }
           });
         }));
@@ -9534,7 +9522,7 @@
     }, {
       key: "render",
       value: function render() {
-        var _this20 = this;
+        var _this15 = this;
 
         return /*#__PURE__*/React__default['default'].createElement("div", null, /*#__PURE__*/React__default['default'].createElement(Text, {
           type: "formTitleSmall",
@@ -9556,10 +9544,10 @@
           placeholder: "User Category",
           value: this.getCatTitle(),
           isValid: function isValid() {
-            return _this20.validateCategory();
+            return _this15.validateCategory();
           },
           showError: function showError() {
-            return _this20.state.showWarnings && !_this20.validateCategory();
+            return _this15.state.showWarnings && !_this15.validateCategory();
           },
           options: this.state.categories,
           onSelect: this.selectCat.bind(this),
@@ -9576,10 +9564,10 @@
           placeholder: "User Type",
           value: this.getTypeTitle(),
           isValid: function isValid() {
-            return _this20.validateType();
+            return _this15.validateType();
           },
           showError: function showError() {
-            return _this20.state.showWarnings && !_this20.validateType();
+            return _this15.state.showWarnings && !_this15.validateType();
           },
           options: this.state.types,
           onSelect: this.selectType.bind(this),
@@ -9595,10 +9583,10 @@
           placeholder: "User Tag",
           value: this.getTagTitle(),
           isValid: function isValid() {
-            return _this20.validateTag();
+            return _this15.validateTag();
           },
           showError: function showError() {
-            return _this20.state.showWarnings && !_this20.validateTag();
+            return _this15.state.showWarnings && !_this15.validateTag();
           },
           options: this.state.tagList,
           onSelect: this.selectTag,

package/package.json

@@ -1,12 +1,15 @@
 {
   "name": "@plusscommunities/pluss-core-web",
-  "version": "1.2.5",
+  "version": "1.2.9-beta.0",
   "description": "Core extension package for Pluss Communities platform",
   "main": "dist/index.cjs.js",
   "scripts": {
     "build": "npm i && rollup -c",
+    "betapatch": "npm version prepatch --preid=beta",
     "patch": "npm version patch",
-    "upload": "npm run build && npm publish --access public && rm -rf node_modules",
+    "betaupload": "npm run build && npm publish --access public --tag beta",
+    "betaupload:p": "npm run betapatch && npm run betaupload",
+    "upload": "npm run build && npm publish --access public",
     "upload:p": "npm run patch && npm run upload"
   },
   "author": "Phillip Suh",