Merge branch 'main' into rylew/1885-heading-elements-bug

.github/workflows/cd-frontend.yml

@@ -33,7 +33,7 @@ jobs:
     uses: ./.github/workflows/deploy.yml
     strategy:
       matrix:
-        envs: ${{ github.event_name == 'release' && fromJSON('["prod"]') || github.ref_name == 'main' && fromJSON('["dev", "staging"]') || fromJSON('["dev"]') }}
+        envs: ${{ github.event_name == 'release' && fromJSON('["prod"]') || github.ref_name == 'main' && fromJSON('["dev"]') || fromJSON('["dev"]') }} # temporarily removing staging from matrix. See: https://github.com/HHS/simpler-grants-gov/issues/1919
     with:
       app_name: "frontend"
       environment: ${{ matrix.envs }}

documentation/wiki/product/deliverables/specifications/delivery-dashboard.md

@@ -6,7 +6,7 @@ description: Create a public-facing dashboard with sprint and delivery metrics.
 
 ## Summary details
 
-<table><thead><tr><th width="253">Field</th><th>Value</th></tr></thead><tbody><tr><td><strong>Deliverable status</strong></td><td>Planning</td></tr><tr><td><strong>Link to GitHub issue</strong></td><td><a href="https://github.com/HHS/simpler-grants-gov/issues/65">Issue 65</a></td></tr><tr><td><strong>Key sections</strong></td><td><ul><li><p><a href="delivery-dashboard.md#overview">Overview</a></p><ul><li><a href="delivery-dashboard.md#business-value">Business value</a></li><li><a href="delivery-dashboard.md#user-stories">User stories</a></li></ul></li><li><p><a href="delivery-dashboard.md#definition-of-done">Definition of done</a></p><ul><li><a href="delivery-dashboard.md#must-have">Must have</a></li><li><a href="delivery-dashboard.md#nice-to-have">Nice to have</a></li><li><a href="delivery-dashboard.md#not-in-scope">Not in scope</a></li></ul></li><li><a href="delivery-dashboard.md#proposed-metrics">Proposed metrics</a></li><li><a href="delivery-dashboard.md#open-questions">Open questions</a></li><li><p><a href="delivery-dashboard.md#logs">Logs</a></p><ul><li><a href="delivery-dashboard.md#change-log">Change log</a></li><li><a href="delivery-dashboard.md#implementation-log">Implementation log</a></li></ul></li></ul></td></tr></tbody></table>
+<table><thead><tr><th width="253">Field</th><th>Value</th></tr></thead><tbody><tr><td><strong>Deliverable status</strong></td><td>In Progress</td></tr><tr><td><strong>Link to GitHub issue</strong></td><td><a href="https://github.com/HHS/simpler-grants-gov/issues/65">Issue 65</a></td></tr><tr><td><strong>Key sections</strong></td><td><ul><li><p><a href="delivery-dashboard.md#overview">Overview</a></p><ul><li><a href="delivery-dashboard.md#business-value">Business value</a></li><li><a href="delivery-dashboard.md#user-stories">User stories</a></li></ul></li><li><p><a href="delivery-dashboard.md#definition-of-done">Definition of done</a></p><ul><li><a href="delivery-dashboard.md#must-have">Must have</a></li><li><a href="delivery-dashboard.md#nice-to-have">Nice to have</a></li><li><a href="delivery-dashboard.md#not-in-scope">Not in scope</a></li></ul></li><li><a href="delivery-dashboard.md#proposed-metrics">Proposed metrics</a></li><li><a href="delivery-dashboard.md#open-questions">Open questions</a></li><li><p><a href="delivery-dashboard.md#logs">Logs</a></p><ul><li><a href="delivery-dashboard.md#change-log">Change log</a></li><li><a href="delivery-dashboard.md#implementation-log">Implementation log</a></li></ul></li></ul></td></tr></tbody></table>
 
 ## Overview
 
@@ -161,7 +161,7 @@ These stakeholders will likely be asking the following questions:
 
 Major updates to the content of this page will be added here.
 
