TagSpaces is an offline, open source, document manager with tagging support
fix directory name in confirm dialog (#1103)
Stanimir2b342019d942
diff --git a/app/components/menus/DirectoryMenu.tsx b/app/components/menus/DirectoryMenu.tsxindex 6ec0b8e0d..3210ccf5f 100644--- a/app/components/menus/DirectoryMenu.tsx+++ b/app/components/menus/DirectoryMenu.tsx@@ -44,7 +44,11 @@ import CreateDirectoryDialog from '../dialogs/CreateDirectoryDialog';import RenameDirectoryDialog from '../dialogs/RenameDirectoryDialog';import AppConfig from '-/config';import i18n from '-/services/i18n';-import { extractFileName, normalizePath } from '-/utils/paths'; // extractFileExtension+import {+ extractFileName,+ normalizePath,+ cleanTrailingDirSeparator+} from '-/utils/paths'; // extractFileExtensionimport PlatformIO from '-/services/platform-io';import { formatDateTime4Tag } from '-/utils/misc';import { actions as AppActions } from '-/reducers/app';@@ -285,6 +289,13 @@ const DirectoryMenu = (props: Props) => {}}+ function getDirPath(dirPath: string) {+ const fileName = extractFileName(dirPath);+ return props.directoryPath && fileName+ ? fileName+ : cleanTrailingDirSeparator(props.directoryPath);+ }+return (<div style={{ overflowY: 'hidden' }}><RenameDirectoryDialog@@ -304,9 +315,7 @@ const DirectoryMenu = (props: Props) => {onClose={handleCloseDialogs}title={i18n.t('core:deleteDirectoryTitleConfirm')}content={i18n.t('core:deleteDirectoryContentConfirm', {- dirPath: props.directoryPath- ? extractFileName(props.directoryPath)- : ''+ dirPath: getDirPath(props.directoryPath)})}confirmCallback={result => {if (result) {diff --git a/app/utils/paths.ts b/app/utils/paths.tsindex 42ffafe24..2d735ecaf 100644--- a/app/utils/paths.ts+++ b/app/utils/paths.ts@@ -113,10 +113,12 @@ export function extractFileName(filePath: string,dirSeparator: string = AppConfig.dirSeparator): string {- return filePath.substring(- filePath.lastIndexOf(dirSeparator) + 1,- filePath.length- );+ return filePath+ ? filePath.substring(+ filePath.lastIndexOf(dirSeparator) + 1,+ filePath.length+ )+ : filePath;}export function cleanTrailingDirSeparator(dirPath: string): string {