fix: disabled in progress and size error fixed

JohnEFerguson · Jan 26, 2021 · 34724e5 · 34724e5
1 parent e9e4d1f
commit 34724e5
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 11 deletions.
diff --git a/src/public/components/EditReserveCategoryModal.vue b/src/public/components/EditReserveCategoryModal.vue
@@ -124,7 +124,7 @@
           ]"
           @click="saveCategory"
         >
-          {{ `${mode === 'add' ? 'Add' : 'Edit'}` }}
+          {{ `${mode === 'add' ? 'Add' : 'Save'}` }}
         </button>
       </div>
     </div>
@@ -181,13 +181,20 @@ export default {
   },
   computed: {
     availableSupply() {
-      const defaultCategory = this.$store.state.currentConfig.reserveCategories.find(
-        (cat) => !!cat.isDefault
+      const totalAllocation = this.$store.state.currentConfig.reserveCategories.reduce(
+        (total, cat) => {
+          // we are allowed to take units from the default category
+          if (!cat.isDefault) {
+            return total + parseInt(cat.size)
+          }
+          return total
+        },
+        0
+      )
+      return (
+        parseInt(this.initialSize) +
+        parseInt(this.$store.state.currentConfig.supply - totalAllocation)
       )
-      if (defaultCategory) {
-        return parseInt(this.initialSize) + parseInt(defaultCategory.size)
-      }
-      return this.$store.state.currentConfig.supply
     },
     CATEGORY_TYPE() {
       return CATEGORY_TYPE

diff --git a/src/public/pages/reserve-instances.vue b/src/public/pages/reserve-instances.vue
@@ -74,7 +74,12 @@
             <button @click="() => viewConfig(instance)">
               View Configuration
             </button>
-            <div class="exportResultsButtonWrapper">
+            <div
+              :class="[
+                'exportResultsButtonWrapper',
+                { isDisabled: instance.status !== 'FINISHED' },
+              ]"
+            >
               <button class="exportResultsBtn">Export Results ▼</button>
               <span class="resultsOptions">
                 <button @click="() => exportAll(instance)">
@@ -548,9 +553,16 @@ export default {
 }
 .exportResultsButtonWrapper {
   position: relative;
-  &:hover {
-    & > .resultsOptions {
-      display: block;
+  &.isDisabled {
+    & > .exportResultsBtn {
+      cursor: not-allowed;
+    }
+  }
+  &:not(.isDisabled) {
+    &:hover {
+      & > .resultsOptions {
+        display: block;
+      }
     }
   }
 }