Merge branch 'main' into ans_headings

Dockerfile

@@ -99,8 +99,14 @@ RUN cp -Rfp /build/* /usr/local && rm -Rf /build
 # See .dockerignore for details on which files are included
 COPY --from=cfgov-node-builder ${APP_HOME} ${APP_HOME}
 
-# Run Django's collectstatic to collect assets from the frontend build
-RUN cfgov/manage.py collectstatic
+# Run Django's collectstatic to collect assets from the frontend build.
+#
+# Our Django settings file requires a SECRET_KEY, but we don't want to
+# bake our key into the Docker image. We need to provide one in order to
+# be able to run collectstatic, even though the key value isn't actually
+# used in any way during staticfiles collection. We provide a random
+# secret key here for this step only.
+RUN SECRET_KEY=only-for-collectstatic cfgov/manage.py collectstatic
 
 #######################################################################
 # Build mod_wsgi against target Python version

cfgov/unprocessed/apps/tccp/js/index.js

@@ -1,4 +1,5 @@
 import tippy from 'tippy.js';
+import { analyticsSendEvent } from '@cfpb/cfpb-analytics';
 import { attach } from '@cfpb/cfpb-design-system/src/index.js';
 
 import orderingDropdown from './ordering';
@@ -27,7 +28,40 @@ function init() {
   // Initialize any tooltips on the page
   initializeTooltips();
   // Reinitialize tooltips after an htmx request replaces DOM nodes
-  attach(document, 'htmx:afterSwap', initializeTooltips);
+  attach(document, 'htmx:afterSwap', initializeAndReport);
+}
+
+/**
+ *
+ * @param {Event} event - htmx event
+ */
+function initializeAndReport(event) {
+  initializeTooltips();
+  reportFilter(event);
+}
+
+/**
+ *
+ * @param {Event} event - htmx event
+ */
+function reportFilter(event) {
+  let category, value;
+  const { target } = event.detail.requestConfig.triggeringEvent;
+  if (target.tagName === 'SELECT') {
+    category = target.name;
+    value = target.value;
+  } else {
+    category = target
+      .closest('fieldset')
+      .firstElementChild.textContent.toLowerCase();
+    value = target.labels[0].textContent.trim();
+  }
+
+  analyticsSendEvent({
+    event: 'tccp:card-list-refinement',
+    category,
+    value,
+  });
 }
 
 /**

docs/deployment.md

@@ -4,12 +4,12 @@ archives to deploy the site to a Linux server.
 
 # Generating a deployment artifact
 
-Running the script at `./docker/deployable-zipfile/build.sh` will start a CentOS 6
+Running the script at `./docker/builder/build.sh` will start a CentOS 7
 container, generate the artifact (via
-[this script](https://github.com/cfpb/consumerfinance.gov/blob/main/docker/deployable-zipfile/_build.sh)),
+[this script](https://github.com/cfpb/consumerfinance.gov/blob/main/docker/builder/_build.sh)),
 and save it to `./cfgov_current_build.zip`.
 
-We use CentOS 6 here, so that the Python modules that include compiled code, will
+We use CentOS 7 here so that the Python modules that include compiled code, will
 be compiled for the same environment they will be run in.
 
 # What's in an artifact?

package.json

@@ -20,14 +20,12 @@
     "@cfpb/browserslist-config": "0.0.3",
     "@cfpb/cfpb-analytics": "0.3.2",
     "@cfpb/cfpb-design-system": "3.2.0",
-    "@cypress/skip-test": "2.6.1",
+    "@csstools/postcss-sass": "5.1.1",
+    "@csstools/sass-import-resolve": "1.0.0",
     "autoprefixer": "10.4.20",
-    "axe-core": "4.10.0",
-    "cypress-axe": "1.5.0",
     "esbuild": "0.24.0",
     "fancy-log": "2.0.0",
     "highcharts": "7.2.2",
-    "less": "4.2.0",
     "lodash.clonedeep": "4.5.0",
     "lodash.throttle": "4.1.1",
     "number-to-words": "1.2.4",
@@ -36,9 +34,10 @@
     "svg-inline-loader": "0.8.2"
   },
   "devDependencies": {
-    "@csstools/postcss-sass": "5.1.1",
-    "@csstools/sass-import-resolve": "1.0.0",
+    "@cypress/skip-test": "2.6.1",
+    "axe-core": "4.10.0",
     "cypress": "13.14.2",
+    "cypress-axe": "1.5.0",
     "cypress-fail-fast": "7.1.1",
     "eslint": "8.57.0",
     "eslint-config-prettier": "9.1.0",