Nick/neos 622 navigating to home page results in no redirect2 (#1086)

frontend/apps/web/app/[account]/connections/[id]/components/MysqlForm.tsx → frontend/apps/web/app/(mgmt)/[account]/connections/[id]/components/MysqlForm.tsx

@@ -1,5 +1,5 @@
 'use client';
-import { checkMysqlConnection } from '@/app/[account]/new/connection/mysql/MysqlForm';
+import { checkMysqlConnection } from '@/app/(mgmt)/[account]/new/connection/mysql/MysqlForm';
 import ButtonText from '@/components/ButtonText';
 import FormError from '@/components/FormError';
 import Spinner from '@/components/Spinner';

frontend/apps/web/app/[account]/jobs/[id]/components/RecentRuns.tsx → frontend/apps/web/app/(mgmt)/[account]/jobs/[id]/components/RecentRuns.tsx

@@ -1,5 +1,5 @@
 'use client';
-import JobRunStatus from '@/app/[account]/runs/components/JobRunStatus';
+import JobRunStatus from '@/app/(mgmt)/[account]/runs/components/JobRunStatus';
 import { useAccount } from '@/components/providers/account-provider';
 import { Alert, AlertTitle } from '@/components/ui/alert';
 import { Badge } from '@/components/ui/badge';

frontend/apps/web/app/[account]/jobs/[id]/source/components/DataGenConnectionCard.tsx → frontend/apps/web/app/(mgmt)/[account]/jobs/[id]/source/components/DataGenConnectionCard.tsx

@@ -2,7 +2,7 @@
 import {
   SINGLE_TABLE_SCHEMA_FORM_SCHEMA,
   SingleTableSchemaFormValues,
-} from '@/app/[account]/new/job/schema';
+} from '@/app/(mgmt)/[account]/new/job/schema';
 import { SchemaTable } from '@/components/jobs/SchemaTable/schema-table';
 import { useAccount } from '@/components/providers/account-provider';
 import SkeletonTable from '@/components/skeleton/SkeletonTable';

frontend/apps/web/app/[account]/jobs/[id]/subsets/components/SubsetCard.tsx → frontend/apps/web/app/(mgmt)/[account]/jobs/[id]/subsets/components/SubsetCard.tsx

@@ -1,7 +1,7 @@
 import {
   SUBSET_FORM_SCHEMA,
   SubsetFormValues,
-} from '@/app/[account]/new/job/schema';
+} from '@/app/(mgmt)/[account]/new/job/schema';
 import EditItem from '@/components/jobs/subsets/EditItem';
 import SubsetTable from '@/components/jobs/subsets/subset-table/SubsetTable';
 import { TableRow } from '@/components/jobs/subsets/subset-table/column';

frontend/apps/web/app/[account]/new/job/[id]/destination/page.tsx → frontend/apps/web/app/(mgmt)/[account]/new/job/[id]/destination/page.tsx

@@ -1,5 +1,5 @@
 'use client';
-import { getConnectionIdFromSource } from '@/app/[account]/jobs/[id]/source/components/util';
+import { getConnectionIdFromSource } from '@/app/(mgmt)/[account]/jobs/[id]/source/components/util';
 import PageHeader from '@/components/headers/PageHeader';
 import DestinationOptionsForm from '@/components/jobs/Form/DestinationOptionsForm';
 import { useAccount } from '@/components/providers/account-provider';

frontend/apps/web/app/[account]/new/job/connect/page.tsx → frontend/apps/web/app/(mgmt)/[account]/new/job/connect/page.tsx

@@ -32,7 +32,7 @@ import { ReactElement, useEffect, useState } from 'react';
 import { useFieldArray, useForm } from 'react-hook-form';
 import useFormPersist from 'react-hook-form-persist';
 import { useSessionStorage } from 'usehooks-ts';
-import DestinationOptionsForm from '../../../../../components/jobs/Form/DestinationOptionsForm';
+import DestinationOptionsForm from '../../../../../../components/jobs/Form/DestinationOptionsForm';
 import JobsProgressSteps, { DATA_SYNC_STEPS } from '../JobsProgressSteps';
 import { CONNECT_FORM_SCHEMA, ConnectFormValues } from '../schema';
 

