CARDS-2618: Replace Livetable with MaterialReactTable in administrati…

…on screens Addressed codereview comments: refactoring EditButton code
data-team-uhn · Jan 8, 2025 · f7efce5 · f7efce5
1 parent c1ac1b8
commit f7efce5
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 10 deletions.
diff --git a/modules/data-entry/src/main/frontend/src/dataHomepage/EditButton.jsx b/modules/data-entry/src/main/frontend/src/dataHomepage/EditButton.jsx
@@ -31,18 +31,24 @@ import QuestionnaireStyle from "../questionnaire/QuestionnaireStyle.jsx";
  * A component that renders an icon to open the edit URL for an entry or to use local edit dialog.
  */
 function EditButton(props) {
-  const { entryPath, entryType, size, className, admin, onClick, useEditDialog } = props;
+  const { entryPath, entryType, size, className, admin, onClick } = props;
 
-  let innerButton = <Tooltip title={entryType ? "Edit " + entryType : "Edit"}>
+  let innerButton =
         <IconButton className={className} size={size} onClick={onClick}>
           <EditIcon />
         </IconButton>
-      </Tooltip>
 
-  return useEditDialog ? innerButton : (
-    <Link to={(admin ? "/content.html/admin" : "/content.html") + entryPath + ".edit"} underline="hover">
-     {innerButton}
-    </Link>
+  return (
+	<Tooltip title={entryType ? "Edit " + entryType.toLowerCase() : "Edit"}>
+	  { onClick
+	    ?
+	    innerButton
+	    :
+        <Link to={(admin ? "/content.html/admin" : "/content.html") + entryPath + ".edit"} underline="hover">
+          {innerButton}
+        </Link>
+      }
+    </Tooltip>
   )
 }
 
@@ -52,7 +58,7 @@ EditButton.propTypes = {
   size: PropTypes.oneOf(["small", "medium", "large"]),
   className: PropTypes.string,
   admin: PropTypes.bool,
-  useEditDialog: PropTypes.bool,
+  onClick: PropTypes.func
 }
 
 EditButton.defaultProps = {

diff --git a/modules/data-entry/src/main/frontend/src/dataHomepage/SubjectTypes.jsx b/modules/data-entry/src/main/frontend/src/dataHomepage/SubjectTypes.jsx
@@ -100,7 +100,6 @@ function SubjectTypes(props) {
               <EditButton
                 entryType={entryType}
                 onClick={() => {setIsEdit(true); setCurrentSubjectType(row.original); setDialogOpen(true);}}
-                useEditDialog
               />
               <DeleteButton
                 entryPath={row.original["@path"]}

diff --git a/modules/statistics/src/main/frontend/src/Statistics/AdminStatistics.jsx b/modules/statistics/src/main/frontend/src/Statistics/AdminStatistics.jsx
@@ -109,7 +109,6 @@ function AdminStatistics(props) {
             <EditButton
               entryType={entryType}
               onClick={() => {setDialogOpen(true); setNewStat(false); setCurrentId(row.original["@name"]);}}
-              useEditDialog
             />
             <DeleteButton
               entryPath={row.original["@path"]}