Prod Release 2023-11-21 - Take 1

CONTRIBUTING.md

@@ -102,7 +102,7 @@ Follow these steps to start contributing:
 
    ```bash
    $ git fetch origin
-   $ git rebase origin/master
+   $ git rebase origin/_staging
    ```
 
    Push the changes to your account using:

packages/client/.nycrc

@@ -0,0 +1,4 @@
+{
+    "include": "src/**",
+    "extension": [".js", ".vue"]
+}

packages/client/babel.config.js

@@ -2,4 +2,9 @@ module.exports = {
   presets: [
     '@vue/cli-plugin-babel/preset',
   ],
+  env: {
+    test: {
+      plugins: [['babel-plugin-istanbul']],
+    },
+  },
 };

packages/client/package.json

@@ -53,6 +53,7 @@
     "@vue/eslint-config-prettier": "^7.0.0",
     "@vue/test-utils": "^1.0.3",
     "babel-eslint": "^10.1.0",
+    "babel-plugin-istanbul": "^6.1.1",
     "chai": "^4.3.4",
     "eslint": "^7.12.1",
     "eslint-config-standard": "^16.0.3",

packages/client/public/deploy-config.js

@@ -21,5 +21,6 @@ window.APP_CONFIG.overrideFeatureFlag = (flagName, overrideValue) => {
 //  configuring the `website_feature_flags` input variable in Terraform (see `terraform/*.tfvars`).
 window.APP_CONFIG.featureFlags = {
   useNewTable: true,
-  myProfileEnabled: true
+  myProfileEnabled: true,
+  newTerminologyEnabled: true,
 };

packages/client/src/arpa_reporter/views/Home.vue

@@ -9,7 +9,7 @@
       </div>
 
       <div class="col" v-if="isAdmin">
-        <button class="btn btn-primary btn-block" @click="sendTreasuryReport" :disabled="sending">
+        <button class="btn btn-primary btn-block" @click="sendTreasuryReport" :disabled="sending" id="sendTreasuryReportButton">
           <span v-if="sending">Sending...</span>
           <span v-else>Send Treasury Report by Email</span>
         </button>
@@ -20,14 +20,14 @@
       </div>
 
       <div class="col" v-if="isAdmin">
-        <button class="btn btn-info btn-block" @click="sendAuditReport" :disabled="sending">
+        <button class="btn btn-info btn-block" @click="sendAuditReport" :disabled="sending" id="sendAuditReportButton">
           <span v-if="sending">Sending...</span>
           <span v-else>Send Audit Report by Email</span>
         </button>
       </div>
 
       <div class="col">
-        <button @click.prevent="startUpload" class="btn btn-primary btn-block">Submit Workbook</button>
+        <button @click.prevent="startUpload" class="btn btn-primary btn-block" id="submitWorkbookButton">Submit Workbook</button>
       </div>
 
       <div class="col">
@@ -36,12 +36,12 @@
     </div>
 
     <div class="row border border-danger rounded m-3 mb-3 p-3" v-else>
-      <div class="col">
+      <div class="col" id="closedReportingPeriodMessage">
         This reporting period is closed.
       </div>
     </div>
 
-    <p>
+    <p id="welcomeToArpaReporter">
       Welcome to the ARPA reporter.
       To get started, click the "Download Empty Template" button, above, to get a copy of an empty template for reporting.
     </p>
@@ -78,9 +78,6 @@ export default {
     viewingOpenPeriod() {
       return this.$store.getters.viewPeriodIsCurrent;
     },
-    isClosed() {
-      return !(this.$store.getters.viewPeriodIsCurrent);
-    },
   },
   data() {
     let alert;

packages/client/src/components/GrantsTable.vue

@@ -102,11 +102,9 @@ export default {
         },
         {
           key: 'viewed_by',
-          sortable: true,
         },
         {
           key: 'interested_agencies',
-          sortable: true,
         },
         {
           // opportunity_status

packages/client/src/components/GrantsTableNext.vue

@@ -21,7 +21,7 @@
     </b-row>
     <b-row align-v="center">
       <b-col cols="12">
-        <b-table fixed id="grants-table" sticky-header="32rem" hover :items="formattedGrants" responsive
+        <b-table id="grants-table" sticky-header="70vh" hover :items="formattedGrants"
           :fields="fields.filter(field => !field.hideGrantItem)" selectable striped :sort-by.sync="orderBy"
           :sort-desc.sync="orderDesc" :no-local-sorting="true" :bordered="true" select-mode="single" :busy="loading"
           @row-selected="onRowSelected" show-empty emptyText="No matches found">
@@ -75,6 +75,7 @@
 
 <script>
 import { mapActions, mapGetters } from 'vuex';
+import { newTerminologyEnabled } from '@/helpers/featureFlags';
 import { titleize } from '../helpers/form-helpers';
 import GrantDetails from './Modals/GrantDetails.vue';
 import SearchPanel from './Modals/SearchPanel.vue';
@@ -110,11 +111,10 @@ export default {
         },
         {
           key: 'viewed_by',
-          sortable: true,
         },
         {
           key: 'interested_agencies',
-          sortable: true,
+          label: `Interested ${newTerminologyEnabled() ? 'Teams' : 'Agencies'}`,
         },
         {
           // opportunity_status
@@ -128,9 +128,6 @@ export default {
         {
           key: 'cost_sharing',
         },
-        {
-          key: 'award_floor',
-        },
         {
           key: 'award_ceiling',
           sortable: true,

packages/client/src/components/Layout.vue

@@ -1,20 +1,18 @@
 <template>
   <div>
-    <b-navbar type="dark" variant="dark">
+    <b-navbar :type="navBarType" :variant="navBarVariant">
       <b-navbar-brand href="/#/grants" class="d-flex align-items-center">
-      <b-img :src="require('../assets/usdr_logo_white_wide.svg')" style="height: 1.625rem;" class="" alt="United States Digital Response logo in white" />
+      <b-img v-if="myProfileEnabled" :src="require('../assets/usdr_logo_standard_wide.svg')" style="height: 1.625rem;" class="" alt="United States Digital Response logo" />
+      <b-img v-else :src="require('../assets/usdr_logo_white_wide.svg')" style="height: 1.625rem;" class="" alt="United States Digital Response logo in white" />
       <h3 class="ml-3 mb-0">Grants Identification Tool</h3>
     </b-navbar-brand>
-      <!-- <b-navbar-brand href="/#/grants">
-      Grants Identification Tool</b-navbar-brand> -->
-
       <b-collapse id="nav-collapse" is-nav>
 
         <!-- Right aligned nav items -->
         <b-navbar-nav class="ml-auto">
 
           <b-nav-text>
-            <b-badge>{{selectedAgency ? selectedAgency.name : ''}}</b-badge>
+            <b-badge>{{selectedTeam ? selectedTeam.name : ''}}</b-badge>
           </b-nav-text>
 
           <b-nav-item-dropdown right v-if="loggedInUser">
@@ -38,8 +36,8 @@
           <b-nav-item v-if="!useNewGrantsTable" to="/keywords" exact exact-active-class="active">Keywords</b-nav-item>
           <b-nav-item to="/dashboard" exact exact-active-class="active">Dashboard</b-nav-item>
           <b-nav-item to="/users" exact exact-active-class="active" v-if="userRole === 'admin'">Users</b-nav-item>
-          <b-nav-item to="/Agencies" exact exact-active-class="active">Agencies</b-nav-item>
-          <b-nav-item v-if="canSeeTenantsTab" to="/tenants" exact exact-active-class="active">Tenants</b-nav-item>
+          <b-nav-item :to="newTerminologyEnabled ? '/teams' : '/agencies'" exact exact-active-class="active">{{newTerminologyEnabled ? 'Teams' : 'Agencies'}}</b-nav-item>
+          <b-nav-item v-if="canSeeOrganizationsTab" :to="newTerminologyEnabled ? '/organizations' : '/tenants'" exact exact-active-class="active">{{newTerminologyEnabled ? 'Organizations' : 'Tenants'}}</b-nav-item>
       </b-nav>
     </b-col>
 
@@ -50,14 +48,13 @@
 
       <router-view />
     </div>
-    <ProfileSettingsModal
-    :showModal.sync="showProfileSettingModal"/>
+    <ProfileSettingsModal :showModal.sync="showProfileSettingModal"/>
   </div>
 </template>
 
 <script>
 import { mapGetters } from 'vuex';
-import { useNewGrantsTable } from '@/helpers/featureFlags';
+import { myProfileEnabled, newTerminologyEnabled, useNewGrantsTable } from '@/helpers/featureFlags';
 import ProfileSettingsModal from '@/components/Modals/ProfileSettings.vue';
 import AlertBox from '../arpa_reporter/components/AlertBox.vue';
 
@@ -75,21 +72,32 @@ export default {
   },
   computed: {
     ...mapGetters({
-      agency: 'users/agency',
       loggedInUser: 'users/loggedInUser',
       userRole: 'users/userRole',
-      selectedAgency: 'users/selectedAgency',
+      selectedTeam: 'users/selectedAgency',
       alerts: 'alerts/alerts',
     }),
-    canSeeTenantsTab() {
-      return this.loggedInUser && this.loggedInUser.isUSDRSuperAdmin;
+    canSeeOrganizationsTab() {
+      return true;
+    },
+    newTerminologyEnabled() {
+      return newTerminologyEnabled();
+    },
+    myProfileEnabled() {
+      return myProfileEnabled();
     },
     useNewGrantsTable() {
       return useNewGrantsTable();
     },
     showTabs() {
       return !(this.$route.meta.hideLayoutTabs === true);
     },
+    navBarType() {
+      return myProfileEnabled() ? 'light' : 'dark';
+    },
+    navBarVariant() {
+      return myProfileEnabled() ? 'white' : 'dark';
+    },
   },
   methods: {
     logout(e) {

packages/client/src/components/Modals/AddTenants.vue → packages/client/src/components/Modals/AddOrganization.vue

@@ -3,7 +3,7 @@
       <b-modal
         id="add-tenant-modal"
         ref="modal"
-        title="Add Tenant"
+        :title="newTerminologyEnabled ? 'Add Organization' : 'Add Tenant'"
         @show="resetModal"
         @hidden="resetModal"
         @ok="handleOk"
@@ -12,9 +12,9 @@
         <form ref="form" @submit.stop.prevent="handleSubmit">
           <b-form-group
             :state="!$v.formData.tenantName.$invalid"
-            label="Tenant Name"
+            :label="newTerminologyEnabled ? 'Organization Name' : 'Tenant Name'"
             label-for="tenantName-input"
-            invalid-feedback="Tenant name is invalid"
+            :invalid-feedback="newTerminologyEnabled ? 'Organization name is invalid' : 'Tenant name is invalid'"
           >
             <b-form-input
               id="tenantName-input"
@@ -25,9 +25,9 @@
           </b-form-group>
           <b-form-group
             :state="!$v.formData.agencyName.$invalid"
-            label="Agency Name"
+            :label="newTerminologyEnabled ? 'Team Name' : 'Agency Name'"
             label-for="agencyName-input"
-            invalid-feedback="Agency name is invalid"
+            :invalid-feedback="newTerminologyEnabled ? 'Team name is invalid' : 'Agency name is invalid'"
           >
             <b-form-input
               id="agencyName-input"
@@ -38,9 +38,9 @@
           </b-form-group>
           <b-form-group
             :state="!$v.formData.agencyAbbreviation"
-            label="Agency Abbreviation"
+            :label="newTerminologyEnabled ? 'Team Abbreviation' : 'Agency Abbreviation'"
             label-for="agencyAbbreviation-input"
-            invalid-feedback="Agency abbreviation is invalid"
+            :invalid-feedback="newTerminologyEnabled ? 'Team abbreviation is invalid' : 'Agency abbreviation is invalid'"
           >
             <b-form-input
               id="agencyAbbreviation-input"
@@ -93,6 +93,7 @@
 <script>
 import { mapActions, mapGetters } from 'vuex';
 import { required, email } from 'vuelidate/lib/validators';
+import { newTerminologyEnabled } from '@/helpers/featureFlags';
 
 export default {
   props: {
@@ -138,6 +139,9 @@ export default {
   computed: {
     ...mapGetters({
     }),
+    newTerminologyEnabled() {
+      return newTerminologyEnabled();
+    },
   },
   mounted() {
   },

packages/client/src/components/Modals/AddAgency.vue → packages/client/src/components/Modals/AddTeam.vue

@@ -5,7 +5,7 @@
       id="add-agency-modal"
       v-model="showDialog"
       ref="modal"
-      title="Add Agency"
+      :title="newTerminologyEnabled ? 'Add Team' : 'Add Agency'"
       @hidden="resetModal"
       @ok="handleOk"
       :ok-disabled="$v.formData.$invalid"
@@ -31,7 +31,7 @@
           invalid-feedback="Required"
         >
           <template slot="label">Abbreviation</template>
-          <template slot="description">This is used for displaying lists of agencies in compact form (e.g. in a table).</template>
+          <template slot="description">This is used for displaying lists of {{newTerminologyEnabled ? 'teams' : 'agencies'}} in compact form (e.g. in a table).</template>
           <b-form-input
               id="abbreviation-input"
               type="text"
@@ -47,7 +47,7 @@
           invalid-feedback="Required"
         >
           <template slot="label">Code</template>
-          <template slot="description">This should match the Agency Code field in ARPA Reporter workbook uploads. If not using ARPA Reporter, you can set this the same as Abbreviation. This field must be unique across agencies.</template>
+          <template slot="description">This should match the Agency Code field in ARPA Reporter workbook uploads. If not using ARPA Reporter, you can set this the same as Abbreviation. This field must be unique across {{newTerminologyEnabled ? 'teams' : 'agencies'}}.</template>
           <b-form-input
               id="code-input"
               type="text"
@@ -60,9 +60,9 @@
         <b-form-group
           :state="!$v.formData.parentAgency.$invalid"
           label-for="agency-input"
-          invalid-feedback="Must select a parent agency"
+          :invalid-feedback="newTerminologyEnabled ? 'Must select a parent team' : 'Must select a parent agency'"
         >
-          <template slot="label">Parent Agency</template>
+          <template slot="label">Parent {{newTerminologyEnabled ? 'Team' : 'Agency'}}</template>
           <v-select :options="agencies" label="name" :value="formData.parentAgency" v-model="formData.parentAgency">
             <template #search="{attributes, events}">
               <input
@@ -117,6 +117,7 @@ import {
   numeric,
   minValue,
 } from 'vuelidate/lib/validators';
+import { newTerminologyEnabled } from '@/helpers/featureFlags';
 
 export default {
   props: {
@@ -179,6 +180,9 @@ export default {
     canDefaultCodeToAbbreviation() {
       return Boolean(this.formData.abbreviation && this.formData.abbreviation.trim().length > 0);
     },
+    newTerminologyEnabled() {
+      return newTerminologyEnabled();
+    },
   },
   mounted() {
   },

packages/client/src/components/Modals/AddUser.vue

@@ -46,9 +46,9 @@
         </b-form-group>
         <b-form-group
           :state="!$v.formData.agency.$invalid"
-          label="Agency"
+          :label="newTerminologyEnabled ? 'Team' : 'Agency'"
           label-for="agency-select"
-          invalid-feedback="Please select your agency"
+          :invalid-feedback="`Please select your ${newTerminologyEnabled ? 'team' : 'agency'}`"
         >
           <b-form-select
           id="agency-select"
@@ -62,6 +62,7 @@
 <script>
 import { mapActions, mapGetters } from 'vuex';
 import { required, minLength, email } from 'vuelidate/lib/validators';
+import { newTerminologyEnabled } from '@/helpers/featureFlags';
 
 export default {
   props: {
@@ -117,6 +118,9 @@ export default {
         text: agency.name,
       }));
     },
+    newTerminologyEnabled() {
+      return newTerminologyEnabled();
+    },
   },
   mounted() {
     if (this.roles.length === 0) {