frontend/apps/web/app/[account]/settings/api-keys/[id]/page.tsx → frontend/apps/web/app/(mgmt)/[account]/settings/api-keys/[id]/page.tsx

@@ -1,5 +1,5 @@
 'use client';
-import { ApiKeyValueSessionStore } from '@/app/[account]/new/api-key/NewApiKeyForm';
+import { ApiKeyValueSessionStore } from '@/app/(mgmt)/[account]/new/api-key/NewApiKeyForm';
 import ButtonText from '@/components/ButtonText';
 import { CopyButton } from '@/components/CopyButton';
 import { useAccount } from '@/components/providers/account-provider';

frontend/apps/web/app/[account]/settings/api-keys/[id]/regenerate/page.tsx → frontend/apps/web/app/(mgmt)/[account]/settings/api-keys/[id]/regenerate/page.tsx

@@ -1,5 +1,5 @@
 'use client';
-import { ApiKeyValueSessionStore } from '@/app/[account]/new/api-key/NewApiKeyForm';
+import { ApiKeyValueSessionStore } from '@/app/(mgmt)/[account]/new/api-key/NewApiKeyForm';
 import OverviewContainer from '@/components/containers/OverviewContainer';
 import PageHeader from '@/components/headers/PageHeader';
 import RequiredLabel from '@/components/labels/RequiredLabel';

frontend/apps/web/app/[account]/transformers/[id]/components/UpdateUserDefinedTransformerForm.tsx → frontend/apps/web/app/(mgmt)/[account]/transformers/[id]/components/UpdateUserDefinedTransformerForm.tsx

@@ -1,9 +1,9 @@
 'use client';
-import { handleUserDefinedTransformerForm } from '@/app/[account]/new/transformer/UserDefinedTransformerForms/HandleUserDefinedTransformersForm';
+import { handleUserDefinedTransformerForm } from '@/app/(mgmt)/[account]/new/transformer/UserDefinedTransformerForms/HandleUserDefinedTransformersForm';
 import {
   UPDATE_USER_DEFINED_TRANSFORMER,
   UpdateUserDefinedTransformer,
-} from '@/app/[account]/new/transformer/schema';
+} from '@/app/(mgmt)/[account]/new/transformer/schema';
 import { useAccount } from '@/components/providers/account-provider';
 import { Button } from '@/components/ui/button';
 import {

frontend/apps/web/app/[account]/transformers/systemTransformers/[name]/page.tsx → frontend/apps/web/app/(mgmt)/[account]/transformers/systemTransformers/[name]/page.tsx

@@ -1,9 +1,9 @@
 'use client';
-import { handleUserDefinedTransformerForm } from '@/app/[account]/new/transformer/UserDefinedTransformerForms/HandleUserDefinedTransformersForm';
+import { handleUserDefinedTransformerForm } from '@/app/(mgmt)/[account]/new/transformer/UserDefinedTransformerForms/HandleUserDefinedTransformersForm';
 import {
   SYSTEM_TRANSFORMER_SCHEMA,
   SystemTransformersSchema,
-} from '@/app/[account]/new/transformer/schema';
+} from '@/app/(mgmt)/[account]/new/transformer/schema';
 import ButtonText from '@/components/ButtonText';
 import OverviewContainer from '@/components/containers/OverviewContainer';
 import PageHeader from '@/components/headers/PageHeader';

frontend/apps/web/app/layout.tsx → frontend/apps/web/app/(mgmt)/layout.tsx

@@ -8,7 +8,8 @@ import { fontSans } from '@/libs/fonts';
 import { cn } from '@/libs/utils';
 import { Metadata } from 'next';
 import { ReactElement, Suspense } from 'react';
