Made a couple tweaks in support of data cell edits.

JSv4 · Nov 6, 2024 · fb0b347 · fb0b347
1 parent 6807aa8
commit fb0b347
Show file tree

Hide file tree

Showing 2 changed files with 60 additions and 4 deletions.
diff --git a/config/graphql/graphene_types.py b/config/graphql/graphene_types.py
@@ -456,6 +456,7 @@ def resolve_full_column_list(self, info):
 
 class DatacellType(AnnotatePermissionsForReadMixin, DjangoObjectType):
     data = GenericScalar()
+    corrected_data = GenericScalar()
     full_source_list = graphene.List(AnnotationType)
 
     def resolve_full_source_list(self, info):

diff --git a/frontend/src/components/extracts/datagrid/ExtractCellFormatter.tsx b/frontend/src/components/extracts/datagrid/ExtractCellFormatter.tsx
@@ -136,6 +136,12 @@ interface ExtractCellFormatterProps {
   column: any;
 }
 
+/**
+ * ExtractCellFormatter component displays the content of a cell in the extract data grid.
+ * It handles displaying the value, editing, approving, and rejecting the cell.
+ * If the cell has correctedData, it displays that instead of the original data.
+ * It also provides a control to view the original value when correctedData is present.
+ */
 export const ExtractCellFormatter: React.FC<ExtractCellFormatterProps> = ({
   value,
   cellStatus,
@@ -162,6 +168,7 @@ export const ExtractCellFormatter: React.FC<ExtractCellFormatterProps> = ({
   const [isPopupOpen, setIsPopupOpen] = useState(false);
   const [isEditing, setIsEditing] = useState(false);
   const [isModalOpen, setIsModalOpen] = useState(false);
+  const [isOriginalModalOpen, setIsOriginalModalOpen] = useState(false); // New state for original value modal
 
   const getCellBackground = () => {
     if (!cellStatus) return "transparent";
@@ -178,6 +185,14 @@ export const ExtractCellFormatter: React.FC<ExtractCellFormatterProps> = ({
     setIsModalOpen(false);
   };
 
+  const openOriginalViewer = () => {
+    setIsOriginalModalOpen(true);
+  };
+
+  const closeOriginalModal = () => {
+    setIsOriginalModalOpen(false);
+  };
+
   const handleJsonEdit = (edit: any) => {
     const updatedValue = edit.updated_src;
     onEdit(cellId, updatedValue);
@@ -190,8 +205,11 @@ export const ExtractCellFormatter: React.FC<ExtractCellFormatterProps> = ({
     return "rgba(128, 128, 128, 1)";
   };
 
+  const displayedValue =
+    cellStatus?.correctedData != null ? cellStatus.correctedData : value;
+
   const displayValue = () => {
-    if (typeof value === "object" && value !== null) {
+    if (typeof displayedValue === "object" && displayedValue !== null) {
       return (
         <div
           onClick={openViewer}
@@ -206,7 +224,7 @@ export const ExtractCellFormatter: React.FC<ExtractCellFormatterProps> = ({
         </div>
       );
     } else {
-      return <div className="cell-value">{String(value)}</div>;
+      return <div className="cell-value">{String(displayedValue)}</div>;
     }
   };
 
@@ -245,7 +263,10 @@ export const ExtractCellFormatter: React.FC<ExtractCellFormatterProps> = ({
                     color="grey"
                     size="tiny"
                     onClick={() => {
-                      if (typeof value === "object" && value !== null) {
+                      if (
+                        typeof displayedValue === "object" &&
+                        displayedValue !== null
+                      ) {
                         openViewer();
                       } else {
                         setIsEditing(true);
@@ -255,6 +276,17 @@ export const ExtractCellFormatter: React.FC<ExtractCellFormatterProps> = ({
                     disabled={readOnly || !isExtractComplete}
                     title="Edit"
                   />
+                  <Button
+                    icon="eye"
+                    color="blue"
+                    size="tiny"
+                    onClick={() => {
+                      openOriginalViewer();
+                      setIsPopupOpen(false);
+                    }}
+                    disabled={!cellStatus?.correctedData}
+                    title="View Original"
+                  />
                   <Button
                     icon="close"
                     color="red"
@@ -303,7 +335,7 @@ export const ExtractCellFormatter: React.FC<ExtractCellFormatterProps> = ({
             <Modal.Header>Edit JSON Data</Modal.Header>
             <Modal.Content>
               <ReactJson
-                src={value}
+                src={displayedValue}
                 onEdit={handleJsonEdit}
                 onAdd={handleJsonEdit}
                 onDelete={handleJsonEdit}
@@ -317,6 +349,29 @@ export const ExtractCellFormatter: React.FC<ExtractCellFormatterProps> = ({
               <Button onClick={closeModal}>Close</Button>
             </Modal.Actions>
           </Modal>
+          <Modal
+            open={isOriginalModalOpen}
+            onClose={closeOriginalModal}
+            size="large"
+          >
+            <Modal.Header>Original Value</Modal.Header>
+            <Modal.Content>
+              {typeof value === "object" && value !== null ? (
+                <ReactJson
+                  src={value}
+                  theme="rjv-default"
+                  style={{ padding: "20px" }}
+                  enableClipboard={false}
+                  displayDataTypes={false}
+                />
+              ) : (
+                <div style={{ padding: "20px" }}>{String(value)}</div>
+              )}
+            </Modal.Content>
+            <Modal.Actions>
+              <Button onClick={closeOriginalModal}>Close</Button>
+            </Modal.Actions>
+          </Modal>
         </>
       )}
     </CellContainer>