Skip to content

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

Menu changes for multi file selection, refactoring grid perspective (#1343)

Stanimire74f59485677
diff --git a/app/components/FolderContainer.tsx b/app/components/FolderContainer.tsx
index 782730a03..82f04896c 100644
--- a/app/components/FolderContainer.tsx
+++ b/app/components/FolderContainer.tsx
@@ -51,12 +51,7 @@ import { normalizePath, extractShortDirectoryName } from '-/utils/paths';
import PlatformIO from '../services/platform-io';
import LoadingLazy from '../components/LoadingLazy';
import { Pro } from '../pro';
-import { savePerspective } from '-/utils/metaoperations';
-import {
- enhanceOpenedEntry,
- FileSystemEntry,
- FileSystemEntryMeta
-} from '-/services/utils-io';
+import { enhanceOpenedEntry, FileSystemEntry } from '-/services/utils-io';
import AppConfig from '-/config';
const GridPerspective = React.lazy(() =>
@@ -205,12 +200,12 @@ interface Props {
editTagForEntry: () => void;
openFileNatively: (path: string) => void;
toggleCreateFileDialog: () => void;
- deleteFile: () => void;
+ // deleteFile: () => void;
renameFile: () => void;
openDirectory: () => void;
showInFileManager: () => void;
openFsEntry: (fsEntry: FileSystemEntry) => void;
- deleteDirectory: (path: string) => void;
+ // deleteDirectory: (path: string) => void;
reflectCreateEntry: (path: string, isFile: boolean) => void;
loadDirectoryContent: (path: string) => void;
loadParentDirectoryContent: () => void;
@@ -397,7 +392,7 @@ const FolderContainer = (props: Props) => {
loadDirectoryContent={props.loadDirectoryContent}
openFsEntry={props.openFsEntry}
loadParentDirectoryContent={props.loadParentDirectoryContent}
- deleteFile={props.deleteFile}
+ // deleteFile={props.deleteFile}
renameFile={props.renameFile}
openDirectory={props.openDirectory}
showInFileManager={props.showInFileManager}
@@ -405,7 +400,7 @@ const FolderContainer = (props: Props) => {
setLastSelectedEntry={props.setLastSelectedEntry}
addTags={props.addTags}
editTagForEntry={props.editTagForEntry}
- deleteDirectory={props.deleteDirectory}
+ // deleteDirectory={props.deleteDirectory}
removeTags={props.removeTags}
removeAllTags={props.removeAllTags}
windowWidth={props.windowWidth}
@@ -420,7 +415,7 @@ const FolderContainer = (props: Props) => {
loadDirectoryContent={props.loadDirectoryContent}
openFsEntry={props.openFsEntry}
loadParentDirectoryContent={props.loadParentDirectoryContent}
- deleteFile={props.deleteFile}
+ // deleteFile={props.deleteFile}
renameFile={props.renameFile}
openDirectory={props.openDirectory}
showInFileManager={props.showInFileManager}
@@ -428,7 +423,7 @@ const FolderContainer = (props: Props) => {
setLastSelectedEntry={props.setLastSelectedEntry}
addTags={props.addTags}
editTagForEntry={props.editTagForEntry}
- deleteDirectory={props.deleteDirectory}
+ // deleteDirectory={props.deleteDirectory}
removeTags={props.removeTags}
removeAllTags={props.removeAllTags}
windowWidth={props.windowWidth}
@@ -551,7 +546,6 @@ const FolderContainer = (props: Props) => {
reflectCreateEntry={props.reflectCreateEntry}
openFsEntry={props.openFsEntry}
toggleCreateFileDialog={props.toggleCreateFileDialog}
- deleteDirectory={props.deleteDirectory}
switchPerspective={switchPerspective}
isReadOnlyMode={props.isReadOnlyMode}
/>
@@ -596,12 +590,12 @@ function mapActionCreatorsToProps(dispatch) {
editTagForEntry: TaggingActions.editTagForEntry,
openFileNatively: AppActions.openFileNatively,
toggleCreateFileDialog: AppActions.toggleCreateFileDialog,
- deleteFile: AppActions.deleteFile,
+ // deleteFile: AppActions.deleteFile,
renameFile: AppActions.renameFile,
openDirectory: AppActions.openDirectory,
showInFileManager: AppActions.showInFileManager,
openFsEntry: AppActions.openFsEntry,
- deleteDirectory: AppActions.deleteDirectory,
+ // deleteDirectory: AppActions.deleteDirectory,
reflectCreateEntry: AppActions.reflectCreateEntry,
loadDirectoryContent: AppActions.loadDirectoryContent,
loadParentDirectoryContent: AppActions.loadParentDirectoryContent,
diff --git a/app/components/menus/DirectoryMenu.tsx b/app/components/menus/DirectoryMenu.tsx
index a6556b15a..1b71a18cd 100644
--- a/app/components/menus/DirectoryMenu.tsx
+++ b/app/components/menus/DirectoryMenu.tsx
@@ -42,19 +42,18 @@ import DeleteForeverIcon from '@material-ui/icons/DeleteForever';
import SettingsIcon from '@material-ui/icons/Settings';
import { Progress } from 'aws-sdk/clients/s3';
import { Pro } from '../../pro';
-import ConfirmDialog from '../dialogs/ConfirmDialog';
import CreateDirectoryDialog from '../dialogs/CreateDirectoryDialog';
import RenameDirectoryDialog from '../dialogs/RenameDirectoryDialog';
import AppConfig from '-/config';
import i18n from '-/services/i18n';
-import {
- extractFileName,
- normalizePath,
- cleanTrailingDirSeparator
-} from '-/utils/paths';
+import { normalizePath } from '-/utils/paths';
import PlatformIO from '-/services/platform-io';
import { formatDateTime4Tag } from '-/utils/misc';
-import { actions as AppActions, perspectives } from '-/reducers/app';
+import {
+ actions as AppActions,
+ getSelectedEntries,
+ perspectives
+} from '-/reducers/app';
import IOActions from '-/reducers/io-actions';
import { Tag } from '-/reducers/taglibrary';
import TaggingActions from '-/reducers/tagging-actions';
@@ -72,7 +71,6 @@ interface Props {
loadDirectoryContent: (path: string) => void;
openDirectory: (path: string) => void;
openFsEntry: (fsEntry: FileSystemEntry) => void;
- deleteDirectory: (path: string) => void;
reflectCreateEntry?: (path: string, isFile: boolean) => void;
toggleCreateFileDialog?: () => void;
// extractContent: (config: Object) => void,
@@ -99,6 +97,9 @@ interface Props {
tags: Array<Tag>,
updateIndex: boolean
) => void;
+ toggleDeleteMultipleEntriesDialog: () => void;
+ selectedEntries: Array<any>;
+ setSelectedEntries: (selectedEntries: Array<Object>) => void;
}
const DirectoryMenu = (props: Props) => {
@@ -109,10 +110,6 @@ const DirectoryMenu = (props: Props) => {
isCreateDirectoryDialogOpened,
setIsCreateDirectoryDialogOpened
] = useState(false);
- const [
- isDeleteDirectoryDialogOpened,
- setIsDeleteDirectoryDialogOpened
- ] = useState(false);
const [
isRenameDirectoryDialogOpened,
setIsRenameDirectoryDialogOpened
@@ -165,7 +162,10 @@ const DirectoryMenu = (props: Props) => {
function showDeleteDirectoryDialog() {
props.onClose();
- setIsDeleteDirectoryDialogOpened(true);
+ props.setSelectedEntries([
+ { isFile: false, name: props.directoryPath, path: props.directoryPath }
+ ]);
+ props.toggleDeleteMultipleEntriesDialog();
}
function showRenameDirectoryDialog() {
@@ -183,12 +183,6 @@ const DirectoryMenu = (props: Props) => {
props.toggleCreateFileDialog();
}
- function handleCloseDialogs() {
- setIsCreateDirectoryDialogOpened(false);
- setIsDeleteDirectoryDialogOpened(false);
- setIsRenameDirectoryDialogOpened(false);
- }
-
function showInFileManager() {
props.onClose();
props.openDirectory(props.directoryPath);
@@ -316,12 +310,12 @@ Do you want to continue?`)
});
}
- function getDirPath(dirPath: string) {
+ /* function getDirPath(dirPath: string) {
const fileName = extractFileName(dirPath, PlatformIO.getDirSeparator());
return props.directoryPath && fileName
? fileName
: cleanTrailingDirSeparator(props.directoryPath);
- }
+ } */
return (
<div style={{ overflowY: 'hidden' }}>
@@ -329,38 +323,20 @@ Do you want to continue?`)
<RenameDirectoryDialog
key={'renameDir' + props.directoryPath}
open={isRenameDirectoryDialogOpened}
- onClose={handleCloseDialogs}
+ onClose={() => setIsRenameDirectoryDialogOpened(false)}
selectedDirectoryPath={props.directoryPath}
/>
)}
- {isCreateDirectoryDialogOpened && ( // TODO move dialogs from this Menu and don't include the Menu HTML always
+ {isCreateDirectoryDialogOpened && ( // TODO move dialogs in MainContainer and don't include the Menu HTML always
<CreateDirectoryDialog
key={'createDir' + props.directoryPath}
open={isCreateDirectoryDialogOpened}
- onClose={handleCloseDialogs}
+ onClose={() => setIsCreateDirectoryDialogOpened(false)}
selectedDirectoryPath={props.directoryPath}
/>
)}
- {isDeleteDirectoryDialogOpened && (
- <ConfirmDialog
- open={isDeleteDirectoryDialogOpened}
- onClose={handleCloseDialogs}
- title={i18n.t('core:deleteDirectoryTitleConfirm')}
- content={i18n.t('core:deleteDirectoryContentConfirm', {
- dirPath: getDirPath(props.directoryPath)
- })}
- confirmCallback={result => {
- if (result) {
- props.deleteDirectory(props.directoryPath);
- }
- }}
- confirmDialogContentTID="confirmDialogContent"
- cancelDialogTID="cancelDeleteDirectoryDialog"
- confirmDialogTID="confirmDeleteDirectoryDialog"
- />
- )}
<Menu anchorEl={props.anchorEl} open={props.open} onClose={props.onClose}>
- {props.perspectiveMode && (
+ {props.selectedEntries.length < 2 && props.perspectiveMode && (
<MenuItem data-tid="openDirectory" onClick={openDirectory}>
<ListItemIcon>
<OpenFolderIcon />
@@ -368,7 +344,7 @@ Do you want to continue?`)
<ListItemText primary={i18n.t('core:openDirectory')} />
</MenuItem>
)}
- {!props.perspectiveMode && (
+ {props.selectedEntries.length < 2 && !props.perspectiveMode && (
<MenuItem data-tid="reloadDirectory" onClick={reloadDirectory}>
<ListItemIcon>
<AutoRenew />
@@ -376,7 +352,7 @@ Do you want to continue?`)
<ListItemText primary={i18n.t('core:reloadDirectory')} />
</MenuItem>
)}
- {!props.isReadOnlyMode && (
+ {props.selectedEntries.length < 2 && !props.isReadOnlyMode && (
<MenuItem
data-tid="renameDirectory"
onClick={showRenameDirectoryDialog}
@@ -398,14 +374,15 @@ Do you want to continue?`)
<ListItemText primary={i18n.t('core:deleteDirectory')} />
</MenuItem>
)}
- {!(PlatformIO.haveObjectStoreSupport() || AppConfig.isWeb) && (
- <MenuItem data-tid="showInFileManager" onClick={showInFileManager}>
- <ListItemIcon>
- <OpenFolderNativelyIcon />
- </ListItemIcon>
- <ListItemText primary={i18n.t('core:showInFileManager')} />
- </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
@@ -434,7 +411,7 @@ Do you want to continue?`)
<ListItemText primary={i18n.t('core:addFiles')} />
</MenuItem>
)}
- {process.platform === 'darwin' && (
+ {props.selectedEntries.length < 2 && process.platform === 'darwin' && (
<MenuItem data-tid="importMacTags" onClick={importMacTags}>
<ListItemIcon>
<ImportTagsIcon />
@@ -450,9 +427,8 @@ Do you want to continue?`)
<ListItemText primary={i18n.t('core:cameraTakePicture')} />
</MenuItem>
)}
- <Divider />
{!props.perspectiveMode && (
- <div>
+ <>
<MenuItem
data-tid="openDefaultPerspective"
onClick={() => switchPerspective(perspectives.DEFAULT)}
@@ -499,8 +475,7 @@ Do you want to continue?`)
</ListItemIcon>
<ListItemText primary="KanBan Perspective - Beta" />
</MenuItem> */}
- <Divider />
- </div>
+ </>
)}
{/* {!props.isReadOnlyMode && (
<React.Fragment>
@@ -512,12 +487,17 @@ Do you want to continue?`)
</MenuItem>
</React.Fragment>
)} */}
- <MenuItem data-tid="showProperties" onClick={showProperties}>
- <ListItemIcon>
- <SettingsIcon />
- </ListItemIcon>
- <ListItemText primary={i18n.t('core:directoryPropertiesTitle')} />
- </MenuItem>
+ {props.selectedEntries.length < 2 && (
+ <>
+ <Divider />
+ <MenuItem data-tid="showProperties" onClick={showProperties}>
+ <ListItemIcon>
+ <SettingsIcon />
+ </ListItemIcon>
+ <ListItemText primary={i18n.t('core:directoryPropertiesTitle')} />
+ </MenuItem>
+ </>
+ )}
</Menu>
<FileUploadContainer
ref={fileUploadContainerRef}
@@ -533,6 +513,12 @@ Do you want to continue?`)
);
};
+function mapStateToProps(state) {
+ return {
+ selectedEntries: getSelectedEntries(state)
+ };
+}
+
function mapDispatchToProps(dispatch) {
return bindActionCreators(
{
@@ -544,10 +530,13 @@ function mapDispatchToProps(dispatch) {
reflectCreateEntries: AppActions.reflectCreateEntries,
extractContent: IOActions.extractContent,
uploadFilesAPI: IOActions.uploadFilesAPI,
- addTags: TaggingActions.addTags
+ addTags: TaggingActions.addTags,
+ toggleDeleteMultipleEntriesDialog:
+ AppActions.toggleDeleteMultipleEntriesDialog,
+ setSelectedEntries: AppActions.setSelectedEntries
},
dispatch
);
}
-export default connect(null, mapDispatchToProps)(DirectoryMenu);
+export default connect(mapStateToProps, mapDispatchToProps)(DirectoryMenu);
diff --git a/app/components/menus/FileMenu.tsx b/app/components/menus/FileMenu.tsx
index a9dc21ca5..6ed566b01 100644
--- a/app/components/menus/FileMenu.tsx
+++ b/app/components/menus/FileMenu.tsx
@@ -58,6 +58,7 @@ interface Props {
) => void;
selectedFilePath?: string;
isReadOnlyMode: boolean;
+ selectedEntries: Array<any>;
}
const FileMenu = (props: Props) => {
@@ -148,37 +149,40 @@ const FileMenu = (props: Props) => {
return (
<div style={{ overflowY: 'hidden' }}>
<Menu anchorEl={props.anchorEl} open={props.open} onClose={props.onClose}>
- <MenuItem data-tid="fileMenuOpenFile" onClick={openFile}>
- <ListItemIcon>
- <OpenFile />
- </ListItemIcon>
- <ListItemText primary={i18n.t('core:openFile')} />
- </MenuItem>
- {!(PlatformIO.haveObjectStoreSupport() || AppConfig.isWeb) && (
- <div>
- <MenuItem
- data-tid="fileMenuOpenFileNatively"
- onClick={openFileNatively}
- >
- <ListItemIcon>
- <OpenFileNatively />
- </ListItemIcon>
- <ListItemText primary={i18n.t('core:openFileNatively')} />
- </MenuItem>
- <MenuItem
- data-tid="fileMenuOpenContainingFolder"
- onClick={showInFileManager}
- >
- <ListItemIcon>
- <OpenContainingFolder />
- </ListItemIcon>
- <ListItemText primary={i18n.t('core:showInFileManager')} />
- </MenuItem>
- </div>
+ {props.selectedEntries.length < 2 && (
+ <MenuItem data-tid="fileMenuOpenFile" onClick={openFile}>
+ <ListItemIcon>
+ <OpenFile />
+ </ListItemIcon>
+ <ListItemText primary={i18n.t('core:openFile')} />
+ </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>
+ <OpenContainingFolder />
+ </ListItemIcon>
+ <ListItemText primary={i18n.t('core:showInFileManager')} />
+ </MenuItem>
+ <Divider />
+ </>
+ )}
{!props.isReadOnlyMode && (
- <div>
- <Divider />
+ <>
<MenuItem
data-tid="fileMenuAddRemoveTags"
onClick={showAddRemoveTagsDialog}
@@ -206,7 +210,7 @@ const FileMenu = (props: Props) => {
</ListItemIcon>
<ListItemText primary={i18n.t('core:moveCopyFile')} />
</MenuItem>
- {Pro && (
+ {Pro && props.selectedEntries.length < 2 && (
<MenuItem data-tid="setAsThumbTID" onClick={setFolderThumbnail}>
<ListItemIcon>
<ImageIcon />
@@ -223,7 +227,7 @@ const FileMenu = (props: Props) => {
</ListItemIcon>
<ListItemText primary={i18n.t('core:deleteEntry')} />
</MenuItem>
- </div>
+ </>
)}
</Menu>
</div>
diff --git a/app/containers/MainPage.tsx b/app/containers/MainPage.tsx
index d68a1d94d..c000bee6d 100644
--- a/app/containers/MainPage.tsx
+++ b/app/containers/MainPage.tsx
@@ -71,7 +71,9 @@ import {
isReadOnlyMode,
isProgressOpened,
getOpenedFiles,
- OpenedEntry
+ OpenedEntry,
+ isDeleteMultipleEntriesDialogOpened,
+ getSelectedEntries
} from '../reducers/app';
import {
actions as LocationIndexActions,
@@ -92,6 +94,7 @@ import FileUploadDialog from '-/components/dialogs/FileUploadDialog';
import ProgressDialog from '-/components/dialogs/ProgressDialog';
import { FileSystemEntry } from '-/services/utils-io';
import useEventListener from '-/utils/useEventListener';
+import ConfirmDialog from '-/components/dialogs/ConfirmDialog';
const initialSplitSize = 44;
const drawerWidth = 300;
@@ -184,7 +187,7 @@ interface Props {
toggleAboutDialog: () => void; // needed by electron-menus
toggleOnboardingDialog: () => void; // needed by electron-menus
setLastSelectedEntry: (path: string) => void; // needed by electron-menus
- setSelectedEntries: (path: string) => void; // needed by electron-menus
+ setSelectedEntries: (selectedEntries: Array<Object>) => void; // needed by electron-menus
openFsEntry: (fsEntry: FileSystemEntry) => void; // needed by electron-menus
openFileNatively: (url: string) => void; // needed by electron-menus
openURLExternally: (url: string) => void;
@@ -220,6 +223,11 @@ interface Props {
onUploadProgress?: (progress: Progress, response: any) => void
) => any;
onUploadProgress: (progress: Progress, response: any) => void;
+ isDeleteMultipleEntriesDialogOpened: boolean;
+ toggleDeleteMultipleEntriesDialog: () => void;
+ selectedEntries: Array<any>;
+ deleteFile: (path: string) => void;
+ deleteDirectory: (path: string) => void;
}
const AboutDialog = React.lazy(() =>
@@ -623,6 +631,39 @@ const MainPage = (props: Props) => {
onClose={toggleSettingsDialog}
/>
)}
+ {props.isDeleteMultipleEntriesDialogOpened && (
+ <ConfirmDialog
+ open={props.isDeleteMultipleEntriesDialogOpened}
+ onClose={() => props.toggleDeleteMultipleEntriesDialog()}
+ title={i18n.t('core:deleteConfirmationTitle')}
+ content={i18n.t('core:deleteConfirmationContent')}
+ list={props.selectedEntries.map(fsEntry => fsEntry.name)}
+ confirmCallback={result => {
+ if (result && props.selectedEntries) {
+ const deletePromises = props.selectedEntries.map(fsEntry => {
+ if (fsEntry.isFile) {
+ return props.deleteFile(fsEntry.path);
+ }
+ return props.deleteDirectory(fsEntry.path);
+ });
+ Promise.all(deletePromises)
+ .then(delResult => {
+ // console.debug(delResult);
+ if (delResult.some(del => del)) {
+ props.setSelectedEntries([]);
+ } // TODO else { remove only deleted from setSelectedEntries}
+ return true;
+ })
+ .catch(err => {
+ console.warn('Deleting file failed', err);
+ });
+ }
+ }}
+ cancelDialogTID="cancelDeleteFileDialog"
+ confirmDialogTID="confirmDeleteFileDialog"
+ confirmDialogContentTID="confirmDeleteDialogContent"
+ />
+ )}
<Snackbar
data-tid={props.notificationStatus.tid}
anchorOrigin={{ vertical: 'bottom', horizontal: 'center' }}
@@ -834,7 +875,11 @@ function mapStateToProps(state) {
isSearchPanelOpened: isSearchPanelOpened(state),
isPerspectivesPanelOpened: isPerspectivesPanelOpened(state),
isHelpFeedbackPanelOpened: isHelpFeedbackPanelOpened(state),
- directoryPath: getDirectoryPath(state)
+ directoryPath: getDirectoryPath(state),
+ isDeleteMultipleEntriesDialogOpened: isDeleteMultipleEntriesDialogOpened(
+ state
+ ),
+ selectedEntries: getSelectedEntries(state)
};
}
@@ -884,8 +929,12 @@ function mapDispatchToProps(dispatch) {
openPerspectivesPanel: AppActions.openPerspectivesPanel,
openHelpFeedbackPanel: AppActions.openHelpFeedbackPanel,
closeAllVerticalPanels: AppActions.closeAllVerticalPanels,
+ toggleDeleteMultipleEntriesDialog:
+ AppActions.toggleDeleteMultipleEntriesDialog,
setFirstRun: SettingsActions.setFirstRun,
- uploadFilesAPI: IOActions.uploadFilesAPI
+ uploadFilesAPI: IOActions.uploadFilesAPI,
+ deleteDirectory: AppActions.deleteDirectory,
+ deleteFile: AppActions.deleteFile
},
dispatch
);
diff --git a/app/perspectives/grid-perspective/components/MainContainer.tsx b/app/perspectives/grid-perspective/components/MainContainer.tsx
index 3fdd9122f..b109b9564 100644
--- a/app/perspectives/grid-perspective/components/MainContainer.tsx
+++ b/app/perspectives/grid-perspective/components/MainContainer.tsx
@@ -16,7 +16,7 @@
*
*/
-import React from 'react';
+import React, { useEffect, useRef, useState } from 'react';
import uuidv1 from 'uuid';
import { connect } from 'react-redux';
import { bindActionCreators } from 'redux';
@@ -31,13 +31,12 @@ import {
getKeyBindingObject,
isDesktopMode
} from '-/reducers/settings';
-import { sortByCriteria, isObj, isVisibleOnScreen } from '-/utils/misc';
+import { sortByCriteria } from '-/utils/misc';
import styles from './styles.css';
import FileMenu from '-/components/menus/FileMenu';
import DirectoryMenu from '-/components/menus/DirectoryMenu';
import EntryTagMenu from '-/components/menus/EntryTagMenu';
import i18n from '-/services/i18n';
-import ConfirmDialog from '-/components/dialogs/ConfirmDialog';
import AddRemoveTagsDialog from '-/components/dialogs/AddRemoveTagsDialog';
import MoveCopyFilesDialog from '-/components/dialogs/MoveCopyFilesDialog';
import RenameFileDialog from '-/components/dialogs/RenameFileDialog';
@@ -51,6 +50,7 @@ import {
actions as AppActions,
getLastSelectedEntry,
getSelectedEntries,
+ isDeleteMultipleEntriesDialogOpened,
isReadOnlyMode
} from '-/reducers/app';
import TaggingActions from '-/reducers/tagging-actions';
@@ -60,7 +60,7 @@ import SortingMenu from './SortingMenu';
import GridOptionsMenu from './GridOptionsMenu';
import { getLocation, Location, locationType } from '-/reducers/locations';
import PlatformIO from '-/services/platform-io';
-import { extractFileName, getLocationPath } from '-/utils/paths';
+import { getLocationPath } from '-/utils/paths';
import GridPagination from '-/perspectives/grid-perspective/components/GridPagination';
import GridSettingsDialog from '-/perspectives/grid-perspective/components/GridSettingsDialog';
@@ -76,8 +76,8 @@ interface Props {
openFsEntry: (fsEntry: FileSystemEntry) => void;
openNextFile: () => any;
openPrevFile: () => any;
- deleteFile: (path: string) => void;
- deleteDirectory: (path: string) => void;
+ // deleteFile: (path: string) => void;
+ // deleteDirectory: (path: string) => void;
loadDirectoryContent: (path: string) => void;
openDirectory: (path: string) => void;
showInFileManager: (path: string) => void;
@@ -87,7 +87,7 @@ interface Props {
setLastSelectedEntry: (entryPath: string | null) => void;
setSelectedEntries: (selectedEntries: Array<Object>) => void;
addTags: () => void;
- removeTags: () => void;
+ removeTags: (paths: Array<string>, tags: Array<Tag>) => void;
removeAllTags: () => void;
directoryContent: Array<FileSystemEntry>;
moveFiles: (files: Array<string>, destination: string) => void;
@@ -99,10 +99,10 @@ interface Props {
) => void;
currentLocation: Location;
isDesktopMode: boolean;
+ toggleDeleteMultipleEntriesDialog: () => void;
}
-interface State {
- fileContextMenuAnchorEl: Element;
+/* interface State {
fileContextMenuOpened: boolean;
dirContextMenuAnchorEl: Element;
dirContextMenuOpened: boolean;
@@ -131,74 +131,140 @@ interface State {
selectedEntryPath: string;
selectedTag: Tag | null;
gridPageLimit: number;
-}
+} */
+
+const GridPerspective = (props: Props) => {
+ const settings = JSON.parse(localStorage.getItem('tsPerspectiveGrid')); // loading settings
+
+ const allFilesSelected = useRef<boolean>(false);
+ const selectedEntryPath = useRef<string>('');
+ const selectedTag = useRef<Tag | null>(null);
+ const [
+ fileContextMenuAnchorEl,
+ setFileContextMenuAnchorEl
+ ] = useState<null | HTMLElement>(null);
+ const [
+ dirContextMenuAnchorEl,
+ setDirContextMenuAnchorEl
+ ] = useState<null | HTMLElement>(null);
+ const [
+ tagContextMenuAnchorEl,
+ setTagContextMenuAnchorEl
+ ] = useState<null | HTMLElement>(null);
+ const [
+ sortingContextMenuAnchorEl,
+ setSortingContextMenuAnchorEl
+ ] = useState<null | HTMLElement>(null);
+ const [
+ optionsContextMenuAnchorEl,
+ setOptionsContextMenuAnchorEl
+ ] = useState<null | HTMLElement>(null);
+ // const [selectedEntryPath, setSelectedEntryPath] = useState<string>('');
+ const [sortBy, setSortBy] = useState<string>(
+ settings && settings.sortBy ? settings.sortBy : 'byName'
+ );
+ const [orderBy, setOrderBy] = useState<null | boolean>(
+ settings && typeof settings.orderBy !== 'undefined'
+ ? settings.orderBy
+ : false
+ );
+ const [layoutType, setLayoutType] = useState<string>(
+ settings && settings.layoutType ? settings.layoutType : 'grid'
+ );
+ const [singleClickAction, setSingleClickAction] = useState<string>(
+ settings && settings.singleClickAction
+ ? settings.singleClickAction
+ : 'openInternal' // openExternal
+ );
+ /* const [doubleClickAction, setDoubleClickAction] = useState<string>(
+ settings && settings.doubleClickAction
+ ? settings.doubleClickAction
+ : 'openInternal' // openExternal
+ ); */
+ const [entrySize, setEntrySize] = useState<string>(
+ settings && settings.entrySize ? settings.entrySize : 'normal' // small, big
+ );
+ const [thumbnailMode, setThumbnailMode] = useState<string>(
+ settings && settings.thumbnailMode ? settings.thumbnailMode : 'cover' // contain
+ );
+ // const [fileOperationsEnabled, setFileOperationsEnabled] = useState<boolean>(false);
+ const [showDirectories, setShowDirectories] = useState<boolean>(
+ settings && typeof settings.showDirectories !== 'undefined'
+ ? settings.showDirectories
+ : true
+ );
+ const [showTags, setShowTags] = useState<boolean>(
+ settings && typeof settings.showTags !== 'undefined'
+ ? settings.showTags
+ : true
+ );
+ const [
+ isMoveCopyFilesDialogOpened,
+ setIsMoveCopyFilesDialogOpened
+ ] = useState<boolean>(false);
+ const [
+ isAddRemoveTagsDialogOpened,
+ setIsAddRemoveTagsDialogOpened
+ ] = useState<boolean>(false);
+ const [isFileRenameDialogOpened, setIsFileRenameDialogOpened] = useState<
+ boolean
+ >(false);
+ const [isGridSettingsDialogOpened, setIsGridSettingsDialogOpened] = useState<
+ boolean
+ >(false);
+ // const [selectedTag, setSelectedTag] = useState<Tag | null>(null);
+ const [gridPageLimit, setGridPageLimit] = useState<number>(
+ settings && settings.gridPageLimit ? settings.gridPageLimit : 100
+ );
-class GridPerspective extends React.Component<Props, State> {
- static allFilesSelected: boolean;
-
- constructor(props) {
- super(props);
- GridPerspective.allFilesSelected = false;
- const settings = JSON.parse(localStorage.getItem('tsPerspectiveGrid')); // loading settings
- this.state = {
- fileContextMenuOpened: false,
- fileContextMenuAnchorEl: null,
- dirContextMenuOpened: false,
- dirContextMenuAnchorEl: null,
- tagContextMenuOpened: false,
- tagContextMenuAnchorEl: null,
- sortingContextMenuOpened: false,
- sortingContextMenuAnchorEl: null,
- optionsContextMenuOpened: false,
- optionsContextMenuAnchorEl: null,
- selectedEntryPath: '',
- sortBy: settings && settings.sortBy ? settings.sortBy : 'byName',
- orderBy:
- settings && typeof settings.orderBy !== 'undefined'
- ? settings.orderBy
- : true,
- layoutType:
- settings && settings.layoutType ? settings.layoutType : 'grid',
- singleClickAction:
- settings && settings.singleClickAction
- ? settings.singleClickAction
- : 'openInternal', // openExternal
- doubleClickAction:
- settings && settings.doubleClickAction
- ? settings.doubleClickAction
- : 'openInternal', // openExternal
- entrySize: settings && settings.entrySize ? settings.entrySize : 'normal', // small, big
- thumbnailMode:
- settings && settings.thumbnailMode ? settings.thumbnailMode : 'cover', // contain
- fileOperationsEnabled: false,
- // allFilesSelected: false,
- showDirectories:
- settings && typeof settings.showDirectories !== 'undefined'
- ? settings.showDirectories
- : true,
- showTags:
- settings && typeof settings.showTags !== 'undefined'
- ? settings.showTags
- : true,
- isDeleteMultipleFilesDialogOpened: false,
- isMoveCopyFilesDialogOpened: false,
- isAddRemoveTagsDialogOpened: false,
- isFileRenameDialogOpened: false,
- isGridSettingsDialogOpened: false,
- selectedTag: null,
- gridPageLimit:
- settings && settings.gridPageLimit ? settings.gridPageLimit : 100
+ useEffect(() => {
+ const settingsObj = {
+ showDirectories,
+ showTags,
+ layoutType,
+ orderBy,
+ sortBy,
+ singleClickAction,
+ // doubleClickAction,
+ entrySize,
+ thumbnailMode,
+ gridPageLimit
};
- }
+ localStorage.setItem('tsPerspectiveGrid', JSON.stringify(settingsObj));
+ }, [
+ showDirectories,
+ showTags,
+ layoutType,
+ orderBy,
+ sortBy,
+ singleClickAction,
+ // doubleClickAction,
+ entrySize,
+ thumbnailMode,
+ gridPageLimit
+ ]);
+
+ const fileOperationsEnabled = () => {
+ let selectionContainsDirectories = false;
+ if (props.selectedEntries && props.selectedEntries.length > 0) {
+ selectionContainsDirectories = selectedEntries.some(
+ entry => !entry.isFile
+ );
+ }
+ return !selectionContainsDirectories;
+ };
- static getDerivedStateFromProps(nextProps: Props, prevState: State) {
+ const folderOperationsEnabled = () => {
+ let selectionContainsFiles = false;
+ if (props.selectedEntries && props.selectedEntries.length > 0) {
+ selectionContainsFiles = selectedEntries.some(entry => entry.isFile);
+ }
+ return !selectionContainsFiles;
+ };
+ /* static getDerivedStateFromProps(nextProps: Props, prevState: State) {
const { selectedEntries } = nextProps;
let fileOperationsEnabled = false;
- // if (lastSelectedEntryPath !== null) {
- // this.makeFirstSelectedEntryVisible(); // disable due to wrong scrolling
- // }
-
if (selectedEntries && selectedEntries.length > 0) {
let selectionContainsDirectories = false;
selectedEntries.map(entry => {
@@ -216,23 +282,14 @@ class GridPerspective extends React.Component<Props, State> {
...prevState,
fileOperationsEnabled
};
+ } */
- // const grid = document.querySelector(
- // '[data-tid="perspectiveGridFileTable"]'
- // );
- // const firstGridItem = grid.querySelector('div');
-
- // if (isObj(firstGridItem)) {
- // firstGridItem.scrollIntoView({ top: 80 });
- // }
- }
-
- sort = memoize((data, criteria, order) =>
+ const sort = memoize((data, criteria, order) =>
sortByCriteria(data, criteria, order)
);
- makeFirstSelectedEntryVisible = () => {
- const { selectedEntries } = this.props;
+ /* const makeFirstSelectedEntryVisible = () => {
+ const { selectedEntries } = props;
if (selectedEntries && selectedEntries.length > 0) {
const firstSelectedElement = document.querySelector(
'[data-entry-id="' + selectedEntries[0].uuid + '"]'
@@ -245,75 +302,44 @@ class GridPerspective extends React.Component<Props, State> {
firstSelectedElement.scrollIntoView(false);
}
}
- };
-
- saveSettings() {
- const settingsObj = {
- showDirectories: this.state.showDirectories,
- showTags: this.state.showTags,
- layoutType: this.state.layoutType,
- orderBy: this.state.orderBy,
- sortBy: this.state.sortBy,
- singleClickAction: this.state.singleClickAction,
- doubleClickAction: this.state.doubleClickAction,
- entrySize: this.state.entrySize,
- thumbnailMode: this.state.thumbnailMode,
- gridPageLimit: this.state.gridPageLimit
- };
- localStorage.setItem('tsPerspectiveGrid', JSON.stringify(settingsObj));
- }
-
- /* scrollToBottom = () => {
- const messagesContainer = ReactDOM.findDOMNode(this.messagesContainer);
- messagesContainer.scrollTop = messagesContainer.scrollHeight;
}; */
- // mainGrid;
-
- handleLayoutSwitch = (layoutType: string) => {
- this.setState({ layoutType }, this.saveSettings);
+ const handleLayoutSwitch = (type: string) => {
+ setLayoutType(type);
};
- handleGridPageLimit = (gridPageLimit: number) => {
- this.handleCloseDialogs();
- this.setState({ gridPageLimit }, this.saveSettings);
+ const handleGridPageLimit = (limit: number) => {
+ setGridPageLimit(limit);
+ setIsGridSettingsDialogOpened(false);
};
- handleSortBy = sortBy => {
- this.closeSortingMenu();
- this.setState(
- prevState => ({
- orderBy: !prevState.orderBy,
- sortBy
- }),
- this.saveSettings
- );
+ const handleSortBy = handleSort => {
+ if (sortBy !== handleSort) {
+ setSortBy(handleSort);
+ } else {
+ setOrderBy(!orderBy);
+ }
+ setSortingContextMenuAnchorEl(null);
};
- handleSortingMenu = event => {
+ const handleSortingMenu = event => {
const anchor = event ? event.currentTarget : null;
- this.setState(prevState => ({
- sortingContextMenuOpened: !prevState.sortingContextMenuOpened,
- sortingContextMenuAnchorEl: anchor
- }));
+ setSortingContextMenuAnchorEl(anchor);
};
- handleOptionsMenu = event => {
+ const handleOptionsMenu = event => {
const anchor = event ? event.currentTarget : null;
- this.setState(prevState => ({
- optionsContextMenuOpened: !prevState.optionsContextMenuOpened,
- optionsContextMenuAnchorEl: anchor
- }));
+ setOptionsContextMenuAnchorEl(anchor);
};
- handleGridCellClick = (event, fsEntry: FileSystemEntry) => {
+ const handleGridCellClick = (event, fsEntry: FileSystemEntry) => {
const {
selectedEntries,
directoryContent,
lastSelectedEntryPath,
setLastSelectedEntry,
setSelectedEntries
- } = this.props;
+ } = props;
const selectHelperKey = AppConfig.isMacLike ? event.metaKey : event.ctrlKey;
if (event.shiftKey) {
let lastSelectedIndex = directoryContent.findIndex(
@@ -359,166 +385,162 @@ class GridPerspective extends React.Component<Props, State> {
setSelectedEntries([fsEntry]);
setLastSelectedEntry(fsEntry.path);
if (fsEntry.isFile) {
- if (this.state.singleClickAction === 'openInternal') {
- this.props.openFsEntry(fsEntry);
- } else if (this.state.singleClickAction === 'openExternal') {
- this.props.openFileNatively(fsEntry.path);
+ if (singleClickAction === 'openInternal') {
+ props.openFsEntry(fsEntry);
+ } else if (singleClickAction === 'openExternal') {
+ props.openFileNatively(fsEntry.path);
}
// else if (this.state.singleClickAction === 'selects') {}
}
}
};
- clearSelection = () => {
- const { setSelectedEntries, setLastSelectedEntry } = this.props;
- setSelectedEntries([]);
- GridPerspective.allFilesSelected = false;
- setLastSelectedEntry(null);
+ const clearSelection = () => {
+ props.setSelectedEntries([]);
+ allFilesSelected.current = false;
+ props.setLastSelectedEntry(null);
};
- toggleSelectAllFiles = () => {
- if (GridPerspective.allFilesSelected) {
- this.clearSelection();
+ const toggleSelectAllFiles = () => {
+ if (selectedEntries.length > 0) {
+ // && allFilesSelected.current) {
+ clearSelection();
} else {
const selectedEntries = [];
- this.props.directoryContent.map(entry => {
+ props.directoryContent.map(entry => {
if (entry.isFile) {
selectedEntries.push(entry);
}
return true;
});
- this.props.setSelectedEntries(selectedEntries);
- GridPerspective.allFilesSelected = !GridPerspective.allFilesSelected;
+ props.setSelectedEntries(selectedEntries);
+ allFilesSelected.current = true;
}
};
- toggleShowDirectories = () => {
- this.closeOptionsMenu();
- this.setState(
- prevState => ({
- showDirectories: !prevState.showDirectories
- }),
- this.saveSettings
- );
+ const toggleShowDirectories = () => {
+ closeOptionsMenu();
+ setShowDirectories(!showDirectories);
};
- toggleShowTags = () => {
- this.closeOptionsMenu();
- this.setState(
- prevState => ({
- showTags: !prevState.showTags
- }),
- this.saveSettings
- );
+ const toggleShowTags = () => {
+ closeOptionsMenu();
+ setShowTags(!showTags);
};
- toggleThumbnailsMode = () => {
- this.closeOptionsMenu();
- this.setState(
- prevState => ({
- thumbnailMode: prevState.thumbnailMode === 'cover' ? 'contain' : 'cover'
- }),
- this.saveSettings
- );
+ const toggleThumbnailsMode = () => {
+ closeOptionsMenu();
+ const thumbMode = thumbnailMode === 'cover' ? 'contain' : 'cover';
+ setThumbnailMode(thumbMode);
};
- changeEntrySize = entrySize => {
- this.closeOptionsMenu();
- this.setState({ entrySize }, this.saveSettings);
+ const changeEntrySize = size => {
+ closeOptionsMenu();
+ setEntrySize(size);
};
- changeSingleClickAction = singleClickAction => {
- this.closeOptionsMenu();
- this.setState({ singleClickAction }, this.saveSettings);
+ const changeSingleClickAction = singleClick => {
+ closeOptionsMenu();
+ setSingleClickAction(singleClick);
};
- openHelpWebPage = () => {
- this.closeOptionsMenu();
- this.props.openURLExternally(
- AppConfig.documentationLinks.defaultPerspective
- );
+ const openHelpWebPage = () => {
+ closeOptionsMenu();
+ props.openURLExternally(AppConfig.documentationLinks.defaultPerspective);
};
- openSettings = () => {
- this.closeOptionsMenu();
- this.openGridSettingsDialog();
+ const openSettings = () => {
+ closeOptionsMenu();
+ setIsGridSettingsDialogOpened(true);
};
- handleGridCellDblClick = (event, fsEntry: FileSystemEntry) => {
- this.props.setSelectedEntries([]);
- if (this.props.currentLocation.type === locationType.TYPE_CLOUD) {
- PlatformIO.enableObjectStoreSupport(this.props.currentLocation)
+ const handleGridCellDblClick = (event, fsEntry: FileSystemEntry) => {
+ props.setSelectedEntries([]);
+ if (props.currentLocation.type === locationType.TYPE_CLOUD) {
+ PlatformIO.enableObjectStoreSupport(props.currentLocation)
.then(() => {
- this.openLocation(fsEntry);
+ openLocation(fsEntry);
return true;
})
.catch(error => {
console.log('enableObjectStoreSupport', error);
});
- } else if (this.props.currentLocation.type === locationType.TYPE_LOCAL) {
+ } else if (props.currentLocation.type === locationType.TYPE_LOCAL) {
PlatformIO.disableObjectStoreSupport();
- this.openLocation(fsEntry);
+ openLocation(fsEntry);
}
};
- openLocation = (fsEntry: FileSystemEntry) => {
+ const openLocation = (fsEntry: FileSystemEntry) => {
if (fsEntry.isFile) {
- this.props.setSelectedEntries([fsEntry]);
- this.props.openFsEntry(fsEntry);
+ props.setSelectedEntries([fsEntry]);
+ props.openFsEntry(fsEntry);
} else {
console.log('Handle Grid cell db click, selected path : ', fsEntry.path);
- this.props.loadDirectoryContent(fsEntry.path);
+ props.loadDirectoryContent(fsEntry.path);
}
};
- handleGridContextMenu = (event, fsEntry: FileSystemEntry) => {
- const { desktopMode, selectedEntries } = this.props;
+ const handleGridContextMenu = (event, fsEntry: FileSystemEntry) => {
+ const { desktopMode, selectedEntries } = props;
+ const isEntryExist = selectedEntries.some(
+ entry => entry.uuid === fsEntry.uuid
+ );
if (fsEntry.isFile) {
if (!desktopMode) {
- if (
- selectedEntries &&
- selectedEntries.some(entry => entry.path === fsEntry.path)
- ) {
- this.props.setSelectedEntries(
- selectedEntries.filter(entry => entry.path !== fsEntry.path)
+ if (selectedEntries && isEntryExist) {
+ props.setSelectedEntries(
+ selectedEntries.filter(entry => entry.uuid !== fsEntry.uuid)
); // deselect selected entry
} else {
- this.props.setSelectedEntries([...selectedEntries, fsEntry]);
+ props.setSelectedEntries([...selectedEntries, fsEntry]);
}
} else {
- this.props.setSelectedEntries(
- event.ctrlKey ? [...selectedEntries, fsEntry] : [fsEntry]
- );
- this.setState({
- fileContextMenuOpened: true,
- fileContextMenuAnchorEl: event.currentTarget,
- selectedEntryPath: fsEntry.path
- });
+ if (props.selectedEntries.length === 0 || !fileOperationsEnabled()) {
+ props.setSelectedEntries([fsEntry]);
+ } else if (event.ctrlKey) {
+ if (!isEntryExist) {
+ props.setSelectedEntries([...selectedEntries, fsEntry]);
+ }
+ } else if (isEntryExist) {
+ // update selected entry
+ props.setSelectedEntries([
+ ...selectedEntries.filter(entry => entry.uuid !== fsEntry.uuid),
+ fsEntry
+ ]);
+ }
+ setFileContextMenuAnchorEl(event.currentTarget);
+ selectedEntryPath.current = fsEntry.path;
}
} else {
- this.props.setSelectedEntries([fsEntry]);
- this.setState({
- dirContextMenuOpened: true,
- dirContextMenuAnchorEl: event.currentTarget,
- selectedEntryPath: fsEntry.path
- });
+ if (props.selectedEntries.length === 0 || !folderOperationsEnabled()) {
+ props.setSelectedEntries([fsEntry]);
+ } else if (isEntryExist) {
+ // update selected entry
+ props.setSelectedEntries([
+ ...selectedEntries.filter(entry => entry.uuid !== fsEntry.uuid),
+ fsEntry
+ ]);
+ }
+ selectedEntryPath.current = fsEntry.path;
+ setDirContextMenuAnchorEl(event.currentTarget);
}
};
- selectEntry = (fsEntry: FileSystemEntry) => {
- const { setSelectedEntries, selectedEntries } = this.props;
+ const selectEntry = (fsEntry: FileSystemEntry) => {
+ const { setSelectedEntries, selectedEntries } = props;
setSelectedEntries([...selectedEntries, fsEntry]);
};
- deselectEntry = (fsEntry: FileSystemEntry) => {
- const { setSelectedEntries, selectedEntries } = this.props;
+ const deselectEntry = (fsEntry: FileSystemEntry) => {
+ const { setSelectedEntries, selectedEntries } = props;
const newSelection = selectedEntries.filter(
data => data.path !== fsEntry.path
);
setSelectedEntries(newSelection);
};
- handleTagMenu = (
+ const handleTagMenu = (
event: React.ChangeEvent<HTMLInputElement>,
tag: Tag,
entryPath: string
@@ -526,50 +548,16 @@ class GridPerspective extends React.Component<Props, State> {
event.preventDefault();
event.stopPropagation();
- this.setState({
- selectedTag: tag,
- tagContextMenuAnchorEl: event.currentTarget,
- tagContextMenuOpened: true,
- selectedEntryPath: entryPath
- });
- };
-
- closeFileMenu = () => {
- this.setState({
- fileContextMenuOpened: false,
- fileContextMenuAnchorEl: null
- });
+ selectedTag.current = tag;
+ selectedEntryPath.current = entryPath;
+ setTagContextMenuAnchorEl(event.currentTarget);
};
- closeDirMenu = () => {
- this.setState({
- dirContextMenuOpened: false,
- dirContextMenuAnchorEl: null
- });
+ const closeOptionsMenu = () => {
+ setOptionsContextMenuAnchorEl(null);
};
- closeTagMenu = () => {
- this.setState({
- tagContextMenuOpened: false,
- tagContextMenuAnchorEl: null
- });
- };
-
- closeSortingMenu = () => {
- this.setState({
- sortingContextMenuOpened: false,
- sortingContextMenuAnchorEl: null
- });
- };
-
- closeOptionsMenu = () => {
- this.setState({
- optionsContextMenuOpened: false,
- optionsContextMenuAnchorEl: null
- });
- };
-
- handleCloseDialogs = (clearSelection: boolean = false) => {
+ /* handleCloseDialogs = (clearSelection: boolean = false) => {
this.setState({
isFileRenameDialogOpened: false,
isDeleteMultipleFilesDialogOpened: false,
@@ -578,33 +566,25 @@ class GridPerspective extends React.Component<Props, State> {
isGridSettingsDialogOpened: false
});
if (clearSelection) {
- this.clearSelection();
+ clearSelection();
}
- };
-
- openFileRenameDialog = () => {
- this.setState({ isFileRenameDialogOpened: true });
- };
-
- openMoveCopyFilesDialog = () => {
- this.setState({ isMoveCopyFilesDialogOpened: true });
- };
+ }; */
- openDeleteFileDialog = () => {
- this.setState({ isDeleteMultipleFilesDialogOpened: true });
+ const openMoveCopyFilesDialog = () => {
+ setIsMoveCopyFilesDialogOpened(true);
};
- openAddRemoveTagsDialog = () => {
- this.setState({ isAddRemoveTagsDialogOpened: true });
+ const openDeleteFileDialog = () => {
+ props.toggleDeleteMultipleEntriesDialog();
};
- openGridSettingsDialog = () => {
- this.setState({ isGridSettingsDialogOpened: true });
+ const openAddRemoveTagsDialog = () => {
+ setIsAddRemoveTagsDialogOpened(true);
};
- handleFileMoveDrop = (item, monitor) => {
- if (this.props.isReadOnlyMode) {
- this.props.showNotification(
+ const handleFileMoveDrop = (item, monitor) => {
+ if (props.isReadOnlyMode) {
+ props.showNotification(
i18n.t('core:dndDisabledReadOnlyMode'),
'error',
true
@@ -623,18 +603,12 @@ class GridPerspective extends React.Component<Props, State> {
arrPath.push(path);
}
console.log('Dropped files: ' + path);
- this.props.moveFiles(arrPath, item.path);
- this.clearSelection();
+ props.moveFiles(arrPath, item.path);
+ clearSelection();
}
};
- renderCell = (fsEntry: FileSystemEntry) => {
- const {
- entrySize,
- layoutType,
- showDirectories,
- thumbnailMode
- } = this.state;
+ const renderCell = (fsEntry: FileSystemEntry) => {
const {
classes,
theme,
@@ -642,7 +616,7 @@ class GridPerspective extends React.Component<Props, State> {
addTags,
supportedFileTypes,
openFsEntry
- } = this.props;
+ } = props;
if (!fsEntry.isFile && !showDirectories) {
return;
}
@@ -674,16 +648,16 @@ class GridPerspective extends React.Component<Props, State> {
thumbnailMode={thumbnailMode}
addTags={addTags}
selectedEntries={selectedEntries}
- selectEntry={this.selectEntry}
- deselectEntry={this.deselectEntry}
- isReadOnlyMode={this.props.isReadOnlyMode}
- handleTagMenu={this.handleTagMenu}
+ selectEntry={selectEntry}
+ deselectEntry={deselectEntry}
+ isReadOnlyMode={props.isReadOnlyMode}
+ handleTagMenu={handleTagMenu}
layoutType={layoutType}
- showTags={this.state.showTags}
+ showTags={showTags}
openFsEntry={openFsEntry}
- handleGridContextMenu={this.handleGridContextMenu}
- handleGridCellDblClick={this.handleGridCellDblClick}
- handleGridCellClick={this.handleGridCellClick}
+ handleGridContextMenu={handleGridContextMenu}
+ handleGridCellDblClick={handleGridCellDblClick}
+ handleGridCellClick={handleGridCellClick}
/>
</TagDropContainer>
);
@@ -695,12 +669,17 @@ class GridPerspective extends React.Component<Props, State> {
}
return (
- <div style={{ position: 'relative' }} key={key}>
+ <div
+ style={{
+ position: 'relative'
+ }}
+ key={key}
+ >
<TargetMoveFileBox
// @ts-ignore
accepts={[DragItemTypes.FILE]}
path={fsEntry.path}
- onDrop={this.handleFileMoveDrop}
+ onDrop={handleFileMoveDrop}
>
{cellContent}
</TargetMoveFileBox>
@@ -708,273 +687,252 @@ class GridPerspective extends React.Component<Props, State> {
);
};
- keyMap = {
- nextDocument: this.props.keyBindings.nextDocument,
- prevDocument: this.props.keyBindings.prevDocument,
- selectAll: this.props.keyBindings.selectAll,
- deleteDocument: this.props.keyBindings.deleteDocument,
- addRemoveTags: this.props.keyBindings.addRemoveTags,
- renameFile: this.props.keyBindings.renameFile,
- openEntry: this.props.keyBindings.openEntry,
- openFileExternally: this.props.keyBindings.openFileExternally
+ const keyMap = {
+ nextDocument: props.keyBindings.nextDocument,
+ prevDocument: props.keyBindings.prevDocument,
+ selectAll: props.keyBindings.selectAll,
+ deleteDocument: props.keyBindings.deleteDocument,
+ addRemoveTags: props.keyBindings.addRemoveTags,
+ renameFile: props.keyBindings.renameFile,
+ openEntry: props.keyBindings.openEntry,
+ openFileExternally: props.keyBindings.openFileExternally
};
- keyBindingHandlers = {
- nextDocument: () => this.props.openNextFile(),
- prevDocument: () => this.props.openPrevFile(),
- selectAll: () => this.toggleSelectAllFiles(),
+ const keyBindingHandlers = {
+ nextDocument: () => props.openNextFile(),
+ prevDocument: () => props.openPrevFile(),
+ selectAll: () => toggleSelectAllFiles(),
deleteDocument: () => {
- if (this.state.fileOperationsEnabled) {
- this.openDeleteFileDialog();
+ if (fileOperationsEnabled()) {
+ openDeleteFileDialog();
}
},
addRemoveTags: () => {
- if (this.props.selectedEntries && this.props.selectedEntries.length > 0) {
- this.openAddRemoveTagsDialog();
+ if (props.selectedEntries && props.selectedEntries.length > 0) {
+ openAddRemoveTagsDialog();
}
},
renameFile: () => {
if (
- this.props.selectedEntries &&
- this.props.selectedEntries.length === 1 &&
- this.props.selectedEntries[0].isFile
+ props.selectedEntries &&
+ props.selectedEntries.length === 1 &&
+ props.selectedEntries[0].isFile
) {
- this.setState(
- { selectedEntryPath: this.props.selectedEntries[0].path },
- () => {
- this.openFileRenameDialog();
- }
- );
+ selectedEntryPath.current = props.selectedEntries[0].path;
+ setIsFileRenameDialogOpened(true);
}
},
openEntry: e => {
e.preventDefault();
- const { lastSelectedEntryPath } = this.props;
+ const { lastSelectedEntryPath } = props;
if (lastSelectedEntryPath) {
- const lastSelectedEntryFile = this.props.directoryContent.find(
+ const lastSelectedEntryFile = props.directoryContent.find(
fsEntry => fsEntry.isFile && fsEntry.path === lastSelectedEntryPath
);
if (lastSelectedEntryFile) {
- this.props.openFsEntry(lastSelectedEntryFile);
+ props.openFsEntry(lastSelectedEntryFile);
} else {
- this.props.loadDirectoryContent(lastSelectedEntryPath);
+ props.loadDirectoryContent(lastSelectedEntryPath);
}
}
},
openFileExternally: () => {
- if (this.props.lastSelectedEntryPath) {
- this.props.openFileNatively(this.props.lastSelectedEntryPath);
+ if (props.lastSelectedEntryPath) {
+ props.openFileNatively(props.lastSelectedEntryPath);
}
}
};
- render() {
- const {
- classes,
- directoryContent,
- selectedEntries,
- loadParentDirectoryContent,
- theme,
- isDesktopMode
- } = this.props;
- const { layoutType, entrySize, sortBy, orderBy } = this.state;
- const selectedFilePaths = selectedEntries
- .filter(fsEntry => fsEntry.isFile)
- .map(fsentry => fsentry.path);
- const sortedContent = this.sort(directoryContent, sortBy, orderBy);
- const sortedDirectories = sortedContent.filter(entry => !entry.isFile);
- const sortedFiles = sortedContent.filter(entry => entry.isFile);
- const locationPath = this.props.currentLocation
- ? getLocationPath(this.props.currentLocation)
- : '';
- let entryWidth = 200;
- if (entrySize === 'small') {
- entryWidth = 150;
- } else if (entrySize === 'normal') {
- entryWidth = 200;
- } else if (entrySize === 'big') {
- entryWidth = 300;
- }
- return (
- <div
- style={{
- height:
- 'calc(100% - ' +
- (AppConfig.isCordova ? '320' : '51') + // todo handle cordova screen sizes
- 'px)'
- }}
- >
- <style>
- {`
+ const {
+ classes,
+ directoryContent,
+ selectedEntries,
+ loadParentDirectoryContent,
+ theme
+ } = props;
+ // const { layoutType, entrySize, sortBy, orderBy } = this.state;
+ const selectedFilePaths = selectedEntries
+ .filter(fsEntry => fsEntry.isFile)
+ .map(fsentry => fsentry.path);
+ const sortedContent = sort(directoryContent, sortBy, orderBy);
+ const sortedDirectories = sortedContent.filter(entry => !entry.isFile);
+ const sortedFiles = sortedContent.filter(entry => entry.isFile);
+ const locationPath = props.currentLocation
+ ? getLocationPath(props.currentLocation)
+ : '';
+ let entryWidth = 200;
+ if (entrySize === 'small') {
+ entryWidth = 150;
+ } else if (entrySize === 'normal') {
+ entryWidth = 200;
+ } else if (entrySize === 'big') {
+ entryWidth = 300;
+ }
+ return (
+ <div
+ style={{
+ height:
+ 'calc(100% - ' +
+ (AppConfig.isCordova ? '320' : '51') + // todo handle cordova screen sizes
+ 'px)'
+ }}
+ >
+ <style>
+ {`
#gridCellTags:hover, #gridCellDescription:hover {
opacity: 1
}
`}
- </style>
- <MainToolbar
- classes={classes}
- layoutType={this.state.layoutType}
- isReadOnlyMode={this.props.isReadOnlyMode}
- selectedEntries={this.props.selectedEntries}
- loadParentDirectoryContent={loadParentDirectoryContent}
- toggleSelectAllFiles={this.toggleSelectAllFiles}
- allFilesSelected={GridPerspective.allFilesSelected}
- handleLayoutSwitch={this.handleLayoutSwitch}
- openAddRemoveTagsDialog={this.openAddRemoveTagsDialog}
- fileOperationsEnabled={this.state.fileOperationsEnabled}
- openMoveCopyFilesDialog={this.openMoveCopyFilesDialog}
- openDeleteFileDialog={this.openDeleteFileDialog}
- handleSortingMenu={this.handleSortingMenu}
- handleOptionsMenu={this.handleOptionsMenu}
- isDesktopMode={isDesktopMode}
- />
- <GlobalHotKeys keyMap={this.keyMap} handlers={this.keyBindingHandlers}>
- <GridPagination
- gridPageLimit={this.state.gridPageLimit}
- className={
+ </style>
+ <MainToolbar
+ classes={classes}
+ layoutType={layoutType}
+ isReadOnlyMode={props.isReadOnlyMode}
+ selectedEntries={selectedEntries}
+ loadParentDirectoryContent={loadParentDirectoryContent}
+ toggleSelectAllFiles={toggleSelectAllFiles}
+ allFilesSelected={
+ allFilesSelected.current && selectedEntries.length > 0
+ }
+ handleLayoutSwitch={handleLayoutSwitch}
+ openAddRemoveTagsDialog={openAddRemoveTagsDialog}
+ fileOperationsEnabled={fileOperationsEnabled()}
+ openMoveCopyFilesDialog={openMoveCopyFilesDialog}
+ openDeleteFileDialog={openDeleteFileDialog}
+ handleSortingMenu={handleSortingMenu}
+ handleOptionsMenu={handleOptionsMenu}
+ isDesktopMode={props.isDesktopMode}
+ />
+ <GlobalHotKeys keyMap={keyMap} handlers={keyBindingHandlers}>
+ <GridPagination
+ gridPageLimit={gridPageLimit}
+ className={
+ layoutType === 'grid' ? classes.gridContainer : classes.rowContainer
+ }
+ style={{
+ marginTop: 53,
+ gridTemplateColumns:
layoutType === 'grid'
- ? classes.gridContainer
- : classes.rowContainer
- }
- style={{
- marginTop: 53,
- gridTemplateColumns:
- layoutType === 'grid'
- ? 'repeat(auto-fit,minmax(' + entryWidth + 'px,1fr))'
- : 'none'
- }}
- theme={theme}
- // gridRef={this.mainGrid}
- directories={sortedDirectories}
- showDirectories={this.state.showDirectories}
- files={sortedFiles}
- renderCell={this.renderCell}
- currentPage={1}
- currentLocationPath={locationPath}
- currentDirectoryPath={this.props.currentDirectoryPath}
- />
- </GlobalHotKeys>
+ ? 'repeat(auto-fit,minmax(' + entryWidth + 'px,1fr))'
+ : 'none'
+ }}
+ theme={theme}
+ // gridRef={this.mainGrid}
+ directories={sortedDirectories}
+ showDirectories={showDirectories}
+ files={sortedFiles}
+ renderCell={renderCell}
+ currentPage={1}
+ currentLocationPath={locationPath}
+ currentDirectoryPath={props.currentDirectoryPath}
+ />
+ </GlobalHotKeys>
+ {isAddRemoveTagsDialogOpened && (
<AddRemoveTagsDialog
- open={this.state.isAddRemoveTagsDialogOpened}
- onClose={this.handleCloseDialogs}
- addTags={this.props.addTags}
- removeTags={this.props.removeTags}
- removeAllTags={this.props.removeAllTags}
- selectedEntries={this.props.selectedEntries}
+ open={isAddRemoveTagsDialogOpened}
+ onClose={() => setIsAddRemoveTagsDialogOpened(false)}
+ addTags={props.addTags}
+ removeTags={props.removeTags}
+ removeAllTags={props.removeAllTags}
+ selectedEntries={props.selectedEntries}
/>
+ )}
+ {isGridSettingsDialogOpened && (
<GridSettingsDialog
- open={this.state.isGridSettingsDialogOpened}
- onClose={this.handleCloseDialogs}
- setGridPageLimit={this.handleGridPageLimit}
- gridPageLimit={this.state.gridPageLimit}
+ open={isGridSettingsDialogOpened}
+ onClose={() => setIsGridSettingsDialogOpened(false)}
+ setGridPageLimit={handleGridPageLimit}
+ gridPageLimit={gridPageLimit}
/>
- {this.state.isMoveCopyFilesDialogOpened && (
- <MoveCopyFilesDialog
- key={uuidv1()}
- open={this.state.isMoveCopyFilesDialogOpened}
- onClose={this.handleCloseDialogs}
- selectedFiles={selectedFilePaths}
- />
- )}
- {this.state.isFileRenameDialogOpened && (
- <RenameFileDialog
- open={this.state.isFileRenameDialogOpened}
- onClose={this.handleCloseDialogs}
- selectedFilePath={this.state.selectedEntryPath}
- />
- )}
- <ConfirmDialog
- open={this.state.isDeleteMultipleFilesDialogOpened}
- onClose={this.handleCloseDialogs}
- title={i18n.t('core:deleteConfirmationTitle')}
- content={i18n.t('core:deleteConfirmationContent')}
- list={selectedFilePaths.map(path =>
- extractFileName(path, PlatformIO.getDirSeparator())
- )}
- confirmCallback={result => {
- if (result && selectedEntries) {
- selectedEntries.map(fsentry => {
- if (fsentry.isFile) {
- this.props.deleteFile(fsentry.path);
- }
- return true;
- });
- }
- this.handleCloseDialogs(true);
- }}
- cancelDialogTID="cancelDeleteFileDialog"
- confirmDialogTID="confirmDeleteFileDialog"
- confirmDialogContentTID="confirmDeleteDialogContent"
+ )}
+ {isMoveCopyFilesDialogOpened && (
+ <MoveCopyFilesDialog
+ key={uuidv1()}
+ open={isMoveCopyFilesDialogOpened}
+ onClose={() => setIsMoveCopyFilesDialogOpened(false)}
+ selectedFiles={selectedFilePaths}
+ />
+ )}
+ {isFileRenameDialogOpened && (
+ <RenameFileDialog
+ open={isFileRenameDialogOpened}
+ onClose={() => setIsFileRenameDialogOpened(false)}
+ selectedFilePath={selectedEntryPath.current}
/>
- {this.state.fileContextMenuOpened && (
- <FileMenu
- anchorEl={this.state.fileContextMenuAnchorEl}
- open={this.state.fileContextMenuOpened}
- onClose={this.closeFileMenu}
- openDeleteFileDialog={this.openDeleteFileDialog}
- openRenameFileDialog={this.openFileRenameDialog}
- openMoveCopyFilesDialog={this.openMoveCopyFilesDialog}
- openAddRemoveTagsDialog={this.openAddRemoveTagsDialog}
- openFsEntry={this.props.openFsEntry}
- openFileNatively={this.props.openFileNatively}
- showInFileManager={this.props.showInFileManager}
- showNotification={this.props.showNotification}
- isReadOnlyMode={this.props.isReadOnlyMode}
- selectedFilePath={this.state.selectedEntryPath}
- />
- )}
- <DirectoryMenu
- open={this.state.dirContextMenuOpened}
- onClose={this.closeDirMenu}
- anchorEl={this.state.dirContextMenuAnchorEl}
- directoryPath={this.state.selectedEntryPath}
- loadDirectoryContent={this.props.loadDirectoryContent}
- openDirectory={this.props.openDirectory}
- openFsEntry={this.props.openFsEntry}
- deleteDirectory={this.props.deleteDirectory}
- isReadOnlyMode={this.props.isReadOnlyMode}
- perspectiveMode={true}
+ )}
+
+ {Boolean(fileContextMenuAnchorEl) && (
+ <FileMenu
+ anchorEl={fileContextMenuAnchorEl}
+ open={Boolean(fileContextMenuAnchorEl)}
+ onClose={() => setFileContextMenuAnchorEl(null)}
+ openDeleteFileDialog={openDeleteFileDialog}
+ openRenameFileDialog={() => setIsFileRenameDialogOpened(true)}
+ openMoveCopyFilesDialog={openMoveCopyFilesDialog}
+ openAddRemoveTagsDialog={openAddRemoveTagsDialog}
+ openFsEntry={props.openFsEntry}
+ openFileNatively={props.openFileNatively}
+ showInFileManager={props.showInFileManager}
+ showNotification={props.showNotification}
+ isReadOnlyMode={props.isReadOnlyMode}
+ selectedFilePath={selectedEntryPath.current}
+ selectedEntries={props.selectedEntries}
/>
- <EntryTagMenu
- anchorEl={this.state.tagContextMenuAnchorEl}
- open={this.state.tagContextMenuOpened}
- onClose={this.closeTagMenu}
- selectedTag={this.state.selectedTag}
- currentEntryPath={this.state.selectedEntryPath}
- removeTags={this.props.removeTags}
- isReadOnlyMode={this.props.isReadOnlyMode}
+ )}
+ {/* {Boolean(dirContextMenuAnchorEl) && ( // todo move dialogs from DirectoryMenu */}
+ <DirectoryMenu
+ open={Boolean(dirContextMenuAnchorEl)}
+ onClose={() => setDirContextMenuAnchorEl(null)}
+ anchorEl={dirContextMenuAnchorEl}
+ directoryPath={selectedEntryPath.current}
+ loadDirectoryContent={props.loadDirectoryContent}
+ openDirectory={props.openDirectory}
+ openFsEntry={props.openFsEntry}
+ isReadOnlyMode={props.isReadOnlyMode}
+ perspectiveMode={true}
+ />
+ {/* {Boolean(tagContextMenuAnchorEl) && ( // TODO EntryTagMenu is used in TagSelect we cannot move confirm dialog from menu */}
+ <EntryTagMenu
+ anchorEl={tagContextMenuAnchorEl}
+ open={Boolean(tagContextMenuAnchorEl)}
+ onClose={() => setTagContextMenuAnchorEl(null)}
+ selectedTag={selectedTag.current}
+ currentEntryPath={selectedEntryPath.current}
+ removeTags={props.removeTags}
+ isReadOnlyMode={props.isReadOnlyMode}
+ />
+ {Boolean(sortingContextMenuAnchorEl) && (
+ <SortingMenu
+ open={Boolean(sortingContextMenuAnchorEl)}
+ onClose={() => setSortingContextMenuAnchorEl(null)}
+ anchorEl={sortingContextMenuAnchorEl}
+ sortBy={sortBy}
+ orderBy={orderBy}
+ handleSortBy={handleSortBy}
/>
- {this.state.sortingContextMenuOpened && (
- <SortingMenu
- open={this.state.sortingContextMenuOpened}
- onClose={this.closeSortingMenu}
- anchorEl={this.state.sortingContextMenuAnchorEl}
- sortBy={this.state.sortBy}
- orderBy={this.state.orderBy}
- handleSortBy={this.handleSortBy}
- />
- )}
+ )}
+ {Boolean(optionsContextMenuAnchorEl) && (
<GridOptionsMenu
- open={this.state.optionsContextMenuOpened}
- onClose={this.closeOptionsMenu}
- anchorEl={this.state.optionsContextMenuAnchorEl}
- toggleShowDirectories={this.toggleShowDirectories}
- showDirectories={this.state.showDirectories}
- toggleShowTags={this.toggleShowTags}
- showTags={this.state.showTags}
- toggleThumbnailsMode={this.toggleThumbnailsMode}
- thumbnailMode={this.state.thumbnailMode}
- entrySize={this.state.entrySize}
- changeSingleClickAction={this.changeSingleClickAction}
- singleClickAction={this.state.singleClickAction}
- changeEntrySize={this.changeEntrySize}
- openHelpWebPage={this.openHelpWebPage}
- openSettings={this.openSettings}
+ open={Boolean(optionsContextMenuAnchorEl)}
+ onClose={closeOptionsMenu}
+ anchorEl={optionsContextMenuAnchorEl}
+ toggleShowDirectories={toggleShowDirectories}
+ showDirectories={showDirectories}
+ toggleShowTags={toggleShowTags}
+ showTags={showTags}
+ toggleThumbnailsMode={toggleThumbnailsMode}
+ thumbnailMode={thumbnailMode}
+ entrySize={entrySize}
+ changeSingleClickAction={changeSingleClickAction}
+ singleClickAction={singleClickAction}
+ changeEntrySize={changeEntrySize}
+ openHelpWebPage={openHelpWebPage}
+ openSettings={openSettings}
/>
- </div>
- );
- }
-}
+ )}
+ </div>
+ );
+};
function mapActionCreatorsToProps(dispatch) {
return bindActionCreators(
@@ -986,6 +944,8 @@ function mapActionCreatorsToProps(dispatch) {
openURLExternally: AppActions.openURLExternally,
openNextFile: AppActions.openNextFile,
openPrevFile: AppActions.openPrevFile,
+ toggleDeleteMultipleEntriesDialog:
+ AppActions.toggleDeleteMultipleEntriesDialog,
addTags: TaggingActions.addTags
},
dispatch
@@ -1001,7 +961,10 @@ function mapStateToProps(state) {
selectedEntries: getSelectedEntries(state),
keyBindings: getKeyBindingObject(state),
currentLocation: getLocation(state, state.app.currentLocationId),
- isDesktopMode: isDesktopMode(state)
+ isDesktopMode: isDesktopMode(state),
+ isDeleteMultipleEntriesDialogOpened: isDeleteMultipleEntriesDialogOpened(
+ state
+ )
};
}
diff --git a/app/reducers/app.ts b/app/reducers/app.ts
index 069843d94..bdc5b0fa6 100644
--- a/app/reducers/app.ts
+++ b/app/reducers/app.ts
@@ -109,7 +109,9 @@ export const types = {
TOGGLE_SETTINGS_DIALOG: 'APP/TOGGLE_SETTINGS_DIALOG',
TOGGLE_CREATE_DIRECTORY_DIALOG: 'APP/TOGGLE_CREATE_DIRECTORY_DIALOG',
TOGGLE_CREATE_FILE_DIALOG: 'APP/TOGGLE_CREATE_FILE_DIALOG',
- TOGGLE_SELECT_DIRECTORY_DIALOG: 'APP/TOGGLE_SELECT_DIRECTORY_DIALOG',
+ TOGGLE_DELETE_MULTIPLE_ENTRIES_DIALOG:
+ 'APP/TOGGLE_DELETE_MULTIPLE_ENTRIES_DIALOG',
+ // TOGGLE_SELECT_DIRECTORY_DIALOG: 'APP/TOGGLE_SELECT_DIRECTORY_DIALOG',
TOGGLE_UPLOAD_DIALOG: 'APP/TOGGLE_UPLOAD_DIALOG',
CLEAR_UPLOAD_DIALOG: 'APP/CLEAR_UPLOAD_DIALOG',
TOGGLE_PROGRESS_DIALOG: 'APP/TOGGLE_PROGRESS_DIALOG',
@@ -351,6 +353,12 @@ export default (state: any = initialState, action: any) => {
createFileDialogOpened: !state.createFileDialogOpened
};
}
+ case types.TOGGLE_DELETE_MULTIPLE_ENTRIES_DIALOG: {
+ return {
+ ...state,
+ deleteMultipleEntriesDialogOpened: !state.deleteMultipleEntriesDialogOpened
+ };
+ }
case types.TOGGLE_LICENSE_DIALOG: {
return { ...state, licenseDialogOpened: !state.licenseDialogOpened };
}
@@ -852,6 +860,9 @@ export const actions = {
type: types.TOGGLE_CREATE_DIRECTORY_DIALOG
}),
toggleCreateFileDialog: () => ({ type: types.TOGGLE_CREATE_FILE_DIALOG }),
+ toggleDeleteMultipleEntriesDialog: () => ({
+ type: types.TOGGLE_DELETE_MULTIPLE_ENTRIES_DIALOG
+ }),
toggleUploadDialog: () => ({
type: types.TOGGLE_UPLOAD_DIALOG
}),
@@ -966,7 +977,7 @@ export const actions = {
directoryPath: string,
directoryContent: Array<Object>,
directoryMeta?: FileSystemEntryMeta
- ) => (dispatch: (actions: Object) => void, getState: () => any) => {
+ ) => (dispatch: (actions: Object) => void) => {
// const currentLocation: Location = getLocation(
// getState(),
// getState().app.currentLocationId
@@ -975,7 +986,19 @@ export const actions = {
// const entryPath =
// openedFiles && openedFiles.length > 0 && openedFiles[0].path;
// updateHistory(currentLocation, directoryPath, entryPath);
-
+ /* const { selectedEntries } = getState().app;
+ if (selectedEntries.length > 0) {
+ // check and remove obsolete selectedEntries
+ const newSelectedEntries = selectedEntries.filter(
+ (entry: FileSystemEntry) =>
+ directoryContent.some(
+ (fsEntry: FileSystemEntry) => fsEntry.path === entry.path
+ )
+ );
+ if (newSelectedEntries.length !== selectedEntries.length) {
+ dispatch(actions.setSelectedEntries(newSelectedEntries));
+ }
+ } */
dispatch(actions.hideNotifications());
dispatch(
actions.loadDirectorySuccessInt(
@@ -1047,7 +1070,10 @@ export const actions = {
) => {
const { settings } = getState();
const { currentDirectoryPath, openedFiles } = getState().app;
- PlatformIO.deleteDirectoryPromise(directoryPath, settings.useTrashCan)
+ return PlatformIO.deleteDirectoryPromise(
+ directoryPath,
+ settings.useTrashCan
+ )
.then(() => {
if (directoryPath === currentDirectoryPath) {
dispatch(actions.loadParentDirectoryContent());
@@ -1638,6 +1664,7 @@ export const actions = {
) => {
dispatch(actions.reflectRenameEntryInt(path, newPath));
dispatch(LocationIndexActions.reflectRenameEntry(path, newPath));
+ dispatch(actions.setSelectedEntries([]));
},
updateCurrentDirEntry: (path: string, entry: Object) => ({
type: types.UPDATE_CURRENTDIR_ENTRY,
@@ -2013,6 +2040,8 @@ export const isCreateDirectoryOpened = (state: any) =>
state.app.createDirectoryDialogOpened;
export const isCreateFileDialogOpened = (state: any) =>
state.app.createFileDialogOpened;
+export const isDeleteMultipleEntriesDialogOpened = (state: any) =>
+ state.app.deleteMultipleEntriesDialogOpened;
export const isUploadDialogOpened = (state: any) =>
state.app.uploadDialogOpened;
export const isOpenLinkDialogOpened = (state: any) =>
diff --git a/package.json b/package.json
index 7eb0150bc..a9012ccbd 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,7 @@
"build-web-dev": "rimraf web/dist && cross-env NODE_ENV=production webpack --config ./configs/webpack.config.web.dev.babel.js --colors",
"build-cordova": "cross-env NODE_ENV=production webpack --config ./configs/webpack.config.cordova.prod.babel.js --colors",
"build-cordova-dev": "cross-env NODE_ENV=development webpack --config ./configs/webpack.config.cordova.dev.babel.js --colors",
- "dev": "cross-env START_HOT=1 node -r @babel/register ./internals/scripts/CheckPortInUse.js && cross-env START_HOT=1 yarn start-renderer-dev",
+ "dev": "yarn check-extensions && cross-env START_HOT=1 node -r @babel/register ./internals/scripts/CheckPortInUse.js && cross-env START_HOT=1 yarn start-renderer-dev",
"lint-old": "cross-env NODE_ENV=development eslint --cache --format=pretty .",
"lint": "tsc --noEmit && eslint '*/**/*.{js,ts,tsx}'",
"lint-fix": "yarn --silent lint --fix; exit 0",
@@ -60,6 +60,7 @@
"install-ext": "cd app && yarn install --force --prod --no-lockfile && cd ..",
"setup-ext": "node scripts/setupextensions.js",
"setup-pro": "node scripts/setuppro.js",
+ "check-extensions": "node scripts/checkExtensions.js",
"run-webdav": "yarn build-web && yarn prepare-web && node scripts/webdavserver.js",
"run-web": "yarn build-web && yarn prepare-web && node scripts/webserver.js",
"run-web-aws": "yarn prepare-web && node scripts/webserver.js",
@@ -146,8 +147,8 @@
"@types/react-redux": "^6.0.12",
"@types/react-router-dom": "^4.3.1",
"@types/redux-logger": "^3.0.6",
- "@wdio/junit-reporter": "^6.11.0",
- "@wdio/spec-reporter": "^6.11.0",
+ "@wdio/junit-reporter": "^7.0.7",
+ "@wdio/spec-reporter": "^7.0.7",
"babel-core": "7.0.0-bridge.0",
"babel-eslint": "^10.0.1",
"babel-jest": "^26.6.3",
@@ -160,7 +161,7 @@
"concat-licenses": "^2.0.1",
"concurrently": "^4.1.0",
"cross-env": "^5.2.0",
- "cross-spawn": "^6.0.5",
+ "cross-spawn": "^7.0.3",
"css-loader": "^2.1.0",
"current-git-branch": "^1.1.0",
"detect-port": "^1.3.0",
@@ -191,7 +192,6 @@
"jest": "^26.4.0",
"jest-html-reporter": "^3.1.3",
"jest-junit": "^12.0.0",
- "jsDAV": "~0.3.4",
"jsdom": "^11.0.0",
"json-loader": "^0.5.7",
"less": "^2.7.3",
diff --git a/scripts/checkExtensions.js b/scripts/checkExtensions.js
new file mode 100644
index 000000000..c04a7ff7d
--- /dev/null
+++ b/scripts/checkExtensions.js
@@ -0,0 +1,17 @@
+const fs = require('fs');
+const path = require('path');
+const spawn = require('cross-spawn');
+
+if (!fs.existsSync(path.resolve(__dirname, '../app/node_modules'))) {
+ /* throw new Error(
+ 'Error: app/node_modules directory missing. Run "yarn install-ext" first'
+ ); */
+ const result = spawn.sync(
+ 'yarn',
+ ['--cwd', path.resolve(__dirname, '../app'), 'install'],
+ {
+ stdio: 'inherit'
+ }
+ );
+ console.log(result);
+}
diff --git a/tests/e2e/folder.e2e.js b/tests/e2e/folder.e2e.js
index a99bbe695..e71fe2e05 100644
--- a/tests/e2e/folder.e2e.js
+++ b/tests/e2e/folder.e2e.js
@@ -74,8 +74,8 @@ describe('TST01 - Folder management [electron]', () => {
});
it('TST0104 - Delete empty folder [electron]', async () => {
- await setSettings('[data-tid=settingsSetUseTrashCan]');
- await global.client.pause(500);
+ // await setSettings('[data-tid=settingsSetUseTrashCan]');
+ // await global.client.pause(500);
const testFolder = await createNewDirectory();
await expectElementExist('[data-tid=fsEntryName_' + testFolder + ']');
await doubleClickOn('[data-tid=fsEntryName_' + testFolder + ']');
diff --git a/tests/e2e/general.helpers.js b/tests/e2e/general.helpers.js
index 643aea648..2f826d214 100644
--- a/tests/e2e/general.helpers.js
+++ b/tests/e2e/general.helpers.js
@@ -587,7 +587,7 @@ export async function deleteDirectory() {
await deleteDirectory.waitForDisplayed();
await delay(500);
await deleteDirectory.click();*/
- await clickOn('[data-tid=confirmDeleteDirectoryDialog]');
+ await clickOn('[data-tid=confirmDeleteFileDialog]');
await waitForNotification();
/*const confirmDeleteDirectory = await global.client.$(
'[data-tid=confirmDeleteDirectoryDialog]'
diff --git a/tests/e2e/perspective-grid-right-button.e2e.js b/tests/e2e/perspective-grid-right-button.e2e.js
index feb8bf146..4f3fcc7cd 100644
--- a/tests/e2e/perspective-grid-right-button.e2e.js
+++ b/tests/e2e/perspective-grid-right-button.e2e.js
@@ -79,6 +79,7 @@ describe('TST50** - Right button on a file', () => {
// await webViewer.waitForDisplayed();
//await delay(5000);
// expect(await webViewer.isDisplayed()).toBe(true);
+ await global.client.pause(500);
await global.client.switchToFrame(webViewer);
await global.client.pause(500);
const iframeBody = await global.client.$('body');
@@ -198,7 +199,7 @@ describe('TST50** - Right button on a file', () => {
* TODO web sometimes: stale element reference: stale element reference: element is not attached to the page document
* TODO minio sometimes: stale element reference: stale element reference: element is not attached to the page document
*/
- test('TST5025 - Add - Remove tags (file menu) [electron]', async () => {
+ test('TST5025 - Add - Remove tags (file menu) [web,electron]', async () => {
await searchEngine('desktop');
const tags = [testTagName, testTagName + '2'];
// select file
@@ -339,15 +340,13 @@ describe('TST50** - Right button on a file', () => {
* delete dir is not supported on minio
*/
test('TST5035 - Delete directory (directory menu) [electron]', async () => {
- await setSettings('[data-tid=settingsSetUseTrashCan]');
- await global.client.pause(500);
+ // await setSettings('[data-tid=settingsSetUseTrashCan]');
+ // await global.client.pause(500);
+ await doubleClickOn(selectorFolder);
const testFolder = await createNewDirectory('aaa');
- await openContextEntryMenu(
- perspectiveGridTable + firstFolder,
- 'deleteDirectory'
- );
- await clickOn('[data-tid=confirmDeleteDirectoryDialog]');
+ await openContextEntryMenu(selectorFolder, 'deleteDirectory');
+ await clickOn('[data-tid=confirmDeleteFileDialog]');
await expectElementExist(
'[data-tid=fsEntryName_' + testFolder + ']',
@@ -388,7 +387,7 @@ describe('TST50** - Right button on a file', () => {
});
test('TST5038 - Return directory back [web,minio,electron]', async () => {
- await expectElementExist(selectorFolder);
+ // await expectElementExist(selectorFolder);
//Open folder
await doubleClickOn(selectorFolder);
diff --git a/tests/e2e/perspective-grid.e2e.js b/tests/e2e/perspective-grid.e2e.js
index 574987219..257476c70 100644
--- a/tests/e2e/perspective-grid.e2e.js
+++ b/tests/e2e/perspective-grid.e2e.js
@@ -78,24 +78,22 @@ describe('TST50 - Perspective Grid', () => {
test('TST10** - Sort by name [web,minio,electron]', async () => {
await clickOn('[data-tid=gridPerspectiveSortByName]');
await global.client.pause(500); // TODO
- const firstFileName = await getGridFileName(0);
- expect(firstFileName).toBe('sample_exif.jpg');
- // asc/desc
+ let firstFileName = await getGridFileName(0);
+ expect(firstFileName).toBe('sample.bmp');
+ // ASC
await clickOn('[data-tid=gridPerspectiveSortMenu]');
+ await global.client.pause(500);
await clickOn('[data-tid=gridPerspectiveSortByName]');
+ await global.client.pause(500); // TODO
+ firstFileName = await getGridFileName(0);
+ expect(firstFileName).toBe('sample_exif.jpg');
});
- /**
- * TODO web https://trello.com/c/b2isDaUc/533-switch-asc-desc-while-sort-by-options
- */
test('TST10** - Sort by size [web,minio,electron]', async () => {
await clickOn('[data-tid=gridPerspectiveSortBySize]');
await global.client.pause(500); // TODO
const firstFileName = await getGridFileName(0);
expect(firstFileName).toBe('sample.ogv');
- // asc/desc
- await clickOn('[data-tid=gridPerspectiveSortMenu]');
- await clickOn('[data-tid=gridPerspectiveSortBySize]');
});
test('TST10** - Sort by date [web,minio,electron]', async () => {
@@ -107,29 +105,20 @@ describe('TST50 - Perspective Grid', () => {
let firstFileName = await getGridFileName(0);
expect(firstFileName).toBe('note.txt');
- // asc/desc
- await clickOn('[data-tid=gridPerspectiveSortMenu]');
- await clickOn('[data-tid=gridPerspectiveSortByDate]');
//cleanup
- await setSettings('[data-tid=settingsSetUseTrashCan]');
- await global.client.pause(500);
+ // await setSettings('[data-tid=settingsSetUseTrashCan]');
+ // await global.client.pause(500);
await deleteFirstFile();
// firstFileName = await getGridFileName(0);
// expect(firstFileName).not.toBe('note.txt'); TODO its have note.txt from another tests
});
- /**
- * TODO web https://trello.com/c/b2isDaUc/533-switch-asc-desc-while-sort-by-options
- */
test('TST10** - Sort by extension [web,minio,electron]', async () => {
await clickOn('[data-tid=gridPerspectiveSortByExt]');
await global.client.pause(1000); // TODO
const firstFileName = await getGridFileName(0);
expect(firstFileName).toBe('sample.zip');
- // asc/desc
- await clickOn('[data-tid=gridPerspectiveSortMenu]');
- await clickOn('[data-tid=gridPerspectiveSortByExt]');
});
test('TST10** - Sort by tags [web,minio,electron]', async () => {
@@ -137,9 +126,6 @@ describe('TST50 - Perspective Grid', () => {
await global.client.pause(1000); // TODO
const firstFileName = await getGridFileName(0);
expect(firstFileName).toBe('sample_exif.jpg');
- // asc/desc
- await clickOn('[data-tid=gridPerspectiveSortMenu]');
- await clickOn('[data-tid=gridPerspectiveSortByFirstTag]');
});
});
diff --git a/yarn.lock b/yarn.lock
index 9fdd7fc0a..e0fa4404f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3577,6 +3577,11 @@
resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-3.1.2.tgz#548650de521b344e3781fbdb0ece4aa6f729afb8"
integrity sha512-JiX9vxoKMmu8Y3Zr2RVathBL1Cdu4Nt4MuNWemt1Nc06A0RAin9c5FArkhGsyMBWfCu4zj+9b+GxtjAnE4qqLQ==
+"@sindresorhus/is@^4.0.0":
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-4.0.0.tgz#2ff674e9611b45b528896d820d3d7a812de2f0e4"
+ integrity sha512-FyD2meJpDPjyNQejSjvnhpgI/azsQkA4lGbuu5BQZfjvJ9cbRZXzeWL2HceCekW4lixO9JPesIIQkSoLjeJHNQ==
+
"@sinonjs/commons@^1", "@sinonjs/commons@^1.6.0", "@sinonjs/commons@^1.7.0", "@sinonjs/commons@^1.7.2":
version "1.8.1"
resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.1.tgz#e7df00f98a203324f6dc7cc606cad9d4a8ab2217"
@@ -3724,6 +3729,11 @@
resolved "https://registry.yarnpkg.com/@types/debug/-/debug-4.1.5.tgz#b14efa8852b7768d898906613c23f688713e02cd"
integrity sha512-Q1y515GcOdTHgagaVFhHnIFQ38ygs/kmxdNpvpou+raI9UO3YZcHDngBSYKQklcKlvA7iuQlmIKbzvmxcOE9CQ==
+"@types/easy-table@^0.0.32":
+ version "0.0.32"
+ resolved "https://registry.yarnpkg.com/@types/easy-table/-/easy-table-0.0.32.tgz#961034bf7bba3d5a4344585b960d7a0d11a249b5"
+ integrity sha512-zKh0f/ixYFnr3Ldf5ZJTi1ZpnRqAynTTtVyGvWDf/TT12asE8ac98t3/WGWfFdRPp/qsccxg82C/Kl3NPNhqEw==
+
"@types/fs-extra@^9.0.1":
version "9.0.1"
resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-9.0.1.tgz#91c8fc4c51f6d5dbe44c2ca9ab09310bd00c7918"
@@ -3812,6 +3822,11 @@
resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.6.tgz#f4c7ec43e81b319a9815115031709f26987891f0"
integrity sha512-3c+yGKvVP5Y9TYBEibGNR+kLtijnj7mYrXRg+WpFb2X9xm04g/DXYkfg4hmzJQosc9snFNUPkbYIhu+KAm6jJw==
+"@types/json-stringify-safe@^5.0.0":
+ version "5.0.0"
+ resolved "https://registry.yarnpkg.com/@types/json-stringify-safe/-/json-stringify-safe-5.0.0.tgz#df34d054419d39323a3730966bacba02ac5e474e"
+ integrity sha512-UUA1sH0RSRROdInuDOA1yoRzbi5xVFD1RHCoOvNRPTNwR8zBkJ/84PZ6NhKVDtKp0FTeIccJCdQz1X2aJPr4uw==
+
"@types/json5@^0.0.29":
version "0.0.29"
resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee"
@@ -3968,6 +3983,11 @@
resolved "https://registry.yarnpkg.com/@types/unist/-/unist-2.0.3.tgz#9c088679876f374eb5983f150d4787aa6fb32d7e"
integrity sha512-FvUupuM3rlRsRtCN+fDudtmytGO6iHJuuRKS1Ss0pG5z8oX0diNEw94UEL7hgDbpN94rgaK5R7sWm6RrSkZuAQ==
+"@types/validator@^13.1.3":
+ version "13.1.3"
+ resolved "https://registry.yarnpkg.com/@types/validator/-/validator-13.1.3.tgz#366b394aa3fbeed2392bf0a20ded606fa4a3d35e"
+ integrity sha512-DaOWN1zf7j+8nHhqXhIgNmS+ltAC53NXqGxYuBhWqWgqolRhddKzfZU814lkHQSTG0IUfQxU7Cg0gb8fFWo2mA==
+
"@types/vfile-message@*":
version "2.0.0"
resolved "https://registry.yarnpkg.com/@types/vfile-message/-/vfile-message-2.0.0.tgz#690e46af0fdfc1f9faae00cd049cc888957927d5"
@@ -4034,14 +4054,17 @@
deepmerge "^4.0.0"
glob "^7.1.2"
-"@wdio/junit-reporter@^6.11.0":
- version "6.11.0"
- resolved "https://registry.yarnpkg.com/@wdio/junit-reporter/-/junit-reporter-6.11.0.tgz#d5b8837a0fa526c3f629b6844317ef3a7bb9272d"
- integrity sha512-wOc1SYEHdGaLdO3zdcJ0U55p/LxMZL4erHSeqHMSJZLtuNPJYvj3RgRrhnVYMcnR6OjzIMC/acQ/hU2QwrzXNQ==
+"@wdio/junit-reporter@^7.0.7":
+ version "7.0.7"
+ resolved "https://registry.yarnpkg.com/@wdio/junit-reporter/-/junit-reporter-7.0.7.tgz#552851641c49a093ebf0b0ac454285d048979e4a"
+ integrity sha512-oSgDjfcL6ErNJYMAxbCoNsZag+lDAJJ/48F4HZI4hYaX17nTlM0+MSn0WCR5UIwniCorlgk8lIiJPGMInyQl7w==
dependencies:
- "@wdio/reporter" "6.11.0"
+ "@types/json-stringify-safe" "^5.0.0"
+ "@types/validator" "^13.1.3"
+ "@wdio/reporter" "7.0.7"
+ "@wdio/types" "7.0.7"
json-stringify-safe "^5.0.1"
- junit-report-builder "^2.1.0"
+ junit-report-builder "^3.0.0"
validator "^13.0.0"
@@ -4066,24 +4089,34 @@
dependencies:
"@wdio/utils" "6.11.0"
- version "6.11.0"
- resolved "https://registry.yarnpkg.com/@wdio/reporter/-/reporter-6.11.0.tgz#edeb255df708509ea8428029273d4d65426ea2d5"
- integrity sha512-SStNZZUI0bXI+omyIU6ql4Rh+Dews1dz1GlowHDrBxwKMPyAwytgYokXLn3zr+E3tkHDiRyJjQxfDetBWBGmtg==
+ version "7.0.7"
+ resolved "https://registry.yarnpkg.com/@wdio/reporter/-/reporter-7.0.7.tgz#1217608db08a6bc81e508e39076fb343c8b27384"
+ integrity sha512-apnjlbBpMdPK9OWuXOwa30dFAZNdvRixR6O3TjqvjL7/2qXWBRCBzs4H4BWxUQ/ut6WAbst1TNKNEnNvB5Ln4Q==
dependencies:
"@types/cucumber" "^6.0.1"
+ "@wdio/types" "7.0.7"
fs-extra "^9.0.0"
-"@wdio/spec-reporter@^6.11.0":
- version "6.11.0"
- resolved "https://registry.yarnpkg.com/@wdio/spec-reporter/-/spec-reporter-6.11.0.tgz#99e0a03985c0dfccf57f4b24c75f03409e1caaca"
- integrity sha512-X68HGyay/tt0Y2nHn5U519bx+yBobAHge7lPklZ2cHNPEsmPSrvTyKIw5h3YO8mkfWHdp6IGxgHrET521Oe6WA==
+"@wdio/spec-reporter@^7.0.7":
+ version "7.0.7"
+ resolved "https://registry.yarnpkg.com/@wdio/spec-reporter/-/spec-reporter-7.0.7.tgz#4438a4a3313e7241899b7a51ab07ff3297e12dc3"
+ integrity sha512-UIzoHrubybIeHrn/DlkkaV0oXSDSy3gBttQfSlBzmf3hZC1Mrvj3T5sosQ5UXNg8mj+l1MngmpKEhIeuGPsqOQ==
dependencies:
- "@wdio/reporter" "6.11.0"
+ "@types/easy-table" "^0.0.32"
+ "@wdio/reporter" "7.0.7"
+ "@wdio/types" "7.0.7"
chalk "^4.0.0"
easy-table "^1.1.1"
pretty-ms "^7.0.0"
+ version "7.0.7"
+ resolved "https://registry.yarnpkg.com/@wdio/types/-/types-7.0.7.tgz#5e16cac7f5bd22fb0a28529273dd672a01776a70"
+ integrity sha512-4UiQevmw9is81RC8ZA6+HTsDAc/m4MGsWZ7UHBeLQGbpzLixexXbluZxF85xWsgFOanW20wVahfsU63gQ5byvQ==
+ dependencies:
+ got "^11.8.1"
+
version "6.11.0"
resolved "https://registry.yarnpkg.com/@wdio/utils/-/utils-6.11.0.tgz#878c2500efb1a325bf5a66d2ff3d08162f976e8c"
@@ -4864,11 +4897,6 @@ async@^3.2.0:
resolved "https://registry.yarnpkg.com/async/-/async-3.2.0.tgz#b3a2685c5ebb641d3de02d161002c60fc9f85720"
integrity sha512-TR2mEZFVOj2pLStYxLht7TyfuRzaydfpxr3k9RpHIzMgw7A64dzsdqCxH1WJyQdoe8T10nDXd9wnEigmiuHIZw==
- version "0.0.10"
- resolved "https://registry.yarnpkg.com/asyncjs/-/asyncjs-0.0.10.tgz#50dbbfefb8b2df2ffa9c9e9e8bd58887bc3c1518"
- integrity sha1-UNu/77iy3y/6nJ6ei9WIh7w8FRg=
-
asynckit@^0.4.0:
version "0.4.0"
resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
@@ -5522,11 +5550,6 @@ [email protected]:
dependencies:
node-int64 "^0.4.0"
-bson@~0.4.21:
- version "0.4.23"
- resolved "https://registry.yarnpkg.com/bson/-/bson-0.4.23.tgz#e65a2e3c7507ffade4109bc7575a76e50f8da915"
- integrity sha1-5louPHUH/63kEJvHV1p25Q+NqRU=
-
buffer-alloc-unsafe@^1.1.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz#bd7dc26ae2972d0eda253be061dba992349c19f0"
@@ -5560,11 +5583,6 @@ buffer-indexof@^1.0.0:
resolved "https://registry.yarnpkg.com/buffer-indexof/-/buffer-indexof-1.1.1.tgz#52fabcc6a606d1a00302802648ef68f639da268c"
integrity sha512-4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g==
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/buffer-writer/-/buffer-writer-1.0.0.tgz#6c29c3b2dea0c9e455a1f261a199a48a04f88b08"
- integrity sha1-bCnDst6gyeRVofJhoZmkigT4iwg=
-
buffer-xor@^1.0.3:
version "1.0.3"
resolved "https://registry.yarnpkg.com/buffer-xor/-/buffer-xor-1.0.3.tgz#26e61ed1422fb70dd42e6e36729ed51d855fe8d9"
@@ -6692,7 +6710,7 @@ cross-spawn@^6.0.0, cross-spawn@^6.0.5:
shebang-command "^1.2.0"
which "^1.2.9"
-cross-spawn@^7.0.0:
+cross-spawn@^7.0.0, cross-spawn@^7.0.3:
version "7.0.3"
resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
@@ -7048,13 +7066,6 @@ [email protected]:
resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-3.0.2.tgz#9a4df4bff158ac2f34bc637abdb15471607e1659"
integrity sha1-mk30v/FYrC80vGN6vbFUcWB+Flk=
- version "0.6.4"
- resolved "https://registry.yarnpkg.com/dbox/-/dbox-0.6.4.tgz#556c4cfd002f30d492893284186bc9711b5a92ad"
- integrity sha1-VWxM/QAvMNSSiTKEGGvJcRtakq0=
- dependencies:
- request "2.9.153"
-
[email protected], debug@^2.2.0, debug@^2.3.3, debug@^2.6.0, debug@^2.6.8, debug@^2.6.9:
version "2.6.9"
resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
@@ -7619,11 +7630,6 @@ dotenv@^8.2.0:
resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-8.2.0.tgz#97e619259ada750eea3e4ea3e26bceea5424b16a"
integrity sha512-8sJ78ElpbDJBHNeBzUbUVLsqKdccaa/BXF1uPTw3GrvQTBgrQrtObr2mUrE38vzYd8cEv+m/JBfDLioYcfXoaw==
-double-ended-queue@^2.1.0-0:
- version "2.1.0-0"
- resolved "https://registry.yarnpkg.com/double-ended-queue/-/double-ended-queue-2.1.0-0.tgz#103d3527fd31528f40188130c841efdd78264e5c"
- integrity sha1-ED01J/0xUo9AGIEwyEHv3XgmTlw=
-
duplexer3@^0.1.4:
version "0.1.4"
resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz#ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2"
@@ -7994,11 +8000,6 @@ es6-object-assign@^1.0.3:
resolved "https://registry.yarnpkg.com/es6-object-assign/-/es6-object-assign-1.1.0.tgz#c2c3582656247c39ea107cb1e6652b6f9f24523c"
integrity sha1-wsNYJlYkfDnqEHyx5mUrb58kUjw=
- version "3.0.2"
- resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-3.0.2.tgz#010d5858423a5f118979665f46486a95c6ee2bb6"
- integrity sha1-AQ1YWEI6XxGJeWZfRkhqlcbuK7Y=
-
es6-promise@^4.0.3:
version "4.2.8"
resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.8.tgz#4eb21594c972bc40553d276e510539143db53e0a"
@@ -8960,11 +8961,6 @@ [email protected]:
dependencies:
samsam "1.x"
- version "1.0.17"
- resolved "https://registry.yarnpkg.com/formidable/-/formidable-1.0.17.tgz#ef5491490f9433b705faa77249c99029ae348559"
- integrity sha1-71SRSQ+UM7cF+qdyScmQKa40hVk=
-
forwarded@~0.1.2:
version "0.1.2"
resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.2.tgz#98c23dab1175657b8c0573e8ceccd91b0ff18c84"
@@ -9167,11 +9163,6 @@ gaze@^1.0.0:
dependencies:
globule "^1.0.0"
- version "2.1.1"
- resolved "https://registry.yarnpkg.com/generic-pool/-/generic-pool-2.1.1.tgz#af04dc2c325cfcb975023fa52bfce9617a7435fd"
- integrity sha1-rwTcLDJc/Ll1Aj+lK/zpYXp0Nf0=
-
genfun@^4.0.1:
version "4.0.1"
resolved "https://registry.yarnpkg.com/genfun/-/genfun-4.0.1.tgz#ed10041f2e4a7f1b0a38466d17a5c3e27df1dfc1"
@@ -9438,11 +9429,6 @@ globule@^1.0.0:
lodash "~4.17.10"
minimatch "~3.0.2"
- version "0.0.9"
- resolved "https://registry.yarnpkg.com/gnu-tools/-/gnu-tools-0.0.9.tgz#dff6238a26aebc394ffc061359edfeab0bdc9911"
- integrity sha1-3/YjiiauvDlP/AYTWe3+qwvcmRE=
-
gonzales-pe@^4.2.3:
version "4.3.0"
resolved "https://registry.yarnpkg.com/gonzales-pe/-/gonzales-pe-4.3.0.tgz#fe9dec5f3c557eead09ff868c65826be54d067b3"
@@ -9467,6 +9453,23 @@ got@^11.0.2:
p-cancelable "^2.0.0"
responselike "^2.0.0"
+got@^11.8.1:
+ version "11.8.1"
+ resolved "https://registry.yarnpkg.com/got/-/got-11.8.1.tgz#df04adfaf2e782babb3daabc79139feec2f7e85d"
+ integrity sha512-9aYdZL+6nHmvJwHALLwKSUZ0hMwGaJGYv3hoPLPgnT8BoBXm1SjnZeky+91tfwJaDzun2s4RsBRy48IEYv2q2Q==
+ dependencies:
+ "@sindresorhus/is" "^4.0.0"
+ "@szmarczak/http-timer" "^4.0.5"
+ "@types/cacheable-request" "^6.0.1"
+ "@types/responselike" "^1.0.0"
+ cacheable-lookup "^5.0.3"
+ cacheable-request "^7.0.1"
+ decompress-response "^6.0.0"
+ http2-wrapper "^1.0.0-beta.5.2"
+ lowercase-keys "^2.0.0"
+ p-cancelable "^2.0.0"
+ responselike "^2.0.0"
+
got@^6.7.1:
version "6.7.1"
resolved "https://registry.yarnpkg.com/got/-/got-6.7.1.tgz#240cd05785a9a18e561dc1b44b41c763ef1e8db0"
@@ -11415,25 +11418,6 @@ js-yaml@^3.13.1, js-yaml@^3.14.0:
argparse "^1.0.7"
esprima "^4.0.0"
-jsDAV@~0.3.4:
- version "0.3.4"
- resolved "https://registry.yarnpkg.com/jsDAV/-/jsDAV-0.3.4.tgz#8c88e82be1d52e2188bc9ff2c44d11579fe62f86"
- integrity sha1-jIjoK+HVLiGIvJ/yxE0RV5/mL4Y=
- dependencies:
- asyncjs "0.0.10"
- formidable "1.0.17"
- moment "2.11.1"
- xmldom "0.1.21"
- xpath "0.0.21"
- optionalDependencies:
- dbox "0.6.4"
- gnu-tools "0.0.9"
- jsftp "0.5.4"
- mongodb "2.1.4"
- node-sftp "0.1.1"
- pg "4.4.3"
- redis "2.4.2"
-
jsbn@~0.1.0:
version "0.1.1"
resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
@@ -11513,13 +11497,6 @@ jsesc@~0.5.0:
resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d"
integrity sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=
- version "0.5.4"
- resolved "https://registry.yarnpkg.com/jsftp/-/jsftp-0.5.4.tgz#7930a14df234d537d7f2edff64668fff02b4b7fe"
- integrity sha1-eTChTfI01TfX8u3/ZGaP/wK0t/4=
- dependencies:
- streamer "0.2.x"
-
version "3.0.0"
resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.0.tgz#5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898"
@@ -11720,15 +11697,15 @@ jszip@^3.1.0, jszip@^3.1.5:
readable-stream "~2.3.6"
set-immediate-shim "~1.0.1"
-junit-report-builder@^2.1.0:
- version "2.1.0"
- resolved "https://registry.yarnpkg.com/junit-report-builder/-/junit-report-builder-2.1.0.tgz#7089dd8ae547657509b9a5eb7b5082bde22bcc7e"
- integrity sha512-Ioj5I4w18ZcHFaaisqCKdh1z+ipzN7sA2JB+h+WOlGcOMWm0FFN1dfxkgc2I4EXfhSP/mOfM3W43uFzEdz4sTw==
+junit-report-builder@^3.0.0:
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/junit-report-builder/-/junit-report-builder-3.0.0.tgz#829680cfb20d99ce70e26cbb426162afe199fedc"
+ integrity sha512-aW7DnfLddUb51T+V08bJyecexaLomy5ID/0FXvhwsRXs9E0abvDaDT024U99J2agU3dt4q0ppzfKxSwrIIgXWg==
dependencies:
date-format "0.0.2"
lodash "^4.17.15"
make-dir "^1.3.0"
- xmlbuilder "^10.0.0"
+ xmlbuilder "^15.1.1"
just-extend@^4.0.2:
version "4.1.0"
@@ -12859,27 +12836,6 @@ mkdirp@^1.0.3, mkdirp@^1.0.4:
resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
- version "2.11.1"
- resolved "https://registry.yarnpkg.com/moment/-/moment-2.11.1.tgz#bf4026413640d1b802467cf353607f8464d6af47"
- integrity sha1-v0AmQTZA0bgCRnzzU2B/hGTWr0c=
-
- version "1.2.32"
- resolved "https://registry.yarnpkg.com/mongodb-core/-/mongodb-core-1.2.32.tgz#ed6e5422fecae10c0e79710b105121b9a92ec3d4"
- integrity sha1-7W5UIv7K4QwOeXELEFEhuakuw9Q=
- dependencies:
- bson "~0.4.21"
-
- version "2.1.4"
- resolved "https://registry.yarnpkg.com/mongodb/-/mongodb-2.1.4.tgz#652d8720ff7f5bc562c473ccb0c90d789379a4a3"
- integrity sha1-ZS2HIP9/W8VixHPMsMkNeJN5pKM=
- dependencies:
- es6-promise "3.0.2"
- mongodb-core "1.2.32"
- readable-stream "1.0.31"
-
move-concurrently@^1.0.1, move-concurrently@~1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/move-concurrently/-/move-concurrently-1.0.1.tgz#be2c005fda32e0b29af1f05d7c4b33214c701f92"
@@ -13164,11 +13120,6 @@ node-sass@^4.5.3:
stdout-stream "^1.4.0"
"true-case-path" "^1.0.2"
- version "0.1.1"
- resolved "https://registry.yarnpkg.com/node-sftp/-/node-sftp-0.1.1.tgz#ebca3a8fd1b1cf09e46c06b54cb22d2d2f946d45"
- integrity sha1-68o6j9GxzwnkbAa1TLItLS+UbUU=
-
"nopt@2 || 3":
version "3.0.6"
resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9"
@@ -13846,11 +13797,6 @@ package-json@^6.3.0:
registry-url "^5.0.0"
semver "^6.2.0"
- version "0.2.0"
- resolved "https://registry.yarnpkg.com/packet-reader/-/packet-reader-0.2.0.tgz#819df4d010b82d5ea5671f8a1a3acf039bcd7700"
- integrity sha1-gZ300BC4LV6lZx+KGjrPA5vNdwA=
-
pacote@~2.7.38:
version "2.7.38"
resolved "https://registry.yarnpkg.com/pacote/-/pacote-2.7.38.tgz#5091f8774298c26c3eca24606037f1bb73db74c1"
@@ -14118,47 +14064,6 @@ performance-now@^2.1.0:
resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
- version "0.1.3"
- resolved "https://registry.yarnpkg.com/pg-connection-string/-/pg-connection-string-0.1.3.tgz#da1847b20940e42ee1492beaf65d49d91b245df7"
- integrity sha1-2hhHsglA5C7hSSvq9l1J2RskXfc=
-
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/pg-int8/-/pg-int8-1.0.1.tgz#943bd463bf5b71b4170115f80f8efc9a0c0eb78c"
- integrity sha512-WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw==
-
-pg-types@1.*:
- version "1.13.0"
- resolved "https://registry.yarnpkg.com/pg-types/-/pg-types-1.13.0.tgz#75f490b8a8abf75f1386ef5ec4455ecf6b345c63"
- integrity sha512-lfKli0Gkl/+za/+b6lzENajczwZHc7D5kiUCZfgm914jipD2kIOIvEkAhZ8GrW3/TUoP9w8FHjwpPObBye5KQQ==
- dependencies:
- pg-int8 "1.0.1"
- postgres-array "~1.0.0"
- postgres-bytea "~1.0.0"
- postgres-date "~1.0.0"
- postgres-interval "^1.1.0"
-
- version "4.4.3"
- resolved "https://registry.yarnpkg.com/pg/-/pg-4.4.3.tgz#bec855c4e9615b20eec6a32d06f074089d5fb152"
- integrity sha1-vshVxOlhWyDuxqMtBvB0CJ1fsVI=
- dependencies:
- buffer-writer "1.0.0"
- generic-pool "2.1.1"
- packet-reader "0.2.0"
- pg-connection-string "0.1.3"
- pg-types "1.*"
- pgpass "0.0.3"
- semver "^4.1.0"
-
- version "0.0.3"
- resolved "https://registry.yarnpkg.com/pgpass/-/pgpass-0.0.3.tgz#12e67e343b3189c2f31206ebc9cc0befffcf9140"
- integrity sha1-EuZ+NDsxicLzEgbrycwL7//PkUA=
- dependencies:
- split "~0.3"
-
picomatch@^2.0.4, picomatch@^2.0.5, picomatch@^2.2.1:
version "2.2.2"
resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad"
@@ -14677,28 +14582,6 @@ postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.13, postcss@^7.0.14, postcss@^7.0.2
source-map "^0.6.1"
supports-color "^6.1.0"
-postgres-array@~1.0.0:
- version "1.0.3"
- resolved "https://registry.yarnpkg.com/postgres-array/-/postgres-array-1.0.3.tgz#c561fc3b266b21451fc6555384f4986d78ec80f5"
- integrity sha512-5wClXrAP0+78mcsNX3/ithQ5exKvCyK5lr5NEEEeGwwM6NJdQgzIJBVxLvRW+huFpX92F2QnZ5CcokH0VhK2qQ==
-
-postgres-bytea@~1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/postgres-bytea/-/postgres-bytea-1.0.0.tgz#027b533c0aa890e26d172d47cf9ccecc521acd35"
- integrity sha1-AntTPAqokOJtFy1Hz5zOzFIazTU=
-
-postgres-date@~1.0.0:
- version "1.0.7"
- resolved "https://registry.yarnpkg.com/postgres-date/-/postgres-date-1.0.7.tgz#51bc086006005e5061c591cee727f2531bf641a8"
- integrity sha512-suDmjLVQg78nMK2UZ454hAG+OAW+HQPZ6n++TNDUX+L0+uUlLywnoxJKDou51Zm+zTCjrCl0Nq6J9C5hP9vK/Q==
-
-postgres-interval@^1.1.0:
- version "1.2.0"
- resolved "https://registry.yarnpkg.com/postgres-interval/-/postgres-interval-1.2.0.tgz#b460c82cb1587507788819a06aa0fffdb3544695"
- integrity sha512-9ZhXKM/rw350N1ovuWHbGxnGh/SNJ4cnxHiM0rxE4VN41wsg8P8zWn9hv/buK00RP4WvlOyr/RBDiptyxVbkZQ==
- dependencies:
- xtend "^4.0.0"
-
prelude-ls@~1.1.2:
version "1.1.2"
resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
@@ -15557,16 +15440,6 @@ read@1, read@~1.0.1, read@~1.0.7:
string_decoder "~1.1.1"
util-deprecate "~1.0.1"
- version "1.0.31"
- resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.31.tgz#8f2502e0bc9e3b0da1b94520aabb4e2603ecafae"
- integrity sha1-jyUC4LyeOw2huUUgqrtOJgPsr64=
- dependencies:
- core-util-is "~1.0.0"
- inherits "~2.0.1"
- isarray "0.0.1"
- string_decoder "~0.10.x"
-
readable-stream@^3.0.6, readable-stream@^3.1.1, readable-stream@^3.4.0, readable-stream@^3.6.0:
version "3.6.0"
resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198"
@@ -15642,19 +15515,6 @@ redent@^2.0.0:
indent-string "^3.0.0"
strip-indent "^2.0.0"
-redis-commands@^1.0.1:
- version "1.6.0"
- resolved "https://registry.yarnpkg.com/redis-commands/-/redis-commands-1.6.0.tgz#36d4ca42ae9ed29815cdb30ad9f97982eba1ce23"
- integrity sha512-2jnZ0IkjZxvguITjFTrGiLyzQZcTvaw8DAaCXxZq/dsHXz7KfMQ3OUJy7Tz9vnRtZRVz6VRCPDvruvU8Ts44wQ==
-
- version "2.4.2"
- resolved "https://registry.yarnpkg.com/redis/-/redis-2.4.2.tgz#2f9160255a26a6cad2b79bf0847e067280a146ea"
- integrity sha1-L5FgJVompsrSt5vwhH4GcoChRuo=
- dependencies:
- double-ended-queue "^2.1.0-0"
- redis-commands "^1.0.1"
-
redux-logger@^3.0.6:
version "3.0.6"
resolved "https://registry.yarnpkg.com/redux-logger/-/redux-logger-3.0.6.tgz#f7555966f3098f3c88604c449cf0baf5778274bf"
@@ -15941,11 +15801,6 @@ [email protected], "request@>=2.9.0 <2.82.0", request@~2.81.0:
tunnel-agent "^0.6.0"
uuid "^3.0.0"
- version "2.9.153"
- resolved "https://registry.yarnpkg.com/request/-/request-2.9.153.tgz#a93c4f7a02d733b56882a166c1e68a9688e75742"
- integrity sha1-qTxPegLXM7VogqFmweaKlojnV0I=
-
request@^2.74.0, request@^2.87.0, request@^2.88.0, request@^2.88.2:
version "2.88.2"
resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3"
@@ -16390,11 +16245,6 @@ [email protected]:
resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e"
integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==
-semver@^4.1.0:
- version "4.3.6"
- resolved "https://registry.yarnpkg.com/semver/-/semver-4.3.6.tgz#300bc6e0e86374f7ba61068b5b1ecd57fc6532da"
- integrity sha1-MAvG4OhjdPe6YQaLWx7NV/xlMto=
-
semver@^6.0.0, semver@^6.1.2, semver@^6.2.0, semver@^6.3.0:
version "6.3.0"
resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
@@ -16965,13 +16815,6 @@ split@^1.0.1:
dependencies:
through "2"
-split@~0.3:
- version "0.3.3"
- resolved "https://registry.yarnpkg.com/split/-/split-0.3.3.tgz#cd0eea5e63a211dfff7eb0f091c4133e2d0dd28f"
- integrity sha1-zQ7qXmOiEd//frDwkcQTPi0N0o8=
- dependencies:
- through "2"
-
sprintf-js@^1.1.2:
version "1.1.2"
resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.2.tgz#da1765262bf8c0f571749f2ad6c26300207ae673"
@@ -17115,11 +16958,6 @@ stream-shift@^1.0.0:
resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.1.tgz#d7088281559ab2778424279b0877da3c392d5a3d"
integrity sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==
- version "0.2.1"
- resolved "https://registry.yarnpkg.com/streamer/-/streamer-0.2.1.tgz#5edf42e9585cd3bc9b11e5574979908fb7c592db"
- integrity sha1-Xt9C6Vhc07ybEeVXSXmQj7fFkts=
-
string-argv@^0.0.2:
version "0.0.2"
resolved "https://registry.yarnpkg.com/string-argv/-/string-argv-0.0.2.tgz#dac30408690c21f3c3630a3ff3a05877bdcbd736"
@@ -19118,10 +18956,10 @@ [email protected]:
resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-15.0.0.tgz#de9a078a0b82ef0c6da5c76e58813a879eec31ec"
integrity sha512-KLu/G0DoWhkncQ9eHSI6s0/w+T4TM7rQaLhtCaL6tORv8jFlJPlnGumsgTcGfYeS1qZ/IHqrvDG7zJZ4d7e+nw==
-xmlbuilder@^10.0.0:
- version "10.1.1"
- resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-10.1.1.tgz#8cae6688cc9b38d850b7c8d3c0a4161dcaf475b0"
- integrity sha512-OyzrcFLL/nb6fMGHbiRDuPup9ljBycsdCypwuyg5AAHvyWzGfChJpCXMG88AGTIMFhGZ9RccFN1e6lhg3hkwKg==
+xmlbuilder@^15.1.1:
+ version "15.1.1"
+ resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-15.1.1.tgz#9dcdce49eea66d8d10b42cae94a79c3c8d0c2ec5"
+ integrity sha512-yMqGBqtXyeN1e3TGYvgNgDVZ3j84W4cwkOXQswghol6APgZWaff9lnbvN7MHYJOiXsvGPXtjTYJEiC9J2wv9Eg==
xmlbuilder@~9.0.1:
version "9.0.7"
@@ -19133,16 +18971,6 @@ xmlchars@^2.2.0:
resolved "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz#060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb"
integrity sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==
- version "0.1.21"
- resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.1.21.tgz#a29e1210dab1f10c25665b5e80129baa8d69a97b"
- integrity sha1-op4SENqx8QwlZltegBKbqo1pqXs=
-
- version "0.0.21"
- resolved "https://registry.yarnpkg.com/xpath/-/xpath-0.0.21.tgz#470291597cbbd33c7c198e0fab2a643c31d4a8e9"
- integrity sha1-RwKRWXy70zx8GY4PqypkPDHUqOk=
-
"xtend@>=4.0.0 <4.1.0-0", xtend@^4.0.0, xtend@^4.0.1, xtend@~4.0.1:
version "4.0.2"
resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54"