TagSpaces is an offline, open source, document manager with tagging support
TSN619 - Navigation from location manager subfolders in Minio locatio… (#1384)
Stanimire0376030b2b5
diff --git a/app/components/DirectoryTreeView.tsx b/app/components/DirectoryTreeView.tsxindex 1d573ba1b..45c3de029 100644--- a/app/components/DirectoryTreeView.tsx+++ b/app/components/DirectoryTreeView.tsx@@ -194,6 +194,7 @@ const DirectoryTreeView = forwardRef(...(location.accessKeyId && { accessKeyId: location.accessKeyId }),...(location.bucketName && { bucketName: location.bucketName }),...(location.region && { region: location.region }),+ ...(location.endpointURL && { endpointURL: location.endpointURL }),...(location.secretAccessKey && {secretAccessKey: location.secretAccessKey}),@@ -238,6 +239,7 @@ const DirectoryTreeView = forwardRef(accessKeyId?: string;bucketName?: string;region?: string;+ endpointURL?: string;secretAccessKey?: string;uuid: string;name: string;@@ -248,7 +250,7 @@ const DirectoryTreeView = forwardRef(const getDirectoriesTree = (subFolder: SubFolder, deepLevel: number) =>// const { settings } = getState();- PlatformIO.listDirectoryPromise(subFolder.path, false)+ PlatformIO.listDirectoryPromise(subFolder.path, true)// @ts-ignore.then(dirEntries => {const directoryContent = [];@@ -272,6 +274,9 @@ const DirectoryTreeView = forwardRef(if (subFolder.region) {entry.region = subFolder.region;}+ if (subFolder.endpointURL) {+ entry.endpointURL = subFolder.endpointURL;+ }if (subFolder.secretAccessKey) {entry.secretAccessKey = subFolder.secretAccessKey;}diff --git a/app/reducers/app.ts b/app/reducers/app.tsindex 675568528..91c8d4eb7 100644--- a/app/reducers/app.ts+++ b/app/reducers/app.ts@@ -943,11 +943,17 @@ export const actions = {});},loadDirectoryContent: (directoryPath: string) => (- dispatch: (actions: Object) => void+ dispatch: (actions: Object) => void,+ getState: () => any) => {console.time('listDirectoryPromise');window.walkCanceled = false;+ const state = getState();+ const { selectedEntries } = state.app;+ if (selectedEntries.length > 0) {+ dispatch(actions.setSelectedEntries([]));+ }loadMetaDataPromise(normalizePath(directoryPath) + PlatformIO.getDirSeparator())diff --git a/app/services/platform-io.ts b/app/services/platform-io.tsindex 0b4909ee1..650f88ef7 100644--- a/app/services/platform-io.ts+++ b/app/services/platform-io.ts@@ -39,6 +39,7 @@ export default class PlatformIO {objectStoreAPI.config.secretAccessKey ===objectStoreConfig.secretAccessKey &&objectStoreAPI.config.region === objectStoreConfig.region &&+ objectStoreAPI.config.endpointURL === objectStoreConfig.endpointURL &&objectStoreAPI.config.accessKeyId === objectStoreConfig.accessKeyId) {resolve();