Skip to content

TagSpaces is an offline, open source, document manager with tagging support

Entry props tabs refactoring (#2205)

Stanimir4ff6c425c141
diff --git a/release/app/package-lock.json b/release/app/package-lock.json
index f220becd1..a3e6c0d8d 100644
--- a/release/app/package-lock.json
+++ b/release/app/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "tagspaces",
- "version": "6.1.0",
+ "version": "6.1.1",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "tagspaces",
- "version": "6.1.0",
+ "version": "6.1.1",
"hasInstallScript": true,
"license": "AGPL-3.0",
"dependencies": {
diff --git a/scripts/extconfig-ai.js b/scripts/extconfig-ai.js
index ef72692e0..6743e6a73 100644
--- a/scripts/extconfig-ai.js
+++ b/scripts/extconfig-ai.js
@@ -27,6 +27,8 @@ window.ExtAI = {
id: 'internalTSEngineId3',
url: 'https://api.openai.com',
apiKey: 'blablabla',
+ defaultImageModel: 'chatGptInternalModelID',
+ defaultTextModel: 'chatGptInternalModelID',
enabled: false,
},*/
],
diff --git a/src/renderer/components/AiPropertiesTab.tsx b/src/renderer/components/AiPropertiesTab.tsx
index 03f5dee62..f4b34e20c 100644
--- a/src/renderer/components/AiPropertiesTab.tsx
+++ b/src/renderer/components/AiPropertiesTab.tsx
@@ -25,26 +25,16 @@ import AiGenDescButton from '-/components/chat/AiGenDescButton';
import AiGenTagsButton from '-/components/chat/AiGenTagsButton';
import { useSelector } from 'react-redux';
import { isDevMode } from '-/reducers/settings';
+import ChatView from '-/components/chat/ChatView';
interface Props {}
-const ChatView = React.lazy(
- () => import(/* webpackChunkName: "ChatView" */ './chat/ChatView'),
-);
-function ChatViewAsync(props) {
- return (
- <React.Suspense fallback={<LoadingLazy />}>
- <ChatView {...props} />
- </React.Suspense>
- );
-}
-
function AiPropertiesTab(props: Props) {
const { openedEntry } = useOpenedEntryContext();
const devMode: boolean = useSelector(isDevMode);
if (!devMode || !openedEntry.isFile) {
- return <ChatViewAsync />;
+ return <ChatView />;
}
return (
diff --git a/src/renderer/components/EntryContainer.tsx b/src/renderer/components/EntryContainer.tsx
index e048c5218..37af565f3 100644
--- a/src/renderer/components/EntryContainer.tsx
+++ b/src/renderer/components/EntryContainer.tsx
@@ -65,6 +65,7 @@ import { SaveIcon, EditIcon } from '-/components/CommonIcons';
import { useIOActionsContext } from '-/hooks/useIOActionsContext';
import { usePerspectiveActionsContext } from '-/hooks/usePerspectiveActionsContext';
import { useResolveConflictContext } from '-/components/dialogs/hooks/useResolveConflictContext';
+import { useEntryPropsTabsContext } from '-/hooks/useEntryPropsTabsContext';
function EntryContainer() {
const { t } = useTranslation();
@@ -78,15 +79,11 @@ function EntryContainer() {
setFileChanged,
} = useOpenedEntryContext();
const { setActions } = usePerspectiveActionsContext();
- const {
- saveDescription,
- description,
- isEditMode,
- setEditMode,
- isEditDescriptionMode,
- } = useFilePropertiesContext();
+ const { saveDescription, isEditMode, setEditMode, isEditDescriptionMode } =
+ useFilePropertiesContext();
const { setAutoSave } = useIOActionsContext();
- const { findLocation, readOnlyMode } = useCurrentLocationContext();
+ const { findLocation } = useCurrentLocationContext();
+ const { isEditable } = useEntryPropsTabsContext();
const { saveFileOpen } = useResolveConflictContext();
const { showNotification } = useNotificationContext();
@@ -102,7 +99,7 @@ function EntryContainer() {
flexDirection: 'column',
};
const [isPanelOpened, setPanelOpened] = useState<boolean>(
- tabIndex !== undefined,
+ tabIndex !== undefined && tabIndex !== -1,
);
const smallScreen = useMediaQuery(theme.breakpoints.down('md'));
@@ -533,14 +530,14 @@ function EntryContainer() {
//window.dispatchEvent(new Event('previous-file'));
};
- const fileExtension =
+ /*const fileExtension =
openedEntry &&
extractFileExtension(openedEntry.path, cLocation?.getDirSeparator());
const isEditable =
!readOnlyMode &&
openedEntry &&
openedEntry.isFile &&
- AppConfig.editableFiles.includes(fileExtension);
+ AppConfig.editableFiles.includes(fileExtension);*/
const toggleAutoSave = (event: React.ChangeEvent<HTMLInputElement>) => {
const autoSave = event.target.checked;
@@ -577,7 +574,7 @@ function EntryContainer() {
};
const tabs = () => {
- const autoSave = isEditable && revisionsEnabled && (
+ const autoSave = isEditable(openedEntry) && revisionsEnabled && (
<Tooltip
title={
t('core:autosave') +
@@ -666,20 +663,17 @@ function EntryContainer() {
);
}
}
- const haveDescription = description?.length > 0;
const tabsComponent = useCallback(
(marginRight: string | undefined = undefined) => (
<EntryContainerTabs
- isEditable={isEditable}
isPanelOpened={isPanelOpened}
openPanel={openPanel}
toggleProperties={toggleProperties}
- haveDescription={haveDescription}
marginRight={marginRight}
/>
),
- [isEditable, isPanelOpened, haveDescription],
+ [isPanelOpened],
);
if (!autoSave && !editFile) {
diff --git a/src/renderer/components/EntryContainerTabs.tsx b/src/renderer/components/EntryContainerTabs.tsx
index f7be7a9dd..e18c462f3 100644
--- a/src/renderer/components/EntryContainerTabs.tsx
+++ b/src/renderer/components/EntryContainerTabs.tsx
@@ -16,34 +16,24 @@
*
*/
-import AppConfig from '-/AppConfig';
-import {
- AIIcon,
- DescriptionIcon,
- EditDescriptionIcon,
- FolderPropertiesIcon,
- RevisionIcon,
-} from '-/components/CommonIcons';
+import React, { useEffect, useReducer, useRef } from 'react';
+import { useTranslation } from 'react-i18next';
+import { useDispatch, useSelector } from 'react-redux';
+import { AppDispatch } from '-/reducers/app';
import Tooltip from '-/components/Tooltip';
import TsTabPanel from '-/components/TsTabPanel';
import { useCurrentLocationContext } from '-/hooks/useCurrentLocationContext';
import { useOpenedEntryContext } from '-/hooks/useOpenedEntryContext';
-import { Pro } from '-/pro';
-import { AppDispatch } from '-/reducers/app';
import {
actions as SettingsActions,
getEntryContainerTab,
getMapTileServer,
isDevMode,
} from '-/reducers/settings';
-import { CommonLocation } from '-/utils/CommonLocation';
import { Box, Tab, Tabs, useMediaQuery } from '@mui/material';
+import { useEntryPropsTabsContext } from '-/hooks/useEntryPropsTabsContext';
+import { TabItem, TabNames } from '-/hooks/EntryPropsTabsContextProvider';
import { styled, useTheme } from '@mui/material/styles';
-import { getBackupFileDir } from '@tagspaces/tagspaces-common/paths';
-import React, { useEffect, useReducer, useRef } from 'react';
-import { useTranslation } from 'react-i18next';
-import { useDispatch, useSelector } from 'react-redux';
-import { useFilePropertiesContext } from '-/hooks/useFilePropertiesContext';
import LoadingLazy from '-/components/LoadingLazy';
import { useChatContext } from '-/hooks/useChatContext';
@@ -53,13 +43,6 @@ interface StyledTabsProps {
onChange: (event: React.SyntheticEvent, newValue: number) => void;
}
-type TabItem = {
- dataTid: string;
- icon: React.ReactNode;
- title: string;
- name: string;
-};
-
const StyledTabs = styled((props: StyledTabsProps) => (
<Tabs
{...props}
@@ -136,32 +119,25 @@ const TabContent4 = React.lazy(
interface EntryContainerTabsProps {
openPanel: () => void;
toggleProperties: () => void;
- isEditable: boolean;
isPanelOpened: boolean;
- haveDescription: boolean;
marginRight: string;
}
function EntryContainerTabs(props: EntryContainerTabsProps) {
- const {
- openPanel,
- toggleProperties,
- marginRight,
- isEditable,
- isPanelOpened,
- haveDescription,
- } = props;
+ 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 { isEditMode } = useFilePropertiesContext();
+ //const { isEditMode } = useFilePropertiesContext();
const theme = useTheme();
const devMode: boolean = useSelector(isDevMode);
const tabIndex = useSelector(getEntryContainerTab);
const tileServer = useSelector(getMapTileServer);
- const haveRevisions = useRef<boolean>(isEditable);
+ const tabsArray = useRef<TabItem[]>([]);
//const selectedTabIndex = useRef<number>(initSelectedTabIndex(tabIndex));
const dispatch: AppDispatch = useDispatch();
const [ignored, forceUpdate] = useReducer((x) => x + 1, 0, undefined);
@@ -173,82 +149,24 @@ function EntryContainerTabs(props: EntryContainerTabsProps) {
}, [tabIndex]);*/
useEffect(() => {
- //selectedTabIndex.current = initSelectedTabIndex(tabIndex);
- if (isEditable) {
- const location: CommonLocation = findLocation(openedEntry.locationID);
- const backupFilePath = getBackupFileDir(
- openedEntry.path,
- openedEntry.uuid,
- location?.getDirSeparator(),
- );
- location?.checkDirExist(backupFilePath).then((exist) => {
- haveRevisions.current = exist;
- forceUpdate();
- });
- } else if (haveRevisions.current) {
- haveRevisions.current = false;
+ getTabsArray(openedEntry).then((tabs) => {
+ tabsArray.current = tabs;
forceUpdate();
- }
- }, [isEditable, isEditMode]);
+ });
+ }, [openedEntry]);
- /*function initSelectedTabIndex(index) {
- if (!haveRevisions.current) {
- if (index === 2) {
- return 0;
- } else if (index === 3) {
- return 2;
+ const handleChange = (event: React.SyntheticEvent, newValue: number) => {
+ if (tabsArray.current.length > 0) {
+ const tab = tabsArray.current[newValue];
+ if (tab && tab.name === 'aiTab') {
+ initHistory();
}
+ dispatch(SettingsActions.setEntryContainerTab(newValue));
+ openPanel();
+ console.log('tab changed to:' + newValue);
}
- // directories must be always opened
- return !openedEntry.isFile && index === undefined ? 0 : index;
- }*/
-
- const tab1: TabItem = {
- dataTid: 'detailsTabTID',
- icon: <FolderPropertiesIcon />,
- title: t('core:details'),
- name: 'propertiesTab',
- };
- const tab2: TabItem = {
- dataTid: 'descriptionTabTID',
- icon: haveDescription ? <EditDescriptionIcon /> : <DescriptionIcon />,
- title: t('core:filePropertiesDescription'),
- name: 'descriptionTab',
};
- const tabsArray: TabItem[] = [tab1, tab2];
- if (haveRevisions.current) {
- const tab3: TabItem = {
- dataTid: 'revisionsTabTID',
- icon: <RevisionIcon />,
- title: t('core:revisions'),
- name: 'revisionsTab',
- };
- tabsArray.push(tab3);
- }
-
- if (!openedEntry.isFile || (devMode && Pro && AppConfig.isElectron)) {
- if (AppConfig.isElectron) {
- // todo enable for web
- const tab4: TabItem = {
- dataTid: 'aiTabTID',
- icon: <AIIcon />,
- title: t('core:aiSettingsTab'),
- name: 'aiTab',
- };
- tabsArray.push(tab4);
- }
- }
-
- const handleChange = (event: React.SyntheticEvent, newValue: number) => {
- const tab = tabsArray[newValue];
- if (tab && tab.name === 'aiTab') {
- initHistory();
- }
- dispatch(SettingsActions.setEntryContainerTab(newValue));
- openPanel();
- console.log('tab changed to:' + newValue);
- };
function handleTabClick(selectedTabIndex, index: number) {
if (
openedEntry.isFile &&
@@ -261,32 +179,36 @@ function EntryContainerTabs(props: EntryContainerTabsProps) {
}
}
- function getSelectedTabIndex(maxTabsIndex) {
+ function getSelectedTabIndex() {
if (!isPanelOpened) {
return undefined;
}
- if (!tabIndex) {
+ if (!tabIndex || tabIndex === -1) {
return 0;
}
- if (tabIndex > maxTabsIndex) {
- return maxTabsIndex;
+ const maxTabIndex = tabsArray.current.length - 1;
+ if (tabIndex > maxTabIndex) {
+ return maxTabIndex;
}
return tabIndex;
}
- const selectedTabIndex = getSelectedTabIndex(tabsArray.length - 1);
+ const selectedTabIndex = getSelectedTabIndex();
function getTabContainer(tabName: string) {
- if (tabName === 'propertiesTab') {
+ if (tabName === TabNames.propertiesTab) {
return <TabContent1 key={openedEntry.path} tileServer={tileServer} />;
- } else if (tabName === 'descriptionTab') {
+ } else if (tabName === TabNames.descriptionTab) {
return <TabContent2 />;
- } else if (tabName === 'revisionsTab') {
+ } else if (tabName === TabNames.revisionsTab) {
return <TabContent3 />;
- } else if (tabName === 'aiTab') {
+ } else if (tabName === TabNames.aiTab) {
return <TabContent4 />;
}
}
+ if (tabsArray.current.length === 0) {
+ return null;
+ }
return (
<div
@@ -308,9 +230,9 @@ function EntryContainerTabs(props: EntryContainerTabsProps) {
onChange={handleChange}
aria-label="Switching among description, revisions entry properties"
>
- {tabsArray.map((tab, index) => (
+ {tabsArray.current.map((tab, index) => (
<StyledTab
- data-tid={tab.dataTid}
+ data-tid={tab.name + 'TID'}
icon={tab.icon}
title={tab.title}
tinyMode={isTinyMode}
@@ -321,7 +243,7 @@ function EntryContainerTabs(props: EntryContainerTabsProps) {
</StyledTabs>
</Box>
<React.Suspense fallback={<LoadingLazy />}>
- {tabsArray.map((tab, index) => (
+ {tabsArray.current.map((tab, index) => (
<TsTabPanel key={tab.name} value={selectedTabIndex} index={index}>
{getTabContainer(tab.name)}
</TsTabPanel>
diff --git a/src/renderer/components/FolderContainer.tsx b/src/renderer/components/FolderContainer.tsx
index 88577b34f..f12768081 100644
--- a/src/renderer/components/FolderContainer.tsx
+++ b/src/renderer/components/FolderContainer.tsx
@@ -17,31 +17,24 @@
*/
import AppConfig from '-/AppConfig';
-import { AIProvider } from '-/components//chat/ChatTypes';
-import {
- GoBackIcon,
- GoForwardIcon,
- MainMenuIcon,
- SearchIcon,
-} from '-/components/CommonIcons';
-import PathBreadcrumbs from '-/components/PathBreadcrumbs';
import RenderPerspective from '-/components/RenderPerspective';
import SearchBox from '-/components/SearchBox';
import Tooltip from '-/components/Tooltip';
import TsButton from '-/components/TsButton';
import TsIconButton from '-/components/TsIconButton';
+import { AIProvider } from '-/components/chat/ChatTypes';
import { adjustKeyBinding } from '-/components/dialogs/KeyboardDialog';
import RenameEntryDialog from '-/components/dialogs/RenameEntryDialog';
import { useFileUploadDialogContext } from '-/components/dialogs/hooks/useFileUploadDialogContext';
import { useProTeaserDialogContext } from '-/components/dialogs/hooks/useProTeaserDialogContext';
+import { TabNames } from '-/hooks/EntryPropsTabsContextProvider';
import { useBrowserHistoryContext } from '-/hooks/useBrowserHistoryContext';
import { useDirectoryContentContext } from '-/hooks/useDirectoryContentContext';
import { useOpenedEntryContext } from '-/hooks/useOpenedEntryContext';
import { AvailablePerspectives, PerspectiveIDs } from '-/perspectives';
import { Pro } from '-/pro';
-import { AppDispatch, getProgress } from '-/reducers/app';
+import { getProgress } from '-/reducers/app';
import {
- actions as SettingsActions,
getDefaultAIProvider,
getDesktopMode,
getKeyBindingObject,
@@ -56,7 +49,14 @@ import { useTheme } from '@mui/material/styles';
import useMediaQuery from '@mui/material/useMediaQuery';
import { useCallback, useState } from 'react';
import { useTranslation } from 'react-i18next';
-import { useDispatch, useSelector } from 'react-redux';
+import { useSelector } from 'react-redux';
+import {
+ GoBackIcon,
+ GoForwardIcon,
+ MainMenuIcon,
+ SearchIcon,
+} from './CommonIcons';
+import PathBreadcrumbs from './PathBreadcrumbs';
interface Props {
toggleDrawer?: () => void;
@@ -66,7 +66,6 @@ interface Props {
function FolderContainer(props: Props) {
const { toggleDrawer, drawerOpened, style } = props;
- const dispatch: AppDispatch = useDispatch();
const { t } = useTranslation();
const theme = useTheme();
const keyBindings = useSelector(getKeyBindingObject);
@@ -163,6 +162,11 @@ function FolderContainer(props: Props) {
key={perspective.id}
data-tid={perspective.key}
onClick={() => switchPerspective(perspective.id)}
+ style={{
+ opacity: 0.9,
+ backgroundColor: theme.palette.background.default,
+ borderColor: theme.palette.divider,
+ }}
>
<Tooltip
title={
@@ -348,9 +352,8 @@ function FolderContainer(props: Props) {
bottom: -40,
right: 20,
zIndex: 1000,
- opacity: 0.9,
+ // opacity: 0.9,
position: 'absolute',
- backgroundColor: theme.palette.background.default,
}}
>
{perspectiveToggleButtons}
@@ -359,10 +362,14 @@ function FolderContainer(props: Props) {
value=""
aria-label="chat-label"
data-tid="chatTID"
- style={{ backgroundColor: '#f3585845', marginLeft: 5 }}
+ style={{
+ marginLeft: 5,
+ borderColor: theme.palette.divider,
+ color: theme.palette.primary.main,
+ backgroundColor: theme.palette.background.default,
+ }}
onClick={() => {
- dispatch(SettingsActions.setEntryContainerTab(3));
- openEntry(currentDirectoryPath);
+ openEntry(currentDirectoryPath, TabNames.aiTab);
}}
>
<Tooltip title="AI Chat for this folder">
diff --git a/src/renderer/components/chat/AiGenDescButton.tsx b/src/renderer/components/chat/AiGenDescButton.tsx
index 151c5abb1..89adbc0e0 100644
--- a/src/renderer/components/chat/AiGenDescButton.tsx
+++ b/src/renderer/components/chat/AiGenDescButton.tsx
@@ -16,25 +16,25 @@
*
*/
+import { useState } from 'react';
import AppConfig from '-/AppConfig';
import TsButton from '-/components/TsButton';
import { useChatContext } from '-/hooks/useChatContext';
import { useFilePropertiesContext } from '-/hooks/useFilePropertiesContext';
import { useNotificationContext } from '-/hooks/useNotificationContext';
import { useOpenedEntryContext } from '-/hooks/useOpenedEntryContext';
-import { AppDispatch } from '-/reducers/app';
-import { actions as SettingsActions } from '-/reducers/settings';
import { extractFileExtension } from '@tagspaces/tagspaces-common/paths';
-import { useState } from 'react';
import { useTranslation } from 'react-i18next';
-import { useDispatch } from 'react-redux';
import { AIIcon } from '../CommonIcons';
+import { TabNames } from '-/hooks/EntryPropsTabsContextProvider';
+import { useEntryPropsTabsContext } from '-/hooks/useEntryPropsTabsContext';
interface Props {}
function AiGenDescButton(props: Props) {
const { t } = useTranslation();
- const dispatch: AppDispatch = useDispatch();
+
+ const { setOpenedTab } = useEntryPropsTabsContext();
const { openedEntry } = useOpenedEntryContext();
const { generate, openedEntryModel } = useChatContext();
const { setDescription, saveDescription } = useFilePropertiesContext();
@@ -59,7 +59,7 @@ function AiGenDescButton(props: Props) {
//console.log('newOllamaMessage response:' + response);
setIsLoading(false);
if (response) {
- dispatch(SettingsActions.setEntryContainerTab(1));
+ setOpenedTab(TabNames.descriptionTab, openedEntry);
if (openedEntry.meta.description) {
setDescription(openedEntry.meta.description + '\n---\n' + response);
diff --git a/src/renderer/components/chat/AiGenTagsButton.tsx b/src/renderer/components/chat/AiGenTagsButton.tsx
index 0beade143..0ab9cf34d 100644
--- a/src/renderer/components/chat/AiGenTagsButton.tsx
+++ b/src/renderer/components/chat/AiGenTagsButton.tsx
@@ -21,20 +21,18 @@ import TsButton from '-/components/TsButton';
import { useChatContext } from '-/hooks/useChatContext';
import { useOpenedEntryContext } from '-/hooks/useOpenedEntryContext';
import { useTaggingActionsContext } from '-/hooks/useTaggingActionsContext';
-import { AppDispatch } from '-/reducers/app';
-import {
- actions as SettingsActions,
- getDefaultAIProvider,
-} from '-/reducers/settings';
+import { getDefaultAIProvider } from '-/reducers/settings';
import { TS } from '-/tagspaces.namespace';
import { ButtonPropsVariantOverrides } from '@mui/material/Button';
import { OverridableStringUnion } from '@mui/types';
import { extractFileExtension } from '@tagspaces/tagspaces-common/paths';
import { useState } from 'react';
import { useTranslation } from 'react-i18next';
-import { useDispatch, useSelector } from 'react-redux';
+import { useSelector } from 'react-redux';
import { AIIcon } from '../CommonIcons';
import { AIProvider } from '-/components/chat/ChatTypes';
+import { TabNames } from '-/hooks/EntryPropsTabsContextProvider';
+import { useEntryPropsTabsContext } from '-/hooks/useEntryPropsTabsContext';
interface Props {
variant?: OverridableStringUnion<
@@ -47,7 +45,7 @@ interface Props {
function AiGenTagsButton(props: Props) {
const { fromDescription, variant } = props;
const { t } = useTranslation();
- const dispatch: AppDispatch = useDispatch();
+ const { setOpenedTab } = useEntryPropsTabsContext();
const { openedEntry } = useOpenedEntryContext();
const defaultAiProvider: AIProvider = useSelector(getDefaultAIProvider);
const { generate, openedEntryModel, newChatMessage } = useChatContext();
@@ -78,9 +76,9 @@ function AiGenTagsButton(props: Props) {
title: match[1].trim().replace(/^,|,$/g, '').toLowerCase(),
type: 'sidecar',
}));
- addTagsToFsEntry(openedEntry, tags).then(() => {
- dispatch(SettingsActions.setEntryContainerTab(0));
- });
+ addTagsToFsEntry(openedEntry, tags).then(() =>
+ setOpenedTab(TabNames.propertiesTab, openedEntry),
+ );
} catch (e) {
console.error('parse response ' + response, e);
}
diff --git a/src/renderer/components/menus/DirectoryMenu.tsx b/src/renderer/components/menus/DirectoryMenu.tsx
index e93908994..8b1c624c6 100644
--- a/src/renderer/components/menus/DirectoryMenu.tsx
+++ b/src/renderer/components/menus/DirectoryMenu.tsx
@@ -57,6 +57,7 @@ import { useNewAudioDialogContext } from '-/components/dialogs/hooks/useNewAudio
import { useProTeaserDialogContext } from '-/components/dialogs/hooks/useProTeaserDialogContext';
import { useDeleteMultipleEntriesDialogContext } from '-/components/dialogs/hooks/useDeleteMultipleEntriesDialogContext';
import { useFileUploadContext } from '-/hooks/useFileUploadContext';
+import { TabNames } from '-/hooks/EntryPropsTabsContextProvider';
interface Props {
open: boolean;
@@ -166,7 +167,7 @@ function DirectoryMenu(props: Props) {
}
function showProperties() {
- return openEntry(directoryPath, true);
+ return openEntry(directoryPath, TabNames.propertiesTab);
}
function perspectiveSwitch(perspectiveId) {
diff --git a/src/renderer/components/menus/FileMenu.tsx b/src/renderer/components/menus/FileMenu.tsx
index 0d74b650a..9dfb2b7ee 100644
--- a/src/renderer/components/menus/FileMenu.tsx
+++ b/src/renderer/components/menus/FileMenu.tsx
@@ -68,6 +68,7 @@ import { TS } from '-/tagspaces.namespace';
import { generateClipboardLink } from '-/utils/dom';
import { useDeleteMultipleEntriesDialogContext } from '-/components/dialogs/hooks/useDeleteMultipleEntriesDialogContext';
import TsMenuList from '-/components/TsMenuList';
+import { TabNames } from '-/hooks/EntryPropsTabsContextProvider';
interface Props {
anchorEl: Element;
@@ -153,7 +154,7 @@ function FileMenu(props: Props) {
function showProperties() {
onClose();
if (selectedEntries && selectedEntries.length === 1) {
- openEntry(selectedEntries[0].path, true);
+ openEntry(selectedEntries[0].path, TabNames.propertiesTab);
}
}
diff --git a/src/renderer/containers/Root.tsx b/src/renderer/containers/Root.tsx
index 793245cce..306a288f3 100644
--- a/src/renderer/containers/Root.tsx
+++ b/src/renderer/containers/Root.tsx
@@ -53,6 +53,7 @@ import DialogsRoot from '-/containers/DialogsRoot';
import { BrowserHistoryContextProvider } from '-/hooks/BrowserHistoryContextProvider';
import { ChatContextProvider } from '-/hooks/ChatProvider';
import { FileUploadDialogContextProvider } from '-/components/dialogs/hooks/FileUploadDialogContextProvider';
+import { EntryPropsTabsContextProvider } from '-/hooks/EntryPropsTabsContextProvider';
type RootType = {
store: Store<{}>;
@@ -87,43 +88,49 @@ export default function Root({ store, persistor }: RootType) {
<PlatformFacadeContextProvider>
<LocationIndexContextProvider>
<IOActionsContextProvider>
- <OpenedEntryContextProvider>
- <TagGroupsLocationContextProvider>
- <TaggingActionsContextProvider>
- <DndProvider backend={HTML5Backend}>
- <ExtensionsContextProvider>
- <PanelsContextProvider>
- <UserContextProvider>
- <SavedSearchesContextProvider>
- <BrowserHistoryContextProvider>
- <FileUploadDialogContextProvider>
- <ChatContextProvider>
- {Pro ? (
- <Pro.contextProviders.BookmarksContextProvider>
- <Pro.contextProviders.HistoryContextProvider>
- <Pro.contextProviders.KanBanImportDialogContextProvider>
+ <EntryPropsTabsContextProvider>
+ <OpenedEntryContextProvider>
+ <TagGroupsLocationContextProvider>
+ <TaggingActionsContextProvider>
+ <DndProvider backend={HTML5Backend}>
+ <ExtensionsContextProvider>
+ <PanelsContextProvider>
+ <UserContextProvider>
+ <SavedSearchesContextProvider>
+ <BrowserHistoryContextProvider>
+ <FileUploadDialogContextProvider>
+ <ChatContextProvider>
+ <FileUploadDialogContextProvider>
+ <ChatContextProvider>
+ {Pro ? (
+ <Pro.contextProviders.BookmarksContextProvider>
+ <Pro.contextProviders.HistoryContextProvider>
+ <Pro.contextProviders.KanBanImportDialogContextProvider>
+ <DialogsRoot>
+ <MainPage />
+ </DialogsRoot>
+ </Pro.contextProviders.KanBanImportDialogContextProvider>
+ </Pro.contextProviders.HistoryContextProvider>
+ </Pro.contextProviders.BookmarksContextProvider>
+ ) : (
<DialogsRoot>
<MainPage />
</DialogsRoot>
- </Pro.contextProviders.KanBanImportDialogContextProvider>
- </Pro.contextProviders.HistoryContextProvider>
- </Pro.contextProviders.BookmarksContextProvider>
- ) : (
- <DialogsRoot>
- <MainPage />
- </DialogsRoot>
- )}
- </ChatContextProvider>
- </FileUploadDialogContextProvider>
- </BrowserHistoryContextProvider>
- </SavedSearchesContextProvider>
- </UserContextProvider>
- </PanelsContextProvider>
- </ExtensionsContextProvider>
- </DndProvider>
- </TaggingActionsContextProvider>
- </TagGroupsLocationContextProvider>
- </OpenedEntryContextProvider>
+ )}
+ </ChatContextProvider>
+ </FileUploadDialogContextProvider>
+ </ChatContextProvider>
+ </FileUploadDialogContextProvider>
+ </BrowserHistoryContextProvider>
+ </SavedSearchesContextProvider>
+ </UserContextProvider>
+ </PanelsContextProvider>
+ </ExtensionsContextProvider>
+ </DndProvider>
+ </TaggingActionsContextProvider>
+ </TagGroupsLocationContextProvider>
+ </OpenedEntryContextProvider>
+ </EntryPropsTabsContextProvider>
</IOActionsContextProvider>
</LocationIndexContextProvider>
</PlatformFacadeContextProvider>
diff --git a/src/renderer/hooks/ChatProvider.tsx b/src/renderer/hooks/ChatProvider.tsx
index df1d6add2..e39875f2d 100644
--- a/src/renderer/hooks/ChatProvider.tsx
+++ b/src/renderer/hooks/ChatProvider.tsx
@@ -360,7 +360,7 @@ export const ChatContextProvider = ({ children }: ChatContextProviderProps) => {
function removeModel(modelName: string) {
const model = findModel(modelName);
- if (model) {
+ if (model && defaultAiProvider) {
const result = confirm('Do you want to remove ' + model.name + ' model?');
if (result) {
//addTimeLineRequest('deleting ' + model.name, 'system');
@@ -393,7 +393,7 @@ export const ChatContextProvider = ({ children }: ChatContextProviderProps) => {
* @param modelName
*/
function getModel(modelName: string): Promise<Model> {
- if (!AppConfig.isElectron || !modelName) {
+ if (!AppConfig.isElectron || !modelName || !defaultAiProvider) {
return Promise.resolve(undefined);
}
return window.electronIO.ipcRenderer
@@ -413,7 +413,7 @@ export const ChatContextProvider = ({ children }: ChatContextProviderProps) => {
confirmCallback?,
): Promise<boolean> {
const model = findModel(newModelName);
- if (!model) {
+ if (!model && defaultAiProvider) {
// return setModel(model);
// } else {
const result = confirm(
@@ -487,7 +487,7 @@ export const ChatContextProvider = ({ children }: ChatContextProviderProps) => {
const model: HistoryModel = {
history: chatHistoryItems.current,
lastModelName: currentModel.current?.name,
- engine: defaultAiProvider.engine,
+ engine: defaultAiProvider?.engine,
};
saveFilePromise(
{ path: getHistoryFilePath() },
@@ -614,6 +614,8 @@ export const ChatContextProvider = ({ children }: ChatContextProviderProps) => {
if (!model) {
showNotification(t('core:chooseModel'));
return Promise.resolve(false);
+ } else if (!defaultAiProvider) {
+ return Promise.resolve(false);
}
const msgContent = getMessage(msg, mode);
const imagesArray =
diff --git a/src/renderer/hooks/EntryPropsTabsContextProvider.tsx b/src/renderer/hooks/EntryPropsTabsContextProvider.tsx
new file mode 100644
index 000000000..6ef3b3007
--- /dev/null
+++ b/src/renderer/hooks/EntryPropsTabsContextProvider.tsx
@@ -0,0 +1,198 @@
+/**
+ * TagSpaces - universal file and folder organizer
+ * Copyright (C) 2023-present TagSpaces GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License (version 3) as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
+
+import React, { createContext, useEffect, useMemo, useRef } from 'react';
+import { useTranslation } from 'react-i18next';
+import AppConfig from '-/AppConfig';
+import {
+ AIIcon,
+ DescriptionIcon,
+ EditDescriptionIcon,
+ FolderPropertiesIcon,
+ RevisionIcon,
+} from '-/components/CommonIcons';
+import { Pro } from '-/pro';
+import {
+ extractFileExtension,
+ getBackupFileDir,
+} from '@tagspaces/tagspaces-common/paths';
+import { CommonLocation } from '-/utils/CommonLocation';
+import { useCurrentLocationContext } from '-/hooks/useCurrentLocationContext';
+import { useOpenedEntryContext } from '-/hooks/useOpenedEntryContext';
+import { useDispatch, useSelector } from 'react-redux';
+import { actions as SettingsActions, isDevMode } from '-/reducers/settings';
+import { useFilePropertiesContext } from '-/hooks/useFilePropertiesContext';
+import { AppDispatch } from '-/reducers/app';
+import { TS } from '-/tagspaces.namespace';
+
+export type TabItem = {
+ //dataTid: string;
+ icon: React.ReactNode;
+ title: string;
+ name: string;
+};
+
+export const TabNames = {
+ propertiesTab: 'detailsTab',
+ descriptionTab: 'descriptionTab',
+ revisionsTab: 'revisionsTab',
+ aiTab: 'aiTab',
+};
+
+type EntryPropsTabsContextData = {
+ getTabsArray: (openedEntry: TS.OpenedEntry) => Promise<TabItem[]>;
+ isEditable: (openedEntry: TS.OpenedEntry) => boolean;
+ setOpenedTab: (
+ tabName: (typeof TabNames)[keyof typeof TabNames],
+ openedEntry: TS.OpenedEntry,
+ ) => Promise<number>;
+};
+
+export const EntryPropsTabsContext = createContext<EntryPropsTabsContextData>({
+ getTabsArray: undefined,
+ isEditable: undefined,
+ setOpenedTab: undefined,
+});
+
+export type EntryPropsTabsContextProviderProps = {
+ children: React.ReactNode;
+};
+
+export const EntryPropsTabsContextProvider = ({
+ children,
+}: EntryPropsTabsContextProviderProps) => {
+ const { t } = useTranslation();
+
+ const { findLocation, readOnlyMode } = useCurrentLocationContext();
+
+ // const { isEditMode } = useFilePropertiesContext();
+ const dispatch: AppDispatch = useDispatch();
+
+ const devMode: boolean = useSelector(isDevMode);
+
+ //const haveRevisions = useRef<boolean>(isEditable());
+ //const tabsArray = useRef<TabItem[]>(getTabsArray(openedEntry));
+ //const [ignored, forceUpdate] = React.useReducer((x) => x + 1, 0, undefined);
+
+ function haveRevisions(openedEntry: TS.OpenedEntry): Promise<boolean> {
+ //selectedTabIndex.current = initSelectedTabIndex(tabIndex);
+ if (isEditable(openedEntry)) {
+ const location: CommonLocation = findLocation(openedEntry.locationID);
+ const backupFilePath = getBackupFileDir(
+ openedEntry.path,
+ openedEntry.uuid,
+ location?.getDirSeparator(),
+ );
+ return location?.checkDirExist(backupFilePath);
+ }
+ return Promise.resolve(false);
+ }
+
+ function isEditable(openedEntry: TS.OpenedEntry): boolean {
+ if (openedEntry) {
+ /* const fileExtension = extractFileExtension(
+ openedEntry.path,
+ currentLocation?.getDirSeparator(),
+ );*/
+ return (
+ !readOnlyMode &&
+ openedEntry.isFile &&
+ AppConfig.editableFiles.includes(openedEntry.extension)
+ );
+ }
+ return false;
+ }
+
+ async function getTabsArray(oEntry: TS.OpenedEntry): Promise<TabItem[]> {
+ const tab1: TabItem = {
+ icon: <FolderPropertiesIcon />,
+ title: t('core:details'),
+ name: TabNames.propertiesTab,
+ };
+ const tab2: TabItem = {
+ icon:
+ oEntry && oEntry.meta && oEntry.meta.description ? (
+ <EditDescriptionIcon />
+ ) : (
+ <DescriptionIcon />
+ ),
+ title: t('core:filePropertiesDescription'),
+ name: TabNames.descriptionTab,
+ };
+
+ const tabsArray: TabItem[] = [tab1, tab2];
+ const revisions = await haveRevisions(oEntry);
+ if (revisions) {
+ const tab3: TabItem = {
+ icon: <RevisionIcon />,
+ title: t('core:revisions'),
+ name: TabNames.revisionsTab,
+ };
+ tabsArray.push(tab3);
+ }
+
+ if (
+ (oEntry && !oEntry.isFile) ||
+ (devMode && Pro && AppConfig.isElectron)
+ ) {
+ if (AppConfig.isElectron) {
+ // todo enable for web
+ const tab4: TabItem = {
+ icon: <AIIcon />,
+ title: t('core:aiSettingsTab'),
+ name: TabNames.aiTab,
+ };
+ tabsArray.push(tab4);
+ }
+ }
+ return tabsArray;
+ }
+
+ /**
+ * @param tabName
+ * @param openedEntry
+ * return tabIndex or -1 if not tab exist with tabName
+ */
+ async function setOpenedTab(
+ tabName: (typeof TabNames)[keyof typeof TabNames],
+ openedEntry: TS.OpenedEntry,
+ ): Promise<number> {
+ const allTabs = await getTabsArray(openedEntry);
+ const tabIndex = allTabs.findIndex((tab) => tab.name === tabName);
+ if (tabIndex > -1) {
+ dispatch(SettingsActions.setEntryContainerTab(tabIndex));
+ } else {
+ console.log('no tab with name:' + tabName + ' exist!');
+ }
+ return tabIndex;
+ }
+
+ const context = useMemo(() => {
+ return {
+ getTabsArray,
+ isEditable,
+ setOpenedTab,
+ };
+ }, []);
+
+ return (
+ <EntryPropsTabsContext.Provider value={context}>
+ {children}
+ </EntryPropsTabsContext.Provider>
+ );
+};
diff --git a/src/renderer/hooks/OpenedEntryContextProvider.tsx b/src/renderer/hooks/OpenedEntryContextProvider.tsx
index 9ba117bdc..2643741b1 100644
--- a/src/renderer/hooks/OpenedEntryContextProvider.tsx
+++ b/src/renderer/hooks/OpenedEntryContextProvider.tsx
@@ -71,6 +71,7 @@ import { useFilePropertiesContext } from '-/hooks/useFilePropertiesContext';
import { useIOActionsContext } from '-/hooks/useIOActionsContext';
import ConfirmDialog from '-/components/dialogs/ConfirmDialog';
import { extractPDFcontent } from '-/services/thumbsgenerator';
+import { useEntryPropsTabsContext } from '-/hooks/useEntryPropsTabsContext';
type OpenedEntryContextData = {
openedEntry: TS.OpenedEntry;
@@ -88,11 +89,14 @@ type OpenedEntryContextData = {
entryPath: string,
fsEntryMeta: TS.FileSystemEntryMeta,
) => Promise<boolean>;*/
- openEntry: (path?: string, showDetails?) => Promise<boolean>;
- openFsEntry: (fsEntry?: TS.FileSystemEntry, showDetails?) => Promise<boolean>;
+ openEntry: (path?: string, tabSelected?: string) => Promise<boolean>;
+ openFsEntry: (
+ fsEntry?: TS.FileSystemEntry,
+ tabSelected?: string,
+ ) => Promise<boolean>;
openEntryInternal: (
fsEntry: TS.FileSystemEntry,
- showDetails?,
+ tabSelected?: string,
) => Promise<boolean>;
openNextFile: (entries: TS.FileSystemEntry[]) => void;
openPrevFile: (entries: TS.FileSystemEntry[]) => void;
@@ -166,6 +170,7 @@ 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();
@@ -516,12 +521,15 @@ export const OpenedEntryContextProvider = ({
return Promise.resolve(false);
}
- function openEntry(path?: string, showDetails = undefined): Promise<boolean> {
+ function openEntry(
+ path?: string,
+ tabSelected: string = undefined,
+ ): Promise<boolean> {
if (path === undefined) {
- return openFsEntry(undefined, showDetails);
+ return openFsEntry(undefined, tabSelected);
}
return getAllPropertiesPromise(path)
- .then((fsEntry: TS.FileSystemEntry) => openFsEntry(fsEntry, showDetails))
+ .then((fsEntry: TS.FileSystemEntry) => openFsEntry(fsEntry, tabSelected))
.catch((error) => {
console.log(
'Error getting properties for entry: ' + path + ' - ' + error,
@@ -532,12 +540,12 @@ export const OpenedEntryContextProvider = ({
function openEntryInternal(
fsEntry: TS.FileSystemEntry,
- showDetails = undefined,
+ tabSelected = undefined,
): Promise<boolean> {
return getAllPropertiesPromise(fsEntry.path, fsEntry.locationID)
.then((entry: TS.FileSystemEntry) => {
if (entry) {
- return openFsEntry(entry, showDetails);
+ return openFsEntry(entry, tabSelected);
} else {
if (typeof entry === 'boolean') {
if (!entry) {
@@ -548,7 +556,7 @@ export const OpenedEntryContextProvider = ({
);
}
}
- return openFsEntry(fsEntry, showDetails);
+ return openFsEntry(fsEntry, tabSelected);
}
})
.catch((error) => {
@@ -561,7 +569,7 @@ export const OpenedEntryContextProvider = ({
async function openFsEntry(
fsEntry?: TS.FileSystemEntry,
- showDetails = undefined,
+ tabSelected: string = undefined,
): Promise<boolean> {
if (!fsEntry) {
if (selectedEntries && selectedEntries.length > 0) {
@@ -594,9 +602,7 @@ export const OpenedEntryContextProvider = ({
return Promise.resolve(false);
}
}
- if (showDetails !== undefined) {
- dispatch(SettingsActions.setShowDetails(showDetails));
- }
+
entryForOpening = findExtensionsForEntry(fsEntry, supportedFileTypes);
const loc = findLocation(fsEntry.locationID);
if (loc?.haveObjectStoreSupport() || loc?.haveWebDavSupport()) {
@@ -637,6 +643,11 @@ export const OpenedEntryContextProvider = ({
);
addToEntryContainer(entryForOpening);
+
+ if (tabSelected !== undefined) {
+ setOpenedTab(tabSelected, entryForOpening);
+ //dispatch(SettingsActions.setShowDetails(tabSelected));
+ }
if (
selectedEntries.length !== 1 ||
selectedEntries.some((e) => e.path !== fsEntry.path)
diff --git a/src/renderer/hooks/useEntryPropsTabsContext.tsx b/src/renderer/hooks/useEntryPropsTabsContext.tsx
new file mode 100644
index 000000000..70c900cd0
--- /dev/null
+++ b/src/renderer/hooks/useEntryPropsTabsContext.tsx
@@ -0,0 +1,23 @@
+/**
+ * TagSpaces - universal file and folder organizer
+ * Copyright (C) 2023-present TagSpaces GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License (version 3) as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
+
+import { useContext } from 'react';
+
+import { EntryPropsTabsContext } from '-/hooks/EntryPropsTabsContextProvider';
+
+export const useEntryPropsTabsContext = () => useContext(EntryPropsTabsContext);
diff --git a/src/renderer/perspectives/grid/components/MainContainer.tsx b/src/renderer/perspectives/grid/components/MainContainer.tsx
index e63414b02..35dc5022e 100644
--- a/src/renderer/perspectives/grid/components/MainContainer.tsx
+++ b/src/renderer/perspectives/grid/components/MainContainer.tsx
@@ -50,6 +50,7 @@ import { useCurrentLocationContext } from '-/hooks/useCurrentLocationContext';
import { usePerspectiveActionsContext } from '-/hooks/usePerspectiveActionsContext';
import useFirstRender from '-/utils/useFirstRender';
import { useDeleteMultipleEntriesDialogContext } from '-/components/dialogs/hooks/useDeleteMultipleEntriesDialogContext';
+import { TabNames } from '-/hooks/EntryPropsTabsContextProvider';
interface Props {
openRenameEntryDialog: () => void;
@@ -264,7 +265,7 @@ function GridPerspective(props: Props) {
if (selectedEntries && selectedEntries.length === 1) {
const entry = selectedEntries[0];
if (entry.isFile) {
- openEntry(entry.path, false);
+ openEntry(entry.path);
} else {
openDirectory(entry.path);
}
@@ -279,7 +280,7 @@ function GridPerspective(props: Props) {
openEntryDetails: () => {
if (selectedEntries && selectedEntries.length === 1) {
const entry = selectedEntries[0];
- openEntry(entry.path, true);
+ openEntry(entry.path, TabNames.propertiesTab);
}
},
duplicateFile: () => {
diff --git a/src/renderer/perspectives/grid/components/MainToolbar.tsx b/src/renderer/perspectives/grid/components/MainToolbar.tsx
index 23a17e076..3bcc17e8f 100644
--- a/src/renderer/perspectives/grid/components/MainToolbar.tsx
+++ b/src/renderer/perspectives/grid/components/MainToolbar.tsx
@@ -55,6 +55,7 @@ import { useSelectedEntriesContext } from '-/hooks/useSelectedEntriesContext';
import { usePerspectiveSettingsContext } from '-/hooks/usePerspectiveSettingsContext';
import { useDeleteMultipleEntriesDialogContext } from '-/components/dialogs/hooks/useDeleteMultipleEntriesDialogContext';
import { useSortedDirContext } from '-/perspectives/grid/hooks/useSortedDirContext';
+import { TabNames } from '-/hooks/EntryPropsTabsContextProvider';
interface Props {
prefixDataTID?: string;
@@ -97,7 +98,7 @@ function MainToolbar(props: Props) {
useDeleteMultipleEntriesDialogContext();
function showProperties() {
- return openEntry(currentDirectoryPath, true);
+ return openEntry(currentDirectoryPath, TabNames.propertiesTab);
}
function multipleDownload() {
diff --git a/src/renderer/perspectives/list/components/MainContainer.tsx b/src/renderer/perspectives/list/components/MainContainer.tsx
index 748cab1e3..7d90d9c07 100644
--- a/src/renderer/perspectives/list/components/MainContainer.tsx
+++ b/src/renderer/perspectives/list/components/MainContainer.tsx
@@ -50,6 +50,7 @@ import { useCurrentLocationContext } from '-/hooks/useCurrentLocationContext';
import { usePerspectiveActionsContext } from '-/hooks/usePerspectiveActionsContext';
import useFirstRender from '-/utils/useFirstRender';
import { useDeleteMultipleEntriesDialogContext } from '-/components/dialogs/hooks/useDeleteMultipleEntriesDialogContext';
+import { TabNames } from '-/hooks/EntryPropsTabsContextProvider';
interface Props {
openRenameEntryDialog: () => void;
@@ -264,7 +265,7 @@ function ListPerspective(props: Props) {
if (selectedEntries && selectedEntries.length === 1) {
const entry = selectedEntries[0];
if (entry.isFile) {
- openEntry(entry.path, false);
+ openEntry(entry.path);
} else {
openDirectory(entry.path);
}
@@ -279,7 +280,7 @@ function ListPerspective(props: Props) {
openEntryDetails: () => {
if (selectedEntries && selectedEntries.length === 1) {
const entry = selectedEntries[0];
- openEntry(entry.path, true);
+ openEntry(entry.path, TabNames.propertiesTab);
}
},
duplicateFile: () => {
diff --git a/src/renderer/reducers/settings-default.ts b/src/renderer/reducers/settings-default.ts
index 2bf447ba6..3138ecd13 100644
--- a/src/renderer/reducers/settings-default.ts
+++ b/src/renderer/reducers/settings-default.ts
@@ -57,7 +57,7 @@ export default {
newHTMLFileContent:
'<!DOCTYPE html><html><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8"></head><body></body></html>',
showUnixHiddenEntries: false,
- entryContainerTab: undefined,
+ entryContainerTab: 0,
checkForUpdates,
reorderTags: false,
coloredFileExtension: false,
diff --git a/src/renderer/reducers/settings.ts b/src/renderer/reducers/settings.ts
index 1385c1e1c..6edb5ec57 100644
--- a/src/renderer/reducers/settings.ts
+++ b/src/renderer/reducers/settings.ts
@@ -39,7 +39,7 @@ export const types = {
SET_LANGUAGE: 'SETTINGS/SET_LANGUAGE',
TOGGLE_SHOWUNIXHIDDENENTRIES: 'SETTINGS/TOGGLE_SHOWUNIXHIDDENENTRIES',
SET_ENTRY_CONTAINER_TAB: 'SETTINGS/SET_ENTRY_CONTAINER_TAB',
- SET_SHOW_DETAILS: 'SETTINGS/SET_SHOW_DETAILS',
+ //SET_SHOW_DETAILS: 'SETTINGS/SET_SHOW_DETAILS',
SET_DESKTOPMODE: 'SETTINGS/SET_DESKTOPMODE',
SET_DEVMODE: 'SETTINGS/SET_DEVMODE',
SET_ENABLE_WS: 'SETTINGS/SET_ENABLE_WS',
@@ -160,18 +160,6 @@ export default (state: any = defaultSettings, action: any) => {
case types.SET_ENTRY_CONTAINER_TAB: {
return { ...state, entryContainerTab: action.entryContainerTab };
}
- case types.SET_SHOW_DETAILS: {
- if (action.showDetails) {
- if (state.entryContainerTab !== 0) {
- return { ...state, entryContainerTab: 0 };
- }
- } /*else {
- if (state.entryContainerTab !== undefined) {
- return { ...state, entryContainerTab: undefined };
- }
- }*/
- return state;
- }
case types.SET_TAG_DELIMITER: {
return { ...state, tagDelimiter: action.delimiter };
}
@@ -639,10 +627,10 @@ export const actions = {
type: types.SET_ENTRY_CONTAINER_TAB,
entryContainerTab: tabIndex,
}),
- setShowDetails: (showDetails: boolean) => ({
+ /* setShowDetails: (showDetails: boolean) => ({
type: types.SET_SHOW_DETAILS,
showDetails: showDetails,
- }),
+ }),*/
setCheckForUpdates: (checkForUpdates: boolean) => ({
type: types.SET_CHECKFORUPDATES,
checkForUpdates,