From 3731e1d46ec7e68119e883a894129c344aea26aa Mon Sep 17 00:00:00 2001
From: Sam Grund <samuel.grund@1stdibs.com>
Date: Wed, 2 Dec 2020 15:18:55 -0500
Subject: [PATCH 01/22] feat: BIN VALIDATION BITCH (#131)

---
 .../components/EditReserveCategoryModal.vue   | 60 ++++++-------------
 src/public/components/PriorityOrderPanel.vue  | 28 +++++----
 src/public/plugins/helpers.js                 | 27 +++++++--
 3 files changed, 59 insertions(+), 56 deletions(-)

diff --git a/src/public/components/EditReserveCategoryModal.vue b/src/public/components/EditReserveCategoryModal.vue
index 8edcfb48..e4267285 100644
--- a/src/public/components/EditReserveCategoryModal.vue
+++ b/src/public/components/EditReserveCategoryModal.vue
@@ -235,36 +235,21 @@ export default {
               }
               break
             case NUMERIC_TYPE:
+              let numericError = {}
               if (criteria.max < criteria.min) {
-                const minMaxError = {
-                  minMax: 'The max must be greater than or equal to the min.',
-                }
-                if (!!errors[index]) {
-                  errors[index] = minMaxError
-                } else {
-                  errors[index] = {
-                    ...errors[index],
-                    ...minMaxError,
-                  }
-                }
+                numericError.minMax =
+                  'The max must be greater than or equal to the min.'
               }
+
               if (criteria.coarsened) {
                 // confirm that Bin 1 has the correct min
-                let binError = null
-                if (!criteria.bins.length) {
-                  binError = {
-                    bins: 'Please enter at least 1 bin.',
-                  }
-                } else if (criteria.bins[0].min !== criteria.min) {
-                  binError = {
-                    bins: `Bin 1 must have a min of ${criteria.min}.`,
-                  }
-                } else if (
-                  criteria.bins[criteria.bins.length - 1].max !== criteria.max
-                ) {
-                  binError = {
-                    bins: `Bin ${criteria.bins.length} must have a max of ${criteria.max}.`,
-                  }
+                const bins = criteria.bins
+                if (!bins.length) {
+                  numericError.bins = 'Please enter at least 1 bin.'
+                } else if (bins[0].min !== criteria.min) {
+                  numericError.bins = `Bin 1 must have a min of ${criteria.min}.`
+                } else if (bins[bins.length - 1].max !== criteria.max) {
+                  numericError.bins = `Bin ${bins.length} must have a max of ${criteria.max}.`
                 } else {
                   const binRangeError = checkBinRange({
                     bins: criteria.bins,
@@ -272,21 +257,13 @@ export default {
                     max: criteria.max,
                   })
                   if (binRangeError) {
-                    binError = {
-                      bins: binRangeError,
-                    }
-                  }
-                }
-
-                if (!!errors[index] && binError) {
-                  errors[index] = binError
-                } else if (binError) {
-                  errors[index] = {
-                    ...errors[index],
-                    ...binError,
+                    numericError.bins = binRangeError
                   }
                 }
               }
+              if (Object.keys(numericError).length) {
+                errors[index] = { ...(errors[index] || {}), ...numericError }
+              }
               break
             default:
               break
@@ -301,9 +278,6 @@ export default {
     setCopyToShow(copyKey) {
       this.copyToShow = editReserveCategoryCopyMap[copyKey]
     },
-    setHasCriteriaError(hasCriteriaError) {
-      this.hasCriteriaError = hasCriteriaError
-    },
     saveCategory() {
       if (!this.hasSizeError && this.reserveCategory.name) {
         const filteredPriorities = this.reserveCategory.priority.filter(
@@ -338,6 +312,9 @@ export default {
           this.currentCriteria = this.currentCriteria - 1
         })
       }
+      this.$nextTick(() => {
+        this.validatePriorities()
+      })
     },
     validateCategoryName() {
       this.hasNameError = !this.reserveCategory.name
@@ -416,6 +393,7 @@ export default {
   border: 2px solid var(--dark-blue);
   border-radius: 0 0 18px 18px;
   height: fit-content;
+  max-height: 50vh;
   overflow: auto;
   position: relative;
 }
diff --git a/src/public/components/PriorityOrderPanel.vue b/src/public/components/PriorityOrderPanel.vue
index 6853a743..2cc2dc5d 100644
--- a/src/public/components/PriorityOrderPanel.vue
+++ b/src/public/components/PriorityOrderPanel.vue
@@ -5,7 +5,7 @@
       <input
         v-model.trim="criteria.name"
         class="textInput"
-        @input="validatePriorities"
+        @input="runValidations"
         name="name"
         placeholder="e.g., sofa_score"
         :disabled="isReadOnly"
@@ -21,6 +21,7 @@
           <input
             v-model="criteria.criteriaType"
             class="textInput"
+            @change="runValidations"
             :name="`criteriaTypeCategory${criteriaIndex}`"
             type="radio"
             :value="CATEGORY_TYPE"
@@ -34,6 +35,7 @@
           <input
             v-model="criteria.criteriaType"
             class="textInput"
+            @change="runValidations"
             :name="`criteriaTypeNumeric${criteriaIndex}`"
             type="radio"
             :value="NUMERIC_TYPE"
@@ -61,7 +63,7 @@
       >
         <input
           v-model.trim="element.name"
-          @input="validatePriorities"
+          @input="runValidations"
           type="text"
           :name="`criteria${criteriaIndex}category${elementIndex}`"
           class="textInput"
@@ -99,7 +101,7 @@
     <div v-if="criteria.criteriaType === NUMERIC_TYPE">
       <span
         v-if="criteriaErrors && criteriaErrors.minMax"
-        class="fs-12 mt-9 ml-18 col-error"
+        class="fs-12 mt-9 ml-9 col-error"
         >{{ criteriaErrors.minMax }}</span
       >
       <div :class="isReadOnly ? 'flexcolumn' : 'flexrow'">
@@ -109,7 +111,7 @@
           >
           <input
             v-model.number="criteria.min"
-            @input="validatePriorities"
+            @input="runValidations"
             type="number"
             class="textInput w50"
             :name="`criteria${criteriaIndex}min`"
@@ -122,7 +124,7 @@
           >
           <input
             v-model.number="criteria.max"
-            @input="validatePriorities"
+            @input="runValidations"
             type="number"
             class="textInput w50"
             :name="`criteria${criteriaIndex}max`"
@@ -167,7 +169,7 @@
           <div class="flexrow">
             <input
               v-model="criteria.coarsened"
-              @input="validatePriorities"
+              @change="runValidations"
               class="textInput"
               :name="`criteriaCoarsenedYes${criteriaIndex}`"
               type="radio"
@@ -181,7 +183,7 @@
           <div class="flexrow ml-18">
             <input
               v-model="criteria.coarsened"
-              @input="validatePriorities"
+              @change="runValidations"
               class="textInput"
               :name="`criteriaCoarsenedNo${criteriaIndex}`"
               type="radio"
@@ -212,7 +214,7 @@
           @input="
             (e) => {
               updateNumBins(e.target.value)
-              validatePriorities()
+              runValidations()
             }
           "
         />
@@ -231,7 +233,7 @@
             >
             <input
               v-model.number="bin.min"
-              @input="validatePriorities"
+              @input="runValidations"
               class="textInput w100"
               type="number"
               :name="`criteria${criteriaIndex}bin${binIndex}min`"
@@ -246,7 +248,7 @@
             >
             <input
               v-model.number="bin.max"
-              @input="validatePriorities"
+              @input="runValidations"
               class="textInput w100"
               type="number"
               :name="`criteria${criteriaIndex}bin${binIndex}max`"
@@ -295,6 +297,11 @@ export default {
     },
   },
   methods: {
+    runValidations() {
+      this.$nextTick(() => {
+        this.validatePriorities()
+      })
+    },
     addNewElement() {
       this.criteria.elements.push({
         name: '',
@@ -310,6 +317,7 @@ export default {
         }
         return acc
       }, [])
+      this.runValidations()
     },
     updateNumBins(numBins) {
       if (numBins < 0) {
diff --git a/src/public/plugins/helpers.js b/src/public/plugins/helpers.js
index 82463930..380a9cb5 100644
--- a/src/public/plugins/helpers.js
+++ b/src/public/plugins/helpers.js
@@ -151,17 +151,34 @@ export function toTitleCase(str) {
 
 export function checkBinRange({ bins, min, max }) {
   let binError = null
-  const rangeCovered = bins.reduce((acc, bin, index) => {
+  const rangeCovered = bins.forEach((bin, index) => {
+    const isFirstBin = index === 0
+    const isLastBin = index === bins.length - 1
     if (!isFloat(bin.min) || !isFloat(bin.max)) {
       binError = `Bin ${index + 1} must have a valid float.`
-      return acc
     } else if (bin.min < min) {
       binError = `Bin ${index + 1} cannot have a min less than ${min}.`
-      return acc
     } else if (bin.max > max) {
       binError = `Bin ${index + 1} cannot have a max greater than ${max}.`
-      return acc
+    } else if (bin.min > bin.max) {
+      binError = `Bin ${index + 1} cannot have a min greater than ${bin.max}.`
+    } else if (bins.length > 1) {
+      if (isFirstBin && bin.max !== bins[index + 1].min) {
+        binError = `The max of Bin 1 should equal the min of Bin 2`
+      } else if (index === bins.length - 1 && bin.min !== bins[index - 1].max) {
+        binError = `The min of Bin ${
+          index + 1
+        } should equal the max of Bin ${index}`
+      } else if (!isFirstBin && bin.min !== bins[index - 1].max) {
+        binError = `The min of Bin ${
+          index + 1
+        } should equal the max of Bin ${index}`
+      } else if (!isLastBin && bin.max !== bins[index + 1].min) {
+        binError = `The max of Bin ${index + 1} should equal the min of Bin ${
+          index + 2
+        }`
+      }
     }
-  }, [])
+  })
   return binError
 }

From 0af5f2e157e8fe60238253897e09c680fd5a0ec6 Mon Sep 17 00:00:00 2001
From: Sam Grund <samuel.grund@1stdibs.com>
Date: Wed, 2 Dec 2020 15:51:47 -0500
Subject: [PATCH 02/22] chore: redirect to reserve instances when you arent
 editing a config (#132)

---
 src/public/pages/finish.vue          | 5 +++++
 src/public/pages/load-data.vue       | 5 +++++
 src/public/pages/specify-reserve.vue | 5 +++++
 3 files changed, 15 insertions(+)

diff --git a/src/public/pages/finish.vue b/src/public/pages/finish.vue
index 79144622..f42eb0eb 100644
--- a/src/public/pages/finish.vue
+++ b/src/public/pages/finish.vue
@@ -58,6 +58,11 @@ export default {
       return this.$store.state.currentConfig
     },
   },
+  beforeMount() {
+    if (!this.$store.state.currentConfig.reserveCategories.length) {
+      this.$router.push('/reserve-instances')
+    }
+  },
   methods: {
     closeViewPriorityOrderModal() {
       this.viewPriorityOrderModalOpen = false
diff --git a/src/public/pages/load-data.vue b/src/public/pages/load-data.vue
index 222628ef..9e02805c 100644
--- a/src/public/pages/load-data.vue
+++ b/src/public/pages/load-data.vue
@@ -70,6 +70,11 @@ export default {
       return this.$store.state.currentConfig
     },
   },
+  beforeMount() {
+    if (!this.$store.state.currentConfig.reserveCategories.length) {
+      this.$router.push('/reserve-instances')
+    }
+  },
   mounted() {
     this.$refs.fileUpload.addEventListener('change', () => {
       const file = this.$refs.fileUpload.files[0]
diff --git a/src/public/pages/specify-reserve.vue b/src/public/pages/specify-reserve.vue
index 0877d109..cc24059c 100644
--- a/src/public/pages/specify-reserve.vue
+++ b/src/public/pages/specify-reserve.vue
@@ -142,6 +142,11 @@ export default {
       }
     },
   },
+  beforeMount() {
+    if (!this.$store.state.currentConfig.reserveCategories.length) {
+      this.$router.push('/reserve-instances')
+    }
+  },
   mounted() {
     this.$store.commit('updateSupplySum')
   },

From c8f910095b89f9f4294dcabad07d374314b1fdd3 Mon Sep 17 00:00:00 2001
From: Sam Grund <samuel.grund@1stdibs.com>
Date: Wed, 2 Dec 2020 16:00:56 -0500
Subject: [PATCH 03/22] fix: disabled buttons

---
 src/public/components/EditReserveCategoryModal.vue | 6 +++++-
 src/public/pages/specify-reserve.vue               | 6 ++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/public/components/EditReserveCategoryModal.vue b/src/public/components/EditReserveCategoryModal.vue
index e4267285..4773cbce 100644
--- a/src/public/components/EditReserveCategoryModal.vue
+++ b/src/public/components/EditReserveCategoryModal.vue
@@ -279,7 +279,11 @@ export default {
       this.copyToShow = editReserveCategoryCopyMap[copyKey]
     },
     saveCategory() {
-      if (!this.hasSizeError && this.reserveCategory.name) {
+      if (
+        !this.hasSizeError &&
+        this.reserveCategory.name &&
+        !this.hasCriteriaError
+      ) {
         const filteredPriorities = this.reserveCategory.priority.filter(
           (criteria) => criteria.name
         )
diff --git a/src/public/pages/specify-reserve.vue b/src/public/pages/specify-reserve.vue
index cc24059c..f1f7bfa6 100644
--- a/src/public/pages/specify-reserve.vue
+++ b/src/public/pages/specify-reserve.vue
@@ -183,10 +183,12 @@ export default {
       this.$store.commit('moveCategory', { category, direction: 'down' })
     },
     deleteCategory(category) {
-      this.$store.dispatch('deleteCategory', category)
+      if (!category.isDefault) {
+        this.$store.dispatch('deleteCategory', category)
+      }
     },
     async postConfig() {
-      if (!this.disableNext) {
+      if (!this.errorMessage) {
         try {
           await this.$store.dispatch('postConfig')
           this.$router.push('/finish')

From f6fe3ac5643a977c60b6a3ce893808330013334c Mon Sep 17 00:00:00 2001
From: "John (Jack) Ferguson" <john.everett.ferguson@gmail.com>
Date: Fri, 4 Dec 2020 21:52:11 -0500
Subject: [PATCH 04/22] refactor: remove lambda process, allow for wasted units
 (#140)

feat: add /sourceFiles/:id/leftOver

refs (#138)
---
 src/api/main/routes/source_files.js | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/api/main/routes/source_files.js b/src/api/main/routes/source_files.js
index 71eae7db..db942e26 100644
--- a/src/api/main/routes/source_files.js
+++ b/src/api/main/routes/source_files.js
@@ -36,7 +36,7 @@ router.get('/sourceFiles/:id', async (req, res) => {
   return res.json(await db.sourceFile.findOne({ where: { id } }))
 })
 
-// GET one source file id
+// GET nth reserve patients 
 router.get('/sourceFiles/:id/nthReservePatients', async (req, res) => {
   const { db } = req
   const id = req.params.id
@@ -47,6 +47,16 @@ router.get('/sourceFiles/:id/nthReservePatients', async (req, res) => {
   )
 })
 
+// GET the number of left over units for reserve instance 
+router.get('/sourceFiles/:id/leftOver', async (req, res) => {
+  const { db } = req
+  const id = req.params.id
+  return res.json(
+    (await db.sourceFile.findOne({ where: { id } })).left_over
+  )
+})
+
+
 // GET all patients for a source file
 router.get('/sourceFiles/:id/patients', async (req, res) => {
   const { db } = req
@@ -128,17 +138,6 @@ router.post('/sourceFiles/:id/process', async (req, res) => {
       leftOver += f.size - given
     })
 
-    const notSelectedPatientsArray = Array.from(notSelectedPatients)
-    let i = 0
-    // give left over to unallocated patients if there are any
-    while (leftOver > 0 && i < notSelectedPatientsArray.length) {
-      const pat = notSelectedPatientsArray[i]
-      selectedPatients.add(pat)
-      allocatedPatientGroups[pat] = 'None'
-      leftOver -= 1
-      i += 1
-    }
-
     // update patients
     selectedPatients.forEach(async (pId) => {
 

From 395c3e3b75806d7303652e867f3393ed41001520 Mon Sep 17 00:00:00 2001
From: "John (Jack) Ferguson" <john.everett.ferguson@gmail.com>
Date: Sun, 6 Dec 2020 20:52:07 -0500
Subject: [PATCH 05/22] feat: sort nested config parts by their order (#141)

feat: create build targets for windows OS
---
 package.json                          | 9 ++++++++-
 src/api/main/routes/configurations.js | 4 ++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index ce50b21e..e93bcb14 100644
--- a/package.json
+++ b/package.json
@@ -12,6 +12,13 @@
     "mac": {
       "category": "your.app.category.type"
     },
+    "win": {
+      "target": [
+        {
+          "target": "nsis"
+        }
+      ]    
+    },
     "files": [
       "build/*",
       "src/**",
@@ -33,7 +40,7 @@
     "build:client": "cross-env NODE_ENV=production webpack --config build/webpack.client.config.js --progress",
     "build:server": "cross-env NODE_ENV=production webpack --config build/webpack.server.config.js --progress",
     "pack": "electron-builder --dir",
-    "dist": "yarn build && DEBUG=electron-builder electron-builder",
+    "dist": "yarn build && DEBUG=electron-builder electron-builder --win --mac",
     "postinstall": "electron-builder install-app-deps"
   },
   "dependencies": {
diff --git a/src/api/main/routes/configurations.js b/src/api/main/routes/configurations.js
index 7170cb3a..e1136e75 100644
--- a/src/api/main/routes/configurations.js
+++ b/src/api/main/routes/configurations.js
@@ -24,6 +24,7 @@ router.get("/configurations/:id", async (req, res) => {
         {
           model: db.reserveCategory,
           as: "reserveCategories",
+          order: [['reserveCatetories.`order`', 'ASC']],
           include: [
             {
               model: db.priority,
@@ -31,6 +32,7 @@ router.get("/configurations/:id", async (req, res) => {
                 {
                   model: db.categoryCriteria,
                   as: "categoryCriteria",
+                  order: [['order', 'ASC']],
                   include: [
                     {
                       model: db.categoryCriteriaElement,
@@ -41,6 +43,7 @@ router.get("/configurations/:id", async (req, res) => {
                 {
                   model: db.numericCriteria,
                   as: "numericCriteria",
+                  order: [['order', 'ASC']],
                   include: [
                     {
                       model: db.numericCriteriaBucket,
@@ -51,6 +54,7 @@ router.get("/configurations/:id", async (req, res) => {
               ],
             },
           ],
+
         },
       ],
     })

From f9d4869c4342c320f41e34932cb8cea9bf732e81 Mon Sep 17 00:00:00 2001
From: Sam Grund <samuel.grund@1stdibs.com>
Date: Sun, 6 Dec 2020 21:36:28 -0500
Subject: [PATCH 06/22] fix: issue squashing (#142)

---
 src/api/main/routes/source_files.js          | 23 +++------
 src/public/components/ConfigSummary.vue      |  2 +-
 src/public/components/PriorityOrderPanel.vue | 53 ++++++++++++++++++--
 src/public/components/constants.js           |  2 +-
 src/public/pages/reserve-instances.vue       |  4 +-
 src/public/plugins/helpers.js                | 18 ++++---
 6 files changed, 73 insertions(+), 29 deletions(-)

diff --git a/src/api/main/routes/source_files.js b/src/api/main/routes/source_files.js
index db942e26..79f1aee5 100644
--- a/src/api/main/routes/source_files.js
+++ b/src/api/main/routes/source_files.js
@@ -36,7 +36,7 @@ router.get('/sourceFiles/:id', async (req, res) => {
   return res.json(await db.sourceFile.findOne({ where: { id } }))
 })
 
-// GET nth reserve patients 
+// GET nth reserve patients
 router.get('/sourceFiles/:id/nthReservePatients', async (req, res) => {
   const { db } = req
   const id = req.params.id
@@ -47,16 +47,13 @@ router.get('/sourceFiles/:id/nthReservePatients', async (req, res) => {
   )
 })
 
-// GET the number of left over units for reserve instance 
+// GET the number of left over units for reserve instance
 router.get('/sourceFiles/:id/leftOver', async (req, res) => {
   const { db } = req
   const id = req.params.id
-  return res.json(
-    (await db.sourceFile.findOne({ where: { id } })).left_over
-  )
+  return res.json((await db.sourceFile.findOne({ where: { id } })).left_over)
 })
 
-
 // GET all patients for a source file
 router.get('/sourceFiles/:id/patients', async (req, res) => {
   const { db } = req
@@ -65,7 +62,7 @@ router.get('/sourceFiles/:id/patients', async (req, res) => {
   if (req.query.givenUnit)
     filterLosers += `and ${
       req.query.givenUnit === 'false' ? 'not' : ''
-      } given_unit`
+    } given_unit`
 
   return res.json(await getPatientsWithAttributes(db, id, filterLosers))
 })
@@ -95,7 +92,6 @@ router.post('/sourceFiles/:id/process', async (req, res) => {
       })
     )
 
-
     const patients = await Promise.all(
       (
         await db.patient.findAll({
@@ -115,17 +111,13 @@ router.post('/sourceFiles/:id/process', async (req, res) => {
       let given = 0
       let i = 0
       while (i < f.patients.length) {
-
-
         if (given < f.size && !selectedPatients.has(f.patients[i])) {
-
           selectedPatients.add(f.patients[i])
           allocatedPatientGroups[f.patients[i]] = f.name
           given += 1
           notSelectedPatients.delete(f.patients[i])
 
           if (given == f.size) {
-
             nthReservePatients.push({
               name: f.name,
               nthRecipientPrimaryId: f.patients[i],
@@ -140,7 +132,6 @@ router.post('/sourceFiles/:id/process', async (req, res) => {
 
     // update patients
     selectedPatients.forEach(async (pId) => {
-
       const patient = await db.patient.findOne({ where: { id: pId } })
       patient.given_unit = true
       patient.group_allocated_under = allocatedPatientGroups[pId]
@@ -149,9 +140,9 @@ router.post('/sourceFiles/:id/process', async (req, res) => {
 
     const nthReservePatientsWithNames = await Promise.all(
       nthReservePatients.map(async (f) => {
-        const name = (
-          await db.patient.findOne({ where: { id: f.nthRecipientPrimaryId } })
-        )
+        const name = await db.patient.findOne({
+          where: { id: f.nthRecipientPrimaryId },
+        })
 
         return { name: f.name, nthRecipientId: name.dataValues.recipient_id }
       })
diff --git a/src/public/components/ConfigSummary.vue b/src/public/components/ConfigSummary.vue
index 2064e820..2d653706 100644
--- a/src/public/components/ConfigSummary.vue
+++ b/src/public/components/ConfigSummary.vue
@@ -115,7 +115,7 @@ export default {
   },
 }
 </script>
-<style lang="stylus">
+<style scoped lang="stylus">
 .configSummaryContainer {
   grid-column: span 3;
   margin: auto;
diff --git a/src/public/components/PriorityOrderPanel.vue b/src/public/components/PriorityOrderPanel.vue
index 2cc2dc5d..63584185 100644
--- a/src/public/components/PriorityOrderPanel.vue
+++ b/src/public/components/PriorityOrderPanel.vue
@@ -202,9 +202,24 @@
           class="fs-12 mt-9 ml-9 col-error"
           >{{ criteriaErrors.bins }}</span
         >
-        <label class="ml-9" :for="`criteriaNumBins${criteriaIndex}`"
-          >Number of bins</label
-        >
+        <span class="ml-9" :for="`criteriaNumBins${criteriaIndex}`">
+          Number of bins
+          <span class="iconWrapper">
+            <font-awesome-icon
+              icon="info-circle"
+              class="icon ml-9"
+              @mouseenter="() => setShowMinMaxNote(true)"
+              @mouseleave="() => setShowMinMaxNote(false)"
+            />
+            <div :class="['descriptionWrapper', { isVisible: showMinMaxNote }]">
+              It is important to know that a bin includes its min in the range
+              but does not include its max. For example, the age bin 20-40 will
+              include all individuals aged 20, 21, ..., 39 but will not include
+              individuals aged 40. The exception is that the last bin will
+              include the max in its range.
+            </div>
+          </span>
+        </span>
         <input
           v-if="!isReadOnly"
           v-model.number="criteria.numBins"
@@ -288,6 +303,11 @@ export default {
       default: () => {},
     },
   },
+  data() {
+    return {
+      showMinMaxNote: false,
+    }
+  },
   computed: {
     CATEGORY_TYPE() {
       return CATEGORY_TYPE
@@ -297,6 +317,9 @@ export default {
     },
   },
   methods: {
+    setShowMinMaxNote(showNote) {
+      this.showMinMaxNote = showNote
+    },
     runValidations() {
       this.$nextTick(() => {
         this.validatePriorities()
@@ -365,6 +388,30 @@ export default {
 .panelWrapper {
   position: relative;
 }
+.iconWrapper {
+  position: relative;
+}
+.icon {
+  cursor: pointer;
+}
+.descriptionWrapper {
+  z-index: 1000;
+  display: none;
+  position: absolute;
+  top: calc(100% + 9px);
+  left: 50%;
+  width: 350px;
+  word-break: break-word;
+  transform: translateX(-50%);
+  left: calc(100% + 9px);
+  background-color: white;
+  border: 2px solid var(--dark-blue);
+  padding: 9px;
+  border-radius: 9px;
+  &.isVisible {
+    display: block;
+  }
+}
 .textInput {
   cursor: pointer;
   resize: none;
diff --git a/src/public/components/constants.js b/src/public/components/constants.js
index 564ba16c..f80ca178 100644
--- a/src/public/components/constants.js
+++ b/src/public/components/constants.js
@@ -203,7 +203,7 @@ export const editReserveCategoryCopyMap = {
       {
         question: 'In a numeric criteria, what are bins?',
         answer:
-          'Bins are a way to break up the range of the numeric criteria. So if a numeric criteria is age which ranges from 0 to 120, you can define bins as 0-20, 20-40, and 40-120 that will treat individuals in the same age bin identically along this criteria. It is important to know that a bin includes its min in the range but does not include its max. For example, the age bin 20-40 will include all individuals aged 20, 21, ..., 39 but will not include individuals aged 40. The exception is that the last bin will include the max in its range.',
+          'Bins are a way to break up the range of the numeric criteria. So if a numeric criteria is age which ranges from 0 to 120, you can define bins as 0-20, 20-40, and 40-120 that will treat individuals in the same age bin identically along this criteria.',
       },
       {
         question:
diff --git a/src/public/pages/reserve-instances.vue b/src/public/pages/reserve-instances.vue
index 95792f41..5776d1c5 100644
--- a/src/public/pages/reserve-instances.vue
+++ b/src/public/pages/reserve-instances.vue
@@ -290,6 +290,8 @@ export default {
         `/sourceFiles/${instance.id}/nthReservePatients`
       )
       const nthReservePatients = await nthReservePatientsRes.json()
+      const leftOverRes = await fetch(`/sourceFiles/${instance.id}/leftOver`)
+      const leftOver = await leftOverRes.json()
 
       const parsedFileName = path.parse(instance.name).name
       const today = new Date()
@@ -323,7 +325,7 @@ export default {
             nthPatient
               ? `, nth recipient id = ${nthPatient.nthRecipientId}`
               : ''
-          })`,
+          }${leftOver ? `, units left over = ${leftOver}` : ''})`,
         ])
         category.priority.forEach((priority, index) => {
           outputArray.push([
diff --git a/src/public/plugins/helpers.js b/src/public/plugins/helpers.js
index 380a9cb5..36ef73ac 100644
--- a/src/public/plugins/helpers.js
+++ b/src/public/plugins/helpers.js
@@ -100,13 +100,17 @@ export function transformCriteriaForDisplay(priority) {
     return null
   }
   const criterias = []
-  priority.categoryCriteria.forEach(
-    (crit) =>
-      (criterias[crit.order - 1] = {
-        ...crit,
-        criteriaType: CATEGORY_TYPE,
-      })
-  )
+  priority.categoryCriteria.forEach((crit) => {
+    const elements = []
+    crit.elements.forEach((element) => {
+      elements[element.order - 1] = element
+    })
+    criterias[crit.order - 1] = {
+      ...crit,
+      elements,
+      criteriaType: CATEGORY_TYPE,
+    }
+  })
   priority.numericCriteria.forEach(
     (crit) =>
       (criterias[crit.order - 1] = {

From 23c569a49c32aa17b0fc166cc75b128b09a3678c Mon Sep 17 00:00:00 2001
From: Jack E Ferguson <jferguson2@ckmanalytix.com>
Date: Sun, 6 Dec 2020 21:51:14 -0500
Subject: [PATCH 07/22] fix: remove electron builder targets

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index e93bcb14..cf8df14d 100644
--- a/package.json
+++ b/package.json
@@ -40,7 +40,7 @@
     "build:client": "cross-env NODE_ENV=production webpack --config build/webpack.client.config.js --progress",
     "build:server": "cross-env NODE_ENV=production webpack --config build/webpack.server.config.js --progress",
     "pack": "electron-builder --dir",
-    "dist": "yarn build && DEBUG=electron-builder electron-builder --win --mac",
+    "dist": "yarn build && DEBUG=electron-builder electron-builder",
     "postinstall": "electron-builder install-app-deps"
   },
   "dependencies": {

From a004b01b5840b495c0d6183fd8d25c84ba9e5ac2 Mon Sep 17 00:00:00 2001
From: Sam Grund <samuel.grund@1stdibs.com>
Date: Sun, 6 Dec 2020 21:59:31 -0500
Subject: [PATCH 08/22] fix: old config bug

---
 src/public/components/EditReserveCategoryModal.vue | 6 +-----
 src/public/components/PriorityOrderPanel.vue       | 5 +----
 src/public/pages/reserve-instances.vue             | 4 +++-
 src/public/pages/specify-reserve.vue               | 5 +----
 src/public/plugins/helpers.js                      | 6 ++++++
 5 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/src/public/components/EditReserveCategoryModal.vue b/src/public/components/EditReserveCategoryModal.vue
index 4773cbce..e0a550dd 100644
--- a/src/public/components/EditReserveCategoryModal.vue
+++ b/src/public/components/EditReserveCategoryModal.vue
@@ -143,11 +143,7 @@ import {
   numericFields,
 } from './constants'
 import { editReserveCategoryCopyMap } from './constants'
-import { checkBinRange } from '../plugins/helpers'
-
-function deepClone(obj) {
-  return JSON.parse(JSON.stringify(obj))
-}
+import { checkBinRange, deepClone } from '../plugins/helpers'
 
 const defaultCriteria = {
   name: '',
diff --git a/src/public/components/PriorityOrderPanel.vue b/src/public/components/PriorityOrderPanel.vue
index 63584185..dc566d31 100644
--- a/src/public/components/PriorityOrderPanel.vue
+++ b/src/public/components/PriorityOrderPanel.vue
@@ -399,11 +399,8 @@ export default {
   display: none;
   position: absolute;
   top: calc(100% + 9px);
-  left: 50%;
-  width: 350px;
+  width: 325px;
   word-break: break-word;
-  transform: translateX(-50%);
-  left: calc(100% + 9px);
   background-color: white;
   border: 2px solid var(--dark-blue);
   padding: 9px;
diff --git a/src/public/pages/reserve-instances.vue b/src/public/pages/reserve-instances.vue
index 5776d1c5..adb5d8fa 100644
--- a/src/public/pages/reserve-instances.vue
+++ b/src/public/pages/reserve-instances.vue
@@ -116,6 +116,7 @@ import {
   downloadCSV,
   removeIds,
   toTitleCase,
+  deepClone,
 } from '../plugins/helpers'
 import ViewConfigModal from '../components/ViewConfigModal.vue'
 import ConfirmationModal from '../components/ConfirmationModal.vue'
@@ -306,6 +307,7 @@ export default {
       outputArray.push([])
       outputArray.push([`Unit Allocated: ${displayConfig.unitType}`])
       outputArray.push([`Number Allocated: ${displayConfig.supply}`])
+      outputArray.push([`Units Left Over: ${leftOver}`])
       outputArray.push([
         [
           `Allocation Timestamp: ${loaded.toLocaleDateString()} ${loaded.toLocaleTimeString()}`,
@@ -325,7 +327,7 @@ export default {
             nthPatient
               ? `, nth recipient id = ${nthPatient.nthRecipientId}`
               : ''
-          }${leftOver ? `, units left over = ${leftOver}` : ''})`,
+          })`,
         ])
         category.priority.forEach((priority, index) => {
           outputArray.push([
diff --git a/src/public/pages/specify-reserve.vue b/src/public/pages/specify-reserve.vue
index f1f7bfa6..028d395e 100644
--- a/src/public/pages/specify-reserve.vue
+++ b/src/public/pages/specify-reserve.vue
@@ -91,10 +91,7 @@
 import EditReserveCategoryModal from '../components/EditReserveCategoryModal.vue'
 import ViewPriorityOrderModal from '../components/ViewPriorityOrderModal.vue'
 import ConfigLayout from '../layouts/configuration-screen.vue'
-
-function deepClone(obj) {
-  return JSON.parse(JSON.stringify(obj))
-}
+import { deepClone } from '../plugins/helpers'
 
 export default {
   middleware: 'has-category',
diff --git a/src/public/plugins/helpers.js b/src/public/plugins/helpers.js
index 36ef73ac..a1bd972d 100644
--- a/src/public/plugins/helpers.js
+++ b/src/public/plugins/helpers.js
@@ -106,6 +106,7 @@ export function transformCriteriaForDisplay(priority) {
       elements[element.order - 1] = element
     })
     criterias[crit.order - 1] = {
+      ...deepClone(numericFields),
       ...crit,
       elements,
       criteriaType: CATEGORY_TYPE,
@@ -114,6 +115,7 @@ export function transformCriteriaForDisplay(priority) {
   priority.numericCriteria.forEach(
     (crit) =>
       (criterias[crit.order - 1] = {
+        ...deepClone(categoryFields),
         ...crit,
         numBins: crit.bins.length,
         criteriaType: NUMERIC_TYPE,
@@ -138,6 +140,10 @@ export function removeIds(obj) {
   }
 }
 
+export function deepClone(obj) {
+  return JSON.parse(JSON.stringify(obj))
+}
+
 export function isFloat(val) {
   var floatRegex = /^-?\d+(?:[.,]\d*?)?$/
   if (!floatRegex.test(val)) return false

From 556a10dc36dd66bfd21b0192595b31351deef0a0 Mon Sep 17 00:00:00 2001
From: "John (Jack) Ferguson" <john.everett.ferguson@gmail.com>
Date: Sun, 6 Dec 2020 22:24:06 -0500
Subject: [PATCH 09/22] refactor: change is_... to
 is_eligible_for_reserve_cat... (refs #137) (#143)

---
 src/api/main/routes/configurations.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/api/main/routes/configurations.js b/src/api/main/routes/configurations.js
index e1136e75..79300c07 100644
--- a/src/api/main/routes/configurations.js
+++ b/src/api/main/routes/configurations.js
@@ -163,7 +163,7 @@ router.get("/configurations/:id/fieldNames", async (req, res) => {
   reserveCategoryNames.forEach((cat) => {
     if (!names.has(cat.name)) {
       fieldNames.push({
-        name: "is_" + cat.name.toLowerCase().split(" ").join("_"),
+        name: "is_eligible_for_reserve_cat_" + cat.name.toLowerCase().split(" ").join("_"),
         required: true,
         dataType: "BOOLEAN",
       })

From 3e821abd621737e0c793af4013e2fccc5f52c438 Mon Sep 17 00:00:00 2001
From: Jack E Ferguson <jferguson2@ckmanalytix.com>
Date: Sun, 6 Dec 2020 22:40:33 -0500
Subject: [PATCH 10/22] fix: add eligible update to patient POST route

---
 src/api/main/routes/patients.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/api/main/routes/patients.js b/src/api/main/routes/patients.js
index 9d1c8a4c..5da19b55 100755
--- a/src/api/main/routes/patients.js
+++ b/src/api/main/routes/patients.js
@@ -47,7 +47,7 @@ router.post("/patients", async (req, res) => {
 
         // add reserve categories
         const reserveCategoryFieldNames = fields
-          .filter((f) => f.startsWith("is_") && rawPat[f])
+          .filter((f) => f.startsWith("is_eligible_for_reserve_cat_") && rawPat[f])
           .map((f) => f.substr(3));
         const reserveCategories = db.reserveCategory.findAll({
           where: {
@@ -76,7 +76,7 @@ router.post("/patients", async (req, res) => {
 
         // add numeric criteria values
         const possibleNumericCriteriaFields = fields.filter(
-          (f) => !f.startsWith("is_")
+          (f) => !f.startsWith("is_eligible_for_reserve_cat_")
         );
         const numericCriteria = db.numericCriteria.findAll({
           where: {
@@ -129,7 +129,7 @@ router.post("/patients", async (req, res) => {
 
         // add category criteria values
         const possibleCategoryCriteriaFields = fields.filter(
-          (f) => !f.startsWith("is_")
+          (f) => !f.startsWith("is_eligible_for_reserve_cat_")
         );
         const categoryCriteria = db.categoryCriteria.findAll({
           where: { name: { [Op.in]: possibleCategoryCriteriaFields } },

From 1135cfb6cd4fcb8ca0f5a2a6a90b511973d7967c Mon Sep 17 00:00:00 2001
From: Jack E Ferguson <jferguson2@ckmanalytix.com>
Date: Sun, 6 Dec 2020 23:01:07 -0500
Subject: [PATCH 11/22] fix: update patient ingestion

---
 src/api/main/routes/patients.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/api/main/routes/patients.js b/src/api/main/routes/patients.js
index 5da19b55..6656eea6 100755
--- a/src/api/main/routes/patients.js
+++ b/src/api/main/routes/patients.js
@@ -48,7 +48,7 @@ router.post("/patients", async (req, res) => {
         // add reserve categories
         const reserveCategoryFieldNames = fields
           .filter((f) => f.startsWith("is_eligible_for_reserve_cat_") && rawPat[f])
-          .map((f) => f.substr(3));
+          .map((f) => f.substr(28));
         const reserveCategories = db.reserveCategory.findAll({
           where: {
             configurationId,

From c126d93e0e10f6d2800859b3af3a5e19b7aed2ac Mon Sep 17 00:00:00 2001
From: Sam Grund <samuel.grund@1stdibs.com>
Date: Mon, 7 Dec 2020 10:05:39 -0500
Subject: [PATCH 12/22] chore: little bug fixes

---
 src/public/components/ConfigSummary.vue | 1 +
 src/public/pages/reserve-instances.vue  | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/src/public/components/ConfigSummary.vue b/src/public/components/ConfigSummary.vue
index 2d653706..25c1c4f1 100644
--- a/src/public/components/ConfigSummary.vue
+++ b/src/public/components/ConfigSummary.vue
@@ -174,6 +174,7 @@ export default {
   border-radius: 18px;
   background-color: var(--light-grey);
   padding: 9px 18px;
+  word-break: break-word;
 }
 .iconWrapper {
   position: relative;
diff --git a/src/public/pages/reserve-instances.vue b/src/public/pages/reserve-instances.vue
index adb5d8fa..2122513e 100644
--- a/src/public/pages/reserve-instances.vue
+++ b/src/public/pages/reserve-instances.vue
@@ -275,6 +275,8 @@ export default {
               `number_of_bins = ${filteredPriority.bins.length}`
             )
             break
+          case 'numBins':
+            break
           default:
             priorityStringElements.push(`${key} = ${filteredPriority[key]}`)
             break

From 241c5565ca8469da14cf337cd9ff5b5fa5a3ae11 Mon Sep 17 00:00:00 2001
From: "John (Jack) Ferguson" <john.everett.ferguson@gmail.com>
Date: Tue, 8 Dec 2020 20:23:21 -0500
Subject: [PATCH 13/22] feat: use appveyor to make windows build (#147)

---
 appveyor.yaml | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 appveyor.yaml

diff --git a/appveyor.yaml b/appveyor.yaml
new file mode 100644
index 00000000..5f33f7fc
--- /dev/null
+++ b/appveyor.yaml
@@ -0,0 +1,20 @@
+image: Visual Studio 2017
+
+platform:
+  - x64
+
+cache:
+  - node_modules
+  - '%USERPROFILE%\.electron'
+
+init:
+  - git config --global core.autocrlf input
+
+install:
+  - ps: Install-Product node 8 x64
+  - yarn
+
+build_script:
+  - yarn dist
+
+test: off

From 0aa844c8eea35ad018b1c9025cc60fc8984dda48 Mon Sep 17 00:00:00 2001
From: "John (Jack) Ferguson" <john.everett.ferguson@gmail.com>
Date: Tue, 8 Dec 2020 20:31:02 -0500
Subject: [PATCH 14/22] Update appveyor.yaml

chore: update appveyor
---
 appveyor.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/appveyor.yaml b/appveyor.yaml
index 5f33f7fc..4ccd260f 100644
--- a/appveyor.yaml
+++ b/appveyor.yaml
@@ -15,6 +15,7 @@ install:
   - yarn
 
 build_script:
+  - echo about to build...
   - yarn dist
 
 test: off

From c6d0de8d7a5494fcd7bf5b5daf4ad1b7b853930d Mon Sep 17 00:00:00 2001
From: Jack E Ferguson <jferguson2@ckmanalytix.com>
Date: Wed, 9 Dec 2020 09:31:16 -0500
Subject: [PATCH 15/22] chore: use --win flag to specify that we want to build
 for Window note: it only works on macOS < Catalina chore: remove appveyor,
 it's so annoying

---
 appveyor.yaml | 21 ---------------------
 package.json  |  2 +-
 2 files changed, 1 insertion(+), 22 deletions(-)
 delete mode 100644 appveyor.yaml

diff --git a/appveyor.yaml b/appveyor.yaml
deleted file mode 100644
index 4ccd260f..00000000
--- a/appveyor.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-image: Visual Studio 2017
-
-platform:
-  - x64
-
-cache:
-  - node_modules
-  - '%USERPROFILE%\.electron'
-
-init:
-  - git config --global core.autocrlf input
-
-install:
-  - ps: Install-Product node 8 x64
-  - yarn
-
-build_script:
-  - echo about to build...
-  - yarn dist
-
-test: off
diff --git a/package.json b/package.json
index cf8df14d..e93bcb14 100644
--- a/package.json
+++ b/package.json
@@ -40,7 +40,7 @@
     "build:client": "cross-env NODE_ENV=production webpack --config build/webpack.client.config.js --progress",
     "build:server": "cross-env NODE_ENV=production webpack --config build/webpack.server.config.js --progress",
     "pack": "electron-builder --dir",
-    "dist": "yarn build && DEBUG=electron-builder electron-builder",
+    "dist": "yarn build && DEBUG=electron-builder electron-builder --win --mac",
     "postinstall": "electron-builder install-app-deps"
   },
   "dependencies": {

From 55693ab55190e9672f24e73ed659efdaea42a3eb Mon Sep 17 00:00:00 2001
From: Sam Grund <samuel.grund@1stdibs.com>
Date: Tue, 22 Dec 2020 15:08:18 -0500
Subject: [PATCH 16/22] fix: issue #155 validation on empty row

---
 src/public/pages/load-data.vue | 150 +++++++++++++++++----------------
 1 file changed, 78 insertions(+), 72 deletions(-)

diff --git a/src/public/pages/load-data.vue b/src/public/pages/load-data.vue
index 9e02805c..f345baa6 100644
--- a/src/public/pages/load-data.vue
+++ b/src/public/pages/load-data.vue
@@ -186,92 +186,98 @@ export default {
           {}
         )
         const recipientIds = []
-        patientObjs = patients.map((patient, patientIndex) => {
-          return patient.reduce((acc, field, index) => {
-            const hasCustomRandomNumber =
-              fieldNames[index] === 'random_number' && !!field
-            const { name, dataType, required, possibleValues } = dataTypeMap[
-              index
-            ] || {
-              name: fieldNames[index],
-              dataType: 'STRING',
-              required: false,
-              possibleValues: hasCustomRandomNumber
-                ? { min: 0, max: 100000 }
-                : null,
+        patientObjs = patients
+          .map((patient, patientIndex) => {
+            // edge case filter out patients that don't have any fields
+            if (!patient.some((field) => Boolean(field) || field === 0)) {
+              return null
             }
-            const errorMessage = `Patient ${
-              patientIndex + 1
-            } has an invalid value for ${name}: ${field}.`
-            let realFieldValue = field
-            if (required && !realFieldValue) {
-              throw new Error(
-                `${errorMessage} This field is required but is empty.`
-              )
-            }
-            if (name === 'recipient_id') {
-              if (recipientIds.includes(realFieldValue)) {
+            return patient.reduce((acc, field, index) => {
+              const hasCustomRandomNumber =
+                fieldNames[index] === 'random_number' && !!field
+              const { name, dataType, required, possibleValues } = dataTypeMap[
+                index
+              ] || {
+                name: fieldNames[index],
+                dataType: 'STRING',
+                required: false,
+                possibleValues: hasCustomRandomNumber
+                  ? { min: 0, max: 100000 }
+                  : null,
+              }
+              const errorMessage = `Patient ${
+                patientIndex + 1
+              } has an invalid value for ${name}: ${field}.`
+              let realFieldValue = field
+              if (required && !realFieldValue) {
                 throw new Error(
-                  `${errorMessage} Duplicate recipient ID: ${realFieldValue}`
+                  `${errorMessage} This field is required but is empty.`
                 )
-              } else {
-                recipientIds.push(realFieldValue)
               }
-            }
-            let typeCheck = dataType
-            if (hasCustomRandomNumber) {
-              typeCheck = 'NUMBER'
-            }
-
-            switch (typeCheck) {
-              case 'BOOLEAN': {
-                const fieldUC = field.toUpperCase()
-                if (!['TRUE', 'FALSE'].includes(fieldUC)) {
+              if (name === 'recipient_id') {
+                if (recipientIds.includes(realFieldValue)) {
                   throw new Error(
-                    `${errorMessage} Please ensure this is a true/false value.`
+                    `${errorMessage} Duplicate recipient ID: ${realFieldValue}`
                   )
+                } else {
+                  recipientIds.push(realFieldValue)
                 }
-                realFieldValue = fieldUC === 'TRUE'
-                break
               }
-              case 'NUMBER': {
-                if (field && !isFloat(field)) {
-                  throw new Error(
-                    `${errorMessage} Please ensure this is a real number.`
-                  )
+              let typeCheck = dataType
+              if (hasCustomRandomNumber) {
+                typeCheck = 'NUMBER'
+              }
+
+              switch (typeCheck) {
+                case 'BOOLEAN': {
+                  const fieldUC = field.toUpperCase()
+                  if (!['TRUE', 'FALSE'].includes(fieldUC)) {
+                    throw new Error(
+                      `${errorMessage} Please ensure this is a true/false value.`
+                    )
+                  }
+                  realFieldValue = fieldUC === 'TRUE'
+                  break
                 }
-                const numberVal = parseFloat(field)
-                if (possibleValues && !isNaN(numberVal)) {
-                  const { min, max } = possibleValues
-                  if (numberVal < min || numberVal > max) {
+                case 'NUMBER': {
+                  if (field && !isFloat(field)) {
                     throw new Error(
-                      `${errorMessage} Out of range. Please ensure number is between ${min} and ${max} (inclusive).`
+                      `${errorMessage} Please ensure this is a real number.`
                     )
                   }
+                  const numberVal = parseFloat(field)
+                  if (possibleValues && !isNaN(numberVal)) {
+                    const { min, max } = possibleValues
+                    if (numberVal < min || numberVal > max) {
+                      throw new Error(
+                        `${errorMessage} Out of range. Please ensure number is between ${min} and ${max} (inclusive).`
+                      )
+                    }
+                  }
+                  realFieldValue = !isNaN(numberVal) ? numberVal : null
+                  break
                 }
-                realFieldValue = !isNaN(numberVal) ? numberVal : null
-                break
+                default:
+                case 'STRING':
+                  if (
+                    possibleValues &&
+                    Array.isArray(possibleValues) &&
+                    !possibleValues.includes(field)
+                  ) {
+                    throw new Error(
+                      `${errorMessage} Please ensure value is one of ${possibleValues.join(
+                        ', '
+                      )}.`
+                    )
+                  }
+                  break
               }
-              default:
-              case 'STRING':
-                if (
-                  possibleValues &&
-                  Array.isArray(possibleValues) &&
-                  !possibleValues.includes(field)
-                ) {
-                  throw new Error(
-                    `${errorMessage} Please ensure value is one of ${possibleValues.join(
-                      ', '
-                    )}.`
-                  )
-                }
-                break
-            }
-            acc[name] = realFieldValue === '' ? null : realFieldValue
-            acc.usedGeneratedRandomNumber = !hasCustomRandomNumber
-            return acc
-          }, {})
-        })
+              acc[name] = realFieldValue === '' ? null : realFieldValue
+              acc.usedGeneratedRandomNumber = !hasCustomRandomNumber
+              return acc
+            }, {})
+          })
+          .filter(Boolean)
       } catch (e) {
         this.errorMessage = e
         this.$refs.fileUpload.value = ''

From 5fc705569f1763ec4d1448d7080853a9645d4b87 Mon Sep 17 00:00:00 2001
From: Sam Grund <samuel.grund@1stdibs.com>
Date: Sat, 9 Jan 2021 13:55:07 -0500
Subject: [PATCH 17/22] feat: only try one download case for the csv

---
 src/public/plugins/helpers.js | 55 ++++++++++++++++++++---------------
 1 file changed, 32 insertions(+), 23 deletions(-)

diff --git a/src/public/plugins/helpers.js b/src/public/plugins/helpers.js
index a1bd972d..42c99ad6 100644
--- a/src/public/plugins/helpers.js
+++ b/src/public/plugins/helpers.js
@@ -10,29 +10,38 @@ export function downloadCSV({ content, fileName }) {
   const a = document.createElement('a')
   const mimeType = 'text/csv;encoding:utf-8'
 
-  if (navigator.msSaveBlob) {
-    // IE10
-    navigator.msSaveBlob(
-      new Blob([content], {
-        type: mimeType,
-      }),
-      fileName
-    )
-  } else if (URL && 'download' in a) {
-    // html5 A[download]
-    a.href = URL.createObjectURL(
-      new Blob([content], {
-        type: mimeType,
-      })
-    )
-    a.setAttribute('download', fileName)
-    document.body.appendChild(a)
-    a.click()
-    document.body.removeChild(a)
-  } else {
-    location.href =
-      'data:application/octet-stream,' + encodeURIComponent(content) // only this mime type is supported
-  }
+  a.href = URL.createObjectURL(
+    new Blob([content], {
+      type: mimeType,
+    })
+  )
+  a.setAttribute('download', fileName)
+  document.body.appendChild(a)
+  a.click()
+  document.body.removeChild(a)
+
+  // if (navigator.msSaveBlob) {
+  //   // IE10
+  //   navigator.msSaveBlob(
+  //     new Blob([content], {
+  //       type: mimeType,
+  //     }),
+  //     fileName
+  //   )
+  // } else if (URL && ('download' in a || a.download !== undefined)) {
+  //   // html5 A[download]
+  //   a.href = URL.createObjectURL(
+  //     new Blob([content], {
+  //       type: mimeType,
+  //     })
+  //   )
+  //   a.setAttribute('download', fileName)
+  //   document.body.appendChild(a)
+  //   a.click()
+  //   document.body.removeChild(a)
+  // } else {
+  //   location.href = 'data:text/csv;charset=utf-8,' + encodeURIComponent(content)
+  // }
 }
 
 // function generateBins({ min, max }) {

From b4b70ed8e2bddb59c1eeac467f7be3bdc480b48d Mon Sep 17 00:00:00 2001
From: Sam Grund <samuel.grund@1stdibs.com>
Date: Sun, 10 Jan 2021 22:11:08 -0500
Subject: [PATCH 18/22] fix: issues

---
 .../components/EditReserveCategoryModal.vue   | 24 ++++--
 src/public/pages/load-data.vue                | 85 ++++++++++---------
 src/public/pages/reserve-instances.vue        |  6 +-
 3 files changed, 64 insertions(+), 51 deletions(-)

diff --git a/src/public/components/EditReserveCategoryModal.vue b/src/public/components/EditReserveCategoryModal.vue
index e0a550dd..962ba02e 100644
--- a/src/public/components/EditReserveCategoryModal.vue
+++ b/src/public/components/EditReserveCategoryModal.vue
@@ -91,7 +91,6 @@
           </div>
           <div class="modalCriteriaPanels mb-18">
             <font-awesome-icon
-              v-if="reserveCategory.priority.length > 1"
               icon="trash"
               class="deleteCriteriaButton"
               @click="deleteCurrentCriteria"
@@ -304,13 +303,22 @@ export default {
       }
     },
     deleteCurrentCriteria() {
-      const deletedLastCriteria =
-        this.currentCriteria === this.reserveCategory.priority.length - 1
-      this.reserveCategory.priority.splice(this.currentCriteria, 1)
-      if (deletedLastCriteria) {
-        this.$nextTick(() => {
-          this.currentCriteria = this.currentCriteria - 1
-        })
+      // clear form if this is the only criteria
+      if (this.reserveCategory.priority.length === 1) {
+        this.reserveCategory.priority = [
+          {
+            ...deepClone(defaultCriteria),
+          },
+        ]
+      } else {
+        const deletedLastCriteria =
+          this.currentCriteria === this.reserveCategory.priority.length - 1
+        this.reserveCategory.priority.splice(this.currentCriteria, 1)
+        if (deletedLastCriteria) {
+          this.$nextTick(() => {
+            this.currentCriteria = this.currentCriteria - 1
+          })
+        }
       }
       this.$nextTick(() => {
         this.validatePriorities()
diff --git a/src/public/pages/load-data.vue b/src/public/pages/load-data.vue
index f345baa6..a47f6b26 100644
--- a/src/public/pages/load-data.vue
+++ b/src/public/pages/load-data.vue
@@ -205,7 +205,7 @@ export default {
                   ? { min: 0, max: 100000 }
                   : null,
               }
-              const errorMessage = `Patient ${
+              const errorMessage = `Patient in row ${
                 patientIndex + 1
               } has an invalid value for ${name}: ${field}.`
               let realFieldValue = field
@@ -223,54 +223,57 @@ export default {
                   recipientIds.push(realFieldValue)
                 }
               }
-              let typeCheck = dataType
-              if (hasCustomRandomNumber) {
-                typeCheck = 'NUMBER'
-              }
 
-              switch (typeCheck) {
-                case 'BOOLEAN': {
-                  const fieldUC = field.toUpperCase()
-                  if (!['TRUE', 'FALSE'].includes(fieldUC)) {
-                    throw new Error(
-                      `${errorMessage} Please ensure this is a true/false value.`
-                    )
-                  }
-                  realFieldValue = fieldUC === 'TRUE'
-                  break
+              if (required) {
+                let typeCheck = dataType
+                if (hasCustomRandomNumber) {
+                  typeCheck = 'NUMBER'
                 }
-                case 'NUMBER': {
-                  if (field && !isFloat(field)) {
-                    throw new Error(
-                      `${errorMessage} Please ensure this is a real number.`
-                    )
+
+                switch (typeCheck) {
+                  case 'BOOLEAN': {
+                    const fieldUC = field.toUpperCase()
+                    if (!['TRUE', 'FALSE'].includes(fieldUC)) {
+                      throw new Error(
+                        `${errorMessage} Please ensure this is a true/false value.`
+                      )
+                    }
+                    realFieldValue = fieldUC === 'TRUE'
+                    break
                   }
-                  const numberVal = parseFloat(field)
-                  if (possibleValues && !isNaN(numberVal)) {
-                    const { min, max } = possibleValues
-                    if (numberVal < min || numberVal > max) {
+                  case 'NUMBER': {
+                    if (field && !isFloat(field)) {
                       throw new Error(
-                        `${errorMessage} Out of range. Please ensure number is between ${min} and ${max} (inclusive).`
+                        `${errorMessage} Please ensure this is a real number.`
                       )
                     }
+                    const numberVal = parseFloat(field)
+                    if (possibleValues && !isNaN(numberVal)) {
+                      const { min, max } = possibleValues
+                      if (numberVal < min || numberVal > max) {
+                        throw new Error(
+                          `${errorMessage} Out of range. Please ensure number is between ${min} and ${max} (inclusive).`
+                        )
+                      }
+                    }
+                    realFieldValue = !isNaN(numberVal) ? numberVal : null
+                    break
                   }
-                  realFieldValue = !isNaN(numberVal) ? numberVal : null
-                  break
+                  default:
+                  case 'STRING':
+                    if (
+                      possibleValues &&
+                      Array.isArray(possibleValues) &&
+                      !possibleValues.includes(field)
+                    ) {
+                      throw new Error(
+                        `${errorMessage} Please ensure value is one of ${possibleValues.join(
+                          ', '
+                        )}.`
+                      )
+                    }
+                    break
                 }
-                default:
-                case 'STRING':
-                  if (
-                    possibleValues &&
-                    Array.isArray(possibleValues) &&
-                    !possibleValues.includes(field)
-                  ) {
-                    throw new Error(
-                      `${errorMessage} Please ensure value is one of ${possibleValues.join(
-                        ', '
-                      )}.`
-                    )
-                  }
-                  break
               }
               acc[name] = realFieldValue === '' ? null : realFieldValue
               acc.usedGeneratedRandomNumber = !hasCustomRandomNumber
diff --git a/src/public/pages/reserve-instances.vue b/src/public/pages/reserve-instances.vue
index 2122513e..531e8bc0 100644
--- a/src/public/pages/reserve-instances.vue
+++ b/src/public/pages/reserve-instances.vue
@@ -272,7 +272,9 @@ export default {
             break
           case 'bins':
             priorityStringElements.push(
-              `number_of_bins = ${filteredPriority.bins.length}`
+              `number_of_bins = ${
+                filteredPriority.coarsened ? filteredPriority.bins.length : 1
+              }`
             )
             break
           case 'numBins':
@@ -308,7 +310,7 @@ export default {
       ])
       outputArray.push([])
       outputArray.push([`Unit Allocated: ${displayConfig.unitType}`])
-      outputArray.push([`Number Allocated: ${displayConfig.supply}`])
+      outputArray.push([`Total Supply Rationed: ${displayConfig.supply}`])
       outputArray.push([`Units Left Over: ${leftOver}`])
       outputArray.push([
         [

From e9e4d1f32521ffd626942fa3e345dd3859d1ade6 Mon Sep 17 00:00:00 2001
From: Sam Grund <samuel.grund@1stdibs.com>
Date: Thu, 14 Jan 2021 13:00:03 -0500
Subject: [PATCH 19/22] fix: (hopefully) only allow CSV downloads on windows

---
 main.js | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/main.js b/main.js
index babcfd86..8cb3189d 100644
--- a/main.js
+++ b/main.js
@@ -28,6 +28,16 @@ try {
 
     //  use server for route
     mainWindow.loadURL(`http://localhost:${env.PORT}`)
+
+    mainWindow.webContents.session.on(
+      'will-download',
+      (event, downloadItem, webContents) => {
+        downloadItem.setSaveDialogOptions({
+          filters: [{ name: 'CSV', extensions: ['csv'] }],
+          message: 'Download CSV',
+        })
+      }
+    )
   }
 
   app.on('ready', createWindow)

From 34724e5278b8c09bba58470395da17677fbe664b Mon Sep 17 00:00:00 2001
From: Sam Grund <samuel.grund@1stdibs.com>
Date: Tue, 26 Jan 2021 11:05:38 -0500
Subject: [PATCH 20/22] fix: disabled in progress and size error fixed

---
 .../components/EditReserveCategoryModal.vue   | 21 ++++++++++++-------
 src/public/pages/reserve-instances.vue        | 20 ++++++++++++++----
 2 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/src/public/components/EditReserveCategoryModal.vue b/src/public/components/EditReserveCategoryModal.vue
index 962ba02e..c05292ee 100644
--- 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
index 531e8bc0..cf163894 100644
--- 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;
+      }
     }
   }
 }

From b89b86633b7ede31b7e98ea4ef12faed8cb20e43 Mon Sep 17 00:00:00 2001
From: John Everett Ferguson <john.everett.ferguson@gmail.com>
Date: Wed, 27 Jan 2021 08:50:13 -0500
Subject: [PATCH 21/22] feat: make criteria fields of default categories
 default

---
 build/entitlements.mac.plist          |   8 +
 build/icon.ico                        | Bin 12386 -> 5659 bytes
 package.json                          |   7 +-
 src/api/main/routes/configurations.js |  74 ++++-
 src/notarize.js                       |  18 ++
 yarn.lock                             | 388 +++++++++++++++++++++++++-
 6 files changed, 478 insertions(+), 17 deletions(-)
 create mode 100644 build/entitlements.mac.plist
 create mode 100644 src/notarize.js

diff --git a/build/entitlements.mac.plist b/build/entitlements.mac.plist
new file mode 100644
index 00000000..d6b93bc0
--- /dev/null
+++ b/build/entitlements.mac.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+  <dict>
+    <key>com.apple.security.cs.allow-unsigned-executable-memory</key>
+    <true/>
+  </dict>
+</plist>
diff --git a/build/icon.ico b/build/icon.ico
index 24ffb76b6dcb8ff8ca90be4e7f3f34c03119f126..24e3b073878d074f53077cc70bc5233cdc840576 100644
GIT binary patch
literal 5659
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
NoE=>4AK8&o{}1i~Vd?+?

literal 12386
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

diff --git a/package.json b/package.json
index e93bcb14..4665989f 100644
--- a/package.json
+++ b/package.json
@@ -8,16 +8,15 @@
   "private": true,
   "build": {
     "productName": "Project Reserve",
-    "appId": "your.id",
+    "appId": "project.reserve",
     "mac": {
-      "category": "your.app.category.type"
     },
     "win": {
       "target": [
         {
           "target": "nsis"
         }
-      ]    
+      ]
     },
     "files": [
       "build/*",
@@ -52,6 +51,8 @@
     "body-parser": "^1.19.0",
     "compression": "^1.7.4",
     "dotenv": "^8.2.0",
+    "electron-builder-squirrel-windows": "^22.10.4",
+    "electron-notarize": "^1.0.0",
     "express": "^4.17.1",
     "http": "^0.0.1-security",
     "isomorphic-fetch": "^3.0.0",
diff --git a/src/api/main/routes/configurations.js b/src/api/main/routes/configurations.js
index 79300c07..092f6637 100644
--- a/src/api/main/routes/configurations.js
+++ b/src/api/main/routes/configurations.js
@@ -110,6 +110,7 @@ router.get("/configurations/:id/fieldNames", async (req, res) => {
     where: { configurationId, isDefault: false },
   });
 
+
   const categoryCriteriaFields = await db.sequelize.query(
     `
     SELECT id, name FROM category_criteria 
@@ -122,6 +123,30 @@ router.get("/configurations/:id/fieldNames", async (req, res) => {
   );
 
 
+  const categoryCriteriaFieldsDefault = await db.sequelize.query(
+    `
+    SELECT id, name FROM category_criteria 
+    WHERE priority_id IN (
+      SELECT id FROM priority 
+      WHERE reserve_category_id in (SELECT id FROM reserve_category WHERE configuration_id = ${configurationId} AND is_default)
+    );
+    `,
+    { type: SELECT }
+  );
+
+
+  const categoryCriteriaFieldsNotDefault = await db.sequelize.query(
+    `
+    SELECT id, name FROM category_criteria 
+    WHERE priority_id IN (
+      SELECT id FROM priority 
+      WHERE reserve_category_id in (SELECT id FROM reserve_category WHERE configuration_id = ${configurationId} AND NOT is_default)
+    );
+    `,
+    { type: SELECT }
+  );
+
+
   const possibleValues = await Promise.all(categoryCriteriaFields[0].map(async (criteria) => {
     const values = await db.sequelize.query(
       `
@@ -144,17 +169,29 @@ router.get("/configurations/:id/fieldNames", async (req, res) => {
   }, {})
 
 
-  const numericCriteriaFields = await db.sequelize.query(
+  const numericCriteriaFieldsRequired = await db.sequelize.query(
     `
     SELECT name, min, max FROM numeric_criteria 
     WHERE priority_id IN (
       SELECT id FROM priority 
-      WHERE reserve_category_id in (SELECT id FROM reserve_category WHERE configuration_id = ${configurationId})
+      WHERE reserve_category_id in (SELECT id FROM reserve_category WHERE configuration_id = ${configurationId} AND is_default)
     );
     `,
     { type: SELECT }
   );
 
+const numericCriteriaFieldsNotRequired = await db.sequelize.query(
+    `
+    SELECT name, min, max FROM numeric_criteria 
+    WHERE priority_id IN (
+      SELECT id FROM priority 
+      WHERE reserve_category_id in (SELECT id FROM reserve_category WHERE configuration_id = ${configurationId} AND NOT is_default)
+    );
+    `,
+    { type: SELECT }
+  );
+
+
   const names = new Set()
 
   const fieldNames = [
@@ -170,7 +207,20 @@ router.get("/configurations/:id/fieldNames", async (req, res) => {
       names.add(cat.name)
     }
   });
-  categoryCriteriaFields[0].forEach((criteria) => {
+
+   categoryCriteriaFieldsDefault[0].forEach((criteria) => {
+    if (!names.has(criteria.name)) {
+      fieldNames.push({
+        name: criteria.name.toLowerCase().split(" ").join("_"),
+        required: true,
+        dataType: "STRING",
+        possibleValues: possibleValuesMap[criteria.id]
+      })
+      names.add(criteria.name)
+    }
+  });
+
+   categoryCriteriaFieldsNotDefault[0].forEach((criteria) => {
     if (!names.has(criteria.name)) {
       fieldNames.push({
         name: criteria.name.toLowerCase().split(" ").join("_"),
@@ -181,7 +231,20 @@ router.get("/configurations/:id/fieldNames", async (req, res) => {
       names.add(criteria.name)
     }
   });
-  numericCriteriaFields[0].forEach((criteria) => {
+
+   numericCriteriaFieldsRequired[0].forEach((criteria) => {
+    if (!names.has(criteria.name)) {
+      fieldNames.push({
+        name: criteria.name.toLowerCase().split(" ").join("_"),
+        required: true,
+        dataType: "NUMBER",
+        possibleValues: { min: criteria.min, max: criteria.max }
+      })
+      names.add(criteria.name)
+    }
+  });
+
+   numericCriteriaFieldsNotRequired[0].forEach((criteria) => {
     if (!names.has(criteria.name)) {
       fieldNames.push({
         name: criteria.name.toLowerCase().split(" ").join("_"),
@@ -193,6 +256,9 @@ router.get("/configurations/:id/fieldNames", async (req, res) => {
     }
   });
 
+
+
+
   res.json(fieldNames);
 });
 
diff --git a/src/notarize.js b/src/notarize.js
new file mode 100644
index 00000000..09a133e6
--- /dev/null
+++ b/src/notarize.js
@@ -0,0 +1,18 @@
+require('dotenv').config();
+const { notarize } = require('electron-notarize');
+
+exports.default = async function notarizing(context) {
+  const { electronPlatformName, appOutDir } = context;  
+  if (electronPlatformName !== 'darwin') {
+    return;
+  }
+
+  const appName = context.packager.appInfo.productFilename;
+
+  return await notarize({
+    appBundleId: 'project.reserve',
+    appPath: `${appOutDir}/${appName}.app`,
+    appleId: process.env.APPLEID,
+    appleIdPassword: process.env.APPLEIDPASS,
+  });
+};
diff --git a/yarn.lock b/yarn.lock
index e26976ec..3808c414 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -122,6 +122,17 @@
     global-agent "^2.0.2"
     global-tunnel-ng "^2.7.1"
 
+"@electron/universal@1.0.4":
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/@electron/universal/-/universal-1.0.4.tgz#231ac246c39d45b80e159bd21c3f9027dcaa10f5"
+  integrity sha512-ajZoumi4XwqwmZe8YVhu4XGkZBCPyWZsVCQONPTIe9TUlleSN+dic3YpXlaWcilx/HOzTdldTKtabNTeI0gDoA==
+  dependencies:
+    "@malept/cross-spawn-promise" "^1.1.0"
+    asar "^3.0.3"
+    debug "^4.3.1"
+    dir-compare "^2.4.0"
+    fs-extra "^9.0.1"
+
 "@eslint/eslintrc@^0.2.1":
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.2.1.tgz#f72069c330461a06684d119384435e12a5d76e3c"
@@ -162,6 +173,13 @@
   resolved "https://registry.yarnpkg.com/@fortawesome/vue-fontawesome/-/vue-fontawesome-2.0.0.tgz#63da3e459147cebb0a8d58eed81d6071db9f5973"
   integrity sha512-N3VKw7KzRfOm8hShUVldpinlm13HpvLBQgT63QS+aCrIRLwjoEUXY5Rcmttbfb6HkzZaeqjLqd/aZCQ53UjQpg==
 
+"@malept/cross-spawn-promise@^1.1.0":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@malept/cross-spawn-promise/-/cross-spawn-promise-1.1.1.tgz#504af200af6b98e198bce768bc1730c6936ae01d"
+  integrity sha512-RTBGWL5FWQcg9orDOCcp4LvItNzUPcyEU9bwaeJX0rJ1IQxzucC48Y0/sQLp/g6t99IQgAlGIaesJS+gTn7tVQ==
+  dependencies:
+    cross-spawn "^7.0.1"
+
 "@sindresorhus/is@^0.14.0":
   version "0.14.0"
   resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.14.0.tgz#9fb3a3cf3132328151f353de4632e01e52102bea"
@@ -237,6 +255,13 @@
   dependencies:
     "@types/node" "*"
 
+"@types/fs-extra@^9.0.5":
+  version "9.0.6"
+  resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-9.0.6.tgz#488e56b77299899a608b8269719c1d133027a6ab"
+  integrity sha512-ecNRHw4clCkowNOBJH1e77nvbPxHYnWIXMv1IAoG/9+MYGkgoyr3Ppxr7XYFNL41V422EDhyV4/4SSK8L2mlig==
+  dependencies:
+    "@types/node" "*"
+
 "@types/geojson@^1.0.0":
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/@types/geojson/-/geojson-1.0.6.tgz#3e02972728c69248c2af08d60a48cbb8680fffdf"
@@ -247,6 +272,14 @@
   resolved "https://registry.yarnpkg.com/@types/geojson/-/geojson-7946.0.7.tgz#c8fa532b60a0042219cdf173ca21a975ef0666ad"
   integrity sha512-wE2v81i4C4Ol09RtsWFAqg3BUitWbHSpSlIo+bNdsCJijO9sjme+zm+73ZMCa/qMC8UEERxzGbvmr1cffo2SiQ==
 
+"@types/glob@^7.1.1":
+  version "7.1.3"
+  resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.3.tgz#e6ba80f36b7daad2c685acd9266382e68985c183"
+  integrity sha512-SEYeGAIQIQX8NN6LDKprLjbrd5dARM5EXsd8GI/A5l0apYI1fGMWgPHSe4ZKL4eozlAyI+doUE9XbYS4xCkQ1w==
+  dependencies:
+    "@types/minimatch" "*"
+    "@types/node" "*"
+
 "@types/json-schema@^7.0.6":
   version "7.0.6"
   resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.6.tgz#f4c7ec43e81b319a9815115031709f26987891f0"
@@ -257,6 +290,11 @@
   resolved "https://registry.yarnpkg.com/@types/mime/-/mime-2.0.3.tgz#c893b73721db73699943bfc3653b1deb7faa4a3a"
   integrity sha512-Jus9s4CDbqwocc5pOAnh8ShfrnMcPHuJYzVcSUU7lrh8Ni5HuIqX3oilL86p3dlTrk0LzHRCgA/GQ7uNCw6l2Q==
 
+"@types/minimatch@*":
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"
+  integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==
+
 "@types/node@*", "@types/node@^14.14.7":
   version "14.14.10"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.10.tgz#5958a82e41863cfc71f2307b3748e3491ba03785"
@@ -516,6 +554,40 @@ app-builder-bin@3.5.10:
   resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-3.5.10.tgz#4a7f9999fccc0c435b6284ae1366bc76a17c4a7d"
   integrity sha512-Jd+GW68lR0NeetgZDo47PdWBEPdnD+p0jEa7XaxjRC8u6Oo/wgJsfKUkORRgr2NpkD19IFKN50P6JYy04XHFLQ==
 
+app-builder-bin@3.5.12:
+  version "3.5.12"
+  resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-3.5.12.tgz#bbe174972cc1f481f73d6d92ad47a8b4c7eb4530"
+  integrity sha512-lQARM2AielmFoBeIo6LZigAe+58Wwe07ZWkt+wVeDxzyieNmeWjlvz/V5dKzinydwdHd+CNswN86sww46yijjA==
+
+app-builder-lib@22.10.4:
+  version "22.10.4"
+  resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-22.10.4.tgz#3fc70821b76beb9c8279d9de22960ef2174da153"
+  integrity sha512-q7B1cr8Ry4a7o08EKShLfwsnIVf5By7YhVwcoqgEwPKxtoj1qF0kB4wyBP79rJylYi0Zj2cSkJJ/gD/ef9xhoQ==
+  dependencies:
+    "7zip-bin" "~5.0.3"
+    "@develar/schema-utils" "~2.6.5"
+    "@electron/universal" "1.0.4"
+    async-exit-hook "^2.0.1"
+    bluebird-lst "^1.0.9"
+    builder-util "22.10.4"
+    builder-util-runtime "8.7.3"
+    chromium-pickle-js "^0.2.0"
+    debug "^4.3.1"
+    ejs "^3.1.5"
+    electron-publish "22.10.4"
+    fs-extra "^9.0.1"
+    hosted-git-info "^3.0.7"
+    is-ci "^2.0.0"
+    isbinaryfile "^4.0.6"
+    js-yaml "^3.14.1"
+    lazy-val "^1.0.4"
+    minimatch "^3.0.4"
+    normalize-package-data "^3.0.0"
+    read-config-file "6.0.0"
+    sanitize-filename "^1.6.3"
+    semver "^7.3.4"
+    temp-file "^3.3.7"
+
 app-builder-lib@22.9.1:
   version "22.9.1"
   resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-22.9.1.tgz#ccb8f1a02b628514a5dfab9401fa2a976689415c"
@@ -549,6 +621,35 @@ aproba@^1.0.3, aproba@^1.1.1:
   resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
   integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==
 
+archiver-utils@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/archiver-utils/-/archiver-utils-2.1.0.tgz#e8a460e94b693c3e3da182a098ca6285ba9249e2"
+  integrity sha512-bEL/yUb/fNNiNTuUz979Z0Yg5L+LzLxGJz8x79lYmR54fmTIb6ob/hNQgkQnIUDWIFjZVQwl9Xs356I6BAMHfw==
+  dependencies:
+    glob "^7.1.4"
+    graceful-fs "^4.2.0"
+    lazystream "^1.0.0"
+    lodash.defaults "^4.2.0"
+    lodash.difference "^4.5.0"
+    lodash.flatten "^4.4.0"
+    lodash.isplainobject "^4.0.6"
+    lodash.union "^4.6.0"
+    normalize-path "^3.0.0"
+    readable-stream "^2.0.0"
+
+archiver@^5.1.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/archiver/-/archiver-5.2.0.tgz#25aa1b3d9febf7aec5b0f296e77e69960c26db94"
+  integrity sha512-QEAKlgQuAtUxKeZB9w5/ggKXh21bZS+dzzuQ0RPBC20qtDCbTyzqmisoeJP46MP39fg4B4IcyvR+yeyEBdblsQ==
+  dependencies:
+    archiver-utils "^2.1.0"
+    async "^3.2.0"
+    buffer-crc32 "^0.2.1"
+    readable-stream "^3.6.0"
+    readdir-glob "^1.0.0"
+    tar-stream "^2.1.4"
+    zip-stream "^4.0.4"
+
 are-we-there-yet@~1.1.2:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz#4b35c2944f062a8bfcda66410760350fe9ddfc21"
@@ -633,6 +734,18 @@ array-unique@^0.3.2:
   resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
   integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=
 
+asar@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/asar/-/asar-3.0.3.tgz#1fef03c2d6d2de0cbad138788e4f7ae03b129c7b"
+  integrity sha512-k7zd+KoR+n8pl71PvgElcoKHrVNiSXtw7odKbyNpmgKe7EGRF9Pnu3uLOukD37EvavKwVFxOUpqXTIZC5B5Pmw==
+  dependencies:
+    chromium-pickle-js "^0.2.0"
+    commander "^5.0.0"
+    glob "^7.1.6"
+    minimatch "^3.0.4"
+  optionalDependencies:
+    "@types/glob" "^7.1.1"
+
 asn1.js@^5.2.0:
   version "5.4.1"
   resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-5.4.1.tgz#11a980b84ebb91781ce35b0fdc2ee294e3783f07"
@@ -700,6 +813,11 @@ async@^2.1.2, async@^2.4.1, async@^2.5.1:
   dependencies:
     lodash "^4.17.14"
 
+async@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/async/-/async-3.2.0.tgz#b3a2685c5ebb641d3de02d161002c60fc9f85720"
+  integrity sha512-TR2mEZFVOj2pLStYxLht7TyfuRzaydfpxr3k9RpHIzMgw7A64dzsdqCxH1WJyQdoe8T10nDXd9wnEigmiuHIZw==
+
 asynckit@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
@@ -1434,7 +1552,7 @@ base64-arraybuffer@0.1.4:
   resolved "https://registry.yarnpkg.com/base64-arraybuffer/-/base64-arraybuffer-0.1.4.tgz#9818c79e059b1355f97e0428a017c838e90ba812"
   integrity sha1-mBjHngWbE1X5fgQooBfIOOkLqBI=
 
-base64-js@^1.0.2:
+base64-js@^1.0.2, base64-js@^1.3.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a"
   integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==
@@ -1498,6 +1616,15 @@ bindings@^1.5.0:
   dependencies:
     file-uri-to-path "1.0.0"
 
+bl@^4.0.3:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/bl/-/bl-4.0.3.tgz#12d6287adc29080e22a705e5764b2a9522cdc489"
+  integrity sha512-fs4G6/Hu4/EE+F75J8DuN/0IpQqNjAdC7aEQv7Qt8MHGUH7Ckv2MwTEEeN9QehD0pfIDkMI1bkHYkKy7xHyKIg==
+  dependencies:
+    buffer "^5.5.0"
+    inherits "^2.0.4"
+    readable-stream "^3.4.0"
+
 block-stream@*:
   version "0.0.9"
   resolved "https://registry.yarnpkg.com/block-stream/-/block-stream-0.0.9.tgz#13ebfe778a03205cfe03751481ebb4b3300c126a"
@@ -1705,11 +1832,16 @@ browserslist@^3.2.6:
     caniuse-lite "^1.0.30000844"
     electron-to-chromium "^1.3.47"
 
-buffer-crc32@~0.2.3:
+buffer-crc32@^0.2.1, buffer-crc32@^0.2.13, buffer-crc32@~0.2.3:
   version "0.2.13"
   resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"
   integrity sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=
 
+buffer-equal@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/buffer-equal/-/buffer-equal-1.0.0.tgz#59616b498304d556abd466966b22eeda3eca5fbe"
+  integrity sha1-WWFrSYME1Var1GaWayLu2j7KX74=
+
 buffer-from@^1.0.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
@@ -1729,6 +1861,14 @@ buffer@^4.3.0:
     ieee754 "^1.1.4"
     isarray "^1.0.0"
 
+buffer@^5.5.0:
+  version "5.7.1"
+  resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0"
+  integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==
+  dependencies:
+    base64-js "^1.3.1"
+    ieee754 "^1.1.13"
+
 builder-util-runtime@8.7.2:
   version "8.7.2"
   resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.7.2.tgz#d93afc71428a12789b437e13850e1fa7da956d72"
@@ -1737,6 +1877,34 @@ builder-util-runtime@8.7.2:
     debug "^4.1.1"
     sax "^1.2.4"
 
+builder-util-runtime@8.7.3:
+  version "8.7.3"
+  resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.7.3.tgz#0aaafa52d25295c939496f62231ca9ff06c30e40"
+  integrity sha512-1Q2ReBqFblimF5g/TLg2+0M5Xzv0Ih5LxJ/BMWXvEy/e6pQKeeEpbkPMGsN6OiQgkygaZo5VXCXIjOkOQG5EoQ==
+  dependencies:
+    debug "^4.3.2"
+    sax "^1.2.4"
+
+builder-util@22.10.4:
+  version "22.10.4"
+  resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-22.10.4.tgz#54e8be83dd0dec28073d866ff087cee8e7ce6cf6"
+  integrity sha512-XdcbFG3otEkNRKxW2wS1npNviCb/IrzusEQ55lMB+6YEHxBOfTbf8vnPt0pDumfwmxls9xczABU+mfqN/W4uDw==
+  dependencies:
+    "7zip-bin" "~5.0.3"
+    "@types/debug" "^4.1.5"
+    "@types/fs-extra" "^9.0.5"
+    app-builder-bin "3.5.12"
+    bluebird-lst "^1.0.9"
+    builder-util-runtime "8.7.3"
+    chalk "^4.1.0"
+    debug "^4.3.1"
+    fs-extra "^9.0.1"
+    is-ci "^2.0.0"
+    js-yaml "^3.14.1"
+    source-map-support "^0.5.19"
+    stat-mode "^1.0.0"
+    temp-file "^3.3.7"
+
 builder-util@22.9.1:
   version "22.9.1"
   resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-22.9.1.tgz#b7087a5cde477f90d718ca5d7fafb6ae261b16af"
@@ -2173,6 +2341,11 @@ colormin@^1.0.5:
     css-color-names "0.0.4"
     has "^1.0.1"
 
+colors@1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz#0433f44d809680fdeb60ed260f1b0c262e82a40b"
+  integrity sha1-BDP0TYCWgP3rYO0mDxsMJi6CpAs=
+
 colors@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/colors/-/colors-1.1.2.tgz#168a4701756b6a7f51a12ce0c97bfa28c084ed63"
@@ -2205,11 +2378,23 @@ command-line-usage@^6.1.0:
     table-layout "^1.0.1"
     typical "^5.2.0"
 
+commander@2.9.0:
+  version "2.9.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.9.0.tgz#9c99094176e12240cb22d6c5146098400fe0f7d4"
+  integrity sha1-nJkJQXbhIkDLItbFFGCYQA/g99Q=
+  dependencies:
+    graceful-readlink ">= 1.0.0"
+
 commander@^2.19.0:
   version "2.20.3"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
   integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
 
+commander@^5.0.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-5.1.0.tgz#46abbd1652f8e059bddaef99bbdcb2ad9cf179ae"
+  integrity sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==
+
 commander@^6.2.0:
   version "6.2.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-6.2.0.tgz#b990bfb8ac030aedc6d11bc04d1488ffef56db75"
@@ -2235,6 +2420,16 @@ component-emitter@^1.2.1, component-emitter@~1.3.0:
   resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0"
   integrity sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==
 
+compress-commons@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/compress-commons/-/compress-commons-4.0.2.tgz#d6896be386e52f37610cef9e6fa5defc58c31bd7"
+  integrity sha512-qhd32a9xgzmpfoga1VQEiLEwdKZ6Plnpx5UCgIsf89FSolyJ7WnifY4Gtjgv5WR6hWAyRaHxC5MiEhU/38U70A==
+  dependencies:
+    buffer-crc32 "^0.2.13"
+    crc32-stream "^4.0.1"
+    normalize-path "^3.0.0"
+    readable-stream "^3.6.0"
+
 compressible@~2.0.16:
   version "2.0.18"
   resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.18.tgz#af53cca6b070d4c3c0750fbd77286a6d7cc46fba"
@@ -2398,6 +2593,22 @@ cors@~2.8.5:
     object-assign "^4"
     vary "^1"
 
+crc-32@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/crc-32/-/crc-32-1.2.0.tgz#cb2db6e29b88508e32d9dd0ec1693e7b41a18208"
+  integrity sha512-1uBwHxF+Y/4yF5G48fwnKq6QsIXheor3ZLPT80yGBV1oEUwpPojlEhQbWKVw1VwcTQyMGHK1/XMmTjmlsmTTGA==
+  dependencies:
+    exit-on-epipe "~1.0.1"
+    printj "~1.1.0"
+
+crc32-stream@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/crc32-stream/-/crc32-stream-4.0.1.tgz#0f047d74041737f8a55e86837a1b826bd8ab0067"
+  integrity sha512-FN5V+weeO/8JaXsamelVYO1PHyeCsuL3HcG4cqsj0ceARcocxalaShCsohZMSAF+db7UYFwBy1rARK/0oFItUw==
+  dependencies:
+    crc-32 "^1.2.0"
+    readable-stream "^3.4.0"
+
 create-ecdh@^4.0.0:
   version "4.0.4"
   resolved "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.4.tgz#d6e7f4bffa66736085a0762fd3a632684dabcc4e"
@@ -2642,13 +2853,20 @@ debug@^3.1.0, debug@^3.2.6:
   dependencies:
     ms "^2.1.1"
 
-debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.0:
+debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.0, debug@^4.3.1:
   version "4.3.1"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz#f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee"
   integrity sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==
   dependencies:
     ms "2.1.2"
 
+debug@^4.3.2:
+  version "4.3.2"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.2.tgz#f0a49c18ac8779e31d4a0c6029dfb76873c7428b"
+  integrity sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==
+  dependencies:
+    ms "2.1.2"
+
 debug@~3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
@@ -2805,6 +3023,16 @@ diffie-hellman@^5.0.0:
     miller-rabin "^4.0.0"
     randombytes "^2.0.0"
 
+dir-compare@^2.4.0:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/dir-compare/-/dir-compare-2.4.0.tgz#785c41dc5f645b34343a4eafc50b79bac7f11631"
+  integrity sha512-l9hmu8x/rjVC9Z2zmGzkhOEowZvW7pmYws5CWHutg8u1JgvsKWMx7Q/UODeu4djLZ4FgW5besw5yvMQnBHzuCA==
+  dependencies:
+    buffer-equal "1.0.0"
+    colors "1.0.3"
+    commander "2.9.0"
+    minimatch "3.0.4"
+
 dmg-builder@22.9.1:
   version "22.9.1"
   resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-22.9.1.tgz#64647224f37ee47fc9bd01947c21cc010a30511f"
@@ -2910,6 +3138,20 @@ ejs@^3.1.5:
   dependencies:
     jake "^10.6.1"
 
+electron-builder-squirrel-windows@^22.10.4:
+  version "22.10.4"
+  resolved "https://registry.yarnpkg.com/electron-builder-squirrel-windows/-/electron-builder-squirrel-windows-22.10.4.tgz#fd23d7124dbed62fe2431933f05e23feaaef50b6"
+  integrity sha512-Kv6FO7OPdlhG02i+7fbOAWc7JCwtGJOzg9gbJySAE4cNhA49bQF4/GyQhFJYhJgg/AapfuV+SLOxlgrD+33UHg==
+  dependencies:
+    app-builder-lib "22.10.4"
+    archiver "^5.1.0"
+    bluebird-lst "^1.0.9"
+    builder-util "22.10.4"
+    fs-extra "^9.0.1"
+    sanitize-filename "^1.6.3"
+  optionalDependencies:
+    "7zip-bin" "~5.0.3"
+
 electron-builder@^22.9.1:
   version "22.9.1"
   resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-22.9.1.tgz#a2962db6f2757bc01d02489f38fafe0809f68f60"
@@ -2935,6 +3177,28 @@ electron-is-dev@^1.1.0:
   resolved "https://registry.yarnpkg.com/electron-is-dev/-/electron-is-dev-1.2.0.tgz#2e5cea0a1b3ccf1c86f577cee77363ef55deb05e"
   integrity sha512-R1oD5gMBPS7PVU8gJwH6CtT0e6VSoD0+SzSnYpNm+dBkcijgA+K7VAMHDfnRq/lkKPZArpzplTW6jfiMYosdzw==
 
+electron-notarize@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/electron-notarize/-/electron-notarize-1.0.0.tgz#bc925b1ccc3f79e58e029e8c4706572b01a9fd8f"
+  integrity sha512-dsib1IAquMn0onCrNMJ6gtEIZn/azG8hZMCYOuZIMVMUeRMgBYHK1s5TK9P8xAcrAjh/2aN5WYHzgVSWX314og==
+  dependencies:
+    debug "^4.1.1"
+    fs-extra "^9.0.1"
+
+electron-publish@22.10.4:
+  version "22.10.4"
+  resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-22.10.4.tgz#944b00aa6a7746c31ce900ffd8106d243326dca8"
+  integrity sha512-cjVM0+9DQoV4TWfH8lVWoelJ89O2i5yDARVp5GCMHrB43XEU0Nr5eKYysgsbOSnZk5W8z1vfGpFWHj+AeAEDYg==
+  dependencies:
+    "@types/fs-extra" "^9.0.5"
+    bluebird-lst "^1.0.9"
+    builder-util "22.10.4"
+    builder-util-runtime "8.7.3"
+    chalk "^4.1.0"
+    fs-extra "^9.0.1"
+    lazy-val "^1.0.4"
+    mime "^2.4.7"
+
 electron-publish@22.9.1:
   version "22.9.1"
   resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-22.9.1.tgz#7cc76ac4cc53efd29ee31c1e5facb9724329068e"
@@ -3007,7 +3271,7 @@ encodeurl@^1.0.2, encodeurl@~1.0.2:
   resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
   integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=
 
-end-of-stream@^1.0.0, end-of-stream@^1.1.0:
+end-of-stream@^1.0.0, end-of-stream@^1.1.0, end-of-stream@^1.4.1:
   version "1.4.4"
   resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"
   integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==
@@ -3419,6 +3683,11 @@ execa@^4.1.0:
     signal-exit "^3.0.2"
     strip-final-newline "^2.0.0"
 
+exit-on-epipe@~1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/exit-on-epipe/-/exit-on-epipe-1.0.1.tgz#0bdd92e87d5285d267daa8171d0eb06159689692"
+  integrity sha512-h2z5mrROTxce56S+pnvAV890uu7ls7f1kEvVGJbw1OlFH3/mlJ5bkXu0KRyW94v37zzHPiUd55iLn3DA7TjWpw==
+
 expand-brackets@^0.1.4:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-0.1.5.tgz#df07284e342a807cd733ac5af72411e581d1177b"
@@ -3817,6 +4086,11 @@ from2@^2.1.0:
     inherits "^2.0.1"
     readable-stream "^2.0.0"
 
+fs-constants@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad"
+  integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==
+
 fs-extra@^8.1.0:
   version "8.1.0"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0"
@@ -4137,6 +4411,11 @@ graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb"
   integrity sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==
 
+"graceful-readlink@>= 1.0.0":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725"
+  integrity sha1-TK+tdrxi8C+gObL5Tpo906ORpyU=
+
 har-schema@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
@@ -4279,7 +4558,7 @@ hosted-git-info@^2.1.4:
   resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.8.tgz#7539bd4bc1e0e0a895815a2e0262420b12858488"
   integrity sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==
 
-hosted-git-info@^3.0.5:
+hosted-git-info@^3.0.5, hosted-git-info@^3.0.6, hosted-git-info@^3.0.7:
   version "3.0.7"
   resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-3.0.7.tgz#a30727385ea85acfcee94e0aad9e368c792e036c"
   integrity sha512-fWqc0IcuXs+BmE9orLDyVykAG9GJtGLGuZAAqgcckPgv5xad4AcXGIv8galtQvlwutxSlaMcdw7BUtq2EIvqCQ==
@@ -4373,7 +4652,7 @@ icss-utils@^2.1.0:
   dependencies:
     postcss "^6.0.1"
 
-ieee754@^1.1.4:
+ieee754@^1.1.13, ieee754@^1.1.4:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352"
   integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==
@@ -4928,6 +5207,14 @@ js-yaml@^3.13.1, js-yaml@^3.14.0:
     argparse "^1.0.7"
     esprima "^4.0.0"
 
+js-yaml@^3.14.1:
+  version "3.14.1"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537"
+  integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==
+  dependencies:
+    argparse "^1.0.7"
+    esprima "^4.0.0"
+
 js-yaml@~3.7.0:
   version "3.7.0"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.7.0.tgz#5c967ddd837a9bfdca5f2de84253abe8a1c03b80"
@@ -5096,6 +5383,13 @@ lazy-val@^1.0.4:
   resolved "https://registry.yarnpkg.com/lazy-val/-/lazy-val-1.0.4.tgz#882636a7245c2cfe6e0a4e3ba6c5d68a137e5c65"
   integrity sha512-u93kb2fPbIrfzBuLjZE+w+fJbUUMhNDXxNmMfaqNgpfQf1CO5ZSe2LfsnBqVAk7i/2NF48OSoRj+Xe2VT+lE8Q==
 
+lazystream@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/lazystream/-/lazystream-1.0.0.tgz#f6995fe0f820392f61396be89462407bb77168e4"
+  integrity sha1-9plf4PggOS9hOWvolGJAe7dxaOQ=
+  dependencies:
+    readable-stream "^2.0.5"
+
 lcid@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/lcid/-/lcid-1.0.0.tgz#308accafa0bc483a3867b4b6f2b9506251d1b835"
@@ -5203,11 +5497,26 @@ lodash.defaults@^4.2.0:
   resolved "https://registry.yarnpkg.com/lodash.defaults/-/lodash.defaults-4.2.0.tgz#d09178716ffea4dde9e5fb7b37f6f0802274580c"
   integrity sha1-0JF4cW/+pN3p5ft7N/bwgCJ0WAw=
 
+lodash.difference@^4.5.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/lodash.difference/-/lodash.difference-4.5.0.tgz#9ccb4e505d486b91651345772885a2df27fd017c"
+  integrity sha1-nMtOUF1Ia5FlE0V3KIWi3yf9AXw=
+
+lodash.flatten@^4.4.0:
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/lodash.flatten/-/lodash.flatten-4.4.0.tgz#f31c22225a9632d2bbf8e4addbef240aa765a61f"
+  integrity sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8=
+
 lodash.get@^4.4.2:
   version "4.4.2"
   resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99"
   integrity sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=
 
+lodash.isplainobject@^4.0.6:
+  version "4.0.6"
+  resolved "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz#7c526a52d89b45c45cc690b88163be0497f550cb"
+  integrity sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs=
+
 lodash.memoize@^4.1.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe"
@@ -5238,6 +5547,11 @@ lodash.templatesettings@^4.0.0:
   dependencies:
     lodash._reinterpolate "^3.0.0"
 
+lodash.union@^4.6.0:
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/lodash.union/-/lodash.union-4.6.0.tgz#48bb5088409f16f1821666641c44dd1aaae3cd88"
+  integrity sha1-SLtQiECfFvGCFmZkHETdGqrjzYg=
+
 lodash.uniq@^4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
@@ -5504,6 +5818,11 @@ mime@^2.4.6:
   resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.6.tgz#e5b407c90db442f2beb5b162373d07b69affa4d1"
   integrity sha512-RZKhC3EmpBchfTGBVb8fb+RL2cWyw/32lshnsETttkBAyAUXSGHxbEJWWRXc751DrIxG1q04b8QwMbAwkRPpUA==
 
+mime@^2.4.7:
+  version "2.4.7"
+  resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.7.tgz#962aed9be0ed19c91fd7dc2ece5d7f4e89a90d74"
+  integrity sha512-dhNd1uA2u397uQk3Nv5LM4lm93WYDUXFn3Fu291FJerns4jyTudqhIWe4W04YLy7Uk1tm1Ore04NpjRvQp/NPA==
+
 mimic-fn@^1.0.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022"
@@ -5529,7 +5848,7 @@ minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1:
   resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
   integrity sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=
 
-minimatch@^3.0.4, minimatch@~3.0.2:
+minimatch@3.0.4, minimatch@^3.0.4, minimatch@~3.0.2:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
   integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
@@ -5884,6 +6203,16 @@ normalize-package-data@^2.3.2, normalize-package-data@^2.3.4, normalize-package-
     semver "2 || 3 || 4 || 5"
     validate-npm-package-license "^3.0.1"
 
+normalize-package-data@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-3.0.0.tgz#1f8a7c423b3d2e85eb36985eaf81de381d01301a"
+  integrity sha512-6lUjEI0d3v6kFrtgA/lOx4zHCWULXsFNIjHolnZCKCTLA6m/G625cdn3O7eNmT0iD3jfo6HZ9cdImGZwf21prw==
+  dependencies:
+    hosted-git-info "^3.0.6"
+    resolve "^1.17.0"
+    semver "^7.3.2"
+    validate-npm-package-license "^3.0.1"
+
 normalize-path@^2.0.0, normalize-path@^2.0.1, normalize-path@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
@@ -6758,6 +7087,11 @@ pretty-bytes@^4.0.2:
   resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-4.0.2.tgz#b2bf82e7350d65c6c33aa95aaa5a4f6327f61cd9"
   integrity sha1-sr+C5zUNZcbDOqlaqlpPYyf2HNk=
 
+printj@~1.1.0:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/printj/-/printj-1.1.2.tgz#d90deb2975a8b9f600fb3a1c94e3f4c53c78a222"
+  integrity sha512-zA2SmoLaxZyArQTOPj5LXecR+RagfPSU5Kw1qP+jkWeNlrq+eJZyY2oS68SU1Z/7/myXM4lo9716laOFAVStCQ==
+
 private@^0.1.6, private@^0.1.8:
   version "0.1.8"
   resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff"
@@ -7007,7 +7341,7 @@ read-pkg@^2.0.0:
     normalize-package-data "^2.3.2"
     path-type "^2.0.0"
 
-"readable-stream@1 || 2", readable-stream@2.3.7, readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6:
+"readable-stream@1 || 2", readable-stream@2.3.7, readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6:
   version "2.3.7"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57"
   integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==
@@ -7020,7 +7354,7 @@ read-pkg@^2.0.0:
     string_decoder "~1.1.1"
     util-deprecate "~1.0.1"
 
-readable-stream@^3.6.0:
+readable-stream@^3.1.1, readable-stream@^3.4.0, readable-stream@^3.6.0:
   version "3.6.0"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198"
   integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==
@@ -7029,6 +7363,13 @@ readable-stream@^3.6.0:
     string_decoder "^1.1.1"
     util-deprecate "^1.0.1"
 
+readdir-glob@^1.0.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/readdir-glob/-/readdir-glob-1.1.1.tgz#f0e10bb7bf7bfa7e0add8baffdc54c3f7dbee6c4"
+  integrity sha512-91/k1EzZwDx6HbERR+zucygRFfiPl2zkIYZtv3Jjr6Mn7SkKcVct8aVO+sSRiGMc6fLf72du3d92/uY63YPdEA==
+  dependencies:
+    minimatch "^3.0.4"
+
 readdirp@^2.0.0, readdirp@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.2.1.tgz#0e87622a3325aa33e892285caf8b4e846529a525"
@@ -7260,7 +7601,7 @@ resolve-url@^0.2.1:
   resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
   integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
 
-resolve@^1.10.0, resolve@^1.12.0, resolve@^1.2.0, resolve@^1.9.0:
+resolve@^1.10.0, resolve@^1.12.0, resolve@^1.17.0, resolve@^1.2.0, resolve@^1.9.0:
   version "1.19.0"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.19.0.tgz#1af5bf630409734a067cae29318aac7fa29a267c"
   integrity sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==
@@ -7487,6 +7828,13 @@ semver@^7.2.1, semver@^7.3.2:
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.2.tgz#604962b052b81ed0786aae84389ffba70ffd3938"
   integrity sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==
 
+semver@^7.3.4:
+  version "7.3.4"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.4.tgz#27aaa7d2e4ca76452f98d3add093a72c943edc97"
+  integrity sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==
+  dependencies:
+    lru-cache "^6.0.0"
+
 semver@~5.3.0:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
@@ -8238,6 +8586,17 @@ tapable@^0.2.7:
   resolved "https://registry.yarnpkg.com/tapable/-/tapable-0.2.9.tgz#af2d8bbc9b04f74ee17af2b4d9048f807acd18a8"
   integrity sha512-2wsvQ+4GwBvLPLWsNfLCDYGsW6xb7aeC6utq2Qh0PFwgEy7K7dsma9Jsmb2zSQj7GvYAyUGSntLtsv++GmgL1A==
 
+tar-stream@^2.1.4:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.2.0.tgz#acad84c284136b060dc3faa64474aa9aebd77287"
+  integrity sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==
+  dependencies:
+    bl "^4.0.3"
+    end-of-stream "^1.4.1"
+    fs-constants "^1.0.0"
+    inherits "^2.0.3"
+    readable-stream "^3.1.1"
+
 tar@^2.0.0:
   version "2.2.2"
   resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.2.tgz#0ca8848562c7299b8b446ff6a4d60cdbb23edc40"
@@ -9331,3 +9690,12 @@ yeast@0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/yeast/-/yeast-0.1.2.tgz#008e06d8094320c372dbc2f8ed76a0ca6c8ac419"
   integrity sha1-AI4G2AlDIMNy28L47XagymyKxBk=
+
+zip-stream@^4.0.4:
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/zip-stream/-/zip-stream-4.0.4.tgz#3a8f100b73afaa7d1ae9338d910b321dec77ff3a"
+  integrity sha512-a65wQ3h5gcQ/nQGWV1mSZCEzCML6EK/vyVPcrPNynySP1j3VBbQKh3nhC8CbORb+jfl2vXvh56Ul5odP1bAHqw==
+  dependencies:
+    archiver-utils "^2.1.0"
+    compress-commons "^4.0.2"
+    readable-stream "^3.6.0"

From 0ecfe25b124dd6346d01dc32d12930ee9ebcc5a2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 27 Jan 2021 14:54:58 +0000
Subject: [PATCH 22/22] chore(deps): bump ini from 1.3.5 to 1.3.8

Bumps [ini](https://github.com/isaacs/ini) from 1.3.5 to 1.3.8.
- [Release notes](https://github.com/isaacs/ini/releases)
- [Commits](https://github.com/isaacs/ini/compare/v1.3.5...v1.3.8)

Signed-off-by: dependabot[bot] <support@github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 3808c414..4c230b4f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4751,9 +4751,9 @@ inherits@2.0.3:
   integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
 
 ini@^1.3.4, ini@^1.3.5, ini@~1.3.0:
-  version "1.3.5"
-  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
-  integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==
+  version "1.3.8"
+  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c"
+  integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==
 
 interpret@^1.0.0:
   version "1.4.0"