-<table data-full-width="true"><thead><tr><th width="137">Date</th><th width="282">Update</th><th>Notes</th></tr></thead><tbody><tr><td>4/5/2024</td><td>Added change log and implementation log</td><td>This is part of the April onsite follow-up</td></tr><tr><td>4/9/2024</td><td>Incorporated comments on change request</td><td><ul><li><p>Changes to "Definition of done"</p><ul><li>Removed "Sprint Allocation" as a metric previously required for the dashboard</li><li>Moved public access to data to nice to have</li></ul></li><li><p>Changes to "Proposed metrics"</p><ul><li>Removed "Build time"</li><li>Added "Number of failures to load data"</li></ul></li><li><p>Changes to "Technical descriptions":</p><ul><li>Added additional considerations to decision drivers for dashboard UI</li></ul></li><li><p>Changes to "User stories":</p><ul><li>Added story for open source contributors wanting to see their impact on metrics</li><li>Added story for seeing last updated date on dashboard</li></ul></li></ul></td></tr><tr><td>4/10/2024</td><td>Moved part of the content of this spec into a technical spec</td><td><p>Moved the following into <a href="delivery-dashboard/delivery-dashboard-technical-spec.md">this spec</a>:</p><ul><li>Integrations</li><li>Technical descriptions</li></ul></td></tr></tbody></table>
+<table data-full-width="true"><thead><tr><th width="137">Date</th><th width="282">Update</th><th>Notes</th></tr></thead><tbody><tr><td>4/5/2024</td><td>Added change log and implementation log</td><td>This is part of the April onsite follow-up</td></tr><tr><td>4/9/2024</td><td>Incorporated comments on change request</td><td><ul><li><p>Changes to "Definition of done"</p><ul><li>Removed "Sprint Allocation" as a metric previously required for the dashboard</li><li>Moved public access to data to nice to have</li></ul></li><li><p>Changes to "Proposed metrics"</p><ul><li>Removed "Build time"</li><li>Added "Number of failures to load data"</li></ul></li><li><p>Changes to "Technical descriptions":</p><ul><li>Added additional considerations to decision drivers for dashboard UI</li></ul></li><li><p>Changes to "User stories":</p><ul><li>Added story for open source contributors wanting to see their impact on metrics</li><li>Added story for seeing last updated date on dashboard</li></ul></li></ul></td></tr><tr><td>4/10/2024</td><td>Moved part of the content of this spec into a technical spec</td><td><p>Moved the following into <a href="delivery-dashboard/delivery-dashboard-technical-spec.md">this spec</a>:</p><ul><li>Integrations</li><li>Technical descriptions</li></ul></td></tr><tr><td>5/6/2024</td><td>Moved deliverable status to "In Progress"</td><td></td></tr></tbody></table>
 
 ### Implementation log
 

frontend/src/app/layout.tsx

@@ -32,9 +32,7 @@ export default function RootLayout({ children }: LayoutProps) {
         {/* TODO: Add locale="english" prop when ready for i18n */}
         <Layout>{children}</Layout>
       </body>
-      {process.env.NEXT_PUBLIC_ENVIRONMENT === "prod" && (
-        <GoogleAnalytics gaId={PUBLIC_ENV.GOOGLE_ANALYTICS_ID} />
-      )}
+      <GoogleAnalytics gaId={PUBLIC_ENV.GOOGLE_ANALYTICS_ID} />
     </html>
   );
 }

frontend/src/constants/environments.ts

@@ -4,15 +4,12 @@
  */
 const PUBLIC_ENV_VARS_BY_ENV = {
   development: {
-    GOOGLE_TAG_MANAGER_ID: "GTM-MV57HMHS",
-    GOOGLE_ANALYTICS_ID: "G-6MDCC5EZW2",
+    GOOGLE_ANALYTICS_ID: "G-GWJZD3DL8W",
   },
   test: {
-    GOOGLE_TAG_MANAGER_ID: "GTM-MV57HMHS",
     GOOGLE_ANALYTICS_ID: "G-6MDCC5EZW2",
   },
   production: {
-    GOOGLE_TAG_MANAGER_ID: "GTM-MV57HMHS",
     GOOGLE_ANALYTICS_ID: "G-6MDCC5EZW2",
   },
 } as const;

frontend/src/pages/_app.tsx

@@ -1,7 +1,7 @@
 import "../styles/styles.scss";
 
 import type { AppProps } from "next/app";
-import { GoogleTagManager } from "@next/third-parties/google";
+import { GoogleAnalytics } from "@next/third-parties/google";
 import Head from "next/head";
 import Layout from "../components/Layout";
 import { PUBLIC_ENV } from "src/constants/environments";
@@ -19,9 +19,7 @@ function MyApp({ Component, pageProps }: AppProps) {
       </Head>
       <Layout>
         <Component {...pageProps} />
-        {process.env.NEXT_PUBLIC_ENVIRONMENT === "prod" && (
-          <GoogleTagManager gtmId={PUBLIC_ENV.GOOGLE_TAG_MANAGER_ID} />
-        )}
+        <GoogleAnalytics gaId={PUBLIC_ENV.GOOGLE_ANALYTICS_ID} />
       </Layout>
     </>
   );

frontend/tests/components/search/SearchFilterAccordion/SearchFilterAccordion.test.tsx

@@ -108,10 +108,10 @@ describe("SearchFilterAccordion", () => {
     );
 
     const accordionToggleButton = screen.getByTestId(
-      "accordionButton_funding-instrument-filter",
+      "accordionButton_funding-instrument-filter-status",
     );
     const contentDiv = screen.getByTestId(
-      "accordionItem_funding-instrument-filter",
+      "accordionItem_funding-instrument-filter-status",
     );
     expect(contentDiv).toHaveAttribute("hidden");