versacall-dashboards-library-react 2.0.13 → 2.0.17

package/dist/components/DashboardsCellGlobalConditions/DashboardsCellGlobalConditions.js

@@ -11,8 +11,6 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 
 var _styles = require("@material-ui/core/styles");
 
-var _CardActionArea = _interopRequireDefault(require("@material-ui/core/CardActionArea"));
-
 var _Button = _interopRequireDefault(require("@material-ui/core/Button"));
 
 var _IconButton = _interopRequireDefault(require("@material-ui/core/IconButton"));
@@ -287,6 +285,23 @@ var reorder = (list, startIndex, endIndex) => {
   return result;
 };
 
+var determineIfAdvanced = condition => {
+  // console.log('determinIfAdvanced', condition);
+  if (condition) {
+    var split = condition.split(/[ ,]+/);
+
+    if (split.length === 3) {
+      var operator = operatorOptions.find(x => x.value === split[1]);
+
+      if (operator) {
+        return false;
+      }
+    }
+  }
+
+  return true;
+};
+
 class DashboardsCellGlobalConditions extends _react.Component {
   constructor(props) {
     super(props);
@@ -296,8 +311,7 @@ class DashboardsCellGlobalConditions extends _react.Component {
       conditionIndex: null,
       menuIndex: null,
       menuAnchorEl: null,
-      advanced: false,
-      typeCondition: ''
+      advanced: false
       /* styleColumns: [
       {
       id: 'condition', style: { paddingRight: 0 }, label: props.intl.formatMessage({ id: '__condition' }), customCell: custom => conditionCustomCell(custom),
@@ -416,30 +430,39 @@ class DashboardsCellGlobalConditions extends _react.Component {
   }
 
   updateCondition(change) {
-    var updatedValue = _objectSpread({}, this.props.value);
+    var _this$state = this.state,
+        conditionIndex = _this$state.conditionIndex,
+        tabIndex = _this$state.tabIndex; // console.log(`conditionIndex = ${conditionIndex}`);
+
+    var updatedValue = _objectSpread({}, this.props.value); // console.log('updatedValue', updatedValue);
+    // const conditions = updatedValue[`${typeCondition}Conditions`];
+
 
-    var conditions = updatedValue["".concat(this.state.typeCondition, "Conditions")]; // const conditions = JSON.parse(JSON.stringify(this.props.value[`${this.state.typeCondition}Conditions`]));
+    var conditions = tabIndex === 1 ? updatedValue.contentConditions : updatedValue.styleConditions; // const conditions = JSON.parse(JSON.stringify(this.props.value[`${this.state.typeCondition}Conditions`]));
 
     if (this.state.advanced) {
-      conditions[this.state.conditionIndex].condition = change.value;
+      conditions[conditionIndex].condition = change.value;
     } else {
-      var split = conditions[this.state.conditionIndex].condition.split(/[ ,]+/);
+      var split = conditions[conditionIndex].condition.split(/[ ,]+/);
+      var segment1 = split[0];
+      var segment2 = split.length > 1 ? split[1] : '===';
+      var segment3 = split.length > 2 ? split[2] : '0';
 
       switch (change.stringIndex) {
         case 0:
-          conditions[this.state.conditionIndex].condition = "".concat(change.value, " ").concat(split[1], " ").concat(split[2]);
+          conditions[conditionIndex].condition = "".concat(change.value, " ").concat(segment2, " ").concat(segment3);
           break;
 
         case 1:
-          conditions[this.state.conditionIndex].condition = "".concat(split[0], " ").concat(change.value, " ").concat(split[2]);
+          conditions[conditionIndex].condition = "".concat(segment1, " ").concat(change.value, " ").concat(segment3);
           break;
 
         case 2:
-          conditions[this.state.conditionIndex].condition = "".concat(split[0], " ").concat(split[1], " ").concat(change.value);
+          conditions[conditionIndex].condition = "".concat(segment1, " ").concat(segment2, " ").concat(change.value);
           break;
 
         default:
-          conditions[this.state.conditionIndex].condition = '1 > 0';
+          conditions[conditionIndex].condition = "".concat(segment1, " ").concat(segment2, " ").concat(segment3);
           break;
       }
     } // this.props.updateValue({ [`${this.state.typeCondition}Conditions`]: conditions });
@@ -488,7 +511,6 @@ class DashboardsCellGlobalConditions extends _react.Component {
 
   addCondition() {
     var conditions = JSON.parse(JSON.stringify(this.props.value));
-    var typeCondition = '';
     var index = null;
 
     if (this.state.tabIndex === 0) {
@@ -498,7 +520,6 @@ class DashboardsCellGlobalConditions extends _react.Component {
         styleIds: []
       });
       index = conditions.styleConditions.length - 1;
-      typeCondition = 'style';
     } else {
       conditions.contentConditions.push({
         condition: '1 > 0',
@@ -508,7 +529,6 @@ class DashboardsCellGlobalConditions extends _react.Component {
         }
       });
       index = conditions.contentConditions.length - 1;
-      typeCondition = 'content';
     }
 
     this.props.updateValue({
@@ -517,23 +537,24 @@ class DashboardsCellGlobalConditions extends _react.Component {
     });
     this.setState({
       conditionIndex: index,
-      advanced: false,
-      typeCondition: typeCondition
+      advanced: false
     });
   }
 
   copyCondition(condition) {
-    var conditions = JSON.parse(JSON.stringify(this.props.value));
+    var newValue = JSON.parse(JSON.stringify(this.props.value));
     var newCondition = JSON.parse(JSON.stringify(condition));
     delete newCondition.index;
-    conditions[this.state.tabIndex === 0 ? 'styleConditions' : 'contentConditions'].push(newCondition);
+    var conditions = newValue[this.state.tabIndex === 0 ? 'styleConditions' : 'contentConditions'];
+    conditions.push(newCondition);
+    var advanced = determineIfAdvanced(newCondition.condition);
     this.props.updateValue({
-      styleConditions: conditions.styleConditions,
-      contentConditions: conditions.contentConditions
+      styleConditions: newValue.styleConditions,
+      contentConditions: newValue.contentConditions
     });
     this.setState(prevState => ({
-      conditionIndex: "".concat(conditions[prevState.tabIndex === 0 ? 'styleConditions' : 'contentConditions'].length),
-      advanced: false
+      conditionIndex: conditions.length - 1,
+      advanced: advanced
     }));
   }
 
@@ -605,9 +626,14 @@ class DashboardsCellGlobalConditions extends _react.Component {
   }
 
   selectCondition(index) {
-    // TODO - Determine advanced state
+    var value = this.props.value;
+    var tabIndex = this.state.tabIndex;
+    var conditions = tabIndex === 1 ? value.contentConditions : value.styleConditions;
+    var condition = conditions[index];
+    var advanced = determineIfAdvanced(condition.condition);
     this.setState({
-      conditionIndex: index
+      conditionIndex: index,
+      advanced: advanced
     });
   }
 
@@ -617,9 +643,9 @@ class DashboardsCellGlobalConditions extends _react.Component {
     var _this$props = this.props,
         classes = _this$props.classes,
         intl = _this$props.intl;
-    var _this$state = this.state,
-        tabIndex = _this$state.tabIndex,
-        conditionIndex = _this$state.conditionIndex;
+    var _this$state2 = this.state,
+        tabIndex = _this$state2.tabIndex,
+        conditionIndex = _this$state2.conditionIndex;
     var divStyle = {
       border: '1px solid black',
       padding: 10,
@@ -682,13 +708,13 @@ class DashboardsCellGlobalConditions extends _react.Component {
         styles = _this$props2.styles,
         widgets = _this$props2.widgets,
         variables = _this$props2.variables;
-    var _this$state2 = this.state,
-        open = _this$state2.open,
-        tabIndex = _this$state2.tabIndex,
-        conditionIndex = _this$state2.conditionIndex,
-        menuIndex = _this$state2.menuIndex,
-        menuAnchorEl = _this$state2.menuAnchorEl,
-        advanced = _this$state2.advanced;
+    var _this$state3 = this.state,
+        open = _this$state3.open,
+        tabIndex = _this$state3.tabIndex,
+        conditionIndex = _this$state3.conditionIndex,
+        menuIndex = _this$state3.menuIndex,
+        menuAnchorEl = _this$state3.menuAnchorEl,
+        advanced = _this$state3.advanced;
     var currentCondition = null;
 
     if (conditionIndex !== null) {
@@ -717,30 +743,23 @@ class DashboardsCellGlobalConditions extends _react.Component {
     return /*#__PURE__*/_react.default.createElement(_Grid.default, {
       xs: 6,
       item: true
-    }, /*#__PURE__*/_react.default.createElement(_CardActionArea.default, {
-      onClick: () => this.setState({
-        open: true
-      })
     }, /*#__PURE__*/_react.default.createElement(_Button.default, {
       variant: "contained",
       color: "secondary",
       size: "large",
       style: {
         width: '100%'
-      }
+      },
+      onClick: () => this.setState({
+        open: true
+      })
     }, /*#__PURE__*/_react.default.createElement(_CallSplit.default, {
       style: {
         marginRight: 10
       }
     }), "".concat(intl.formatMessage({
       id: '__conditions'
-    })).concat(totalConditions > 0 ? " (".concat(totalConditions, ")") : '')), totalConditions > 0 && /*#__PURE__*/_react.default.createElement("div", {
-      style: style.information
-    }, value.styleConditions.length > 0 && /*#__PURE__*/_react.default.createElement("div", null, "".concat(intl.formatMessage({
-      id: '__style'
-    }), ": ").concat(value.styleConditions.length)), value.contentConditions.length > 0 && /*#__PURE__*/_react.default.createElement("div", null, "".concat(intl.formatMessage({
-      id: '__content'
-    }), ": ").concat(value.contentConditions.length)))), open && /*#__PURE__*/_react.default.createElement(_Dialog.default, {
+    })).concat(totalConditions > 0 ? " (".concat(totalConditions, ")") : '')), open && /*#__PURE__*/_react.default.createElement(_Dialog.default, {
       maxWidth: "xl",
       onClose: () => this.setState({
         open: false,

package/package.json

@@ -2,10 +2,10 @@
   "versacall": {
     "title": "Versacall Dashboards Library React",
     "applicationType": "react-library",
-    "build": 13
+    "build": 17
   },
   "name": "versacall-dashboards-library-react",
-  "version": "2.0.13",
+  "version": "2.0.17",
   "description": "Versacall Dashboards Library",
   "main": "dist/index.js",
   "module": "dist/index.js",