Revert "Rollback to Arch Diagram (#139777)" (#139779)

.github/workflows/destroy.yml

@@ -65,4 +65,18 @@ jobs:
           inputs: '{ "topics": "mgmt.connect.cms-carts-seds.carts-bigmac-streams-${{env.BRANCH_NAME}}.config,mgmt.connect.cms-carts-seds.carts-bigmac-streams-${{env.BRANCH_NAME}}.offsets,mgmt.connect.cms-carts-seds.carts-bigmac-streams-${{env.BRANCH_NAME}}.status"}'
           ref: refs/heads/master # Otherwise workflow-dispatch tries to operate off of our default name
       - name: Destroy
-        run: ./run destroy --stage $STAGE_PREFIX$branch_name --verify false
+        run: ./run destroy --stage $STAGE_PREFIX$branch_name --verify false
+
+  # Notify the integrations channel when a destroy action fails
+  notify_on_destroy_failure:
+    runs-on: ubuntu-latest
+    needs: 
+      - destroy
+    if: ${{ failure() }}
+    steps:
+      - name: Slack Notification
+        uses: rtCamp/action-slack-notify@v2
+        env:
+          SLACK_TITLE: ":boom: A destroy action has failed on ${{ github.repository }}."
+          MSG_MINIMAL: true
+          SLACK_WEBHOOK: ${{ secrets.INTEGRATIONS_SLACK_WEBHOOK }}

.github/workflows/scan_security-hub-jira-integration.yml

@@ -21,13 +21,12 @@ jobs:
           aws-region: ${{ secrets.AWS_DEFAULT_REGION }}
           role-to-assume: ${{ secrets.PRODUCTION_SYNC_OIDC_ROLE }}
       - name: Sync Security Hub and Jira
-        uses: Enterprise-CMCS/mac-fc-security-hub-visibility@v1.0.5
+        uses: Enterprise-CMCS/mac-fc-security-hub-visibility@v2.0.9
         with:
           jira-username: "mdct_github_service_account"
           jira-token: ${{ secrets.JIRA_ENT_USER_TOKEN }}
-          jira-host: jiraent.cms.gov
           jira-project-key: CMDCT
           jira-ignore-statuses: Done, Closed, Canceled
           jira-custom-fields: '{ "customfield_10100": "CMDCT-2280", "customfield_26700" : [{"id": "40101", "value": "CARTS"}] }'
           aws-severities: CRITICAL, HIGH, MEDIUM
-          assign-jira-ticket-to: "MWTW"
+          jira-assignee: "MWTW"

services/app-api/libs/validation/backend-section.schema.ts

@@ -359,6 +359,9 @@ export const sectionSchema = {
           hint: {
             type: "string",
           },
+          mask: {
+            type: "string",
+          },
           questions: {
             type: "array",
             items: {

services/ui-src/package.json

@@ -36,7 +36,7 @@
     "redux-logger": "^3.0.6",
     "redux-thunk": "^2.3.0",
     "sass": "^1.77.1",
-    "vite": "^5.2.11",
+    "vite": "^5.4.6",
     "vite-tsconfig-paths": "^4.3.2"
   },
   "scripts": {

services/ui-src/src/components/fields/DataGrid.jsx

@@ -1,12 +1,13 @@
 import React, { useEffect, useState } from "react";
+import { useDispatch, useSelector } from "react-redux";
 import PropTypes from "prop-types";
 import Question from "./Question";
-import { connect, useDispatch } from "react-redux";
 import { ADD_TO_TOTAL, FINISH_CALCULATION } from "../../store/lastYearTotals";
 
-const DataGrid = ({ question, lastYearFormData }) => {
+const DataGrid = ({ question, printView }) => {
   const [renderQuestions, setRenderQuestions] = useState([]);
   const [questionsToSet, setQuestionsToSet] = useState([]);
+  const lastYearFormData = useSelector((state) => state.lastYearFormData);
   const dispatch = useDispatch();
 
   const rowStyle =
@@ -138,6 +139,7 @@ const DataGrid = ({ question, lastYearFormData }) => {
               hideNumber={question.type !== "fieldset"}
               question={question.question}
               prevYear={question.prevYear}
+              printView={printView}
             />
           </div>
         );
@@ -148,16 +150,7 @@ const DataGrid = ({ question, lastYearFormData }) => {
 
 DataGrid.propTypes = {
   question: PropTypes.object.isRequired,
-  year: PropTypes.number.isRequired,
-  state: PropTypes.string.isRequired,
-  lastYearFormData: PropTypes.object.isRequired,
+  printView: PropTypes.bool,
 };
 
-const mapStateToProps = (state) => ({
-  year: state.formData[0].contents.section.year,
-  state: state.formData[0].contents.section.state,
-  lastYearFormData: state.lastYearFormData,
-  lastYearTotals: state.lastYearTotals,
-});
-
-export default connect(mapStateToProps)(DataGrid);
+export default DataGrid;

services/ui-src/src/components/fields/Integer.jsx

@@ -4,12 +4,54 @@ import { TextField } from "@cmsgov/design-system";
 import { useSelector } from "react-redux";
 import { generateQuestionNumber } from "../utils/helperFunctions";
 
-const Integer = ({ onChange, question, prevYear, ...props }) => {
+const getPrevYearValue = (question, lastYearFormData) => {
+  let prevYearValue;
+
+  // Split and create array from id
+  const splitID = question.id.split("-");
+
+  // the subquestion id (a, b, c, etc)
+  const questionId = splitID[5];
+
+  // Custom handling for -03-c-05 and -03-c-06
+  if (
+    splitID[1] === "03" &&
+    splitID[2] === "c" &&
+    (splitID[3] === "05" || splitID[3] === "06") &&
+    questionId === "a" &&
+    parseInt(splitID[4]) > 2 &&
+    parseInt(splitID[4]) < 10
+  ) {
+    // Set year to last year
+    splitID[0] = parseInt(splitID[0]) - 1;
+    splitID.pop();
+
+    const fieldsetId = splitID.join("-");
+    const partIndex = parseInt(splitID[3]) - 1;
+
+    // Get questions from last years JSON
+    const questions =
+      lastYearFormData?.[3]?.contents.section.subsections[2].parts[partIndex]
+        .questions;
+
+    // Filter down to this question
+    const matchingQuestion = questions?.filter(
+      (question) => fieldsetId === question?.fieldset_info?.id
+    );
+
+    // The first will always be correct
+    if (matchingQuestion?.[0]) {
+      prevYearValue = matchingQuestion[0].questions[0].answer?.entry;
+    }
+  }
+  return prevYearValue;
+};
+
+const Integer = ({ onChange, question, prevYear, printView, ...props }) => {
   const [error, setError] = useState(false);
   const [answer, setAnswer] = useState(question.answer.entry);
-  const lastYearTotals = useSelector((state) => state.lastYearTotals);
-  const prevYearNumber =
-    lastYearTotals[question.id.substring(0, question.id.length - 2)];
+  const lastYearFormData = useSelector((state) => state.lastYearFormData);
+
   const change = ({ target: { name, value } }) => {
     const stripped = value.replace(/[^0-9]+/g, "");
     const parsed = parseFloat(stripped);
@@ -25,22 +67,26 @@ const Integer = ({ onChange, question, prevYear, ...props }) => {
     }
   };
 
-  if (prevYearNumber && question.id.indexOf("-a") > -1) {
+  const isLessThanElevenMask = (value) => {
     return (
-      <TextField
-        className="ds-c-input"
-        errorMessage={error}
-        label={`${generateQuestionNumber(question.id)} ${question.label}`}
-        hint={question.hint}
-        name={question.id}
-        numeric
-        onChange={change}
-        value={prevYearNumber}
-        {...props}
-      />
+      printView &&
+      question.mask === "lessThanEleven" &&
+      value <= 10 &&
+      value > 0
     );
-  }
-  const renderAnswer = (val) => (val || Number.isInteger(val) ? val : ""); // may attempt to rerender string on page load, so both val || isInteger
+  };
+
+  const renderAnswer = () => {
+    if (answer === null) {
+      const value =
+        getPrevYearValue(question, lastYearFormData) ?? prevYear?.value;
+      if (isLessThanElevenMask(value)) return "<11";
+      return value;
+    } else {
+      if (isLessThanElevenMask(answer)) return "<11";
+      return answer || Number.isInteger(answer) ? answer : "";
+    }
+  };
   return (
     <TextField
       className="ds-c-input"
@@ -50,7 +96,7 @@ const Integer = ({ onChange, question, prevYear, ...props }) => {
       name={question.id}
       numeric
       onChange={change}
-      value={answer != null ? renderAnswer(answer) : prevYear && prevYear.value}
+      value={renderAnswer()}
       {...props}
     />
   );
@@ -59,7 +105,7 @@ Integer.propTypes = {
   onChange: PropTypes.func.isRequired,
   question: PropTypes.object.isRequired,
   prevYear: PropTypes.object,
+  printView: PropTypes.bool,
 };
 
-export { Integer };
 export default Integer;

services/ui-src/src/components/fields/Integer.test.jsx

@@ -6,14 +6,48 @@ import Integer from "./Integer";
 import { screen, render, fireEvent } from "@testing-library/react";
 
 const mockStore = configureMockStore();
-const store = mockStore({ lastYearTotals: { 2022: [] } });
+const lastYearFormData = [
+  {},
+  {},
+  {},
+  {
+    contents: {
+      section: {
+        subsections: [
+          {},
+          {},
+          {
+            parts: [
+              {},
+              {},
+              {},
+              {},
+              {
+                questions: [
+                  {
+                    fieldset_info: {
+                      id: "2022-03-c-05-03",
+                    },
+                    questions: [{ answer: { entry: 3000 } }],
+                  },
+                ],
+              },
+            ],
+          },
+        ],
+      },
+    },
+  },
+];
+const store = mockStore({ lastYearTotals: { 2022: [] }, lastYearFormData });
 const buildInteger = (intProps) => {
   return (
     <Provider store={store}>
       <Integer onChange={() => {}} {...intProps} />
     </Provider>
   );
 };
+
 describe("<Integer />", () => {
   it("should render correctly", () => {
     const props = { question: { id: "2023-00-a-01-01", answer: 1 } };
@@ -29,7 +63,7 @@ describe("<Integer />", () => {
     const props = {
       question: {
         id: "2023-00-a-01-01",
-        label: "How many lightbulbs does it take to change a man?",
+        label: "Example Question",
         answer: { entry: 123 },
       },
     };
@@ -45,7 +79,7 @@ describe("<Integer />", () => {
     const props = {
       question: {
         id: "2023-00-a-01-01",
-        label: "How many lightbulbs does it take to change a man?",
+        label: "Example Question",
         answer: { entry: 123 },
       },
     };
@@ -61,7 +95,7 @@ describe("<Integer />", () => {
     const props = {
       question: {
         id: "2023-00-a-01-01",
-        label: "How many lightbulbs does it take to change a man?",
+        label: "Example Question",
         answer: { entry: "hope" },
       },
     };
@@ -73,4 +107,67 @@ describe("<Integer />", () => {
     expect(screen.queryByDisplayValue("raw text")).not.toBeInTheDocument();
     expect(screen.getByRole("alert")).toBeInTheDocument();
   });
+
+  it("should show <11 if passed >0 and <=10 with printView and lessThanEleven", () => {
+    const props = {
+      question: {
+        id: "2023-00-a-01-01",
+        label: "Example Question",
+        answer: { entry: "5" },
+        mask: "lessThanEleven",
+      },
+      printView: true,
+    };
+
+    render(buildInteger(props));
+    expect(screen.getByDisplayValue("<11")).toBeInTheDocument();
+    expect(screen.queryByDisplayValue("5")).not.toBeInTheDocument();
+  });
+
+  it("should show original answer if passed >=11 with printView and lessThanEleven mask", () => {
+    const props = {
+      question: {
+        id: "2023-00-a-01-01",
+        label: "Example Question",
+        answer: { entry: "12" },
+        mask: "lessThanEleven",
+      },
+      printView: true,
+    };
+
+    render(buildInteger(props));
+    expect(screen.getByDisplayValue("12")).toBeInTheDocument();
+  });
+
+  it("should show original answer if passed 0 with printView and lessThanEleven mask", () => {
+    const props = {
+      question: {
+        id: "2023-00-a-01-01",
+        label: "Example Question",
+        answer: { entry: "0" },
+        mask: "lessThanEleven",
+      },
+      printView: true,
+    };
+
+    render(buildInteger(props));
+    expect(screen.getByDisplayValue("0")).toBeInTheDocument();
+  });
+
+  it("should render previous year value for appropriate 3c part 5 or 6 questions", () => {
+    const props = {
+      question: {
+        id: "2023-03-c-05-03-a",
+        label: "How much?",
+        answer: { entry: null },
+      },
+    };
+
+    render(buildInteger(props));
+
+    expect(screen.getByDisplayValue("3000")).toBeInTheDocument();
+    const input = screen.getByRole("textbox");
+    fireEvent.change(input, { target: { value: 234 } });
+    expect(screen.getByDisplayValue("234")).toBeInTheDocument();
+  });
 });

services/ui-src/src/components/fields/Money.jsx

@@ -1,6 +1,6 @@
 import React from "react";
 import PropTypes from "prop-types";
-import { Integer } from "./Integer";
+import Integer from "./Integer";
 
 const Money = ({ ...props }) => {
   return <Integer {...props} inputMode="currency" mask="currency" />;