Move NCPI catalog to ncpi-data.org (#3821)

* feat: move NCPI catalog to ncpi-data.org (#3820)
DataBiosphere · Dec 9, 2023 · d5f7e76 · d5f7e76
1 parent f57bca9
commit d5f7e76
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 75 deletions.
diff --git a/explorer/cc-ncpi-catalog-dev-deploy.sh b/explorer/cc-ncpi-catalog-dev-deploy.sh
@@ -5,22 +5,14 @@ set -e
 echo \"Deleting ./out/\"
 rm -rf ./out
 
-echo \"Deleting ./build/\"
-rm -rf ./build
-
 n 16.15.1
 npm ci
-export NEXT_PUBLIC_BASE_PATH="/ncpi/data"
-
-mkdir -p build/ncpi/data
 
-# Build AnVIL
-rm -rf ./out
+# Build
 npm run build-dev:ncpi-catalog
-mv out/ncpi/data/* build/ncpi/data
 
-export BUCKET=s3://uqc-anvil-portal.dev.ncpi.data/
-export SRCDIR=build/
+export BUCKET=s3://g78-ncpi-data.humancellatlas.dev/
+export SRCDIR=out/
 
 aws s3 sync  $SRCDIR $BUCKET --delete --profile excira
-aws cloudfront create-invalidation --distribution-id EYO1P4DTRZBCE --paths "/*" --profile excira
+aws cloudfront create-invalidation --distribution-id EJ5E27A5IGM2B --paths "/*" --profile excira
diff --git a/explorer/cgl-ncpi-catalog-prod-deploy.sh b/explorer/cgl-ncpi-catalog-prod-deploy.sh
@@ -2,25 +2,17 @@
 # Set the script to exit immediately on error
 set -e
 
+echo \"Deleting ./out/\"
 rm -rf ./out
 
-echo \"Deleting ./build/\"
-rm -rf ./build
-
 n 16.15.1
 npm ci
-export NEXT_PUBLIC_BASE_PATH="/ncpi/data"
-#./insert-gtm-snippet.sh
-
-mkdir -p build/ncpi/data
 
-# Build AnVIL
-rm -rf ./out
+# Build
 npm run build-prod:ncpi-catalog
-mv out/ncpi/data/* build/ncpi/data
 
-export BUCKET=s3://ptm-anvilproject.org.ncpi.data/
-export SRCDIR=build/
+export BUCKET=s3://TODO/
+export SRCDIR=out/a
 
 aws s3 sync  $SRCDIR $BUCKET --delete  --profile platform-anvil-portal
-aws cloudfront create-invalidation --distribution-id E3PPAMUU6T4255 --paths "/*" --profile platform-anvil-portal
+aws cloudfront create-invalidation --distribution-id TODO --paths "/*" --profile platform-anvil-portal
diff --git a/explorer/package.json b/explorer/package.json
@@ -6,8 +6,8 @@
     "dev:ncpi-catalog-dug": "./scripts/dev.sh ncpi-catalog-dug && next dev",
     "build:ncpi-catalog-dug": "./scripts/build.sh ncpi-catalog-dug && next build && next export -o out/explore && npm run postbuild",
     "dev:ncpi-catalog": "./scripts/dev.sh ncpi-catalog && next dev",
-    "build-dev:ncpi-catalog": "scripts/common-build.sh ncpi-catalog dev && next build && next export -o out/ncpi/data && npm run postbuild",
-    "build-prod:ncpi-catalog": "./scripts/common-build.sh ncpi-catalog prod && next build && next export -o out/ncpi/data && npm run postbuild",
+    "build-dev:ncpi-catalog": "scripts/common-build.sh ncpi-catalog dev && next build && next export -o out && npm run postbuild",
+    "build-prod:ncpi-catalog": "./scripts/common-build.sh ncpi-catalog prod && next build && next export -o out && npm run postbuild",
     "dev:anvil-catalog": "./scripts/dev.sh anvil-catalog && next dev",
     "build-dev:anvil-catalog": "scripts/common-build.sh anvil-catalog dev && next build && next export -o out/data && npm run postbuild",
     "build-prod:anvil-catalog": "./scripts/common-build.sh anvil-catalog prod && next build && next export -o out/data && npm run postbuild",

diff --git a/explorer/site-config/ncpi-catalog/dev/.env b/explorer/site-config/ncpi-catalog/dev/.env
@@ -1,4 +1,3 @@
 NEXT_PUBLIC_SITE_CONFIG='ncpi-catalog-dev'
-NEXT_PUBLIC_SITEMAP_DOMAIN='https://anvil-portal.dev.clevercanary.com'
-NEXT_PUBLIC_BASE_PATH='/data'
+NEXT_PUBLIC_SITEMAP_DOMAIN='https://ncpi-data.dev.clevercanary.com'
 SITEMAP_EXCLUDE='/export*,/login'
diff --git a/explorer/site-config/ncpi-catalog/dev/config.ts b/explorer/site-config/ncpi-catalog/dev/config.ts
@@ -1,5 +1,4 @@
 import { ELEMENT_ALIGNMENT } from "@clevercanary/data-explorer-ui/lib/common/entities";
-import { HEADER_NAVIGATION_LABEL } from "@clevercanary/data-explorer-ui/lib/components/Layout/components/Header/common/constants";
 import { SiteConfig } from "@clevercanary/data-explorer-ui/lib/config/entities";
 import * as C from "../../../app/components/index";
 import anvilConfig from "../../anvil/dev/config";
@@ -15,7 +14,6 @@ const logoNcpi = "/images/logoNcpi.svg";
 
 // Template constants
 const APP_TITLE = "NCPI Dataset Catalog";
-const BROWSER_URL = process.env.NEXT_PUBLIC_SITEMAP_DOMAIN || "";
 const SLOGAN = "NIH Cloud Platform Interoperability Effort";
 
 // Remove the summary from the AnVIL config.
@@ -64,62 +62,31 @@ const config: SiteConfig = {
       ],
     },
   ],
-  entities: [studiesEntityConfig, platformsEntityConfig],
+  entities: [platformsEntityConfig, studiesEntityConfig],
   explorerTitle: "NCPI Dataset Catalog",
   layout: {
-    footer: { ...anvilConfig.layout.footer, socials: socialMedia.socials },
+    footer: {
+      Branding: C.ANVILBranding({ portalURL: undefined }),
+      navLinks: [],
+      socials: socialMedia.socials,
+    },
     header: {
       Logo: C.Logo({
         alt: APP_TITLE,
         height: 40,
-        link: `${BROWSER_URL}/ncpi`,
+        link: `ncpi-acc.org`,
         src: logoNcpi,
       }),
       authenticationEnabled: false,
-      navAlignment: ELEMENT_ALIGNMENT.CENTER,
-      navLinks: [
-        {
-          label: "Overview",
-          url: `${BROWSER_URL}/ncpi`,
-        },
-        {
-          label: "Platforms",
-          url: `${BROWSER_URL}/ncpi/platforms`,
-        },
-        {
-          label: "Technologies",
-          url: `${BROWSER_URL}/ncpi/technologies`,
-        },
-        {
-          label: "Datasets",
-          url: `${BROWSER_URL}/ncpi/data`,
-        },
-        {
-          label: HEADER_NAVIGATION_LABEL.MORE,
-          menuItems: [
-            {
-              label: "Demonstration Projects",
-              url: `${BROWSER_URL}/ncpi/demonstration-projects`,
-            },
-            {
-              label: "Training",
-              url: `${BROWSER_URL}/ncpi/training`,
-            },
-            {
-              label: "Updates",
-              url: `${BROWSER_URL}/ncpi/progress-updates`,
-            },
-          ],
-          url: "",
-        },
-      ],
-      searchEnabled: true,
-      searchURL: `${BROWSER_URL}/ncpi/search`,
+      navAlignment: ELEMENT_ALIGNMENT.RIGHT,
+      navLinks: [],
+      searchEnabled: false,
+      searchURL: ``,
       slogan: SLOGAN,
       socialMedia,
     },
   },
-  redirectRootToPath: "/studies",
+  redirectRootToPath: "/platforms",
 };
 
 export default config;
diff --git a/explorer/site-config/ncpi-catalog/prod/.env b/explorer/site-config/ncpi-catalog/prod/.env
@@ -1,4 +1,3 @@
 NEXT_PUBLIC_SITE_CONFIG='ncpi-catalog-prod'
 NEXT_PUBLIC_SITEMAP_DOMAIN='https://anvilproject.org'
-NEXT_PUBLIC_BASE_PATH='/data'
 SITEMAP_EXCLUDE='/export*,/login'