dennii/dbgate
1
0
Fork 0
mirror of https://github.com/DeNNiiInc/dbgate.git synced 2026-04-25 09:45:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

save favorite content

Browse Source
This commit is contained in:
Jan Prochazka
2020-12-14 20:47:22 +01:00
parent 3a89d1a07b
commit a7926a1a71
6 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/web/src/appobj/DatabaseObjectAppObject.js
View File

@@ -193,8 +193,10 @@ function Menu({ data }) {
}, },
}, },
{ {
editor: {
config: { chartType: 'bar' }, config: { chartType: 'bar' },
sql: dmp.s, sql: dmp.s,
},
} }
); );
} else { } else {

5
packages/web/src/modals/FavoriteModal.js
View File

@@ -55,11 +55,11 @@ export default function FavoriteModal({ modalState, editingData = undefined, sav
const skipEditor = !!savedFile && values.whatToSave != 'content'; const skipEditor = !!savedFile && values.whatToSave != 'content';
const re = new RegExp(`tabdata_(.*)_${savingTab.tabid}`); const re = new RegExp(`tabdata_(.*)_${savingTab.tabid}`);
for (const key in await localforage.keys()) { for (const key of await localforage.keys()) {
const match = key.match(re); const match = key.match(re);
if (!match) continue; if (!match) continue;
if (skipEditor && match[1] == 'editor') continue; if (skipEditor && match[1] == 'editor') continue;
tabdata[match[1]] = JSON.parse(await localforage.getItem(key)); tabdata[match[1]] = await localforage.getItem(key);
} }
for (const key in localStorage) { for (const key in localStorage) {
const match = key.match(re); const match = key.match(re);
@@ -67,6 +67,7 @@ export default function FavoriteModal({ modalState, editingData = undefined, sav
if (skipEditor && match[1] == 'editor') continue; if (skipEditor && match[1] == 'editor') continue;
tabdata[match[1]] = JSON.parse(localStorage.getItem(key)); tabdata[match[1]] = JSON.parse(localStorage.getItem(key));
} }
console.log('tabdata', tabdata, skipEditor, savingTab.tabid);
return { return {
props: props:

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

@@ -75,4 +75,4 @@ export default function ChartTab({ tabVisible, toolbarPortalRef, conid, database
); );
} }
ChartTab.allowAddToFavorites = (props) => props.savedFile; ChartTab.allowAddToFavorites = (props) => true;

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

@@ -177,4 +177,4 @@ export default function QueryTab({ tabid, conid, database, initialArgs, tabVisib
); );
} }
QueryTab.allowAddToFavorites = (props) => props.savedFile; QueryTab.allowAddToFavorites = (props) => true;

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

@@ -140,4 +140,4 @@ export default function ShellTab({ tabid, tabVisible, toolbarPortalRef, ...other
); );
} }
ShellTab.allowAddToFavorites = (props) => props.savedFile; ShellTab.allowAddToFavorites = (props) => true;

1
packages/web/src/widgets/Toolbar.js
View File

@@ -144,7 +144,6 @@ export default function ToolBar({ toolbarPortalRef }) {
{!!currentTab && {!!currentTab &&
tabs[currentTab.tabComponent] && tabs[currentTab.tabComponent] &&
tabs[currentTab.tabComponent].allowAddToFavorites && tabs[currentTab.tabComponent].allowAddToFavorites &&
currentTab.props &&
tabs[currentTab.tabComponent].allowAddToFavorites(currentTab.props) && ( tabs[currentTab.tabComponent].allowAddToFavorites(currentTab.props) && (
<ToolbarButton onClick={addToFavorite} icon="icon share"> <ToolbarButton onClick={addToFavorite} icon="icon share">
Share Share