Revert "Refactor JSONEditor and UploadFilesModal components for improved type safety and UI consistency"

This reverts commit f22859e.

Author: Pavan-Microsoft

src/ContentProcessorWeb/package.json

@@ -6,9 +6,12 @@
   "dependencies": {
     "@azure/msal-browser": "^5.6.2",
     "@azure/msal-react": "^5.2.0",
+    "@fluentui/react-button": "^9.8.0",
     "@fluentui/react-components": "^9.73.6",
+    "@fluentui/react-dialog": "^9.16.6",
     "@fluentui/react-icons": "^2.0.245",
     "@reduxjs/toolkit": "^2.11.2",
+    "axios": "^1.14.0",
     "babel-preset-react-app": "^10.1.0",
     "contentprocessor_web": "file:",
     "cra-template-typescript": "1.3.0",
@@ -58,14 +61,12 @@
     "@testing-library/react": "^16.3.2",
     "@testing-library/user-event": "^14.6.1",
     "@types/jest": "^30.0.0",
-    "@types/node": "^22.15.0",
     "@types/react": "^19.2.14",
     "@types/react-dom": "^19.2.3",
     "@types/react-router-dom": "^5.3.3",
     "@types/react-virtualized": "^9.22.3",
     "@types/react-window": "^2.0.0",
     "customize-cra": "^1.0.0",
-    "eslint": "^8.57.0",
     "gh-pages": "^6.3.0",
     "globals": "^17.4.0",
     "husky": "^9.1.7",
@@ -74,7 +75,7 @@
     "react-tiff": "^0.0.16",
     "sass": "^1.98.0",
     "sass-loader": "^16.0.7",
-    "typescript": "^5.8.3",
+    "typescript": "^6.0.2",
     "typescript-eslint": "^8.58.0"
   },
   "compilerOptions": {
@@ -101,9 +102,10 @@
       "postcss": "^8.5.6",
       "nth-check": "^2.1.1",
       "string_decoder": "^1.3.0",
-      "typescript": "^5.8.3",
+      "typescript": "^4.9.5",
       "node-forge": "^1.4.0",
       "@tootallnate/once": "^3.0.1",
+      "axios": "^1.15.0",
       "brace-expansion": "^2.0.3",
       "flatted": "^3.4.2",
       "immutable": "^5.1.5",

src/ContentProcessorWeb/pnpm-lock.yaml

@@ -47,7 +47,7 @@ const JSONEditor: React.FC<JSONEditorProps> = () => {
       if (Object.keys(store.contentData).length > 0) {
         const formattedJson = store.contentData.result;
         const data = {
-          ...(formattedJson as Record<string, unknown>)
+          ...formattedJson
         }
         setJsonData(data);
       } else {
@@ -116,7 +116,7 @@ const JSONEditor: React.FC<JSONEditorProps> = () => {
                   }
                 }]}
                 onUpdate={({ newData }) => {
-                  onUpdateHandle(newData as Record<string, unknown>)
+                  onUpdateHandle(newData)
                 }}
                 restrictDelete={true}
                 showIconTooltips={true}

src/ContentProcessorWeb/src/Components/JSONEditor/JSONEditor.tsx

@@ -11,11 +11,12 @@ import React, { useState, useRef, useEffect } from "react";
 import {
   Dialog,
   DialogSurface,
-  DialogBody,
   DialogTitle,
   DialogContent,
   DialogActions,
-  Button,
+} from "@fluentui/react-dialog";
+import { Button } from "@fluentui/react-button";
+import {
   ProgressBar,
   makeStyles,
   Combobox,
@@ -342,9 +343,8 @@ const UploadFilesModal: React.FC<UploadFilesModalProps> = ({ open, onClose }) =>
     onClose();
   };
   return (
-    <Dialog open={open} modalType="modal" >
+    <Dialog open={open} modalType="alert" >
       <DialogSurface className={styles.dialogSurface}>
-        <DialogBody style={{ display: "flex", flexDirection: "column", overflow: "hidden", flex: 1 }}>
         <DialogTitle>Import Content</DialogTitle>
         <DialogContent className={styles.dialogContent}>
           <div className="dialogBody">
@@ -439,7 +439,6 @@ const UploadFilesModal: React.FC<UploadFilesModalProps> = ({ open, onClose }) =>
             {uploading ? "Importing..." : "Import"}
           </Button>
         </DialogActions>
-        </DialogBody>
       </DialogSurface>
     </Dialog>
   );

