ms2/error handling

src/management-system-v2/app/(auth)/layout.tsx

@@ -1,11 +1,18 @@
 import Layout from '@/app/(dashboard)/[environmentId]/layout-client';
+import { getCurrentUser } from '@/components/auth';
 import Content from '@/components/content';
 import Processes from '@/components/processes';
 import { SetAbility } from '@/lib/abilityStore';
+import { errorResponse } from '@/lib/server-error-handling/page-error-response';
 import { FC, PropsWithChildren } from 'react';
 import { AiOutlineFile, AiOutlineProfile } from 'react-icons/ai';
 
-const SigninLayout: FC<PropsWithChildren> = ({ children }) => {
+const SigninLayout: FC<PropsWithChildren> = async ({ children }) => {
+  const currentUser = await getCurrentUser();
+  if (currentUser.isErr()) {
+    return errorResponse(currentUser);
+  }
+
   return (
     <>
       {children}

src/management-system-v2/app/(auth)/signin/page.tsx

@@ -1,17 +1,24 @@
 import { getProviders } from '@/lib/auth';
 import { getCurrentUser } from '@/components/auth';
-import { redirect } from 'next/navigation';
+import { notFound, redirect } from 'next/navigation';
 import SignIn from './signin';
 import { generateGuestReferenceToken } from '@/lib/reference-guest-user-token';
 import { env } from '@/lib/ms-config/env-vars';
 import db from '@/lib/data/db';
+import { errorResponse } from '@/lib/server-error-handling/page-error-response';
 
 const dayInMS = 1000 * 60 * 60 * 24;
 
 // take in search query
 const SignInPage = async (props: { searchParams: Promise<{ callbackUrl: string }> }) => {
   const searchParams = await props.searchParams;
-  const { session } = await getCurrentUser();
+  const currentUser = await getCurrentUser();
+  if (currentUser.isErr()) {
+    // this shouldn't really occur since it is handled in the layout file in the parent folder
+    // already
+    return notFound();
+  }
+  const { session } = currentUser.value;
   const isGuest = session?.user.isGuest;
 
   if (session?.user && !isGuest) {

src/management-system-v2/app/(auth)/signin/signin.tsx

@@ -147,7 +147,7 @@ const SignIn: FC<{
             </Button>
 
             <Alert
-              message='Note: if you select "Continue as Guest", the this Platform is functionally restricted and your created processes will not be accessible on other devices. All your data will be deleted automatically after a few days."'
+              message='Note: if you select "Continue as Guest", the PROCEED Platform is functionally restricted and your created processes will not be accessible on other devices. All your data will be deleted automatically after a few days."'
               type="info"
             />
           </>
@@ -163,8 +163,9 @@ const SignIn: FC<{
             color: '#434343',
           }}
         >
-          By using the this Platform, you agree to the <Link href="/terms">Terms of Service</Link>{' '}
-          and the storage of functionally essential cookies on your device.
+          By using the PROCEED Platform, you agree to the{' '}
+          <Link href="/terms">Terms of Service</Link> and the storage of functionally essential
+          cookies on your device.
         </Typography.Paragraph>
       </AuthModal>
     </ConfigProvider>

src/management-system-v2/app/(dashboard)/[environmentId]/(automation)/engines/[dbEngineId]/page.tsx

@@ -9,6 +9,7 @@ import { getDbEngineById } from '@/lib/data/db/engines';
 import { getMSConfig } from '@/lib/ms-config/ms-config';
 import EngineDashboard from '@/components/engine-dashboard/server-component';
 import SpaceLink from '@/components/space-link';
+import { errorResponse } from '@/lib/server-error-handling/page-error-response';
 
 export type TableEngine = Engine & { id: string };
 
@@ -24,8 +25,15 @@ export default async function EnginesPage(props: {
   const dbEngineId = decodeURIComponent(params.dbEngineId);
   const engineId = decodeURIComponent(searchParams.engineId || '');
 
-  const { ability, activeEnvironment } = await getCurrentEnvironment(params.environmentId);
+  const currentSpace = await getCurrentEnvironment(params.environmentId);
+  if (currentSpace.isErr()) {
+    return errorResponse(currentSpace);
+  }
+  const { ability, activeEnvironment } = currentSpace.value;
   const dbEngine = await getDbEngineById(dbEngineId, activeEnvironment.spaceId, ability);
+  if (dbEngine.isErr()) {
+    return errorResponse(dbEngine);
+  }
 
   return (
     <Suspense
@@ -36,7 +44,7 @@ export default async function EnginesPage(props: {
       }
     >
       <EngineDashboard
-        dbEngine={dbEngine}
+        dbEngine={dbEngine.value}
         engineId={engineId}
         backButton={
           <SpaceLink href="/engines">

src/management-system-v2/app/(dashboard)/[environmentId]/(automation)/engines/page.tsx

@@ -10,6 +10,7 @@ import { getSpaceSettingsValues } from '@/lib/data/db/space-settings';
 import { savedEnginesToEngines } from '@/lib/engines/saved-engines-helpers';
 import { Engine as DBEngine } from '@prisma/client';
 import { spaceURL } from '@/lib/utils';
+import { errorResponse } from '@/lib/server-error-handling/page-error-response';
 
 const getEngineStatus = async (engine: DBEngine) => {
   const engines = await savedEnginesToEngines([engine]);
@@ -26,20 +27,30 @@ const EnginesPage = async (props: { params: Promise<{ environmentId: string }> }
   if (!msConfig.PROCEED_PUBLIC_PROCESS_AUTOMATION_ACTIVE) return notFound();
 
   const params = await props.params;
-  const { activeEnvironment, ability } = await getCurrentEnvironment(params.environmentId);
+  const currentSpace = await getCurrentEnvironment(params.environmentId);
+  if (currentSpace.isErr()) {
+    return errorResponse(currentSpace);
+  }
+  const { activeEnvironment, ability } = currentSpace.value;
 
   const machinesSettings = await getSpaceSettingsValues(
     activeEnvironment.spaceId,
     'process-automation.process-engines',
   );
+  if (machinesSettings.isErr()) {
+    return errorResponse(machinesSettings);
+  }
 
-  if (machinesSettings.active === false) {
+  if (machinesSettings.value.active === false) {
     return notFound();
   }
 
   const engines = await getDbEngines(activeEnvironment.spaceId, ability);
+  if (engines.isErr()) {
+    return errorResponse(engines);
+  }
 
-  const enginesWithStatus = engines.map((engine) => {
+  const enginesWithStatus = engines.value.map((engine) => {
     return {
       ...engine,
       status: (

src/management-system-v2/app/(dashboard)/[environmentId]/(automation)/executions-dashboard/page.tsx

@@ -4,21 +4,29 @@ import { getCurrentEnvironment } from '@/components/auth';
 import { getMSConfig } from '@/lib/ms-config/ms-config';
 import { getSpaceSettingsValues } from '@/lib/data/db/space-settings';
 import DashboardView from './dashboard-view';
+import { errorResponse } from '@/lib/server-error-handling/page-error-response';
 
 const Page = async (props: any) => {
   const params = await props.params;
   const msConfig = await getMSConfig();
   if (!msConfig.PROCEED_PUBLIC_PROCESS_AUTOMATION_ACTIVE) return notFound();
 
-  const { activeEnvironment, ability } = await getCurrentEnvironment(params.environmentId);
+  const currentSpace = await getCurrentEnvironment(params.environmentId);
+  if (currentSpace.isErr()) {
+    return errorResponse(currentSpace);
+  }
+  const { activeEnvironment, ability } = currentSpace.value;
 
   const machinesSettings = await getSpaceSettingsValues(
     activeEnvironment.spaceId,
     'process-automation.dashboard',
     ability,
   );
+  if (machinesSettings.isErr()) {
+    return errorResponse(machinesSettings);
+  }
 
-  if (machinesSettings.active === false) {
+  if (machinesSettings.value.active === false) {
     return notFound();
   }
 

src/management-system-v2/app/(dashboard)/[environmentId]/(automation)/executions/[processId]/page.tsx

@@ -4,9 +4,13 @@ import { getDeployment } from '@/lib/engines/server-actions';
 import ProcessDeploymentView from './process-deployment-view';
 import { Suspense } from 'react';
 import { getCurrentEnvironment } from '@/components/auth';
+import { errorResponse } from '@/lib/server-error-handling/page-error-response';
+import { isUserErrorResponse } from '@/lib/server-error-handling/user-error';
+import { err } from 'neverthrow';
 
 async function Deployment({ processId, spaceId }: { processId: string; spaceId: string }) {
   const deployment = await getDeployment(spaceId, processId);
+  if (isUserErrorResponse(deployment)) return errorResponse(err());
 
   if (!deployment) {
     return (
@@ -24,7 +28,11 @@ export default async function Page(props: {
 }) {
   const params = await props.params;
   //TODO: authentication + authorization
-  const { activeEnvironment } = await getCurrentEnvironment(params.environmentId);
+  const currentSpace = await getCurrentEnvironment(params.environmentId);
+  if (currentSpace.isErr()) {
+    return errorResponse(currentSpace);
+  }
+  const { activeEnvironment } = currentSpace.value;
 
   return (
     <Suspense

src/management-system-v2/app/(dashboard)/[environmentId]/(automation)/executions/deployment-hook.ts

@@ -15,7 +15,7 @@ import { Engine } from '@/lib/engines/machines';
 import { getStartFormFromMachine } from '@/lib/engines/tasklist';
 import useEngines from '@/lib/engines/use-engines';
 import { asyncFilter, asyncForEach, deepEquals } from '@/lib/helpers/javascriptHelpers';
-import { getErrorMessage, userError } from '@/lib/user-error';
+import { getErrorMessage, userError } from '@/lib/server-error-handling/user-error';
 import { useQuery } from '@tanstack/react-query';
 import { useCallback } from 'react';
 

src/management-system-v2/app/(dashboard)/[environmentId]/(automation)/executions/deployments-modal.tsx

@@ -25,7 +25,7 @@ import { useEnvironment } from '@/components/auth-can';
 import { getFolder, getFolderContents } from '@/lib/data/folders';
 import { ProcessDeploymentList } from '@/components/process-list';
 import { useQuery } from '@tanstack/react-query';
-import { isUserErrorResponse } from '@/lib/user-error';
+import { isUserErrorResponse } from '@/lib/server-error-handling/user-error';
 import { getAvailableSpaceEngines } from '@/lib/engines/server-actions';
 import { SpaceEngine } from '@/lib/engines/machines';
 import { MdOutlineComputer } from 'react-icons/md';

src/management-system-v2/app/(dashboard)/[environmentId]/(automation)/executions/deployments-view.tsx

@@ -15,7 +15,7 @@ import { useRouter } from 'next/navigation';
 import { deployProcess as serverDeployProcess } from '@/lib/engines/server-actions';
 import { wrapServerCall } from '@/lib/wrap-server-call';
 import { SpaceEngine } from '@/lib/engines/machines';
-import { userError } from '@/lib/user-error';
+import { userError } from '@/lib/server-error-handling/user-error';
 import { removeDeployment as serverRemoveDeployment } from '@/lib/engines/server-actions';
 import { useQueryClient } from '@tanstack/react-query';
 

src/management-system-v2/app/(dashboard)/[environmentId]/(automation)/executions/layout.tsx

@@ -3,6 +3,7 @@ import { getSpaceSettingsValues } from '@/lib/data/db/space-settings';
 import { notFound } from 'next/navigation';
 import { getCurrentEnvironment } from '@/components/auth';
 import { getMSConfig } from '@/lib/ms-config/ms-config';
+import { errorResponse } from '@/lib/server-error-handling/page-error-response';
 
 type ExecutionLayoutProps = {
   params: Promise<{ environmentId: string }>;
@@ -17,14 +18,21 @@ const ExecutionsLayout: React.FC<ExecutionLayoutProps> = async (props) => {
 
   if (!msConfig.PROCEED_PUBLIC_PROCESS_AUTOMATION_ACTIVE) return notFound();
 
-  const { activeEnvironment } = await getCurrentEnvironment(params.environmentId);
+  const currentSpace = await getCurrentEnvironment(params.environmentId);
+  if (currentSpace.isErr()) {
+    return errorResponse(currentSpace);
+  }
+  const { activeEnvironment } = currentSpace.value;
 
-  const exeuctionsSettings = await getSpaceSettingsValues(
+  const executionsSettings = await getSpaceSettingsValues(
     activeEnvironment.spaceId,
     'process-automation.executions',
   );
+  if (executionsSettings.isErr()) {
+    return errorResponse(executionsSettings);
+  }
 
-  if (exeuctionsSettings.active === false) {
+  if (executionsSettings.value.active === false) {
     return notFound();
   }
 

src/management-system-v2/app/(dashboard)/[environmentId]/(automation)/executions/page.tsx

@@ -5,10 +5,10 @@ import { getRootFolder, getFolderById, getFolderContents } from '@/lib/data/db/f
 import { getUsersFavourites } from '@/lib/data/users';
 import { getDeployedProcessesFromSavedEngines } from '@/lib/engines/saved-engines-helpers';
 import { DeployedProcessInfo } from '@/lib/engines/deployment';
-import { isUserErrorResponse } from '@/lib/user-error';
-import { Skeleton } from 'antd';
-import { Suspense } from 'react';
+import { isUserErrorResponse } from '@/lib/server-error-handling/user-error';
 import { getDbEngines } from '@/lib/data/db/engines';
+import { errorResponse } from '@/lib/server-error-handling/page-error-response';
+import { Result, err, ok } from 'neverthrow';
 
 function getDeploymentNames<T extends { versions: DeployedProcessInfo['versions'] }>(
   deployments: T[],
@@ -29,30 +29,56 @@ function getDeploymentNames<T extends { versions: DeployedProcessInfo['versions'
 }
 
 async function Executions({ environmentId }: { environmentId: string }) {
-  const { ability, activeEnvironment } = await getCurrentEnvironment(environmentId);
+  const currentSpace = await getCurrentEnvironment(environmentId);
+  if (currentSpace.isErr()) {
+    return errorResponse(currentSpace);
+  }
+  const { ability, activeEnvironment } = currentSpace.value;
 
   // TODO: check ability
 
   // TODO: once the legacy storage is dropped, it would be better to do one db transaction
-  let [favs, [folder, folderContents], deployedInProceed, deployedInSpaceEngines] =
-    await Promise.all([
-      getUsersFavourites(),
-      (async () => {
-        const rootFolder = await getRootFolder(activeEnvironment.spaceId, ability);
-        const folder = await getFolderById(rootFolder.id);
-        const folderContents = await getFolderContents(folder.id, ability);
-        return [folder, folderContents];
-      })(),
-      (async () => {
-        const engines = await getDbEngines(null, ability, 'dont-check');
-        return await getDeployedProcessesFromSavedEngines(engines);
-      })(),
-      (async () => {
-        const spaceEngines = await getDbEngines(activeEnvironment.spaceId, ability);
-        if (isUserErrorResponse(spaceEngines)) return [];
-        return await getDeployedProcessesFromSavedEngines(spaceEngines);
-      })(),
-    ]);
+  let promises = await Promise.all([
+    (async () => {
+      const favorites = await getUsersFavourites();
+      if (isUserErrorResponse(favorites)) return err(favorites);
+
+      return ok(favorites);
+    })(),
+    (async () => {
+      const rootFolder = await getRootFolder(activeEnvironment.spaceId, ability);
+      if (rootFolder.isErr()) return rootFolder;
+
+      const folder = await getFolderById(rootFolder.value.id);
+      if (folder.isErr()) return folder;
+
+      const folderContents = await getFolderContents(folder.value.id, ability);
+      if (folderContents.isErr()) {
+        return folderContents;
+      }
+
+      return ok([folder.value, folderContents.value] as const);
+    })(),
+    (async () => {
+      const engines = await getDbEngines(null, ability, 'dont-check');
+      if (engines.isErr()) return engines;
+
+      return ok(await getDeployedProcessesFromSavedEngines(engines.value));
+    })(),
+    (async () => {
+      const spaceEngines = await getDbEngines(activeEnvironment.spaceId, ability);
+      if (spaceEngines.isErr()) return spaceEngines;
+
+      return ok(await getDeployedProcessesFromSavedEngines(spaceEngines.value));
+    })(),
+  ]);
+
+  const results = Result.combine(promises);
+  if (results.isErr()) {
+    return errorResponse(results);
+  }
+
+  let [favs, [folder, folderContents], deployedInProceed, deployedInSpaceEngines] = results.value;
 
   folderContents = folderContents.filter((p) => p.type === 'folder' || p.versions.length);
 
@@ -66,22 +92,20 @@ async function Executions({ environmentId }: { environmentId: string }) {
   const deployedProcesses = getDeploymentNames(deployedWithRemappedIds);
 
   return (
-    <DeploymentsView
-      processes={folderContents}
-      folder={folder}
-      favourites={favs as string[]}
-      deployedProcesses={deployedProcesses}
-    />
+    <Content title="Executions">
+      <DeploymentsView
+        processes={folderContents}
+        folder={folder}
+        favourites={favs as string[]}
+        deployedProcesses={deployedProcesses}
+      />
+    </Content>
   );
 }
 
 export default async function ExecutionsPage(props: {
   params: Promise<{ environmentId: string }>;
 }) {
   const params = await props.params;
-  return (
-    <Content title="Executions">
-      <Executions environmentId={params.environmentId} />
-    </Content>
-  );
+  return <Executions environmentId={params.environmentId} />;
 }