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

🐛 Address required status bug #1843

Merged
merged 3 commits into from
Apr 15, 2024
Merged

🐛 Address required status bug #1843

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8c94ee8
:bug: Address required status bug
ibolton336 Apr 12, 2024
f4ac411
Merge branch 'main' into address-status-issue
ibolton336 Apr 12, 2024
adfd274
Merge branch 'main' into address-status-issue
ibolton336 Apr 15, 2024
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
9 changes: 5 additions & 4 deletions client/src/app/hooks/useAssessmentStatus.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,11 @@ export const useAssessmentStatus = (application: Application) => {

const hasApplicationAssessmentInProgress = applicationAssessments?.some(
(assessment: Assessment) =>
assessment.status === "started" ||
assessment.status === "empty" ||
(assessment.status === "complete" &&
application.assessments?.length !== 0)
assessment.required &&
(assessment.status === "started" ||
assessment.status === "empty" ||
(assessment.status === "complete" &&
application.assessments?.length !== 0))
);

return {
Expand Down
104 changes: 104 additions & 0 deletions ...ons/components/application-assessment-status/tests/application-assessment-status.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,110 @@ describe("useAssessmentStatus", () => {
server.resetHandlers();
});

it("Updates hasApplicationAssessmentInProgress to false when assessment is marked as not required", async () => {
server.use(
rest.get("/hub/archetypes", (req, res, ctx) => {
return res(
ctx.json([
createMockArchetype({
id: 1,
name: "archetype1",
applications: [],
assessed: false,
assessments: [],
}),
])
);
}),
rest.get("/hub/assessments", (req, res, ctx) => {
return res(
ctx.json([
createMockAssessment({
id: 1,
application: { id: 1, name: "app1" },
questionnaire: { id: 1, name: "questionnaire1" },
status: "started",
required: true,
sections: [],
}),
createMockAssessment({
id: 2,
application: { id: 1, name: "app1" },
questionnaire: { id: 2, name: "questionnaire2" },
status: "complete",
required: true,
sections: [],
}),
])
);
})
);

const queryClient = new QueryClient({
defaultOptions: {
queries: {
retry: false,
cacheTime: 1000,
},
},
});

const { result, rerender } = renderHook(
() => useAssessmentStatus(createMockApplication({ id: 1, name: "app1" })),
{ queryClient }
);

await waitFor(() => {
expect(result.current.hasApplicationAssessmentInProgress).toBe(true);
});

server.use(
rest.get("/hub/archetypes", (req, res, ctx) => {
return res(
ctx.json([
createMockArchetype({
id: 1,
name: "archetype1",
applications: [],
assessed: false,
assessments: [],
}),
])
);
}),
rest.get("/hub/assessments", (req, res, ctx) => {
return res(
ctx.json([
createMockAssessment({
id: 1,
application: { id: 1, name: "app1" },
questionnaire: { id: 1, name: "questionnaire1" },
status: "started",
required: false,
sections: [],
}),
createMockAssessment({
id: 2,
application: { id: 1, name: "app1" },
questionnaire: { id: 2, name: "questionnaire2" },
status: "complete",
required: false,
sections: [],
}),
])
);
})
Comment on lines +94 to +115
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Having the second set of handlers is a bit confusing.

I suggest just doing a use once kind of setup so it is more obvious that the data will change on the second request.

This may work (not tested):

    rest.get("/hub/assessments", (req, res, ctx) => {
        return res.once(
          // first json
        );
      })
    rest.get("/hub/assessments", (req, res, ctx) => {
        return res(
          // json for the rest of the time
        );
      })

See: https://v1.mswjs.io/docs/api/setup-server/use#one-time-override

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Or I just found you can use a generator function in this case -- way cooler:
mswjs/msw#1117 (reply in thread)

It points at this bit of code for more examples: https://github.com/mswjs/msw/blob/6990c3a57a1f515fe977c2eaa7741005b885b8af/test/rest-api/generator.mocks.ts#L4

//cc @rszwajko

);

queryClient.invalidateQueries([assessmentsQueryKey]);

rerender(createMockApplication({ id: 1, name: "app1" }));

await waitFor(() => {
expect(result.current.hasApplicationAssessmentInProgress).toBe(false);
});
});

it("Updates hasApplicationAssessmentInProgress to false once associated assessments are deleted", async () => {
server.use(
rest.get("/hub/assessments", (req, res, ctx) => {
Expand Down
Loading