From 5256a13e60f11bee303f0363f1d149e7f54f4723 Mon Sep 17 00:00:00 2001
From: tglide <26071571+TGlide@users.noreply.github.com>
Date: Tue, 20 Jun 2023 17:42:32 +0100
Subject: [PATCH 1/3] refactor: small changes
---
src/lib/stores/sdk.ts | 6 +++---
.../settings/migrations/(import)/index.ts | 11 ++++++++---
.../settings/migrations/(import)/wizard.svelte | 2 +-
.../settings/migrations/+page.svelte | 6 +++---
.../project-[project]/settings/migrations/+page.ts | 4 ++--
5 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/src/lib/stores/sdk.ts b/src/lib/stores/sdk.ts
index d79e6e25d..56e907bc7 100644
--- a/src/lib/stores/sdk.ts
+++ b/src/lib/stores/sdk.ts
@@ -13,7 +13,7 @@ import {
Storage,
Teams,
Users,
- Imports
+ Migrations
} from '@appwrite.io/console';
const endpoint = VARS.APPWRITE_ENDPOINT ?? `${globalThis?.location?.origin}/v1`;
@@ -35,7 +35,7 @@ const sdkForProject = {
storage: new Storage(clientProject),
teams: new Teams(clientProject),
users: new Users(clientProject),
- imports: new Imports(clientProject)
+ migrations: new Migrations(clientProject)
};
export const sdk = {
@@ -49,7 +49,7 @@ export const sdk = {
projects: new Projects(clientConsole),
teams: new Teams(clientConsole),
users: new Users(clientConsole),
- imports: new Imports(clientConsole)
+ migrations: new Migrations(clientConsole)
},
get forProject() {
const projectId = getProjectId();
diff --git a/src/routes/console/project-[project]/settings/migrations/(import)/index.ts b/src/routes/console/project-[project]/settings/migrations/(import)/index.ts
index 599be6880..b2b860bd9 100644
--- a/src/routes/console/project-[project]/settings/migrations/(import)/index.ts
+++ b/src/routes/console/project-[project]/settings/migrations/(import)/index.ts
@@ -1,3 +1,8 @@
+import {
+ PUBLIC_MOCK_APIKEY,
+ PUBLIC_MOCK_ENDPOINT,
+ PUBLIC_MOCK_PROJECTID
+} from '$env/static/public';
import { wizard } from '$lib/stores/wizard';
import { writable } from 'svelte/store';
import Wizard from './wizard.svelte';
@@ -40,9 +45,9 @@ type ProviderInput = AppwriteInput | NhostInput | SupabaseInput | FirebaseInput;
const initialProvider: ProviderInput = { provider: 'appwrite' };
const mockProvider: ProviderInput = {
provider: 'appwrite',
- endpoint: 'https://torsten.appwrite.org/v1',
- apiKey: '34c94260f05d44325aefe025acb33fc1f814647e9fa87050b8751f1182f7cf4a8e2aed09e9b29477fafedb3d0c71e46478e8b9f0bcab3604ff927972deeaaf99272ab63cc30a087fc1e09a86a4d8e3363caf88b9e003e0e7321e6021f90fa147468e5caa1bb43e8fef5ca0d8b2e048272f37f7b1c001a19524b21bc41d9ac2bd',
- projectID: '642c3cddd42da42e1bc6'
+ endpoint: PUBLIC_MOCK_ENDPOINT,
+ apiKey: PUBLIC_MOCK_APIKEY,
+ projectID: PUBLIC_MOCK_PROJECTID
};
export const provider = writable({ ...mockProvider });
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 b4d0dbd74..54c80ba7a 100644
--- a/src/routes/console/project-[project]/settings/migrations/(import)/wizard.svelte
+++ b/src/routes/console/project-[project]/settings/migrations/(import)/wizard.svelte
@@ -17,7 +17,7 @@
const onFinish = async () => {
const resources = formDataToResources($formData);
if ($provider.provider === 'appwrite') {
- const res = await sdk.forProject.imports.importAppwrite(
+ const res = await sdk.forProject.migrations.importAppwrite(
resources,
$provider.endpoint,
$provider.projectID,
diff --git a/src/routes/console/project-[project]/settings/migrations/+page.svelte b/src/routes/console/project-[project]/settings/migrations/+page.svelte
index 8179c4ca8..ff7b28c8d 100644
--- a/src/routes/console/project-[project]/settings/migrations/+page.svelte
+++ b/src/routes/console/project-[project]/settings/migrations/+page.svelte
@@ -27,7 +27,7 @@
let showCloudExport = false;
const mockImport = async () => {
- console.log(await sdk.forProject.imports.list());
+ console.log(await sdk.forProject.migrations.list());
};
mockImport();
@@ -116,7 +116,7 @@
Import data from other products or from a different Appwrite instance
- {#if data.imports.length}
+ {#if data.migrations.length}
Import data
@@ -131,7 +131,7 @@
- {#each data.imports as entry}
+ {#each data.migrations as entry}
{@const source = capitalize(JSON.parse(entry.source).type)}
{@const status = getStatus(entry.status)}
diff --git a/src/routes/console/project-[project]/settings/migrations/+page.ts b/src/routes/console/project-[project]/settings/migrations/+page.ts
index fe38293d4..95cb09514 100644
--- a/src/routes/console/project-[project]/settings/migrations/+page.ts
+++ b/src/routes/console/project-[project]/settings/migrations/+page.ts
@@ -4,9 +4,9 @@ import { sdk } from '$lib/stores/sdk';
export async function load({ depends }) {
depends(Dependencies.MIGRATIONS);
- // const { imports } = await sdk.forProject.imports.list();
+ const { migrations } = await sdk.forProject.migrations.list();
return {
- imports: []
+ migrations: []
};
}
From f32e1d58b53b48d2131cae1eb26b7235b3352d92 Mon Sep 17 00:00:00 2001
From: tglide <26071571+TGlide@users.noreply.github.com>
Date: Mon, 3 Jul 2023 13:19:48 +0100
Subject: [PATCH 2/3] refactor: migrations
---
package.json | 2 +-
src/lib/constants.ts | 10 ++++
.../settings/migrations/(import)/index.ts | 48 +++++++++----------
.../migrations/(import)/wizard.svelte | 34 +++++++++----
.../settings/migrations/+page.svelte | 4 +-
.../settings/migrations/+page.ts | 2 +-
6 files changed, 63 insertions(+), 37 deletions(-)
diff --git a/package.json b/package.json
index 2a9ce4161..71ceda1f8 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,7 @@
},
"dependencies": {
"@analytics/google-analytics": "^1.0.5",
- "@appwrite.io/console": "0.1.0",
+ "@appwrite.io/console": "^0.1.1",
"@appwrite.io/pink": "^0.0.6-rc.14",
"@popperjs/core": "^2.11.6",
"@sentry/svelte": "^7.44.2",
diff --git a/src/lib/constants.ts b/src/lib/constants.ts
index 8c387aa82..ccdf6c6a0 100644
--- a/src/lib/constants.ts
+++ b/src/lib/constants.ts
@@ -169,6 +169,16 @@ export const scopes: {
scope: 'health.read',
description: "Access to read your project's health status",
category: 'Other'
+ },
+ {
+ scope: 'migrations.read',
+ description: "Access to read your project's migration status",
+ category: 'Other'
+ },
+ {
+ scope: 'migrations.write',
+ description: 'Access to create migrations',
+ category: 'Other'
}
];
diff --git a/src/routes/console/project-[project]/settings/migrations/(import)/index.ts b/src/routes/console/project-[project]/settings/migrations/(import)/index.ts
index b2b860bd9..acb8feba2 100644
--- a/src/routes/console/project-[project]/settings/migrations/(import)/index.ts
+++ b/src/routes/console/project-[project]/settings/migrations/(import)/index.ts
@@ -73,48 +73,48 @@ type FormData = typeof initialFormData;
export const formData = writable({ ...initialFormData });
type Resource =
- | 'user'
- | 'team'
- | 'teammembership'
- | 'file'
- | 'bucket'
- | 'function'
- | 'envvar'
- | 'deployment'
- | 'database'
- | 'collection'
- | 'index'
- | 'attribute'
- | 'document';
+ | 'User'
+ | 'Team'
+ | 'Membership'
+ | 'File'
+ | 'Bucket'
+ | 'Function'
+ | 'EnvVar'
+ | 'Deployment'
+ | 'Database'
+ | 'Collection'
+ | 'Index'
+ | 'Attribute'
+ | 'Document';
export const formDataToResources = (formData: FormData): Resource[] => {
const resources: Resource[] = [];
if (formData.users.root) {
- resources.push('user');
+ resources.push('User');
}
if (formData.users.teams) {
- resources.push('team');
- resources.push('teammembership');
+ resources.push('Team');
+ resources.push('Membership');
}
if (formData.databases.root) {
- resources.push('database');
+ resources.push('Database');
}
if (formData.databases.documents) {
- resources.push('collection');
- resources.push('document');
+ resources.push('Collection');
+ resources.push('Document');
}
if (formData.functions.root) {
- resources.push('function');
+ resources.push('Function');
}
if (formData.functions.env) {
- resources.push('envvar');
+ resources.push('EnvVar');
}
if (formData.functions.inactive) {
- resources.push('deployment');
+ resources.push('Deployment');
}
if (formData.storage.root) {
- resources.push('bucket');
- resources.push('file');
+ resources.push('Bucket');
+ resources.push('File');
}
return resources;
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 54c80ba7a..3be65b14c 100644
--- a/src/routes/console/project-[project]/settings/migrations/(import)/wizard.svelte
+++ b/src/routes/console/project-[project]/settings/migrations/(import)/wizard.svelte
@@ -16,15 +16,31 @@
const onFinish = async () => {
const resources = formDataToResources($formData);
- if ($provider.provider === 'appwrite') {
- const res = await sdk.forProject.migrations.importAppwrite(
- resources,
- $provider.endpoint,
- $provider.projectID,
- $provider.apiKey
- );
- console.log(res);
- invalidate(Dependencies.MIGRATIONS);
+ switch ($provider.provider) {
+ case 'appwrite': {
+ const res = await sdk.forProject.migrations.migrationAppwrite(
+ resources,
+ $provider.endpoint,
+ $provider.projectID,
+ $provider.apiKey
+ );
+ console.log(res);
+ invalidate(Dependencies.MIGRATIONS);
+ break;
+ }
+ case 'supabase': {
+ const res = await sdk.forProject.migrations.migrationSupabase(
+ resources,
+ $provider.endpoint,
+ $provider.apiKey,
+ $provider.host,
+ $provider.username,
+ $provider.password,
+ $provider.port
+ );
+ console.log(res);
+ invalidate(Dependencies.MIGRATIONS);
+ }
}
resetImportStores();
wizard.hide();
diff --git a/src/routes/console/project-[project]/settings/migrations/+page.svelte b/src/routes/console/project-[project]/settings/migrations/+page.svelte
index ff7b28c8d..9b5f2be08 100644
--- a/src/routes/console/project-[project]/settings/migrations/+page.svelte
+++ b/src/routes/console/project-[project]/settings/migrations/+page.svelte
@@ -26,11 +26,11 @@
let showDetails = false;
let showCloudExport = false;
- const mockImport = async () => {
+ const mockMigrate = async () => {
console.log(await sdk.forProject.migrations.list());
};
- mockImport();
+ mockMigrate();
const getStatus = (status: string) => {
if (status === 'failed') {
diff --git a/src/routes/console/project-[project]/settings/migrations/+page.ts b/src/routes/console/project-[project]/settings/migrations/+page.ts
index 95cb09514..856641313 100644
--- a/src/routes/console/project-[project]/settings/migrations/+page.ts
+++ b/src/routes/console/project-[project]/settings/migrations/+page.ts
@@ -4,7 +4,7 @@ import { sdk } from '$lib/stores/sdk';
export async function load({ depends }) {
depends(Dependencies.MIGRATIONS);
- const { migrations } = await sdk.forProject.migrations.list();
+ // const { migrations } = await sdk.forProject.migrations.list();
return {
migrations: []
From 21de81de00dbd125235b84743f7b4863f58f6825 Mon Sep 17 00:00:00 2001
From: tglide <26071571+TGlide@users.noreply.github.com>
Date: Wed, 5 Jul 2023 17:21:40 +0100
Subject: [PATCH 3/3] refactor: details modal & self-hosted screens
---
package-lock.json | 8 +-
.../settings/migrations/+page.svelte | 226 +++++++-----------
.../settings/migrations/+page.ts | 4 +-
.../settings/migrations/details.svelte | 138 ++++++-----
4 files changed, 162 insertions(+), 214 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index 2fd48112c..5e9d34e1b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -7,7 +7,7 @@
"name": "@appwrite/console",
"dependencies": {
"@analytics/google-analytics": "^1.0.5",
- "@appwrite.io/console": "0.1.0",
+ "@appwrite.io/console": "^0.1.1",
"@appwrite.io/pink": "^0.0.6-rc.14",
"@popperjs/core": "^2.11.6",
"@sentry/svelte": "^7.44.2",
@@ -147,9 +147,9 @@
"integrity": "sha512-1Yw7u/COtxx06BfwlI+kVhsa/upKYzmCNrT4c8QDeCY2KMYlnijkUjtHiPU08HxyTIVB5j6d75O0YWVIHwQS8g=="
},
"node_modules/@appwrite.io/console": {
- "version": "0.1.0",
- "resolved": "https://registry.npmjs.org/@appwrite.io/console/-/console-0.1.0.tgz",
- "integrity": "sha512-GzCRUmaXAVgpGwxBNI3PrtCLHz7CM+epBHDDTHw8B2u61KbijGBO3GrwreXy91fy00RJiEzGlMSRzDgwsF3Tsg==",
+ "version": "0.1.1",
+ "resolved": "https://registry.npmjs.org/@appwrite.io/console/-/console-0.1.1.tgz",
+ "integrity": "sha512-7aBh/8QxKmaMsP9tVJgNsrOBstuikKasSUoSyRNxblK3J/OdPXnQRInZELT9uaK+vqjZaCYspA3B+5UH+DZ9Dw==",
"dependencies": {
"cross-fetch": "3.1.5",
"isomorphic-form-data": "2.0.0"
diff --git a/src/routes/console/project-[project]/settings/migrations/+page.svelte b/src/routes/console/project-[project]/settings/migrations/+page.svelte
index 9b5f2be08..bfd194561 100644
--- a/src/routes/console/project-[project]/settings/migrations/+page.svelte
+++ b/src/routes/console/project-[project]/settings/migrations/+page.svelte
@@ -16,14 +16,13 @@
import { isSameDay, toLocaleDate } from '$lib/helpers/date';
import { capitalize } from '$lib/helpers/string';
import { Container } from '$lib/layout';
- import { migrator } from '$lib/stores/migrator';
import { sdk } from '$lib/stores/sdk';
import { isSelfHosted } from '$lib/system';
import { openImportWizard } from './(import)';
import Details from './details.svelte';
export let data;
- let showDetails = false;
+ let details: (typeof data.migrations)[number] | null = null;
let showCloudExport = false;
const mockMigrate = async () => {
@@ -34,7 +33,7 @@
const getStatus = (status: string) => {
if (status === 'failed') {
- return { text: 'Failed', icon: 'clock', iconColor: 'blue' };
+ return { text: 'Failed', icon: 'exclamation', iconColor: 'danger' };
}
return { text: 'Pending', icon: 'clock', iconColor: 'blue' };
@@ -43,54 +42,93 @@
Migrations
- {#if isSelfHosted}
-
- Import project data
-
- Import project data from Cloud to your self-hosted project. Initiate the process of
- importing project data from the migrations settings of your Cloud project.
-
-
- {#if $migrator.status === 'idle'}
-
-
-
- Date
- Source
- Status
-
-
-
- Today
- Heaven
- Awesome
-
- (showDetails = true)}
- >Details
-
-
-
- {:else}
-
-
-
No imported data yet
+
+ Import project data
+ Import data from other products or from a different Appwrite instance
+
+ {#if data.migrations.length}
+
+
+ Import data
- {/if}
-
-
+
+
+
+
+ Date
+ Source
+ Status
+
+
+
+ {#each data.migrations as entry}
+
+ {@const source = capitalize(JSON.parse(entry.source).type)}
+ {@const status = getStatus(entry.status)}
+
+ {isSameDay(new Date(), new Date(entry.$createdAt))
+ ? 'Today'
+ : toLocaleDate(entry.$createdAt)}
+
+ {source}
+
+
+
+ {status.text}
+
+
+
+ (details = entry)}
+ >Details
+
+
+ {/each}
+
+
+ {:else}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Import data
+
+
+ {/if}
+
+
+ {#if isSelfHosted}
Deploy to Cloud
Export data from your project to Appwrite Cloud
@@ -110,94 +148,6 @@
{:else}
-
- Import project data
-
- Import data from other products or from a different Appwrite instance
-
-
- {#if data.migrations.length}
-
-
-
-
- Date
- Source
- Status
-
-
-
- {#each data.migrations as entry}
-
- {@const source = capitalize(JSON.parse(entry.source).type)}
- {@const status = getStatus(entry.status)}
-
- {isSameDay(new Date(), new Date(entry.$createdAt))
- ? 'Today'
- : toLocaleDate(entry.$createdAt)}
-
- {source}
-
-
-
- {status.text}
-
-
-
- (showDetails = true)}
- >Details
-
-
- {/each}
-
-
- {:else}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Import data
-
-
- {/if}
-
-
Export to self-hosted instance
Export data from your project to a self-hosted instance
@@ -262,7 +212,7 @@
-
+