TagSpaces is an offline, open source, document manager with tagging support
fix: issue with creating files, by no opened location
Ilian Sapundshievc437513ec09c
diff --git a/app/components/dialogs/CreateDialog.tsx b/app/components/dialogs/CreateDialog.tsxindex 869d1993c..aa20b0656 100644--- a/app/components/dialogs/CreateDialog.tsx+++ b/app/components/dialogs/CreateDialog.tsx@@ -35,6 +35,7 @@ import Dialog from '@mui/material/Dialog';import { Progress } from 'aws-sdk/clients/s3';import { formatDateTime4Tag } from '@tagspaces/tagspaces-platforms/misc';import AppConfig from '@tagspaces/tagspaces-platforms/AppConfig';+import { extractContainingDirectoryPath } from '@tagspaces/tagspaces-platforms/paths';import i18n from '-/services/i18n';import { getKeyBindingObject } from '-/reducers/settings';import {@@ -43,8 +44,13 @@ import {getSelectedEntries} from '-/reducers/app';import IOActions from '-/reducers/io-actions';-import { getLocations, getFirstRWLocation } from '-/reducers/locations';+import {+ getLocations,+ getFirstRWLocation,+ getCurrentLocation+} from '-/reducers/locations';import { TS } from '-/tagspaces.namespace';+import PlatformIO from '-/services/platform-facade';import DialogCloseButton from '-/components/dialogs/DialogCloseButton';import Spacer from '-/components/Spacer';import useTheme from '@mui/styles/useTheme';@@ -53,6 +59,7 @@ import TextField from '@mui/material/TextField';import FormHelperText from '@mui/material/FormHelperText';import { FormControl } from '@mui/material';import { fileNameValidation } from '-/services/utils-io';+import { PerspectiveIDs } from '-/perspectives';const styles: any = () => ({createButton: {@@ -66,8 +73,9 @@ const styles: any = () => ({interface Props {open: boolean;classes: any;- locations: Array<TS.Location>;+ // locations: Array<TS.Location>;firstRWLocation: TS.Location;+ currentLocation: TS.Location;selectedEntries: Array<TS.FileSystemEntry>;currentDirectoryPath: string | null;openLocation: (location: TS.Location) => void;@@ -101,6 +109,7 @@ function CreateDialog(props: Props) {openLocation,currentDirectoryPath,selectedEntries,+ currentLocation,// locations,showNotification,firstRWLocation@@ -116,16 +125,24 @@ function CreateDialog(props: Props) {let fileInput: HTMLInputElement;const fileContent = '';- let selectedDirectoryPath =- selectedEntries && selectedEntries.length === 1- ? selectedEntries[0].path- : currentDirectoryPath;+ let targetDirectoryPath = currentDirectoryPath;+ if (+ currentLocation &&+ currentLocation.perspective === PerspectiveIDs.KANBAN &&+ selectedEntries &&+ selectedEntries.length === 1+ ) {+ targetDirectoryPath = extractContainingDirectoryPath(+ selectedEntries[0].path,+ PlatformIO.getDirSeparator()+ );+ }- if (!selectedDirectoryPath && firstRWLocation) {- selectedDirectoryPath = firstRWLocation.path;+ if (!targetDirectoryPath && firstRWLocation) {+ targetDirectoryPath = firstRWLocation.path;}- const noSuitableLocation = !selectedDirectoryPath;+ const noSuitableLocation = !targetDirectoryPath;// function handleKeyPress(event: any) {// if (event.key === 'n') {@@ -150,10 +167,10 @@ function CreateDialog(props: Props) {}function createRichTextFile() {- if (selectedDirectoryPath && !fileNameValidation(fileName.current)) {+ if (targetDirectoryPath && !fileNameValidation(fileName.current)) {loadLocation();createFileAdvanced(- selectedDirectoryPath,+ targetDirectoryPath,fileName.current,fileContent,'html'@@ -163,10 +180,10 @@ function CreateDialog(props: Props) {}function createTextFile() {- if (selectedDirectoryPath && !fileNameValidation(fileName.current)) {+ if (targetDirectoryPath && !fileNameValidation(fileName.current)) {loadLocation();createFileAdvanced(- selectedDirectoryPath,+ targetDirectoryPath,fileName.current,fileContent,'txt'@@ -176,10 +193,10 @@ function CreateDialog(props: Props) {}function createMarkdownFile() {- if (selectedDirectoryPath && !fileNameValidation(fileName.current)) {+ if (targetDirectoryPath && !fileNameValidation(fileName.current)) {loadLocation();createFileAdvanced(- selectedDirectoryPath,+ targetDirectoryPath,fileName.current,fileContent,'md'@@ -201,7 +218,7 @@ function CreateDialog(props: Props) {props.uploadFilesAPI(Array.from(selection.currentTarget.files),- selectedDirectoryPath,+ targetDirectoryPath,props.onUploadProgress).then(fsEntries => {@@ -308,9 +325,7 @@ function CreateDialog(props: Props) {disabled={noSuitableLocation}fullWidth={true}data-tid="newEntryDialogInputTID"- helperText={- 'File will be created in : ' + selectedDirectoryPath- }+ helperText={'File will be created in : ' + targetDirectoryPath}/>{inputError && (<FormHelperText>{i18n.t('core:fileNameHelp')}</FormHelperText>@@ -427,11 +442,12 @@ function CreateDialog(props: Props) {function mapStateToProps(state) {return {- locations: getLocations(state),+ // locations: getLocations(state),firstRWLocation: getFirstRWLocation(state),keyBindings: getKeyBindingObject(state),selectedEntries: getSelectedEntries(state),- currentDirectoryPath: getDirectoryPath(state)+ currentDirectoryPath: getDirectoryPath(state),+ currentLocation: getCurrentLocation(state)};}diff --git a/app/reducers/app.ts b/app/reducers/app.tsindex f69128b15..1464e7b92 100644--- a/app/reducers/app.ts+++ b/app/reducers/app.ts@@ -1797,6 +1797,7 @@ export const actions = {dispatch(actions.setCurrentLocationId(null));dispatch(actions.clearDirectoryContent());dispatch(LocationIndexActions.clearDirectoryIndex());+ dispatch(actions.setSelectedEntries([]));if (Pro && Pro.Watcher) {Pro.Watcher.stopWatching();}@@ -1811,6 +1812,7 @@ export const actions = {dispatch(actions.setCurrentLocationId(null));dispatch(actions.clearDirectoryContent());dispatch(LocationIndexActions.clearDirectoryIndex());+ dispatch(actions.setSelectedEntries([]));if (Pro && Pro.Watcher) {Pro.Watcher.stopWatching();}diff --git a/app/reducers/locations.ts b/app/reducers/locations.tsindex 1d8db4871..d95050695 100644--- a/app/reducers/locations.ts+++ b/app/reducers/locations.ts@@ -290,6 +290,12 @@ export const getDefaultLocationId = (state: any): string | undefined => {);return foundLocation ? foundLocation.uuid : undefined;};+export const getCurrentLocation = (state: any): string | undefined => {+ let foundLocation = state.locations.find(+ location => location.uuid === state.app.currentLocationId+ );+ return foundLocation ? foundLocation.uuid : undefined;+};export const getFirstRWLocation = (state: any): string | undefined => {let foundLocation = state.locations.find(location => location.isDefault && !location.isReadOnly