Skip to content

Commit 48555e0

Browse files
committed
🐛 MTA-1907 fix for broken questionnaire fetch
1 parent 67ab924 commit 48555e0

File tree

3 files changed

+22
-16
lines changed

3 files changed

+22
-16
lines changed

client/src/app/pages/assessment-management/assessment-settings/assessment-settings-page.tsx

-1
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,6 @@ const AssessmentSettings: React.FC = () => {
153153

154154
// TODO: Check RBAC access
155155
const rbacWriteAccess = true; // checkAccess(userScopes, questionnaireWriteScopes);
156-
157156
return (
158157
<>
159158
<PageSection variant={PageSectionVariants.light}>

client/src/app/pages/assessment-management/import-questionnaire-form/import-questionnaire-form.tsx

+6
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,12 @@ export const ImportQuestionnaireForm: React.FC<
116116
createQuestionnaire(questionnaireData);
117117
} else {
118118
console.error("Invalid JSON data.");
119+
pushNotification({
120+
title: "Failed",
121+
message: "Invalid JSON data.",
122+
variant: "danger",
123+
timeout: 30000,
124+
});
119125
}
120126
} catch (error) {
121127
pushNotification({

client/src/app/queries/questionnaires.ts

+16-15
Original file line numberDiff line numberDiff line change
@@ -21,26 +21,27 @@ export const QuestionnaireByIdQueryKey = "questionnaireById";
2121
* in that list have an order. Hub stores things in the document order not logical
2222
* order. UI needs to have things in logical order.
2323
*/
24-
function inPlaceSortByOrder(q: Questionnaire) {
25-
q.sections.sort((a, b) => a.order - b.order);
26-
q.sections.forEach((s) => {
27-
s.questions.sort((a, b) => a.order - b.order);
28-
s.questions.forEach((q) => {
29-
q.answers.sort((a, b) => a.order - b.order);
30-
});
31-
});
32-
return q;
33-
}
24+
//TODO: this is not working, need to figure out why https://issues.redhat.com/browse/MTA-1907
25+
// function inPlaceSortByOrder(q: Questionnaire) {
26+
// q.sections.sort((a, b) => a.order - b.order);
27+
// q.sections.forEach((s) => {
28+
// s.questions.sort((a, b) => a.order - b.order);
29+
// s.questions.forEach((q) => {
30+
// q.answers.sort((a, b) => a.order - b.order);
31+
// });
32+
// });
33+
// return q;
34+
// }
3435

3536
export const useFetchQuestionnaires = () => {
3637
const { isLoading, data, error } = useQuery({
3738
queryKey: [QuestionnairesQueryKey],
3839
queryFn: getQuestionnaires,
3940
onError: (error: AxiosError) => console.log("error, ", error),
40-
select: (questionnaires) => {
41-
questionnaires.forEach((q) => inPlaceSortByOrder(q));
42-
return questionnaires;
43-
},
41+
// select: (questionnaires) => {
42+
// questionnaires.forEach((q) => inPlaceSortByOrder(q));
43+
// return questionnaires;
44+
// },
4445
});
4546
return {
4647
questionnaires: data || [],
@@ -92,7 +93,7 @@ export const useFetchQuestionnaireById = (id: number | string) => {
9293
queryKey: [QuestionnaireByIdQueryKey, id],
9394
queryFn: () => getQuestionnaireById<Questionnaire>(id),
9495
onError: (error: AxiosError) => console.log("error, ", error),
95-
select: (q) => inPlaceSortByOrder(q),
96+
// select: (q) => inPlaceSortByOrder(q),
9697
});
9798

9899
return {

0 commit comments

Comments
 (0)