Skip to content

Commit

Permalink
feat: add version info to footer for AnVIL Explorer (#4259) (#4279)
Browse files Browse the repository at this point in the history
* feat: add version info to footer (#4259)

* chore: updated findable-ui to v15.0.1 (#4259)

---------

Co-authored-by: Fran McDade <[email protected]>
  • Loading branch information
frano-m and Fran McDade authored Nov 20, 2024
1 parent 07ba9a8 commit 48965a0
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 20 deletions.
1 change: 0 additions & 1 deletion app/components/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ export {
} from "@databiosphere/findable-ui/lib/components/Layout/components/BackPage/backPageView.styles";
export { BackPageHero } from "@databiosphere/findable-ui/lib/components/Layout/components/BackPage/components/BackPageHero/backPageHero";
export { SubTitle } from "@databiosphere/findable-ui/lib/components/Layout/components/BackPage/components/BackPageHero/components/SubTitle/subTitle";
export { VersionInfo } from "@databiosphere/findable-ui/lib/components/Layout/components/Footer/components/VersionInfo/versionInfo";
export { Logo } from "@databiosphere/findable-ui/lib/components/Layout/components/Header/components/Content/components/Logo/logo";
export { Link } from "@databiosphere/findable-ui/lib/components/Links/components/Link/link";
export { Links } from "@databiosphere/findable-ui/lib/components/Links/links";
Expand Down
14 changes: 7 additions & 7 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"check-system-status:anvil-cmg": "esrun e2e/anvil/anvil-check-system-status.ts"
},
"dependencies": {
"@databiosphere/findable-ui": "15.0.0",
"@databiosphere/findable-ui": "15.0.1",
"@emotion/react": "^11.13.3",
"@emotion/styled": "^11.13.0",
"@mdx-js/loader": "^3.0.1",
Expand Down
13 changes: 2 additions & 11 deletions site-config/anvil-catalog/dev/config.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import { VersionInfo } from "@databiosphere/findable-ui/lib/components/Layout/components/Footer/components/VersionInfo/types";
import * as C from "../../../app/components/index";
import { socialMedia } from "../../anvil/dev/socialMedia";
import { SiteConfig } from "../../common/entities";
Expand All @@ -17,25 +16,17 @@ import { buildNavigation } from "./layout/header/navigation/navigation";
// Template constants
const APP_TITLE = "AnVIL Dataset Catalog";
const BROWSER_URL = "https://anvilproject.dev.clevercanary.com";
const BUILD_DATE = process.env.NEXT_PUBLIC_BUILD_DATE;
const EXPLORER_URL = "https://explore.anvilproject.dev.clevercanary.com";
const GIT_HASH = process.env.NEXT_PUBLIC_GIT_HASH;
const GIT_HUB_REPO_URL = "https://github.com/DataBiosphere/data-browser";
const HOME_PAGE_PATH = ROUTES.CONSORTIA;
const PORTAL_URL = "https://anvilproject.dev.clevercanary.com";
const SLOGAN = "NHGRI Analysis Visualization and Informatics Lab-space";
const VERSION = process.env.NEXT_PUBLIC_VERSION;

export function makeConfig(
browserUrl: string,
portalUrl: string,
explorerUrl: string,
gitHubUrl: string = GIT_HUB_REPO_URL,
versionInfo: VersionInfo = {
buildDate: BUILD_DATE,
gitHash: GIT_HASH,
version: VERSION,
}
gitHubUrl: string = GIT_HUB_REPO_URL
): SiteConfig {
return {
analytics: {
Expand Down Expand Up @@ -103,7 +94,7 @@ export function makeConfig(
Branding: C.ANVILBranding({ portalURL: undefined }),
navLinks: buildFooterNavigation(portalUrl),
socials: socialMedia.socials,
versionInfo: C.VersionInfo({ versionInfo }),
versionInfo: true,
},
header: {
authenticationEnabled: false,
Expand Down
4 changes: 4 additions & 0 deletions site-config/anvil-cmg/dev/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,14 @@ import { floating } from "./layout/floating";
const APP_TITLE = "AnVIL Data Explorer";
const DATA_URL = "https://service.anvil.gi.ucsc.edu";
const BROWSER_URL = "https://explore.anvil.gi.ucsc.edu";
const GIT_HUB_REPO_URL = "https://github.com/DataBiosphere/data-browser";
const PORTAL_URL = "https://anvilproject.dev.clevercanary.com";

export function makeConfig(
browserUrl: string,
portalUrl: string,
dataUrl: string,
gitHubUrl: string = GIT_HUB_REPO_URL,
catalog: string = CATALOG_DEFAULT
): SiteConfig {
return {
Expand Down Expand Up @@ -148,6 +150,7 @@ export function makeConfig(
explorerTitle: "Explore Data",
export: exportConfig,
exportToTerraUrl: "https://bvdp-saturn-dev.appspot.com/",
gitHubUrl,
layout: {
floating,
footer: {
Expand All @@ -162,6 +165,7 @@ export function makeConfig(
url: `${browserUrl}/privacy`,
},
],
versionInfo: true,
},
header: {
announcements,
Expand Down
1 change: 1 addition & 0 deletions site-config/anvil-cmg/prod/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ const config: SiteConfig = {
"https://explore.anvilproject.org",
"https://anvilproject.org",
"https://service.explore.anvilproject.org",
undefined,
"anvil8"
),
exportToTerraUrl: "https://anvil.terra.bio/",
Expand Down
1 change: 1 addition & 0 deletions site-config/anvil-cmg/tempdev/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ const config: SiteConfig = {
"https://explore.temp.gi.ucsc.edu",
"https://anvilproject.org",
"https://service.temp.gi.ucsc.edu",
undefined,
"anvil"
),
exportToTerraUrl: "https://bvdp-saturn-dev.appspot.com/",
Expand Down

0 comments on commit 48965a0

Please sign in to comment.