TagSpaces is an offline, open source, document manager with tagging support
e2e-fixes (#1993)
Stanimir97036084a2fd
diff --git a/app/components/EntryContainerMenu.tsx b/app/components/EntryContainerMenu.tsxindex 54cd8c53c..b96053036 100644--- a/app/components/EntryContainerMenu.tsx+++ b/app/components/EntryContainerMenu.tsx@@ -36,8 +36,8 @@ import {import { useTranslation } from 'react-i18next';import { useOpenedEntryContext } from '-/hooks/useOpenedEntryContext';import { useCurrentLocationContext } from '-/hooks/useCurrentLocationContext';-import { useFsActionsContext } from '-/hooks/useFsActionsContext';import { useNotificationContext } from '-/hooks/useNotificationContext';+import { useIOActionsContext } from '-/hooks/useIOActionsContext';interface Props {anchorEl: null | HTMLElement;@@ -63,7 +63,7 @@ function EntryContainerMenu(props: Props) {// const theme = useTheme();const { toggleEntryFullWidth, openLink } = useOpenedEntryContext();const { readOnlyMode } = useCurrentLocationContext();- const { deleteFile } = useFsActionsContext();+ const { deleteFile } = useIOActionsContext();const { showNotification } = useNotificationContext();const desktopMode = useSelector(isDesktopMode);const warningOpeningFilesExternally = useSelector(diff --git a/app/components/dialogs/CreateDirectoryDialog.tsx b/app/components/dialogs/CreateDirectoryDialog.tsxindex 4bd201fb0..20220044e 100644--- a/app/components/dialogs/CreateDirectoryDialog.tsx+++ b/app/components/dialogs/CreateDirectoryDialog.tsx@@ -17,7 +17,6 @@*/import React, { useState, useEffect, useRef } from 'react';-import { useSelector } from 'react-redux';import Button from '@mui/material/Button';import TextField from '@mui/material/TextField';import DialogActions from '@mui/material/DialogActions';@@ -30,8 +29,8 @@ import { joinPaths } from '@tagspaces/tagspaces-common/paths';import DialogCloseButton from '-/components/dialogs/DialogCloseButton';import PlatformIO from '-/services/platform-facade';import { useTranslation } from 'react-i18next';-import { useFsActionsContext } from '-/hooks/useFsActionsContext';import { useDirectoryContentContext } from '-/hooks/useDirectoryContentContext';+import { useIOActionsContext } from '-/hooks/useIOActionsContext';interface Props {open: boolean;@@ -43,7 +42,7 @@ interface Props {function CreateDirectoryDialog(props: Props) {const { t } = useTranslation();- const { createDirectory } = useFsActionsContext();+ const { createDirectory } = useIOActionsContext();const { currentDirectoryPath } = useDirectoryContentContext();const [inputError, setInputError] = useState(false);diff --git a/app/components/menus/DirectoryMenu.tsx b/app/components/menus/DirectoryMenu.tsxindex 41772600a..73975d38d 100644--- a/app/components/menus/DirectoryMenu.tsx+++ b/app/components/menus/DirectoryMenu.tsx@@ -200,16 +200,18 @@ function DirectoryMenu(props: Props) {}function showDeleteDirectoryDialog() {- setSelectedEntries([- {- isFile: false,- name: directoryPath,- path: directoryPath,- tags: [],- size: 0,- lmdt: 0- }- ]);+ if (!selectedEntries.some(entry => entry.path === directoryPath)) {+ setSelectedEntries([+ {+ isFile: false,+ name: directoryPath,+ path: directoryPath,+ tags: [],+ size: 0,+ lmdt: 0+ }+ ]);+ }toggleDeleteMultipleEntriesDialog();}diff --git a/app/containers/MainPage.tsx b/app/containers/MainPage.tsxindex d834f43b6..1e86af751 100644--- a/app/containers/MainPage.tsx+++ b/app/containers/MainPage.tsx@@ -86,9 +86,12 @@ import { styled, useTheme } from '@mui/material/styles';import { useTranslation } from 'react-i18next';import { DescriptionContextProvider } from '-/hooks/DescriptionContextProvider';import { useOpenedEntryContext } from '-/hooks/useOpenedEntryContext';-import { useFsActionsContext } from '-/hooks/useFsActionsContext';import { useDirectoryContentContext } from '-/hooks/useDirectoryContentContext';import { useSelectedEntriesContext } from '-/hooks/useSelectedEntriesContext';+import { useIOActionsContext } from '-/hooks/useIOActionsContext';+import { extractDirectoryName } from '@tagspaces/tagspaces-common/paths';+import PlatformIO from '-/services/platform-facade';+import { useNotificationContext } from '-/hooks/useNotificationContext';const drawerWidth = 320;const body = document.getElementsByTagName('body')[0];@@ -314,8 +317,8 @@ function ProTeaserDialogAsync(props) {function MainPage(props: Props) {const { t } = useTranslation();- const { deleteDirectory, deleteFile } = useFsActionsContext();- const { selectedEntries, setSelectedEntries } = useSelectedEntriesContext();+ const { deleteEntries } = useIOActionsContext();+ const { selectedEntries } = useSelectedEntriesContext();const {openLink,openedEntries,@@ -332,6 +335,7 @@ function MainPage(props: Props) {exitSearchMode,setSearchQuery} = useDirectoryContentContext();+ const { showNotification } = useNotificationContext();const theme = useTheme();const percent = useRef<number | undefined>(undefined);const [ignored, forceUpdate] = useReducer(x => x + 1, 0);@@ -703,23 +707,20 @@ function MainPage(props: Props) {list={selectedEntries.map(fsEntry => fsEntry.name)}confirmCallback={result => {if (result && selectedEntries) {- const deletePromises = selectedEntries.map(fsEntry => {- if (fsEntry.isFile) {- return deleteFile(fsEntry.path, fsEntry.uuid);- }- return deleteDirectory(fsEntry.path);- });- Promise.all(deletePromises)- .then(delResult => {- // console.debug(delResult);- if (delResult.some(del => del)) {- setSelectedEntries([]);- } // TODO else { remove only deleted from setSelectedEntries}- return true;- })- .catch(err => {- console.warn('Deleting file failed', err);- });+ deleteEntries(selectedEntries).then(+ success =>+ success &&+ selectedEntries.length > 1 &&+ showNotification(+ t('core:deletingEntriesSuccessful', {+ dirPath: selectedEntries+ .map(fsEntry => fsEntry.name)+ .toString()+ }),+ 'default',+ true+ )+ );}}}cancelDialogTID="cancelDeleteFileDialog"diff --git a/app/hooks/DirectoryContentContextProvider.tsx b/app/hooks/DirectoryContentContextProvider.tsxindex a7ec2fd61..3d8149ce8 100644--- a/app/hooks/DirectoryContentContextProvider.tsx+++ b/app/hooks/DirectoryContentContextProvider.tsx@@ -73,6 +73,7 @@ type DirectoryContentContextData = {searchQuery: TS.SearchQuery;isSearchMode: boolean;addDirectoryEntries: (entries: TS.FileSystemEntry[]) => void;+ removeDirectoryEntries: (entryPaths: string[]) => void;setSearchQuery: (sQuery: TS.SearchQuery) => void;loadParentDirectoryContent: () => void;loadDirectoryContent: (@@ -122,6 +123,7 @@ export const DirectoryContentContext = createContext<searchQuery: {},isSearchMode: false,addDirectoryEntries: undefined,+ removeDirectoryEntries: undefined,setSearchQuery: () => {},loadParentDirectoryContent: () => {},loadDirectoryContent: undefined,@@ -243,17 +245,13 @@ export const DirectoryContentContextProvider = ({setCurrentDirectoryEntries(newDirectoryEntries);//}}- } else if (action === 'delete') {+ } /*else if (action === 'delete') {const filePath = editedEntryPaths[0].path;const newDirectoryEntries = currentDirectoryEntries.filter(entry => entry.path !== filePath);-- /*if (searchMode.current) {- GlobalSearch.getInstance().setResults(newDirectoryEntries);- } else {*/setCurrentDirectoryEntries(newDirectoryEntries);- }+ }*/}}, [editedEntryPaths]);@@ -669,9 +667,20 @@ export const DirectoryContentContextProvider = ({currentDirectoryFiles.current = files;}- function addDirectoryEntries(entries: TS.FileSystemEntry[]) {- setCurrentDirectoryEntries([...currentDirectoryEntries, ...entries]);- }+ const addDirectoryEntries = useMemo(() => {+ return (entries: TS.FileSystemEntry[]) => {+ setCurrentDirectoryEntries([...currentDirectoryEntries, ...entries]);+ };+ }, [currentDirectoryEntries]);++ const removeDirectoryEntries = useMemo(() => {+ return (entryPaths: string[]) => {+ const entries = currentDirectoryEntries.filter(+ entry => !entryPaths.includes(entry.path)+ );+ setCurrentDirectoryEntries(entries);+ };+ }, [currentDirectoryEntries]);function setDirectoryMeta(meta: TS.FileSystemEntryMeta) {directoryMeta.current = meta;@@ -714,6 +723,7 @@ export const DirectoryContentContextProvider = ({setCurrentDirectoryDirs,setCurrentDirectoryFiles,addDirectoryEntries,+ removeDirectoryEntries,updateCurrentDirEntries,updateThumbnailUrl,setDirectoryMeta,diff --git a/app/hooks/FsActionsContextProvider.tsx b/app/hooks/FsActionsContextProvider.tsxindex 2cdee96e8..0c965f8eb 100644--- a/app/hooks/FsActionsContextProvider.tsx+++ b/app/hooks/FsActionsContextProvider.tsx@@ -22,23 +22,14 @@ import { actions as AppActions, AppDispatch } from '-/reducers/app';import { useTranslation } from 'react-i18next';import PlatformIO from '-/services/platform-facade';import {- extractContainingDirectoryPath,extractDirectoryName,- getBackupFileLocation,getMetaFileLocationForFile,getThumbFileLocationForFile} from '@tagspaces/tagspaces-common/paths';import { useOpenedEntryContext } from '-/hooks/useOpenedEntryContext';-import {- getUseTrashCan,- getWarningOpeningFilesExternally-} from '-/reducers/settings';+import { getWarningOpeningFilesExternally } from '-/reducers/settings';import { useDirectoryContentContext } from '-/hooks/useDirectoryContentContext';-import {- deleteFilesPromise,- renameFilesPromise,- toFsEntry-} from '-/services/utils-io';+import { renameFilesPromise } from '-/services/utils-io';import { useNotificationContext } from '-/hooks/useNotificationContext';import { useLocationIndexContext } from '-/hooks/useLocationIndexContext';import { useSelectedEntriesContext } from '-/hooks/useSelectedEntriesContext';@@ -48,19 +39,13 @@ type FsActionsContextData = {directoryPath: string,newDirectoryName: string) => Promise<string>;- createDirectory: (directoryPath: string, reflect?) => Promise<boolean>;- deleteDirectory: (directoryPath: string) => Promise<boolean>;renameFile: (filePath: string, newFilePath: string) => Promise<boolean>;- deleteFile: (filePath: string, uuid: string) => Promise<boolean>;openFileNatively: (selectedFile?: string) => void;};export const FsActionsContext = createContext<FsActionsContextData>({renameDirectory: () => Promise.resolve(''),- createDirectory: () => Promise.resolve(false),- deleteDirectory: () => Promise.resolve(false),renameFile: () => Promise.resolve(false),- deleteFile: () => Promise.resolve(false),openFileNatively: undefined});@@ -73,24 +58,11 @@ export const FsActionsContextProvider = ({}: FsActionsContextProviderProps) => {const { t } = useTranslation();const { setSelectedEntries, selectedEntries } = useSelectedEntriesContext();- const {- openedEntries,- reflectRenameDirectory,- reflectDeleteDirectory- } = useOpenedEntryContext();- const {- openDirectory,- currentDirectoryPath,- loadParentDirectoryContent- } = useDirectoryContentContext();- const {- reflectDeleteEntry,- reflectRenameEntry,- reflectCreateEntry- } = useLocationIndexContext();+ const { openedEntries, reflectRenameDirectory } = useOpenedEntryContext();+ const { openDirectory, currentDirectoryPath } = useDirectoryContentContext();+ const { reflectRenameEntry } = useLocationIndexContext();const { showNotification } = useNotificationContext();const dispatch: AppDispatch = useDispatch();- const useTrashCan = useSelector(getUseTrashCan);const warningOpeningFilesExternally = useSelector(getWarningOpeningFilesExternally);@@ -133,90 +105,6 @@ export const FsActionsContextProvider = ({});}- function createDirectory(directoryPath: string, reflect = true) {- return PlatformIO.createDirectoryPromise(directoryPath)- .then(result => {- if (result !== undefined && result.dirPath !== undefined) {- // eslint-disable-next-line no-param-reassign- directoryPath = result.dirPath;- }- console.log(`Creating directory ${directoryPath} successful.`);- if (reflect) {- reflectCreateEntry(toFsEntry(directoryPath, false));- dispatch(AppActions.reflectCreateEntry(directoryPath, false));- }- showNotification(- `Creating directory ${extractDirectoryName(- directoryPath,- PlatformIO.getDirSeparator()- )} successful.`,- 'default',- true- );- return true;- })- .catch(error => {- console.warn('Error creating directory: ' + error);- showNotification(- `Error creating directory '${extractDirectoryName(- directoryPath,- PlatformIO.getDirSeparator()- )}'`,- 'error',- true- );- return false;- // dispatch stopLoadingAnimation- });- }-- function deleteDirectory(directoryPath: string) {- return PlatformIO.deleteDirectoryPromise(directoryPath, useTrashCan)- .then(() => {- if (directoryPath === currentDirectoryPath) {- loadParentDirectoryContent();- reflectDeleteEntry(directoryPath);- // close opened entries in deleted dir- reflectDeleteDirectory(directoryPath);- } else {- reflectDeleteEntry(directoryPath);- dispatch(AppActions.reflectDeleteEntry(directoryPath));- }- showNotification(- t(- 'deletingDirectorySuccessfull' as any,- {- dirPath: extractDirectoryName(- directoryPath,- PlatformIO.getDirSeparator()- )- } as any- ) as string,- 'default',- true- );- return true;- })- .catch(error => {- console.warn('Error while deleting directory: ' + error);- showNotification(- t(- 'errorDeletingDirectoryAlert' as any,- {- dirPath: extractDirectoryName(- directoryPath,- PlatformIO.getDirSeparator()- )- } as any- ) as string,- 'error',- true- );- return false;- // dispatch stopLoadingAnimation- });- }-function renameFile(filePath: string, newFilePath: string): Promise<boolean> {return PlatformIO.renameFilePromise(filePath, newFilePath).then(result => {@@ -286,66 +174,6 @@ export const FsActionsContextProvider = ({});}- function deleteFile(filePath: string, uuid: string): Promise<boolean> {- return PlatformIO.deleteFilePromise(filePath, useTrashCan)- .then(() => {- // TODO close file opener if this file is opened- reflectDeleteEntry(filePath);- dispatch(AppActions.reflectDeleteEntry(filePath));- showNotification(- `Deleting file ${filePath} successful.`,- 'default',- true- );- // Delete revisions- const backupFilePath = getBackupFileLocation(- filePath,- uuid,- PlatformIO.getDirSeparator()- );- const backupPath = extractContainingDirectoryPath(- backupFilePath,- PlatformIO.getDirSeparator()- );- PlatformIO.deleteDirectoryPromise(backupPath)- .then(() => {- console.log('Cleaning revisions successful for ' + filePath);- return true;- })- .catch(err => {- console.warn('Cleaning revisions failed ', err);- });- // Delete sidecar file and thumb- deleteFilesPromise([- getMetaFileLocationForFile(filePath, PlatformIO.getDirSeparator()),- getThumbFileLocationForFile(- filePath,- PlatformIO.getDirSeparator(),- false- )- ])- .then(() => {- console.log(- 'Cleaning meta file and thumb successful for ' + filePath- );- return true;- })- .catch(err => {- console.warn('Cleaning meta file and thumb failed with ' + err);- });- return true;- })- .catch(error => {- console.warn('Error while deleting file: ' + error);- showNotification(- `Error while deleting file ${filePath}`,- 'error',- true- );- return false;- });- }-function openFileNatively(selectedFile?: string) {// todo reload selectedEntries or find better place for this functionif (selectedFile === undefined) {@@ -365,10 +193,7 @@ export const FsActionsContextProvider = ({const context = useMemo(() => {return {renameDirectory,- createDirectory,- deleteDirectory,renameFile,- deleteFile,openFileNatively};}, [openedEntries]);diff --git a/app/hooks/IOActionsContextProvider.tsx b/app/hooks/IOActionsContextProvider.tsxindex e4e748eb3..257c70dd4 100644--- a/app/hooks/IOActionsContextProvider.tsx+++ b/app/hooks/IOActionsContextProvider.tsx@@ -22,9 +22,11 @@ import { useTranslation } from 'react-i18next';import { useDirectoryContentContext } from '-/hooks/useDirectoryContentContext';import { useNotificationContext } from '-/hooks/useNotificationContext';import {+ extractContainingDirectoryPath,extractDirectoryName,extractFileName,getBackupFileDir,+ getBackupFileLocation,getMetaDirectoryPath,getMetaFileLocationForFile,getThumbFileLocationForFile,@@ -33,9 +35,10 @@ import {} from '@tagspaces/tagspaces-common/paths';import PlatformIO from '-/services/platform-facade';import { actions as AppActions, AppDispatch } from '-/reducers/app';-import { useDispatch } from 'react-redux';+import { useDispatch, useSelector } from 'react-redux';import {copyFilesPromise,+ deleteFilesPromise,getThumbPath,loadFileMetaDataPromise,renameFilesPromise,@@ -52,6 +55,8 @@ import {} from '@tagspaces/tagspaces-common/utils-io';import { useLocationIndexContext } from '-/hooks/useLocationIndexContext';import { useSelectedEntriesContext } from '-/hooks/useSelectedEntriesContext';+import { getUseTrashCan } from '-/reducers/settings';+import { useOpenedEntryContext } from '-/hooks/useOpenedEntryContext';type extractOptions = {EXIFGeo?: boolean;@@ -61,6 +66,10 @@ type extractOptions = {};type IOActionsContextData = {extractContent: (options?: extractOptions, addTags?) => Promise<boolean>;+ createDirectory: (directoryPath: string, reflect?) => Promise<boolean>;+ deleteEntries: (entries: TS.FileSystemEntry[]) => Promise<boolean>;+ deleteDirectory: (directoryPath: string, reflect?) => Promise<boolean>;+ deleteFile: (filePath: string, uuid: string, reflect?) => Promise<boolean>;moveDirs: (dirPaths: Array<string>,targetPath: string,@@ -103,6 +112,10 @@ type IOActionsContextData = {export const IOActionsContext = createContext<IOActionsContextData>({extractContent: () => Promise.resolve(false),+ createDirectory: undefined,+ deleteEntries: undefined,+ deleteDirectory: undefined,+ deleteFile: undefined,moveDirs: () => Promise.resolve(false),moveFiles: () => Promise.resolve(false),copyDirs: () => Promise.resolve(false),@@ -123,11 +136,13 @@ export const IOActionsContextProvider = ({const { t } = useTranslation();const dispatch: AppDispatch = useDispatch();const { showNotification, hideNotifications } = useNotificationContext();+ const { reflectDeleteDirectory, reflectDeleteFile } = useOpenedEntryContext();const {currentDirectoryEntries,currentDirectoryPath,- openDirectory,- addDirectoryEntries+ loadParentDirectoryContent,+ addDirectoryEntries,+ removeDirectoryEntries} = useDirectoryContentContext();const { setSelectedEntries } = useSelectedEntriesContext();const {@@ -135,6 +150,7 @@ export const IOActionsContextProvider = ({reflectCreateEntry,reflectDeleteEntries} = useLocationIndexContext();+ const useTrashCan = useSelector(getUseTrashCan);function extractContent(options: extractOptions = {@@ -160,6 +176,202 @@ export const IOActionsContextProvider = ({});}+ const createDirectory = useMemo(() => {+ return (directoryPath: string, reflect = true) =>+ PlatformIO.createDirectoryPromise(directoryPath)+ .then(result => {+ if (result !== undefined && result.dirPath !== undefined) {+ // eslint-disable-next-line no-param-reassign+ directoryPath = result.dirPath;+ }+ console.log(`Creating directory ${directoryPath} successful.`);+ if (reflect) {+ const entry = toFsEntry(directoryPath, false);+ setSelectedEntries([entry]);+ addDirectoryEntries([entry]);+ reflectCreateEntry(entry);+ dispatch(AppActions.reflectCreateEntry(directoryPath, false));+ }+ showNotification(+ `Creating directory ${extractDirectoryName(+ directoryPath,+ PlatformIO.getDirSeparator()+ )} successful.`,+ 'default',+ true+ );+ return true;+ })+ .catch(error => {+ console.warn('Error creating directory: ' + error);+ showNotification(+ `Error creating directory '${extractDirectoryName(+ directoryPath,+ PlatformIO.getDirSeparator()+ )}'`,+ 'error',+ true+ );+ return false;+ // dispatch stopLoadingAnimation+ });+ }, [currentDirectoryEntries]);++ const deleteEntries = useMemo(() => {+ return (entries: TS.FileSystemEntry[]) => {+ const deletePromises = entries.map(fsEntry => {+ if (fsEntry.isFile) {+ return deleteFile(fsEntry.path, fsEntry.uuid, false);+ }+ return deleteDirectory(fsEntry.path, false);+ });+ return Promise.all(deletePromises)+ .then(delResult => {+ const notDeletedEntries = [];+ for (let i = 0; i < delResult.length; i++) {+ const entry = entries[i];+ if (delResult[i]) {+ // reflect opened entry+ if (entry.isFile) {+ reflectDeleteFile(entry.path);+ } else {+ reflectDeleteDirectory(entry.path);+ }+ } else {+ notDeletedEntries.push(entry);+ }+ }+ removeDirectoryEntries(+ entries+ .filter(e => !notDeletedEntries.some(n => n.path === e.path))+ .map(e => e.path)+ );+ setSelectedEntries(notDeletedEntries);+ return true;+ })+ .catch(err => {+ console.warn('Deleting file failed', err);+ return false;+ });+ };+ }, [currentDirectoryEntries]);++ const deleteDirectory = useMemo(() => {+ return (directoryPath: string, reflect = true) =>+ PlatformIO.deleteDirectoryPromise(directoryPath, useTrashCan)+ .then(() => {+ if (reflect) {+ if (directoryPath === currentDirectoryPath) {+ loadParentDirectoryContent();+ // close opened entries in deleted dir+ reflectDeleteDirectory(directoryPath);+ } else {+ removeDirectoryEntries([directoryPath]);+ dispatch(AppActions.reflectDeleteEntry(directoryPath));+ }+ }+ // change index+ reflectDeleteEntry(directoryPath);+ showNotification(+ t(+ 'deletingDirectorySuccessfull' as any,+ {+ dirPath: extractDirectoryName(+ directoryPath,+ PlatformIO.getDirSeparator()+ )+ } as any+ ) as string,+ 'default',+ true+ );+ return true;+ })+ .catch(error => {+ console.warn('Error while deleting directory: ' + error);+ showNotification(+ t(+ 'errorDeletingDirectoryAlert' as any,+ {+ dirPath: extractDirectoryName(+ directoryPath,+ PlatformIO.getDirSeparator()+ )+ } as any+ ) as string,+ 'error',+ true+ );+ return false;+ // dispatch stopLoadingAnimation+ });+ }, [currentDirectoryEntries, useTrashCan]);++ const deleteFile = useMemo(() => {+ return (filePath: string, uuid: string, reflect = true) =>+ PlatformIO.deleteFilePromise(filePath, useTrashCan)+ .then(() => {+ if (reflect) {+ // close file opener if this file is opened+ reflectDeleteFile(filePath);+ dispatch(AppActions.reflectDeleteEntry(filePath));+ }+ // change index+ reflectDeleteEntry(filePath);+ showNotification(+ `Deleting file ${filePath} successful.`,+ 'default',+ true+ );+ // Delete revisions+ const backupFilePath = getBackupFileLocation(+ filePath,+ uuid,+ PlatformIO.getDirSeparator()+ );+ const backupPath = extractContainingDirectoryPath(+ backupFilePath,+ PlatformIO.getDirSeparator()+ );+ PlatformIO.deleteDirectoryPromise(backupPath)+ .then(() => {+ console.log('Cleaning revisions successful for ' + filePath);+ return true;+ })+ .catch(err => {+ console.warn('Cleaning revisions failed ', err);+ });+ // Delete sidecar file and thumb+ deleteFilesPromise([+ getMetaFileLocationForFile(filePath, PlatformIO.getDirSeparator()),+ getThumbFileLocationForFile(+ filePath,+ PlatformIO.getDirSeparator(),+ false+ )+ ])+ .then(() => {+ console.log(+ 'Cleaning meta file and thumb successful for ' + filePath+ );+ return true;+ })+ .catch(err => {+ console.warn('Cleaning meta file and thumb failed with ' + err);+ });+ return true;+ })+ .catch(error => {+ console.warn('Error while deleting file: ' + error);+ showNotification(+ `Error while deleting file ${filePath}`,+ 'error',+ true+ );+ return false;+ });+ }, [currentDirectoryEntries, useTrashCan]);+function moveDirs(dirPaths: Array<any>,targetPath: string,@@ -768,6 +980,10 @@ export const IOActionsContextProvider = ({const context = useMemo(() => {return {extractContent,+ createDirectory,+ deleteEntries,+ deleteDirectory,+ deleteFile,moveDirs,moveFiles,copyDirs,diff --git a/app/hooks/OpenedEntryContextProvider.tsx b/app/hooks/OpenedEntryContextProvider.tsxindex 5a880aace..38016f78b 100644--- a/app/hooks/OpenedEntryContextProvider.tsx+++ b/app/hooks/OpenedEntryContextProvider.tsx@@ -34,7 +34,6 @@ import { Pro } from '-/pro';import { TS } from '-/tagspaces.namespace';import PlatformIO from '-/services/platform-facade';import {- enhanceOpenedEntry,findExtensionsForEntry,getAllPropertiesPromise,getCleanLocationPath,@@ -42,7 +41,6 @@ import {getPrevFile,getRelativeEntryPath,loadJSONFile,- openedToFsEntry,openURLExternally,toFsEntry} from '-/services/utils-io';@@ -105,6 +103,7 @@ type OpenedEntryContextData = {createFile: () => void;reflectRenameDirectory: (directoryPath: string, newDirPath: string) => void;reflectDeleteDirectory: (directoryPath: string) => void;+ reflectDeleteFile: (filePath: string) => void;};export const OpenedEntryContext = createContext<OpenedEntryContextData>({@@ -127,7 +126,8 @@ export const OpenedEntryContext = createContext<OpenedEntryContextData>({createFile: () => {},createFileAdvanced: () => {},reflectRenameDirectory: () => {},- reflectDeleteDirectory: () => {}+ reflectDeleteDirectory: undefined,+ reflectDeleteFile: undefined});export type OpenedEntryContextProviderProps = {@@ -144,9 +144,7 @@ export const OpenedEntryContextProvider = ({currentDirectoryEntries,currentDirectoryPath,openDirectory,- setCurrentDirectoryColor,- setCurrentDirectoryPerspective,- updateCurrentDirEntry+ addDirectoryEntries} = useDirectoryContentContext();const { selectedEntries, setSelectedEntries } = useSelectedEntriesContext();@@ -172,7 +170,7 @@ export const OpenedEntryContextProvider = ({const [isEntryInFullWidth, setEntryInFullWidth] = useState(false);const sharingLink = useRef<string>(undefined);const sharingParentFolderLink = useRef<string>(undefined);- const havePrevOpenedFile = React.useRef<boolean>(false);+ //const havePrevOpenedFile = React.useRef<boolean>(false);const firstRender = useFirstRender();/**@@ -278,7 +276,7 @@ export const OpenedEntryContextProvider = ({setSharedLinks(newEntries[0]);setOpenedEntries(newEntries);}- } else if (action === 'delete') {+ } /*else if (action === 'delete') {const filePath = editedEntryPaths[0].path;if (openedEntries &&@@ -287,7 +285,7 @@ export const OpenedEntryContextProvider = ({) {closeAllFiles();}- }+ }*/}}, [editedEntryPaths]);@@ -926,11 +924,11 @@ export const OpenedEntryContextProvider = ({}PlatformIO.saveFilePromise({ path: filePath }, fileContent, false).then((fsEntry: TS.FileSystemEntry) => {- reflectCreateEntry(toFsEntry(filePath, true));+ addDirectoryEntries([fsEntry]);+ reflectCreateEntry(fsEntry); // toFsEntry(filePath, true);dispatch(AppActions.reflectCreateEntry(filePath, true));openFsEntry(fsEntry);-- // dispatch(actions.setSelectedEntries([fsEntry]));+ setSelectedEntries([fsEntry]);showNotification(`File '${fileNameAndExt}' created.`, 'default', true);return true;})@@ -970,6 +968,16 @@ export const OpenedEntryContextProvider = ({}}+ function reflectDeleteFile(filePath) {+ if (+ openedEntries &&+ openedEntries.length > 0 &&+ openedEntries.some(file => file.path === filePath)+ ) {+ closeAllFiles();+ }+ }+const context = useMemo(() => {return {openedEntries,@@ -991,7 +999,8 @@ export const OpenedEntryContextProvider = ({createFile,createFileAdvanced,reflectRenameDirectory,- reflectDeleteDirectory+ reflectDeleteDirectory,+ reflectDeleteFile};}, [openedEntries,diff --git a/app/locales/en/core.json b/app/locales/en/core.jsonindex ac3e3698d..eee38f05f 100644--- a/app/locales/en/core.json+++ b/app/locales/en/core.json@@ -40,6 +40,7 @@"deleteDirectoryContentConfirm": "Do you want to delete the folder '{{dirPath}}' ?","errorDeletingDirectoryAlert": "Deleting '{{dirPath}}' failed. Folder probably not empty.","deletingDirectorySuccessfull": "Folder '{{dirPath}}' successfully deleted.",+ "deletingEntriesSuccessful": "Entries '{{dirPath}}' successfully deleted.","filePropertiesDescription": "Description","directoryPropertiesTitle": "Folder Details","filePropertiesTitle": "File Details",diff --git a/tests/e2e/fileopener.pw.e2e.js b/tests/e2e/fileopener.pw.e2e.jsindex 9bd53545c..7ec45286b 100644--- a/tests/e2e/fileopener.pw.e2e.js+++ b/tests/e2e/fileopener.pw.e2e.js@@ -180,6 +180,7 @@ test.describe('TST08 - File folder properties', () => {: [propsNewFileName + '.json', propsNewFileName + '.jpg']; // check meta and thumbnail renamedawait expectMetaFilesExist(arrayMeta);+ await setSettings('[data-tid=settingsSetPersistTagsInSidecarFile]', true);//turn fileName back/*await clickOn('[data-tid=startRenameEntryTID]');await setInputValue('[data-tid=fileNameProperties] input', propsFileName);@@ -212,6 +213,7 @@ test.describe('TST08 - File folder properties', () => {//Toggle Propertiesawait clickOn('[data-tid=detailsTabTID]');await AddRemovePropertiesTags(['test-tag1', 'test-tag2']);+ await setSettings('[data-tid=settingsSetPersistTagsInSidecarFile]', true);});test('TST0810 - Tag file drag&drop in file opener [web,minio,electron]', async () => {@@ -343,6 +345,7 @@ test.describe('TST08 - File folder properties', () => {await expectElementExist(getGridFileSelector(fileName), false, 5000);await expectMetaFilesExist(arrayMeta, false);+ await setSettings('[data-tid=settingsSetPersistTagsInSidecarFile]', true);});test('TST0813a - Delete file and check revisions deleted [web,minio,electron,_pro]', async () => {diff --git a/tests/e2e/general.helpers.js b/tests/e2e/general.helpers.jsindex 360ed89a0..de96c9fee 100644--- a/tests/e2e/general.helpers.js+++ b/tests/e2e/general.helpers.js@@ -84,7 +84,7 @@ export async function setInputValue(selector, value) {* @param delay* @returns {Promise<*>}*/-export async function setInputKeys(tid, value, delay = 50) {+export async function setInputKeys(tid, value, delay = 0) {// global.client.keyboard.type('[data-tid=' + tid + '] input', value, { delay: 100 });const oldValue = await global.client.inputValue('[data-tid=' + tid + '] input'@@ -102,7 +102,7 @@ export async function setInputKeys(tid, value, delay = 50) {* @param delay* @returns {Promise<*>} oldValue*/-export async function typeInputValue(inputSelector, value, delay = 50) {+export async function typeInputValue(inputSelector, value, delay = 0) {const oldValue = await global.client.inputValue(inputSelector);await global.client.type(inputSelector, value, {delay