Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Enable field 2 in Basic State Information #139460

Merged
merged 15 commits into from
Sep 25, 2023
Merged

Enable field 2 in Basic State Information #139460

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
4fe194e
initial refactor
gmrabian Sep 19, 2023
3905c55
fixup logic and add mocking for tests
gmrabian Sep 19, 2023
994cd30
dynamic year and readd programType to initial status
gmrabian Sep 19, 2023
c09a1ab
search current and previous year for program type
gmrabian Sep 20, 2023
2c67997
tests
gmrabian Sep 20, 2023
9d53f14
refactor programType
gmrabian Sep 21, 2023
62b7606
Merge branch 'main' into mdct-2933-enable-fields
gmrabian Sep 21, 2023
2e563f6
update shouldDisplay and tests
gmrabian Sep 21, 2023
80b4619
add jsonpath-plus to package (already in yarn.lock)
gmrabian Sep 21, 2023
cbb3fe5
move jsonpath-plus to app-api
gmrabian Sep 21, 2023
557a15e
update getProgramType based on feedback
gmrabian Sep 22, 2023
4324f90
Merge branch 'main' into mdct-2933-enable-fields
gmrabian Sep 25, 2023
9ec318d
Merge branch 'main' into mdct-2933-enable-fields
gmrabian Sep 25, 2023
c331844
readd fetch from state for ux
gmrabian Sep 25, 2023
9ca805e
readd tests
gmrabian Sep 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion services/app-api/handlers/formTemplates/post.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@ export const post = handler(async (event, _context) => {
stateStatuses.push({
stateId: state.code,
year: yearNumber,
programType: state.programType,
gmrabian marked this conversation as resolved.
Show resolved Hide resolved
status: "not_started",
lastChanged: creationTime,
});
Expand Down
1 change: 0 additions & 1 deletion services/database/data/seed/seed-section-base-2023.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@
"value": "separate_chip"
}
],
"readonly": true,
"prepopulated": true
}
},
Expand Down
7 changes: 0 additions & 7 deletions services/ui-src/src/store/formData.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,6 @@ export default (state = initialState, action) => {
updatedData[0].contents.section.subsections[0].parts[0].questions[0] =
lastYearData[0].contents.section.subsections[0].parts[0].questions[0]; // Name
}
if (
!updatedData[0].contents.section.subsections[0].parts[0].questions[1]
.answer.entry
) {
updatedData[0].contents.section.subsections[0].parts[0].questions[1] =
lastYearData[0].contents.section.subsections[0].parts[0].questions[1]; // Type
}
gmrabian marked this conversation as resolved.
Show resolved Hide resolved
// Cohort Questions - These should be revolving around a 2 year cycle, but today just pull forward
if (twoYearCycle) {
updatedData[3].contents.section.subsections[2].parts[5].questions[1].answer =
Expand Down
16 changes: 4 additions & 12 deletions services/ui-src/src/util/shouldDisplay.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { selectFragmentById } from "../store/formData";
import { AppRoles } from "../types";
import jsonpath from "./jsonpath";
import {
Expand Down Expand Up @@ -175,19 +176,10 @@ const hideIfTableValue = (state, hideIfTableValueInfo) => {
* @returns {boolean} - determines if an element should be filtered out, returning true means a question will display
*/
const shouldDisplay = (state, context, programType = null) => {
let program, reportStatusCode;
let program;
if (state.stateUser.currentUser.role === AppRoles.CMS_ADMIN) return true;
if (!programType) {
// If program type is not provided as an argument (the user is a bus_user, co_user), use the value for program type present in state
if (state.stateUser.currentUser.role === AppRoles.STATE_USER) {
reportStatusCode = state.stateUser.abbr + state.global.formYear;
} else {
reportStatusCode = state.formData[0].stateId + state.formData[0].year;
}
program = state.reportStatus[reportStatusCode].programType;
} else {
program = programType;
}
program =
programType ?? selectFragmentById(state, "2023-00-a-01-02").answer.entry;
gmrabian marked this conversation as resolved.
Show resolved Hide resolved

if (
!context ||
Expand Down
7 changes: 7 additions & 0 deletions services/ui-src/src/util/shouldDisplay.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
import { shouldDisplay } from "./shouldDisplay";
import { AppRoles } from "../types";

jest.mock("../store/formData", () => ({
...jest.requireActual("../store/formData"),
selectFragmentById: () => ({
answer: { entry: "test program" },
}),
}));

describe("shouldDisplay", () => {
it("should display everything for CMS Admins", () => {
const state = {
Expand Down
Loading