feat: add environment-specific galaxy urls (#239)

.github/workflows/dev-deploy.yml

@@ -27,7 +27,7 @@ jobs:
       - name: Build Next.js Site
         env:
           NEXT_PUBLIC_BASE_PATH: ""
-        run: npm run build:local
+        run: npm run build:dev
 
       - name: Configure AWS Credentials
         uses: aws-actions/configure-aws-credentials@v4

.github/workflows/publish.yml

@@ -28,7 +28,7 @@ jobs:
       - name: Build Next.js Site
         env:
           NEXT_PUBLIC_BASE_PATH: ""
-        run: npm run build:local
+        run: npm run build:prod
 
       - name: Configure AWS Credentials
         uses: aws-actions/configure-aws-credentials@v3

app/config/config.ts

@@ -1,9 +1,13 @@
 import { setConfig } from "@databiosphere/findable-ui/lib/config/config";
 import { SiteConfig } from "@databiosphere/findable-ui/lib/config/entities";
+import brcAnalyticsDev from "../../site-config/brc-analytics/dev/config";
 import brcAnalyticsLocal from "../../site-config/brc-analytics/local/config";
+import brcAnalyticsProd from "../../site-config/brc-analytics/prod/config";
 
 const CONFIGS: { [k: string]: SiteConfig } = {
+  "brc-analytics-dev": brcAnalyticsDev,
   "brc-analytics-local": brcAnalyticsLocal,
+  "brc-analytics-prod": brcAnalyticsProd,
 };
 
 let appConfig: SiteConfig | null = null;

app/utils/galaxy-api.ts

@@ -1,5 +1,6 @@
 import ky from "ky";
 import { WORKFLOW_ID } from "../apis/catalog/brc-analytics-catalog/common/entities";
+import { GALAXY_ENVIRONMENT } from "site-config/common/galaxy";
 
 interface WorkflowLandingsBody {
   public: true;
@@ -16,11 +17,9 @@ interface WorkflowLanding {
   uuid: string;
 }
 
-const WORKFLOW_LANDINGS_API_URL =
-  "https://test.galaxyproject.org/api/workflow_landings";
-
-const WORKFLOW_LANDING_URL_PREFIX =
-  "https://test.galaxyproject.org/workflow_landings/";
+const { galaxyInstanceUrl } = GALAXY_ENVIRONMENT;
+const workflowLandingsApiUrl = `${galaxyInstanceUrl}api/workflow_landings`;
+const workflowLandingUrl = `${galaxyInstanceUrl}workflow_landings`;
 
 /**
  * Get the URL of the workflow landing page for the given genome workflow.
@@ -44,14 +43,14 @@ export async function getWorkflowLandingUrl(
     workflow_id: workflowId,
     workflow_target_type: "trs_url",
   };
-  const res = await ky.post<WorkflowLanding>(WORKFLOW_LANDINGS_API_URL, {
+  const res = await ky.post<WorkflowLanding>(workflowLandingsApiUrl, {
     json: body,
     retry: {
       methods: ["post"],
     },
   });
   const id = (await res.json()).uuid;
-  return `${WORKFLOW_LANDING_URL_PREFIX}${encodeURIComponent(id)}?public=true`;
+  return `${workflowLandingUrl}/${encodeURIComponent(id)}?public=true`;
 }
 
 function buildFastaUrl(identifier: string): string {

cc-brc-analytics.dev.clevercanary.com-build.sh

@@ -11,7 +11,7 @@ npm ci
 export NEXT_PUBLIC_BASE_PATH=""
 
 # Build catalog
-npm run build:local
+npm run build:dev
 
 export BUCKET=s3://tik-brc-analytics.dev/
 export SRCDIR=out/

package.json

@@ -5,6 +5,8 @@
   "scripts": {
     "dev": "./scripts/dev.sh brc-analytics && ./scripts/set-version.sh dev && next dev",
     "build:local": "./scripts/build.sh brc-analytics local && ./scripts/set-version.sh && next build",
+    "build:dev": "./scripts/build.sh brc-analytics dev && ./scripts/set-version.sh && next build",
+    "build:prod": "./scripts/build.sh brc-analytics prod && ./scripts/set-version.sh && next build",
     "start": "npx serve out",
     "lint": "next lint --dir .",
     "check-format": "prettier --check .",

psu-brc-analytics.org-build.sh

@@ -11,7 +11,7 @@ npm ci
 export NEXT_PUBLIC_BASE_PATH=""
 
 # Build catalog
-npm run build:local
+npm run build:prod
 
 export BUCKET=s3://izk-brc-analytics.org/
 export SRCDIR=out/

site-config/brc-analytics/dev/.env

@@ -0,0 +1,2 @@
+NEXT_PUBLIC_SITE_CONFIG='brc-analytics-dev'
+NEXT_PUBLIC_GALAXY_ENV="TEST"

site-config/brc-analytics/dev/config.ts

@@ -0,0 +1,8 @@
+import { SiteConfig } from "@databiosphere/findable-ui/lib/config/entities";
+import { makeConfig } from "../local/config";
+
+const BROWSER_URL = "https://brc-analytics.dev.clevercanary.com";
+
+const config: SiteConfig = makeConfig(BROWSER_URL);
+
+export default config;

site-config/brc-analytics/local/.env

@@ -1 +1,2 @@
 NEXT_PUBLIC_SITE_CONFIG='brc-analytics-local'
+NEXT_PUBLIC_GALAXY_ENV="TEST"

site-config/brc-analytics/local/config.ts

@@ -32,7 +32,10 @@ const GIT_HUB_REPO_URL = "https://github.com/galaxyproject/brc-analytics";
  *
  * @returns site config.
  */
-export function makeConfig(browserUrl: string, gitHubUrl: string): SiteConfig {
+export function makeConfig(
+  browserUrl: string,
+  gitHubUrl = GIT_HUB_REPO_URL
+): SiteConfig {
   return {
     appTitle: APP_TITLE,
     browserURL: browserUrl,
@@ -89,6 +92,6 @@ export function makeConfig(browserUrl: string, gitHubUrl: string): SiteConfig {
   };
 }
 
-const config: SiteConfig = makeConfig(BROWSER_URL, GIT_HUB_REPO_URL);
+const config: SiteConfig = makeConfig(BROWSER_URL);
 
 export default config;

site-config/brc-analytics/prod/.env

@@ -0,0 +1,2 @@
+NEXT_PUBLIC_SITE_CONFIG='brc-analytics-prod'
+NEXT_PUBLIC_GALAXY_ENV="PROD"

site-config/brc-analytics/prod/config.ts

@@ -0,0 +1,8 @@
+import { SiteConfig } from "@databiosphere/findable-ui/lib/config/entities";
+import { makeConfig } from "../local/config";
+
+const BROWSER_URL = "https://brc-analytics.org";
+
+const config: SiteConfig = makeConfig(BROWSER_URL);
+
+export default config;

site-config/common/galaxy.ts

@@ -0,0 +1,12 @@
+interface GalaxyEnvironment {
+  galaxyInstanceUrl: string;
+}
+
+export const GALAXY_ENVIRONMENT: GalaxyEnvironment =
+  process.env.NEXT_PUBLIC_GALAXY_ENV === "PROD"
+    ? {
+        galaxyInstanceUrl: "https://usegalaxy.org/",
+      }
+    : {
+        galaxyInstanceUrl: "https://test.galaxyproject.org/",
+      };