From c76a61e50abc965613d8795014a98102b87981ca Mon Sep 17 00:00:00 2001 From: tglide <26071571+TGlide@users.noreply.github.com> Date: Mon, 24 Jul 2023 11:09:09 +0100 Subject: [PATCH] feat: import from org settings --- src/lib/commandCenter/commandCenter.svelte | 1 - src/lib/commandCenter/commands.ts | 2 - src/lib/commandCenter/panels/template.svelte | 14 ++-- src/lib/elements/forms/inputText.svelte | 1 - src/routes/console/+layout.svelte | 39 ++--------- .../organization-[organization]/+page.svelte | 67 ++++++++++++++----- .../console/project-[project]/+layout.svelte | 30 ++++++++- .../migrations/(import)/wizard.svelte | 2 +- 8 files changed, 93 insertions(+), 63 deletions(-) diff --git a/src/lib/commandCenter/commandCenter.svelte b/src/lib/commandCenter/commandCenter.svelte index 447ccb336..5fc9aad48 100644 --- a/src/lib/commandCenter/commandCenter.svelte +++ b/src/lib/commandCenter/commandCenter.svelte @@ -14,7 +14,6 @@ }; export const toggleCommandCenter = () => { - console.log('toggleCommandCenter'); if (get(subPanels).length > 0) { clearSubPanels(); } else { diff --git a/src/lib/commandCenter/commands.ts b/src/lib/commandCenter/commands.ts index c6a8afdfe..386536396 100644 --- a/src/lib/commandCenter/commands.ts +++ b/src/lib/commandCenter/commands.ts @@ -288,7 +288,6 @@ export const registerSearchers = { runner((...searchers: Searcher[]) => { searchersMap.update((curr) => { - console.log(curr); curr.set(uuid, [...searchers]); return curr; }); @@ -296,7 +295,6 @@ export const registerSearchers = { return () => { searchersMap.update((curr) => { - console.log('deleting', curr, uuid); curr.delete(uuid); return curr; }); diff --git a/src/lib/commandCenter/panels/template.svelte b/src/lib/commandCenter/panels/template.svelte index bfc1bdcaa..043d6b22b 100644 --- a/src/lib/commandCenter/panels/template.svelte +++ b/src/lib/commandCenter/panels/template.svelte @@ -81,18 +81,15 @@ if (selectedIdx === 0) { contentEl.scrollTo({ - top: 0, - behavior: 'smooth' + top: 0 }); } else if (selectedIdx === resultEls.length - 1) { contentEl.scrollTo({ - top: contentEl.scrollHeight, - behavior: 'smooth' + top: contentEl.scrollHeight }); } else if (selectedEl) { selectedEl.scrollIntoView({ - block: 'nearest', - behavior: 'smooth' + block: 'nearest' }); } }); @@ -272,10 +269,7 @@ class:first-nested={isFirstNested(i)} class:last-nested={isLastNested(i)}> {#if isSelected} -
+
{/if} + + + + (showCreate = true)}>Empty project + +
+ Import project Experimental +
+
+
+
{#if data.projects.total} diff --git a/src/routes/console/project-[project]/+layout.svelte b/src/routes/console/project-[project]/+layout.svelte index e445fdd82..02688f938 100644 --- a/src/routes/console/project-[project]/+layout.svelte +++ b/src/routes/console/project-[project]/+layout.svelte @@ -5,10 +5,11 @@ import { project, stats } from './store'; import { goto } from '$app/navigation'; - import { registerCommands, registerSearchers } from '$lib/commandCenter'; + import { addSubPanel, registerCommands, registerSearchers } from '$lib/commandCenter'; import { dbSearcher, userSearcher } from '$lib/commandCenter/searchers'; import { MigrationBox } from '$lib/components'; + import { UsersPanel, TeamsPanel, DatabasesPanel } from '$lib/commandCenter/panels'; onMount(async () => { return sdk.forConsole.client.subscribe(['project', 'console'], (response) => { @@ -69,6 +70,33 @@ }, keys: ['p'], group: 'navigation' + }, + { + label: 'Find Users', + callback: () => { + addSubPanel(UsersPanel); + }, + group: 'users', + icon: 'search', + keys: ['f', 'u'] + }, + { + label: 'Find Teams', + callback: () => { + addSubPanel(TeamsPanel); + }, + group: 'teams', + icon: 'search', + keys: ['f', 't'] + }, + { + label: 'Find Databases', + callback: () => { + addSubPanel(DatabasesPanel); + }, + group: 'databases', + icon: 'search', + keys: ['f', 'd'] } ]); diff --git a/src/routes/console/project-[project]/settings/migrations/(import)/wizard.svelte b/src/routes/console/project-[project]/settings/migrations/(import)/wizard.svelte index 7aa0cb858..799cbadcb 100644 --- a/src/routes/console/project-[project]/settings/migrations/(import)/wizard.svelte +++ b/src/routes/console/project-[project]/settings/migrations/(import)/wizard.svelte @@ -20,7 +20,7 @@ const onFinish = async () => { const resources = migrationFormToResources($formData); console.log('resources', resources); - return; + switch ($provider.provider) { case 'appwrite': { const res = await sdk.forProject.migrations.migrateAppwrite(