TagSpaces is an offline, open source, document manager with tagging support
the material-ui Menu component doesn't accept a Fragment as a child (#1433)
Stanimir38d9c0d4474b
diff --git a/app/components/EntryIcon.tsx b/app/components/EntryIcon.tsxindex 5d1393b27..e28669905 100644--- a/app/components/EntryIcon.tsx+++ b/app/components/EntryIcon.tsx@@ -39,9 +39,9 @@ const EntryIcon = (props: Props) => (height="32"fill="none"stroke="#bbbbbb22"- stroke-linecap="round"- stroke-linejoin="round"- stroke-width="2"+ strokeLinecap="round"+ strokeLinejoin="round"+ strokeWidth="2">{props.isFile ? (<path d="M6 2 L6 30 26 30 26 10 18 2 Z M18 2 L18 10 26 10" />diff --git a/app/components/menus/DirectoryMenu.tsx b/app/components/menus/DirectoryMenu.tsxindex 2046c7010..e3d592ee1 100644--- a/app/components/menus/DirectoryMenu.tsx+++ b/app/components/menus/DirectoryMenu.tsx@@ -376,6 +376,250 @@ Do you want to continue?`)});}+ const menuItems = [];++ if (props.selectedEntries.length < 2) {+ if (props.perspectiveMode) {+ menuItems.push(+ <MenuItem+ key="openDirectory"+ data-tid="openDirectory"+ onClick={openDirectory}+ >+ <ListItemIcon>+ <OpenFolderIcon />+ </ListItemIcon>+ <ListItemText primary={i18n.t('core:openDirectory')} />+ </MenuItem>+ );+ } else {+ menuItems.push(+ <MenuItem+ key="reloadDirectory"+ data-tid="reloadDirectory"+ onClick={reloadDirectory}+ >+ <ListItemIcon>+ <AutoRenew />+ </ListItemIcon>+ <ListItemText primary={i18n.t('core:reloadDirectory')} />+ </MenuItem>+ );+ }+ if (!props.isReadOnlyMode) {+ menuItems.push(+ <MenuItem+ key="renameDirectory"+ data-tid="renameDirectory"+ onClick={showRenameDirectoryDialog}+ >+ <ListItemIcon>+ <RenameFolderIcon />+ </ListItemIcon>+ <ListItemText primary={i18n.t('core:renameDirectory')} />+ </MenuItem>+ );+ }+ }++ if (!props.isReadOnlyMode) {+ menuItems.push(+ <MenuItem+ key="deleteDirectory"+ data-tid="deleteDirectory"+ onClick={showDeleteDirectoryDialog}+ >+ <ListItemIcon>+ <DeleteForeverIcon />+ </ListItemIcon>+ <ListItemText primary={i18n.t('core:deleteDirectory')} />+ </MenuItem>+ );+ }++ if (+ props.selectedEntries.length < 2 &&+ !(PlatformIO.haveObjectStoreSupport() || AppConfig.isWeb)+ ) {+ menuItems.push(+ <MenuItem+ key="showInFileManager"+ data-tid="showInFileManager"+ onClick={showInFileManager}+ >+ <ListItemIcon>+ <OpenFolderNativelyIcon />+ </ListItemIcon>+ <ListItemText primary={i18n.t('core:showInFileManager')} />+ </MenuItem>+ );+ }+ if (!props.perspectiveMode) {+ menuItems.push(<Divider key="divider1" />);+ }+ if (!props.isReadOnlyMode && !props.perspectiveMode) {+ menuItems.push(+ <MenuItem+ key="newSubDirectory"+ data-tid="newSubDirectory"+ onClick={showCreateDirectoryDialog}+ >+ <ListItemIcon>+ <NewFolderIcon />+ </ListItemIcon>+ <ListItemText primary={i18n.t('core:newSubdirectory')} />+ </MenuItem>+ );+ menuItems.push(+ <MenuItem+ key="createNewFile"+ data-tid="createNewFile"+ onClick={createNewFile}+ >+ <ListItemIcon>+ <NewFileIcon />+ </ListItemIcon>+ <ListItemText primary={i18n.t('core:newFileNote')} />+ </MenuItem>+ );+ menuItems.push(+ <MenuItem+ key="addExistingFile"+ data-tid="addExistingFile"+ onClick={addExistingFile}+ >+ <ListItemIcon>+ <AddExistingFileIcon />+ </ListItemIcon>+ <ListItemText primary={i18n.t('core:addFiles')} />+ </MenuItem>+ );+ }+ if (Pro && props.perspectiveMode && props.selectedEntries.length < 2) {+ menuItems.push(+ <MenuItem+ key="setAsThumb"+ data-tid="setAsThumbTID"+ onClick={setFolderThumbnail}+ >+ <ListItemIcon>+ <ImageIcon />+ </ListItemIcon>+ <ListItemText primary={i18n.t('core:setAsParentFolderThumbnail')} />+ </MenuItem>+ );+ }++ if (props.selectedEntries.length < 2 && process.platform === 'darwin') {+ menuItems.push(+ <MenuItem+ key="importMacTags"+ data-tid="importMacTags"+ onClick={importMacTags}+ >+ <ListItemIcon>+ <ImportTagsIcon />+ </ListItemIcon>+ <ListItemText primary={i18n.t('core:importMacTags')} />+ </MenuItem>+ );+ }++ if (AppConfig.isCordova) {+ menuItems.push(+ <MenuItem+ key="takePicture"+ data-tid="takePicture"+ onClick={cameraTakePicture}+ >+ <ListItemIcon>+ <AddExistingFileIcon />+ </ListItemIcon>+ <ListItemText primary={i18n.t('core:cameraTakePicture')} />+ </MenuItem>+ );+ }+ if (!props.perspectiveMode) {+ menuItems.push(<Divider key="divider2" />);+ menuItems.push(+ <MenuItem+ key="openDefaultPerspective"+ data-tid="openDefaultPerspective"+ onClick={() => switchPerspective(perspectives.DEFAULT)}+ title="Switch to default perspective"+ >+ <ListItemIcon>+ <DefaultPerspectiveIcon />+ </ListItemIcon>+ <ListItemText primary="Default Perspective" />+ </MenuItem>+ );+ menuItems.push(+ <MenuItem+ key="openGalleryPerspective"+ data-tid="openGalleryPerspective"+ onClick={() => switchPerspective(perspectives.GALLERY)}+ title="Switch to gallery perspective"+ >+ <ListItemIcon>+ <GalleryPerspectiveIcon />+ </ListItemIcon>+ <ListItemText primary="Gallery Perspective" />+ </MenuItem>+ );+ menuItems.push(+ <MenuItem+ key="openMapiquePerspective"+ data-tid="openMapiquePerspective"+ onClick={() => switchPerspective(perspectives.MAPIQUE)}+ title="Switch to mapique perspective"+ >+ <ListItemIcon>+ <MapiquePerspectiveIcon />+ </ListItemIcon>+ <ListItemText primary="Mapique Perspective" />+ </MenuItem>+ );+ menuItems.push(+ <MenuItem+ key="openKanBanPerspective"+ data-tid="openKanBanPerspectiveTID"+ onClick={() => switchPerspective(perspectives.KANBAN)}+ title="Switch to kanban perspective"+ >+ <ListItemIcon>+ <KanBanPerspectiveIcon />+ </ListItemIcon>+ <ListItemText primary="KanBan Perspective" />+ </MenuItem>+ );+ }+ /* if (!props.isReadOnlyMode) {+ menuItems.push(+ <MenuItem data-tid="extractContent" onClick={initContentExtraction}>+ <ListItemIcon>+ <ContentExtractionIcon />+ </ListItemIcon>+ <ListItemText primary={i18n.t('core:startContentExtraction')} />+ </MenuItem>+ );+ } */+ if (props.selectedEntries.length < 2) {+ menuItems.push(<Divider key="divider3" />);+ menuItems.push(+ <MenuItem+ key="showProperties"+ data-tid="showProperties"+ onClick={showProperties}+ >+ <ListItemIcon>+ <SettingsIcon />+ </ListItemIcon>+ <ListItemText primary={i18n.t('core:directoryPropertiesTitle')} />+ </MenuItem>+ );+ }+return (<div style={{ overflowY: 'hidden' }}>{/* {isRenameDirectoryDialogOpened && (@@ -407,171 +651,7 @@ Do you want to continue?`): undefined}>- {props.selectedEntries.length < 2 && props.perspectiveMode && (- <MenuItem data-tid="openDirectory" onClick={openDirectory}>- <ListItemIcon>- <OpenFolderIcon />- </ListItemIcon>- <ListItemText primary={i18n.t('core:openDirectory')} />- </MenuItem>- )}- {props.selectedEntries.length < 2 && !props.perspectiveMode && (- <MenuItem data-tid="reloadDirectory" onClick={reloadDirectory}>- <ListItemIcon>- <AutoRenew />- </ListItemIcon>- <ListItemText primary={i18n.t('core:reloadDirectory')} />- </MenuItem>- )}- {props.selectedEntries.length < 2 && !props.isReadOnlyMode && (- <MenuItem- data-tid="renameDirectory"- onClick={showRenameDirectoryDialog}- >- <ListItemIcon>- <RenameFolderIcon />- </ListItemIcon>- <ListItemText primary={i18n.t('core:renameDirectory')} />- </MenuItem>- )}- {!props.isReadOnlyMode && (- <MenuItem- data-tid="deleteDirectory"- onClick={showDeleteDirectoryDialog}- >- <ListItemIcon>- <DeleteForeverIcon />- </ListItemIcon>- <ListItemText primary={i18n.t('core:deleteDirectory')} />- </MenuItem>- )}- {props.selectedEntries.length < 2 &&- !(PlatformIO.haveObjectStoreSupport() || AppConfig.isWeb) && (- <MenuItem data-tid="showInFileManager" onClick={showInFileManager}>- <ListItemIcon>- <OpenFolderNativelyIcon />- </ListItemIcon>- <ListItemText primary={i18n.t('core:showInFileManager')} />- </MenuItem>- )}- {!props.perspectiveMode && <Divider />}- {!props.isReadOnlyMode && !props.perspectiveMode && (- <MenuItem- data-tid="newSubDirectory"- onClick={showCreateDirectoryDialog}- >- <ListItemIcon>- <NewFolderIcon />- </ListItemIcon>- <ListItemText primary={i18n.t('core:newSubdirectory')} />- </MenuItem>- )}- {!props.isReadOnlyMode && !props.perspectiveMode && (- <MenuItem data-tid="createNewFile" onClick={createNewFile}>- <ListItemIcon>- <NewFileIcon />- </ListItemIcon>- <ListItemText primary={i18n.t('core:newFileNote')} />- </MenuItem>- )}- {!props.isReadOnlyMode && !props.perspectiveMode && (- <MenuItem data-tid="addExistingFile" onClick={addExistingFile}>- <ListItemIcon>- <AddExistingFileIcon />- </ListItemIcon>- <ListItemText primary={i18n.t('core:addFiles')} />- </MenuItem>- )}- {Pro && props.perspectiveMode && props.selectedEntries.length < 2 && (- <MenuItem data-tid="setAsThumbTID" onClick={setFolderThumbnail}>- <ListItemIcon>- <ImageIcon />- </ListItemIcon>- <ListItemText primary={i18n.t('core:setAsParentFolderThumbnail')} />- </MenuItem>- )}- {props.selectedEntries.length < 2 && process.platform === 'darwin' && (- <MenuItem data-tid="importMacTags" onClick={importMacTags}>- <ListItemIcon>- <ImportTagsIcon />- </ListItemIcon>- <ListItemText primary={i18n.t('core:importMacTags')} />- </MenuItem>- )}- {AppConfig.isCordova && (- <MenuItem data-tid="takePicture" onClick={cameraTakePicture}>- <ListItemIcon>- <AddExistingFileIcon />- </ListItemIcon>- <ListItemText primary={i18n.t('core:cameraTakePicture')} />- </MenuItem>- )}- {!props.perspectiveMode && (- <>- <Divider />- <MenuItem- data-tid="openDefaultPerspective"- onClick={() => switchPerspective(perspectives.DEFAULT)}- title="Switch to default perspective"- >- <ListItemIcon>- <DefaultPerspectiveIcon />- </ListItemIcon>- <ListItemText primary="Default Perspective" />- </MenuItem>- <MenuItem- data-tid="openGalleryPerspective"- onClick={() => switchPerspective(perspectives.GALLERY)}- title="Switch to gallery perspective"- >- <ListItemIcon>- <GalleryPerspectiveIcon />- </ListItemIcon>- <ListItemText primary="Gallery Perspective" />- </MenuItem>- <MenuItem- data-tid="openMapiquePerspective"- onClick={() => switchPerspective(perspectives.MAPIQUE)}- title="Switch to mapique perspective"- >- <ListItemIcon>- <MapiquePerspectiveIcon />- </ListItemIcon>- <ListItemText primary="Mapique Perspective" />- </MenuItem>- <MenuItem- data-tid="openKanBanPerspectiveTID"- onClick={() => switchPerspective(perspectives.KANBAN)}- title="Switch to kanban perspective"- >- <ListItemIcon>- <KanBanPerspectiveIcon />- </ListItemIcon>- <ListItemText primary="KanBan Perspective" />- </MenuItem>- </>- )}- {/* {!props.isReadOnlyMode && (- <React.Fragment>- <MenuItem data-tid="extractContent" onClick={initContentExtraction}>- <ListItemIcon>- <ContentExtractionIcon />- </ListItemIcon>- <ListItemText primary={i18n.t('core:startContentExtraction')} />- </MenuItem>- </React.Fragment>- )} */}- {props.selectedEntries.length < 2 && (- <>- <Divider />- <MenuItem data-tid="showProperties" onClick={showProperties}>- <ListItemIcon>- <SettingsIcon />- </ListItemIcon>- <ListItemText primary={i18n.t('core:directoryPropertiesTitle')} />- </MenuItem>- </>- )}+ {menuItems}</Menu><FileUploadContainerref={fileUploadContainerRef}diff --git a/app/components/menus/EntryTagMenu.tsx b/app/components/menus/EntryTagMenu.tsxindex 2575e44d9..0bedab6ec 100644--- a/app/components/menus/EntryTagMenu.tsx+++ b/app/components/menus/EntryTagMenu.tsx@@ -33,6 +33,7 @@ import { actions as LocationIndexActions } from '-/reducers/location-index';import { getMaxSearchResults } from '-/reducers/settings';import { actions as AppActions } from '-/reducers/app';import { TS } from '-/tagspaces.namespace';+import OpenFolderIcon from '@material-ui/icons/SubdirectoryArrowLeft';interface Props {open: boolean;@@ -90,42 +91,63 @@ const EntryTagMenu = (props: Props) => {handleCloseDialogs();}- return (- <div style={{ overflowY: 'hidden' }}>- <Menu anchorEl={props.anchorEl} open={props.open} onClose={props.onClose}>+ const menuItems = [+ <MenuItem+ key="showFilesWithThisTag"+ data-tid="showFilesWithThisTag"+ onClick={showFilesWithThisTag}+ >+ <ListItemIcon>+ <ShowEntriesWithTagIcon />+ </ListItemIcon>+ <ListItemText primary={i18n.t('core:showFilesWithThisTag')} />+ </MenuItem>+ ];+ if (!props.isReadOnlyMode) {+ if (props.setIsAddTagDialogOpened) {+ menuItems.push(<MenuItem- data-tid="showFilesWithThisTag"- onClick={showFilesWithThisTag}+ key="addTagMenu"+ data-tid="addTagMenuTID"+ onClick={showAddTagDialog}><ListItemIcon>- <ShowEntriesWithTagIcon />+ <AddIcon /></ListItemIcon>- <ListItemText primary={i18n.t('core:showFilesWithThisTag')} />+ <ListItemText primary={i18n.t('core:addTagToTagGroup')} /></MenuItem>- {!props.isReadOnlyMode && (- <>- {props.setIsAddTagDialogOpened && (- <MenuItem data-tid="addTagMenuTID" onClick={showAddTagDialog}>- <ListItemIcon>- <AddIcon />- </ListItemIcon>- <ListItemText primary={i18n.t('core:addTagToTagGroup')} />- </MenuItem>- )}- <MenuItem data-tid="editTagDialogMenu" onClick={showEditTagDialog}>- <ListItemIcon>- <EditIcon />- </ListItemIcon>- <ListItemText primary={i18n.t('core:editTagTitle')} />- </MenuItem>- <MenuItem data-tid="deleteTagMenu" onClick={showDeleteTagDialog}>- <ListItemIcon>- <DeleteIcon />- </ListItemIcon>- <ListItemText primary={i18n.t('core:removeTag')} />- </MenuItem>- </>- )}+ );+ }+ menuItems.push(+ <MenuItem+ key="editTagDialogMenu"+ data-tid="editTagDialogMenu"+ onClick={showEditTagDialog}+ >+ <ListItemIcon>+ <EditIcon />+ </ListItemIcon>+ <ListItemText primary={i18n.t('core:editTagTitle')} />+ </MenuItem>+ );+ menuItems.push(+ <MenuItem+ key="deleteTagMenu"+ data-tid="deleteTagMenu"+ onClick={showDeleteTagDialog}+ >+ <ListItemIcon>+ <DeleteIcon />+ </ListItemIcon>+ <ListItemText primary={i18n.t('core:removeTag')} />+ </MenuItem>+ );+ }++ return (+ <div style={{ overflowY: 'hidden' }}>+ <Menu anchorEl={props.anchorEl} open={props.open} onClose={props.onClose}>+ {menuItems}</Menu><ConfirmDialogopen={isDeleteTagDialogOpened}diff --git a/app/components/menus/FileMenu.tsx b/app/components/menus/FileMenu.tsxindex 5d617e309..49c86ffc1 100644--- a/app/components/menus/FileMenu.tsx+++ b/app/components/menus/FileMenu.tsx@@ -41,6 +41,7 @@ import {import { Pro } from '-/pro';import { extractParentDirectoryPath } from '-/utils/paths';import { TS } from '-/tagspaces.namespace';+import AddIcon from '@material-ui/icons/Add';interface Props {anchorEl: Element;@@ -161,6 +162,129 @@ const FileMenu = (props: Props) => {);}}+ const menuItems = [];++ if (props.selectedEntries.length < 2) {+ menuItems.push(+ <MenuItem+ key="fileMenuOpenFile"+ data-tid="fileMenuOpenFile"+ onClick={openFile}+ >+ <ListItemIcon>+ <OpenFile />+ </ListItemIcon>+ <ListItemText primary={i18n.t('core:openFile')} />+ </MenuItem>+ );+ menuItems.push(+ <MenuItem+ key="fileMenuOpenParentFolderInternally"+ data-tid="fileMenuOpenParentFolderInternally"+ onClick={openParentFolderInternally}+ >+ <ListItemIcon>+ <OpenParentFolder />+ </ListItemIcon>+ <ListItemText primary={i18n.t('core:openParentFolder')} />+ </MenuItem>+ );+ }+ if (+ !(PlatformIO.haveObjectStoreSupport() || AppConfig.isWeb) &&+ props.selectedEntries.length < 2+ ) {+ menuItems.push(+ <MenuItem+ key="fileMenuOpenFileNatively"+ data-tid="fileMenuOpenFileNatively"+ onClick={openFileNatively}+ >+ <ListItemIcon>+ <OpenFileNatively />+ </ListItemIcon>+ <ListItemText primary={i18n.t('core:openFileNatively')} />+ </MenuItem>+ );+ menuItems.push(+ <MenuItem+ key="fileMenuOpenContainingFolder"+ data-tid="fileMenuOpenContainingFolder"+ onClick={showInFileManager}+ >+ <ListItemIcon>+ <OpenFolderInternally />+ </ListItemIcon>+ <ListItemText primary={i18n.t('core:showInFileManager')} />+ </MenuItem>+ );+ menuItems.push(<Divider key="fmDivider" />);+ }++ if (!props.isReadOnlyMode) {+ menuItems.push(+ <MenuItem+ key="fileMenuAddRemoveTags"+ data-tid="fileMenuAddRemoveTags"+ onClick={showAddRemoveTagsDialog}+ >+ <ListItemIcon>+ <AddRemoveTags />+ </ListItemIcon>+ <ListItemText primary={i18n.t('core:addRemoveTags')} />+ </MenuItem>+ );+ menuItems.push(+ <MenuItem+ key="fileMenuRenameFile"+ data-tid="fileMenuRenameFile"+ onClick={showRenameFileDialog}+ >+ <ListItemIcon>+ <RenameFile />+ </ListItemIcon>+ <ListItemText primary={i18n.t('core:renameFile')} />+ </MenuItem>+ );+ menuItems.push(+ <MenuItem+ key="fileMenuMoveCopyFile"+ data-tid="fileMenuMoveCopyFile"+ onClick={showMoveCopyFilesDialog}+ >+ <ListItemIcon>+ <MoveCopy />+ </ListItemIcon>+ <ListItemText primary={i18n.t('core:moveCopyFile')} />+ </MenuItem>+ );+ if (Pro && props.selectedEntries.length < 2) {+ menuItems.push(+ <MenuItem+ key="setAsThumbTID"+ data-tid="setAsThumbTID"+ onClick={setFolderThumbnail}+ >+ <ListItemIcon>+ <ImageIcon />+ </ListItemIcon>+ <ListItemText primary={i18n.t('core:setAsThumbnail')} />+ </MenuItem>+ );+ }+ menuItems.push(+ <MenuItem+ key="fileMenuDeleteFile"+ data-tid="fileMenuDeleteFile"+ onClick={showDeleteFileDialog}+ >+ <ListItemIcon>+ <DeleteForever />+ </ListItemIcon>+ <ListItemText primary={i18n.t('core:deleteEntry')} />+ </MenuItem>+ );+ }return (<div style={{ overflowY: 'hidden' }}>@@ -177,97 +301,7 @@ const FileMenu = (props: Props) => {open={props.open}onClose={props.onClose}>- {props.selectedEntries.length < 2 && (- <>- <MenuItem data-tid="fileMenuOpenFile" onClick={openFile}>- <ListItemIcon>- <OpenFile />- </ListItemIcon>- <ListItemText primary={i18n.t('core:openFile')} />- </MenuItem>- <MenuItem- data-tid="fileMenuOpenParentFolderInternally"- onClick={openParentFolderInternally}- >- <ListItemIcon>- <OpenParentFolder />- </ListItemIcon>- <ListItemText primary={i18n.t('core:openParentFolder')} />- </MenuItem>- </>- )}- {!(PlatformIO.haveObjectStoreSupport() || AppConfig.isWeb) &&- props.selectedEntries.length < 2 && (- <>- <MenuItem- data-tid="fileMenuOpenFileNatively"- onClick={openFileNatively}- >- <ListItemIcon>- <OpenFileNatively />- </ListItemIcon>- <ListItemText primary={i18n.t('core:openFileNatively')} />- </MenuItem>- <MenuItem- data-tid="fileMenuOpenContainingFolder"- onClick={showInFileManager}- >- <ListItemIcon>- <OpenFolderInternally />- </ListItemIcon>- <ListItemText primary={i18n.t('core:showInFileManager')} />- </MenuItem>- <Divider />- </>- )}- {!props.isReadOnlyMode && (- <>- <MenuItem- data-tid="fileMenuAddRemoveTags"- onClick={showAddRemoveTagsDialog}- >- <ListItemIcon>- <AddRemoveTags />- </ListItemIcon>- <ListItemText primary={i18n.t('core:addRemoveTags')} />- </MenuItem>- <MenuItem- data-tid="fileMenuRenameFile"- onClick={showRenameFileDialog}- >- <ListItemIcon>- <RenameFile />- </ListItemIcon>- <ListItemText primary={i18n.t('core:renameFile')} />- </MenuItem>- <MenuItem- data-tid="fileMenuMoveCopyFile"- onClick={showMoveCopyFilesDialog}- >- <ListItemIcon>- <MoveCopy />- </ListItemIcon>- <ListItemText primary={i18n.t('core:moveCopyFile')} />- </MenuItem>- {Pro && props.selectedEntries.length < 2 && (- <MenuItem data-tid="setAsThumbTID" onClick={setFolderThumbnail}>- <ListItemIcon>- <ImageIcon />- </ListItemIcon>- <ListItemText primary={i18n.t('core:setAsThumbnail')} />- </MenuItem>- )}- <MenuItem- data-tid="fileMenuDeleteFile"- onClick={showDeleteFileDialog}- >- <ListItemIcon>- <DeleteForever />- </ListItemIcon>- <ListItemText primary={i18n.t('core:deleteEntry')} />- </MenuItem>- </>- )}+ {menuItems}</Menu></div>);diff --git a/app/components/menus/LocationContextMenu.tsx b/app/components/menus/LocationContextMenu.tsxindex 8366aff93..670ad593b 100644--- a/app/components/menus/LocationContextMenu.tsx+++ b/app/components/menus/LocationContextMenu.tsx@@ -132,65 +132,105 @@ const LocationContextMenu = (props: Props) => {}};- return (- <Menu- anchorEl={props.locationDirectoryContextMenuAnchorEl}- open={Boolean(props.locationDirectoryContextMenuAnchorEl)}- onClose={() => props.setLocationDirectoryContextMenuAnchorEl(null)}+ const menuItems = [];+ if (!AppConfig.locationsReadOnly && !selectedLocation.isNotEditable) {+ menuItems.push(+ <MenuItem+ key="editLocation"+ data-tid="editLocation"+ onClick={showEditLocationDialog}+ >+ <ListItemIcon>+ <EditIcon />+ </ListItemIcon>+ <ListItemText primary={i18n.t('core:editLocationTitle')} />+ </MenuItem>+ );+ }+ menuItems.push(+ <MenuItem+ key="indexLocation"+ data-tid="indexLocation"+ onClick={indexLocation}>- {!AppConfig.locationsReadOnly && !selectedLocation.isNotEditable && (- <MenuItem data-tid="editLocation" onClick={showEditLocationDialog}>- <ListItemIcon>- <EditIcon />- </ListItemIcon>- <ListItemText primary={i18n.t('core:editLocationTitle')} />- </MenuItem>- )}- <MenuItem data-tid="indexLocation" onClick={indexLocation}>+ <ListItemIcon>+ <RefreshIcon />+ </ListItemIcon>+ <ListItemText primary={i18n.t('core:indexLocation')} />+ </MenuItem>+ );+ if (!AppConfig.locationsReadOnly) {+ menuItems.push(+ <MenuItem+ key="moveLocationUp"+ data-tid="moveLocationUp"+ onClick={moveLocationUp}+ >+ <ListItemIcon>+ <ArrowUpwardIcon />+ </ListItemIcon>+ <ListItemText primary={i18n.t('core:moveUp')} />+ </MenuItem>+ );+ menuItems.push(+ <MenuItem+ key="moveLocationDown"+ data-tid="moveLocationDown"+ onClick={moveLocationDown}+ ><ListItemIcon>- <RefreshIcon />+ <ArrowDownwardIcon /></ListItemIcon>- <ListItemText primary={i18n.t('core:indexLocation')} />+ <ListItemText primary={i18n.t('core:moveDown')} /></MenuItem>- {!AppConfig.locationsReadOnly && (- <>- <MenuItem data-tid="moveLocationUp" onClick={moveLocationUp}>- <ListItemIcon>- <ArrowUpwardIcon />- </ListItemIcon>- <ListItemText primary={i18n.t('core:moveUp')} />- </MenuItem>- <MenuItem data-tid="moveLocationDown" onClick={moveLocationDown}>- <ListItemIcon>- <ArrowDownwardIcon />- </ListItemIcon>- <ListItemText primary={i18n.t('core:moveDown')} />- </MenuItem>- <MenuItem- data-tid="removeLocation"- onClick={showDeleteLocationDialog}- >- <ListItemIcon>- <DeleteIcon />- </ListItemIcon>- <ListItemText primary={i18n.t('core:removeLocation')} />- </MenuItem>- </>- )}- {selectedLocation.type === locationType.TYPE_LOCAL && (- <MenuItem data-tid="showInFileManager" onClick={showInFileManager}>- <ListItemIcon>- <OpenFolderNativelyIcon />- </ListItemIcon>- <ListItemText primary={i18n.t('core:showInFileManager')} />- </MenuItem>- )}- <MenuItem data-tid="closeLocationTID" onClick={closeLocation}>+ );+ menuItems.push(+ <MenuItem+ key="removeLocation"+ data-tid="removeLocation"+ onClick={showDeleteLocationDialog}+ ><ListItemIcon>- <CloseIcon />+ <DeleteIcon /></ListItemIcon>- <ListItemText primary={i18n.t('core:closeLocation')} />+ <ListItemText primary={i18n.t('core:removeLocation')} /></MenuItem>+ );+ }+ if (selectedLocation.type === locationType.TYPE_LOCAL) {+ menuItems.push(+ <MenuItem+ key="showInFileManager"+ data-tid="showInFileManager"+ onClick={showInFileManager}+ >+ <ListItemIcon>+ <OpenFolderNativelyIcon />+ </ListItemIcon>+ <ListItemText primary={i18n.t('core:showInFileManager')} />+ </MenuItem>+ );+ }+ menuItems.push(+ <MenuItem+ key="closeLocationTID"+ data-tid="closeLocationTID"+ onClick={closeLocation}+ >+ <ListItemIcon>+ <CloseIcon />+ </ListItemIcon>+ <ListItemText primary={i18n.t('core:closeLocation')} />+ </MenuItem>+ );++ return (+ <Menu+ anchorEl={props.locationDirectoryContextMenuAnchorEl}+ open={Boolean(props.locationDirectoryContextMenuAnchorEl)}+ onClose={() => props.setLocationDirectoryContextMenuAnchorEl(null)}+ >+ {menuItems}</Menu>);};diff --git a/app/components/menus/LocationManagerMenu.tsx b/app/components/menus/LocationManagerMenu.tsxindex 722bda79e..71a21978c 100644--- a/app/components/menus/LocationManagerMenu.tsx+++ b/app/components/menus/LocationManagerMenu.tsx@@ -36,6 +36,7 @@ import AppConfig from '-/config';import i18n from '-/services/i18n';import { Pro } from '../../pro';import { actions as AppActions } from '-/reducers/app';+import OpenParentFolder from '@material-ui/icons/FolderOpen';interface Props {classes: any;@@ -53,6 +54,105 @@ const LocationManagerMenu = (props: Props) => {setLocationManagerMenuAnchorEl] = useState<null | HTMLElement>(null);+ const menuItems = [];+ if (!AppConfig.locationsReadOnly) {+ menuItems.push(+ <MenuItem+ key="locationManagerMenuCreateLocation"+ data-tid="locationManagerMenuCreateLocation"+ onClick={() => {+ setLocationManagerMenuAnchorEl(null);+ props.showCreateLocationDialog();+ }}+ >+ <ListItemIcon>+ <CreateLocationIcon />+ </ListItemIcon>+ <ListItemText primary={i18n.t('core:createLocationTitle')} />+ </MenuItem>+ );+ }++ menuItems.push(+ <MenuItem+ key="locationManagerMenuOpenLink"+ data-tid="locationManagerMenuOpenLink"+ onClick={() => {+ setLocationManagerMenuAnchorEl(null);+ props.toggleOpenLinkDialog();+ }}+ >+ <ListItemIcon>+ <OpenLinkIcon />+ </ListItemIcon>+ <ListItemText primary={i18n.t('core:openLink')} />+ </MenuItem>+ );+ if (Pro) {+ menuItems.push(+ <MenuItem+ key="locationManagerMenuExportLocationsTID"+ data-tid="locationManagerMenuExportLocationsTID"+ onClick={() => {+ setLocationManagerMenuAnchorEl(null);+ props.exportLocations();+ }}+ >+ <ListItemIcon>+ <ExportImportIcon />+ </ListItemIcon>+ <ListItemText primary={i18n.t('core:exportLocationTitle')} />+ </MenuItem>+ );+ menuItems.push(+ <MenuItem+ key="locationManagerMenuImportLocations"+ data-tid="locationManagerMenuImportLocationsTID"+ onClick={() => {+ setLocationManagerMenuAnchorEl(null);+ props.importLocations();+ }}+ >+ <ListItemIcon>+ <ExportImportIcon />+ </ListItemIcon>+ <ListItemText primary={i18n.t('core:importLocationTitle')} />+ </MenuItem>+ );+ }++ menuItems.push(+ <MenuItem+ key="locationManagerMenuCloseAll"+ data-tid="locationManagerMenuCloseAll"+ onClick={() => {+ setLocationManagerMenuAnchorEl(null);+ props.closeAllLocations();+ }}+ >+ <ListItemIcon>+ <CloseIcon />+ </ListItemIcon>+ <ListItemText primary={i18n.t('core:closeAllLocations')} />+ </MenuItem>+ );++ menuItems.push(+ <MenuItem+ key="locationManagerMenuHelp"+ data-tid="locationManagerMenuHelp"+ onClick={() => {+ setLocationManagerMenuAnchorEl(null);+ props.openURLExternally(AppConfig.documentationLinks.locations, true);+ }}+ >+ <ListItemIcon>+ <HelpIcon />+ </ListItemIcon>+ <ListItemText primary={i18n.t('core:help')} />+ </MenuItem>+ );+return (<><div className={props.classes.toolbar}>@@ -76,87 +176,7 @@ const LocationManagerMenu = (props: Props) => {setLocationManagerMenuAnchorEl(null);}}>- {!AppConfig.locationsReadOnly && (- <MenuItem- data-tid="locationManagerMenuCreateLocation"- onClick={() => {- setLocationManagerMenuAnchorEl(null);- props.showCreateLocationDialog();- }}- >- <ListItemIcon>- <CreateLocationIcon />- </ListItemIcon>- <ListItemText primary={i18n.t('core:createLocationTitle')} />- </MenuItem>- )}- <MenuItem- data-tid="locationManagerMenuOpenLink"- onClick={() => {- setLocationManagerMenuAnchorEl(null);- props.toggleOpenLinkDialog();- }}- >- <ListItemIcon>- <OpenLinkIcon />- </ListItemIcon>- <ListItemText primary={i18n.t('core:openLink')} />- </MenuItem>- {Pro && (- <>- <MenuItem- data-tid="locationManagerMenuExportLocationsTID"- onClick={() => {- setLocationManagerMenuAnchorEl(null);- props.exportLocations();- }}- >- <ListItemIcon>- <ExportImportIcon />- </ListItemIcon>- <ListItemText primary={i18n.t('core:exportLocationTitle')} />- </MenuItem>- <MenuItem- data-tid="locationManagerMenuImportLocationsTID"- onClick={() => {- setLocationManagerMenuAnchorEl(null);- props.importLocations();- }}- >- <ListItemIcon>- <ExportImportIcon />- </ListItemIcon>- <ListItemText primary={i18n.t('core:importLocationTitle')} />- </MenuItem>- </>- )}- <MenuItem- data-tid="locationManagerMenuCloseAll"- onClick={() => {- setLocationManagerMenuAnchorEl(null);- props.closeAllLocations();- }}- >- <ListItemIcon>- <CloseIcon />- </ListItemIcon>- <ListItemText primary={i18n.t('core:closeAllLocations')} />- </MenuItem>- <MenuItem- data-tid="locationManagerMenuHelp"- onClick={() => {- setLocationManagerMenuAnchorEl(null);- props.openURLExternally(- AppConfig.documentationLinks.locations,- true- );- }}- >- <ListItemIcon>- <HelpIcon />- </ListItemIcon>- <ListItemText primary={i18n.t('core:help')} />- </MenuItem>+ {menuItems}</Menu></>);diff --git a/app/components/menus/SearchMenu.tsx b/app/components/menus/SearchMenu.tsxindex 3cd97445a..f8826d00d 100644--- a/app/components/menus/SearchMenu.tsx+++ b/app/components/menus/SearchMenu.tsx@@ -39,22 +39,57 @@ interface Props {createLocationsIndexes: () => void;}-const SearchMenu = (props: Props) => (- <div style={{ overflowY: 'hidden' }}>- <Menu anchorEl={props.anchorEl} open={props.open} onClose={props.onClose}>+const SearchMenu = (props: Props) => {+ const menuItems = [];+ menuItems.push(+ <MenuItem+ key="updateAllLocationIndexes"+ data-tid="updateAllLocationIndexes"+ onClick={() => {+ props.onClose();+ props.createLocationsIndexes();+ }}+ >+ <ListItemIcon>+ <UpdateIndexIcon />+ </ListItemIcon>+ <ListItemText primary={i18n.t('core:updateAllLocationIndexes')} />+ </MenuItem>+ );+ if (Pro) {+ menuItems.push(<MenuItem- data-tid="searchMenuHelp"+ key="exportSavedSearchTID"+ data-tid="exportSavedSearchTID"+ onClick={() => {+ props.onClose();+ props.exportSearches();+ }}+ >+ <ListItemIcon>+ <ExportImportIcon />+ </ListItemIcon>+ <ListItemText primary={i18n.t('core:exportSavedSearch')} />+ </MenuItem>+ );+ menuItems.push(+ <MenuItem+ key="importSavedSearchTID"+ data-tid="importSavedSearchTID"onClick={() => {props.onClose();- props.createLocationsIndexes();+ props.importSearches();}}><ListItemIcon>- <UpdateIndexIcon />+ <ExportImportIcon /></ListItemIcon>- <ListItemText primary={i18n.t('core:updateAllLocationIndexes')} />+ <ListItemText primary={i18n.t('core:importSavedSearch')} /></MenuItem>+ );+ menuItems.push(<MenuItem+ key="searchMenuHelp"data-tid="searchMenuHelp"onClick={() => {props.onClose();@@ -66,36 +101,16 @@ const SearchMenu = (props: Props) => (</ListItemIcon><ListItemText primary={i18n.t('core:help')} /></MenuItem>- {Pro && (- <>- <MenuItem- data-tid="exportSavedSearchTID"- onClick={() => {- props.onClose();- props.exportSearches();- }}- >- <ListItemIcon>- <ExportImportIcon />- </ListItemIcon>- <ListItemText primary={i18n.t('core:exportSavedSearch')} />- </MenuItem>- <MenuItem- data-tid="importSavedSearchTID"- onClick={() => {- props.onClose();- props.importSearches();- }}- >- <ListItemIcon>- <ExportImportIcon />- </ListItemIcon>- <ListItemText primary={i18n.t('core:importSavedSearch')} />- </MenuItem>- </>- )}- </Menu>- </div>-);+ );+ }++ return (+ <div style={{ overflowY: 'hidden' }}>+ <Menu anchorEl={props.anchorEl} open={props.open} onClose={props.onClose}>+ {menuItems}+ </Menu>+ </div>+ );+};export default SearchMenu;diff --git a/app/perspectives/grid-perspective/components/MainToolbar.tsx b/app/perspectives/grid-perspective/components/MainToolbar.tsxindex 152b4758b..919172192 100644--- a/app/perspectives/grid-perspective/components/MainToolbar.tsx+++ b/app/perspectives/grid-perspective/components/MainToolbar.tsx@@ -120,38 +120,44 @@ const MainToolbar = (props: Props) => {)}{!isReadOnlyMode && (<Tooltip title={i18n.t('core:tagSelectedEntries')}>- <IconButton- aria-label={i18n.t('core:tagSelectedEntries')}- data-tid="gridPerspectiveAddRemoveTags"- disabled={selectedEntries.length < 1}- onClick={openAddRemoveTagsDialog}- >- <TagIcon />- </IconButton>+ <span>+ <IconButton+ aria-label={i18n.t('core:tagSelectedEntries')}+ data-tid="gridPerspectiveAddRemoveTags"+ disabled={selectedEntries.length < 1}+ onClick={openAddRemoveTagsDialog}+ >+ <TagIcon />+ </IconButton>+ </span></Tooltip>)}{!isReadOnlyMode && (<Tooltip title={i18n.t('core:copyMoveSelectedEntries')}>- <IconButton- aria-label={i18n.t('core:copyMoveSelectedEntries')}- data-tid="gridPerspectiveCopySelectedFiles"- disabled={!fileOperationsEnabled}- onClick={openMoveCopyFilesDialog}- >- <CopyIcon />- </IconButton>+ <span>+ <IconButton+ aria-label={i18n.t('core:copyMoveSelectedEntries')}+ data-tid="gridPerspectiveCopySelectedFiles"+ disabled={!fileOperationsEnabled}+ onClick={openMoveCopyFilesDialog}+ >+ <CopyIcon />+ </IconButton>+ </span></Tooltip>)}{!isReadOnlyMode && (<Tooltip title={i18n.t('core:deleteSelectedEntries')}>- <IconButton- aria-label={i18n.t('core:deleteSelectedEntries')}- data-tid="gridPerspectiveDeleteMultipleFiles"- disabled={!fileOperationsEnabled}- onClick={openDeleteFileDialog}- >- <DeleteIcon />- </IconButton>+ <span>+ <IconButton+ aria-label={i18n.t('core:deleteSelectedEntries')}+ data-tid="gridPerspectiveDeleteMultipleFiles"+ disabled={!fileOperationsEnabled}+ onClick={openDeleteFileDialog}+ >+ <DeleteIcon />+ </IconButton>+ </span></Tooltip>)}<Tooltip title={i18n.t('core:sort')}>