app object refactor WIP

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

View File

@@ -1,7 +1,7 @@
import React from 'react';
import styled from 'styled-components';
import TableControl, { TableColumn } from './TableControl';
import { AppObjectControl } from '../appobj/AppObjects';
// import { AppObjectControl } from '../appobj/AppObjects';
import useTheme from '../theme/useTheme';
const ObjectListWrapper = styled.div`
@@ -39,7 +39,7 @@ export default function ObjectListControl({ collection = [], title, showIfEmpty
<TableColumn
fieldName="displayName"
header="Name"
formatter={(col) => <AppObjectControl data={col} makeAppObj={makeAppObj} component="span" />}
// formatter={(col) => <AppObjectControl data={col} makeAppObj={makeAppObj} component="span" />}
/>
{children}
</TableControl>

View File

@@ -80,31 +80,31 @@ export function useUpdateDatabaseForTab(tabVisible, conid, database) {
}
}
export function useAppObjectParams() {
const setOpenedTabs = useSetOpenedTabs();
const currentDatabase = useCurrentDatabase();
const newQuery = useNewQuery();
const openedTabs = useOpenedTabs();
const openedConnections = useOpenedConnections();
const setOpenedConnections = useSetOpenedConnections();
const currentArchive = useCurrentArchive();
const showModal = useShowModal();
const config = useConfig();
const extensions = useExtensions();
// export function useAppObjectParams() {
// const setOpenedTabs = useSetOpenedTabs();
// const currentDatabase = useCurrentDatabase();
// const newQuery = useNewQuery();
// const openedTabs = useOpenedTabs();
// const openedConnections = useOpenedConnections();
// const setOpenedConnections = useSetOpenedConnections();
// const currentArchive = useCurrentArchive();
// const showModal = useShowModal();
// const config = useConfig();
// const extensions = useExtensions();
return {
setOpenedTabs,
currentDatabase,
currentArchive,
newQuery,
openedTabs,
openedConnections,
setOpenedConnections,
config,
showModal,
extensions,
};
}
// return {
// setOpenedTabs,
// currentDatabase,
// currentArchive,
// newQuery,
// openedTabs,
// openedConnections,
// setOpenedConnections,
// config,
// showModal,
// extensions,
// };
// }
const [OpenedConnectionsProvider, useOpenedConnections, useSetOpenedConnections] = createGlobalState([]);