feat: rename agency status fields (#734) (#794)

* feat: rename agency status fields * feat: rename agency status fields * feat: update non-award agency status
usdigitalresponse · Feb 15, 2023 · bd0ab6f · bd0ab6f
1 parent 1607f02
commit bd0ab6f
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 7 deletions.
diff --git a/packages/client/src/components/Modals/GrantDetails.vue b/packages/client/src/components/Modals/GrantDetails.vue
@@ -38,11 +38,11 @@
                   <b-form-select-option v-for="code in interestedCodes.interested" :key="code.id" :value="code.id">
                     {{ code.name }}</b-form-select-option>
                 </b-form-select-option-group>
-                <b-form-select-option-group label="Result">
+                <b-form-select-option-group label="Applied">
                   <b-form-select-option v-for="code in interestedCodes.result" :key="code.id" :value="code.id">
                     {{ code.name }}</b-form-select-option>
                 </b-form-select-option-group>
-                <b-form-select-option-group label="Rejections">
+                <b-form-select-option-group label="Not Applying">
                   <b-form-select-option v-for="code in interestedCodes.rejections" :key="code.id" :value="code.id">
                     {{ code.name }}</b-form-select-option>
                 </b-form-select-option-group>

diff --git a/packages/client/src/views/MyGrants.vue b/packages/client/src/views/MyGrants.vue
@@ -6,10 +6,10 @@
     <b-tab title="Assigned">
       <GrantsTable :showAssignedToAgency="selectedAgencyId"/>
     </b-tab>
-    <b-tab title="Rejected">
+    <b-tab title="Not Applying">
       <GrantsTable :showRejected="true"/>
     </b-tab>
-    <b-tab title="Result">
+    <b-tab title="Applied">
         <GrantsTable :showResult="true"/>
     </b-tab>
   </b-tabs>

diff --git a/packages/server/migrations/20230111193234_update_interested_codes_names.js b/packages/server/migrations/20230111193234_update_interested_codes_names.js
@@ -0,0 +1,19 @@
+/**
+ * @param { import("knex").Knex } knex
+ * @returns { Promise<void> }
+ */
+exports.up = async function (knex) {
+    await knex('interested_codes').where({ name: 'Applied' }).update({ name: 'Pending' });
+    await knex('interested_codes').where({ name: 'Awarded' }).update({ name: 'Award' });
+    await knex('interested_codes').where({ name: 'Rejected' }).update({ name: 'Non-award' });
+};
+
+/**
+ * @param { import("knex").Knex } knex
+ * @returns { Promise<void> }
+ */
+exports.down = async function (knex) {
+    await knex('interested_codes').where({ name: 'Pending' }).update({ name: 'Applied' });
+    await knex('interested_codes').where({ name: 'Award' }).update({ name: 'Awarded' });
+    await knex('interested_codes').where({ name: 'Non-award' }).update({ name: 'Rejected' });
+};
diff --git a/packages/server/seeds/dev/ref/interestedCodes.js b/packages/server/seeds/dev/ref/interestedCodes.js
@@ -36,12 +36,12 @@ module.exports = [
         id: 11, name: 'Will Support', status_code: 'Interested',
     },
     {
-        id: 12, name: 'Applied', status_code: 'Result',
+        id: 12, name: 'Pending', status_code: 'Result',
     },
     {
-        id: 13, name: 'Awarded', status_code: 'Result',
+        id: 13, name: 'Award', status_code: 'Result',
     },
     {
-        id: 14, name: 'Rejected', status_code: 'Result',
+        id: 14, name: 'Non-award', status_code: 'Result',
     },
 ];