Fixes Members Page Routing bug (#879)

nucleuscloud · Dec 16, 2023 · c2df7e8 · c2df7e8
1 parent 4129b00
commit c2df7e8
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 6 deletions.
diff --git a/frontend/apps/web/app/[account]/settings/layout.tsx b/frontend/apps/web/app/[account]/settings/layout.tsx
@@ -4,6 +4,7 @@ import PageHeader from '@/components/headers/PageHeader';
 import { useAccount } from '@/components/providers/account-provider';
 import { useGetSystemAppConfig } from '@/libs/hooks/useGetSystemAppConfig';
 import { cn } from '@/libs/utils';
+import { UserAccountType } from '@neosync/sdk';
 import Link from 'next/link';
 import { usePathname } from 'next/navigation';
 
@@ -45,7 +46,9 @@ export default function SettingsLayout({
   const items = getNavSettings(account?.name ?? '');
 
   const filteredItems =
-    !isSystemConfigLoading && systemAppConfigData?.isAuthEnabled
+    !isSystemConfigLoading &&
+    systemAppConfigData?.isAuthEnabled &&
+    account?.type === UserAccountType.TEAM
       ? items
       : items.filter((item) => item.title !== 'Members');
 

diff --git a/frontend/apps/web/app/[account]/settings/members/page.tsx b/frontend/apps/web/app/[account]/settings/members/page.tsx
@@ -1,7 +1,9 @@
 'use client';
 import { useAccount } from '@/components/providers/account-provider';
+import { Alert, AlertTitle } from '@/components/ui/alert';
 import { Skeleton } from '@/components/ui/skeleton';
 import { Tabs, TabsContent, TabsList, TabsTrigger } from '@/components/ui/tabs';
+import { UserAccountType } from '@neosync/sdk';
 import { ReactElement } from 'react';
 import { InvitesTable } from './components/InviteTable';
 import MembersTable from './components/MemberTable';
@@ -16,13 +18,19 @@ export default function MemberManagementSettings(_: Props): ReactElement {
     return <Skeleton className="w-full h-12" />;
   }
 
-  const isTeamAccount = account?.type.toString() == 'USER_ACCOUNT_TYPE_TEAM';
+  const isTeamAccount = account?.type === UserAccountType.TEAM;
   if (!isTeamAccount) {
-    return <div></div>;
+    return (
+      <div>
+        <Alert variant="destructive">
+          <AlertTitle>Members can only be added to team accounts</AlertTitle>
+        </Alert>
+      </div>
+    );
   }
 
   return (
-    <div className="mt-10">
+    <div className="flex flex-col gap-3">
       <h1 className="text-xl font-bold tracking-tight">Member Managment</h1>
       <Tabs defaultValue="members">
         <TabsList>

diff --git a/frontend/apps/web/app/[account]/settings/page.tsx b/frontend/apps/web/app/[account]/settings/page.tsx
@@ -3,6 +3,7 @@ import OverviewContainer from '@/components/containers/OverviewContainer';
 import PageHeader from '@/components/headers/PageHeader';
 import { useAccount } from '@/components/providers/account-provider';
 import { useGetSystemAppConfig } from '@/libs/hooks/useGetSystemAppConfig';
+import { UserAccountType } from '@neosync/sdk';
 import { useRouter } from 'next/navigation';
 import { useEffect } from 'react';
 
@@ -17,7 +18,11 @@ export default function Settings() {
     if (isSystemAppConfigDataLoading || isAccountLoading) {
       return;
     }
-    if (systemAppConfigData?.isAuthEnabled && account?.name) {
+    if (
+      systemAppConfigData?.isAuthEnabled &&
+      account?.name &&
+      account.type === UserAccountType.TEAM
+    ) {
       return router.push(`/${account?.name}/settings/members`);
     } else {
       return router.push('/personal/settings/temporal');

diff --git a/frontend/apps/web/libs/hooks/useGetSystemAppConfig.ts b/frontend/apps/web/libs/hooks/useGetSystemAppConfig.ts
@@ -1,11 +1,12 @@
 import type { SystemAppConfig } from '@/app/config/app-config';
 import useSWR, { KeyedMutator } from 'swr';
+import { fetcher } from '../fetcher';
 import type { HookReply } from './types';
 import { useGenericErrorToast } from './useGenericErrorToast';
 
 export function useGetSystemAppConfig(): HookReply<SystemAppConfig> {
   const { data, error, mutate, isLoading, isValidating } =
-    useSWR(`/api/config`);
+    useSWR<SystemAppConfig>(`/api/config`, fetcher);
   useGenericErrorToast(error);
 
   if (isLoading) {