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

rename id=>conid, id=>tabid

Browse Source
This commit is contained in:
Jan Prochazka
2020-01-25 13:57:56 +01:00
parent 8646221b41
commit 2a40b05ae0
8 changed files with 44 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
web/src/TabsPanel.js
View File

@@ -34,17 +34,17 @@ export default function TabsPanel() {
const tabs = useOpenedTabs();
const setOpenedTabs = useSetOpenedTabs();
const handleTabClick = id => {
const handleTabClick = tabid => {
setOpenedTabs(files =>
files.map(x => ({
...x,
selected: x.id == id,
selected: x.tabid == tabid,
}))
);
};
const handleMouseUp = (e, id) => {
const handleMouseUp = (e, tabid) => {
if (e.button == 1) {
setOpenedTabs(files => files.filter(x => x.id != id));
setOpenedTabs(files => files.filter(x => x.tabid != tabid));
}
};
return (
@@ -52,9 +52,9 @@ export default function TabsPanel() {
{tabs.map(tab => (
<FileTabItem
{...tab}
key={tab.id}
onClick={() => handleTabClick(tab.id)}
onMouseUp={e => handleMouseUp(e, tab.id)}
key={tab.tabid}
onClick={() => handleTabClick(tab.tabid)}
onMouseUp={e => handleMouseUp(e, tab.tabid)}
>
{getIconImage(tab.icon)}
<FileNameWrapper>{tab.title}</FileNameWrapper>

4
web/src/appobj/tableAppObject.js
View File

@@ -26,11 +26,11 @@ export default function tableAppObject({ pureName, schemaName }, { setOpenedTabs
const key = title;
const Icon = TableIcon;
const onClick = ({ schemaName, pureName }) => {
const id = uuidv1();
const tabid = uuidv1();
setOpenedTabs(files => [
...files,
{
id,
tabid,
title: pureName,
icon: 'table2.svg',
tabComponent: 'TableDataTab',

12
web/src/widgets/DatabaseWidget.js
View File

@@ -34,7 +34,7 @@ function SubDatabaseList({ data }) {
};
const { _id } = data;
const databases = useFetch({
url: `server-connections/list-databases?id=${_id}`,
url: `server-connections/list-databases?conid=${_id}`,
reloadTrigger: `database-list-changed-${_id}`,
});
return <AppObjectList list={databases} makeAppObj={databaseAppObject} onObjectClick={handleDatabaseClick} />;
@@ -55,15 +55,15 @@ function ConnectionList() {
);
}
function SqlObjectList({ id, database }) {
function SqlObjectList({ conid, database }) {
const objects = useFetch({
url: `database-connections/list-objects?id=${id}&database=${database}`,
reloadTrigger: `database-structure-changed-${id}-${database}`,
url: `database-connections/list-objects?conid=${conid}&database=${database}`,
reloadTrigger: `database-structure-changed-${conid}-${database}`,
});
const { tables } = objects || {};
return (
<>
<AppObjectList list={(tables || []).map(x => ({ ...x, id, database }))} makeAppObj={tableAppObject} />
<AppObjectList list={(tables || []).map(x => ({ ...x, conid, database }))} makeAppObj={tableAppObject} />
</>
);
}
@@ -74,7 +74,7 @@ function SqlObjectListWrapper() {
if (!db) return <div>(Choose database)</div>;
const { name, connection } = db;
return <SqlObjectList id={connection._id} database={name} />;
return <SqlObjectList conid={connection._id} database={name} />;
// return <div>tables of {db && db.name}</div>
// return <div>tables of {JSON.stringify(db)}</div>
}