PR comments addressed

konveyor · Aug 31, 2023 · 8f64628 · 8f64628
1 parent ebfe5e8
commit 8f64628
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 25 deletions.
diff --git a/...ion-assessment/components/application-assessment-wizard/application-assessment-wizard.tsx b/...ion-assessment/components/application-assessment-wizard/application-assessment-wizard.tsx
@@ -20,10 +20,7 @@ import { getAxiosErrorMessage } from "@app/utils/utils";
 import { WizardStepNavDescription } from "../wizard-step-nav-description";
 import { QuestionnaireForm } from "../questionnaire-form";
 import { ConfirmDialog } from "@app/components/ConfirmDialog";
-import {
-  useFetchQuestionnaireById,
-  useFetchQuestionnaires,
-} from "@app/queries/questionnaires";
+import { useFetchQuestionnaires } from "@app/queries/questionnaires";
 import {
   COMMENTS_KEY,
   QUESTIONS_KEY,
@@ -70,7 +67,7 @@ export const ApplicationAssessmentWizard: React.FC<
   const [currentStep, setCurrentStep] = useState(0);
 
   const [isConfirmDialogOpen, setIsConfirmDialogOpen] =
-    React.useState<Boolean>(false);
+    React.useState<boolean>(false);
 
   const history = useHistory();
 
@@ -80,7 +77,7 @@ export const ApplicationAssessmentWizard: React.FC<
     return (matchingQuestionnaire ? matchingQuestionnaire.sections : []).sort(
       (a, b) => a.order - b.order
     );
-  }, [assessment]);
+  }, [matchingQuestionnaire]);
 
   // const initialComments = useMemo(() => {
   //   let comments: { [key: string]: string } = {};
@@ -188,7 +185,7 @@ export const ApplicationAssessmentWizard: React.FC<
     console.error("form errors", errors);
 
   const onSubmit = (formValues: ApplicationAssessmentWizardValues) => {
-    if (!assessment) {
+    if (!assessment?.application?.id) {
       console.log("An assessment must exist in order to save the form");
       return;
     }
@@ -235,8 +232,8 @@ export const ApplicationAssessmentWizard: React.FC<
             history.push(Paths.applications);
             break;
           case SAVE_ACTION_VALUE.SAVE_AND_REVIEW:
-            assessment &&
-              getApplicationById(assessment?.application?.id || 0)
+            assessment?.application?.id &&
+              getApplicationById(assessment.application.id)
                 .then((data) => {
                   history.push(
                     formatPath(Paths.applicationsReview, {

diff --git a/client/src/app/pages/applications/assessment-actions/components/assessment-actions-table.tsx b/client/src/app/pages/applications/assessment-actions/components/assessment-actions-table.tsx
@@ -101,7 +101,7 @@ const AssessmentActionsTable: React.FC<AssessmentActionsTableProps> = ({
           numRenderedColumns={numRenderedColumns}
           noDataEmptyState={
             <div>
-              <NoDataEmptyState title="No Questionnaires are currently available. " />
+              <NoDataEmptyState title="No Questionnaires are currently available to be taken. " />
             </div>
           }
         >

diff --git a/...s/applications/components/application-assessment-status/application-assessment-status.tsx b/...s/applications/components/application-assessment-status/application-assessment-status.tsx
@@ -34,6 +34,7 @@ export const ApplicationAssessmentStatus: React.FC<
   ApplicationAssessmentStatusProps
 > = ({ assessments, isLoading, fetchError }) => {
   const { t } = useTranslation();
+  //TODO: remove this once we have a proper assessment status
   const { assessment } = useFetchAssessmentByID(assessments?.[0]?.id || 0);
 
   if (fetchError) {

diff --git a/client/src/app/pages/assessment-management/questionnaire/questionnaire-page.tsx b/client/src/app/pages/assessment-management/questionnaire/questionnaire-page.tsx
@@ -43,15 +43,6 @@ const Questionnaire: React.FC = () => {
 
   const [assessmentData, setAssessmentData] = useState<Assessment | null>(null);
 
-  // useEffect(() => {
-  //   fetch("/questionnaire-data.yaml") // adjust this path
-  //     .then((response) => response.text())
-  //     .then((data) => {
-  //       const parsedData = yaml.load(data) as Assessment;
-  //       setAssessmentData(parsedData);
-  //     });
-  // }, []);
-  // // ------------------------!!
   const { questionnaires, isFetching, fetchError } = useFetchQuestionnaires();
 
   const [searchValue, setSearchValue] = React.useState("");
@@ -62,8 +53,8 @@ const Questionnaire: React.FC = () => {
       sections: assessmentData?.sections.map((section) => ({
         ...section,
         questions: section.questions.filter(({ text, explanation }) =>
-          [text, explanation].some((text) =>
-            text?.toLowerCase().includes(searchValue.toLowerCase())
+          [text, explanation].some(
+            (text) => text?.toLowerCase().includes(searchValue.toLowerCase())
           )
         ),
       })),

diff --git a/client/src/app/queries/questionnaires.ts b/client/src/app/queries/questionnaires.ts
@@ -8,7 +8,6 @@ import {
   updateQuestionnaire,
 } from "@app/api/rest";
 import { Questionnaire } from "@app/api/models";
-import { c_options_menu__toggle_BackgroundColor } from "@patternfly/react-tokens";
 
 export const QuestionnairesTasksQueryKey = "questionnaires";
 export const QuestionnaireByIdQueryKey = "questionnaireById";
@@ -71,9 +70,6 @@ export const useFetchQuestionnaireById = (id: number | string) => {
     queryFn: () => getQuestionnaireById(id),
     onError: (error: AxiosError) => console.log("error, ", error),
   });
-  console.log("data, ", data);
-  console.log("isLoading, ", isLoading);
-  console.log("error, ", error);
   return {
     questionnaire: data,
     isFetching: isLoading,