Fix version display issue.

bcgov · Nov 28, 2024 · 8eb418d · 8eb418d
1 parent 4adc2c2
commit 8eb418d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/app/components/VersionBar/VersionBar.tsx b/app/components/VersionBar/VersionBar.tsx
@@ -12,7 +12,7 @@ interface VersionBarProps {
 
 export default function VersionBar({
   ruleInfo,
-  version = process.env.NEXT_PUBLIC_IN_PRODUCTION ? RULE_VERSION.inProduction : RULE_VERSION.inDev,
+  version = process.env.NEXT_PUBLIC_IN_PRODUCTION === "true" ? RULE_VERSION.inProduction : RULE_VERSION.inDev,
 }: VersionBarProps) {
   const versionColor = getVersionColor(version);
 

diff --git a/app/rule/[ruleId]/page.tsx b/app/rule/[ruleId]/page.tsx
@@ -25,11 +25,10 @@ export async function generateMetadata({ params, searchParams }: Props): Promise
 }
 
 export default async function Rule({ params: { ruleId }, searchParams }: Props) {
-  const version = searchParams.version?.trim()
-    ? searchParams.version
-    : process.env.NEXT_PUBLIC_IN_PRODUCTION
-    ? RULE_VERSION.inProduction
-    : RULE_VERSION.inDev;
+  const defaultVersion =
+    process.env.NEXT_PUBLIC_IN_PRODUCTION === "true" ? RULE_VERSION.inProduction : RULE_VERSION.inDev;
+
+  const version = searchParams.version?.trim() || defaultVersion;
 
   const oAuthRequired = version === RULE_VERSION.draft; // only require oauth if editing a draft
   // Ensure user is first logged into github so they can save what they edit