TagSpaces is an offline, open source, document manager with tagging support
chore: improving ui of the advanced search and cleanup
Ilian Sapundshievfd8a4ffac97e
diff --git a/app/components/CommonIcons.tsx b/app/components/CommonIcons.tsxindex 8e0b22aaa..1974b36a5 100644--- a/app/components/CommonIcons.tsx+++ b/app/components/CommonIcons.tsx@@ -28,7 +28,7 @@ export const NavigateToFolderIcon = props => <KeyboardReturnIcon />;export { default as InfoTooltipIcon } from '@mui/icons-material/InfoOutlined';-export { default as FolderIcon } from '@mui/icons-material/Folder';+export { default as FolderIcon } from '@mui/icons-material/Folder'; // FolderOpenexport { default as FileIcon } from '@mui/icons-material/InsertDriveFile';@@ -69,3 +69,27 @@ export { default as DeleteIcon } from '@mui/icons-material/DeleteForever';export { default as LinkIcon } from '@mui/icons-material/Link';export { default as ExpandIcon } from '@mui/icons-material/ExpandMore';++export { default as EditIcon } from '@mui/icons-material/Edit';++export { default as UntaggedIcon } from '@mui/icons-material/LabelOffOutlined';++export { default as BookmarkIcon } from '@mui/icons-material/BookmarkBorder';++export { default as BookIcon } from '@mui/icons-material/LocalLibraryOutlined';++export { default as DateIcon } from '@mui/icons-material/DateRange';++export { default as PictureIcon } from '@mui/icons-material/Panorama';++export { default as DocumentIcon } from '@mui/icons-material/PictureAsPdf';++export { default as NoteIcon } from '@mui/icons-material/Note';++export { default as AudioIcon } from '@mui/icons-material/MusicVideo';++export { default as VideoIcon } from '@mui/icons-material/OndemandVideo';++export { default as ArchiveIcon } from '@mui/icons-material/Archive';++export { default as SearchIcon } from '@mui/icons-material/Search';diff --git a/app/components/FolderContainer.tsx b/app/components/FolderContainer.tsxindex 1ad913e38..9d17d1056 100644--- a/app/components/FolderContainer.tsx+++ b/app/components/FolderContainer.tsx@@ -25,13 +25,12 @@ import CircularProgress from '@mui/material/CircularProgress';import Tooltip from '-/components/Tooltip';import Typography from '@mui/material/Typography';import InputAdornment from '@mui/material/InputAdornment';-import SearchIcon from '@mui/icons-material/Search';import Badge from '@mui/material/Badge';import withStyles from '@mui/styles/withStyles';import ToggleButton from '@mui/material/ToggleButton';import ToggleButtonGroup from '@mui/material/ToggleButtonGroup';import AppConfig from '-/AppConfig';-import LocationMenu from './menus/LocationMenu';+// import LocationMenu from './menus/LocationMenu';import i18n from '../services/i18n';import {getMaxSearchResults,@@ -39,7 +38,6 @@ import {getCurrentLanguage,getDefaultPerspective} from '-/reducers/settings';-import {actions as AppActions,getDirectoryContent,@@ -55,7 +53,12 @@ import {} from '../reducers/app';import TaggingActions from '../reducers/tagging-actions';import LoadingLazy from '../components/LoadingLazy';-import { GoBackIcon, GoForwardIcon, MainMenuIcon } from './CommonIcons';+import {+ GoBackIcon,+ GoForwardIcon,+ MainMenuIcon,+ SearchIcon+} from './CommonIcons';import { Pro } from '../pro';import RenameEntryDialog from '-/components/dialogs/RenameEntryDialog';import { TS } from '-/tagspaces.namespace';diff --git a/app/components/SearchAutocomplete.tsx b/app/components/SearchAutocomplete.tsxindex 949abcd20..46bbc85c5 100644--- a/app/components/SearchAutocomplete.tsx+++ b/app/components/SearchAutocomplete.tsx@@ -72,6 +72,7 @@ import CloseIcon from '@mui/icons-material/Close';import { getTagLibrary } from '-/services/taglibrary-utils';import { getSearches } from '-/reducers/searches';import { getSearchOptions } from '-/components/SearchOptionsMenu';+import { SearchIcon } from '-/components/CommonIcons';interface Props {style?: any;@@ -1363,6 +1364,12 @@ function SearchAutocomplete(props: Props) {return null;}+ // const startAdornment = (+ // <IconButton size="small" edge="end" onClick={clickSearchButton}>+ // <SearchIcon />+ // </IconButton>+ // );+/*const startAdornment = isDesktop ? (<><Tooltip@@ -1404,22 +1411,12 @@ function SearchAutocomplete(props: Props) {);*/const endAdornment = (- /* {isDesktop && (- <Tooltip title={i18n.t('core:savedSearchesTitle')}>- <IconButton- size="small"- edge="end"- onClick={handleOpenSavedSearches}- >- <ExpandMoreIcon />- </IconButton>- </Tooltip>- )}*/<><Tooltip title={i18n.t('core:advancedSearch')}><IconButtonid="advancedButton"data-tid="advancedSearch"+ style={{ maxHeight: 24 }}onClick={(event: React.MouseEvent<HTMLButtonElement>) => {props.setAnchorSearch(event.currentTarget);}}@@ -1433,7 +1430,6 @@ function SearchAutocomplete(props: Props) {id="clearSearchID"onClick={() => {clearSearch();- // props.openCurrentDirectory();}}size="small"edge="end"diff --git a/app/components/SearchInline.css.tsx b/app/components/SearchInline.css.tsxindex 7b633386c..fb382ef21 100644--- a/app/components/SearchInline.css.tsx+++ b/app/components/SearchInline.css.tsx@@ -7,14 +7,9 @@ export interface StyleProps {header: BaseCSSProperties;icon: BaseCSSProperties;locationListArea: BaseCSSProperties;- searchArea: BaseCSSProperties;- topShadow: BaseCSSProperties;listItem: BaseCSSProperties;listItemSelected: BaseCSSProperties;panelTitle: BaseCSSProperties;- nested: BaseCSSProperties;- listItemTitleText: BaseCSSProperties;- hiddenFileInput: BaseCSSProperties;toolbar: BaseCSSProperties;formControl: BaseCSSProperties;mainActionButton: BaseCSSProperties;@@ -43,22 +38,6 @@ export const styles = (theme: any) => {// @ts-ignore// overflowY: AppConfig.isFirefox ? 'auto' : 'overlay'},- searchArea: {- paddingTop: 0,- paddingLeft: 10,- paddingRight: 10,- marginTop: 0,- height: 'calc(100% - 80px)',- maxHeight: 'calc(100% - 80px)',- overflowX: 'hidden',- // @ts-ignore- overflowY: AppConfig.isFirefox ? 'auto' : 'overlay'- },- topShadow: {- borderTop: '1px solid lightgray',- height: 10,- boxShadow: '0px -7px 20px 0px rgba(255, 255, 255, 1)'- },listItem: {paddingLeft: 0,paddingTop: 2,@@ -81,15 +60,6 @@ export const styles = (theme: any) => {paddingLeft: 7,paddingTop: 12},- nested: {- paddingLeft: theme.spacing(4)- },- listItemTitleText: {- fontWeight: 'bold'- },- hiddenFileInput: {- display: 'none'- },toolbar: {display: 'flex'},diff --git a/app/components/SearchPopover.tsx b/app/components/SearchPopover.tsxindex 66e73198b..d3e29c49c 100644--- a/app/components/SearchPopover.tsx+++ b/app/components/SearchPopover.tsx@@ -25,20 +25,7 @@ import format from 'date-fns/format';import Typography from '@mui/material/Typography';import MenuItem from '@mui/material/MenuItem';import Tooltip from '-/components/Tooltip';-import PictureIcon from '@mui/icons-material/Panorama';-import DocumentIcon from '@mui/icons-material/PictureAsPdf';-import NoteIcon from '@mui/icons-material/Note';-import AudioIcon from '@mui/icons-material/MusicVideo';-import VideoIcon from '@mui/icons-material/OndemandVideo';-import ArchiveIcon from '@mui/icons-material/Archive';import DialogActions from '@mui/material/DialogActions';-import FolderIcon from '@mui/icons-material/FolderOpen';-import UntaggedIcon from '@mui/icons-material/LabelOffOutlined';-import FileIcon from '@mui/icons-material/InsertDriveFileOutlined';-import EditIcon from '@mui/icons-material/Edit';-import BookmarkIcon from '@mui/icons-material/BookmarkBorder';-import BookIcon from '@mui/icons-material/LocalLibraryOutlined';-import DateIcon from '@mui/icons-material/DateRange';import Button from '@mui/material/Button';import Grid from '@mui/material/Grid';import Input from '@mui/material/Input';@@ -55,7 +42,6 @@ import ButtonGroup from '@mui/material/ButtonGroup';import ToggleButton from '@mui/material/ToggleButton';import ToggleButtonGroup from '@mui/material/ToggleButtonGroup';import { mergeWithExtractedTags } from '@tagspaces/tagspaces-common/misc';-import HelpIcon from '@mui/icons-material/Help';import AppConfig from '-/AppConfig';import TagsSelect from './TagsSelect';import { actions as AppActions, getDirectoryPath } from '../reducers/app';@@ -79,8 +65,23 @@ import { getSearches } from '-/reducers/searches';import { TS } from '-/tagspaces.namespace';import { ProLabel, BetaLabel, ProTooltip } from '-/components/HelperComponents';import Links from '-/content/links';-import { CreateFileIcon } from '-/components/CommonIcons';import GlobalSearch from '-/services/search-index';+import {+ CreateFileIcon,+ FolderIcon,+ UntaggedIcon,+ FileIcon,+ BookmarkIcon,+ BookIcon,+ DateIcon,+ EditIcon,+ PictureIcon,+ DocumentIcon,+ NoteIcon,+ AudioIcon,+ VideoIcon,+ ArchiveIcon+} from '-/components/CommonIcons';const SaveSearchDialog = Pro && Pro.UI ? Pro.UI.SaveSearchDialog : false;@@ -512,25 +513,15 @@ function SearchPopover(props: Props) {}}><div className={classes.toolbar}>- <IconButton- size="medium"- data-tid="helpSearchTID"- title={i18n.t('core:help')}- onClick={() =>- props.openURLExternally(Links.documentationLinks.search, true)- }- >- <HelpIcon />- </IconButton>- {/*<Typography variant="button" style={{ margin: '12px 0 10px 10px' }}>+ <Typography variant="button" style={{ margin: '12px 0 10px 10px' }}>{i18n.t('core:advancedSearch')}- </Typography>*/}+ </Typography><Typographyvariant="caption"className={classes.header}- style={{ flex: 1, margin: 'auto' }}+ style={{ flex: 1, margin: 'auto', paddingLeft: 10 }}>- {indexStatus}+ {'(' + indexStatus + ')'}</Typography><IconButtonstyle={{ marginLeft: 'auto' }}@@ -541,7 +532,20 @@ function SearchPopover(props: Props) {<CloseIcon /></IconButton></div>- <div className={classes.searchArea} data-tid="searchAdvancedTID">+ <div+ style={{+ paddingTop: 0,+ paddingLeft: 10,+ paddingRight: 10,+ marginTop: 0,+ height: 'calc(100% - 90px)',+ maxHeight: 'calc(100% - 90px)',+ overflowX: 'hidden',+ // @ts-ignore+ overflowY: AppConfig.isFirefox ? 'auto' : 'overlay'+ }}+ data-tid="searchAdvancedTID"+ ><Gridcontainerspacing={2}@@ -558,21 +562,21 @@ function SearchPopover(props: Props) {<Selectdisabled={indexing || !Pro}onChange={handleSavedSearchChange}- inputProps={{- endAdornment: (- <InputAdornment position="end">- {props.searchQuery.uuid && (- <IconButton- data-tid="editSearchBtnTID"- size="small"- onClick={() => saveSearch(false)}- >- <EditIcon />- </IconButton>- )}- </InputAdornment>- )- }}+ // inputProps={{+ // endAdornment: (+ // <InputAdornment position="end">+ // {props.searchQuery.uuid && (+ // <IconButton+ // data-tid="editSearchBtnTID"+ // size="small"+ // onClick={() => saveSearch(false)}+ // >+ // <EditIcon />+ // </IconButton>+ // )}+ // </InputAdornment>+ // )+ // }}input={<Input name="savedSearch" id="saved-searches" />}displayEmptyfullWidth@@ -598,24 +602,26 @@ function SearchPopover(props: Props) {}}>{props.searchQuery.uuid && (+ <Tooltip title={i18n.t('editSavedSearchTitle')}>+ <IconButton+ data-tid="editSearchBtnTID"+ size="small"+ onClick={() => saveSearch(false)}+ >+ <EditIcon />+ </IconButton>+ </Tooltip>+ )}+ <Tooltip title={i18n.t('createNewSavedSearchTitle')}><IconButton- data-tid="editSearchBtnTID"+ disabled={!Pro}+ data-tid="addSearchBtnTID"size="small"- onClick={() => saveSearch(false)}+ onClick={() => saveSearch()}>- <EditIcon />+ <CreateFileIcon /></IconButton>- )}- <Button- disabled={!Pro}- data-tid="addSearchBtnTID"- variant="outlined"- color="primary"- size="small"- onClick={() => saveSearch()}- >- {'+'}- </Button>+ </Tooltip></ButtonGroup></Grid><Grid item xs={12}>@@ -1008,22 +1014,31 @@ function SearchPopover(props: Props) {style={{display: 'flex',justifyContent: 'space-between',- paddingRight: 8+ padding: 5}}><Buttonsize="small"+ variant="text"data-tid="helpSearchButtonTID"- title={i18n.t('core:help')}onClick={() =>props.openURLExternally(Links.documentationLinks.search, true)}>{i18n.t('help')}</Button>- <ButtonGroup>+ <div>+ <Button+ variant="text"+ size="small"+ onClick={clearSearch}+ id="resetSearchButton"+ >+ {i18n.t('resetBtn')}+ </Button><Buttondisabled={indexing}+ variant="contained"id="searchButtonAdvTID"onClick={executeSearch}size="small"@@ -1032,12 +1047,7 @@ function SearchPopover(props: Props) {? 'Search disabled while indexing': i18n.t('searchTitle')}</Button>- <Tooltip title={i18n.t('clearSearch')}>- <Button size="small" onClick={clearSearch} id="resetSearchButton">- {i18n.t('resetBtn')}- </Button>- </Tooltip>- </ButtonGroup>+ </div></div>{SaveSearchDialog && saveSearchDialogOpened !== undefined && (<SaveSearchDialogdiff --git a/app/components/SidePanels.css.tsx b/app/components/SidePanels.css.tsxindex 2ca7a387e..d8711023e 100644--- a/app/components/SidePanels.css.tsx+++ b/app/components/SidePanels.css.tsx@@ -38,21 +38,6 @@ export default (theme: any) =>marginTop: 0,overflowY: AppConfig.isFirefox ? 'auto' : 'overlay'},- searchArea: {- paddingTop: 0,- paddingLeft: 5,- paddingRight: 5,- marginTop: 0,- height: 'calc(100% - 110px)',- maxHeight: 'calc(100% - 110px)',- overflowX: 'hidden',- overflowY: AppConfig.isFirefox ? 'auto' : 'overlay'- },- topShadow: {- borderTop: '1px solid lightgray',- height: 10,- boxShadow: '0px -7px 20px 0px rgba(255, 255, 255, 1)'- },listItem: {paddingLeft: 0,paddingTop: 2,@@ -75,15 +60,6 @@ export default (theme: any) =>paddingLeft: 7,paddingTop: 12},- nested: {- paddingLeft: theme.spacing(4)- },- listItemTitleText: {- fontWeight: 'bold'- },- hiddenFileInput: {- display: 'none'- },toolbar: {display: 'flex'},