update graphql responses

Author: prd-duy-huynh

public/index.js

@@ -458,7 +458,7 @@ function setupGeneric() {
 
   Traitify.http.post(Traitify.GraphQL.generic.path, {query, variables}).then((response) => {
     try {
-      const options = response.data.genericAssessments
+      const options = response.data.genericSurveys
         .map(({id, name}) => ({text: name, value: id}))
         .sort((a, b) => a.text.localeCompare(b.text));
 

src/components/survey/generic/index.js

@@ -18,7 +18,7 @@ export default function Generic() {
   const [showConclusions, setShowConclusions] = useState(false);
 
   const assessment = useAssessment({surveyType: "generic"});
-  const questionSets = assessment ? assessment.questionSets : [];
+  const questionSets = assessment ? assessment.survey.questionSets : [];
   const questionCount = questionSets.reduce((count, set) => count + set.questions.length, 0);
   const currentQuestionSet = questionSets ? questionSets[questionSetIndex] : {};
   const progress = questionSetIndex >= 0 ? (questionSetIndex / questionSets.length) * 100 : 0;
@@ -41,7 +41,7 @@ export default function Generic() {
   const onSubmit = () => {
     const query = graphQL.generic.update;
     const variables = {
-      assessmentID: assessment.assessment.id,
+      assessmentID: assessment.id,
       answers
     };
 
@@ -69,7 +69,7 @@ export default function Generic() {
     return (
       <Container {...props}>
         <Markdown className={style.markdown}>
-          {assessment.conclusions}
+          {assessment.survey.conclusions}
         </Markdown>
         <button type="button" className={style.btnPrimary}>Finished!</button>
       </Container>
@@ -102,7 +102,7 @@ export default function Generic() {
             containerClass={style.modalContainer}
           >
             <Markdown>
-              {assessment.instructions}
+              {assessment.survey.instructions}
             </Markdown>
             <hr className={style.grayDivider} />
             <div className={style.footer}>
@@ -118,7 +118,7 @@ export default function Generic() {
                 className={style.btnPrimary}
                 onClick={() => setShowInstructions(false)}
               >
-                {assessment.instructionButton}
+                {assessment.survey.instructionButton}
               </button>
             </div>
           </Modal>

src/lib/graphql/generic.js

@@ -1,6 +1,6 @@
 export const surveys = `
   query($localeKey: String!) {
-    genericAssessments(localeKey: $localeKey) {
+    genericSurveys(localeKey: $localeKey) {
       id
       name
     }
@@ -21,31 +21,31 @@ export const create = `
 
 export const questions = `
   query($assessmentID: ID!) {
-    genericAssessmentQuestions(assessmentId: $assessmentID) {
+    genericSurveyQuestions(assessmentId: $assessmentID) {
       id
-      name
-      conclusions
-      instructions
-      instructionButton
-      questionSets {
-        text
-        setImage
-        questions {
-          id
+      surveyId
+      profileId
+      startedAt
+      completedAt
+      survey {
+        id
+        name
+        conclusions
+        instructions
+        instructionButton
+        questionSets {
           text
-          responseOptions {
+          setImage
+          questions {
             id
             text
+            responseOptions {
+              id
+              text
+            }
           }
         }
       }
-      assessment {
-        id
-        surveyId
-        profileId
-        startedAt
-        completedAt
-      }
     }
   }
 `;

src/lib/recoil/assessment.js

@@ -124,12 +124,12 @@ export const genericAssessmentQuery = selectorFamily({
       return null;
     }
 
-    const survey = response.data.genericAssessmentQuestions;
-    if(!survey?.length || !survey?.assessment.completedAt) { return survey; }
+    const assessment = response.data.genericSurveyQuestions;
+    if(!assessment?.length || !assessment?.completedAt) { return assessment; }
 
-    cache.set(cacheKey, survey);
+    cache.set(cacheKey, assessment);
 
-    return survey;
+    return assessment;
   },
   key: "assessment/generic"
 });