Merge pull request #407 from wri/develop

Merging develop and main

Author: kamicut

app/(home)/sections/11_CTA.tsx

@@ -37,7 +37,7 @@ export default function CTASection() {
             </Box>
             <Button asChild variant="solid" colorPalette="primary" rounded="lg">
               <Link href="/app">
-                {LANDING_PAGE_VERSION === "public" ? "Explore the beta" : "Try the preview"}
+                {LANDING_PAGE_VERSION === "public" ? "Explore the preview" : "Try the preview"}
                 <CaretRightIcon weight="bold" />
               </Link>
             </Button>

app/(home)/sections/1_Hero.tsx

@@ -166,7 +166,7 @@ export default function LandingHero({
             >
               Global Nature Watch is an open, AI-powered system that transforms groundbreaking
               land monitoring data into intelligence to understand Earth’s landscapes.
-              Test the beta and help shape the future of land monitoring.
+              Test the preview and help shape the future of land monitoring.
             </Text>
           </Container>
           <Container
@@ -282,14 +282,14 @@ export default function LandingHero({
             >
               <Text>
                 <Badge size="xs" fontSize="8px" rounded="4px" mr="1">
-                  BETA
+                  PREVIEW
                 </Badge>
                 Global Nature Watch is
                 {LANDING_PAGE_VERSION === "closed"
-                  ? " in closed beta."
+                  ? " in closed preview."
                   : LANDING_PAGE_VERSION === "limited"
-                  ? " in limited beta."
-                  : " in beta."}
+                  ? " in limited preview."
+                  : " in preview."}
               </Text>
               <Tooltip
                 openDelay={100}
@@ -306,7 +306,7 @@ export default function LandingHero({
                   alignItems="center"
                 >
                   <QuestionIcon />
-                  What does beta mean?
+                  What does preview mean?
                 </Box>
               </Tooltip>
             </Box>

app/(home)/sections/4_FeaturesTabs.tsx

@@ -68,7 +68,7 @@ export default function FeaturesTabsSection() {
               rounded="lg"
             >
               <Link href="/app">
-                Explore the beta
+                Explore the preview
                 <CaretRightIcon weight="bold" />
               </Link>
             </Button>

app/(home)/sections/5_SupportWorkTabs.tsx

@@ -153,7 +153,7 @@ export default function SupportWorkTabsSection() {
                 rounded="lg"
               >
                 <Link href="/app">
-                  Explore the beta
+                  Explore the preview
                   <CaretRightIcon weight="bold" />
                 </Link>
               </Button>

app/actions/ortto.ts

@@ -4,6 +4,9 @@ import { cookies } from "next/headers";
 import { API_CONFIG } from "@/app/config/api";
 import { getAPIRequestHeaders } from "../../shared/utils";
 
+// Force dynamic rendering - this route should never be cached
+export const dynamic = "force-dynamic";
+
 const TOKEN_NAME = "auth_token";
 
 export async function GET() {
@@ -96,13 +99,22 @@ export async function GET() {
       userObj && typeof userObj.id === "string" ? (userObj.id as string) : null;
     const userId = idSub ?? idRoot ?? idUserId ?? idFromUser ?? email;
 
-    return NextResponse.json({
-      isAuthenticated: true,
-      user: { email, id: userId },
-      promptsUsed,
-      promptQuota,
-      hasProfile,
-    });
+    return NextResponse.json(
+      {
+        isAuthenticated: true,
+        user: { email, id: userId },
+        promptsUsed,
+        promptQuota,
+        hasProfile,
+      },
+      {
+        headers: {
+          "Cache-Control": "no-store, no-cache, must-revalidate",
+          Pragma: "no-cache",
+          Expires: "0",
+        },
+      }
+    );
   } catch {
     return NextResponse.json({ isAuthenticated: false }, { status: 401 });
   }

app/api/auth/me/route.ts

@@ -7,8 +7,6 @@ import Reasoning from "./Reasoning";
 import SamplePrompts from "./SamplePrompts";
 import ChatDisclaimer from "./ChatDisclaimer";
 
-const LANDING_PAGE_VERSION = process.env.NEXT_PUBLIC_LANDING_PAGE_VERSION;
-
 function ChatMessages() {
   const containerRef = useRef<HTMLDivElement>(null);
   const { messages, isLoading } = useChatStore();
@@ -55,49 +53,50 @@ function ChatMessages() {
         const isFirst = index === 0;
         return (
           <Fragment key={message.id}>
-                        {isFirst && displayDisclaimer && (
+            {isFirst && displayDisclaimer && (
               <ChatDisclaimer
                 type="info"
                 setDisplayDisclaimer={setDisplayDisclaimer}
               >
                 <Box>
                   <Text mb={{ base: 1, md: 2 }}>
-                    <strong>Global Nature Watch beta</strong>
+                    <strong>Global Nature Watch preview</strong>
                   </Text>
                   <Text mb={{ base: 1, md: 2 }}>
-                    You&apos;re using a beta version that&apos;s still under active development.
+                    You&apos;re using a preview version that&apos;s still under active development.
                     You may encounter errors or incomplete results, so verify results with primary sources.
                     Features, datasets, and assistant behavior may change or be removed as we iterate.
                   </Text>
                   <Text>
-                    By using this beta, you&apos;re helping shape the future of Global Nature Watch.
-                  Share feedback via{" "}
-                  <Link
-                    color="primary.solid"
-                    textDecor="underline"
-                    href="https://surveys.hotjar.com/860def81-d4f2-4f8c-abee-339ebc3129f3"
-                  >
-                    this survey
-                  </Link>{" "}
-                  or by emailing{" "}
-                  <Link
-                    color="primary.solid"
-                    textDecor="underline"
-                    href="mailto:landcarbonlab@wri.org"
-                  >
-                    landcarbonlab@wri.org
-                  </Link>{". "}
-                  Visit the{" "}
-                  <Link
-                    color="primary.solid"
-                    textDecor="underline"
-                    href="https://help.globalnaturewatch.org/"
-                    target="_blank"
-                    rel="noopener noreferrer"
-                  >
-                    Help Center
-                  </Link>{" "}
-                  to learn more about the beta.
+                    By using this preview, you&apos;re helping shape the future of Global Nature Watch.
+                    Share feedback via{" "}
+                    <Link
+                      color="primary.solid"
+                      textDecor="underline"
+                      href="https://surveys.hotjar.com/860def81-d4f2-4f8c-abee-339ebc3129f3"
+                    >
+                      this survey
+                    </Link>{" "}
+                    or by emailing{" "}
+                    <Link
+                      color="primary.solid"
+                      textDecor="underline"
+                      href="mailto:landcarbonlab@wri.org"
+                    >
+                      landcarbonlab@wri.org
+                    </Link>
+                    {" "}
+                    Visit the{" "}
+                    <Link
+                      color="primary.solid"
+                      textDecor="underline"
+                      href="https://help.globalnaturewatch.org/"
+                      target="_blank"
+                      rel="noopener noreferrer"
+                    >
+                      Help Center
+                    </Link>{" "}
+                    to learn more about the preview.
                   </Text>
                 </Box>
               </ChatDisclaimer>
@@ -110,7 +109,7 @@ function ChatMessages() {
             {isLoading && index === lastUserMessageIndex && <Reasoning />}
 
             {/* Prompt options for first message, removed when sent */}
-            {messages.length < 2 && LANDING_PAGE_VERSION !== "public" && (
+            {messages.length < 2 && (
               <SamplePrompts />
             )}
           </Fragment>

app/components/ChatMessages.tsx

@@ -85,7 +85,7 @@ const renderNavItems = (
           </Link>
         ) : (
           <Link href="/app" onClick={() => setNavOpen && setNavOpen(false)}>
-            Explore the beta
+            Explore the preview
           </Link>
         )}
       </Button>

app/components/GlobalHeader.tsx

@@ -77,7 +77,7 @@ function PageHeader() {
           variant="solid"
           size="xs"
         >
-          BETA
+          PREVIEW
         </Badge>
       </Flex>
       <Flex gap="6" alignItems="center" hideBelow="md">

app/components/PageHeader.tsx

@@ -13,6 +13,7 @@ import ThreadDeleteDialog from "./ThreadDeleteDialog";
 import ThreadRenameDialog from "./ThreadRenameDialog";
 import ThreadShareDialog from "./ThreadShareDialog";
 import { sendGAEvent } from "@next/third-parties/google";
+import { sendGAEventAsync } from "@/app/utils/analytics";
 
 function ThreadActionsMenu({
   thread,
@@ -49,7 +50,7 @@ function ThreadActionsMenu({
   )
 
   const onDelete = useCallback(async () => {
-    sendGAEvent("event", "thread_deleted", { 
+    await sendGAEventAsync("thread_deleted", { 
       thread_name: thread.name,
       thread_id: thread.id,
      });