add doctor feedback

app/doctor/_components/analysis-fallback.tsx

@@ -0,0 +1,27 @@
+'use server';
+
+import React from 'react';
+
+import { Spinner } from '@kit/ui/makerkit/spinner';
+import { Trans } from '@kit/ui/makerkit/trans';
+import { Progress } from '@kit/ui/shadcn/progress';
+
+import { withI18n } from '~/lib/i18n/with-i18n';
+
+const AnalysisFallback = ({
+  progress,
+  progressTextKey,
+}: {
+  progress: number;
+  progressTextKey: string;
+}) => {
+  return (
+    <div className="flex flex-col items-center justify-center gap-4 py-10">
+      <Trans i18nKey={progressTextKey} />
+      <Spinner />
+      <Progress value={progress} />
+    </div>
+  );
+};
+
+export default withI18n(AnalysisFallback);

app/doctor/_components/analysis-feedback.tsx

@@ -16,6 +16,7 @@ import { zodResolver } from '@hookform/resolvers/zod';
 import { useQueryClient } from '@tanstack/react-query';
 import { useForm } from 'react-hook-form';
 
+import { Spinner } from '@kit/ui/makerkit/spinner';
 import { Trans } from '@kit/ui/makerkit/trans';
 import { Button } from '@kit/ui/shadcn/button';
 import {
@@ -32,12 +33,21 @@ const AnalysisFeedback = ({
   feedback,
   patient,
   order,
+  aiDoctorFeedback,
+  timestamp,
+  recommendations,
+  isRecommendationsEdited,
 }: {
   feedback?: DoctorFeedback;
   patient: Patient;
   order: Order;
+  aiDoctorFeedback?: string;
+  timestamp?: string;
+  recommendations: string[];
+  isRecommendationsEdited: boolean;
 }) => {
   const [isDraftSubmitting, setIsDraftSubmitting] = useState(false);
+  const [isSubmittingFeedback, setIsSubmittingFeedback] = useState(false);
   const [isConfirmOpen, setIsConfirmOpen] = useState(false);
   const { data: user } = useUser();
   const queryClient = useQueryClient();
@@ -46,7 +56,7 @@ const AnalysisFeedback = ({
     resolver: zodResolver(doctorAnalysisFeedbackFormSchema),
     reValidateMode: 'onChange',
     defaultValues: {
-      feedbackValue: feedback?.value ?? '',
+      feedbackValue: feedback?.value ?? aiDoctorFeedback ?? '',
       userId: patient.userId,
     },
   });
@@ -71,23 +81,30 @@ const AnalysisFeedback = ({
     data: DoctorAnalysisFeedbackForm,
     status: 'DRAFT' | 'COMPLETED',
   ) => {
+    setIsConfirmOpen(false);
+    setIsSubmittingFeedback(true);
+
     const result = await giveFeedbackAction({
       ...data,
       analysisOrderId: order.analysisOrderId,
       status,
+      patientId: patient.userId,
+      timestamp,
+      recommendations,
+      isRecommendationsEdited,
     });
 
     if (!result.success) {
       return toast.error(<Trans i18nKey="common:genericServerError" />);
     }
 
+    setIsSubmittingFeedback(false);
+
     queryClient.invalidateQueries({
       predicate: (query) => query.queryKey.includes('doctor-jobs'),
     });
 
-    toast.success(<Trans i18nKey={'doctor:updateFeedbackSuccess'} />);
-
-    return setIsConfirmOpen(false);
+    return toast.success(<Trans i18nKey={'doctor:updateFeedbackSuccess'} />);
   };
 
   const confirmComplete = form.handleSubmit(async (data) => {
@@ -96,10 +113,6 @@ const AnalysisFeedback = ({
 
   return (
     <>
-      <h3>
-        <Trans i18nKey="doctor:feedback" />
-      </h3>
-      <p>{feedback?.value ?? '-'}</p>
       {!isReadOnly && (
         <Form {...form}>
           <form className="space-y-4 lg:w-1/2">
@@ -109,7 +122,11 @@ const AnalysisFeedback = ({
               render={({ field }) => (
                 <FormItem>
                   <FormControl>
-                    <Textarea {...field} disabled={isReadOnly} />
+                    <Textarea
+                      className="min-h-[200px]"
+                      {...field}
+                      disabled={isDraftSubmitting || isSubmittingFeedback}
+                    />
                   </FormControl>
                   <FormMessage />
                 </FormItem>
@@ -136,7 +153,11 @@ const AnalysisFeedback = ({
                 }
                 className="xs:w-1/4 w-full"
               >
-                <Trans i18nKey="common:save" />
+                {isDraftSubmitting || form.formState.isSubmitting ? (
+                  <Spinner />
+                ) : (
+                  <Trans i18nKey="common:save" />
+                )}
               </Button>
             </div>
           </form>

app/doctor/_components/analysis-view.tsx

@@ -1,5 +1,7 @@
 'use client';
 
+import { useMemo, useState } from 'react';
+
 import { useQueryClient } from '@tanstack/react-query';
 import { capitalize } from 'lodash';
 
@@ -23,20 +25,40 @@ import { bmiFromMetric } from '~/lib/utils';
 import AnalysisFeedback from './analysis-feedback';
 import DoctorAnalysisWrapper from './doctor-analysis-wrapper';
 import DoctorJobSelect from './doctor-job-select';
+import DoctorRecommendedAnalyses from './doctor-recommended-analyses';
 
 export default function AnalysisView({
   patient,
   order,
   analyses,
   feedback,
+  aiDoctorFeedback,
+  recommendations,
+  availableAnalyses,
+  timestamp,
 }: {
   patient: Patient;
   order: Order;
   analyses: AnalysisResponse[];
   feedback?: DoctorFeedback;
+  aiDoctorFeedback?: string;
+  recommendations?: string[];
+  availableAnalyses?: string[];
+  timestamp?: string;
 }) {
   const { data: user } = useUser();
   const queryClient = useQueryClient();
+  const [recommendedAnalyses, setRecommendedAnalyses] = useState<string[]>(
+    recommendations ?? [],
+  );
+  const isRecommendationsEdited = useMemo(() => {
+    if (recommendedAnalyses.length !== recommendations?.length) return true;
+    const sa = new Set(recommendedAnalyses),
+      sb = new Set(recommendations);
+    if (sa.size !== sb.size) return true;
+    for (const v of sa) if (!sb.has(v)) return true;
+    return false;
+  }, [recommendations, recommendedAnalyses]);
 
   const languageNames = useCurrentLocaleLanguageNames();
 
@@ -154,7 +176,28 @@ export default function AnalysisView({
         })}
       </div>
       {order.isPackage && (
-        <AnalysisFeedback order={order} patient={patient} feedback={feedback} />
+        <>
+          <h3>
+            <Trans i18nKey="doctor:feedback" />
+          </h3>
+          <p>{feedback?.value ?? '-'}</p>
+          <div className="flex flex-col gap-4 lg:flex-row">
+            <AnalysisFeedback
+              order={order}
+              patient={patient}
+              feedback={feedback}
+              aiDoctorFeedback={aiDoctorFeedback}
+              timestamp={timestamp}
+              recommendations={recommendedAnalyses}
+              isRecommendationsEdited={isRecommendationsEdited}
+            />
+            <DoctorRecommendedAnalyses
+              recommendedAnalyses={recommendedAnalyses}
+              availableAnalyses={availableAnalyses}
+              setRecommendedAnalyses={setRecommendedAnalyses}
+            />
+          </div>
+        </>
       )}
     </>
   );

app/doctor/_components/doctor-recommended-analyses.tsx

@@ -0,0 +1,53 @@
+'use client';
+
+import React, { Dispatch, SetStateAction } from 'react';
+
+import { Trans } from '@kit/ui/makerkit/trans';
+import { Button } from '@kit/ui/shadcn/button';
+
+const DoctorRecommendedAnalyses = ({
+  recommendedAnalyses,
+  availableAnalyses,
+  setRecommendedAnalyses,
+}: {
+  recommendedAnalyses?: string[];
+  availableAnalyses?: string[];
+  setRecommendedAnalyses: Dispatch<SetStateAction<string[]>>;
+}) => {
+  if (availableAnalyses?.length === 0) {
+    return null;
+  }
+
+  return (
+    <div>
+      <h5>
+        <Trans i18nKey="doctor:recommendedAnalyses" />
+      </h5>
+      <div className="mt-4 flex gap-2">
+        {availableAnalyses?.map((analysis, index) => {
+          return (
+            <Button
+              size="sm"
+              key={`${index}-analysis-feedback-list`}
+              variant={
+                recommendedAnalyses?.includes(analysis) ? 'default' : 'outline'
+              }
+              type="button"
+              onClick={() =>
+                setRecommendedAnalyses((prev: string[]) =>
+                  prev.includes(analysis)
+                    ? prev.filter((x) => x !== analysis)
+                    : [...prev, analysis],
+                )
+              }
+            >
+              {analysis}
+            </Button>
+          );
+        })}
+      </div>
+    </div>
+  );
+};
+
+export default DoctorRecommendedAnalyses;

app/doctor/_components/new-analysis-recommendations-loader.tsx

@@ -0,0 +1,90 @@
+'use server';
+
+import React from 'react';
+
+import { AnalysisResponses } from '@/app/home/(user)/_components/ai/types';
+import { OrderAnalysisCard } from '@/app/home/(user)/_components/order-analyses-cards';
+import { loadLifeStyle } from '@/app/home/(user)/_lib/server/load-life-style';
+import { loadRecommendations } from '@/app/home/(user)/_lib/server/load-recommendations';
+import { AccountWithParams } from '@/packages/features/accounts/src/types/accounts';
+import { AnalysisResultDetails } from '@/packages/features/doctor/src/lib/server/schema/doctor-analysis-detail-view.schema';
+
+import { withI18n } from '~/lib/i18n/with-i18n';
+
+import {
+  loadDoctorFeedback,
+  prepareFeedback,
+} from '../_lib/server/load-doctor-feedback';
+import AnalysisView from './analysis-view';
+
+async function NewAnalysisRecommendationsLoader({
+  analysisResultDetails,
+  account,
+  analysisResponses,
+  currentAIResponseTimestamp,
+  analyses,
+  patient,
+}: {
+  currentAIResponseTimestamp: string;
+  account: AccountWithParams | null;
+  analysisResponses: AnalysisResponses;
+  analysisResultDetails: AnalysisResultDetails;
+  analyses: OrderAnalysisCard[];
+  patient: AccountWithParams | null;
+}) {
+  if (!analysisResultDetails.order.isPackage) {
+    return (
+      <AnalysisView
+        patient={analysisResultDetails.patient}
+        order={analysisResultDetails.order}
+        analyses={analysisResultDetails.analysisResponse}
+        feedback={analysisResultDetails.doctorFeedback}
+      />
+    );
+  }
+
+  const [lifeStyle, recommendations, aiFeedback] = await Promise.all([
+    loadLifeStyle({
+      account: patient,
+      analysisResponses,
+      isDoctorView: true,
+      aiResponseTimestamp: currentAIResponseTimestamp,
+    }),
+    loadRecommendations({
+      account: patient,
+      analysisResponses,
+      aiResponseTimestamp: currentAIResponseTimestamp,
+      isDoctorView: true,
+      analyses,
+    }),
+    loadDoctorFeedback(
+      analysisResultDetails.patient,
+      analysisResultDetails.analysisResponse,
+      currentAIResponseTimestamp,
+    ),
+  ]);
+
+  const feedback = prepareFeedback({
+    aiResponse: aiFeedback,
+    recommendations,
+    lifeStyleSummary: lifeStyle.response.summary,
+    patientName: analysisResultDetails.patient.firstName,
+    doctorName: `${account?.name} ${account?.last_name}`,
+    aiResponseTimestamp: currentAIResponseTimestamp,
+  });
+
+  return (
+    <AnalysisView
+      patient={analysisResultDetails.patient}
+      order={analysisResultDetails.order}
+      analyses={analysisResultDetails.analysisResponse}
+      feedback={analysisResultDetails.doctorFeedback}
+      aiDoctorFeedback={feedback}
+      availableAnalyses={analyses.map((analysis) => analysis.title)}
+      recommendations={recommendations}
+      timestamp={currentAIResponseTimestamp}
+    />
+  );
+}
+
+export default withI18n(NewAnalysisRecommendationsLoader);

app/doctor/_components/prepare-ai-parameters.tsx

@@ -0,0 +1,55 @@
+'use server';
+
+import React, { Suspense } from 'react';
+
+import { loadAnalyses } from '@/app/home/(user)/_lib/server/load-analyses';
+import {
+  loadCurrentUserAccount,
+  loadUserAccount,
+} from '@/app/home/(user)/_lib/server/load-user-account';
+import { AnalysisResultDetails } from '@/packages/features/doctor/src/lib/server/schema/doctor-analysis-detail-view.schema';
+import { createUserAnalysesApi } from '@/packages/features/user-analyses/src/server/api';
+import { getSupabaseServerClient } from '@/packages/supabase/src/clients/server-client';
+
+import { withI18n } from '~/lib/i18n/with-i18n';
+import { getLatestResponseTime } from '~/lib/utils';
+
+import AnalysisFallback from './analysis-fallback';
+import NewAnalysisRecommendationsLoader from './new-analysis-recommendations-loader';
+
+async function PrepareAIParameters({
+  analysisResultDetails,
+}: {
+  analysisResultDetails: AnalysisResultDetails;
+}) {
+  const { analyses } = await loadAnalyses();
+  const { account: doctorAccount } = await loadCurrentUserAccount();
+  const patientAccount = await loadUserAccount(
+    analysisResultDetails.patient.userId,
+  );
+  const client = getSupabaseServerClient();
+  const userAnalysesApi = createUserAnalysesApi(client);
+  const analysisResponses = await userAnalysesApi.getAllUserAnalysisResponses(
+    patientAccount.id,
+  );
+  const currentAIResponseTimestamp = getLatestResponseTime(analysisResponses);
+
+  return (
+    <Suspense
+      fallback={
+        <AnalysisFallback progress={66} progressTextKey="doctor:loadFeedback" />
+      }
+    >
+      <NewAnalysisRecommendationsLoader
+        account={doctorAccount}
+        currentAIResponseTimestamp={currentAIResponseTimestamp}
+        analysisResponses={analysisResponses}
+        analysisResultDetails={analysisResultDetails}
+        analyses={analyses}
+        patient={patientAccount}
+      />
+    </Suspense>
+  );
+}
+
+export default withI18n(PrepareAIParameters);