Merge pull request #422 from m2ms/stagingcandidate

Implemented #1389 and #1403
xchem · Apr 17, 2024 · 9e5d2cd · 9e5d2cd
2 parents 1b8268b + 2a657e7
commit 9e5d2cd
Show file tree

Hide file tree

Showing 13 changed files with 601 additions and 57 deletions.
diff --git a/js/components/preview/tags/details/tagDetailRow.js b/js/components/preview/tags/details/tagDetailRow.js
@@ -162,12 +162,14 @@ const TagDetailRow = memo(({ tag, moleculesToEditIds, moleculesToEdit }) => {
         isEdit={true}
         isTagEditor={true}
       ></TagView>
+
       {/* category */}
       <Tooltip title={dispatch(getCategoryById(tag.category))?.category}>
         <Typography className={classes.text} variant="body2" noWrap>
           {dispatch(getCategoryById(tag.category))?.category}
         </Typography>
       </Tooltip>
+
       {/* select hits button */}
       <Tooltip title="Select hits">
         <Button
@@ -182,6 +184,7 @@ const TagDetailRow = memo(({ tag, moleculesToEditIds, moleculesToEdit }) => {
           {hasSelectedMolecule() ? 'Unselect hits' : 'Select hits'}
         </Button>
       </Tooltip>
+
       {/* discourse button */}
       <Tooltip title="Discourse link">
         {/* Tooltip should not have disabled element as a direct child */}
@@ -213,18 +216,23 @@ const TagDetailRow = memo(({ tag, moleculesToEditIds, moleculesToEdit }) => {
           </Fab>
         </>
       </Tooltip>
+
       {/* user */}
       <Typography className={classes.text} variant="body2">
         {tag.user_id}
       </Typography>
+
       {/* date */}
       <Typography className={classes.text} variant="body2" noWrap>
         {navigator.language
           ? new Date(tag.create_date).toLocaleDateString(navigator.language)
           : new Date(tag.create_date).toLocaleDateString()}
       </Typography>
+      {/* </TableCell> */}
+
       {/* edit button */}
-      <IconButton
+      <div></div>
+      {/* <IconButton
         variant="contained"
         className={classes.editButton}
         size="small"
@@ -235,7 +243,7 @@ const TagDetailRow = memo(({ tag, moleculesToEditIds, moleculesToEdit }) => {
         <Tooltip title="Edit" className={classes.editButtonIcon}>
           <Edit />
         </Tooltip>
-      </IconButton>
+      </IconButton> */}
     </>
   );
 });

diff --git a/js/components/preview/tags/details/tagDetails.js b/js/components/preview/tags/details/tagDetails.js
@@ -44,6 +44,8 @@ import {
 import { selectAllTags, clearAllTags } from '../redux/dispatchActions';
 import { Button } from '../../../common/Inputs/Button';
 import { LoadingContext } from '../../../loading';
+import { EditTagsModal } from '../modal/editTagsModal';
+import { DJANGO_CONTEXT } from '../../../../utils/djangoContext';
 
 export const heightOfBody = '172px';
 export const defaultHeaderPadding = 15;
@@ -169,6 +171,7 @@ const TagDetails = memo(() => {
 
   const [tagList, setTagList] = useState([]);
   const [selectAll, setSelectAll] = useState(true);
+  const [showEditTagsModal, setShowEditTagsModal] = useState(false);
   const [searchString, setSearchString] = useState(null);
 
   tagDetailView = tagDetailView?.tagDetailView === undefined ? tagDetailView : tagDetailView.tagDetailView;
@@ -337,6 +340,10 @@ const TagDetails = memo(() => {
     setSelectAll(!selectAll);
   };
 
+  const handleEditTagsButton = () => {
+    setShowEditTagsModal(!showEditTagsModal);
+  };
+
   return (
     <Panel
       ref={ref}
@@ -439,9 +446,25 @@ const TagDetails = memo(() => {
               Select all tags
             </Button>
           </Grid>
+          {DJANGO_CONTEXT.pk && ([
+            <Grid item>
+              <Button
+                onClick={() => handleEditTagsButton()}
+                disabled={false}
+                color="inherit"
+                variant="text"
+                size="small"
+                data-id="editTagsButton"
+                className={classes.contColButton}
+              >
+                Edit tags
+              </Button>
+            </Grid>,
+            <EditTagsModal open={showEditTagsModal} setOpenDialog={setShowEditTagsModal} anchorEl={ref?.current} />
+          ])}
         </Grid>
       </div>
-      <div ref={elementRef} className={classes.containerExpanded} style={{ height: tagDetailView ? '80%' : '87%' }}>
+      <div ref={elementRef} className={classes.containerExpanded} style={{ height: tagDetailView ? '89%' : '93%' }}>
         {tagDetailView ? (
           <>
             <div className={classes.container} id="tagName">
@@ -581,7 +604,7 @@ const TagDetails = memo(() => {
                 </Tooltip>
               </IconButton>
             </div>
-            <div />
+            <div></div>
 
             {filteredTagList &&
               filteredTagList.map((tag, idx) => {
@@ -604,9 +627,9 @@ const TagDetails = memo(() => {
           </div>
         )}
       </div>
-      <div style={{ paddingBottom: resizableLayout === true ? '17px' : '0px' }}>
+      {/* <div style={{ paddingBottom: resizableLayout === true ? '17px' : '0px' }}>
         <NewTagDetailRow moleculesToEditIds={moleculesToEditIds} moleculesToEdit={moleculesToEdit} />
-      </div>
+      </div> */}
     </Panel>
   );
 });