Merge pull request #1313 from dxc-technology/marcialfps-website-versi…

…on-fixes Website version fixes
dxc-technology · Sep 29, 2022 · 9885dbb · 9885dbb
2 parents e090360 + bbbfbd6
commit 9885dbb
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 10 deletions.
diff --git a/website/package.json b/website/package.json
@@ -10,6 +10,7 @@
   "dependencies": {
     "@dxc-technology/halstack-react": "0.0.0-3216581",
     "@types/styled-components": "^5.1.18",
+    "axios": "^0.27.2",
     "cross-env": "^7.0.3",
     "next": "12.1.0",
     "raw-loader": "^4.0.2",

diff --git a/website/screens/common/sidenav/SidenavLogo.tsx b/website/screens/common/sidenav/SidenavLogo.tsx
@@ -3,14 +3,12 @@ import Image from "@/common/Image";
 import halstackLogo from "@/common/images/halstack_logo.svg";
 import StatusTag from "@/common/StatusTag";
 import React from "react";
-
-const siteVersion = process.env.SITE_VERSION
-  ? typeof process.env.SITE_VERSION === "number"
-    ? `v${process.env.SITE_VERSION}.0.0`
-    : process.env.SITE_VERSION
-  : "dev";
+import { useRouter } from "next/router";
 
 const SidenavLogo = () => {
+  const { basePath } = useRouter();
+  const siteVersion = basePath.split("/")[2];
+
   return (
     <SidenavLogoContainer>
       <LogoContainer>
@@ -25,7 +23,13 @@ const SidenavLogo = () => {
         </Header>
         <Subtitle>Design system</Subtitle>
       </LogoContainer>
-      <StatusTag>{siteVersion}</StatusTag>
+      <StatusTag>
+        {basePath
+          ? isNaN(parseInt(siteVersion))
+            ? siteVersion
+            : `v${siteVersion}.0.0`
+          : "dev"}
+      </StatusTag>
     </SidenavLogoContainer>
   );
 };

diff --git a/website/screens/overview/introduction/IntroductionPage.tsx b/website/screens/overview/introduction/IntroductionPage.tsx
@@ -9,8 +9,10 @@ import QuickNavContainer from "@/common/QuickNavContainer";
 import PageHeading from "@/common/PageHeading";
 import DocFooter from "@/common/DocFooter";
 import QuickNavContainerLayout from "@/common/QuickNavContainerLayout";
+import { useEffect, useState } from "react";
+import axios from "axios";
 
-const sections = [
+const sections = (currentVersion: number) => [
   {
     title: "What is Halstack",
     content: (
@@ -220,7 +222,7 @@ const sections = [
           . Please note that this version can include bugs. For a more stable
           experience check the latest release that is available{" "}
           <DxcLink
-            href={`https://developer.dxc.com/halstack/${process.env.SITE_VERSION}/`}
+            href={`https://developer.dxc.com/halstack/${currentVersion}/`}
             newWindow
           >
             here
@@ -233,6 +235,22 @@ const sections = [
 ];
 
 const Introduction = () => {
+  const [currentVersion, setCurrentVersion] = useState(0);
+
+  useEffect(() => {
+    const fetchVersions = async () => {
+      const versionsResp = await axios({
+        method: "get",
+        url: "https://developer.dxc.com/halstack/versions.json",
+      });
+      setCurrentVersion(
+        versionsResp.data.find((v: any) => v.current).versionNumber
+      );
+    };
+
+    fetchVersions();
+  }, []);
+
   return (
     <DxcFlex direction="column" gap="4rem">
       <PageHeading>
@@ -242,7 +260,7 @@ const Introduction = () => {
       </PageHeading>
       <QuickNavContainerLayout>
         <QuickNavContainer
-          sections={sections}
+          sections={sections(currentVersion)}
           startHeadingLevel={2}
         ></QuickNavContainer>
       </QuickNavContainerLayout>