-import { getSystemAppConfig } from './api/config/config';
+import BaseLayout from '../BaseLayout';
+import { getSystemAppConfig } from '../api/config/config';
 
 export const metadata: Metadata = {
   title: 'Neosync',
@@ -41,7 +42,9 @@ export default async function RootLayout({
             <Suspense>
               <PostHogPageview config={appConfig.posthog} />
             </Suspense>
-            <PHProvider>{children}</PHProvider>
+            <PHProvider>
+              <BaseLayout>{children}</BaseLayout>
+            </PHProvider>
           </>
         </ThemeProvider>
       </body>

frontend/apps/web/app/(mgmt)/not-found.tsx

@@ -0,0 +1,23 @@
+import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card';
+
+export default function NotFound() {
+  return (
+    <div className="flex flex-col items-center justify-center h-screen bg-background">
+      <Card className="w-full max-w-md p-8 dark:bg-background">
+        <CardHeader>
+          <CardTitle className="text-center text-gray-900 dark:text-gray-200 text-2xl">
+            404 Error
+          </CardTitle>
+        </CardHeader>
+        <CardContent className="space-y-4">
+          <div className="text-center">
+            <div className="text-gray-600 dark:text-gray-400">
+              The page you are looking for does not exist or may have been
+              moved.
+            </div>
+          </div>
+        </CardContent>
+      </Card>
+    </div>
+  );
+}

frontend/apps/web/app/(mgmt)/page.tsx

@@ -0,0 +1,20 @@
+import AccountPageRedirect from '@/components/AccountPageRedirect';
+import OverviewContainer from '@/components/containers/OverviewContainer';
+import PageHeader from '@/components/headers/PageHeader';
+import SkeletonTable from '@/components/skeleton/SkeletonTable';
+import { ReactElement } from 'react';
+
+export default function Home(): ReactElement {
+  return (
+    <AccountPageRedirect>
+      <OverviewContainer
+        Header={<PageHeader header={`Home`} />}
+        containerClassName="home-page"
+      >
+        <div className="flex flex-col gap-4">
+          <SkeletonTable />
+        </div>
+      </OverviewContainer>
+    </AccountPageRedirect>
+  );
+}

frontend/apps/web/app/api/auth/[...nextauth]/auth.ts

@@ -178,7 +178,6 @@ async function getTokenUrl(issuer: string): Promise<string> {
     }
     return oidcConfig.token_endpoint;
   } catch (err) {
-    console.log('failed', err);
     throw err;
   }
 }

frontend/apps/web/app/invite/layout.tsx

@@ -1,12 +1,55 @@
-import { ReactElement, ReactNode } from 'react';
+import '@/app/globals.css';
+import {
+  PHProvider,
+  PostHogPageview,
+} from '@/components/providers/posthog-provider';
+import { ThemeProvider } from '@/components/providers/theme-provider';
+import { fontSans } from '@/libs/fonts';
+import { cn } from '@/libs/utils';
+import { Metadata } from 'next';
+import { ReactElement, ReactNode, Suspense } from 'react';
 import BaseLayout from '../BaseLayout';
+import { getSystemAppConfig } from '../api/config/config';
+
+export const metadata: Metadata = {
+  title: 'Neosync',
+  description: 'Open Source Test Data Management',
+  icons: [{ rel: 'icon', url: 'favicon.ico' }],
+};
 
 export default async function InviteLayout({
   children,
 }: {
   children: ReactNode;
 }): Promise<ReactElement> {
-  // Server Signin is disabled for the invite page due to inability to access path or search params on the server
-  // Without this, the signin redirect url is set to the root url instead of /invite?token=<token>
-  return <BaseLayout disableServerSignin>{children}</BaseLayout>;
+  const appConfig = getSystemAppConfig();
+  return (
+    <html lang="en" suppressHydrationWarning>
+      <head />
+      <body
+        className={cn(
+          'min-h-screen bg-background font-sans antialiased overflow-scroll',
+          fontSans.variable
+        )}
+      >
+        <ThemeProvider
+          attribute="class"
+          defaultTheme="system"
+          enableSystem
+          disableTransitionOnChange
+        >
+          <>
+            <Suspense>
+              <PostHogPageview config={appConfig.posthog} />
+            </Suspense>
+            <PHProvider>
+              {/*   // Server Signin is disabled for the invite page due to inability to access path or search params on the server
+  // Without this, the signin redirect url is set to the root url instead of /invite?token=<token> */}
+              <BaseLayout disableServerSignin>{children}</BaseLayout>
+            </PHProvider>
+          </>
+        </ThemeProvider>
+      </body>
+    </html>
+  );
 }

frontend/apps/web/components/jobs/SchemaTable/VirtualizedSchemaTable.tsx

@@ -1,5 +1,5 @@
-import { SingleTableSchemaFormValues } from '@/app/[account]/new/job/schema';
-import EditTransformerOptions from '@/app/[account]/transformers/EditTransformerOptions';
+import { SingleTableSchemaFormValues } from '@/app/(mgmt)/[account]/new/job/schema';
+import EditTransformerOptions from '@/app/(mgmt)/[account]/transformers/EditTransformerOptions';
 import { Button } from '@/components/ui/button';
 import { Checkbox } from '@/components/ui/checkbox';
 import { FormControl, FormField, FormItem } from '@/components/ui/form';

frontend/apps/web/components/jobs/SchemaTable/schema-table.tsx

@@ -2,7 +2,7 @@
 import {
   filterInputFreeSystemTransformers,
   filterInputFreeUdfTransformers,
-} from '@/app/[account]/transformers/EditTransformerOptions';
+} from '@/app/(mgmt)/[account]/transformers/EditTransformerOptions';
 import { useAccount } from '@/components/providers/account-provider';
 import SkeletonTable from '@/components/skeleton/SkeletonTable';
 import { useGetSystemTransformers } from '@/libs/hooks/useGetSystemTransformers';

