feat(app): able to set a parent

This commit is contained in:
Quentin Laffont
2022-11-04 10:05:17 +01:00
parent 8c051ff5f7
commit b0d61f974c
5 changed files with 53 additions and 3 deletions

View File

@@ -62,7 +62,7 @@ function getPortalCollections() {
displayName: process.env[`LABEL_${id}`], displayName: process.env[`LABEL_${id}`],
isReadOnly: process.env[`READONLY_${id}`], isReadOnly: process.env[`READONLY_${id}`],
databases: process.env[`DBCONFIG_${id}`] ? safeJsonParse(process.env[`DBCONFIG_${id}`]) : null, databases: process.env[`DBCONFIG_${id}`] ? safeJsonParse(process.env[`DBCONFIG_${id}`]) : null,
parentId: process.env[`PARENT_${id}`] || undefined, parent: process.env[`PARENT_${id}`] || undefined,
// SSH tunnel // SSH tunnel
useSshTunnel: process.env[`USE_SSH_${id}`], useSshTunnel: process.env[`USE_SSH_${id}`],

View File

@@ -10,6 +10,7 @@
export let group; export let group;
export let groupFunc; export let groupFunc;
export let items; export let items;
export let groupIconFunc = plusExpandIcon;
export let module; export let module;
export let checkedObjectsStore = null; export let checkedObjectsStore = null;
export let disableContextMenu = false; export let disableContextMenu = false;
@@ -37,7 +38,7 @@
<div class="group" on:click={() => (isExpanded = !isExpanded)}> <div class="group" on:click={() => (isExpanded = !isExpanded)}>
<span class="expand-icon"> <span class="expand-icon">
<FontIcon icon={plusExpandIcon(isExpanded)} /> <FontIcon icon={groupIconFunc(isExpanded)} />
</span> </span>
{group} {group}

View File

@@ -2,6 +2,7 @@
import _ from 'lodash'; import _ from 'lodash';
import { asyncFilter } from '../utility/common'; import { asyncFilter } from '../utility/common';
import AppObjectGroup from './AppObjectGroup.svelte'; import AppObjectGroup from './AppObjectGroup.svelte';
import { plusExpandIcon } from '../icons/expandIcons';
import AppObjectListItem from './AppObjectListItem.svelte'; import AppObjectListItem from './AppObjectListItem.svelte';
@@ -18,6 +19,7 @@
export let getIsExpanded = null; export let getIsExpanded = null;
export let setIsExpanded = null; export let setIsExpanded = null;
export let groupIconFunc = plusExpandIcon;
export let groupFunc = undefined; export let groupFunc = undefined;
$: filtered = !groupFunc $: filtered = !groupFunc
@@ -71,6 +73,7 @@
{module} {module}
items={groups[group]} items={groups[group]}
{expandIconFunc} {expandIconFunc}
{groupIconFunc}
{isExpandable} {isExpandable}
{subItemsComponent} {subItemsComponent}
{checkedObjectsStore} {checkedObjectsStore}

View File

@@ -217,6 +217,19 @@
disabled={isConnected} disabled={isConnected}
/> />
</div> </div>
</div>
{/if}
{#if driver}
<div>
<div class="is-full select-row">
<!-- TODO: Able to use with svelte-select the possibility to use isCreatable & isClearable -->
<FormTextField
label="Parent Folder"
name="parent"
disabled={isConnected}
/>
</div>
</div> </div>
{/if} {/if}

View File

@@ -25,6 +25,7 @@
import { apiCall } from '../utility/api'; import { apiCall } from '../utility/api';
import LargeButton from '../buttons/LargeButton.svelte'; import LargeButton from '../buttons/LargeButton.svelte';
import { matchingProps } from '../tabs/TableDataTab.svelte'; import { matchingProps } from '../tabs/TableDataTab.svelte';
import { plusExpandIcon, chevronExpandIcon } from '../icons/expandIcons';
const connections = useConnectionList(); const connections = useConnectionList();
const serverStatus = useServerStatus(); const serverStatus = useServerStatus();
@@ -40,6 +41,9 @@
x => !x.unsaved || $openedConnections.includes(x._id) || $openedSingleDatabaseConnections.includes(x._id) x => !x.unsaved || $openedConnections.includes(x._id) || $openedSingleDatabaseConnections.includes(x._id)
); );
$: connectionsWithParent = connectionsWithStatusFiltered ? connectionsWithStatusFiltered?.filter((x) => x.parent !== undefined && x.parent !== null && x.parent.length !== 0) : [];
$: connectionsWithoutParent = connectionsWithStatusFiltered ? connectionsWithStatusFiltered?.filter((x) => x.parent === undefined || x.parent === null || x.parent.length === 0) : [];
const handleRefreshConnections = () => { const handleRefreshConnections = () => {
for (const conid of $openedConnections) { for (const conid of $openedConnections) {
apiCall('server-connections/refresh', { conid }); apiCall('server-connections/refresh', { conid });
@@ -63,7 +67,26 @@
</SearchBoxWrapper> </SearchBoxWrapper>
<WidgetsInnerContainer> <WidgetsInnerContainer>
<AppObjectList <AppObjectList
list={_.sortBy(connectionsWithStatusFiltered, connection => (getConnectionLabel(connection) || '').toUpperCase())} list={_.sortBy(connectionsWithParent, connection => (getConnectionLabel(connection) || '').toUpperCase())}
module={connectionAppObject}
subItemsComponent={SubDatabaseList}
expandOnClick
isExpandable={data => $openedConnections.includes(data._id) && !data.singleDatabase}
{filter}
passProps={{ connectionColorFactory: $connectionColorFactory, showPinnedInsteadOfUnpin: true }}
getIsExpanded={data => $expandedConnections.includes(data._id) && !data.singleDatabase}
setIsExpanded={(data, value) => {
expandedConnections.update(old => (value ? [...old, data._id] : old.filter(x => x != data._id)));
}}
groupIconFunc={chevronExpandIcon}
groupFunc={data => data.parent}
expandIconFunc={plusExpandIcon}
/>
{#if connectionsWithParent?.length > 0 && connectionsWithoutParent?.length > 0}
<div class="br"/>
{/if}
<AppObjectList
list={_.sortBy(connectionsWithoutParent, connection => (getConnectionLabel(connection) || '').toUpperCase())}
module={connectionAppObject} module={connectionAppObject}
subItemsComponent={SubDatabaseList} subItemsComponent={SubDatabaseList}
expandOnClick expandOnClick
@@ -84,3 +107,13 @@
</ToolbarButton> --> </ToolbarButton> -->
{/if} {/if}
</WidgetsInnerContainer> </WidgetsInnerContainer>
<style>
.br {
background: var(--theme-bg-2);
height: 1px;
margin: 5px 10px;
}
</style>