react-autoql 3.4.2 → 3.4.3

package/dist/autoql.esm.js

@@ -12069,11 +12069,9 @@ var NotificationIcon = /*#__PURE__*/function (_React$Component) {
         while (1) {
           switch (_context.prev = _context.next) {
             case 0:
-              _this._isMounted = true;
+              _this._isMounted = true; // this.subscribeToNotificationCount()
 
-              _this.subscribeToNotificationCount();
-
-            case 2:
+            case 1:
             case "end":
               return _context.stop();
           }
@@ -14955,12 +14953,8 @@ var DataAlerts = /*#__PURE__*/function (_React$Component) {
         type: type
       })).then(function (response) {
         _this._isMounted && _this.setState({
-          customAlertsList: [],
-          projectAlertsList: response.data.items.filter(function (al) {
-            return _$1.find(al.projects, function (p) {
-              return p.id === _this.props.selectedDemoProjectId;
-            });
-          })
+          customAlertsList: _get(response, 'data.custom_alerts'),
+          projectAlertsList: _get(response, 'data.project_alerts')
         });
       }).catch(function (error) {
         console.error(error);
@@ -15022,20 +15016,13 @@ var DataAlerts = /*#__PURE__*/function (_React$Component) {
     _defineProperty(_assertThisInitialized(_this), "onEnableSwitchChange", function (e, dataAlert) {
       var newStatus = e.target.checked ? 'ACTIVE' : 'INACTIVE';
       var listType = dataAlert.type === 'CUSTOM' ? 'customAlertsList' : 'projectAlertsList';
-      var newProjects = dataAlert.projects.map(function (p) {
-        if (p.id === _this.props.selectedDemoProjectId) {
-          p.status = newStatus;
-        }
-
-        return p;
-      });
 
       var oldList = _cloneDeep(_this.state[listType]);
 
       var newList = _this.state[listType].map(function (n) {
         if (dataAlert.id === n.id) {
           return _objectSpread2(_objectSpread2({}, n), {}, {
-            projects: newProjects
+            status: newStatus
           });
         }
 
@@ -15130,13 +15117,8 @@ var DataAlerts = /*#__PURE__*/function (_React$Component) {
     });
 
     _defineProperty(_assertThisInitialized(_this), "hasError", function (dataAlert) {
-      return dataAlert.projects.map(function (p) {
-        return p.id === _this.props.selectedDemoProjectId;
-      })[0].status === 'GENERAL_ERROR' || dataAlert.projects.map(function (p) {
-        return p.id === _this.props.selectedDemoProjectId;
-      })[0].status === 'EVALUATION_ERROR' || dataAlert.projects.map(function (p) {
-        return p.id === _this.props.selectedDemoProjectId;
-      })[0].status === 'DATA_RETURN_ERROR';
+      console.log(dataAlert);
+      return dataAlert.status === 'GENERAL_ERROR' || dataAlert.status === 'EVALUATION_ERROR' || dataAlert.status === 'DATA_RETURN_ERROR';
     });
 
     _defineProperty(_assertThisInitialized(_this), "renderNotificationlist", function (type, list) {
@@ -15148,7 +15130,7 @@ var DataAlerts = /*#__PURE__*/function (_React$Component) {
         className: "data-alerts-list-container"
       }, type === 'custom' && _this.renderNotificationGroupTitle('Custom Data Alerts', 'View and manage your custom Data Alerts', true), type === 'custom' && !_get(list, 'length') && _this.renderEmptyListMessage(), type === 'project' && _this.renderNotificationGroupTitle('Subscribe to a Data Alert', 'Choose from a range of ready-to-use Alerts that have been set up for you'), /*#__PURE__*/React.createElement("div", {
         className: "react-autoql-notification-settings-container"
-      }, list.map(function (notification, i) {
+      }, list && list.map(function (notification, i) {
         return /*#__PURE__*/React.createElement("div", {
           key: "react-autoql-notification-setting-item-".concat(i),
           className: "react-autoql-notification-setting-item ".concat(notification.type)
@@ -15205,16 +15187,12 @@ var DataAlerts = /*#__PURE__*/function (_React$Component) {
         })) : /*#__PURE__*/React.createElement(Checkbox, {
           themeConfig: getThemeConfig(_this.props.themeConfig),
           type: "switch",
-          checked: notification.projects && notification.projects.filter(function (p) {
-            return p.status === 'ACTIVE' && p.id === _this.props.selectedDemoProjectId || p.status === 'WAITING' && p.id === _this.props.selectedDemoProjectId;
-          }).length > 0,
+          checked: notification.status === 'ACTIVE' || notification.status === 'WAITING',
           className: "react-autoql-notification-enable-checkbox",
           onClick: function onClick(e) {
             return e.stopPropagation();
           },
-          "data-tip": notification.projects && notification.projects.filter(function (p) {
-            return p.status === 'ACTIVE' && p.id === _this.props.selectedDemoProjectId || p.status === 'WAITING' && p.id === _this.props.selectedDemoProjectId;
-          }).length > 0 ? 'Turn Data Alert off' : 'Turn Data Alert on',
+          "data-tip": notification.status === 'ACTIVE' || notification.status === 'WAITING',
           "data-for": "react-autoql-notification-settings-tooltip",
           onChange: function onChange(e) {
             _this.onEnableSwitchChange(e, notification);
@@ -15246,16 +15224,16 @@ var DataAlerts = /*#__PURE__*/function (_React$Component) {
     });
 
     _defineProperty(_assertThisInitialized(_this), "render", function () {
-      // if (!this.state.customAlertsList) {
-      //   return (
-      //     <div
-      //       data-test="notification-settings"
-      //       style={{ textAlign: 'center', marginTop: '100px' }}
-      //     >
-      //       <LoadingDots />
-      //     </div>
-      //   )
-      // }
+      if (!_this.state.customAlertsList) {
+        return /*#__PURE__*/React.createElement("div", {
+          "data-test": "notification-settings",
+          style: {
+            textAlign: 'center',
+            marginTop: '100px'
+          }
+        }, /*#__PURE__*/React.createElement(LoadingDots, null));
+      }
+
       var projectAlertsList = _get(_this.state, 'projectAlertsList', []);
 
       var customAlertsList = _get(_this.state, 'customAlertsList', []);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-autoql",
-  "version": "3.4.2",
+  "version": "3.4.3",
   "description": "React Widget Library",
   "main": "dist/autoql.cjs.js",
   "module": "dist/autoql.esm.js",