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

app object refactor WIP

Browse Source
This commit is contained in:
Jan Prochazka
2020-12-03 11:35:27 +01:00
parent d693cb734b
commit 9bf755ff25
17 changed files with 313 additions and 244 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/web/src/widgets/ArchiveWidget.js
View File

@@ -6,8 +6,8 @@ import { useCurrentArchive, useSetCurrentArchive } from '../utility/globalState'
import { SearchBoxWrapper, WidgetsInnerContainer } from './WidgetStyles';
import WidgetColumnBar, { WidgetColumnBarItem } from './WidgetColumnBar';
import { useArchiveFiles, useArchiveFolders } from '../utility/metadataLoaders';
import archiveFolderAppObject from '../appobj/archiveFolderAppObject';
import archiveFileAppObject from '../appobj/archiveFileAppObject';
import ArchiveFolderAppObject from '../appobj/ArchiveFolderAppObject';
import ArchiveFileAppObject from '../appobj/ArchiveFileAppObject';
import SearchInput from './SearchInput';
import InlineButton from './InlineButton';
import axios from '../utility/axios';
@@ -31,7 +31,7 @@ function ArchiveFolderList() {
<WidgetsInnerContainer>
<AppObjectList
list={_.sortBy(folders, 'name')}
makeAppObj={archiveFolderAppObject()}
AppObjectComponent={ArchiveFolderAppObject}
onObjectClick={(archive) => setArchive(archive.name)}
filter={filter}
/>
@@ -61,7 +61,7 @@ function ArchiveFilesList() {
folderName: folder,
}))}
filter={filter}
makeAppObj={archiveFileAppObject()}
AppObjectComponent={ArchiveFileAppObject}
/>
</WidgetsInnerContainer>
</>

17
packages/web/src/widgets/DatabaseWidget.js
View File

@@ -2,11 +2,11 @@ import React from 'react';
import _ from 'lodash';
import { AppObjectList } from '../appobj/AppObjectList';
import connectionAppObject from '../appobj/connectionAppObject';
import databaseAppObject from '../appobj/databaseAppObject';
import ConnectionAppObject from '../appobj/ConnectionAppObject';
import DatabaseAppObject from '../appobj/DatabaseAppObject';
import { useSetCurrentDatabase, useCurrentDatabase, useOpenedConnections } from '../utility/globalState';
import InlineButton from './InlineButton';
import databaseObjectAppObject from '../appobj/databaseObjectAppObject';
import DatabaseObjectAppObject from '../appobj/DatabaseObjectAppObject';
import {
// useSqlObjectList,
useDatabaseList,
@@ -41,7 +41,8 @@ function SubDatabaseList({ data }) {
return (
<AppObjectList
list={(databases || []).map((db) => ({ ...db, connection: data }))}
makeAppObj={databaseAppObject({ boldCurrentDatabase: true })}
AppObjectComponent={DatabaseAppObject}
// makeAppObj={databaseAppObject({ boldCurrentDatabase: true })}
onObjectClick={handleDatabaseClick}
/>
);
@@ -73,9 +74,11 @@ function ConnectionList() {
<WidgetsInnerContainer>
<AppObjectList
list={connectionsWithStatus}
makeAppObj={connectionAppObject({ boldCurrentDatabase: true })}
AppObjectComponent={ConnectionAppObject}
// makeAppObj={connectionAppObject({ boldCurrentDatabase: true })}
SubItems={SubDatabaseList}
filter={filter}
isExpandable={(data) => openedConnections.includes(data._id)}
/>
</WidgetsInnerContainer>
</>
@@ -112,8 +115,8 @@ function SqlObjectList({ conid, database }) {
) : (
<AppObjectList
list={objectList.map((x) => ({ ...x, conid, database }))}
makeAppObj={databaseObjectAppObject()}
groupFunc={(appobj) => appobj.groupTitle}
AppObjectComponent={DatabaseObjectAppObject}
groupFunc={(data) => _.startCase(data.objectTypeField)}
filter={filter}
/>
)}

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

@@ -3,9 +3,9 @@ import _ from 'lodash';
import { AppObjectList } from '../appobj/AppObjectList';
import { useOpenedTabs } from '../utility/globalState';
import closedTabAppObject from '../appobj/closedTabAppObject';
import ClosedTabAppObject from '../appobj/ClosedTabAppObject';
import { WidgetsInnerContainer } from './WidgetStyles';
import savedSqlFileAppObject from '../appobj/savedSqlFileAppObject';
import SavedSqlFileAppObject from '../appobj/SavedSqlFileAppObject';
import WidgetColumnBar, { WidgetColumnBarItem } from './WidgetColumnBar';
import { useFiles } from '../utility/metadataLoaders';
@@ -20,7 +20,7 @@ function ClosedTabsList() {
tabs.filter((x) => x.closedTime),
(x) => -x.closedTime
)}
makeAppObj={closedTabAppObject()}
AppObjectComponent={ClosedTabAppObject}
/>
</WidgetsInnerContainer>
</>
@@ -33,7 +33,7 @@ function SavedSqlFilesList() {
return (
<>
<WidgetsInnerContainer>
<AppObjectList list={files} makeAppObj={savedSqlFileAppObject()} />
<AppObjectList list={files} AppObjectComponent={SavedSqlFileAppObject} />
</WidgetsInnerContainer>
</>
);