improvement: users can now comment on a case and it's details and have an option to make it visible for clinics too.

frontend/src/components/ui/treatment/TreatmentWorkspace.tsx

@@ -51,7 +51,6 @@ function labCaseDraftsToPast(
     id: lc.id ?? lc.clientId,
     clientId: lc.clientId,
     destinationOrganizationId: lc.destinationOrganizationId,
-    labComment: lc.labComment || null,
     sentAt: lc.sentAt ?? null,
     treatmentDetailIds: lc.detailClientIds
       .map((cid) => details.find((d) => d.clientId === cid)?.id)
@@ -132,7 +131,6 @@ function newLabCaseDraft(): LabCaseDraft {
         ? crypto.randomUUID()
         : `lab-${Date.now()}-${Math.random().toString(36).slice(2, 9)}`,
     destinationOrganizationId: null,
-    labComment: '',
     detailClientIds: [],
     toothProsthesis: [],
     sentAt: null,
@@ -175,7 +173,6 @@ function mapLabCaseDraftFromApi(lc: PastLabCase): LabCaseDraft {
     clientId: lc.clientId,
     id: lc.id,
     destinationOrganizationId: lc.destinationOrganizationId,
-    labComment: lc.labComment ?? '',
     detailClientIds: lc.details.map((d) => d.clientId),
     toothProsthesis: (lc.toothProsthesis ?? []).map((tp) => ({
       detailClientId:
@@ -391,6 +388,12 @@ export function TreatmentWorkspace({ userId, currentOrganization }: TreatmentWor
 
   const selectedTeethSet = useMemo(() => new Set(activeDetail?.teeth ?? []), [activeDetail?.teeth]);
 
+  // Sync active lab shipment when the selected treatment detail changes.
+  useEffect(() => {
+    const match = labCaseDrafts.find((lc) => lc.detailClientIds.includes(activeDetailId));
+    setActiveLabCaseId(match?.clientId ?? null);
+  }, [activeDetailId, labCaseDrafts]);
+
   useEffect(() => {
     setSelectionLocked(false);
   }, [selectedDay]);
@@ -788,18 +791,18 @@ export function TreatmentWorkspace({ userId, currentOrganization }: TreatmentWor
   );
 
   const persistLabCases = useCallback(
-    async (savedTreatment: PastTreatment) => {
+    async (savedTreatment: PastTreatment, draftsOverride?: LabCaseDraft[]) => {
       if (!selectedAppointment) throw new Error('No appointment selected');
 
+      const drafts = draftsOverride ?? labCaseDrafts;
       const detailIdByClientId = new Map(
         savedTreatment.details.map((d) => [d.clientId, d.id]),
       );
 
-      const payload = labCaseDrafts.map((lc) => ({
+      const payload = drafts.map((lc) => ({
         clientId: lc.clientId,
         id: lc.id,
         destinationOrganizationId: lc.destinationOrganizationId ?? undefined,
-        labComment: lc.labComment.trim() || undefined,
         treatmentDetailIds: lc.detailClientIds
           .map((clientId) => detailIdByClientId.get(clientId))
           .filter((id): id is string => Boolean(id)),
@@ -834,6 +837,40 @@ export function TreatmentWorkspace({ userId, currentOrganization }: TreatmentWor
     [labCaseDrafts, selectedAppointment],
   );
 
+  const handleAddLabCase = useCallback(async () => {
+    if (!canEditTreatmentForDay || !selectedAppointment) return;
+
+    const activeDetail = details.find((d) => d.clientId === activeDetailId);
+    const next: LabCaseDraft = {
+      ...newLabCaseDraft(),
+      detailClientIds:
+        activeDetail && labDependentCodes.has(activeDetail.treatmentType)
+          ? [activeDetailId]
+          : [],
+    };
+    const updatedLabCases = [...labCaseDrafts, next];
+    setLabCaseDrafts(updatedLabCases);
+    setActiveLabCaseId(next.clientId);
+
+    try {
+      const saved = await persistDraft({ force: true });
+      await persistLabCases(saved, updatedLabCases);
+    } catch (error: unknown) {
+      showError(formatApiErrorMessage(error, t('errorSaveLabShipments')));
+    }
+  }, [
+    activeDetailId,
+    canEditTreatmentForDay,
+    details,
+    labCaseDrafts,
+    labDependentCodes,
+    persistDraft,
+    persistLabCases,
+    selectedAppointment,
+    showError,
+    t,
+  ]);
+
   const handleSendLabCase = useCallback(
     async (labCase: LabCaseDraft) => {
       if (!canEditTreatmentForDay || !selectedAppointment) return;
@@ -1041,6 +1078,7 @@ export function TreatmentWorkspace({ userId, currentOrganization }: TreatmentWor
 
           <LabCasesDispatchPanel
             details={details}
+            activeDetailId={activeDetailId}
             labCases={labCaseDrafts}
             labDependentCodes={labDependentCodes}
             treatmentCatalog={treatmentCatalog}
@@ -1064,12 +1102,9 @@ export function TreatmentWorkspace({ userId, currentOrganization }: TreatmentWor
               );
             }}
             sendBusyId={sendBusyId}
-            onAddLabCase={() => {
-              const next = newLabCaseDraft();
-              setLabCaseDrafts((prev) => [...prev, next]);
-              setActiveLabCaseId(next.clientId);
-            }}
+            onAddLabCase={() => void handleAddLabCase()}
             onSendLabCase={(lc) => void handleSendLabCase(lc)}
+            onCommentError={showError}
           />
         </div>
       </div>