Fix review comments

the-deep · Aug 23, 2023 · 4b98279 · 4b98279
1 parent 3f72721
commit 4b98279
Show file tree

Hide file tree

Showing 11 changed files with 71 additions and 0 deletions.
diff --git a/src/views/QuestionnaireEdit/DateQuestionForm/index.tsx b/src/views/QuestionnaireEdit/DateQuestionForm/index.tsx
@@ -121,13 +121,15 @@ interface Props {
     projectId: string;
     questionnaireId: string;
     questionId?: string;
+    onSuccess: (questionId: string | undefined) => void;
 }
 
 function DateQuestionForm(props: Props) {
     const {
         projectId,
         questionnaireId,
         questionId,
+        onSuccess,
     } = props;
 
     const alert = useAlert();
@@ -193,6 +195,7 @@ function DateQuestionForm(props: Props) {
                     return;
                 }
                 if (response.ok) {
+                    onSuccess(response.result?.id);
                     alert.show(
                         'Question created successfully.',
                         { variant: 'success' },
@@ -225,6 +228,7 @@ function DateQuestionForm(props: Props) {
                     return;
                 }
                 if (response.ok) {
+                    onSuccess(response.result?.id);
                     alert.show(
                         'Question updated successfully.',
                         { variant: 'success' },

diff --git a/src/views/QuestionnaireEdit/FileQuestionForm/index.tsx b/src/views/QuestionnaireEdit/FileQuestionForm/index.tsx
@@ -121,13 +121,15 @@ interface Props {
     projectId: string;
     questionnaireId: string;
     questionId?: string;
+    onSuccess: (questionId: string | undefined) => void;
 }
 
 function FileQuestionForm(props: Props) {
     const {
         projectId,
         questionnaireId,
         questionId,
+        onSuccess,
     } = props;
 
     const alert = useAlert();
@@ -193,6 +195,7 @@ function FileQuestionForm(props: Props) {
                     return;
                 }
                 if (response.ok) {
+                    onSuccess(response.result?.id);
                     alert.show(
                         'Question created successfully.',
                         { variant: 'success' },
@@ -225,6 +228,7 @@ function FileQuestionForm(props: Props) {
                     return;
                 }
                 if (response.ok) {
+                    onSuccess(response.result?.id);
                     alert.show(
                         'Question updated successfully.',
                         { variant: 'success' },

diff --git a/src/views/QuestionnaireEdit/ImageQuestionForm/index.tsx b/src/views/QuestionnaireEdit/ImageQuestionForm/index.tsx
@@ -121,13 +121,15 @@ interface Props {
     projectId: string;
     questionnaireId: string;
     questionId?: string;
+    onSuccess: (questionId: string | undefined) => void;
 }
 
 function ImageQuestionForm(props: Props) {
     const {
         projectId,
         questionnaireId,
         questionId,
+        onSuccess,
     } = props;
 
     const alert = useAlert();
@@ -193,6 +195,7 @@ function ImageQuestionForm(props: Props) {
                     return;
                 }
                 if (response.ok) {
+                    onSuccess(response.result?.id);
                     alert.show(
                         'Question created successfully.',
                         { variant: 'success' },
@@ -225,6 +228,7 @@ function ImageQuestionForm(props: Props) {
                     return;
                 }
                 if (response.ok) {
+                    onSuccess(response.result?.id);
                     alert.show(
                         'Question updated successfully.',
                         { variant: 'success' },

diff --git a/src/views/QuestionnaireEdit/IntegerQuestionForm/index.tsx b/src/views/QuestionnaireEdit/IntegerQuestionForm/index.tsx
@@ -117,13 +117,15 @@ interface Props {
     projectId: string;
     questionnaireId: string;
     questionId?: string;
+    onSuccess: (questionId: string | undefined) => void;
 }
 
 function IntegerQuestionForm(props: Props) {
     const {
         projectId,
         questionnaireId,
         questionId,
+        onSuccess,
     } = props;
 
     const alert = useAlert();
@@ -189,6 +191,7 @@ function IntegerQuestionForm(props: Props) {
                     return;
                 }
                 if (response.ok) {
+                    onSuccess(response.result?.id);
                     alert.show(
                         'Question created successfully.',
                         { variant: 'success' },
@@ -221,6 +224,7 @@ function IntegerQuestionForm(props: Props) {
                     return;
                 }
                 if (response.ok) {
+                    onSuccess(response.result?.id);
                     alert.show(
                         'Question updated successfully.',
                         { variant: 'success' },

diff --git a/src/views/QuestionnaireEdit/NoteQuestionForm/index.tsx b/src/views/QuestionnaireEdit/NoteQuestionForm/index.tsx
@@ -121,13 +121,15 @@ interface Props {
     projectId: string;
     questionnaireId: string;
     questionId?: string;
+    onSuccess: (questionId: string | undefined) => void;
 }
 
 function NoteQuestionForm(props: Props) {
     const {
         projectId,
         questionnaireId,
         questionId,
+        onSuccess,
     } = props;
 
     const alert = useAlert();
@@ -193,6 +195,7 @@ function NoteQuestionForm(props: Props) {
                     return;
                 }
                 if (response.ok) {
+                    onSuccess(response.result?.id);
                     alert.show(
                         'Question created successfully.',
                         { variant: 'success' },
@@ -225,6 +228,7 @@ function NoteQuestionForm(props: Props) {
                     return;
                 }
                 if (response.ok) {
+                    onSuccess(response.result?.id);
                     alert.show(
                         'Question updated successfully.',
                         { variant: 'success' },

diff --git a/src/views/QuestionnaireEdit/RankQuestionForm/index.tsx b/src/views/QuestionnaireEdit/RankQuestionForm/index.tsx
@@ -122,13 +122,15 @@ interface Props {
     projectId: string;
     questionnaireId: string;
     questionId?: string;
+    onSuccess: (questionId: string | undefined) => void;
 }
 
 function RankQuestionForm(props: Props) {
     const {
         projectId,
         questionnaireId,
         questionId,
+        onSuccess,
     } = props;
 
     const alert = useAlert();
@@ -194,6 +196,7 @@ function RankQuestionForm(props: Props) {
                     return;
                 }
                 if (response.ok) {
+                    onSuccess(response.result?.id);
                     alert.show(
                         'Question created successfully.',
                         { variant: 'success' },
@@ -226,6 +229,7 @@ function RankQuestionForm(props: Props) {
                     return;
                 }
                 if (response.ok) {
+                    onSuccess(response.result?.id);
                     alert.show(
                         'Question updated successfully.',
                         { variant: 'success' },

diff --git a/src/views/QuestionnaireEdit/SelectMultipleQuestionForm/index.tsx b/src/views/QuestionnaireEdit/SelectMultipleQuestionForm/index.tsx
@@ -29,9 +29,13 @@ import SelectMultipleQuestionPreview from '#components/questionPreviews/SelectMu
 import PillarSelectInput from '#components/PillarSelectInput';
 import ChoiceCollectionSelectInput from '#components/ChoiceCollectionSelectInput';
 
+import {
+    QUESTION_FRAGMENT,
+} from '../queries.ts';
 import styles from './index.module.css';
 
 const CREATE_MULTIPLE_SELECTION_QUESTION = gql`
+    ${QUESTION_FRAGMENT}
     mutation CreateMultipleSelectionQuestion(
         $projectId: ID!,
         $input: QuestionCreateInput!,
@@ -43,6 +47,9 @@ const CREATE_MULTIPLE_SELECTION_QUESTION = gql`
                 ) {
                     ok
                     errors
+                    result {
+                        ...QuestionResponse
+                    }
                 }
             }
         }
@@ -86,12 +93,14 @@ const schema: FormSchema = {
 interface Props {
     projectId: string;
     questionnaireId: string;
+    onSuccess: (questionId: string | undefined) => void;
 }
 
 function SelectMultipleQuestionForm(props: Props) {
     const {
         projectId,
         questionnaireId,
+        onSuccess,
     } = props;
 
     const alert = useAlert();
@@ -111,6 +120,7 @@ function SelectMultipleQuestionForm(props: Props) {
                     return;
                 }
                 if (response.ok) {
+                    onSuccess(response.result?.id);
                     alert.show(
                         'Question created successfully.',
                         { variant: 'success' },

diff --git a/src/views/QuestionnaireEdit/SelectOneQuestionForm/index.tsx b/src/views/QuestionnaireEdit/SelectOneQuestionForm/index.tsx
@@ -30,9 +30,13 @@ import SelectOneQuestionPreview from '#components/questionPreviews/SelectOneQues
 import PillarSelectInput from '#components/PillarSelectInput';
 import ChoiceCollectionSelectInput from '#components/ChoiceCollectionSelectInput';
 
+import {
+    QUESTION_FRAGMENT,
+} from '../queries.ts';
 import styles from './index.module.css';
 
 const CREATE_SINGLE_SELECTION_QUESTION = gql`
+    ${QUESTION_FRAGMENT}
     mutation CreateSingleSelectionQuestion(
         $projectId: ID!,
         $input: QuestionCreateInput!,
@@ -44,6 +48,9 @@ const CREATE_SINGLE_SELECTION_QUESTION = gql`
                 ) {
                     ok
                     errors
+                    result {
+                        ...QuestionResponse
+                    }
                 }
             }
         }
@@ -87,12 +94,14 @@ const schema: FormSchema = {
 interface Props {
     projectId: string;
     questionnaireId: string;
+    onSuccess: (questionId: string | undefined) => void;
 }
 
 function SelectOneQuestionForm(props: Props) {
     const {
         projectId,
         questionnaireId,
+        onSuccess,
     } = props;
 
     const alert = useAlert();
@@ -111,6 +120,7 @@ function SelectOneQuestionForm(props: Props) {
                     return;
                 }
                 if (response.ok) {
+                    onSuccess(response.result?.id);
                     alert.show(
                         'Question created successfully.',
                         { variant: 'success' },

diff --git a/src/views/QuestionnaireEdit/TextQuestionForm/index.tsx b/src/views/QuestionnaireEdit/TextQuestionForm/index.tsx
@@ -118,13 +118,15 @@ interface Props {
     projectId: string;
     questionnaireId: string;
     questionId?: string;
+    onSuccess: (questionId: string | undefined) => void;
 }
 
 function TextQuestionForm(props: Props) {
     const {
         projectId,
         questionnaireId,
         questionId,
+        onSuccess,
     } = props;
 
     const alert = useAlert();
@@ -190,6 +192,7 @@ function TextQuestionForm(props: Props) {
                     return;
                 }
                 if (response.ok) {
+                    onSuccess(response.result?.id);
                     alert.show(
                         'Question created successfully.',
                         { variant: 'success' },
@@ -222,6 +225,7 @@ function TextQuestionForm(props: Props) {
                     return;
                 }
                 if (response.ok) {
+                    onSuccess(response.result?.id);
                     alert.show(
                         'Question updated successfully.',
                         { variant: 'success' },

diff --git a/src/views/QuestionnaireEdit/TimeQuestionForm/index.tsx b/src/views/QuestionnaireEdit/TimeQuestionForm/index.tsx
@@ -122,13 +122,15 @@ interface Props {
     projectId: string;
     questionnaireId: string;
     questionId?: string;
+    onSuccess: (questionId: string | undefined) => void;
 }
 
 function TimeQuestionForm(props: Props) {
     const {
         projectId,
         questionnaireId,
         questionId,
+        onSuccess,
     } = props;
 
     const alert = useAlert();
@@ -194,6 +196,7 @@ function TimeQuestionForm(props: Props) {
                     return;
                 }
                 if (response.ok) {
+                    onSuccess(response.result?.id);
                     alert.show(
                         'Question created successfully.',
                         { variant: 'success' },
@@ -226,6 +229,7 @@ function TimeQuestionForm(props: Props) {
                     return;
                 }
                 if (response.ok) {
+                    onSuccess(response.result?.id);
                     alert.show(
                         'Question updated successfully.',
                         { variant: 'success' },