Hotfix for maxUsages - consider non-label states

Author: hlomzik

src/tags/object/AudioPlus.js

@@ -176,15 +176,8 @@ const Model = types
         return find_r;
       }
 
-      const exceeded = self.states().reduce((list, s) => list.concat(s.checkMaxUsages()), []);
-      const allStates = self.activeStates();
-
+      const allStates = self.getAvailableStates();
       if (allStates.length === 0) {
-        if (exceeded.length) {
-          const label = exceeded[0];
-          InfoModal.warning(`You can't use ${label.value} more than ${label.maxUsages} time(s)`);
-        }
-        self.completion.regionStore.unselectAll(true);
         ws_region.remove && ws_region.remove();
         return;
       }

src/tags/object/Base.js

@@ -1,6 +1,7 @@
 import { types } from "mobx-state-tree";
 import lodash from "../../utils/lodash";
 import { guidGenerator, restoreNewsnapshot } from "../../core/Helpers";
+import InfoModal from "../../components/Infomodal/Infomodal";
 
 const ObjectBase = types
   .model({
@@ -38,9 +39,29 @@ const ObjectBase = types
       return props;
     }
 
+    // @todo maybe not a best place for this method?
+    // check that maxUsages was not exceeded for labels
+    // and if it was - don't allow to create new region and unselect all regions
+    // unselect labels which was exceeded maxUsages
+    // return all states left untouched - available labels and others
+    function getAvailableStates() {
+      const checkAndCollect = (list, s) => (s.checkMaxUsages ? list.concat(s.checkMaxUsages()) : list);
+      const exceeded = self.states().reduce(checkAndCollect, []);
+      const states = self.activeStates();
+      if (states.length === 0) {
+        if (exceeded.length) {
+          const label = exceeded[0];
+          InfoModal.warning(`You can't use ${label.value} more than ${label.maxUsages} time(s)`);
+        }
+        self.completion.regionStore.unselectAll(true);
+      }
+      return states;
+    }
+
     return {
       addProp,
       getProps,
+      getAvailableStates,
     };
   });
 

src/tags/object/HyperText.js

@@ -89,16 +89,8 @@ const Model = types
     },
 
     addRegion(range) {
-      const exceeded = self.states().reduce((list, s) => list.concat(s.checkMaxUsages()), []);
-      const states = self.activeStates();
-      if (states.length === 0) {
-        if (exceeded.length) {
-          const label = exceeded[0];
-          InfoModal.warning(`You can't use ${label.value} more than ${label.maxUsages} time(s)`);
-        }
-        self.completion.regionStore.unselectAll(true);
-        return;
-      }
+      const states = self.getAvailableStates();
+      if (states.length === 0) return;
 
       const clonedStates = states.map(s => cloneNode(s));
 

src/tags/object/Image.js

@@ -331,20 +331,9 @@ const Model = types
       });
     },
 
-    // check that maxUsages was not exceeded
-    // and if it was - don't allow to create new region and unselect all regions
     checkLabels() {
-      const exceeded = self.states().reduce((list, s) => (s.checkMaxUsages ? list.concat(s.checkMaxUsages()) : []), []);
-      const states = self.activeStates();
-      if (states.length === 0) {
-        if (exceeded.length) {
-          const label = exceeded[0];
-          InfoModal.warning(`You can't use ${label.value} more than ${label.maxUsages} time(s)`);
-        }
-        self.completion().regionStore.unselectAll(true);
-        return false;
-      }
-      return true;
+      const states = self.getAvailableStates();
+      return states.length !== 0;
     },
 
     addShape(shape) {

src/tags/object/Text.js

@@ -154,16 +154,8 @@ const Model = types
     },
 
     addRegion(range) {
-      const exceeded = self.states().reduce((list, s) => list.concat(s.checkMaxUsages()), []);
-      const states = self.activeStates();
-      if (states.length === 0) {
-        if (exceeded.length) {
-          const label = exceeded[0];
-          InfoModal.warning(`You can't use ${label.value} more than ${label.maxUsages} time(s)`);
-        }
-        self.completion.regionStore.unselectAll(true);
-        return;
-      }
+      const states = self.getAvailableStates();
+      if (states.length === 0) return;
 
       const clonedStates = states.map(s => cloneNode(s));