From b7028ff1316ce09a9431e9a546f1c890b1bd08f4 Mon Sep 17 00:00:00 2001 From: nick-delirium Date: Mon, 19 May 2025 11:01:35 +0200 Subject: [PATCH] ui: remove scope setup, fix spot capitalization --- frontend/app/PrivateRoutes.tsx | 9 ----- .../Spots/SpotsList/SpotListItem.tsx | 2 +- frontend/app/mstore/userStore.ts | 40 +++++++------------ 3 files changed, 16 insertions(+), 35 deletions(-) diff --git a/frontend/app/PrivateRoutes.tsx b/frontend/app/PrivateRoutes.tsx index f16e41523..45b5d9dd4 100644 --- a/frontend/app/PrivateRoutes.tsx +++ b/frontend/app/PrivateRoutes.tsx @@ -32,7 +32,6 @@ const components: any = { ), SpotsListPure: lazy(() => import('Components/Spots/SpotsList')), SpotPure: lazy(() => import('Components/Spots/SpotPlayer')), - ScopeSetup: lazy(() => import('Components/ScopeForm')), HighlightsPure: lazy(() => import('Components/Highlights/HighlightsList')), KaiPure: lazy(() => import('Components/Kai/KaiChat')), }; @@ -111,7 +110,6 @@ function PrivateRoutes() { const sites = projectsStore.list; const { siteId } = projectsStore; const hasRecordings = sites.some((s) => s.recorded); - const redirectToSetup = scope === 0; const redirectToOnboarding = !onboarding && (localStorage.getItem(GLOBAL_HAS_NO_RECORDINGS) === 'true' || @@ -138,13 +136,6 @@ function PrivateRoutes() { return ( }> - - {redirectToSetup ? : null} - +
diff --git a/frontend/app/mstore/userStore.ts b/frontend/app/mstore/userStore.ts index 7412b0968..ccbfb9e65 100644 --- a/frontend/app/mstore/userStore.ts +++ b/frontend/app/mstore/userStore.ts @@ -13,45 +13,25 @@ import i18next, { TFunction } from 'i18next'; class UserStore { t: TFunction; - list: User[] = []; - instance: User | null = null; - page: number = 1; - pageSize: number = 10; - searchQuery: string = ''; - modifiedCount: number = 0; - loading: boolean = false; - saving: boolean = false; - limits: any = {}; - initialDataFetched: boolean = false; - account = new Account(); - siteId: string | null = null; - passwordRequestError: boolean = false; - passwordErrors: string[] = []; - tenants: any[] = []; - onboarding: boolean = false; - sites: any[] = []; - jwt: string | null = null; - spotJwt: string | null = null; - errors: any[] = []; loginRequest = { @@ -119,7 +99,11 @@ class UserStore { } get isSSOSupported() { - return this.isEnterprise || this.account?.edition === 'msaas' || this.authStore.authDetails?.edition === 'msaas'; + return ( + this.isEnterprise || + this.account?.edition === 'msaas' || + this.authStore.authDetails?.edition === 'msaas' + ); } get isLoggedIn() { @@ -242,7 +226,7 @@ class UserStore { resolve(response); }) .catch(async (e) => { - toast.error(e.message || this.t("Failed to save user's data.")); + toast.error(e.message || this.t("Failed to save user's data.")); reject(e); }) .finally(() => { @@ -383,8 +367,12 @@ class UserStore { }); } catch (error) { const inUse = error.message.includes('already in use'); - const inUseMsg = this.t('An account with this email already exists. Please log in or use a different email address.') - const genericMsg = this.t('Error signing up; please check your data and try again') + const inUseMsg = this.t( + 'An account with this email already exists. Please log in or use a different email address.', + ); + const genericMsg = this.t( + 'Error signing up; please check your data and try again', + ); runInAction(() => { this.signUpRequest = { loading: false, @@ -411,7 +399,9 @@ class UserStore { this.spotJwt = data.spotJwt; }); } catch (e) { - toast.error(e.message || this.t('Error resetting your password; please try again')); + toast.error( + e.message || this.t('Error resetting your password; please try again'), + ); throw e; } finally { runInAction(() => {