Merge remote-tracking branch 'upstream/main' into fd/merge-upstream-2…

…024-08-28T1757-0500
nuonco · Aug 28, 2024 · cf3683b · cf3683b
2 parents 1901ba0 + 383fe0d
commit cf3683b
Show file tree

Hide file tree

Showing 7 changed files with 236 additions and 96 deletions.
diff --git a/app/[installer-slug]/[install-id]/page.tsx b/app/[installer-slug]/[install-id]/page.tsx
@@ -1,20 +1,72 @@
+import type { Metadata } from "next";
+
 import {
   createInstall,
   getInstall,
   redeployInstall,
 } from "@/app/[installer-slug]/actions";
 import { getAppBySlug, getInstaller } from "@/common";
 import { Link } from "@/components";
+
+import { Footer } from "@/components/Footer";
+
 import InstallStepper from "@/components/InstallStepper";
 import { getCloudPlatformRegions } from "@/common";
 
+type Props = {
+  searchParams: { [key: string]: string | string[] | undefined };
+};
+
+export async function generateMetadata({
+  searchParams,
+}: Props): Promise<Metadata> {
+  const { metadata } = await getInstaller(
+    searchParams ? searchParams.installerId : null,
+  );
+  console.debug("[install] Generating Metdata");
+
+  // TODO(fd): we need to address this.
+  if (!!!metadata) {
+    console.debug("[install] No Metdata Found");
+    return {};
+  }
+
+  return {
+    title: `Install Details | ${metadata.name}`,
+    description: metadata.description,
+    icons: {
+      icon: metadata.favicon_url,
+      shortcut: metadata.favicon_url,
+    },
+    openGraph: {
+      title: metadata.name,
+      description: metadata.description,
+      type: "website",
+      images: [
+        {
+          url: metadata.og_image_url,
+        },
+      ],
+    },
+    twitter: {
+      title: metadata.name,
+      description: metadata.description,
+      images: [
+        {
+          url: metadata.logo_url,
+        },
+      ],
+    },
+  };
+}
+
 export default async function Installer({ params, searchParams }) {
   const slug = params?.["installer-slug"];
   const installId = params?.["install-id"];
 
   const [app, installer, install] = await Promise.all([
     getAppBySlug(slug),
-    getInstaller(),
+    getInstaller(searchParams ? searchParams.installerId : null),
     getInstall(installId),
   ]);
   const regions = await getCloudPlatformRegions(app.cloud_platform);
@@ -55,6 +107,7 @@ export default async function Installer({ params, searchParams }) {
           regions={regions}
         />
       </main>
+      <Footer {...installer.metadata} />
     </>
   );
 }
diff --git a/app/[installer-slug]/page.tsx b/app/[installer-slug]/page.tsx
@@ -1,18 +1,68 @@
+import type { Metadata } from "next";
+
 import {
   createInstall,
   getInstall,
   redeployInstall,
 } from "@/app/[installer-slug]/actions";
 import { getAppBySlug, getInstaller } from "@/common";
 import { Link } from "@/components";
+import { Footer } from "@/components/Footer";
 import InstallStepper from "@/components/InstallStepper";
 import { getCloudPlatformRegions } from "@/common";
 
