Skip to content

TagSpaces is an offline, open source, document manager with tagging support

chore: simplifying the create dialog by adding an accordion component

Ilian Sapundshiev8419c2ab7a2b
diff --git a/app/components/CommonIcons.tsx b/app/components/CommonIcons.tsx
index 840583910..8e0b22aaa 100644
--- a/app/components/CommonIcons.tsx
+++ b/app/components/CommonIcons.tsx
@@ -40,7 +40,7 @@ export { default as GoForwardIcon } from '@mui/icons-material/ArrowForward';
export { default as HelpIcon } from '@mui/icons-material/Help';
-export { default as InfoIcon } from '@mui/icons-material/AnnouncementOutlined';
+export { default as InfoIcon } from '@mui/icons-material/InfoOutlined';
export { default as FolderPropertiesIcon } from '@mui/icons-material/Info';
@@ -67,3 +67,5 @@ export { default as ReloadIcon } from '@mui/icons-material/Refresh';
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';
diff --git a/app/components/dialogs/CreateDialog.tsx b/app/components/dialogs/CreateDialog.tsx
index 0b3d59666..41249d3c3 100644
--- a/app/components/dialogs/CreateDialog.tsx
+++ b/app/components/dialogs/CreateDialog.tsx
@@ -29,6 +29,7 @@ import Grid from '@mui/material/Grid';
import withStyles from '@mui/styles/withStyles';
import Dialog from '@mui/material/Dialog';
import Paper from '@mui/material/Paper';
+import { Accordion, AccordionDetails, AccordionSummary } from '@mui/material';
import DraggablePaper from '-/components/DraggablePaper';
import { Progress } from 'aws-sdk/clients/s3';
import { formatDateTime4Tag } from '@tagspaces/tagspaces-common/misc';
@@ -55,6 +56,7 @@ import FormHelperText from '@mui/material/FormHelperText';
import { FormControl } from '@mui/material';
import { fileNameValidation } from '-/services/utils-io';
import { PerspectiveIDs } from '-/perspectives';
+import { ExpandIcon, InfoIcon } from '-/components/CommonIcons';
const styles: any = () => ({
createButton: {
@@ -341,186 +343,206 @@ function CreateDialog(props: Props) {
</DialogTitle>
<DialogContent
style={{
- display: 'flex',
minWidth: 200,
minHeight: 300,
marginBottom: 20,
- overflow: 'overlay',
- alignSelf: 'center'
+ overflow: 'overlay'
}}
data-tid="keyboardShortCutsDialog"
>
- <Grid style={{ flexGrow: 1, width: '100%' }} container spacing={1}>
- <Grid item xs={12}>
- {noSuitableLocation ? (
- <Typography variant="caption">
- {i18n.t('noSuitableLocation')}
- </Typography>
- ) : (
- <Typography variant="caption">
- {i18n.t('core:entriesWillBeCreatedIn') +
- ' ' +
- (currentLocation ? currentLocation.name : '') +
- ' ' +
- targetDirectoryPath}
- </Typography>
- )}
- </Grid>
- <Grid item xs={12}>
- <FormControl fullWidth={true} error={inputError}>
- <TextField
- autoFocus
- error={inputError}
- margin="dense"
- name="entryName"
- label={i18n.t('core:newFileName')}
- onChange={handleInputChange}
- onFocus={onInputFocus}
- defaultValue={fileName.current}
- disabled={noSuitableLocation}
- fullWidth={true}
- data-tid="newEntryDialogInputTID"
- />
- {inputError && (
- <FormHelperText>{i18n.t('core:fileNameHelp')}</FormHelperText>
- )}
- </FormControl>
- </Grid>
- <Grid item xs={12}>
- <ButtonGroup
- style={{
- textAlign: 'center',
- width: '100%'
- }}
- >
- <Button
- variant="contained"
- onClick={createMarkdownFile}
- className={classes.createButton}
- data-tid="createMarkdownButton"
- disabled={noSuitableLocation}
- >
- <Tooltip title={i18n.t('createMarkdownTitle')}>
- <Typography variant="button" display="block" gutterBottom>
- {i18n.t('createMarkdown')}
- </Typography>
- </Tooltip>
- </Button>
+ <Accordion style={{ marginTop: 5 }} defaultExpanded>
+ <AccordionDetails style={{ paddingTop: 16 }}>
+ <Grid style={{ flexGrow: 1, width: '100%' }} container spacing={1}>
+ <Grid item xs={12}>
+ <FormControl fullWidth={true} error={inputError}>
+ <TextField
+ autoFocus
+ error={inputError}
+ margin="dense"
+ name="entryName"
+ label={i18n.t('core:newFileName')}
+ onChange={handleInputChange}
+ onFocus={onInputFocus}
+ defaultValue={fileName.current}
+ disabled={noSuitableLocation}
+ fullWidth={true}
+ data-tid="newEntryDialogInputTID"
+ />
+ {inputError && (
+ <FormHelperText>
+ {i18n.t('core:fileNameHelp')}
+ </FormHelperText>
+ )}
+ </FormControl>
+ </Grid>
+ <Grid item xs={12}>
+ <ButtonGroup
+ style={{
+ textAlign: 'center',
+ width: '100%'
+ }}
+ >
+ <Button
+ // variant="contained"
+ onClick={createMarkdownFile}
+ className={classes.createButton}
+ data-tid="createMarkdownButton"
+ disabled={noSuitableLocation}
+ >
+ <Tooltip title={i18n.t('createMarkdownTitle')}>
+ <Typography variant="button" display="block" gutterBottom>
+ {i18n.t('createMarkdown')}
+ </Typography>
+ </Tooltip>
+ </Button>
+ <Button
+ // variant="contained"
+ onClick={createRichTextFile}
+ className={classes.createButton}
+ data-tid="createRichTextFileButton"
+ disabled={noSuitableLocation}
+ >
+ <Tooltip title={i18n.t('createNoteTitle')}>
+ <Typography variant="button" display="block" gutterBottom>
+ {i18n.t('createRichTextFile')}
+ </Typography>
+ </Tooltip>
+ </Button>
+ <Button
+ // variant="contained"
+ onClick={createTextFile}
+ className={classes.createButton}
+ data-tid="createTextFileButton"
+ disabled={noSuitableLocation}
+ >
+ <Tooltip title={i18n.t('createTextFileTitle')}>
+ <Typography variant="button" display="block" gutterBottom>
+ {i18n.t('createTextFile')}
+ </Typography>
+ </Tooltip>
+ </Button>
+ </ButtonGroup>
+ </Grid>
+ <Grid style={{ marginTop: 20 }} item xs={12}>
+ <Button
+ variant="outlined"
+ onClick={() => {
+ onClose();
+ toggleLocationDialog();
+ }}
+ className={classes.createButton}
+ data-tid="createLocationButton"
+ >
+ <Tooltip title={i18n.t('createLocationTitle')}>
+ <Typography variant="button" display="block" gutterBottom>
+ {i18n.t('core:createLocation')}
+ </Typography>
+ </Tooltip>
+ </Button>
+ </Grid>
+ </Grid>
+ </AccordionDetails>
+ </Accordion>
+ <Accordion>
+ <AccordionSummary
+ expandIcon={<ExpandIcon />}
+ aria-controls="panelGeneral-content"
+ id="panelGeneral-header"
+ >
+ <Typography>{i18n.t('core:moreOperations')}</Typography>
+ </AccordionSummary>
+ <AccordionDetails>
+ <Grid item xs={12}>
<Button
- variant="contained"
- onClick={createRichTextFile}
- className={classes.createButton}
- data-tid="createRichTextFileButton"
- disabled={noSuitableLocation}
- >
- <Tooltip title={i18n.t('createNoteTitle')}>
- <Typography variant="button" display="block" gutterBottom>
- {i18n.t('createRichTextFile')}
- </Typography>
- </Tooltip>
- </Button>
- <Button
- variant="contained"
- onClick={createTextFile}
+ variant="outlined"
+ onClick={() => {
+ onClose();
+ toggleCreateDirectoryDialog();
+ }}
className={classes.createButton}
- data-tid="createTextFileButton"
+ data-tid="newSubDirectory"
disabled={noSuitableLocation}
>
- <Tooltip title={i18n.t('createTextFileTitle')}>
- <Typography variant="button" display="block" gutterBottom>
- {i18n.t('createTextFile')}
- </Typography>
- </Tooltip>
+ {i18n.t('core:newSubdirectory')}
</Button>
- </ButtonGroup>
- </Grid>
- <Grid style={{ marginTop: 20 }} item xs={12}>
- <Button
- variant="outlined"
- onClick={() => {
- onClose();
- toggleLocationDialog();
- }}
- className={classes.createButton}
- data-tid="createLocationButton"
- >
- <Tooltip title={i18n.t('createLocationTitle')}>
- <Typography variant="button" display="block" gutterBottom>
- {i18n.t('core:createLocation')}
- </Typography>
+ </Grid>
+ <Grid style={{ marginTop: 20 }} item xs={12}>
+ <Tooltip title={i18n.t('core:addFilesTitle')}>
+ <Button
+ variant="outlined"
+ onClick={addFile}
+ className={classes.createButton}
+ data-tid="addFilesButton"
+ disabled={noSuitableLocation}
+ >
+ {i18n.t('addFiles')}
+ </Button>
</Tooltip>
- </Button>
- </Grid>
- <Grid style={{ marginTop: 20 }} item xs={12}>
- <Button
- variant="outlined"
- onClick={() => {
- onClose();
- toggleCreateDirectoryDialog();
- }}
- className={classes.createButton}
- data-tid="newSubDirectory"
- disabled={noSuitableLocation}
- >
- {i18n.t('core:newSubdirectory')}
- </Button>
- </Grid>
- <Grid style={{ marginTop: 20 }} item xs={12}>
- <Tooltip title={i18n.t('core:addFilesTitle')}>
- <Button
- variant="outlined"
- onClick={addFile}
- className={classes.createButton}
- data-tid="addFilesButton"
- disabled={noSuitableLocation}
+ </Grid>
+ <Grid item xs={12}>
+ <TextField
+ error={invalidURL}
+ label={i18n.t('core:url')}
+ margin="dense"
+ name="name"
+ fullWidth={true}
+ data-tid="newUrlTID"
+ onKeyDown={event => {
+ if (event.key === 'Enter') {
+ downloadURL();
+ }
+ }}
+ onChange={handleUrlChange}
+ />
+ </Grid>
+ <Grid item xs={12}>
+ <ButtonGroup
+ style={{
+ textAlign: 'center',
+ width: '100%'
+ }}
>
- {i18n.t('addFiles')}
- </Button>
- </Tooltip>
- </Grid>
- <Grid item xs={12}>
- <TextField
- error={invalidURL}
- label={i18n.t('core:url')}
- margin="dense"
- name="name"
- fullWidth={true}
- data-tid="newUrlTID"
- onKeyDown={event => {
- if (event.key === 'Enter') {
- downloadURL();
- }
+ <Button
+ data-tid="cancelRenameEntryTID"
+ className={classes.createButton}
+ onClick={() => downloadURL()}
+ >
+ {i18n.t('core:downloadFile')}
+ </Button>
+ </ButtonGroup>
+ </Grid>
+ {/* </Grid> */}
+ <input
+ style={{ display: 'none' }}
+ ref={input => {
+ fileInput = input;
}}
- onChange={handleUrlChange}
+ accept="*"
+ type="file"
+ multiple
+ onChange={handleFileInputChange}
/>
- </Grid>
- <Grid item xs={12}>
- <ButtonGroup
- style={{
- textAlign: 'center',
- width: '100%'
- }}
+ </AccordionDetails>
+ </Accordion>
+ <Grid item style={{ marginTop: 20 }} xs={12}>
+ {noSuitableLocation ? (
+ <Typography variant="caption">
+ {i18n.t('noSuitableLocation')}
+ </Typography>
+ ) : (
+ <Typography
+ style={{ display: 'flex', alignItems: 'center' }}
+ variant="caption"
>
- <Button
- data-tid="cancelRenameEntryTID"
- className={classes.createButton}
- onClick={() => downloadURL()}
- >
- {i18n.t('core:downloadFile')}
- </Button>
- </ButtonGroup>
- </Grid>
+ <InfoIcon style={{ paddingRight: 10 }} />
+ {i18n.t('core:entriesWillBeCreatedIn') +
+ ' ' +
+ (currentLocation ? currentLocation.name : '') +
+ ' ' +
+ targetDirectoryPath}
+ </Typography>
+ )}
</Grid>
- <input
- style={{ display: 'none' }}
- ref={input => {
- fileInput = input;
- }}
- accept="*"
- type="file"
- multiple
- onChange={handleFileInputChange}
- />
</DialogContent>
</Dialog>
);
diff --git a/app/components/dialogs/CreateEditLocationDialog.tsx b/app/components/dialogs/CreateEditLocationDialog.tsx
index b6a283ef0..53c697c5f 100644
--- a/app/components/dialogs/CreateEditLocationDialog.tsx
+++ b/app/components/dialogs/CreateEditLocationDialog.tsx
@@ -54,7 +54,6 @@ import {
MenuItem,
Select
} from '@mui/material';
-import ExpandMoreIcon from '@mui/icons-material/ExpandMore';
import i18n from '-/services/i18n';
import { Pro } from '-/pro';
import ObjectStoreForm from './ObjectStoreForm';
@@ -75,6 +74,7 @@ import useTheme from '@mui/styles/useTheme';
import useMediaQuery from '@mui/material/useMediaQuery';
import { loadLocationDataPromise } from '-/services/utils-io';
import { getUuid } from '@tagspaces/tagspaces-common/utils-io';
+import { ExpandIcon } from '-/components/CommonIcons';
const styles: any = theme => ({
formControl: {
@@ -543,13 +543,6 @@ function CreateEditLocationDialog(props: Props) {
}}
>
<Accordion defaultExpanded>
- {/* <AccordionSummary
- expandIcon={<ExpandMoreIcon />}
- aria-controls="panelGeneral-content"
- id="panelGeneral-header"
- >
- <Typography>{i18n.t('core:switchGeneral')}</Typography>
- </AccordionSummary> */}
<AccordionDetails style={{ paddingTop: 16 }}>
<FormGroup>
<FormControl disabled={disableLocationTypeSwitch} fullWidth>
@@ -677,7 +670,7 @@ function CreateEditLocationDialog(props: Props) {
<Accordion>
<AccordionSummary
data-tid="switchAdvancedModeTID"
- expandIcon={<ExpandMoreIcon />}
+ expandIcon={<ExpandIcon />}
aria-controls="panelAdvanced-content"
id="panelAdvanced-header"
>