Code optimisation for builder

Ref: #209
beda-software · Nov 27, 2023 · f0ec846 · f0ec846
1 parent e3c4457
commit f0ec846
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 16 deletions.
diff --git a/src/containers/QuestionnaireBuilder/hooks.ts b/src/containers/QuestionnaireBuilder/hooks.ts
@@ -1,9 +1,5 @@
 import { notification } from 'antd';
-import {
-    Questionnaire as FHIRQuestionnaire,
-    QuestionnaireItem as FHIRQuestionnaireItem,
-    Questionnaire,
-} from 'fhir/r4b';
+import { Questionnaire as FHIRQuestionnaire, QuestionnaireItem as FHIRQuestionnaireItem } from 'fhir/r4b';
 import { notAsked, RemoteData } from 'fhir-react';
 import _ from 'lodash';
 import { useCallback, useEffect, useState } from 'react';
@@ -48,7 +44,6 @@ export function useQuestionnaireBuilder() {
     const [error, setError] = useState<string | undefined>();
     const [editHistory, setEditHistory] = useState({});
     const [selectedPrompt, setSelectedPrompt] = useState<string | undefined>(undefined);
-    const [selectedQuestionnaire, setSelectedQuestionnaire] = useState<Questionnaire>();
 
     useEffect(() => {
         (async () => {
@@ -96,14 +91,12 @@ export function useQuestionnaireBuilder() {
                 setError(undefined);
                 const questionnaire = response.data;
                 const saveResponse = await generateQuestionnaire(prompt, JSON.stringify(questionnaire));
-                console.log('saveResponse', saveResponse);
 
                 setUpdateResponse(saveResponse);
                 if (isSuccess(saveResponse)) {
                     const newQuestionnaire = saveResponse.data;
                     setResponse(success(newQuestionnaire));
                     setEditHistory({ ...{ [prompt]: newQuestionnaire }, ...editHistory });
-                    setSelectedQuestionnaire(undefined);
                     setSelectedPrompt(prompt);
                 }
 
@@ -172,7 +165,7 @@ export function useQuestionnaireBuilder() {
 
     const onPromptSelect = useCallback(
         (prompt: string) => {
-            setSelectedQuestionnaire(editHistory[prompt]);
+            setResponse(success(editHistory[prompt]));
             setSelectedPrompt(prompt);
         },
         [editHistory],
@@ -201,7 +194,6 @@ export function useQuestionnaireBuilder() {
         error,
         editHistory,
         setEditHistory,
-        selectedQuestionnaire,
         onPromptSelect,
         selectedPrompt,
         onPromptDelete,

diff --git a/src/containers/QuestionnaireBuilder/index.tsx b/src/containers/QuestionnaireBuilder/index.tsx
@@ -6,7 +6,7 @@ import React, { useState } from 'react';
 import { GroupItemProps, QuestionItemProps } from 'sdc-qrf/lib/types';
 
 import { RenderRemoteData } from 'fhir-react/lib/components/RenderRemoteData';
-import { isLoading, success } from 'fhir-react/lib/libs/remoteData';
+import { isLoading } from 'fhir-react/lib/libs/remoteData';
 
 import { BasePageContent, BasePageHeader } from 'src/components/BaseLayout';
 import { ModalTrigger } from 'src/components/ModalTrigger';
@@ -30,7 +30,6 @@ export function QuestionnaireBuilder() {
         onItemDrag,
         onSaveQuestionnaire,
         onItemDelete,
-        selectedQuestionnaire,
         onPromptSelect,
         selectedPrompt,
         editHistory,
@@ -50,9 +49,7 @@ export function QuestionnaireBuilder() {
                             </Title>
                         </Col>
                         <Col>
-                            <RenderRemoteData
-                                remoteData={selectedQuestionnaire ? success(selectedQuestionnaire) : response}
-                            >
+                            <RenderRemoteData remoteData={response}>
                                 {(questionnaire: Questionnaire) => {
                                     return questionnaire.item ? (
                                         <ModalTrigger
@@ -82,7 +79,7 @@ export function QuestionnaireBuilder() {
                 <S.Content>
                     <div className={s.rightColumn}>
                         <Builder
-                            response={selectedQuestionnaire ? success(selectedQuestionnaire) : response}
+                            response={response}
                             updateResponse={updateResponse}
                             error={error}
                             activeQuestionItem={questionnaireItem || groupItem}