tea/browsertrix
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Redirect if org with slug doesn't exist (#1740)

Browse Source 
Resolves https://github.com/webrecorder/browsertrix/issues/1739

Redirect to first user's first org if an org with current slug doesn't
exist.
This commit is contained in:
sua yoo 2024-04-24 01:50:55 -07:00 committed by GitHub
parent 6232103e60
commit eeab64a0d1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
frontend/src/pages/org/index.ts
View File

@ -183,10 +183,17 @@ export class Org extends LiteElement {
async willUpdate(changedProperties: Map<string, unknown>) {
if (
(changedProperties.has("userInfo") && this.userInfo) ||
(changedProperties.has("slug") && this.slug)
(changedProperties.has("userInfo") || changedProperties.has("slug")) &&
this.userInfo &&
this.slug
) {
void this.updateOrg();
if (this.userOrg) {
void this.updateOrg();
} else {
// Couldn't find org with slug, redirect to first org
this.navTo(`/orgs/${this.userInfo.orgs[0].slug}`);
return;
}
}
if (changedProperties.has("openDialogName")) {
// Sync URL to create dialog
@ -216,9 +223,6 @@ export class Org extends LiteElement {
this.checkStorageQuota();
this.checkExecutionMinutesQuota();
} catch {
// TODO handle 404
this.org = null;
this.notify({
message: msg("Sorry, couldn't retrieve organization at this time."),
variant: "danger",
@ -253,8 +257,7 @@ export class Org extends LiteElement {
render() {
if (this.org === null) {
// TODO handle 404 and 500s
return "";
return html`<btrix-not-found></btrix-not-found>`;
}
if (!this.org || !this.userInfo) {