TagSpaces is an offline, open source, document manager with tagging support
save tab name instead of index in redux (#2218)
Stanimir4d57d4db995e
diff --git a/release/app/package-lock.json b/release/app/package-lock.jsonindex 1472740ea..a9d41477a 100644--- a/release/app/package-lock.json+++ b/release/app/package-lock.json@@ -1,12 +1,12 @@{"name": "tagspaces",- "version": "6.1.1",+ "version": "6.1.2","lockfileVersion": 2,"requires": true,"packages": {"": {"name": "tagspaces",- "version": "6.1.1",+ "version": "6.1.2","hasInstallScript": true,"license": "AGPL-3.0","dependencies": {diff --git a/src/renderer/components/EntryContainerTabs.tsx b/src/renderer/components/EntryContainerTabs.tsxindex 713e6752d..667fc0203 100644--- a/src/renderer/components/EntryContainerTabs.tsx+++ b/src/renderer/components/EntryContainerTabs.tsx@@ -130,14 +130,13 @@ function EntryContainerTabs(props: EntryContainerTabsProps) {const { openPanel, toggleProperties, marginRight, isPanelOpened } = props;const { t } = useTranslation();- const { findLocation } = useCurrentLocationContext();const { initHistory } = useChatContext();- //const { findLocation } = useCurrentLocationContext();const { getTabsArray } = useEntryPropsTabsContext();const { openedEntry } = useOpenedEntryContext();const theme = useTheme();- const devMode: boolean = useSelector(isDevMode);- const tabIndex = useSelector(getEntryContainerTab);+ //const devMode: boolean = useSelector(isDevMode);+ const selectedTab: (typeof TabNames)[keyof typeof TabNames] =+ useSelector(getEntryContainerTab);const tileServer = useSelector(getMapTileServer);const tabsArray = useRef<TabItem[]>([]);const dispatch: AppDispatch = useDispatch();@@ -154,10 +153,10 @@ function EntryContainerTabs(props: EntryContainerTabsProps) {const handleChange = (event: React.SyntheticEvent, newValue: number) => {if (tabsArray.current.length > 0) {const tab = tabsArray.current[newValue];- if (tab && tab.name === 'aiTab') {+ if (tab && tab.name === TabNames.aiTab) {initHistory();}- dispatch(SettingsActions.setEntryContainerTab(newValue));+ dispatch(SettingsActions.setEntryContainerTab(tab.name));openPanel();console.log('tab changed to:' + newValue);}@@ -179,14 +178,15 @@ function EntryContainerTabs(props: EntryContainerTabsProps) {if (!isPanelOpened) {return undefined;}- if (!tabIndex || tabIndex === -1) {+ if (selectedTab === undefined) {return 0;}- const maxTabIndex = tabsArray.current.length - 1;+ return tabsArray.current.findIndex((tab) => tab.name === selectedTab);+ /*const maxTabIndex = tabsArray.current.length - 1;if (tabIndex > maxTabIndex) {return maxTabIndex;}- return tabIndex;+ return tabIndex;*/}const selectedTabIndex = getSelectedTabIndex();diff --git a/src/renderer/components/chat/AiGenDescButton.tsx b/src/renderer/components/chat/AiGenDescButton.tsxindex 13161575f..88e814156 100644--- a/src/renderer/components/chat/AiGenDescButton.tsx+++ b/src/renderer/components/chat/AiGenDescButton.tsx@@ -20,7 +20,6 @@ import AppConfig from '-/AppConfig';import TsButton, { TSButtonProps } from '-/components/TsButton';import { TabNames } from '-/hooks/EntryPropsTabsContextProvider';import { useChatContext } from '-/hooks/useChatContext';-import { useEntryPropsTabsContext } from '-/hooks/useEntryPropsTabsContext';import { useFilePropertiesContext } from '-/hooks/useFilePropertiesContext';import { useNotificationContext } from '-/hooks/useNotificationContext';import { useOpenedEntryContext } from '-/hooks/useOpenedEntryContext';@@ -29,13 +28,16 @@ import { extractFileExtension } from '@tagspaces/tagspaces-common/paths';import { useState } from 'react';import { useTranslation } from 'react-i18next';import { AIIcon } from '../CommonIcons';+import { actions as SettingsActions } from '-/reducers/settings';+import { AppDispatch } from '-/reducers/app';+import { useDispatch } from 'react-redux';type Props = TSButtonProps & {};function AiGenDescButton(props: Props) {const { t } = useTranslation();const { style, disabled } = props;- const { setOpenedTab } = useEntryPropsTabsContext();+ const dispatch: AppDispatch = useDispatch();const { openedEntry } = useOpenedEntryContext();const { generate, openedEntryModel } = useChatContext();const { setDescription, saveDescription } = useFilePropertiesContext();@@ -60,7 +62,7 @@ function AiGenDescButton(props: Props) {//console.log('newOllamaMessage response:' + response);setIsLoading(false);if (response) {- setOpenedTab(TabNames.descriptionTab, openedEntry);+ dispatch(SettingsActions.setEntryContainerTab(TabNames.descriptionTab));response =response +'\\\n *Generated with AI on ' +diff --git a/src/renderer/components/chat/AiGenTagsButton.tsx b/src/renderer/components/chat/AiGenTagsButton.tsxindex b2acb5610..4bb4d2ed9 100644--- a/src/renderer/components/chat/AiGenTagsButton.tsx+++ b/src/renderer/components/chat/AiGenTagsButton.tsx@@ -21,7 +21,7 @@ import TsButton, { TSButtonProps } from '-/components/TsButton';import { AIProvider } from '-/components/chat/ChatTypes';import { TabNames } from '-/hooks/EntryPropsTabsContextProvider';import { useChatContext } from '-/hooks/useChatContext';-import { useEntryPropsTabsContext } from '-/hooks/useEntryPropsTabsContext';+import { actions as SettingsActions } from '-/reducers/settings';import { useNotificationContext } from '-/hooks/useNotificationContext';import { useOpenedEntryContext } from '-/hooks/useOpenedEntryContext';import { useTaggingActionsContext } from '-/hooks/useTaggingActionsContext';@@ -32,8 +32,9 @@ import { OverridableStringUnion } from '@mui/types';import { extractFileExtension } from '@tagspaces/tagspaces-common/paths';import { useState } from 'react';import { useTranslation } from 'react-i18next';-import { useSelector } from 'react-redux';+import { useDispatch, useSelector } from 'react-redux';import { AIIcon } from '../CommonIcons';+import { AppDispatch } from '-/reducers/app';type Props = TSButtonProps & {variant?: OverridableStringUnion<@@ -46,7 +47,7 @@ type Props = TSButtonProps & {function AiGenTagsButton(props: Props) {const { fromDescription, variant, style, disabled } = props;const { t } = useTranslation();- const { setOpenedTab } = useEntryPropsTabsContext();+ const dispatch: AppDispatch = useDispatch();const { openedEntry } = useOpenedEntryContext();const defaultAiProvider: AIProvider = useSelector(getDefaultAIProvider);const { generate, openedEntryModel, newChatMessage } = useChatContext();@@ -79,7 +80,9 @@ function AiGenTagsButton(props: Props) {type: 'sidecar',}));addTagsToFsEntry(openedEntry, tags).then(() =>- setOpenedTab(TabNames.propertiesTab, openedEntry),+ dispatch(+ SettingsActions.setEntryContainerTab(TabNames.propertiesTab),+ ),);showNotification('Tags for ' + openedEntry.name + ' generated by an AI.',diff --git a/src/renderer/hooks/EntryPropsTabsContextProvider.tsx b/src/renderer/hooks/EntryPropsTabsContextProvider.tsxindex fc116de8a..ea73268c7 100644--- a/src/renderer/hooks/EntryPropsTabsContextProvider.tsx+++ b/src/renderer/hooks/EntryPropsTabsContextProvider.tsx@@ -40,7 +40,7 @@ export type TabItem = {//dataTid: string;icon: React.ReactNode;title: string;- name: string;+ name: (typeof TabNames)[keyof typeof TabNames];};export const TabNames = {@@ -54,10 +54,10 @@ export const TabNames = {type EntryPropsTabsContextData = {getTabsArray: (openedEntry: TS.OpenedEntry) => Promise<TabItem[]>;isEditable: (openedEntry: TS.OpenedEntry) => boolean;- setOpenedTab: (+ /*setOpenedTab: (tabName: (typeof TabNames)[keyof typeof TabNames],openedEntry: TS.OpenedEntry,- ) => Promise<number>;+ ) => Promise<number>;*/isTabOpened: (tabName: (typeof TabNames)[keyof typeof TabNames],openedEntry: TS.OpenedEntry,@@ -68,7 +68,7 @@ type EntryPropsTabsContextData = {export const EntryPropsTabsContext = createContext<EntryPropsTabsContextData>({getTabsArray: undefined,isEditable: undefined,- setOpenedTab: undefined,+ //setOpenedTab: undefined,isTabOpened: undefined,});@@ -174,7 +174,7 @@ export const EntryPropsTabsContextProvider = ({* @param openedEntry* return tabIndex or -1 if not tab exist with tabName*/- async function setOpenedTab(+ /*async function setOpenedTab(tabName: (typeof TabNames)[keyof typeof TabNames],openedEntry: TS.OpenedEntry,): Promise<number> {@@ -186,7 +186,7 @@ export const EntryPropsTabsContextProvider = ({console.log('no tab with name:' + tabName + ' exist!');}return tabIndex;- }+ }*/async function isTabOpened(tabName: (typeof TabNames)[keyof typeof TabNames],@@ -205,7 +205,7 @@ export const EntryPropsTabsContextProvider = ({return {getTabsArray,isEditable,- setOpenedTab,+ //setOpenedTab,isTabOpened,};}, []);diff --git a/src/renderer/hooks/OpenedEntryContextProvider.tsx b/src/renderer/hooks/OpenedEntryContextProvider.tsxindex f166a7cd1..ac07243d0 100644--- a/src/renderer/hooks/OpenedEntryContextProvider.tsx+++ b/src/renderer/hooks/OpenedEntryContextProvider.tsx@@ -72,6 +72,7 @@ import { useIOActionsContext } from '-/hooks/useIOActionsContext';import ConfirmDialog from '-/components/dialogs/ConfirmDialog';import { extractPDFcontent } from '-/services/thumbsgenerator';import { useEntryPropsTabsContext } from '-/hooks/useEntryPropsTabsContext';+import { TabNames } from '-/hooks/EntryPropsTabsContextProvider';type OpenedEntryContextData = {openedEntry: TS.OpenedEntry;@@ -92,7 +93,7 @@ type OpenedEntryContextData = {openEntry: (path?: string, tabSelected?: string) => Promise<boolean>;openFsEntry: (fsEntry?: TS.FileSystemEntry,- tabSelected?: string,+ tabSelected?: (typeof TabNames)[keyof typeof TabNames],) => Promise<boolean>;openEntryInternal: (fsEntry: TS.FileSystemEntry,@@ -170,7 +171,6 @@ export const OpenedEntryContextProvider = ({const { selectedEntries, setSelectedEntries } = useSelectedEntriesContext();const { showNotification } = useNotificationContext();const { actions } = useEditedEntryContext();- const { setOpenedTab } = useEntryPropsTabsContext();const { metaActions } = useEditedEntryMetaContext();const { saveFilePromise } = usePlatformFacadeContext();const { setEditMode } = useFilePropertiesContext();@@ -572,7 +572,7 @@ export const OpenedEntryContextProvider = ({async function openFsEntry(fsEntry?: TS.FileSystemEntry,- tabSelected: string = undefined,+ tabSelected: (typeof TabNames)[keyof typeof TabNames] = undefined,): Promise<boolean> {if (!fsEntry) {if (selectedEntries && selectedEntries.length > 0) {@@ -648,7 +648,8 @@ export const OpenedEntryContextProvider = ({addToEntryContainer(entryForOpening);if (tabSelected !== undefined) {- setOpenedTab(tabSelected, entryForOpening);+ dispatch(SettingsActions.setEntryContainerTab(tabSelected));+ //setOpenedTab(tabSelected, entryForOpening);//dispatch(SettingsActions.setShowDetails(tabSelected));}if (diff --git a/src/renderer/reducers/settings.ts b/src/renderer/reducers/settings.tsindex 6edb5ec57..102f89d0a 100644--- a/src/renderer/reducers/settings.ts+++ b/src/renderer/reducers/settings.ts@@ -33,6 +33,7 @@ import {updateByProp,} from '-/services/utils-io';import { AIProvider } from '-/components/chat/ChatTypes';+import { TabNames } from '-/hooks/EntryPropsTabsContextProvider';export const types = {UPGRADE_SETTINGS: 'SETTINGS/UPGRADE_SETTINGS',@@ -623,9 +624,11 @@ export const actions = {toggleShowUnixHiddenEntries: () => ({type: types.TOGGLE_SHOWUNIXHIDDENENTRIES,}),- setEntryContainerTab: (tabIndex: number) => ({+ setEntryContainerTab: (+ tabName: (typeof TabNames)[keyof typeof TabNames],+ ) => ({type: types.SET_ENTRY_CONTAINER_TAB,- entryContainerTab: tabIndex,+ entryContainerTab: tabName,}),/* setShowDetails: (showDetails: boolean) => ({type: types.SET_SHOW_DETAILS,diff --git a/src/renderer/services/utils-io.ts b/src/renderer/services/utils-io.tsindex 8e932ae7f..1bb14a906 100644--- a/src/renderer/services/utils-io.ts+++ b/src/renderer/services/utils-io.ts@@ -205,7 +205,7 @@ export function getNextFile(// eslint-disable-next-line prefer-destructuringnextFile = currentEntries[0];}- return nextFile;+ return { ...nextFile, meta: { ...nextFile.meta, id: undefined } };}export function getPrevFile(@@ -241,7 +241,7 @@ export function getPrevFile(// eslint-disable-next-line prefer-destructuringprevFile = currentEntries[0];}- return prevFile;+ return { ...prevFile, meta: { ...prevFile.meta, id: undefined } };}export function saveAsTextFile(blob: any, filename: string) {