Properly handle backend exception and front end error code (#7325)

Author: jonathanawesome

packages/services/api/src/modules/schema/providers/schema-manager.ts

@@ -322,9 +322,21 @@ export class SchemaManager {
     };
   }
 
-  async getSchemaVersion(selector: TargetSelector & { versionId: string }) {
+  async getSchemaVersion(
+    selector: TargetSelector & { versionId: string },
+  ): Promise<SchemaVersion | null> {
     this.logger.debug('Fetching single schema version (selector=%o)', selector);
-    const result = await this.storage.getVersion(selector);
+
+    if (isUUID(selector.versionId) === false) {
+      this.logger.debug('Invalid UUID provided. (versionId=%s)', selector.versionId);
+      return null;
+    }
+
+    const result = await this.storage.getMaybeVersion(selector);
+
+    if (!result) {
+      return null;
+    }
 
     return {
       projectId: selector.projectId,

packages/services/api/src/modules/shared/providers/storage.ts

@@ -405,7 +405,7 @@ export interface Storage {
     first: number | null;
     cursor: null | string;
   }): Promise<PaginatedSchemaVersionConnection>;
-  getVersion(_: TargetSelector & { versionId: string }): Promise<SchemaVersion | never>;
+  getMaybeVersion(_: TargetSelector & { versionId: string }): Promise<SchemaVersion | null>;
   deleteSchema(
     _: {
       serviceName: string;

packages/services/storage/src/index.ts

@@ -2316,8 +2316,8 @@ export async function createStorage(
       return { serviceName: after.service_name, after: after.sdl, before: before?.sdl ?? null };
     },
 
-    async getVersion({ projectId: project, targetId: target, versionId: version }) {
-      const result = await pool.one(sql`/* getVersion */
+    async getMaybeVersion({ projectId: project, targetId: target, versionId: version }) {
+      const result = await pool.maybeOne(sql`/* getMaybeVersion */
         SELECT
           ${schemaVersionSQLFields(sql`sv.`)}
         FROM schema_versions as sv
@@ -2330,6 +2330,10 @@ export async function createStorage(
         LIMIT 1
       `);
 
+      if (!result) {
+        return null;
+      }
+
       return SchemaVersionModel.parse(result);
     },
     async getPaginatedSchemaVersionsForTargetId(args) {

packages/web/app/src/pages/target-history-version.tsx

@@ -644,17 +644,16 @@ function ActiveSchemaVersion(props: {
       targetSlug: props.targetSlug,
       versionId: props.versionId,
     },
+    // don't fire query if this is an invalid UUID
     pause: !isValidVersionId,
   });
 
   const { error } = query;
-
   const isLoading = query.fetching || query.stale;
   const project = query.data?.project;
   const schemaVersion = project?.target?.schemaVersion;
   const projectType = query.data?.project?.type;
 
-  // Order of these conditionals is important...relocate carefully!
   if (!isValidVersionId) {
     return (
       <NotFoundContent
@@ -665,16 +664,6 @@ function ActiveSchemaVersion(props: {
     );
   }
 
-  if (!isLoading && !schemaVersion) {
-    return (
-      <NotFoundContent
-        heading="Version ID does not exist"
-        subheading="The provided version ID is not in our database."
-        includeBackButton={false}
-      />
-    );
-  }
-
   if (isLoading || !projectType) {
     return (
       <div className="flex size-full flex-col items-center justify-center self-center text-sm text-gray-500">
@@ -684,6 +673,17 @@ function ActiveSchemaVersion(props: {
     );
   }
 
+  // if we're here, we have a valid UUID for versionId but the schemaVersion is doesn't exist
+  if (!schemaVersion) {
+    return (
+      <NotFoundContent
+        heading="Schema Version not found."
+        subheading="This schema version does not seem to exist anymore."
+        includeBackButton={false}
+      />
+    );
+  }
+
   if (error) {
     return (
       <div className="m-3 rounded-lg bg-red-500/20 p-8">