src/ContentProcessorWeb/src/Components/UploadContent/UploadFilesModal.tsx

@@ -167,8 +167,8 @@ const CellRenderer: React.FC<CellRendererProps> = ({ type, props }) => {
           <MenuItem
             icon={<DeleteIcon />}
             onClick={() => {
-              setSelectedDeleteItem?.(item);
-              toggleDialog?.();
+              setSelectedDeleteItem(item);
+              toggleDialog();
             }}
             style={{ maxWidth: 'auto', minWidth: 'auto' }}
           >
@@ -190,11 +190,11 @@ const CellRenderer: React.FC<CellRendererProps> = ({ type, props }) => {
     case 'schemaScore':
       return calculateSchemaScore(valueText || '', lastModifiedBy || '', status || '');
     case 'text':
-      return renderText(text ?? '', 'center');
+      return renderText(text, 'center');
     case 'date':
-      return renderText(text ?? '', 'date');
+      return renderText(text, 'date');
     case 'deleteButton':
-      return item ? renderDeleteButton(item, deleteBtnStatus || { disabled: false, message: '' }) : <div>Invalid Type</div>;
+      return renderDeleteButton(item, deleteBtnStatus || {});
     default:
       return <div>Invalid Type</div>;
   }

src/ContentProcessorWeb/src/Pages/DefaultPage/Components/ProcessQueueGrid/CustomCellRender.tsx

@@ -88,7 +88,7 @@ const ProcessQueueGrid: React.FC<GridComponentProps> = () => {
     useEffect(() => {
         if (!store.gridLoader) {
             if (store.gridData.items && store.gridData.items.length > 0) {
-                const claimRows: ClaimRowData[] = (store.gridData.items as unknown as ClaimItem[]).map((item: ClaimItem) => ({
+                const claimRows: ClaimRowData[] = store.gridData.items.map((item: ClaimItem) => ({
                     claim: item,
                     isExpanded: false,
                     isSelected: false,
@@ -113,7 +113,7 @@ const ProcessQueueGrid: React.FC<GridComponentProps> = () => {
                     setSelectedDocumentId(null);
                     dispatch(
                         setSelectedClaim({
-                            claim: firstClaim as unknown as Record<string, unknown>,
+                            claim: firstClaim,
                         })
                     );
                 }
@@ -149,7 +149,7 @@ const ProcessQueueGrid: React.FC<GridComponentProps> = () => {
         // Dispatch the claim selection
         dispatch(
             setSelectedClaim({
-                claim: claim as unknown as Record<string, unknown>,
+                claim: claim,
             })
         );
     };
@@ -160,7 +160,7 @@ const ProcessQueueGrid: React.FC<GridComponentProps> = () => {
         dispatch(
             setSelectedGridRow({
                 processId: document.process_id,
-                item: document as unknown as Record<string, unknown>,
+                item: document,
             })
         );
     };

src/ContentProcessorWeb/src/Pages/DefaultPage/Components/ProcessQueueGrid/ProcessQueueGrid.tsx

@@ -6,8 +6,8 @@
  * data structures (claims, documents, grid rows).
  */
 
-import type { JSX } from "react";
 import { TableRowData as RowStateBase } from "@fluentui/react-components";
+import { ListChildComponentProps } from "react-window";
 
 /** A single processed document within a claim batch. */
 export interface ProcessedDocument {
@@ -95,5 +95,11 @@ export interface TableRowData extends RowStateBase<Item> {
     appearance: "brand" | "none";
 }
 
+export interface ReactWindowRenderFnProps extends ListChildComponentProps {
+    data: TableRowData[];
+    style: React.CSSProperties;
+    index: number;
+}
+
 /** Props for the {@link ProcessQueueGrid} component. */
 export type GridComponentProps = Record<string, never>;

src/ContentProcessorWeb/src/Pages/DefaultPage/Components/ProcessQueueGrid/ProcessQueueGridTypes.ts

@@ -92,18 +92,15 @@ const ProcessSteps: React.FC = () => {
 
   return (
     <Accordion collapsible>
-      {!status.includes(store.selectedItem.status as string) && store.processStepsData?.map((step, index) => {
-        const stepName = step.step_name as string;
-        const processedTime = step.processed_time as string;
-        return (
-        <AccordionItem key={index} value={stepName}>
+      {!status.includes(store.selectedItem.status) && store.processStepsData?.map((step, index) => (
+        <AccordionItem key={index} value={step.step_name}>
           <AccordionHeader onClick={() => handleExpand(index)}> {loadingStates[index] && <Spinner size="tiny" style={{ position: 'absolute', left: '10px' }} label="" />}
-            <span style={{ fontWeight: 'bold', textTransform: 'capitalize'}}>{stepName}</span>
+            <span style={{ fontWeight: 'bold', textTransform: 'capitalize'}}>{step.step_name}</span>
             <span style={{ color: 'green', marginLeft: 'auto', display: 'flex', alignItems: 'center' }}>
-              {renderProcessTimeInSeconds(processedTime)} <CheckmarkCircleFilled style={{ marginLeft: '4px' }} />
+              {renderProcessTimeInSeconds(step.processed_time)} <CheckmarkCircleFilled style={{ marginLeft: '4px' }} />
             </span>
           </AccordionHeader>
-          <div ref={(el) => { childRefs.current[index] = el; }}>
+          <div ref={(el) => (childRefs.current[index] = el)}>
             <AccordionPanel >
               <JsonEditor
                 key={`json-editor-${index}`}
@@ -112,7 +109,7 @@ const ProcessSteps: React.FC = () => {
                 restrictEdit={true}
                 restrictDelete={true}
                 restrictAdd={true}
-                rootName={stepName.toLowerCase()}
+                rootName={step.step_name.toLowerCase()}
                 collapseAnimationTime={300}
                 theme={[{
                   styles: {
@@ -129,8 +126,7 @@ const ProcessSteps: React.FC = () => {
             </AccordionPanel>
           </div>
         </AccordionItem>
-        );
-      })}
+      ))}
     </Accordion>
 
   );

src/ContentProcessorWeb/src/Pages/DefaultPage/Components/ProcessSteps/ProcessSteps.tsx

@@ -47,7 +47,7 @@ const ChevronDoubleLeft = bundleIcon(ChevronDoubleLeft20Regular, ChevronDoubleLe
 /** Props for the {@link PanelCenter} component. */
 interface PanelCenterProps {
   /** Callback to collapse/expand a named panel. */
-  readonly togglePanel: (panel: 'Left' | 'Right' | 'Center' | 'All') => void;
+  readonly togglePanel: (panel: string) => void;
 }
 
 const useStyles = makeStyles({
@@ -153,7 +153,7 @@ const PanelCenter: React.FC<PanelCenterProps> = ({ togglePanel }) => {
   );
 
   useEffect(() => {
-    dispatch(setActiveProcessId(store.processId ?? ''))
+    dispatch(setActiveProcessId(store.processId))
     setComment('');
     // Reset tab to appropriate default when selection changes
     if (store.selectionType === 'claim') {
@@ -183,7 +183,7 @@ const PanelCenter: React.FC<PanelCenterProps> = ({ togglePanel }) => {
       }
     }
     // Only fetch for document selection
-    if (store.selectionType === 'document' && (store.activeProcessId != null || store.activeProcessId !== '') && !status.includes(store.selectedItem.status as string) && store.selectedItem?.process_id === store.activeProcessId) {
+    if (store.selectionType === 'document' && (store.activeProcessId != null || store.activeProcessId !== '') && !status.includes(store.selectedItem.status) && store.selectedItem?.process_id === store.activeProcessId) {
       fetchContent();
     }
   }, [store.activeProcessId, store.selectedItem, store.selectionType, store.refreshTrigger])
@@ -192,14 +192,14 @@ const PanelCenter: React.FC<PanelCenterProps> = ({ togglePanel }) => {
   useEffect(() => {
     if (store.selectionType === 'claim' && store.selectedClaim?.id) {
       setClaimComment('');
-      dispatch(fetchClaimDetails({ claimId: store.selectedClaim.id as string }));
+      dispatch(fetchClaimDetails({ claimId: store.selectedClaim.id }));
     }
   }, [store.selectionType, store.selectedClaim?.id, dispatch, store.refreshTrigger])
 
   // Sync claim comment with API response
   useEffect(() => {
-    if ((store.claimDetails?.data as Record<string, unknown>)?.process_comment !== undefined) {
-      setClaimComment((store.claimDetails?.data as Record<string, unknown>)?.process_comment as string || '');
+    if (store.claimDetails?.data?.process_comment !== undefined) {
+      setClaimComment(store.claimDetails.data.process_comment || '');
     }
   }, [store.claimDetails])
 
@@ -232,7 +232,7 @@ const PanelCenter: React.FC<PanelCenterProps> = ({ togglePanel }) => {
           <div style={{ marginBottom: '16px' }}>
             <h4 style={{ margin: '0 0 8px 0', color: tokens.colorNeutralForeground1 }}>Summary</h4>
             <p style={{ margin: 0, color: tokens.colorNeutralForeground2, whiteSpace: 'pre-wrap' }}>
-              {(store.claimDetails.data as Record<string, unknown>)?.process_summary as string || 'No summary available'}
+              {store.claimDetails.data.process_summary || 'No summary available'}
             </p>
           </div>
         </div>
@@ -266,7 +266,7 @@ const PanelCenter: React.FC<PanelCenterProps> = ({ togglePanel }) => {
 
   const ExtractedResults = React.useCallback(() => (
     <div role="tabpanel" className={styles.tabItemCotnent} aria-labelledby="Extracted Results">
-      {store.activeProcessId && !status.includes(store.selectedItem.status as string) ? (
+      {store.activeProcessId && !status.includes(store.selectedItem.status) ? (
         <JSONEditor
           processId={store.activeProcessId}
         />
@@ -277,7 +277,7 @@ const PanelCenter: React.FC<PanelCenterProps> = ({ togglePanel }) => {
   const ProcessHistory = useCallback(() => (
     <div role="tabpanel" className={styles.processTabItemCotnent} aria-labelledby="Process Steps">
       {apiLoader ? <div className={styles.apiLoader}><p>Loading...</p></div>
-        : (store.processStepsData?.length === 0 || status.includes(store.selectedItem.status as string)) ? <p style={{ textAlign: 'center' }}> No data available</p>
+        : (store.processStepsData?.length === 0 || status.includes(store.selectedItem.status)) ? <p style={{ textAlign: 'center' }}> No data available</p>
           : <ProcessSteps />
       }
     </div>
@@ -291,7 +291,7 @@ const PanelCenter: React.FC<PanelCenterProps> = ({ togglePanel }) => {
     try {
       dispatch(startLoader("1"));
       dispatch(setUpdateComments(comment))
-      const result = await dispatch(saveContentJson({ 'processId': store.activeProcessId, 'contentJson': store.modified_result as unknown as string, 'comments': comment, 'savedComments': store.comments }))
+      const result = await dispatch(saveContentJson({ 'processId': store.activeProcessId, 'contentJson': store.modified_result, 'comments': comment, 'savedComments': store.comments }))
       if (result?.type === 'SaveContentJSON-Comments/fulfilled') {
         dispatch(setRefreshGrid(true));
       }
@@ -304,7 +304,7 @@ const PanelCenter: React.FC<PanelCenterProps> = ({ togglePanel }) => {
 
   const isButtonSaveDisabledCheck = () => {
     if(!store.activeProcessId) return true;
-    if (status.includes(store.selectedItem.status as string)) return true;
+    if (status.includes(store.selectedItem.status)) return true;
     if (Object.keys(store.modified_result).length > 0) return false;
     if (comment.trim() !== store.comments && comment.trim() !== '') return false;
     if (store.comments !== '' && comment.trim() === '') return false;
@@ -314,15 +314,15 @@ const PanelCenter: React.FC<PanelCenterProps> = ({ togglePanel }) => {
   const isClaimSaveDisabled = () => {
     if (!store.claimDetails) return true;
     if (store.claimCommentSaving) return true;
-    const savedComment = ((store.claimDetails?.data as Record<string, unknown>)?.process_comment as string) || '';
+    const savedComment = store.claimDetails?.data?.process_comment || '';
     // Enable save if comment has changed
     if (claimComment.trim() !== savedComment) return false;
     return true;
   }
 
   const handleClaimSave = async () => {
     if (store.selectedClaim?.id) {
-      await dispatch(saveClaimComment({ claimId: store.selectedClaim.id as string, comment: claimComment }));
+      await dispatch(saveClaimComment({ claimId: store.selectedClaim.id, comment: claimComment }));
     }
   }
 

src/ContentProcessorWeb/src/Pages/DefaultPage/PanelCenter.tsx

@@ -27,7 +27,7 @@ const ChevronDoubleLeft = bundleIcon(ChevronDoubleLeft20Regular, ChevronDoubleLe
 /** Props for the {@link PanelLeft} component. */
 interface PanelLeftProps {
   /** Callback to collapse/expand a named panel. */
-  readonly togglePanel: (panel: 'Left' | 'Right' | 'Center' | 'All') => void;
+  readonly togglePanel: (panel: string) => void;
 }
 
 /**