frontend/apps/web/components/jobs/subsets/utils.ts

@@ -1,4 +1,4 @@
-import { SubsetFormValues } from '@/app/[account]/new/job/schema';
+import { SubsetFormValues } from '@/app/(mgmt)/[account]/new/job/schema';
 import { TableRow } from './subset-table/column';
 
 interface DbCol {

frontend/apps/web/components/providers/account-provider.tsx

@@ -58,7 +58,7 @@ export default function AccountProvider(props: Props): ReactElement {
     const foundAccount = accountsResponse?.accounts.find(
       (a) => a.name === accountName
     );
-    if (userAccount && foundAccount && userAccount?.id === foundAccount?.id) {
+    if (userAccount && foundAccount && userAccount.id === foundAccount.id) {
       return;
     }
     if (foundAccount) {
@@ -82,9 +82,12 @@ export default function AccountProvider(props: Props): ReactElement {
 
   function setAccount(userAccount: UserAccount): void {
     if (userAccount.name !== accountName) {
-      router.push(`/${userAccount.name}`);
-      setUserAccount(userAccount);
+      // this order matters. Otherwise if we push first,
+      // when it routes to the page, there is no account param and it defaults to personal /shrug
+      // by setting this here, it finds the last selected account and is able to effectively route to the correct spot.
       setLastSelectedAccount(userAccount.name);
+      setUserAccount(userAccount);
+      router.push(`/${userAccount.name}`);
     }
   }
 

frontend/apps/web/yup-validations/connections.ts

@@ -1,4 +1,4 @@
-import { isConnectionNameAvailable } from '@/app/[account]/new/connection/postgres/PostgresForm';
+import { isConnectionNameAvailable } from '@/app/(mgmt)/[account]/new/connection/postgres/PostgresForm';
 import * as Yup from 'yup';
 
 export const POSTGRES_CONNECTION = Yup.object({

frontend/apps/web/yup-validations/jobs.ts

@@ -1,5 +1,5 @@
-import { SubsetFormValues } from '@/app/[account]/new/job/schema';
-import { TransformerConfigSchema } from '@/app/[account]/new/transformer/schema';
+import { SubsetFormValues } from '@/app/(mgmt)/[account]/new/job/schema';
+import { TransformerConfigSchema } from '@/app/(mgmt)/[account]/new/transformer/schema';
 import {
   AwsS3DestinationConnectionOptions,
   Connection,