diff --git a/src/lib/constants.ts b/src/lib/constants.ts index b0b6e881c..4ee5ea39e 100644 --- a/src/lib/constants.ts +++ b/src/lib/constants.ts @@ -159,6 +159,16 @@ export const scopes: { description: "Access to execute your project's functions", category: 'Functions' }, + { + scope: 'transfers.read', + description: "Access to read your project's transfers", + category: 'Transfers' + }, + { + scope: 'transfers.write', + description: "Access to create, update, and delete your project's transfers", + category: 'Transfers' + }, { scope: 'locale.read', description: "Access to access your project's Locale service", diff --git a/src/lib/stores/project-services.ts b/src/lib/stores/project-services.ts index ef8a1c444..40a4c9cdf 100644 --- a/src/lib/stores/project-services.ts +++ b/src/lib/stores/project-services.ts @@ -59,6 +59,11 @@ function createServices() { label: 'GraphQL', method: 'graphql', value: null + }, + { + label: 'Transfers', + method: 'Transfers', + value: null } ] }); @@ -117,6 +122,11 @@ function createServices() { label: 'GraphQL', method: 'graphql', value: project.serviceStatusForGraphql + }, + { + label: 'Transfers', + method: 'Transfers', + value: project.serviceStatusForTransfers } ]; set({ list }); diff --git a/src/routes/console/project-[project]/overview/keys/scopes.svelte b/src/routes/console/project-[project]/overview/keys/scopes.svelte index ac9ae7c86..fca8dd920 100644 --- a/src/routes/console/project-[project]/overview/keys/scopes.svelte +++ b/src/routes/console/project-[project]/overview/keys/scopes.svelte @@ -12,6 +12,7 @@ Database = 'Database', Functions = 'Functions', Storage = 'Storage', + Transfers = 'Transfers', Other = 'Other' } @@ -87,7 +88,7 @@ - {#each [Category.Auth, Category.Database, Category.Functions, Category.Storage, Category.Other] as category} + {#each [Category.Auth, Category.Database, Category.Functions, Category.Storage, Category.Transfers, Category.Other] as category} {@const checked = categoryState(category, scopes)} diff --git a/src/routes/console/project-[project]/settings/transfers/[[page]]/+page.svelte b/src/routes/console/project-[project]/settings/transfers/[[page]]/+page.svelte index cd191b4e0..e8683b951 100644 --- a/src/routes/console/project-[project]/settings/transfers/[[page]]/+page.svelte +++ b/src/routes/console/project-[project]/settings/transfers/[[page]]/+page.svelte @@ -1,7 +1,7 @@ @@ -91,7 +84,7 @@ {permission} - {#if errors[permission]} + {#if errors[permission] && errors[permission].length > 0} {#each errors[permission] as error} {error}
@@ -99,7 +92,7 @@
{/if}
- +
-
+
{`${$destination.type} diff --git a/src/routes/console/project-[project]/settings/transfers/sources/[[page]]/+page.svelte b/src/routes/console/project-[project]/settings/transfers/sources/[[page]]/+page.svelte index 7c4c6852a..c207ac3f8 100644 --- a/src/routes/console/project-[project]/settings/transfers/sources/[[page]]/+page.svelte +++ b/src/routes/console/project-[project]/settings/transfers/sources/[[page]]/+page.svelte @@ -54,7 +54,7 @@ href={`${base}/console/project-${project}/settings/transfers/sources/source-${source.$id}`}>
-
+
technology diff --git a/src/routes/console/project-[project]/settings/transfers/sources/source-[source]/[[page]]/+page.svelte b/src/routes/console/project-[project]/settings/transfers/sources/source-[source]/[[page]]/+page.svelte index 4c69e0da7..c03229fa3 100644 --- a/src/routes/console/project-[project]/settings/transfers/sources/source-[source]/[[page]]/+page.svelte +++ b/src/routes/console/project-[project]/settings/transfers/sources/source-[source]/[[page]]/+page.svelte @@ -18,16 +18,14 @@ import { addNotification } from '$lib/stores/notifications'; import { sdkForProject } from '$lib/stores/sdk'; import { onMount } from 'svelte'; - + import type { PageData } from './$types'; const permissions = ['Users', 'Databases', 'Documents', 'Files', 'Functions']; + export let data: PageData; + let isChecking = false; let errorMessage = null; - let errors = permissions.map((permission) => { - return { - [permission]: false - }; - }); + let errors = {}; const sourceId = $page.params.source; const runChecks = async () => { @@ -35,7 +33,14 @@ errorMessage = null; try { - await sdkForProject.transfers.validateSource(sourceId); + let result = await sdkForProject.transfers.validateSource(sourceId); + + addNotification({ + message: `Destination is valid`, + type: 'success' + }); + + errors = result.errors ?? {}; isChecking = false; } catch (error) { @@ -44,17 +49,19 @@ title: 'Error', message: error.message }); - errors = error.response.errors; + errors = error.response.errors ?? {}; errorMessage = error.message; - console.error(error); } isChecking = false; }; onMount(() => { - runChecks(); + let lastCheck: any = data.source.lastCheck; + + errors = lastCheck.errors ?? {}; + errorMessage = lastCheck.errorMessage ?? null; }); @@ -79,7 +86,7 @@ {permission} - {#if errors[permission]} + {#if errors[permission] && errors[permission].length > 0} {#each errors[permission] as error} {error}
diff --git a/src/routes/console/project-[project]/settings/transfers/sources/source-[source]/settings/+page.svelte b/src/routes/console/project-[project]/settings/transfers/sources/source-[source]/settings/+page.svelte index 226ca1374..d48a59c94 100644 --- a/src/routes/console/project-[project]/settings/transfers/sources/source-[source]/settings/+page.svelte +++ b/src/routes/console/project-[project]/settings/transfers/sources/source-[source]/settings/+page.svelte @@ -15,7 +15,7 @@
-
+
{`${$source.type} diff --git a/src/routes/console/project-[project]/settings/transfers/transfer-[transfer]/[[page]]/+page.svelte b/src/routes/console/project-[project]/settings/transfers/transfer-[transfer]/[[page]]/+page.svelte index 394c06380..19cc9eb08 100644 --- a/src/routes/console/project-[project]/settings/transfers/transfer-[transfer]/[[page]]/+page.svelte +++ b/src/routes/console/project-[project]/settings/transfers/transfer-[transfer]/[[page]]/+page.svelte @@ -1,9 +1,77 @@
- + +
+ +
+
+

Transfer ID:

+ {$transfer.$id} +
+
+
+ +
+
+

Created at: {toLocaleDateTime($transfer.$createdAt)}

+

Updated at: {toLocaleDateTime($transfer.$updatedAt)}

+
+
+ + {$transfer.status} + + +
+
+
+ + + + +
diff --git a/src/routes/console/project-[project]/settings/transfers/transfer-[transfer]/logs/+page.svelte b/src/routes/console/project-[project]/settings/transfers/transfer-[transfer]/logs/+page.svelte index 9e03f0587..418fc5bd7 100644 --- a/src/routes/console/project-[project]/settings/transfers/transfer-[transfer]/logs/+page.svelte +++ b/src/routes/console/project-[project]/settings/transfers/transfer-[transfer]/logs/+page.svelte @@ -1,5 +1,10 @@ - + +
+ Logs +
+
diff --git a/src/routes/console/project-[project]/settings/transfers/transfer-[transfer]/settings/+page.svelte b/src/routes/console/project-[project]/settings/transfers/transfer-[transfer]/settings/+page.svelte index ffda5c194..d1fe75ed6 100644 --- a/src/routes/console/project-[project]/settings/transfers/transfer-[transfer]/settings/+page.svelte +++ b/src/routes/console/project-[project]/settings/transfers/transfer-[transfer]/settings/+page.svelte @@ -20,7 +20,7 @@
-
+
🛫
@@ -44,7 +44,7 @@ -
+
technology @@ -59,7 +59,7 @@ {:else}
-
+
@@ -74,10 +74,10 @@ -
+
technology + alt="destination provider" />
{data.destination.name} @@ -89,7 +89,7 @@ {:else}
-
+
diff --git a/src/routes/console/project-[project]/settings/transfers/wizard/createDestination/FirebaseAuthflow.svelte b/src/routes/console/project-[project]/settings/transfers/wizard/createDestination/FirebaseAuthflow.svelte deleted file mode 100644 index 7914f627b..000000000 --- a/src/routes/console/project-[project]/settings/transfers/wizard/createDestination/FirebaseAuthflow.svelte +++ /dev/null @@ -1,4 +0,0 @@ - - -
diff --git a/src/routes/console/project-[project]/settings/transfers/wizard/createDestination/step1.svelte b/src/routes/console/project-[project]/settings/transfers/wizard/createDestination/step1.svelte index 36cd971cc..7b85fab2d 100644 --- a/src/routes/console/project-[project]/settings/transfers/wizard/createDestination/step1.svelte +++ b/src/routes/console/project-[project]/settings/transfers/wizard/createDestination/step1.svelte @@ -19,7 +19,7 @@ type="checkbox" name="isVerified" required - bind:checked={$createDestination.type.length} /> + bind:checked={$createDestination.type} />
    {#each options.filter((p) => p !== 'Local') as destination}
  • diff --git a/src/routes/console/project-[project]/settings/transfers/wizard/createDestination/step2.svelte b/src/routes/console/project-[project]/settings/transfers/wizard/createDestination/step2.svelte index 67769a134..e3599eb4d 100644 --- a/src/routes/console/project-[project]/settings/transfers/wizard/createDestination/step2.svelte +++ b/src/routes/console/project-[project]/settings/transfers/wizard/createDestination/step2.svelte @@ -1,11 +1,14 @@ Provide Credentials Please provide your authentication details for your provider. - {#if $createDestination.type === 'firebase' && !firebaseFallback} - -
    - -
    - {:else} - - {#each Object.keys(credentialSchemas[$createDestination.type]) as key} + + {#each Object.keys(credentialSchemas[$createDestination.type]) as key} + {#if credentialSchemas[$createDestination.type][key].type === 'password'} + + {:else} - {/each} - - {/if} + {/if} + {/each} +
    diff --git a/src/routes/console/project-[project]/settings/transfers/wizard/createDestination/step3.svelte b/src/routes/console/project-[project]/settings/transfers/wizard/createDestination/step3.svelte index 46a1aa4d0..d178199ff 100644 --- a/src/routes/console/project-[project]/settings/transfers/wizard/createDestination/step3.svelte +++ b/src/routes/console/project-[project]/settings/transfers/wizard/createDestination/step3.svelte @@ -18,11 +18,12 @@ import Heading from '$lib/components/heading.svelte'; import Output from '$lib/components/output.svelte'; import Helper from '$lib/elements/forms/helper.svelte'; + import Button from '$lib/elements/forms/button.svelte'; const permissions = ['Users', 'Databases', 'Documents', 'Files', 'Functions']; let errors = permissions.map((permission) => { return { - [permission]: false + [permission]: [] }; }); let isChecking = false; @@ -54,24 +55,14 @@ customId: !!$createDestination.id }); } catch (error) { - if (error.response.errors) { - errors = error.response.errors; - } else { - errors = permissions.map((permission) => { - return { - [permission]: true - }; - }); - } - addNotification({ message: error.message, type: 'error' }); trackError(error, Submit.DestinationValidate); + errors = error.response.errors ?? {}; errorMessage = error.message; - console.error(error); - isChecking = false; + canProgress = false; } } @@ -104,6 +95,11 @@
    {errorMessage}
    + + {/if} @@ -117,7 +113,7 @@ {permission} - {#if errors[permission]} + {#if errors[permission] && errors[permission].length > 0} {#each errors[permission] as error} {error}
    diff --git a/src/routes/console/project-[project]/settings/transfers/wizard/createSource/FirebaseAuthflow.svelte b/src/routes/console/project-[project]/settings/transfers/wizard/createSource/FirebaseAuthflow.svelte index 8b4b85b2a..1a5c1a1d6 100644 --- a/src/routes/console/project-[project]/settings/transfers/wizard/createSource/FirebaseAuthflow.svelte +++ b/src/routes/console/project-[project]/settings/transfers/wizard/createSource/FirebaseAuthflow.svelte @@ -1,9 +1,56 @@
    - +
    +
    + + +
    + Login with google to get started. +
    +
    + +
    +
    +
    +
    diff --git a/src/routes/console/project-[project]/settings/transfers/wizard/createSource/step1.svelte b/src/routes/console/project-[project]/settings/transfers/wizard/createSource/step1.svelte index 00b09e9a1..3fd1cd320 100644 --- a/src/routes/console/project-[project]/settings/transfers/wizard/createSource/step1.svelte +++ b/src/routes/console/project-[project]/settings/transfers/wizard/createSource/step1.svelte @@ -19,7 +19,7 @@ type="checkbox" name="isVerified" required - bind:checked={$createSource.type.length} /> + bind:checked={$createSource.type} />
      {#each options.filter((p) => p !== 'Local') as source}
    • diff --git a/src/routes/console/project-[project]/settings/transfers/wizard/createSource/step2.svelte b/src/routes/console/project-[project]/settings/transfers/wizard/createSource/step2.svelte index 6d52ded45..1d64a5a1a 100644 --- a/src/routes/console/project-[project]/settings/transfers/wizard/createSource/step2.svelte +++ b/src/routes/console/project-[project]/settings/transfers/wizard/createSource/step2.svelte @@ -1,6 +1,7 @@