dennii/dbgate
1
0
Fork 0
mirror of https://github.com/DeNNiiInc/dbgate.git synced 2026-04-20 17:06:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

recently closed tabs

Browse Source
This commit is contained in:
Jan Prochazka
2020-10-10 17:43:16 +02:00
parent 598c48069a
commit a07d99c731
6 changed files with 46 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
packages/web/src/TabsPanel.js
View File

@@ -131,12 +131,26 @@ export default function TabsPanel() {
setOpenedTabs((files) => {
const active = files.find((x) => x.tabid == tabid);
if (!active) return files;
let index = _.findIndex(files, (x) => x.tabid == tabid);
const newFiles = files.filter((x) => !closeCondition(x, active));
const lastSelectedIndex = _.findIndex(files, (x) => x.tabid == tabid);
let selectedIndex = lastSelectedIndex;
if (!newFiles.find((x) => x.selected)) {
while (index >= newFiles.length) index -= 1;
if (index >= 0) newFiles[index].selected = true;
const newFiles = files.map((x) => ({
...x,
closedTime: x.closedTime || (closeCondition(x, active) ? new Date().getTime() : undefined),
}));
while (selectedIndex >= 0 && newFiles[selectedIndex].closedTime) selectedIndex -= 1;
if (selectedIndex < 0) {
selectedIndex = lastSelectedIndex;
while (selectedIndex < newFiles.length && newFiles[selectedIndex].closedTime) selectedIndex += 1;
}
if (selectedIndex != lastSelectedIndex) {
return newFiles.map((x, index) => ({
...x,
selected: index == selectedIndex,
}));
}
return newFiles;
@@ -184,12 +198,14 @@ export default function TabsPanel() {
// 't',
// tabs.map(x => x.tooltip)
// );
const tabsWithDb = tabs.map((tab) => ({
...tab,
tabDbName: tab.props && tab.props.conid && tab.props.database ? tab.props.database : '(no DB)',
tabDbKey:
tab.props && tab.props.conid && tab.props.database ? formatDbKey(tab.props.conid, tab.props.database) : noDbKey,
}));
const tabsWithDb = tabs
.filter((x) => !x.closedTime)
.map((tab) => ({
...tab,
tabDbName: tab.props && tab.props.conid && tab.props.database ? tab.props.database : '(no DB)',
tabDbKey:
tab.props && tab.props.conid && tab.props.database ? formatDbKey(tab.props.conid, tab.props.database) : noDbKey,
}));
const tabsByDb = _.groupBy(tabsWithDb, 'tabDbKey');
const dbKeys = _.keys(tabsByDb).sort();

8
packages/web/src/appobj/openedTabAppObject.js → packages/web/src/appobj/closedTabAppObject.js
View File

@@ -1,8 +1,9 @@
import React from 'react';
import _ from 'lodash';
import moment from 'moment';
import { getIconImage } from '../icons';
const openedTabAppObject = () => ({ tabid, props, selected, icon, title, busy }, { setOpenedTabs }) => {
const closedTabAppObject = () => ({ tabid, props, selected, icon, title, closedTime, busy }, { setOpenedTabs }) => {
const key = tabid;
const Icon = (props) => getIconImage(icon, props);
const isBold = !!selected;
@@ -12,11 +13,12 @@ const openedTabAppObject = () => ({ tabid, props, selected, icon, title, busy },
files.map((x) => ({
...x,
selected: x.tabid == tabid,
closedTime: x.tabid == tabid ? undefined : x.closedTime,
}))
);
};
return { title, key, Icon, isBold, onClick, isBusy: busy };
return { title: `${title} ${moment(closedTime).fromNow()}`, key, Icon, isBold, onClick, isBusy: busy };
};
export default openedTabAppObject;
export default closedTabAppObject;

2
packages/web/src/tabs/QueryTab.js
View File

@@ -76,7 +76,7 @@ export default function QueryTab({
...other
}) {
const loadingText = 'Loading SQL template...';
const localStorageKey = storageKey || `sql_${tabid}`;
const localStorageKey = storageKey || `tabdata_sql_${tabid}`;
const { sqlTemplate } = initialArgs || {};
const [queryText, setQueryText] = React.useState(
() => localStorage.getItem(localStorageKey) || initialScript || (sqlTemplate ? loadingText : '')

2
packages/web/src/tabs/ShellTab.js
View File

@@ -33,7 +33,7 @@ export default function ShellTab({
storageKey,
...other
}) {
const localStorageKey = storageKey || `shell_${tabid}`;
const localStorageKey = storageKey || `tabdata_shell_${tabid}`;
const [shellText, setShellText] = React.useState(() => localStorage.getItem(localStorageKey) || initialScript || '');
const shellTextRef = React.useRef(shellText);
const [busy, setBusy] = React.useState(false);

4
packages/web/src/utility/useGridConfig.js
View File

@@ -2,7 +2,7 @@ import { createGridConfig } from '@dbgate/datalib';
import React from 'react';
const loadGridConfigFunc = (tabid) => () => {
const existing = localStorage.getItem(`grid_${tabid}`);
const existing = localStorage.getItem(`tabdata_grid_${tabid}`);
if (existing) return JSON.parse(existing);
return createGridConfig();
};
@@ -11,7 +11,7 @@ export default function useGridConfig(tabid) {
const [config, setConfig] = React.useState(loadGridConfigFunc(tabid));
React.useEffect(() => {
localStorage.setItem(`grid_${tabid}`, JSON.stringify(config));
localStorage.setItem(`tabdata_grid_${tabid}`, JSON.stringify(config));
}, [config]);
return [config, setConfig];

14
packages/web/src/widgets/FilesWidget.js
View File

@@ -4,7 +4,7 @@ import _ from 'lodash';
import { AppObjectList } from '../appobj/AppObjectList';
import { useOpenedTabs, useSavedSqlFiles } from '../utility/globalState';
import openedTabAppObject from '../appobj/openedTabAppObject';
import closedTabAppObject from '../appobj/closedTabAppObject';
import {
SearchBoxWrapper,
WidgetsInnerContainer,
@@ -14,14 +14,20 @@ import {
} from './WidgetStyles';
import savedSqlFileAppObject from '../appobj/savedSqlFileAppObject';
function OpenedTabsList() {
function ClosedTabsList() {
const tabs = useOpenedTabs();
return (
<>
<WidgetTitle>Recently closed tabs</WidgetTitle>
<WidgetsInnerContainer>
<AppObjectList list={tabs} makeAppObj={openedTabAppObject()} />
<AppObjectList
list={_.sortBy(
tabs.filter((x) => x.closedTime),
(x) => -x.closedTime
)}
makeAppObj={closedTabAppObject()}
/>
</WidgetsInnerContainer>
</>
);
@@ -44,7 +50,7 @@ export default function FilesWidget() {
return (
<WidgetsMainContainer>
<WidgetsOuterContainer>
<OpenedTabsList />
<ClosedTabsList />
</WidgetsOuterContainer>
<WidgetsOuterContainer>
<SavedSqlFilesList />