From 70e4a42a9be73ecfa68db2ba8c9013e698ba5c0f Mon Sep 17 00:00:00 2001
From: Arman
Date: Tue, 9 Aug 2022 13:22:54 +0200
Subject: [PATCH 11/23] feat: add error section to modals
---
src/lib/components/modal.svelte | 12 ++++++++++++
.../console/[project]/users/_createTeam.svelte | 9 ++++-----
.../console/[project]/users/_createUser.svelte | 9 ++++-----
3 files changed, 20 insertions(+), 10 deletions(-)
diff --git a/src/lib/components/modal.svelte b/src/lib/components/modal.svelte
index 7843b7c91..3a1263411 100644
--- a/src/lib/components/modal.svelte
+++ b/src/lib/components/modal.svelte
@@ -1,10 +1,12 @@
-
+
Create Team
{
try {
@@ -32,10 +33,7 @@
});
dispatch('created', user);
} catch (error) {
- addNotification({
- type: 'error',
- message: error.message
- });
+ modalError = error.message;
}
};
@@ -44,11 +42,12 @@
}
$: if (!showCreate) {
showDropdown = false;
+ modalError = null;
}
-
+
Create User
Date: Tue, 9 Aug 2022 13:26:52 +0200
Subject: [PATCH 12/23] feat: add missing errors to modals
---
src/routes/console/[project]/users/_appleOAuth.svelte | 9 +++------
src/routes/console/[project]/users/_auth0OAuth.svelte | 9 +++------
src/routes/console/[project]/users/_mainOAuth.svelte | 10 ++++------
.../console/[project]/users/_microsoftOAuth.svelte | 10 ++++------
src/routes/console/[project]/users/_oktaOAuth.svelte | 10 ++++------
5 files changed, 18 insertions(+), 30 deletions(-)
diff --git a/src/routes/console/[project]/users/_appleOAuth.svelte b/src/routes/console/[project]/users/_appleOAuth.svelte
index 157ce1900..4804311f1 100644
--- a/src/routes/console/[project]/users/_appleOAuth.svelte
+++ b/src/routes/console/[project]/users/_appleOAuth.svelte
@@ -9,7 +9,6 @@
Form,
FormList
} from '$lib/elements/forms';
- import { addNotification } from '$lib/stores/notifications';
import { sdkForConsole } from '$lib/stores/sdk';
import type { Provider } from '$lib/stores/oauth-providers';
@@ -17,6 +16,7 @@
export let provider: Provider;
let { keyID, teamID, p8 } = JSON.parse(provider.secret);
+ let modalError: string;
const projectId = $page.params.project;
const update = async () => {
@@ -30,16 +30,13 @@
);
showModal = false;
} catch (error) {
- addNotification({
- type: 'error',
- message: error.message
- });
+ modalError = error.message;
}
};
-
+
{provider.name} OAuth2 Settings
diff --git a/src/routes/console/[project]/users/_auth0OAuth.svelte b/src/routes/console/[project]/users/_auth0OAuth.svelte
index ee16907db..f3dc7425a 100644
--- a/src/routes/console/[project]/users/_auth0OAuth.svelte
+++ b/src/routes/console/[project]/users/_auth0OAuth.svelte
@@ -9,7 +9,6 @@
Form,
FormList
} from '$lib/elements/forms';
- import { addNotification } from '$lib/stores/notifications';
import { sdkForConsole } from '$lib/stores/sdk';
import type { Provider } from '$lib/stores/oauth-providers';
@@ -17,6 +16,7 @@
export let provider: Provider;
let { clientSecret, auth0Domain } = JSON.parse(provider.secret);
+ let modalError: string;
const projectId = $page.params.project;
const update = async () => {
@@ -30,16 +30,13 @@
);
showModal = false;
} catch (error) {
- addNotification({
- type: 'error',
- message: error.message
- });
+ modalError = error.message;
}
};
-
+
{provider.name} OAuth2 Settings
diff --git a/src/routes/console/[project]/users/_mainOAuth.svelte b/src/routes/console/[project]/users/_mainOAuth.svelte
index 85677ab84..7429b7385 100644
--- a/src/routes/console/[project]/users/_mainOAuth.svelte
+++ b/src/routes/console/[project]/users/_mainOAuth.svelte
@@ -9,13 +9,14 @@
Form,
FormList
} from '$lib/elements/forms';
- import { addNotification } from '$lib/stores/notifications';
import { sdkForConsole } from '$lib/stores/sdk';
import type { Provider } from '$lib/stores/oauth-providers';
export let showModal = false;
export let provider: Provider;
const projectId = $page.params.project;
+ let modalError: string;
+
const update = async () => {
try {
await sdkForConsole.projects.updateOAuth2(
@@ -26,16 +27,13 @@
);
showModal = false;
} catch (error) {
- addNotification({
- type: 'error',
- message: error.message
- });
+ modalError = error.message;
}
};
-
+
{provider.name} OAuth2 Settings
diff --git a/src/routes/console/[project]/users/_microsoftOAuth.svelte b/src/routes/console/[project]/users/_microsoftOAuth.svelte
index 432e54569..73e1ae506 100644
--- a/src/routes/console/[project]/users/_microsoftOAuth.svelte
+++ b/src/routes/console/[project]/users/_microsoftOAuth.svelte
@@ -9,15 +9,16 @@
Form,
FormList
} from '$lib/elements/forms';
- import { addNotification } from '$lib/stores/notifications';
import { sdkForConsole } from '$lib/stores/sdk';
import type { Provider } from '$lib/stores/oauth-providers';
export let showModal = false;
export let provider: Provider;
let { clientSecret, tenantID } = JSON.parse(provider.secret);
+ let modalError: string;
const projectId = $page.params.project;
+
const update = async () => {
try {
const secret = JSON.stringify({ clientSecret, tenantID });
@@ -30,16 +31,13 @@
showModal = false;
} catch (error) {
- addNotification({
- type: 'error',
- message: error.message
- });
+ modalError = error.message;
}
};
-
+
{provider.name} OAuth2 Settings
diff --git a/src/routes/console/[project]/users/_oktaOAuth.svelte b/src/routes/console/[project]/users/_oktaOAuth.svelte
index 32bb06db6..ad34410d2 100644
--- a/src/routes/console/[project]/users/_oktaOAuth.svelte
+++ b/src/routes/console/[project]/users/_oktaOAuth.svelte
@@ -9,7 +9,6 @@
Form,
FormList
} from '$lib/elements/forms';
- import { addNotification } from '$lib/stores/notifications';
import { sdkForConsole } from '$lib/stores/sdk';
import type { Provider } from '$lib/stores/oauth-providers';
@@ -17,8 +16,10 @@
export let provider: Provider;
let { clientSecret, oktaDomain, authorizationServerId } = JSON.parse(provider.secret);
+ let modalError: string;
const projectId = $page.params.project;
+
const update = async () => {
try {
const secret = JSON.stringify({ clientSecret, oktaDomain, authorizationServerId });
@@ -31,16 +32,13 @@
showModal = false;
} catch (error) {
- addNotification({
- type: 'error',
- message: error.message
- });
+ modalError = error.message;
}
};
-
+
{provider.name} OAuth2 Settings
From aa647291e6c4a840533319f1be843cddbe9f3b7d Mon Sep 17 00:00:00 2001
From: Arman
Date: Tue, 9 Aug 2022 15:52:29 +0200
Subject: [PATCH 13/23] feat: add errors to missing modals
---
src/routes/console/[project]/storage/_create.svelte | 11 ++++-------
.../[project]/storage/bucket/[bucket]/_create.svelte | 10 ++++------
.../users/teams/[team]/_createMembership.svelte | 8 +++-----
3 files changed, 11 insertions(+), 18 deletions(-)
diff --git a/src/routes/console/[project]/storage/_create.svelte b/src/routes/console/[project]/storage/_create.svelte
index 1e4511130..801526f5c 100644
--- a/src/routes/console/[project]/storage/_create.svelte
+++ b/src/routes/console/[project]/storage/_create.svelte
@@ -2,8 +2,6 @@
import { Modal, InnerModal } from '$lib/components';
import { Pill } from '$lib/elements';
import { Button, InputText, Form, FormList } from '$lib/elements/forms';
- import { addNotification } from '$lib/stores/notifications';
-
import { sdkForProject } from '$lib/stores/sdk';
import { createEventDispatcher } from 'svelte';
@@ -14,6 +12,7 @@
let name = '';
let id: string = null;
let showDropdown = false;
+ let modalError: string;
const create = async () => {
try {
@@ -26,10 +25,7 @@
showCreate = false;
dispatch('created', bucket);
} catch (error) {
- addNotification({
- type: 'error',
- message: error.message
- });
+ modalError = error.message;
}
};
@@ -38,11 +34,12 @@
}
$: if (!showCreate) {
showDropdown = false;
+ modalError = null;
}
-
+
Create Bucket
{
try {
@@ -37,10 +37,7 @@
uploader.addFile(file);
dispatch('created');
} catch (error) {
- addNotification({
- type: 'error',
- message: error.message
- });
+ modalError = error.message;
}
};
@@ -76,6 +73,7 @@
files = null;
read = [];
write = [];
+ modalError = null;
}
$: if (!showDropdown) {
@@ -86,7 +84,7 @@
-
+
Upload File
diff --git a/src/routes/console/[project]/users/teams/[team]/_createMembership.svelte b/src/routes/console/[project]/users/teams/[team]/_createMembership.svelte
index b58a92960..53df2076f 100644
--- a/src/routes/console/[project]/users/teams/[team]/_createMembership.svelte
+++ b/src/routes/console/[project]/users/teams/[team]/_createMembership.svelte
@@ -12,6 +12,7 @@
const dispatch = createEventDispatcher();
let name: string, email: string, roles: [];
+ let modalError: string;
const create = async () => {
const url = `${$page.url.origin}/console/${$page.params.project}/users/teams/${$page.params.team}/members`;
@@ -33,16 +34,13 @@
showCreate = false;
dispatch('created', user);
} catch (error) {
- addNotification({
- type: 'error',
- message: error.message
- });
+ modalError = error.message;
}
};
-
+
Create Membership
Date: Tue, 9 Aug 2022 16:20:32 +0200
Subject: [PATCH 14/23] feat: add custom message, minlength, fix showpw submit
---
src/lib/elements/forms/inputPassword.svelte | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/src/lib/elements/forms/inputPassword.svelte b/src/lib/elements/forms/inputPassword.svelte
index 8553aebe1..d6ffcd128 100644
--- a/src/lib/elements/forms/inputPassword.svelte
+++ b/src/lib/elements/forms/inputPassword.svelte
@@ -16,6 +16,8 @@
export let errorMessage = 'An error occurred';
export let errorType: false | 'success' | 'warning' | 'error' = 'warning';
export let showHelper = false;
+ export let minlength = 8;
+ export let maxlength: number;
let element: HTMLInputElement;
let showInPlainText = false;
@@ -28,7 +30,10 @@
const handleInvalid = (event: Event) => {
errorMessage = element.validationMessage;
-
+ console.log(element.validity);
+ if (element.validity.tooShort) {
+ errorMessage = 'Password should contain at least 8 characters';
+ }
event.preventDefault();
showHelper = true;
};
@@ -49,9 +54,10 @@
{id}
name={id}
{placeholder}
- {required}
{disabled}
autocomplete={autocomplete ? 'on' : 'off'}
+ {minlength}
+ {maxlength}
class="input-text"
bind:value
bind:this={element} />
@@ -63,6 +69,8 @@
{disabled}
{required}
autocomplete={autocomplete ? 'on' : 'off'}
+ {minlength}
+ {maxlength}
type="password"
class="input-text"
bind:value
@@ -82,6 +90,7 @@
{/if}
{#if showPasswordButton}
diff --git a/src/routes/console/[project]/storage/bucket/[bucket]/_create.svelte b/src/routes/console/[project]/storage/bucket/[bucket]/_create.svelte
index 30f6aa42c..38317a0af 100644
--- a/src/routes/console/[project]/storage/bucket/[bucket]/_create.svelte
+++ b/src/routes/console/[project]/storage/bucket/[bucket]/_create.svelte
@@ -19,8 +19,8 @@
let read: string[] = [];
let write: string[] = [];
let id: string = null;
+ let error: string;
let showDropdown = false;
- let modalError: string;
const create = async () => {
try {
@@ -36,8 +36,8 @@
showDropdown = false;
uploader.addFile(file);
dispatch('created');
- } catch (error) {
- modalError = error.message;
+ } catch ({ message }) {
+ error = message;
}
};
@@ -68,12 +68,10 @@
}
$: if (!showCreate) {
- id = null;
+ id = files = error = null;
list = new DataTransfer();
- files = null;
read = [];
write = [];
- modalError = null;
}
$: if (!showDropdown) {
@@ -84,7 +82,7 @@
-
+
Upload File
@@ -135,7 +133,9 @@
{:else}
File ID
- Enter a custom file ID. Leave blank for a randomly generated one.
+
+ Enter a custom file ID. Leave blank for a randomly generated one.
+
-
+
Delete Bucket
Are you sure you want to delete {$bucket.name}?
diff --git a/src/routes/console/[project]/storage/bucket/[bucket]/_deleteFile.svelte b/src/routes/console/[project]/storage/bucket/[bucket]/_deleteFile.svelte
index c05dbeb69..b21e98870 100644
--- a/src/routes/console/[project]/storage/bucket/[bucket]/_deleteFile.svelte
+++ b/src/routes/console/[project]/storage/bucket/[bucket]/_deleteFile.svelte
@@ -26,7 +26,7 @@
-
+
Delete File
Are you sure you want to delete {file.name}?
diff --git a/src/routes/console/[project]/storage/bucket/[bucket]/file/[file]/_deleteFile.svelte b/src/routes/console/[project]/storage/bucket/[bucket]/file/[file]/_deleteFile.svelte
index b7276efbf..065012aec 100644
--- a/src/routes/console/[project]/storage/bucket/[bucket]/file/[file]/_deleteFile.svelte
+++ b/src/routes/console/[project]/storage/bucket/[bucket]/file/[file]/_deleteFile.svelte
@@ -25,7 +25,7 @@
-
+
Delete File
Are you sure you want to delete {$file.name}?
diff --git a/src/routes/console/[project]/users/_appleOAuth.svelte b/src/routes/console/[project]/users/_appleOAuth.svelte
index 4804311f1..605a45405 100644
--- a/src/routes/console/[project]/users/_appleOAuth.svelte
+++ b/src/routes/console/[project]/users/_appleOAuth.svelte
@@ -16,7 +16,7 @@
export let provider: Provider;
let { keyID, teamID, p8 } = JSON.parse(provider.secret);
- let modalError: string;
+ let error: string;
const projectId = $page.params.project;
const update = async () => {
@@ -29,21 +29,22 @@
secret
);
showModal = false;
- } catch (error) {
- modalError = error.message;
+ } catch ({ message }) {
+ error = message;
}
};
-
+
{provider.name} OAuth2 Settings
To use {provider.name} authentication in your application, first fill in this form. For
more info you can
- visit the docs.
+
+ visit the docs.
+
{
@@ -29,14 +29,14 @@
secret
);
showModal = false;
- } catch (error) {
- modalError = error.message;
+ } catch ({ message }) {
+ error = message;
}
};
-
+
{provider.name} OAuth2 Settings
diff --git a/src/routes/console/[project]/users/_createTeam.svelte b/src/routes/console/[project]/users/_createTeam.svelte
index f53aaaef0..109e91f92 100644
--- a/src/routes/console/[project]/users/_createTeam.svelte
+++ b/src/routes/console/[project]/users/_createTeam.svelte
@@ -10,9 +10,8 @@
const dispatch = createEventDispatcher();
- let name: string, id: string;
+ let name: string, id: string, error: string;
let showDropdown = false;
- let modalError: string;
const create = async () => {
try {
@@ -25,8 +24,8 @@
message: `${team.name} has been created`
});
dispatch('created', team);
- } catch (error) {
- modalError = error.message;
+ } catch ({ message }) {
+ error = message;
}
};
@@ -35,12 +34,12 @@
}
$: if (!showCreate) {
showDropdown = false;
- modalError = null;
+ error = null;
}
-
+
Create Team
Team ID
- Enter a custom team ID. Leave blank for a randomly generated one.
+
+ Enter a custom team ID. Leave blank for a randomly generated one.
+
{
try {
@@ -32,8 +32,8 @@
message: `${user.name} has been created`
});
dispatch('created', user);
- } catch (error) {
- modalError = error.message;
+ } catch ({ message }) {
+ error = message;
}
};
@@ -42,12 +42,12 @@
}
$: if (!showCreate) {
showDropdown = false;
- modalError = null;
+ error = null;
}
-
+
Create User
- (showDropdown = !showDropdown)}
- >
+ (showDropdown = !showDropdown)}>
+
User ID
-
+
+
{:else}
User ID
- Enter a custom user ID. Leave blank for a randomly generated one.
+
+ Enter a custom user ID. Leave blank for a randomly generated one.
+
- Allowed characters: alphanumeric, hyphen, non-leading
- underscore, period
+
+ Allowed characters: alphanumeric, hyphen, non-leading
+ underscore, period
+
diff --git a/src/routes/console/[project]/users/_mainOAuth.svelte b/src/routes/console/[project]/users/_mainOAuth.svelte
index 7429b7385..c760a1fdb 100644
--- a/src/routes/console/[project]/users/_mainOAuth.svelte
+++ b/src/routes/console/[project]/users/_mainOAuth.svelte
@@ -14,8 +14,10 @@
export let showModal = false;
export let provider: Provider;
+
const projectId = $page.params.project;
- let modalError: string;
+
+ let error: string;
const update = async () => {
try {
@@ -26,14 +28,14 @@
provider.secret
);
showModal = false;
- } catch (error) {
- modalError = error.message;
+ } catch ({ message }) {
+ error = message;
}
};
-
+
{provider.name} OAuth2 Settings
diff --git a/src/routes/console/[project]/users/_microsoftOAuth.svelte b/src/routes/console/[project]/users/_microsoftOAuth.svelte
index 73e1ae506..d1e0a2938 100644
--- a/src/routes/console/[project]/users/_microsoftOAuth.svelte
+++ b/src/routes/console/[project]/users/_microsoftOAuth.svelte
@@ -14,8 +14,9 @@
export let showModal = false;
export let provider: Provider;
+
let { clientSecret, tenantID } = JSON.parse(provider.secret);
- let modalError: string;
+ let error: string;
const projectId = $page.params.project;
@@ -30,21 +31,22 @@
);
showModal = false;
- } catch (error) {
- modalError = error.message;
+ } catch ({ message }) {
+ error = message;
}
};
-
+
{provider.name} OAuth2 Settings
To use {provider.name} authentication in your application, first fill in this form. For
more info you can
- visit the docs.
+
+ visit the docs.
+
-
+
{provider.name} OAuth2 Settings
diff --git a/src/routes/console/[project]/users/teams/[team]/_createMembership.svelte b/src/routes/console/[project]/users/teams/[team]/_createMembership.svelte
index 53df2076f..d128d7b22 100644
--- a/src/routes/console/[project]/users/teams/[team]/_createMembership.svelte
+++ b/src/routes/console/[project]/users/teams/[team]/_createMembership.svelte
@@ -11,8 +11,8 @@
const dispatch = createEventDispatcher();
- let name: string, email: string, roles: [];
- let modalError: string;
+ let name: string, email: string, roles: string[];
+ let error: string;
const create = async () => {
const url = `${$page.url.origin}/console/${$page.params.project}/users/teams/${$page.params.team}/members`;
@@ -33,14 +33,14 @@
roles = [];
showCreate = false;
dispatch('created', user);
- } catch (error) {
- modalError = error.message;
+ } catch ({ message }) {
+ error = message;
}
};
-
+
Create Membership
-
+
Delete Member
-
Are you sure you want to delete {selectedMembership.userName} from '{selectedMembership.teamName}'?
diff --git a/src/routes/console/[project]/users/teams/[team]/_deleteTeam.svelte b/src/routes/console/[project]/users/teams/[team]/_deleteTeam.svelte
index 1b1a18398..dacd5e9d2 100644
--- a/src/routes/console/[project]/users/teams/[team]/_deleteTeam.svelte
+++ b/src/routes/console/[project]/users/teams/[team]/_deleteTeam.svelte
@@ -26,7 +26,7 @@
-
+
Delete Team
diff --git a/src/routes/console/[project]/users/user/[user]/_deleteAllMemberships.svelte b/src/routes/console/[project]/users/user/[user]/_deleteAllMemberships.svelte
index f5c76479c..da8a539c3 100644
--- a/src/routes/console/[project]/users/user/[user]/_deleteAllMemberships.svelte
+++ b/src/routes/console/[project]/users/user/[user]/_deleteAllMemberships.svelte
@@ -25,7 +25,7 @@
-
+
Delete All Memberships
diff --git a/src/routes/console/[project]/users/user/[user]/_deleteAllSessions.svelte b/src/routes/console/[project]/users/user/[user]/_deleteAllSessions.svelte
index 8905281b6..13ec19bad 100644
--- a/src/routes/console/[project]/users/user/[user]/_deleteAllSessions.svelte
+++ b/src/routes/console/[project]/users/user/[user]/_deleteAllSessions.svelte
@@ -26,9 +26,8 @@
-
+
Delete All Sessions
-
Are you sure you want to delete all of {$user.name}'s sessions?
diff --git a/src/routes/console/[project]/users/user/[user]/_deleteMembership.svelte b/src/routes/console/[project]/users/user/[user]/_deleteMembership.svelte
index 4d5cf77f8..30e5f4a8b 100644
--- a/src/routes/console/[project]/users/user/[user]/_deleteMembership.svelte
+++ b/src/routes/console/[project]/users/user/[user]/_deleteMembership.svelte
@@ -35,7 +35,7 @@
-
+
Delete Member
Are you sure you want to delete {selectedMembership.userName} from '{selectedMembership.teamName}'?
diff --git a/src/routes/console/[project]/users/user/[user]/_deleteSession.svelte b/src/routes/console/[project]/users/user/[user]/_deleteSession.svelte
index ee2ca5781..b447e8f90 100644
--- a/src/routes/console/[project]/users/user/[user]/_deleteSession.svelte
+++ b/src/routes/console/[project]/users/user/[user]/_deleteSession.svelte
@@ -26,7 +26,7 @@
-
+
Delete Sessions
Are you sure you want to delete this session?
diff --git a/src/routes/console/[project]/users/user/[user]/_deleteUser.svelte b/src/routes/console/[project]/users/user/[user]/_deleteUser.svelte
index 2b2d31892..ca9482f6f 100644
--- a/src/routes/console/[project]/users/user/[user]/_deleteUser.svelte
+++ b/src/routes/console/[project]/users/user/[user]/_deleteUser.svelte
@@ -30,7 +30,7 @@
-
+
Delete User
Are you sure you want to delete {$user.name} from '{$project.name}'?
diff --git a/src/routes/console/[project]/users/user/[user]/index.svelte b/src/routes/console/[project]/users/user/[user]/index.svelte
index 2d685b872..0278da85f 100644
--- a/src/routes/console/[project]/users/user/[user]/index.svelte
+++ b/src/routes/console/[project]/users/user/[user]/index.svelte
@@ -228,7 +228,8 @@
text={$user.status}
secondary={!$user.status}
on:click={() => updateStatus()}
- >{$user.status ? 'Block account' : 'Unblock account'}
+ >{$user.status ? 'Block account' : 'Unblock account'}
+
{#if $user.status}
{#if $user.phone && $user.email}
- updateVerificationEmail()}
- >{$user.emailVerification ? 'Unverify' : 'Verify'} email
+ updateVerificationEmail()}>
+ {$user.emailVerification ? 'Unverify' : 'Verify'} email
+
updateVerificationPhone()}>
- {$user.phoneVerification ? 'Unverify' : 'Verify'} phone
+ {$user.phoneVerification ? 'Unverify' : 'Verify'} phone
+
{:else if !$user.phone}
@@ -300,8 +305,9 @@
- Update
+
+ Update
+
@@ -321,8 +327,9 @@
- Update
+
+ Update
+
@@ -334,7 +341,7 @@
- Enter a new password. A password must contain at least 8 characters.
+ Enter a new password. A password must contain at least 8 characters.
@@ -380,8 +387,9 @@
diff --git a/src/routes/console/[project]/users/_auth0OAuth.svelte b/src/routes/console/[project]/users/_auth0OAuth.svelte index ee16907db..f3dc7425a 100644 --- a/src/routes/console/[project]/users/_auth0OAuth.svelte +++ b/src/routes/console/[project]/users/_auth0OAuth.svelte @@ -9,7 +9,6 @@ Form, FormList } from '$lib/elements/forms'; - import { addNotification } from '$lib/stores/notifications'; import { sdkForConsole } from '$lib/stores/sdk'; import type { Provider } from '$lib/stores/oauth-providers'; @@ -17,6 +16,7 @@ export let provider: Provider; let { clientSecret, auth0Domain } = JSON.parse(provider.secret); + let modalError: string; const projectId = $page.params.project; const update = async () => { @@ -30,16 +30,13 @@ ); showModal = false; } catch (error) { - addNotification({ - type: 'error', - message: error.message - }); + modalError = error.message; } };
diff --git a/src/routes/console/[project]/users/_mainOAuth.svelte b/src/routes/console/[project]/users/_mainOAuth.svelte index 85677ab84..7429b7385 100644 --- a/src/routes/console/[project]/users/_mainOAuth.svelte +++ b/src/routes/console/[project]/users/_mainOAuth.svelte @@ -9,13 +9,14 @@ Form, FormList } from '$lib/elements/forms'; - import { addNotification } from '$lib/stores/notifications'; import { sdkForConsole } from '$lib/stores/sdk'; import type { Provider } from '$lib/stores/oauth-providers'; export let showModal = false; export let provider: Provider; const projectId = $page.params.project; + let modalError: string; + const update = async () => { try { await sdkForConsole.projects.updateOAuth2( @@ -26,16 +27,13 @@ ); showModal = false; } catch (error) { - addNotification({ - type: 'error', - message: error.message - }); + modalError = error.message; } };
diff --git a/src/routes/console/[project]/users/_microsoftOAuth.svelte b/src/routes/console/[project]/users/_microsoftOAuth.svelte index 432e54569..73e1ae506 100644 --- a/src/routes/console/[project]/users/_microsoftOAuth.svelte +++ b/src/routes/console/[project]/users/_microsoftOAuth.svelte @@ -9,15 +9,16 @@ Form, FormList } from '$lib/elements/forms'; - import { addNotification } from '$lib/stores/notifications'; import { sdkForConsole } from '$lib/stores/sdk'; import type { Provider } from '$lib/stores/oauth-providers'; export let showModal = false; export let provider: Provider; let { clientSecret, tenantID } = JSON.parse(provider.secret); + let modalError: string; const projectId = $page.params.project; + const update = async () => { try { const secret = JSON.stringify({ clientSecret, tenantID }); @@ -30,16 +31,13 @@ showModal = false; } catch (error) { - addNotification({ - type: 'error', - message: error.message - }); + modalError = error.message; } };
diff --git a/src/routes/console/[project]/users/_oktaOAuth.svelte b/src/routes/console/[project]/users/_oktaOAuth.svelte index 32bb06db6..ad34410d2 100644 --- a/src/routes/console/[project]/users/_oktaOAuth.svelte +++ b/src/routes/console/[project]/users/_oktaOAuth.svelte @@ -9,7 +9,6 @@ Form, FormList } from '$lib/elements/forms'; - import { addNotification } from '$lib/stores/notifications'; import { sdkForConsole } from '$lib/stores/sdk'; import type { Provider } from '$lib/stores/oauth-providers'; @@ -17,8 +16,10 @@ export let provider: Provider; let { clientSecret, oktaDomain, authorizationServerId } = JSON.parse(provider.secret); + let modalError: string; const projectId = $page.params.project; + const update = async () => { try { const secret = JSON.stringify({ clientSecret, oktaDomain, authorizationServerId }); @@ -31,16 +32,13 @@ showModal = false; } catch (error) { - addNotification({ - type: 'error', - message: error.message - }); + modalError = error.message; } };
From aa647291e6c4a840533319f1be843cddbe9f3b7d Mon Sep 17 00:00:00 2001
From: Arman Enter a custom file ID. Leave blank for a randomly generated one. Are you sure you want to delete {$bucket.name}? Are you sure you want to delete {file.name}? Are you sure you want to delete {$file.name}?
To use {provider.name} authentication in your application, first fill in this form. For
more info you can
- visit the docs.
+
+ visit the docs.
+
diff --git a/src/routes/console/[project]/users/_createTeam.svelte b/src/routes/console/[project]/users/_createTeam.svelte
index f53aaaef0..109e91f92 100644
--- a/src/routes/console/[project]/users/_createTeam.svelte
+++ b/src/routes/console/[project]/users/_createTeam.svelte
@@ -10,9 +10,8 @@
const dispatch = createEventDispatcher();
- let name: string, id: string;
+ let name: string, id: string, error: string;
let showDropdown = false;
- let modalError: string;
const create = async () => {
try {
@@ -25,8 +24,8 @@
message: `${team.name} has been created`
});
dispatch('created', team);
- } catch (error) {
- modalError = error.message;
+ } catch ({ message }) {
+ error = message;
}
};
@@ -35,12 +34,12 @@
}
$: if (!showCreate) {
showDropdown = false;
- modalError = null;
+ error = null;
}
diff --git a/src/routes/console/[project]/users/_microsoftOAuth.svelte b/src/routes/console/[project]/users/_microsoftOAuth.svelte
index 73e1ae506..d1e0a2938 100644
--- a/src/routes/console/[project]/users/_microsoftOAuth.svelte
+++ b/src/routes/console/[project]/users/_microsoftOAuth.svelte
@@ -14,8 +14,9 @@
export let showModal = false;
export let provider: Provider;
+
let { clientSecret, tenantID } = JSON.parse(provider.secret);
- let modalError: string;
+ let error: string;
const projectId = $page.params.project;
@@ -30,21 +31,22 @@
);
showModal = false;
- } catch (error) {
- modalError = error.message;
+ } catch ({ message }) {
+ error = message;
}
};
To use {provider.name} authentication in your application, first fill in this form. For
more info you can
- visit the docs.
+
+ visit the docs.
+
diff --git a/src/routes/console/[project]/users/teams/[team]/_createMembership.svelte b/src/routes/console/[project]/users/teams/[team]/_createMembership.svelte
index 53df2076f..d128d7b22 100644
--- a/src/routes/console/[project]/users/teams/[team]/_createMembership.svelte
+++ b/src/routes/console/[project]/users/teams/[team]/_createMembership.svelte
@@ -11,8 +11,8 @@
const dispatch = createEventDispatcher();
- let name: string, email: string, roles: [];
- let modalError: string;
+ let name: string, email: string, roles: string[];
+ let error: string;
const create = async () => {
const url = `${$page.url.origin}/console/${$page.params.project}/users/teams/${$page.params.team}/members`;
@@ -33,14 +33,14 @@
roles = [];
showCreate = false;
dispatch('created', user);
- } catch (error) {
- modalError = error.message;
+ } catch ({ message }) {
+ error = message;
}
};
Are you sure you want to delete {selectedMembership.userName} from '{selectedMembership.teamName}'?
diff --git a/src/routes/console/[project]/users/user/[user]/_deleteAllMemberships.svelte b/src/routes/console/[project]/users/user/[user]/_deleteAllMemberships.svelte
index f5c76479c..da8a539c3 100644
--- a/src/routes/console/[project]/users/user/[user]/_deleteAllMemberships.svelte
+++ b/src/routes/console/[project]/users/user/[user]/_deleteAllMemberships.svelte
@@ -25,7 +25,7 @@
diff --git a/src/routes/console/[project]/users/user/[user]/_deleteAllSessions.svelte b/src/routes/console/[project]/users/user/[user]/_deleteAllSessions.svelte
index 8905281b6..13ec19bad 100644
--- a/src/routes/console/[project]/users/user/[user]/_deleteAllSessions.svelte
+++ b/src/routes/console/[project]/users/user/[user]/_deleteAllSessions.svelte
@@ -26,9 +26,8 @@
Are you sure you want to delete all of {$user.name}'s sessions?
Are you sure you want to delete {selectedMembership.userName} from '{selectedMembership.teamName}'?
diff --git a/src/routes/console/[project]/users/user/[user]/_deleteSession.svelte b/src/routes/console/[project]/users/user/[user]/_deleteSession.svelte
index ee2ca5781..b447e8f90 100644
--- a/src/routes/console/[project]/users/user/[user]/_deleteSession.svelte
+++ b/src/routes/console/[project]/users/user/[user]/_deleteSession.svelte
@@ -26,7 +26,7 @@
Are you sure you want to delete this session? Are you sure you want to delete {$user.name} from '{$project.name}'?
- Enter a new password. A password must contain at least 8 characters.
+ Enter a new password. A password must contain at least 8 characters.
@@ -380,8 +387,9 @@