TagSpaces is an offline, open source, document manager with tagging support
fix load directory with default perspective from KanBan (#1948)
Stanimir5f61c9e6e82f
diff --git a/app/components/FolderContainer.tsx b/app/components/FolderContainer.tsxindex 6c5636ca7..9657189c2 100644--- a/app/components/FolderContainer.tsx+++ b/app/components/FolderContainer.tsx@@ -70,7 +70,7 @@ import {} from '-/reducers/location-index';import { PerspectiveIDs, AvailablePerspectives } from '-/perspectives';import MainSearchField from '-/components/MainSearchField';-import LoadingAnimation from '-/components/LoadingAnimation';+// import LoadingAnimation from '-/components/LoadingAnimation';import SearchBox from '-/components/SearchBox';import useFirstRender from '-/utils/useFirstRender';@@ -634,7 +634,7 @@ function FolderContainer(props: Props) {width: '100%'}}>- <LoadingAnimation />+ {/*<LoadingAnimation />*/}{renderPerspective()}{isRenameEntryDialogOpened && (<RenameEntryDialogdiff --git a/app/reducers/app.ts b/app/reducers/app.tsindex 75f1ca822..83c6718fc 100644--- a/app/reducers/app.ts+++ b/app/reducers/app.ts@@ -388,7 +388,7 @@ export default (state: any = initialState, action: any) => {currentDirectoryPerspective:action.directoryMeta && action.directoryMeta.perspective? action.directoryMeta.perspective- : state.currentDirectoryPerspective,+ : action.defaultPerspective, // state.currentDirectoryPerspective,currentDirectoryPath: directoryPath,/*** used for reorder files in KanBan@@ -1515,7 +1515,7 @@ export const actions = {directoryPath: string,directoryContent: Array<any>,directoryMeta?: TS.FileSystemEntryMeta- ) => (dispatch: (action) => void) => {+ ) => (dispatch: (action) => void, getState: () => any) => {// const currentLocation: Location = getLocation(// getState(),// getState().app.currentLocationId@@ -1537,13 +1537,15 @@ export const actions = {dispatch(actions.setSelectedEntries(newSelectedEntries));}} */+ const { settings } = getState();dispatch(actions.hideNotifications(['error']));dispatch(actions.loadDirectorySuccessInt(directoryPath,directoryContent,false,- directoryMeta+ directoryMeta,+ settings.defaultPerspective));dispatch(actions.setIsMetaLoaded(false));@@ -1552,13 +1554,15 @@ export const actions = {directoryPath: string,directoryContent: Array<any>,showIsLoading?: boolean,- directoryMeta?: TS.FileSystemEntryMeta+ directoryMeta?: TS.FileSystemEntryMeta,+ defaultPerspective?: string) => ({type: types.LOAD_DIRECTORY_SUCCESS,directoryPath: directoryPath || PlatformIO.getDirSeparator(),directoryContent,directoryMeta,- showIsLoading+ showIsLoading,+ defaultPerspective}),setDirectoryMeta: (directoryMeta: TS.FileSystemEntryMeta) => ({type: types.SET_DIRECTORY_META,diff --git a/package.json b/package.jsonindex 800fb0091..25c025e2c 100644--- a/package.json+++ b/package.json@@ -112,7 +112,7 @@"skip:husky:pre-commit": "node -e \"require('fs').rename('./.git/hooks/pre-commit', './.git/hooks/pre-commit.disabled', function(err) { if (err) console.log(err); console.log('File successfully renamed!') })\"","sort-package-json": "npx sort-package-json","source-map": "npm run source-map-app && npm run source-map-web && npm run source-map-cordova",- "source-map-app": "source-map-explorer app/dist/*.* --html reports/source-map-app.html",+ "source-map-app": "npx source-map-explorer app/dist/*.* --html reports/source-map-app.html","source-map-cordova": "source-map-explorer cordova/www/dist/*.* --html reports/source-map-cordova.html","source-map-web": "source-map-explorer web/dist/*.* --html reports/source-map-web.html","start": "cross-env NODE_ENV=production electron ./app/",