fixing rebase off main

Author: Judyzc

telescopetest-io/.opencode/opencode.jsonc

@@ -0,0 +1,32 @@
+{
+  "$schema": "https://opencode.ai/config.json",
+  "default_agent": "telescopetest-io",
+  "agent": {
+    "telescopetest-io": {
+      "permission": {
+        "edit": "ask",
+        "webfetch": "allow",
+        "bash": {
+          "*": "ask",
+          "git status *": "allow",
+          "git branch --show-current": "allow",
+          "git diff *": "allow",
+          "git log *": "allow",
+          "git show *": "allow",
+          "gh pr list *": "allow",
+          "gh pr view *": "allow",
+          "ls *": "allow",
+          "cat *": "allow",
+          "grep *": "allow",
+          "find *": "allow",
+          "wc *": "allow",
+          "jq *": "allow",
+          "npm *": "ask",
+          "npx *": "ask",
+          "wrangler *": "ask",
+          "node *": "ask",
+        },
+      },
+    },
+  },
+}

telescopetest-io/src/lib/repositories/testRepository.ts

@@ -45,6 +45,29 @@ export async function findTestIdByZipKey(
   return { testId: test.test_id, contentRating: test.content_rating };
 }
 
+/**
+ * Find a single test by its testId
+ * Returns the test or null if not found
+ */
+export async function getTestById(
+  prisma: PrismaClient,
+  testId: string,
+): Promise<Tests | null> {
+  const row = await prisma.tests.findUnique({
+    where: { test_id: testId },
+    select: {
+      test_id: true,
+      url: true,
+      test_date: true,
+      browser: true,
+      name: true,
+      description: true,
+      content_rating: true,
+    },
+  });
+  return row ?? null;
+}
+
 /**
  * Find all tests.
  * When AI rating is enabled, only safe tests are returned.

telescopetest-io/src/pages/api/tests/[testId]/rating.ts

@@ -1,5 +1,5 @@
 import type { APIContext, APIRoute } from 'astro';
-import { createPrismaClient } from '@/lib/prisma/client';
+import { getPrismaClient } from '@/lib/prisma/client';
 import {
   getTestRating,
   updateContentRating,
@@ -22,7 +22,7 @@ export const GET: APIRoute = async (context: APIContext) => {
     });
   }
   const env = context.locals.runtime.env;
-  const prisma = createPrismaClient(env.TELESCOPE_DB);
+  const prisma = getPrismaClient(context);
   const test = await getTestRating(prisma, testId);
   if (test === null) {
     return new Response(JSON.stringify({ error: 'Test not found' }), {

telescopetest-io/src/pages/results/[testId].astro

@@ -1,16 +1,16 @@
 ---
 import Page from '@/layouts/Page.astro';
-import Summary from '@/components/Summary.astro';
+import MetricsSection from '@/components/MetricsSection.astro';
 import ScreenshotDisplay from '@/components/ScreenshotDisplay.astro';
 import TestInfoPanel from '@/components/TestInfoPanel.astro';
 import Tabs from '@/components/Tabs.astro';
 import AllMetrics from '@/components/AllMetrics.astro';
 
 import { getPrismaClient } from '@/lib/prisma/client';
-import { getTestById, getTestRating } from '@/lib/repositories/testRepository';
-import { ContentRating } from '@/generated/prisma/client';
+import { getTestById } from '@/lib/repositories/test-repository';
+import { ContentRating } from '@/lib/classes/TestConfig';
 
-import type { MetricsJson } from '@/lib/types/results';
+import type { MetricsJson } from '@/lib/metrics/types';
 import {
   extractFcp,
   extractLcp,
@@ -24,7 +24,7 @@ import {
   getLcpRating,
   getClsRating,
   getTtfbRating,
-} from '@/lib/metrics/ratings';
+} from '@/lib/metrics/web-vitals';
 import { formatMs, formatDecimal, formatKb } from '@/lib/metrics/formatters';
 
 export const prerender = false;
@@ -43,14 +43,9 @@ if (!test) {
   return Astro.redirect('/results');
 }
 
-const rating = await getTestRating(prisma, testId);
-if (rating === null) {
-  return Astro.redirect('/results');
-}
-
 // When AI rating is disabled, treat everything as safe
-const isUnknown = aiEnabled && (test.rating === ContentRating.UNKNOWN || test.rating === ContentRating.IN_PROGRESS);
-const isUnsafe = aiEnabled && test.rating === ContentRating.UNSAFE;
+const isUnknown = aiEnabled && (test.content_rating === ContentRating.UNKNOWN || test.content_rating === ContentRating.IN_PROGRESS);
+const isUnsafe = aiEnabled && test.content_rating === ContentRating.UNSAFE;
 
 
 // --- Screenshot ---
@@ -135,8 +130,7 @@ const formattedDate = date.toLocaleString('en-US', {
     </div>
   )}
 
-
-        {!isUnsafe && (
+  {!isUnsafe && !isUnknown && (
     <>
       <div class="title-section">
         {test.name ? <h1>{test.name}</h1> : <h1>{test.test_id}</h1>}
@@ -240,8 +234,7 @@ const formattedDate = date.toLocaleString('en-US', {
         const res = await fetch(`/api/tests/${testId}/rating`);
         const data: { rating: string } = await res.json();
         if (data.rating === 'safe') {
-          if (pendingBanner) pendingBanner.style.display = 'none';
-          if (testContent) testContent.style.display = '';
+          window.location.reload();
           return;
         }
         if (data.rating === 'unsafe') {