+type Props = {
+  searchParams: { [key: string]: string | string[] | undefined };
+};
+
+export async function generateMetadata({
+  searchParams,
+}: Props): Promise<Metadata> {
+  const { metadata } = await getInstaller(
+    searchParams ? searchParams.installerId : null,
+  );
+  console.debug("[installer] Generating Metdata");
+
+  // TODO(fd): we need to address this.
+  if (!!!metadata) {
+    console.debug("[installer] No Metdata Found");
+    return {};
+  }
+
+  return {
+    title: `Installer | ${metadata.name}`,
+    description: metadata.description,
+    icons: {
+      icon: metadata.favicon_url,
+      shortcut: metadata.favicon_url,
+    },
+    openGraph: {
+      title: metadata.name,
+      description: metadata.description,
+      type: "website",
+      images: [
+        {
+          url: metadata.og_image_url,
+        },
+      ],
+    },
+    twitter: {
+      title: metadata.name,
+      description: metadata.description,
+      images: [
+        {
+          url: metadata.logo_url,
+        },
+      ],
+    },
+  };
+}
+
 export default async function Installer({ params, searchParams }) {
   const slug = params?.["installer-slug"];
   const [app, installer] = await Promise.all([
     getAppBySlug(slug),
-    getInstaller(),
+    getInstaller(searchParams ? searchParams.installerId : null),
   ]);
   const regions = await getCloudPlatformRegions(app.cloud_platform);
 
@@ -39,7 +89,6 @@ export default async function Installer({ params, searchParams }) {
           <p>{app?.description}</p>
         </div>
       </header>
-
       <main className="flex-auto" id="steps">
         <InstallStepper
           app={app}
@@ -52,6 +101,7 @@ export default async function Installer({ params, searchParams }) {
           regions={regions}
         />
       </main>
+      <Footer {...installer.metadata} />
     </>
   );
 }
diff --git a/app/layout.tsx b/app/layout.tsx
@@ -1,93 +1,27 @@
-import type { Metadata } from "next";
 import { Inter } from "next/font/google";
 import React from "react";
-import { getInstaller } from "@/common";
-import { Link, PoweredByNuon } from "@/components";
-import { Markdown } from "@/components/Markdown";
 import "./globals.css";
 import theme from "@/theme";
 
 const inter = Inter({ subsets: ["latin"] });
 
-export async function generateMetadata(): Promise<Metadata> {
-  const { metadata } = await getInstaller();
-
-  return {
-    title: metadata.name,
-    description: metadata.description,
-    icons: {
-      icon: metadata.favicon_url,
-      shortcut: metadata.favicon_url,
-    },
-    openGraph: {
-      title: metadata.name,
-      description: metadata.description,
-      type: "website",
-      images: [
-        {
-          url: metadata.og_image_url,
-        },
-      ],
-    },
-    twitter: {
-      title: metadata.name,
-      description: metadata.description,
-      images: [
-        {
-          url: metadata.logo_url,
-        },
-      ],
-    },
-  };
-}
-
-const missingData = {
-  orgName: "Nuon",
-};
-
 export default async function RootLayout({
   children,
 }: Readonly<{
   children: React.ReactNode;
 }>) {
-  const { metadata } = await getInstaller();
-
   return (
     <html
       className={`${theme.forceDarkMode ? "dark" : ""} bg-white dark:bg-black text-black dark:text-white`}
       lang="en"
     >
       <body className={`${inter.className} w-full h-dvh`}>
-        <div className="flex flex-col w-full max-w-5xl mx-auto p-6 py-12 gap-6 md:gap-12">
+        <div
+          className="flex flex-col w-full max-w-5xl mx-auto p-6 py-12 gap-6 md:gap-12"
+          id="content-wapper
+        "
+        >
           {children}
-          <footer className="flex items-center justify-between">
-            <div className="flex gap-2 items-center">
-              {metadata.copyright_markdown ? (
-                <Markdown content={metadata.copyright_markdown} />
-              ) : (
-                <>
-                  <span className="text-xs">
-                    &copy; {new Date().getFullYear()}
-                  </span>
-                  <Link
-                    href={metadata.homepage_url}
-                    className="text-xs"
-                    target="_blank"
-                    rel="noreferrer"
-                  >
-                    {missingData.orgName}
-                  </Link>
-                </>
-              )}
-            </div>
-            <div className="flex gap-6 items-center">
-              {metadata.footer_markdown ? (
-                <Markdown content={metadata.footer_markdown} />
-              ) : (
-                <PoweredByNuon />
-              )}
-            </div>
-          </footer>
         </div>
       </body>
     </html>

diff --git a/app/page.tsx b/app/page.tsx
@@ -1,8 +1,58 @@
 import { getInstaller } from "@/common";
 import { Link, Video, Card } from "@/components";
+import { Footer } from "@/components/Footer";
+
+import type { Metadata } from "next";
+
+type Props = {
+  searchParams: { [key: string]: string | string[] | undefined };
+};
+
+export async function generateMetadata({
+  searchParams,
+}: Props): Promise<Metadata> {
+  const { metadata } = await getInstaller(
+    searchParams ? searchParams.installerId : null,
+  );
+  console.debug("[index] Generating Metdata");
+
+  // TODO(fd): we need to address this.
+  if (!!!metadata) {
+    console.debug("[index] No Metdata Found");
+    return {};
+  }
+
+  return {
+    title: metadata.name,
+    description: metadata.description,
+    icons: {
+      icon: metadata.favicon_url,
+      shortcut: metadata.favicon_url,
+    },
+    openGraph: {
+      title: metadata.name,
+      description: metadata.description,
+      type: "website",
+      images: [
+        {
+          url: metadata.og_image_url,
+        },
+      ],
+    },
+    twitter: {
+      title: metadata.name,
+      description: metadata.description,
+      images: [
+        {
+          url: metadata.logo_url,
+        },
+      ],
+    },
+  };
+}
 
 export default async function Home({ searchParams }) {
-  const { metadata, apps } = await getInstaller();
+  const { metadata, apps } = await getInstaller(searchParams.installerId);
   const queryString = new URLSearchParams(searchParams).toString();
   const demoUrl = metadata.formatted_demo_url || metadata.demo_url;
   const isDemoUrlValid = /^((http|https):\/\/)/.test(demoUrl);
@@ -50,6 +100,7 @@ export default async function Home({ searchParams }) {
             ))}
         </div>
       </main>
+      <Footer {...metadata} />
     </>
   );
 }
diff --git a/common/index.ts b/common/index.ts
@@ -1,17 +1,29 @@
 export const NUON_API_URL =
   process?.env?.NUON_API_URL || "https://ctl.prod.nuon.co";
 
-export async function getInstaller(): Promise<Record<string, any>> {
-  const res = await fetch(
-    `${NUON_API_URL}/v1/installers/${process.env?.NUON_INSTALLER_ID}`,
-    {
-      cache: "no-store",
-      headers: {
-        Authorization: `Bearer ${process?.env?.NUON_API_TOKEN}`,
-        "X-Nuon-Org-ID": process.env?.NUON_ORG_ID || "",
-      },
+export async function getInstaller(
+  installerId: string[] | string | null | undefined, // man, this is why we use any
+): Promise<Record<string, any>> {
+  let nuonInstallerId = process.env?.NUON_INSTALLER_ID;
+  if (installerId !== null && installerId !== undefined) {
+    nuonInstallerId = String(installerId); // cast here to silence the linter
+    console.debug(`Using installerId from arg: ${nuonInstallerId}`);
+  } else {
+    console.debug(`Using installerId from env: ${nuonInstallerId}`);
+  }
+  let url = `${NUON_API_URL}/v1/installers/${nuonInstallerId}`;
+  const res = await fetch(url, {
+    cache: "no-store",
+    headers: {
+      Authorization: `Bearer ${process?.env?.NUON_API_TOKEN}`,
+      "X-Nuon-Org-ID": process.env?.NUON_ORG_ID || "",
     },
-  );
+  });
+  if (res.status > 300) {
+    console.error(
+      `[${res.status}] Encountered an error while fetching installer. url=${url}`,
+    );
+  }
 
   return res.json();
 }