Skip to content

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

TSN26x - WebDav re-integration v2 (#1685)

Stanimirdc0aa19f729a
diff --git a/app/components/DirectoryTreeView.tsx b/app/components/DirectoryTreeView.tsx
index 7f2a814cb..15437cfad 100644
--- a/app/components/DirectoryTreeView.tsx
+++ b/app/components/DirectoryTreeView.tsx
@@ -70,8 +70,12 @@ const DirectoryTreeView = forwardRef(
.catch(error => {
console.log('enableObjectStoreSupport', error);
});
+ } else if (location.type === locationType.TYPE_WEBDAV) {
+ PlatformIO.enableWebdavSupport(location);
+ loadSubDirectories(location);
} else if (location.type === locationType.TYPE_LOCAL) {
PlatformIO.disableObjectStoreSupport();
+ PlatformIO.disableWebdavSupport();
loadSubDirectories(location);
}
},
diff --git a/app/components/EntryContainer.tsx b/app/components/EntryContainer.tsx
index 9002cf94b..2ad8fc1d8 100644
--- a/app/components/EntryContainer.tsx
+++ b/app/components/EntryContainer.tsx
@@ -634,7 +634,7 @@ function EntryContainer(props: Props) {
</IconButton>
</Tooltip>
)}
- {!(PlatformIO.haveObjectStoreSupport() || AppConfig.isWeb) && (
+ {!(PlatformIO.haveObjectStoreSupport() || PlatformIO.haveWebDavSupport() || AppConfig.isWeb) && (
<Tooltip title={i18n.t('core:openFileExternally')}>
<IconButton
aria-label={i18n.t('core:openFileExternally')}
@@ -772,7 +772,7 @@ function EntryContainer(props: Props) {
const renderFolderToolbar = () => (
<div className={props.classes.toolbar2}>
<div className={props.classes.flexLeft}>
- {!(PlatformIO.haveObjectStoreSupport() || AppConfig.isWeb) && (
+ {!(PlatformIO.haveObjectStoreSupport() || PlatformIO.haveWebDavSupport() || AppConfig.isWeb) && (
<Tooltip title={i18n.t('core:openDirectoryExternally')}>
<IconButton
aria-label={i18n.t('core:openDirectoryExternally')}
diff --git a/app/components/EntryProperties.tsx b/app/components/EntryProperties.tsx
index 4710de964..60d9faa63 100644
--- a/app/components/EntryProperties.tsx
+++ b/app/components/EntryProperties.tsx
@@ -351,7 +351,10 @@ function EntryProperties(props: Props) {
const setThumb = (filePath, thumbFilePath) => {
if (filePath !== undefined) {
- if (PlatformIO.haveObjectStoreSupport()) {
+ if (
+ PlatformIO.haveObjectStoreSupport() ||
+ PlatformIO.haveWebDavSupport()
+ ) {
const thumbUrl = PlatformIO.getURLforPath(thumbFilePath);
props.updateThumbnailUrl(currentEntry.path, thumbUrl);
return Promise.resolve(true);
@@ -479,7 +482,7 @@ function EntryProperties(props: Props) {
);
}
let url;
- if (PlatformIO.haveObjectStoreSupport()) {
+ if (PlatformIO.haveObjectStoreSupport() || PlatformIO.haveWebDavSupport()) {
url = PlatformIO.getURLforPath(thumbPath);
} else {
url = thumbPath + '?' + new Date().getTime();
diff --git a/app/components/FolderContainer.tsx b/app/components/FolderContainer.tsx
index 0c576d980..5e03f7ca3 100644
--- a/app/components/FolderContainer.tsx
+++ b/app/components/FolderContainer.tsx
@@ -678,30 +678,40 @@ function FolderContainer(props: Props) {
width: '100%'
}}
>
- {isLoading && PlatformIO.haveObjectStoreSupport() && (
- <div
- style={{
- position: 'absolute',
- zIndex: 1000,
- height: '100%',
- width: '100%',
- display: 'flex',
- justifyContent: 'center',
- alignItems: 'center',
- borderRadius: 10,
- backdropFilter: 'grayscale(1)'
- // backdropFilter: 'blur(2px)',
- // backgroundColor: '#fafafa33' // red: '#eb585882' '#d9d9d980'
- }}
- >
- <div className="lds-ellipsis">
- <div style={{ backgroundColor: theme.palette.primary.main }} />
- <div style={{ backgroundColor: theme.palette.primary.main }} />
- <div style={{ backgroundColor: theme.palette.primary.main }} />
- <div style={{ backgroundColor: theme.palette.primary.main }} />
+ {isLoading &&
+ (PlatformIO.haveObjectStoreSupport() ||
+ PlatformIO.haveWebDavSupport()) && (
+ <div
+ style={{
+ position: 'absolute',
+ zIndex: 1000,
+ height: '100%',
+ width: '100%',
+ display: 'flex',
+ justifyContent: 'center',
+ alignItems: 'center',
+ borderRadius: 10,
+ backdropFilter: 'grayscale(1)'
+ // backdropFilter: 'blur(2px)',
+ // backgroundColor: '#fafafa33' // red: '#eb585882' '#d9d9d980'
+ }}
+ >
+ <div className="lds-ellipsis">
+ <div
+ style={{ backgroundColor: theme.palette.primary.main }}
+ />
+ <div
+ style={{ backgroundColor: theme.palette.primary.main }}
+ />
+ <div
+ style={{ backgroundColor: theme.palette.primary.main }}
+ />
+ <div
+ style={{ backgroundColor: theme.palette.primary.main }}
+ />
+ </div>
</div>
- </div>
- )}
+ )}
{renderPerspective()}
{isRenameEntryDialogOpened && (
<RenameEntryDialog
diff --git a/app/components/LocationManager.tsx b/app/components/LocationManager.tsx
index 0766b0d17..2625f334e 100644
--- a/app/components/LocationManager.tsx
+++ b/app/components/LocationManager.tsx
@@ -136,20 +136,22 @@ function LocationManager(props: Props) {
flexDirection: 'column'
}}
>
- {isLoading && PlatformIO.haveObjectStoreSupport() && (
- <div
- style={{
- position: 'absolute',
- zIndex: 1000,
- height: 'calc(100% - 180px)',
- width: 310,
- backdropFilter: 'grayscale(1)'
- // backgroundColor: 'red'
- // backdropFilter: 'blur(2px)',
- // backgroundColor: '#fafafaAA' // red: '#eb585882' '#d9d9d980'
- }}
- />
- )}
+ {isLoading &&
+ (PlatformIO.haveObjectStoreSupport() ||
+ PlatformIO.haveWebDavSupport()) && (
+ <div
+ style={{
+ position: 'absolute',
+ zIndex: 1000,
+ height: 'calc(100% - 180px)',
+ width: 310,
+ backdropFilter: 'grayscale(1)'
+ // backgroundColor: 'red'
+ // backdropFilter: 'blur(2px)',
+ // backgroundColor: '#fafafaAA' // red: '#eb585882' '#d9d9d980'
+ }}
+ />
+ )}
<LocationManagerMenu
importLocations={() => {
fileInputRef.current.click();
diff --git a/app/components/LocationView.tsx b/app/components/LocationView.tsx
index 97465eabe..72f45cc49 100644
--- a/app/components/LocationView.tsx
+++ b/app/components/LocationView.tsx
@@ -185,6 +185,7 @@ function LocationView(props: Props) {
// TODO handle monitor -> isOver and change folder icon
console.log('Dropped files: ' + path);
if (targetLocation.type === locationType.TYPE_CLOUD) {
+ // TODO Webdav
PlatformIO.enableObjectStoreSupport(targetLocation)
.then(() => {
props.resetProgress();
diff --git a/app/components/PathBreadcrumbs.tsx b/app/components/PathBreadcrumbs.tsx
index 3bb018e43..873a4af07 100644
--- a/app/components/PathBreadcrumbs.tsx
+++ b/app/components/PathBreadcrumbs.tsx
@@ -23,7 +23,10 @@ import Tooltip from '@material-ui/core/Tooltip';
import Chip from '@material-ui/core/Chip';
import ExpandMoreIcon from '@material-ui/icons/MoreVert';
import PlatformIO from '../services/platform-facade';
-import { normalizePath, extractShortDirectoryName } from '@tagspaces/tagspaces-platforms/paths';
+import {
+ normalizePath,
+ extractShortDirectoryName
+} from '@tagspaces/tagspaces-platforms/paths';
import i18n from '../services/i18n';
import DirectoryMenu from './menus/DirectoryMenu';
import { TS } from '-/tagspaces.namespace';
diff --git a/app/components/dialogs/AddRemoveTagsDialog.tsx b/app/components/dialogs/AddRemoveTagsDialog.tsx
index 746b7c988..9bb7cf24b 100644
--- a/app/components/dialogs/AddRemoveTagsDialog.tsx
+++ b/app/components/dialogs/AddRemoveTagsDialog.tsx
@@ -33,7 +33,10 @@ import Typography from '@material-ui/core/Typography';
import Dialog from '@material-ui/core/Dialog';
import TagsSelect from '../TagsSelect';
import i18n from '-/services/i18n';
-import { extractFileName, extractDirectoryName } from '@tagspaces/tagspaces-platforms/paths';
+import {
+ extractFileName,
+ extractDirectoryName
+} from '@tagspaces/tagspaces-platforms/paths';
import PlatformIO from '-/services/platform-facade';
import { TS } from '-/tagspaces.namespace';
import DialogCloseButton from '-/components/dialogs/DialogCloseButton';
diff --git a/app/components/dialogs/CreateEditLocationDialog.tsx b/app/components/dialogs/CreateEditLocationDialog.tsx
index 4975e9ddf..5eac5cbb0 100644
--- a/app/components/dialogs/CreateEditLocationDialog.tsx
+++ b/app/components/dialogs/CreateEditLocationDialog.tsx
@@ -29,9 +29,6 @@ import FormControl from '@material-ui/core/FormControl';
import FormControlLabel from '@material-ui/core/FormControlLabel';
import FormGroup from '@material-ui/core/FormGroup';
import Typography from '@material-ui/core/Typography';
-import Grid from '@material-ui/core/Grid';
-import Radio from '@material-ui/core/Radio';
-import RadioGroup from '@material-ui/core/RadioGroup';
import Tooltip from '@material-ui/core/Tooltip';
import Dialog from '@material-ui/core/Dialog';
import List from '@material-ui/core/List';
@@ -47,6 +44,15 @@ import { bindActionCreators } from 'redux';
import { connect } from 'react-redux';
import { locationType } from '@tagspaces/tagspaces-platforms/misc';
import AppConfig from '@tagspaces/tagspaces-platforms/AppConfig';
+import {
+ Accordion,
+ AccordionDetails,
+ AccordionSummary,
+ InputLabel,
+ MenuItem,
+ Select
+} from '@material-ui/core';
+import ExpandMoreIcon from '@material-ui/icons/ExpandMore';
import i18n from '-/services/i18n';
import { Pro } from '-/pro';
import ObjectStoreForm from './ObjectStoreForm';
@@ -60,7 +66,8 @@ import { actions as LocationActions } from '-/reducers/locations';
import { getPersistTagsInSidecarFile } from '-/reducers/settings';
import ConfirmDialog from '-/components/dialogs/ConfirmDialog';
import { actions as LocationIndexActions } from '-/reducers/location-index';
-import PlatformIO from "-/services/platform-facade";
+import PlatformIO from '-/services/platform-facade';
+import WebdavForm from '-/components/dialogs/WebdavForm';
const styles: any = theme => ({
formControl: {
@@ -85,15 +92,21 @@ function CreateEditLocationDialog(props: Props) {
const IgnorePatternDialog =
Pro && Pro.UI ? Pro.UI.IgnorePatternDialog : false;
const { location } = props;
- const [showAdvancedMode, setShowAdvancedMode] = useState<boolean>(false);
const [showSecretAccessKey, setShowSecretAccessKey] = useState<boolean>(
false
);
+ const [showPassword, setShowPassword] = useState<boolean>(false);
const [errorTextPath, setErrorTextPath] = useState<boolean>(false);
const [errorTextName, setErrorTextName] = useState<boolean>(false);
const [name, setName] = useState<string>(
location && location.name ? location.name : ''
);
+ const [username, setUserName] = useState<string>(
+ location && location.username ? location.username : ''
+ );
+ const [password, setPassword] = useState<string>(
+ location && location.password ? location.password : ''
+ );
let defaultIndexAge = AppConfig.maxIndexAge;
if (location && location.maxIndexAge && location.maxIndexAge > 0) {
const maxIndexAsString = location.maxIndexAge + '';
@@ -116,6 +129,7 @@ function CreateEditLocationDialog(props: Props) {
const [endpointURL, setEndpointURL] = useState<string>(
location ? location.endpointURL : ''
);
+ const [authType, setAuthType] = useState<string>('password');
const [isDefault, setIsDefault] = useState<boolean>(
location ? location.isDefault : false
);
@@ -164,6 +178,7 @@ function CreateEditLocationDialog(props: Props) {
location ? location.uuid : uuidv1()
);
const [cloudErrorTextName, setCloudErrorTextName] = useState<boolean>(false);
+ const [webdavErrorUrl, setWebdavErrorUrl] = useState<boolean>(false);
const [cloudErrorAccessKey, setCloudErrorAccessKey] = useState<boolean>(
false
);
@@ -253,10 +268,29 @@ function CreateEditLocationDialog(props: Props) {
return false;
};
+ const validateWebdav = (checkOnly = false): boolean => {
+ if (!name || name.length === 0) {
+ if (checkOnly) return true;
+ setErrorTextName(true);
+ } else if (!checkOnly) {
+ setErrorTextName(false);
+ }
+ if (!endpointURL || endpointURL.length === 0) {
+ if (checkOnly) return true;
+ setWebdavErrorUrl(true);
+ } else if (!checkOnly) {
+ setWebdavErrorUrl(false);
+ }
+ return false;
+ };
+
const disableConfirmButton = () => {
if (type === locationType.TYPE_LOCAL) {
return errorTextName || errorTextPath || validateLocal(true);
}
+ if (type === locationType.TYPE_WEBDAV) {
+ return errorTextName || validateWebdav(true);
+ }
return (
cloudErrorTextName ||
cloudErrorAccessKey ||
@@ -285,6 +319,24 @@ function CreateEditLocationDialog(props: Props) {
maxIndexAge,
ignorePatternPaths
};
+ } else if (type === locationType.TYPE_WEBDAV) {
+ loc = {
+ uuid: props.location ? props.location.uuid : newuuid,
+ type,
+ authType,
+ name,
+ username,
+ password,
+ secretAccessKey,
+ endpointURL,
+ isDefault,
+ isReadOnly,
+ disableIndexing,
+ fullTextIndex,
+ watchForChanges,
+ maxIndexAge,
+ ignorePatternPaths
+ };
} else if (type === locationType.TYPE_CLOUD) {
loc = {
uuid: props.location ? props.location.uuid : newuuid,
@@ -335,8 +387,6 @@ function CreateEditLocationDialog(props: Props) {
cloudErrorSecretAccessKey={cloudErrorSecretAccessKey}
cloudErrorBucketName={false}
cloudErrorRegion={false}
- errorTextId={false}
- showAdvancedMode={showAdvancedMode}
showSecretAccessKey={showSecretAccessKey}
storeName={storeName}
storePath={storePath}
@@ -347,7 +397,6 @@ function CreateEditLocationDialog(props: Props) {
bucketName={bucketName}
region={region}
endpointURL={endpointURL}
- newuuid={newuuid}
setStoreName={setStoreName}
setStorePath={setStorePath}
setAccessKeyId={setAccessKeyId}
@@ -355,23 +404,39 @@ function CreateEditLocationDialog(props: Props) {
setSessionToken={setSessionToken}
setBucketName={setBucketName}
setEndpointURL={setEndpointURL}
- setNewUuid={setNewUuid}
setRegion={setRegion}
/>
);
+ } else if (type === locationType.TYPE_WEBDAV) {
+ content = (
+ <WebdavForm
+ errorTextName={errorTextName}
+ setName={setName}
+ setUserName={setUserName}
+ setPassword={setPassword}
+ setEndpointURL={setEndpointURL}
+ endpointURL={endpointURL}
+ name={name}
+ userName={username}
+ password={password}
+ setShowPassword={setShowPassword}
+ showPassword={showPassword}
+ webdavErrorUrl={webdavErrorUrl}
+ authType={authType}
+ setAuthType={setAuthType}
+ secretAccessKey={secretAccessKey}
+ setSecretAccessKey={setSecretAccessKey}
+ />
+ );
} else {
content = (
<LocalForm
- showAdvancedMode={showAdvancedMode}
errorTextPath={errorTextPath}
errorTextName={errorTextName}
- errorTextId={false}
setName={setName}
setPath={setPath}
- setNewUuid={setNewUuid}
path={path}
name={name}
- newuuid={newuuid}
/>
);
}
@@ -382,7 +447,7 @@ function CreateEditLocationDialog(props: Props) {
: props.isPersistTagsInSidecar;
const disableLocationTypeSwitch: boolean =
- !Pro || AppConfig.isWeb || props.location !== undefined;
+ !Pro || props.location !== undefined; // || AppConfig.isWeb
return (
<Dialog
@@ -410,383 +475,405 @@ function CreateEditLocationDialog(props: Props) {
</DialogTitle>
<DialogContent
style={{
- overflow: AppConfig.isFirefox ? 'auto' : 'overlay'
+ overflow: AppConfig.isFirefox ? 'auto' : 'overlay',
+ minHeight: 200,
+ padding: 8
}}
>
- <Grid container spacing={2}>
- <Grid item xs={2} style={{ marginTop: 10, textAlign: 'left' }}>
- <Typography>{i18n.t('core:locationType')}</Typography>
- </Grid>
- <Grid item xs={10}>
- <FormControl disabled={disableLocationTypeSwitch}>
- <RadioGroup
- aria-label={i18n.t('core:locationType')}
- name="type"
- value={type}
- onChange={(event: ChangeEvent<HTMLInputElement>) =>
- setType(event.target.value)
+ <Accordion defaultExpanded>
+ <AccordionSummary
+ expandIcon={<ExpandMoreIcon />}
+ aria-controls="panelGeneral-content"
+ id="panelGeneral-header"
+ >
+ <Typography>{i18n.t('core:switchGeneral')}</Typography>
+ </AccordionSummary>
+ <AccordionDetails>
+ <FormGroup>
+ <FormControl disabled={disableLocationTypeSwitch} fullWidth>
+ <InputLabel id="locationLabelID">
+ {i18n.t('core:locationType')}
+ </InputLabel>
+ <Select
+ labelId="locationLabelID"
+ id="locationTypeID"
+ value={type}
+ label={i18n.t('core:locationType')}
+ onChange={(event: ChangeEvent<HTMLInputElement>) =>
+ setType(event.target.value)
+ }
+ >
+ {!AppConfig.isWeb && (
+ <MenuItem key="TYPE_LOCAL" value={locationType.TYPE_LOCAL}>
+ {i18n.t('core:localLocation')}
+ </MenuItem>
+ )}
+ <MenuItem key="TYPE_CLOUD" value={locationType.TYPE_CLOUD}>
+ {i18n.t('core:objectStorage') + ' (AWS, MinIO, Wasabi,...)'}
+ </MenuItem>
+ <MenuItem key="TYPE_WEBDAV" value={locationType.TYPE_WEBDAV}>
+ {i18n.t('core:webdavLocation') + ' (experimental)'}
+ </MenuItem>
+ </Select>
+ </FormControl>
+ {content}
+ <FormControlLabel
+ className={classes.formControl}
+ labelPlacement="start"
+ style={{ justifyContent: 'space-between' }}
+ control={
+ <Switch
+ data-tid="locationIsDefault"
+ name="isDefault"
+ checked={isDefault}
+ onChange={(event: ChangeEvent<HTMLInputElement>) =>
+ setIsDefault(event.target.checked)
+ }
+ />
}
- row
- >
- <FormControlLabel
- data-tid="localLocation"
- value={locationType.TYPE_LOCAL}
- control={<Radio />}
- label={i18n.t('core:localLocation')}
+ label={i18n.t('core:startupLocation')}
+ />
+ <FormControlLabel
+ className={classes.formControl}
+ labelPlacement="start"
+ style={{ justifyContent: 'space-between' }}
+ control={
+ <Switch
+ disabled={!Pro}
+ data-tid="changeFullTextIndex"
+ name="fullTextIndex"
+ checked={fullTextIndex}
+ onChange={(event: ChangeEvent<HTMLInputElement>) => {
+ setFullTextIndex(event.target.checked);
+ if (event.target.checked) {
+ setFullTextIndexConfirmDialogOpened(true);
+ }
+ }}
+ />
+ }
+ label={
+ <>
+ {i18n.t('core:createFullTextIndex')}
+ {Pro ? <BetaLabel /> : <ProLabel />}
+ </>
+ }
+ />
+ {isFullTextIndexConfirmDialogOpened && location && (
+ <ConfirmDialog
+ open={isFullTextIndexConfirmDialogOpened}
+ onClose={() => {
+ setFullTextIndexConfirmDialogOpened(false);
+ }}
+ title={i18n.t('core:confirm')}
+ content={i18n.t('core:fullTextIndexRegenerate')}
+ confirmCallback={result => {
+ if (result) {
+ props.createLocationIndex(location);
+ } else {
+ setFullTextIndexConfirmDialogOpened(false);
+ }
+ }}
+ cancelDialogTID="cancelSaveBeforeCloseDialog"
+ confirmDialogTID="confirmSaveBeforeCloseDialog"
+ confirmDialogContentTID="confirmDialogContent"
/>
- <FormControlLabel
- data-tid="objectStorageLocation"
- value={locationType.TYPE_CLOUD}
- control={<Radio />}
- title={i18n.t('core:objectStorageTitle')}
- label={
- <>
- {i18n.t('core:objectStorage') +
- ' (AWS, MinIO, Wasabi ...)'}
- <ProLabel />
- </>
- }
+ )}
+ <FormControlLabel
+ className={classes.formControl}
+ labelPlacement="start"
+ style={{ justifyContent: 'space-between' }}
+ control={
+ <Switch
+ disabled={!Pro || type === locationType.TYPE_CLOUD}
+ data-tid="changeWatchForChanges"
+ name="watchForChanges"
+ checked={watchForChanges}
+ onChange={(event: ChangeEvent<HTMLInputElement>) =>
+ setWatchForChanges(event.target.checked)
+ }
+ />
+ }
+ label={
+ <>
+ {i18n.t('core:watchForChangesInLocation')}
+ <ProLabel />
+ </>
+ }
+ />
+ </FormGroup>
+ </AccordionDetails>
+ </Accordion>
+ <Accordion>
+ <AccordionSummary
+ data-tid="switchAdvancedModeTID"
+ expandIcon={<ExpandMoreIcon />}
+ aria-controls="panelAdvanced-content"
+ id="panelAdvanced-header"
+ >
+ <Typography>{i18n.t('core:switchAdvanced')}</Typography>
+ </AccordionSummary>
+ <AccordionDetails>
+ <FormGroup style={{ width: '100%' }}>
+ <FormControl fullWidth={true}>
+ <InputLabel htmlFor="newuuid">
+ {i18n.t('core:locationId')}
+ </InputLabel>
+ <Input
+ required
+ margin="dense"
+ name="newuuid"
+ fullWidth={true}
+ data-tid="newuuid"
+ placeholder="Unique location identifier"
+ onChange={event => setNewUuid(event.target.value)}
+ value={newuuid}
/>
- </RadioGroup>
- </FormControl>
- </Grid>
- </Grid>
- {content}
- <FormGroup style={{ marginTop: 10 }}>
- <FormControlLabel
- className={classes.formControl}
- labelPlacement="start"
- style={{ justifyContent: 'space-between' }}
- control={
- <Switch
- data-tid="locationIsDefault"
- name="isDefault"
- checked={isDefault}
- onChange={(event: ChangeEvent<HTMLInputElement>) =>
- setIsDefault(event.target.checked)
+ </FormControl>
+ <FormControlLabel
+ className={classes.formControl}
+ labelPlacement="start"
+ style={{ justifyContent: 'space-between' }}
+ control={
+ <Switch
+ disabled={!Pro}
+ data-tid="changeReadOnlyMode"
+ name="isReadOnly"
+ checked={isReadOnly}
+ onChange={(event: ChangeEvent<HTMLInputElement>) =>
+ setIsReadOnly(event.target.checked)
+ }
+ />
+ }
+ label={
+ <>
+ {i18n.t('core:readonlyModeSwitch')}
+ <ProLabel />
+ </>
}
/>
- }
- label={i18n.t('core:startupLocation')}
- />
- <FormControlLabel
- className={classes.formControl}
- labelPlacement="start"
- style={{ justifyContent: 'space-between' }}
- control={
- <Switch
- disabled={!Pro}
- data-tid="changeFullTextIndex"
- name="fullTextIndex"
- checked={fullTextIndex}
- onChange={(event: ChangeEvent<HTMLInputElement>) => {
- setFullTextIndex(event.target.checked);
- if (event.target.checked) {
- setFullTextIndexConfirmDialogOpened(true);
- }
- }}
+ <FormControlLabel
+ className={classes.formControl}
+ labelPlacement="start"
+ style={{ justifyContent: 'space-between' }}
+ control={
+ <Switch
+ disabled={!Pro}
+ data-tid="disableIndexingTID"
+ name="disableIndexing"
+ checked={disableIndexing}
+ onChange={(event: ChangeEvent<HTMLInputElement>) =>
+ setIndexDisable(event.target.checked)
+ }
+ />
+ }
+ label={
+ <>
+ {i18n.t('core:disableIndexing')}
+ <ProLabel />
+ </>
+ }
/>
- }
- label={
- <>
- {i18n.t('core:createFullTextIndex')}
- {Pro ? <BetaLabel /> : <ProLabel />}
- </>
- }
- />
- {isFullTextIndexConfirmDialogOpened && location && (
- <ConfirmDialog
- open={isFullTextIndexConfirmDialogOpened}
- onClose={() => {
- setFullTextIndexConfirmDialogOpened(false);
- }}
- title={i18n.t('core:confirm')}
- content={i18n.t('core:fullTextIndexRegenerate')}
- confirmCallback={result => {
- if (result) {
- props.createLocationIndex(location);
- } else {
- setFullTextIndexConfirmDialogOpened(false);
+ <FormControlLabel
+ className={classes.formControl}
+ labelPlacement="start"
+ style={{ justifyContent: 'space-between' }}
+ control={
+ <Input
+ name="maxIndexAge"
+ style={{
+ maxWidth: 70,
+ marginLeft: 15,
+ marginBottom: 15
+ }}
+ type="number"
+ data-tid="maxIndexAgeTID"
+ inputProps={{ min: 0 }}
+ value={maxIndexAge / (1000 * 60)}
+ onChange={event => changeMaxIndexAge(event.target.value)}
+ />
}
- }}
- cancelDialogTID="cancelSaveBeforeCloseDialog"
- confirmDialogTID="confirmSaveBeforeCloseDialog"
- confirmDialogContentTID="confirmDialogContent"
- />
- )}
- <FormControlLabel
- className={classes.formControl}
- labelPlacement="start"
- style={{ justifyContent: 'space-between' }}
- control={
- <Switch
- disabled={!Pro || type === locationType.TYPE_CLOUD}
- data-tid="changeWatchForChanges"
- name="watchForChanges"
- checked={watchForChanges}
- onChange={(event: ChangeEvent<HTMLInputElement>) =>
- setWatchForChanges(event.target.checked)
+ label={
+ <Typography>
+ {i18n.t('core:maxIndexAge')}
+ <InfoIcon tooltip={i18n.t('core:maxIndexAgeHelp')} />
+ </Typography>
}
/>
- }
- label={
- <>
- {i18n.t('core:watchForChangesInLocation')}
- <ProLabel />
- </>
- }
- />
- {showAdvancedMode && (
- <FormControlLabel
- className={classes.formControl}
- labelPlacement="start"
- style={{ justifyContent: 'space-between' }}
- control={
- <Switch
- disabled={!Pro}
- data-tid="changeReadOnlyMode"
- name="isReadOnly"
- checked={isReadOnly}
- onChange={(event: ChangeEvent<HTMLInputElement>) =>
- setIsReadOnly(event.target.checked)
+ {AppConfig.useSidecarsForFileTaggingDisableSetting ? (
+ <FormControlLabel
+ className={classes.formControl}
+ labelPlacement="start"
+ style={{ justifyContent: 'space-between' }}
+ control={
+ <Button size="small" variant="outlined" disabled>
+ {currentTagsSetting
+ ? i18n.t('core:useSidecarFile')
+ : i18n.t('core:renameFile')}
+ </Button>
+ }
+ label={
+ <Typography variant="caption" display="block" gutterBottom>
+ {i18n.t('core:fileTaggingSetting')}
+ </Typography>
}
/>
- }
- label={
- <>
- {i18n.t('core:readonlyModeSwitch')}
- <ProLabel />
- </>
- }
- />
- )}
- {showAdvancedMode && (
- <FormControlLabel
- className={classes.formControl}
- labelPlacement="start"
- style={{ justifyContent: 'space-between' }}
- control={
- <Switch
+ ) : (
+ <FormControlLabel
+ labelPlacement="top"
+ className={classes.formControl}
+ style={{ alignItems: 'start', marginBottom: 10 }}
+ control={
+ <ToggleButtonGroup
+ value={persistTagsInSidecarFile}
+ size="small"
+ exclusive
+ >
+ <ToggleButton
+ value={null}
+ data-tid="settingsSetPersistTagsDefault"
+ onClick={() => setPersistTagsInSidecarFile(null)}
+ >
+ <Tooltip
+ arrow
+ title={
+ <Typography color="inherit">
+ {i18n.t('core:useDefaultTaggingType')}:{' '}
+ <b>
+ {currentTagsSetting
+ ? i18n.t('core:useSidecarFile')
+ : i18n.t('core:renameFile')}
+ </b>
+ </Typography>
+ }
+ >
+ <div style={{ display: 'flex' }}>
+ {persistTagsInSidecarFile === null && <CheckIcon />}
+ &nbsp;{i18n.t('core:default')}&nbsp;&nbsp;
+ </div>
+ </Tooltip>
+ </ToggleButton>
+ <ToggleButton
+ value={false}
+ data-tid="settingsSetPersistTagsInFileName"
+ onClick={() => setPersistTagsInSidecarFile(false)}
+ >
+ <Tooltip
+ arrow
+ title={
+ <Typography color="inherit">
+ {i18n.t('core:tagsInFilenameExplanation')}
+ </Typography>
+ }
+ >
+ <div style={{ display: 'flex' }}>
+ {persistTagsInSidecarFile !== null &&
+ !persistTagsInSidecarFile && <CheckIcon />}
+ &nbsp;{i18n.t('core:renameFile')}&nbsp;&nbsp;
+ </div>
+ </Tooltip>
+ </ToggleButton>
+ <ToggleButton
+ value={true}
+ data-tid="settingsSetPersistTagsInSidecarFile"
+ onClick={() => setPersistTagsInSidecarFile(true)}
+ >
+ <Tooltip
+ arrow
+ title={
+ <Typography color="inherit">
+ {i18n.t('core:tagsInSidecarFileExplanation')}
+ </Typography>
+ }
+ >
+ <div style={{ display: 'flex' }}>
+ {persistTagsInSidecarFile !== null &&
+ persistTagsInSidecarFile && <CheckIcon />}
+ &nbsp;{i18n.t('core:useSidecarFile')}&nbsp;&nbsp;
+ </div>
+ </Tooltip>
+ </ToggleButton>
+ </ToggleButtonGroup>
+ }
+ label={
+ <Typography gutterBottom>
+ {i18n.t('core:fileTaggingSetting')}
+ </Typography>
+ }
+ />
+ )}
+ <>
+ <FormControlLabel
+ className={classes.formControl}
disabled={!Pro}
- data-tid="disableIndexingTID"
- name="disableIndexing"
- checked={disableIndexing}
- onChange={(event: ChangeEvent<HTMLInputElement>) =>
- setIndexDisable(event.target.checked)
+ labelPlacement="start"
+ style={{ justifyContent: 'space-between' }}
+ control={
+ <ProTooltip tooltip={i18n.t('ignorePatternDialogTitle')}>
+ <Button
+ color="primary"
+ disabled={!Pro}
+ onClick={() => {
+ setIgnorePatternDialogOpen(true);
+ }}
+ >
+ {i18n.t('addEntryTags')}
+ </Button>
+ </ProTooltip>
+ }
+ label={
+ <Typography>
+ {i18n.t('core:ignorePatterns')}
+ <InfoIcon tooltip={i18n.t('core:ignorePatternsHelp')} />
+ <ProLabel />
+ </Typography>
}
/>
- }
- label={
- <>
- {i18n.t('core:disableIndexing')}
- <ProLabel />
- </>
- }
- />
- )}
- </FormGroup>
- {showAdvancedMode && (
- <FormControlLabel
- className={classes.formControl}
- labelPlacement="start"
- style={{ justifyContent: 'space-between' }}
- control={
- <Input
- name="maxIndexAge"
- style={{
- maxWidth: 70,
- marginLeft: 15,
- marginBottom: 15
- }}
- type="number"
- data-tid="maxIndexAgeTID"
- inputProps={{ min: 0 }}
- value={maxIndexAge / (1000 * 60)}
- onChange={event => changeMaxIndexAge(event.target.value)}
- />
- }
- label={
- <Typography>
- {i18n.t('core:maxIndexAge')}
- <InfoIcon tooltip={i18n.t('core:maxIndexAgeHelp')} />
- </Typography>
- }
- />
- )}
- {showAdvancedMode &&
- (AppConfig.useSidecarsForFileTaggingDisableSetting ? (
- <FormControlLabel
- className={classes.formControl}
- labelPlacement="start"
- style={{ justifyContent: 'space-between' }}
- control={
- <Button size="small" variant="outlined" disabled>
- {currentTagsSetting
- ? i18n.t('core:useSidecarFile')
- : i18n.t('core:renameFile')}
- </Button>
- }
- label={
- <Typography variant="caption" display="block" gutterBottom>
- {i18n.t('core:fileTaggingSetting')}
- </Typography>
- }
- />
- ) : (
- <FormControlLabel
- labelPlacement="top"
- className={classes.formControl}
- style={{ alignItems: 'start', marginBottom: 10 }}
- control={
- <ToggleButtonGroup
- value={persistTagsInSidecarFile}
- size="small"
- exclusive
- >
- <ToggleButton
- value={null}
- data-tid="settingsSetPersistTagsDefault"
- onClick={() => setPersistTagsInSidecarFile(null)}
- >
- <Tooltip
- arrow
- title={
- <Typography color="inherit">
- {i18n.t('core:useDefaultTaggingType')}:{' '}
- <b>
- {currentTagsSetting
- ? i18n.t('core:useSidecarFile')
- : i18n.t('core:renameFile')}
- </b>
- </Typography>
- }
- >
- <div style={{ display: 'flex' }}>
- {persistTagsInSidecarFile === null && <CheckIcon />}
- &nbsp;{i18n.t('core:default')}&nbsp;&nbsp;
- </div>
- </Tooltip>
- </ToggleButton>
- <ToggleButton
- value={false}
- data-tid="settingsSetPersistTagsInFileName"
- onClick={() => setPersistTagsInSidecarFile(false)}
- >
- <Tooltip
- arrow
- title={
- <Typography color="inherit">
- {i18n.t('core:tagsInFilenameExplanation')}
- </Typography>
- }
- >
- <div style={{ display: 'flex' }}>
- {persistTagsInSidecarFile !== null &&
- !persistTagsInSidecarFile && <CheckIcon />}
- &nbsp;{i18n.t('core:renameFile')}&nbsp;&nbsp;
- </div>
- </Tooltip>
- </ToggleButton>
- <ToggleButton
- value={true}
- data-tid="settingsSetPersistTagsInSidecarFile"
- onClick={() => setPersistTagsInSidecarFile(true)}
- >
- <Tooltip
- arrow
- title={
- <Typography color="inherit">
- {i18n.t('core:tagsInSidecarFileExplanation')}
- </Typography>
- }
- >
- <div style={{ display: 'flex' }}>
- {persistTagsInSidecarFile !== null &&
- persistTagsInSidecarFile && <CheckIcon />}
- &nbsp;{i18n.t('core:useSidecarFile')}&nbsp;&nbsp;
- </div>
- </Tooltip>
- </ToggleButton>
- </ToggleButtonGroup>
- }
- label={
- <Typography gutterBottom>
- {i18n.t('core:fileTaggingSetting')}
- </Typography>
- }
- />
- ))}
- {showAdvancedMode && (
- <>
- <FormControlLabel
- className={classes.formControl}
- disabled={!Pro}
- labelPlacement="start"
- style={{ justifyContent: 'space-between' }}
- control={
- <ProTooltip tooltip={i18n.t('ignorePatternDialogTitle')}>
- <Button
- color="primary"
- disabled={!Pro}
- onClick={() => {
- setIgnorePatternDialogOpen(true);
+ {ignorePatternPaths && ignorePatternPaths.length && (
+ <List
+ style={{
+ padding: 5,
+ backgroundColor: '#d3d3d34a',
+ borderRadius: 10
}}
+ dense
>
- {i18n.t('addEntryTags')}
- </Button>
- </ProTooltip>
- }
- label={
- <Typography>
- {i18n.t('core:ignorePatterns')}
- <InfoIcon tooltip={i18n.t('core:ignorePatternsHelp')} />
- <ProLabel />
- </Typography>
- }
- />
- <List
- style={{
- padding: 5,
- backgroundColor: '#d3d3d34a',
- borderRadius: 10
- }}
- dense
- >
- {ignorePatternPaths &&
- ignorePatternPaths.map(ignorePatternPath => (
- <ListItem style={{ padding: 0 }}>
- <ListItemText primary={ignorePatternPath} />
- <ListItemIcon
- style={{ minWidth: 0 }}
- title={i18n.t('core:ignorePatternRemove')}
- onClick={() => {
- const array = [...ignorePatternPaths];
- const index = array.indexOf(ignorePatternPath);
- if (index !== -1) {
- array.splice(index, 1);
- setIgnorePatternPaths(array);
- }
- }}
- >
- <RemoveIcon />
- </ListItemIcon>
- </ListItem>
- ))}
- </List>
- {IgnorePatternDialog && isIgnorePatternDialogOpen && (
- <IgnorePatternDialog
- open={isIgnorePatternDialogOpen}
- onClose={() => setIgnorePatternDialogOpen(false)}
- ignorePatternPaths={ignorePatternPaths}
- setIgnorePatternPaths={setIgnorePatternPaths}
- locationPath={PlatformIO.getLocationPath(location)}
- />
- )}
- </>
- )}
+ {ignorePatternPaths.map(ignorePatternPath => (
+ <ListItem style={{ padding: 0 }}>
+ <ListItemText primary={ignorePatternPath} />
+ <ListItemIcon
+ style={{ minWidth: 0 }}
+ title={i18n.t('core:ignorePatternRemove')}
+ onClick={() => {
+ const array = [...ignorePatternPaths];
+ const index = array.indexOf(ignorePatternPath);
+ if (index !== -1) {
+ array.splice(index, 1);
+ setIgnorePatternPaths(array);
+ }
+ }}
+ >
+ <RemoveIcon />
+ </ListItemIcon>
+ </ListItem>
+ ))}
+ </List>
+ )}
+ {IgnorePatternDialog && isIgnorePatternDialogOpen && (
+ <IgnorePatternDialog
+ open={isIgnorePatternDialogOpen}
+ onClose={() => setIgnorePatternDialogOpen(false)}
+ ignorePatternPaths={ignorePatternPaths}
+ setIgnorePatternPaths={setIgnorePatternPaths}
+ locationPath={PlatformIO.getLocationPath(location)}
+ />
+ )}
+ </>
+ </FormGroup>
+ </AccordionDetails>
+ </Accordion>
</DialogContent>
- <DialogActions style={{ justifyContent: 'space-between' }}>
- <Button
+ <DialogActions>
+ {/* <Button
data-tid="switchAdvancedModeTID"
onClick={() => setShowAdvancedMode(!showAdvancedMode)}
style={{ marginLeft: 10 }}
@@ -794,18 +881,16 @@ function CreateEditLocationDialog(props: Props) {
{showAdvancedMode
? i18n.t('core:switchSimpleMode')
: i18n.t('core:switchAdvancedMode')}
+ </Button> */}
+ <Button onClick={() => onClose()}>{i18n.t('core:cancel')}</Button>
+ <Button
+ disabled={disableConfirmButton()}
+ onClick={onConfirm}
+ data-tid="confirmLocationCreation"
+ color="primary"
+ >
+ {i18n.t('core:ok')}
</Button>
- <div>
- <Button onClick={() => onClose()}>{i18n.t('core:cancel')}</Button>
- <Button
- disabled={disableConfirmButton()}
- onClick={onConfirm}
- data-tid="confirmLocationCreation"
- color="primary"
- >
- {i18n.t('core:ok')}
- </Button>
- </div>
</DialogActions>
</Dialog>
);
diff --git a/app/components/dialogs/CreateFileDialog.tsx b/app/components/dialogs/CreateFileDialog.tsx
index 4759d7a84..bdd6c2508 100644
--- a/app/components/dialogs/CreateFileDialog.tsx
+++ b/app/components/dialogs/CreateFileDialog.tsx
@@ -274,7 +274,7 @@ function CreateFileDialog(props: Props) {
value={selectedDirectoryPath.current}
onChange={handleFileChange}
endAdornment={
- PlatformIO.haveObjectStoreSupport() ? (
+ PlatformIO.haveObjectStoreSupport() || PlatformIO.haveWebDavSupport() ? (
undefined
) : (
<InputAdornment position="end" style={{ height: 32 }}>
diff --git a/app/components/dialogs/LocalForm.tsx b/app/components/dialogs/LocalForm.tsx
index cfb6cd94d..eddc84945 100644
--- a/app/components/dialogs/LocalForm.tsx
+++ b/app/components/dialogs/LocalForm.tsx
@@ -32,31 +32,16 @@ import i18n from '-/services/i18n';
import PlatformIO from '-/services/platform-facade';
interface Props {
- showAdvancedMode: boolean;
errorTextPath: boolean;
errorTextName: boolean;
- errorTextId: boolean;
setName: (string) => void;
setPath: (string) => void;
- setNewUuid: (string) => void;
path: string;
name: string;
- newuuid: string;
}
function LocalForm(props: Props) {
- const {
- errorTextPath,
- errorTextName,
- errorTextId,
- setName,
- setPath,
- setNewUuid,
- path,
- name,
- newuuid,
- showAdvancedMode
- } = props;
+ const { errorTextPath, errorTextName, setName, setPath, path, name } = props;
const openDirectory = () => {
PlatformIO.selectDirectoryDialog()
@@ -79,6 +64,23 @@ function LocalForm(props: Props) {
return (
<Grid container spacing={2}>
+ <Grid item xs={12}>
+ <FormControl fullWidth={true} error={errorTextName}>
+ <InputLabel htmlFor="path">
+ {i18n.t('core:createLocationName')}
+ </InputLabel>
+ <Input
+ required
+ margin="dense"
+ name="name"
+ inputProps={{ autoCorrect: 'off' }}
+ onChange={event => setName(event.target.value)}
+ value={name}
+ data-tid="locationName"
+ fullWidth={true}
+ />
+ </FormControl>
+ </Grid>
<Grid item xs={12}>
<FormControl fullWidth={true} error={errorTextPath}>
<InputLabel htmlFor="path">
@@ -111,42 +113,6 @@ function LocalForm(props: Props) {
)}
</FormControl>
</Grid>
- <Grid item xs={12}>
- <FormControl fullWidth={true} error={errorTextName}>
- <InputLabel htmlFor="path">
- {i18n.t('core:createLocationName')}
- </InputLabel>
- <Input
- required
- margin="dense"
- name="name"
- inputProps={{ autoCorrect: 'off' }}
- onChange={event => setName(event.target.value)}
- value={name}
- data-tid="locationName"
- fullWidth={true}
- />
- </FormControl>
- </Grid>
- {showAdvancedMode && (
- <Grid item xs={12}>
- <FormControl fullWidth={true} error={errorTextId}>
- <InputLabel htmlFor="newuuid">
- {i18n.t('core:locationId')}
- </InputLabel>
- <Input
- required
- margin="dense"
- name="newuuid"
- fullWidth={true}
- data-tid="newuuid"
- placeholder="Unique location identifier"
- onChange={event => setNewUuid(event.target.value)}
- value={newuuid}
- />
- </FormControl>
- </Grid>
- )}
</Grid>
);
}
diff --git a/app/components/dialogs/MoveCopyFilesDialog.tsx b/app/components/dialogs/MoveCopyFilesDialog.tsx
index f4d7beffa..b071f8516 100644
--- a/app/components/dialogs/MoveCopyFilesDialog.tsx
+++ b/app/components/dialogs/MoveCopyFilesDialog.tsx
@@ -149,7 +149,9 @@ function MoveCopyFilesDialog(props: Props) {
}}
value={targetPath}
endAdornment={
- PlatformIO.haveObjectStoreSupport() || AppConfig.isWeb ? (
+ PlatformIO.haveObjectStoreSupport() ||
+ PlatformIO.haveWebDavSupport() ||
+ AppConfig.isWeb ? (
undefined
) : (
<InputAdornment position="end" style={{ height: 33 }}>
diff --git a/app/components/dialogs/ObjectStoreForm.tsx b/app/components/dialogs/ObjectStoreForm.tsx
index 8c98616aa..f5fedaa6d 100644
--- a/app/components/dialogs/ObjectStoreForm.tsx
+++ b/app/components/dialogs/ObjectStoreForm.tsx
@@ -88,8 +88,6 @@ interface Props {
cloudErrorSecretAccessKey: boolean;
cloudErrorBucketName: boolean;
cloudErrorRegion: boolean;
- errorTextId: boolean;
- showAdvancedMode: boolean;
showSecretAccessKey: boolean;
storeName: string;
storePath: string;
@@ -99,7 +97,6 @@ interface Props {
bucketName: string;
region: string;
endpointURL: string;
- newuuid: string;
setStoreName: (string) => void;
setStorePath: (string) => void;
setAccessKeyId: (string) => void;
@@ -109,7 +106,6 @@ interface Props {
setBucketName: (string) => void;
setRegion: (string) => void;
setEndpointURL: (string) => void;
- setNewUuid: (string) => void;
}
function ObjectStoreForm(props: Props) {
const {
@@ -120,8 +116,6 @@ function ObjectStoreForm(props: Props) {
cloudErrorSecretAccessKey,
cloudErrorBucketName,
cloudErrorRegion,
- errorTextId,
- showAdvancedMode,
showSecretAccessKey,
storeName,
storePath,
@@ -131,7 +125,6 @@ function ObjectStoreForm(props: Props) {
bucketName,
region,
endpointURL,
- newuuid,
setStoreName,
setStorePath,
setAccessKeyId,
@@ -139,7 +132,6 @@ function ObjectStoreForm(props: Props) {
setSessionToken,
setBucketName,
setEndpointURL,
- setNewUuid,
setRegion
} = props;
@@ -247,24 +239,22 @@ function ObjectStoreForm(props: Props) {
)} */}
</FormControl>
</Grid>
- {showAdvancedMode && (
- <Grid item xs={12}>
- <FormControl fullWidth={true}>
- <InputLabel htmlFor="sessionToken">
- {i18n.t('core:sessionToken')}
- </InputLabel>
- <Input
- margin="dense"
- name="sessionToken"
- fullWidth={true}
- data-tid="sessionTokenTID"
- inputProps={{ autoCorrect: 'off', autoCapitalize: 'none' }}
- onChange={event => setSessionToken(event.target.value)}
- value={sessionToken}
- />
- </FormControl>
- </Grid>
- )}
+ <Grid item xs={12}>
+ <FormControl fullWidth={true}>
+ <InputLabel htmlFor="sessionToken">
+ {i18n.t('core:sessionToken')}
+ </InputLabel>
+ <Input
+ margin="dense"
+ name="sessionToken"
+ fullWidth={true}
+ data-tid="sessionTokenTID"
+ inputProps={{ autoCorrect: 'off', autoCapitalize: 'none' }}
+ onChange={event => setSessionToken(event.target.value)}
+ value={sessionToken}
+ />
+ </FormControl>
+ </Grid>
<Grid item xs={12}>
<FormControl fullWidth={true} error={cloudErrorBucketName}>
<InputLabel htmlFor="bucketName">
@@ -305,48 +295,25 @@ function ObjectStoreForm(props: Props) {
)} */}
</FormControl>
</Grid>
- {showAdvancedMode && (
- <Grid item xs={12}>
- <FormControl fullWidth={true} error={cloudErrorRegion}>
- <Autocomplete
- options={regions}
- value={region}
- freeSolo
- onChange={handleRegionChange}
- onInputChange={handleRegionChange}
- placeholder={i18n.t('core:regionSearch')}
- renderInput={params => (
- <TextField
- {...params}
- label={i18n.t('core:regionSearch')}
- margin="normal"
- />
- )}
- />
- {/* {state.cloudErrorRegion && (
- <FormHelperText>{i18n.t('core:invalidRegion')}</FormHelperText>
- )} */}
- </FormControl>
- </Grid>
- )}
- {showAdvancedMode && (
- <Grid item xs={12}>
- <FormControl fullWidth={true} error={errorTextId}>
- <InputLabel htmlFor="newuuid">
- {i18n.t('core:locationId')}
- </InputLabel>
- <Input
- margin="dense"
- name="newuuid"
- fullWidth={true}
- data-tid="newuuid"
- placeholder="Advanced setting"
- onChange={event => setNewUuid(event.target.value)}
- value={newuuid}
- />
- </FormControl>
- </Grid>
- )}
+ <Grid item xs={12}>
+ <FormControl fullWidth={true} error={cloudErrorRegion}>
+ <Autocomplete
+ options={regions}
+ value={region}
+ freeSolo
+ onChange={handleRegionChange}
+ onInputChange={handleRegionChange}
+ placeholder={i18n.t('core:regionSearch')}
+ renderInput={params => (
+ <TextField
+ {...params}
+ label={i18n.t('core:regionSearch')}
+ margin="normal"
+ />
+ )}
+ />
+ </FormControl>
+ </Grid>
</Grid>
);
}
diff --git a/app/components/dialogs/WebdavForm.tsx b/app/components/dialogs/WebdavForm.tsx
new file mode 100644
index 000000000..a3345e567
--- /dev/null
+++ b/app/components/dialogs/WebdavForm.tsx
@@ -0,0 +1,215 @@
+/**
+ * TagSpaces - universal file and folder organizer
+ * Copyright (C) 2017-present TagSpaces UG (haftungsbeschraenkt)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License (version 3) as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
+
+import React, { ChangeEvent } from 'react';
+
+import FormControl from '@material-ui/core/FormControl';
+import Input from '@material-ui/core/Input';
+import InputLabel from '@material-ui/core/InputLabel';
+import {
+ Grid,
+ IconButton,
+ InputAdornment,
+ MenuItem,
+ Select
+} from '@material-ui/core';
+import { Visibility, VisibilityOff } from '@material-ui/icons';
+import i18n from '-/services/i18n';
+
+interface Props {
+ errorTextName: boolean;
+ webdavErrorUrl: boolean;
+ setUserName: (string) => void;
+ setPassword: (string) => void;
+ setName: (string) => void;
+ setEndpointURL: (string) => void;
+ userName: string;
+ password: string;
+ showPassword: boolean;
+ setShowPassword: (boolean) => void;
+ endpointURL: string;
+ name: string;
+ authType: string;
+ setAuthType: (string) => void;
+ secretAccessKey: string;
+ setSecretAccessKey: (string) => void;
+}
+
+function WebdavForm(props: Props) {
+ const {
+ errorTextName,
+ webdavErrorUrl,
+ setName,
+ setUserName,
+ setPassword,
+ setEndpointURL,
+ userName,
+ password,
+ endpointURL,
+ name,
+ showPassword,
+ setShowPassword,
+ authType,
+ setAuthType,
+ secretAccessKey,
+ setSecretAccessKey
+ } = props;
+
+ const AuthTypes = {
+ None: 'none',
+ Basic: 'password',
+ Digest: 'digest',
+ Token: 'token'
+ };
+
+ return (
+ <Grid container direction="column" spacing={1}>
+ <Grid item>
+ <FormControl fullWidth={true} error={errorTextName}>
+ <InputLabel htmlFor="name">
+ {i18n.t('core:createLocationName')}
+ </InputLabel>
+ <Input
+ required
+ margin="dense"
+ name="name"
+ inputProps={{ autoCorrect: 'off' }}
+ onChange={event => setName(event.target.value)}
+ value={name}
+ data-tid="locationName"
+ fullWidth={true}
+ />
+ </FormControl>
+ </Grid>
+ <Grid item>
+ <FormControl fullWidth={true} error={errorTextName}>
+ <InputLabel id="AuthID">{i18n.t('core:WebdavAuth')}</InputLabel>
+ <Select
+ labelId="AuthID"
+ id="AuthTypeID"
+ value={authType}
+ label={i18n.t('core:WebdavAuth')}
+ onChange={(event: ChangeEvent<HTMLInputElement>) =>
+ setAuthType(event.target.value)
+ }
+ >
+ {Object.keys(AuthTypes).map(auth => (
+ <MenuItem key={auth} value={AuthTypes[auth]}>
+ {auth}
+ </MenuItem>
+ ))}
+ </Select>
+ </FormControl>
+ </Grid>
+ {(authType === AuthTypes.Basic || authType === AuthTypes.Digest) && (
+ <>
+ <Grid item>
+ <FormControl fullWidth={true}>
+ <InputLabel htmlFor="userNameId">
+ {i18n.t('core:userName')}
+ </InputLabel>
+ <Input
+ margin="dense"
+ name="userNameId"
+ fullWidth={true}
+ data-tid="userNameIdTID"
+ inputProps={{ autoCorrect: 'off', autoCapitalize: 'none' }}
+ onChange={event => setUserName(event.target.value)}
+ value={userName}
+ />
+ </FormControl>
+ </Grid>
+ <Grid item>
+ <FormControl fullWidth={true}>
+ <InputLabel htmlFor="password">
+ {i18n.t('core:password')}
+ </InputLabel>
+ <Input
+ margin="dense"
+ name="password"
+ type={showPassword ? 'text' : 'password'}
+ fullWidth={true}
+ data-tid="passwordTID"
+ inputProps={{ autoCorrect: 'off', autoCapitalize: 'none' }}
+ onChange={event => setPassword(event.target.value)}
+ value={password}
+ endAdornment={
+ <InputAdornment position="end">
+ <IconButton
+ aria-label="toggle password visibility"
+ onClick={() => setShowPassword(!showPassword)}
+ >
+ {showPassword ? <Visibility /> : <VisibilityOff />}
+ </IconButton>
+ </InputAdornment>
+ }
+ />
+ </FormControl>
+ </Grid>
+ </>
+ )}
+ {authType === AuthTypes.Token && (
+ <Grid item>
+ <FormControl fullWidth={true}>
+ <InputLabel htmlFor="webDavToken">
+ {i18n.t('core:webDavToken')}
+ </InputLabel>
+ <Input
+ margin="dense"
+ name="webDavToken"
+ type={showPassword ? 'text' : 'password'}
+ fullWidth={true}
+ data-tid="webDavToken"
+ inputProps={{ autoCorrect: 'off', autoCapitalize: 'none' }}
+ onChange={event => setSecretAccessKey(event.target.value)}
+ value={secretAccessKey}
+ endAdornment={
+ <InputAdornment position="end">
+ <IconButton
+ aria-label="toggle password visibility"
+ onClick={() => setShowPassword(!showPassword)}
+ >
+ {showPassword ? <Visibility /> : <VisibilityOff />}
+ </IconButton>
+ </InputAdornment>
+ }
+ />
+ </FormControl>
+ </Grid>
+ )}
+ <Grid item>
+ <FormControl fullWidth={true} error={webdavErrorUrl}>
+ <InputLabel htmlFor="endpointURL">
+ {i18n.t('core:endpointURL')}
+ </InputLabel>
+ <Input
+ margin="dense"
+ name="endpointURL"
+ fullWidth={true}
+ data-tid="endpointURL"
+ placeholder={i18n.t('webdavServiceURL')}
+ onChange={event => setEndpointURL(event.target.value)}
+ value={endpointURL}
+ />
+ </FormControl>
+ </Grid>
+ </Grid>
+ );
+}
+
+export default WebdavForm;
diff --git a/app/components/menus/DirectoryMenu.tsx b/app/components/menus/DirectoryMenu.tsx
index f74c5217e..080edd383 100644
--- a/app/components/menus/DirectoryMenu.tsx
+++ b/app/components/menus/DirectoryMenu.tsx
@@ -497,7 +497,11 @@ Do you want to continue?`)
if (
selectedEntries.length < 2 &&
- !(PlatformIO.haveObjectStoreSupport() || AppConfig.isWeb)
+ !(
+ PlatformIO.haveObjectStoreSupport() ||
+ PlatformIO.haveWebDavSupport() ||
+ AppConfig.isWeb
+ )
) {
menuItems.push(
<MenuItem
diff --git a/app/components/menus/FileMenu.tsx b/app/components/menus/FileMenu.tsx
index bdd349666..ad55e6d39 100644
--- a/app/components/menus/FileMenu.tsx
+++ b/app/components/menus/FileMenu.tsx
@@ -270,7 +270,7 @@ function FileMenu(props: Props) {
);
}
if (
- !(PlatformIO.haveObjectStoreSupport() || AppConfig.isWeb) &&
+ !(PlatformIO.haveObjectStoreSupport() || PlatformIO.haveWebDavSupport() || AppConfig.isWeb) &&
selectedEntries.length < 2
) {
menuItems.push(
diff --git a/app/components/menus/LocationContextMenu.tsx b/app/components/menus/LocationContextMenu.tsx
index 35d00aa15..e318a08f4 100644
--- a/app/components/menus/LocationContextMenu.tsx
+++ b/app/components/menus/LocationContextMenu.tsx
@@ -37,7 +37,7 @@ import { actions as LocationIndexActions } from '-/reducers/location-index';
import i18n from '-/services/i18n';
import { actions as AppActions } from '-/reducers/app';
import { TS } from '-/tagspaces.namespace';
-import PlatformIO from "-/services/platform-facade";
+import PlatformIO from '-/services/platform-facade';
interface Props {
setEditLocationDialogOpened: (open: boolean) => void;
diff --git a/app/containers/MainPage.tsx b/app/containers/MainPage.tsx
index 3f7eb2ec9..80aafc624 100644
--- a/app/containers/MainPage.tsx
+++ b/app/containers/MainPage.tsx
@@ -769,7 +769,8 @@ function MainPage(props: Props) {
onDrop={(item: any) => {
if (
AppConfig.isElectron &&
- !PlatformIO.haveObjectStoreSupport()
+ !PlatformIO.haveObjectStoreSupport() &&
+ !PlatformIO.haveWebDavSupport()
) {
setMoveCopyDialogOpened(item.files);
} else {
diff --git a/app/locales/en/core.json b/app/locales/en/core.json
index f8aaad883..4adea0ef2 100644
--- a/app/locales/en/core.json
+++ b/app/locales/en/core.json
@@ -494,6 +494,7 @@
"globalSearch": "Global",
"localLocation": "Local - pointing to a local folder",
"objectStorage": "Object Storage",
+ "webdavLocation": "WebDAV",
"objectStorageTitle": "Amazon S3 compliant object storage",
"endpointURL": "Endpoint URL",
"enableIndexingBySearch": "By enabling this option, the search will deliver better results, but it will take longer",
@@ -515,6 +516,9 @@
"goforward": "Go Forward",
"switchSimpleMode": "Simple Mode",
"switchAdvancedMode": "Advanced Mode",
+ "switchAdvanced": "Advanced",
+ "switchGeneral": "General",
+ "userName": "User",
"openLink": "Open Link",
"invalidLink": "Invalid Link",
"link": "Link",
@@ -632,6 +636,7 @@
"contactUs": "Contact us",
"sessionToken": "Session Token",
"s3serviceURL": "URL of the S3 service",
+ "webdavServiceURL": "URL of the Webdav service",
"print": "Print",
"advancedSearch": "Advanced Search",
"new": "New",
@@ -646,5 +651,7 @@
"iptcKeywords": "Import IPTC keywords as tags",
"exifDialogTitle": "Import EXIF/IPTC information as tags",
"exifDialogExplanation": "This functionality will traverse all JPG files from the current folder and import the data from the selected EXIF/IPTC fields as tags",
+ "webDavToken": "WebDAV token",
+ "WebdavAuth": "WebDAV authorization type",
"-": "-"
}
diff --git a/app/package.json b/app/package.json
index 97f79a6de..051809133 100644
--- a/app/package.json
+++ b/app/package.json
@@ -13,8 +13,8 @@
"license": "AGPL-3.0",
"scripts": {},
"dependencies": {
- "@tagspaces/extensions": "1.0.23",
"@tagspaces/tagspaces-ws": "1.2.1",
+ "@tagspaces/extensions": "1.0.23",
"sharp": "^0.29.3"
}
}
diff --git a/app/perspectives/grid-perspective/components/CellContent.tsx b/app/perspectives/grid-perspective/components/CellContent.tsx
index cc97f0cfb..372c248c0 100644
--- a/app/perspectives/grid-perspective/components/CellContent.tsx
+++ b/app/perspectives/grid-perspective/components/CellContent.tsx
@@ -31,7 +31,10 @@ import {
formatFileSize,
formatDateTime
} from '@tagspaces/tagspaces-platforms/misc';
-import { extractTagsAsObjects, extractTitle } from '@tagspaces/tagspaces-platforms/paths';
+import {
+ extractTagsAsObjects,
+ extractTitle
+} from '@tagspaces/tagspaces-platforms/paths';
import AppConfig from '@tagspaces/tagspaces-platforms/AppConfig';
import {
findBackgroundColorForFolder,
diff --git a/app/perspectives/grid-perspective/components/GridPagination.tsx b/app/perspectives/grid-perspective/components/GridPagination.tsx
index 90895d08b..d03cc80c2 100644
--- a/app/perspectives/grid-perspective/components/GridPagination.tsx
+++ b/app/perspectives/grid-perspective/components/GridPagination.tsx
@@ -154,7 +154,10 @@ function GridPagination(props: Props) {
);
if (meta.some(metaFile => thumbPath.endsWith(metaFile.path))) {
thumbEntry.thumbPath = thumbPath;
- if (PlatformIO.haveObjectStoreSupport()) {
+ if (
+ PlatformIO.haveObjectStoreSupport() ||
+ PlatformIO.haveWebDavSupport()
+ ) {
if (thumbPath && thumbPath.startsWith('/')) {
thumbPath = thumbPath.substring(1);
}
@@ -189,9 +192,10 @@ function GridPagination(props: Props) {
);
let enhancedEntry;
if (meta.some(metaFile => thumbDirPath.endsWith(metaFile.path))) {
- const thumbPath = PlatformIO.haveObjectStoreSupport()
- ? PlatformIO.getURLforPath(thumbDirPath)
- : thumbDirPath;
+ const thumbPath =
+ PlatformIO.haveObjectStoreSupport() || PlatformIO.haveWebDavSupport()
+ ? PlatformIO.getURLforPath(thumbDirPath)
+ : thumbDirPath;
enhancedEntry = { ...entry, thumbPath };
}
if (
diff --git a/app/perspectives/grid-perspective/components/MainContainer.tsx b/app/perspectives/grid-perspective/components/MainContainer.tsx
index 69b0643cf..5287a8620 100644
--- a/app/perspectives/grid-perspective/components/MainContainer.tsx
+++ b/app/perspectives/grid-perspective/components/MainContainer.tsx
@@ -425,8 +425,12 @@ function GridPerspective(props: Props) {
.catch(error => {
console.log('enableObjectStoreSupport', error);
});
+ } else if (props.currentLocation.type === locationType.TYPE_WEBDAV) {
+ PlatformIO.enableWebdavSupport(props.currentLocation);
+ openLocation(fsEntry);
} else if (props.currentLocation.type === locationType.TYPE_LOCAL) {
PlatformIO.disableObjectStoreSupport();
+ PlatformIO.disableWebdavSupport();
openLocation(fsEntry);
}
};
diff --git a/app/perspectives/list/components/MainContainer.tsx b/app/perspectives/list/components/MainContainer.tsx
index 6e47f99ff..9a407cb39 100644
--- a/app/perspectives/list/components/MainContainer.tsx
+++ b/app/perspectives/list/components/MainContainer.tsx
@@ -425,6 +425,9 @@ function GridPerspective(props: Props) {
.catch(error => {
console.log('enableObjectStoreSupport', error);
});
+ } else if (props.currentLocation.type === locationType.TYPE_WEBDAV) {
+ PlatformIO.enableWebdavSupport(props.currentLocation);
+ doubleClickAction(fsEntry);
} else if (props.currentLocation.type === locationType.TYPE_LOCAL) {
PlatformIO.disableObjectStoreSupport();
doubleClickAction(fsEntry);
diff --git a/app/reducers/app.ts b/app/reducers/app.ts
index ba7d49c9b..5bf70285c 100644
--- a/app/reducers/app.ts
+++ b/app/reducers/app.ts
@@ -1581,7 +1581,12 @@ export const actions = {
PlatformIO.disableObjectStoreSupport();
});
} else {
- PlatformIO.disableObjectStoreSupport();
+ if (location.type === locationType.TYPE_WEBDAV) {
+ PlatformIO.enableWebdavSupport(location);
+ } else {
+ PlatformIO.disableObjectStoreSupport();
+ PlatformIO.disableWebdavSupport();
+ }
dispatch(actions.setReadOnlyMode(location.isReadOnly || false));
dispatch(actions.changeLocation(location));
dispatch(
@@ -1788,7 +1793,7 @@ export const actions = {
fsEntry.path,
fsEntry.isFile
);
- if (PlatformIO.haveObjectStoreSupport()) {
+ if (PlatformIO.haveObjectStoreSupport() || PlatformIO.haveWebDavSupport()) {
const cleanedPath = fsEntry.path.startsWith('/')
? fsEntry.path.substr(1)
: fsEntry.path;
diff --git a/app/reducers/location-index.ts b/app/reducers/location-index.ts
index ff3c94433..568ee1c8f 100644
--- a/app/reducers/location-index.ts
+++ b/app/reducers/location-index.ts
@@ -240,6 +240,16 @@ export const actions = {
.catch(() => {
PlatformIO.disableObjectStoreSupport();
});
+ } else if (location.type === locationType.TYPE_WEBDAV) {
+ PlatformIO.enableWebdavSupport(location);
+ dispatch(
+ actions.createDirectoryIndex(
+ PlatformIO.getLocationPath(location),
+ location.fullTextIndex,
+ isCurrentLocation,
+ location.uuid
+ )
+ );
} else if (location.type === locationType.TYPE_LOCAL) {
PlatformIO.disableObjectStoreSupport();
dispatch(
diff --git a/app/reducers/locations.ts b/app/reducers/locations.ts
index 65032d877..c504fb944 100644
--- a/app/reducers/locations.ts
+++ b/app/reducers/locations.ts
@@ -223,6 +223,10 @@ export const actions = {
// disableObjectStoreSupport to revoke objectStoreAPI cached object
PlatformIO.disableObjectStoreSupport();
}
+ if (PlatformIO.haveWebDavSupport()) {
+ // disableWebdavSupport to revoke cached object
+ PlatformIO.disableWebdavSupport();
+ }
if (openAfterEdit) {
/**
* check if location uuid is changed
diff --git a/app/services/platform-facade.ts b/app/services/platform-facade.ts
index af35782d5..ce8001b4a 100644
--- a/app/services/platform-facade.ts
+++ b/app/services/platform-facade.ts
@@ -18,6 +18,7 @@
import {
platformHaveObjectStoreSupport,
+ platformHaveWebDavSupport,
platformIsMinio,
platformGetDirSeparator,
platformEnableObjectStoreSupport,
@@ -76,14 +77,17 @@ export default class PlatformFacade {
static disableObjectStoreSupport = (): void =>
platformDisableObjectStoreSupport();
- static enableWebdavSupport = (webDavConfig: any): void =>
+ static enableWebdavSupport = (webDavConfig: any): void => {
platformEnableWebdavSupport(webDavConfig);
+ };
static disableWebdavSupport = (): void => platformDisableWebdavSupport();
static haveObjectStoreSupport = (): boolean =>
platformHaveObjectStoreSupport();
+ static haveWebDavSupport = (): boolean => platformHaveWebDavSupport();
+
static isMinio = (): boolean => platformIsMinio();
static getDirSeparator = (): string => platformGetDirSeparator();
diff --git a/app/services/utils-io.ts b/app/services/utils-io.ts
index d3f859dba..6d95d63a8 100644
--- a/app/services/utils-io.ts
+++ b/app/services/utils-io.ts
@@ -114,6 +114,7 @@ export function enhanceDirectoryContent(
// Enable thumb generation by
!AppConfig.isWeb && // not in webdav mode
!PlatformIO.haveObjectStoreSupport() && // not in object store mode
+ !PlatformIO.haveWebDavSupport() && // not in webdav mode
enhancedEntry.isFile && // only for files
useGenerateThumbnails // enabled in the settings
) {
@@ -210,6 +211,7 @@ export function prepareDirectoryContent(
function genThumbnails() {
if (
+ !directoryPath ||
directoryPath.endsWith(AppConfig.dirSeparator + AppConfig.metaFolder) ||
directoryPath.endsWith(
AppConfig.dirSeparator + AppConfig.metaFolder + AppConfig.dirSeparator
@@ -518,6 +520,7 @@ export function createDirectoryIndex(
if (
enableWS &&
!PlatformIO.haveObjectStoreSupport() &&
+ !PlatformIO.haveWebDavSupport() &&
PlatformIO.isWorkerAvailable()
) {
// Start indexing in worker if not in the object store mode
@@ -1066,7 +1069,7 @@ export function convertMarkDown(mdContent: string, directoryPath: string) {
? directoryPath + sourceUrl
: directoryPath + dirSep + sourceUrl;
}
- if (PlatformIO.haveObjectStoreSupport()) {
+ if (PlatformIO.haveObjectStoreSupport() || PlatformIO.haveWebDavSupport()) {
sourceUrl = PlatformIO.getURLforPath(sourceUrl);
}
return `<img src="${sourceUrl}" style="max-width: 100%">
diff --git a/app/tagspaces.namespace.d.ts b/app/tagspaces.namespace.d.ts
index b65ac64a6..13d9d1dce 100644
--- a/app/tagspaces.namespace.d.ts
+++ b/app/tagspaces.namespace.d.ts
@@ -22,6 +22,9 @@ export namespace TS {
newuuid?: string;
name: string;
type: string; // 0 - local; 1 - S3; 2 - amplify; 3 - webdav
+ authType?: string; // none,password,digest,token
+ username?: string;
+ password?: string;
accessKeyId?: string;
secretAccessKey?: string;
sessionToken?: string;
diff --git a/app/utils/dom.ts b/app/utils/dom.ts
index 17eeb5ad3..832408f8b 100644
--- a/app/utils/dom.ts
+++ b/app/utils/dom.ts
@@ -1,6 +1,6 @@
import { locationType } from '@tagspaces/tagspaces-platforms/misc';
import { TS } from '-/tagspaces.namespace';
-import PlatformIO from "-/services/platform-facade";
+import PlatformIO from '-/services/platform-facade';
export function isVisibleOnScreen(element: any) {
const rectangle = element.getBoundingClientRect();
diff --git a/package.json b/package.json
index c8b975791..ce11b167d 100644
--- a/package.json
+++ b/package.json
@@ -148,7 +148,7 @@
"@material-ui/icons": "^4.11.2",
"@material-ui/lab": "^4.0.0-alpha.60",
"@material-ui/pickers": "^3.3.10",
- "@tagspaces/tagspaces-platforms": "1.3.23",
+ "@tagspaces/tagspaces-platforms": "1.3.33",
"aws-amplify": "^4.3.8",
"aws-sdk": "^2.1036.0",
"babel-polyfill": "^6.26.0",
@@ -276,8 +276,8 @@
"detect-port": "^1.3.0",
"devtron": "^1.4.0",
"dotenv-webpack": "^7.1.0",
- "electron": "17.4.3",
- "electron-builder": "^23.0.9",
+ "electron": "19.0.7",
+ "electron-builder": "^23.1.0",
"electron-devtools-installer": "^3.2.0",
"electron-notarize": "^1.2.1",
"enzyme": "^2.8.2",
diff --git a/yarn.lock b/yarn.lock
index 79c70e185..b6402853a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4796,10 +4796,10 @@
ajv "^6.12.0"
ajv-keywords "^3.4.1"
-"@electron/get@^1.13.0":
- version "1.13.0"
- resolved "https://registry.yarnpkg.com/@electron/get/-/get-1.13.0.tgz#95c6bcaff4f9a505ea46792424f451efea89228c"
- integrity sha512-+SjZhRuRo+STTO1Fdhzqnv9D2ZhjxXP6egsJ9kiO8dtP68cDx7dFCwWi64dlMQV7sWcfW1OYCW4wviEBzmRsfQ==
+"@electron/get@^1.14.1":
+ version "1.14.1"
+ resolved "https://registry.yarnpkg.com/@electron/get/-/get-1.14.1.tgz#16ba75f02dffb74c23965e72d617adc721d27f40"
+ integrity sha512-BrZYyL/6m0ZXz/lDxy/nlVhQz+WF+iPS6qXolEU8atw7h6v1aYkjwJZ63m+bJMBTxDE66X+r2tPS4a/8C82sZw==
dependencies:
debug "^4.1.1"
env-paths "^2.2.0"
@@ -4809,7 +4809,7 @@
semver "^6.2.0"
sumchecker "^3.0.1"
optionalDependencies:
- global-agent "^2.0.2"
+ global-agent "^3.0.0"
global-tunnel-ng "^2.7.1"
"@electron/[email protected]":
@@ -5764,10 +5764,10 @@
dependencies:
defer-to-connect "^1.0.1"
-"@tagspaces/[email protected]":
- version "1.3.23"
- resolved "https://registry.yarnpkg.com/@tagspaces/tagspaces-platforms/-/tagspaces-platforms-1.3.23.tgz#b11b14706d1528eeed54b67b207e1cc7ad5ed5ca"
- integrity sha512-tFiqv9JpKx/Vbt0XknxedHKzAKWtR5wnr1dDdzSOPnUN2HgYzYitVfxChLH6ThyfIFC2KrjCUOYi4LsSRkkQQA==
+"@tagspaces/[email protected]":
+ version "1.3.33"
+ resolved "https://registry.yarnpkg.com/@tagspaces/tagspaces-platforms/-/tagspaces-platforms-1.3.33.tgz#b4b14294c713c85af973baf54d6c79ac436687bc"
+ integrity sha512-4tjWAtKSe1j9eLDczdnEvucHEaYQtcjwchtM4SXYSp70GQYv1yaC985j2Xe40C2P28xtEhc6NULr+pxtHfDV8w==
"@testim/chrome-version@^1.0.7":
version "1.0.7"
@@ -6004,7 +6004,7 @@
resolved "https://registry.yarnpkg.com/@types/node-emoji/-/node-emoji-1.8.1.tgz#689cb74fdf6e84309bcafce93a135dfecd01de3f"
integrity sha512-0fRfA90FWm6KJfw6P9QGyo0HDTCmthZ7cWaBQndITlaWLTZ6njRyKwrwpzpg+n6kBXBIGKeUHEQuBx7bphGJkA==
-"@types/node@*", "@types/node@^14.6.2":
+"@types/node@*":
version "14.6.4"
resolved "https://registry.npmjs.org/@types/node/-/node-14.6.4.tgz"
integrity sha512-Wk7nG1JSaMfMpoMJDKUsWYugliB2Vy55pdjLpmLixeyMi7HizW2I/9QoxsPCkXl3dO+ZOVqPumKaDUv5zJu2uQ==
@@ -6014,6 +6014,11 @@
resolved "https://registry.npmjs.org/@types/node/-/node-12.12.56.tgz"
integrity sha512-8OdIupOIZtmObR13fvGyTvpcuzKmMugkATeVcfNwCjGtHxhjEKmOvLqXwR8U9VOtNnZ4EXaSfNiLVsPinaCXkQ==
+"@types/node@^16.11.26":
+ version "16.11.43"
+ resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.43.tgz#555e5a743f76b6b897d47f945305b618525ddbe6"
+ integrity sha512-GqWykok+3uocgfAJM8imbozrqLnPyTrpFlrryURQlw1EesPUCx5XxTiucWDSFF9/NUEXDuD4bnvHm8xfVGWTpQ==
+
"@types/normalize-package-data@^2.4.0":
version "2.4.0"
resolved "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz"
@@ -6882,10 +6887,10 @@ [email protected]:
resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-4.0.0.tgz#1df8e654bd1395e4a319d82545c98667d7eed2f0"
integrity sha512-xwdG0FJPQMe0M0UA4Tz0zEB8rBJTRA5a476ZawAqiBkMv16GRK5xpXThOjMaEOFnZ6zabejjG4J3da0SXG63KA==
- version "23.0.9"
- resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-23.0.9.tgz#c429299b12bf2210f30dfd671b38869bbc5917b7"
- integrity sha512-2JboeCVrL+PksZ7IHp2teXbMUBnlucc3LhKGV+irxEA0l36bHs939AVtcaiATqyGnJcZkRdaB6TDd7SZfu+pxQ==
+ version "23.1.0"
+ resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-23.1.0.tgz#39bab8eb445d06ad9168eb2513c7f267923df2ba"
+ integrity sha512-aZpKjBBLzyxtr4Cmbyi3dl8uRO8SI2PG2MYEKYRZL6pl7IsKP2hJkCYzlD6NjLJlRIAZcFPFjFbJliO74DFf7w==
dependencies:
"7zip-bin" "~5.1.1"
"@develar/schema-utils" "~2.6.5"
@@ -8986,11 +8991,6 @@ core-js@^3.16.2:
resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.22.5.tgz#a5f5a58e663d5c0ebb4e680cd7be37536fb2a9cf"
integrity sha512-VP/xYuvJ0MJWRAobcmQ8F2H6Bsn+s7zqAAjFaHGBMc5AQm7zaelhD1LGduFn2EehEcQcU+br6t+fwbpQ5d1ZWA==
-core-js@^3.6.5:
- version "3.10.2"
- resolved "https://registry.npmjs.org/core-js/-/core-js-3.10.2.tgz"
- integrity sha512-W+2oVYeNghuBr3yTzZFQ5rfmjZtYB/Ubg87R5YOmlGrIb+Uw9f7qjUbhsj+/EkXhcV7eOD3jiM4+sgraX3FZUw==
-
[email protected], core-util-is@~1.0.0:
version "1.0.2"
resolved "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
@@ -10330,12 +10330,12 @@ dir-glob@^3.0.1:
dependencies:
path-type "^4.0.0"
- version "23.0.9"
- resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-23.0.9.tgz#ee509dba5631057a65e3d78434a8736179b2093a"
- integrity sha512-a9mq85K31czOjso+T0aN9pWlmydzhehapU+ussFMD5FwD3l3JCK2ILlRfXuR3penbZT6LKCHuQFDIaZvsusY1w==
+ version "23.1.0"
+ resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-23.1.0.tgz#94426db22b762e7ffc61f0da1f68d385059a20ed"
+ integrity sha512-CzhPk/k12nJ2KqTbePkIwHOLiaWneQu2cgXCT9Hb5FhwI1vxTPalLsg8OZ57wKCrkL8AEftqqSff8gB5yWY/xw==
dependencies:
- app-builder-lib "23.0.9"
+ app-builder-lib "23.1.0"
builder-util "23.0.9"
builder-util-runtime "9.0.2"
fs-extra "^10.0.0"
@@ -10586,17 +10586,17 @@ ejs@^3.1.7:
dependencies:
jake "^10.8.5"
-electron-builder@^23.0.9:
- version "23.0.9"
- resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-23.0.9.tgz#b181cbee1584d5c5c2eedfb6bc0348e6660600d3"
- integrity sha512-qeAbUfgVOBMjrDfGaTDsM2wuiPsISbADKLaMM27HAeVTjs6o4UuUFl+DzDVPal3v61W6nAB9kvBTeU9RZ/jH7g==
+electron-builder@^23.1.0:
+ version "23.1.0"
+ resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-23.1.0.tgz#fdd213387008e44ab7dcabe53b84dbd969c1a7cc"
+ integrity sha512-UEblaQY8N9m8/HriOwl7jgFJ4olpWDXwdDBqwUkQiRHVNRnCfrA0u8LV03li5ZYhma6zFWzfIZbHd+uk8y//lQ==
dependencies:
"@types/yargs" "^17.0.1"
- app-builder-lib "23.0.9"
+ app-builder-lib "23.1.0"
builder-util "23.0.9"
builder-util-runtime "9.0.2"
chalk "^4.1.1"
- dmg-builder "23.0.9"
+ dmg-builder "23.1.0"
fs-extra "^10.0.0"
is-ci "^3.0.0"
lazy-val "^1.0.5"
@@ -10698,13 +10698,13 @@ electron-window-state@^5.0.3:
jsonfile "^4.0.0"
mkdirp "^0.5.1"
- version "17.4.3"
- resolved "https://registry.yarnpkg.com/electron/-/electron-17.4.3.tgz#5f3c26cb211f9267d2becee717f34e3ce564a6bf"
- integrity sha512-WQggyCgNUOzoOn+wJKe+xFhYy56gyrn/jIa/l7dyD3TxPb8lddSc86OAqPnP5EugcNXQ0yIu8b+SIE8duKozSw==
+ version "19.0.7"
+ resolved "https://registry.yarnpkg.com/electron/-/electron-19.0.7.tgz#c7a7841646adc6457de70b93661cc400bfdf9d38"
+ integrity sha512-Wyg+oGkY8cWYmm8tVka6CZmhJxnyUx+Us2ALyWiY4w73+dO9XUNB/c7vQNIm1Uk/DLMn9vFzgvcS9YtOOMqpbg==
dependencies:
- "@electron/get" "^1.13.0"
- "@types/node" "^14.6.2"
+ "@electron/get" "^1.14.1"
+ "@types/node" "^16.11.26"
extract-zip "^1.0.3"
elegant-spinner@^1.0.1:
@@ -12411,13 +12411,12 @@ glob@^7.0.0, glob@^7.0.3, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, gl
once "^1.3.0"
path-is-absolute "^1.0.0"
-global-agent@^2.0.2:
- version "2.2.0"
- resolved "https://registry.npmjs.org/global-agent/-/global-agent-2.2.0.tgz"
- integrity sha512-+20KpaW6DDLqhG7JDiJpD1JvNvb8ts+TNl7BPOYcURqCrXqnN1Vf+XVOrkKJAFPqfX+oEhsdzOj1hLWkBTdNJg==
+global-agent@^3.0.0:
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/global-agent/-/global-agent-3.0.0.tgz#ae7cd31bd3583b93c5a16437a1afe27cc33a1ab6"
+ integrity sha512-PT6XReJ+D07JvGoxQMkT6qji/jVNfX/h364XHZOWeRzy64sSFr+xJ5OX7LI3b4MPQzdL4H8Y8M0xzPpsVMwA8Q==
dependencies:
boolean "^3.0.1"
- core-js "^3.6.5"
es6-error "^4.1.1"
matcher "^3.0.0"
roarr "^2.15.3"