From df41858a159c626bdf129efdcd35110ead7d822e Mon Sep 17 00:00:00 2001 From: Max Winokan <36866506+mwinokan@users.noreply.github.com> Date: Thu, 19 Sep 2024 13:49:20 +0100 Subject: [PATCH] #1501 (#451) (#452) * Squashed commit of the following: commit e61321646b0f62c6ba81ca8dbbb8a328405819c4 Author: Boris Kovar Date: Wed Jul 31 13:57:02 2024 +0200 - implemented #1251 * #1482 added TagName and CentroidRes columns for expanded view of observation dialog * #1489 show warning toast message if is defined on target load * #1322 added longcode column * updated general function for tag comparison * #1505 adjusted getting of centroid_res * #1458 allow to tag XCA sites, temp commit # Conflicts: # js/components/preview/molecule/observationsDialog.js * #1458 adjusted functionality and styling to proper change tag * #1508 removed TagName column in expanded observation dialog, changed order of columns, adjusted labels and tooltips, show observation dialog in its full height * #1508 adjusted column order and width calculation * #1501 added upload links to menu --------- Co-authored-by: matej <60509086+matej-vavrek@users.noreply.github.com> Co-authored-by: Boris Kovar --- js/components/header/index.js | 28 ++++++++++++++++++++++++++-- js/components/routes/constants.js | 4 ++++ 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/js/components/header/index.js b/js/components/header/index.js index 484316a02..11ba81ab1 100644 --- a/js/components/header/index.js +++ b/js/components/header/index.js @@ -68,6 +68,7 @@ import { AddProjectDetail } from '../projects/addProjectDetail'; import { ServicesStatusWrapper } from '../services'; import { COMPANIES, get_logo } from '../funders/constants'; import { setEditTargetDialogOpen } from '../target/redux/actions'; +import { Upload } from '@mui/icons-material'; const useStyles = makeStyles(theme => ({ padding: { @@ -272,8 +273,8 @@ export default memo( targetName !== undefined ? ( <> {currentProject.authorID === null || - currentProject.projectID === null || - currentProject.authorID === userId ? ( + currentProject.projectID === null || + currentProject.authorID === userId ? (