Skip to content

Commit

Permalink
feat: add version info to footer (#4264)
Browse files Browse the repository at this point in the history
  • Loading branch information
Fran McDade authored and Fran McDade committed Nov 20, 2024
1 parent e32d084 commit 5ed752c
Show file tree
Hide file tree
Showing 17 changed files with 59 additions and 21 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
import { VersionInfo } from "@databiosphere/findable-ui/lib/components/Layout/components/Footer/components/VersionInfo/versionInfo";
import styled from "@emotion/styled";

export const StyledVersionInfo = styled(VersionInfo)`
align-self: center;
`;
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import { StyledVersionInfo } from "./versionInfo.styles";

export const VersionInfo = (): JSX.Element => {
return <StyledVersionInfo />;
};
1 change: 1 addition & 0 deletions app/components/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ export { CopyCell } from "./Index/components/CopyCell/copyCell";
export { BackPageHeroActions } from "./Layout/components/BackPage/components/BackPageHero/components/BackPageHeroActions/backPageHeroActions";
export { ANVILBranding } from "./Layout/components/Footer/components/Branding/components/ANVILBranding/anvilBranding";
export { HCABranding } from "./Layout/components/Footer/components/Branding/components/HCABranding/hcaBranding";
export { VersionInfo } from "./Layout/components/Footer/components/VersionInfo/versionInfo";
export { ANVILExplorer } from "./Layout/components/Header/components/Content/components/Logo/components/LogoExplorer/components/ANVILExplorer/ANVILExplorer";
export { LogoExplorer } from "./Layout/components/Header/components/Content/components/Logo/components/LogoExplorer/logoExplorer";
export { LabelIconMenuItem } from "./Layout/components/Header/components/Content/components/Navigation/components/NavigationMenuItems/components/LabelIconMenuItem/labelIconMenuItem";
11 changes: 8 additions & 3 deletions site-config/anvil-catalog/dev/config.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import * as C from "../../../app/components/index";
import { socialMedia } from "../../anvil/dev/socialMedia";
import { GIT_HUB_REPO_URL } from "../../common/constants";
import { SiteConfig } from "../../common/entities";
import {
ANVIL_CATALOG_CATEGORY_KEY,
Expand All @@ -17,7 +18,6 @@ import { buildNavigation } from "./layout/header/navigation/navigation";
const APP_TITLE = "AnVIL Dataset Catalog";
const BROWSER_URL = "https://anvilproject.dev.clevercanary.com";
const EXPLORER_URL = "https://explore.anvilproject.dev.clevercanary.com";
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";
Expand All @@ -26,7 +26,7 @@ export function makeConfig(
browserUrl: string,
portalUrl: string,
explorerUrl: string,
gitHubUrl: string = GIT_HUB_REPO_URL
gitHubUrl: string
): SiteConfig {
return {
analytics: {
Expand Down Expand Up @@ -125,6 +125,11 @@ export function makeConfig(
};
}

const config: SiteConfig = makeConfig(BROWSER_URL, PORTAL_URL, EXPLORER_URL);
const config: SiteConfig = makeConfig(
BROWSER_URL,
PORTAL_URL,
EXPLORER_URL,
GIT_HUB_REPO_URL
);

export default config;
3 changes: 2 additions & 1 deletion site-config/anvil-catalog/prod/config.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { GIT_HUB_REPO_URL } from "../../common/constants";
import { SiteConfig } from "../../common/entities";
import { makeConfig } from "../dev/config";

Expand All @@ -7,7 +8,7 @@ const EXPLORER_URL = "https://explore.anvilproject.org";
const PORTAL_URL = "https://anvilproject.org";

const config: SiteConfig = {
...makeConfig(BROWSER_URL, PORTAL_URL, EXPLORER_URL),
...makeConfig(BROWSER_URL, PORTAL_URL, EXPLORER_URL, GIT_HUB_REPO_URL),
};

// Update gtmAuth for the prod environment lookup.
Expand Down
4 changes: 3 additions & 1 deletion site-config/anvil-cmg/cc-dev/config.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { GIT_HUB_REPO_URL } from "../../common/constants";
import { SiteConfig } from "../../common/entities";
import { makeConfig } from "../dev/config";
import { authenticationConfig } from "./authentication/authentication";
Expand All @@ -6,7 +7,8 @@ const config: SiteConfig = {
...makeConfig(
"https://anvilproject.dev.clevercanary.com",
"https://anvilproject.dev.clevercanary.com",
"https://service.anvil.gi.ucsc.edu"
"https://service.anvil.gi.ucsc.edu",
GIT_HUB_REPO_URL
),
exportToTerraUrl: "https://bvdp-saturn-dev.appspot.com/",
};
Expand Down
12 changes: 8 additions & 4 deletions site-config/anvil-cmg/dev/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { CATALOG_DEFAULT } from "../../../app/apis/azul/anvil-cmg/common/constan
import * as C from "../../../app/components/index";
import { mapSelectCategoryValue } from "../../../app/config/utils";
import { bindSystemStatusResponse } from "../../../app/viewModelBuilders/azul/common/systemStatusMapper/systemStatusMapper";
import { FLATTEN } from "../../common/constants";
import { FLATTEN, GIT_HUB_REPO_URL } from "../../common/constants";
import { SiteConfig } from "../../common/entities";
import { ANVIL_CMG_CATEGORY_KEY, ANVIL_CMG_CATEGORY_LABEL } from "../category";
import { announcements } from "./announcements/announcements";
Expand All @@ -23,14 +23,13 @@ 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,
gitHubUrl: string,
catalog: string = CATALOG_DEFAULT
): SiteConfig {
return {
Expand Down Expand Up @@ -225,6 +224,11 @@ export function makeConfig(
};
}

const config: SiteConfig = makeConfig(BROWSER_URL, PORTAL_URL, DATA_URL);
const config: SiteConfig = makeConfig(
BROWSER_URL,
PORTAL_URL,
DATA_URL,
GIT_HUB_REPO_URL
);

export default config;
3 changes: 2 additions & 1 deletion site-config/anvil-cmg/prod/config.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { EntityConfig } from "@databiosphere/findable-ui/lib/config/entities";
import { GIT_HUB_REPO_URL } from "../../common/constants";
import { SiteConfig } from "../../common/entities";
import { makeConfig } from "../dev/config";
import { downloadColumn } from "../dev/index/filesEntityConfig";
Expand All @@ -9,7 +10,7 @@ const config: SiteConfig = {
"https://explore.anvilproject.org",
"https://anvilproject.org",
"https://service.explore.anvilproject.org",
undefined,
GIT_HUB_REPO_URL,
"anvil8"
),
exportToTerraUrl: "https://anvil.terra.bio/",
Expand Down
3 changes: 2 additions & 1 deletion site-config/anvil-cmg/tempdev/config.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { GIT_HUB_REPO_URL } from "../../common/constants";
import { SiteConfig } from "../../common/entities";
import { makeConfig } from "../dev/config";
import { authenticationConfig } from "./authentication/authentication";
Expand All @@ -7,7 +8,7 @@ const config: SiteConfig = {
"https://explore.temp.gi.ucsc.edu",
"https://anvilproject.org",
"https://service.temp.gi.ucsc.edu",
undefined,
GIT_HUB_REPO_URL,
"anvil"
),
exportToTerraUrl: "https://bvdp-saturn-dev.appspot.com/",
Expand Down
2 changes: 2 additions & 0 deletions site-config/common/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ export const FLATTEN: Record<
XS_ONLY: { xs: true },
};

export const GIT_HUB_REPO_URL = "https://github.com/DataBiosphere/data-browser";

export const VISIBLE: Record<
string,
Partial<Record<BreakpointKey, boolean>>
Expand Down
2 changes: 1 addition & 1 deletion site-config/hca-dcp/cc-ma-dev/config.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { GIT_HUB_REPO_URL } from "../../common/constants";
import { SiteConfig } from "../../common/entities";
import { makeConfig } from "../dev/config";
import { getAuthenticationConfig } from "./authentication/authentication";
Expand All @@ -12,7 +13,6 @@ const BROWSER_URL =
"https://ma-pilot.explore.data.humancellatlas.dev.clevercanary.com";
const CATALOG = "dcp3";
const DATA_URL = "https://service.dev.singlecell.gi.ucsc.edu";
const GIT_HUB_REPO_URL = "https://github.com/DataBiosphere/data-browser";
const PORTAL_URL = "https://data.humancellatlas.dev.clevercanary.com";

const config: SiteConfig = {
Expand Down
12 changes: 8 additions & 4 deletions site-config/hca-dcp/dev/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import {
} from "@databiosphere/findable-ui/lib/theme/common/typography";
import * as C from "../../../app/components/index";
import { bindSystemStatusResponse } from "../../../app/viewModelBuilders/azul/common/systemStatusMapper/systemStatusMapper";
import { FLATTEN } from "../../common/constants";
import { FLATTEN, GIT_HUB_REPO_URL } from "../../common/constants";
import { SiteConfig } from "../../common/entities";
import { announcements } from "./announcements/announcements";
import { exportConfig } from "./export/export";
Expand All @@ -29,7 +29,6 @@ const BROWSER_URL = "https://explore.data.humancellatlas.dev.clevercanary.com";
const DATA_URL = "https://service.azul.data.humancellatlas.org";
const EXPORT_TO_TERRA_URL = "https://app.terra.bio";
const FONT_FAMILY_DIN = "'din-2014', sans-serif";
const GIT_HUB_REPO_URL = "https://github.com/DataBiosphere/data-browser";
const HOME_PAGE_PATH = "/projects";
const ORG_URL = "https://www.humancellatlas.org";
const PAGINATION_PAGE_SIZE = "25";
Expand All @@ -39,7 +38,7 @@ export function makeConfig(
browserUrl: string,
portalUrl: string,
dataUrl: string,
gitHubUrl: string = GIT_HUB_REPO_URL,
gitHubUrl: string,
catalog: string = CATALOG
): SiteConfig {
return {
Expand Down Expand Up @@ -205,6 +204,11 @@ export function makeConfig(
};
}

const config: SiteConfig = makeConfig(BROWSER_URL, PORTAL_URL, DATA_URL);
const config: SiteConfig = makeConfig(
BROWSER_URL,
PORTAL_URL,
DATA_URL,
GIT_HUB_REPO_URL
);

export default config;
2 changes: 1 addition & 1 deletion site-config/hca-dcp/ma-dev/config.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { GIT_HUB_REPO_URL } from "../../common/constants";
import { SiteConfig } from "../../common/entities";
import { makeManagedAccessConfig } from "../cc-ma-dev/config";
import { makeConfig } from "../dev/config";
Expand All @@ -6,7 +7,6 @@ import { makeConfig } from "../dev/config";
const BROWSER_URL = "https://explore.dev.singlecell.gi.ucsc.edu";
const CATALOG = "dcp3";
export const DATA_URL = "https://service.dev.singlecell.gi.ucsc.edu";
const GIT_HUB_REPO_URL = "https://github.com/DataBiosphere/data-browser";
export const PORTAL_URL = "https://dev.singlecell.gi.ucsc.edu";

const config: SiteConfig = {
Expand Down
2 changes: 1 addition & 1 deletion site-config/hca-dcp/ma-prod/config.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { GIT_HUB_REPO_URL } from "../../common/constants";
import { SiteConfig } from "../../common/entities";
import { makeManagedAccessConfig } from "../cc-ma-dev/config";
import { makeConfig } from "../dev/config";
Expand All @@ -7,7 +8,6 @@ import { getAuthenticationConfig } from "./authentication/authentication";
const BROWSER_URL = "https://explore.data.humancellatlas.org";
const CATALOG = "dcp43";
const DATA_URL = "https://service.azul.data.humancellatlas.org";
const GIT_HUB_REPO_URL = "https://github.com/DataBiosphere/data-browser";
const PORTAL_URL = "https://data.humancellatlas.org";

const config: SiteConfig = {
Expand Down
3 changes: 2 additions & 1 deletion site-config/hca-dcp/prod/config.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { GIT_HUB_REPO_URL } from "../../common/constants";
import { SiteConfig } from "../../common/entities";
import { makeConfig } from "../dev/config";

Expand All @@ -7,7 +8,7 @@ export const DATA_URL = "https://service.azul.data.humancellatlas.org";
export const PORTAL_URL = "https://data.humancellatlas.org";

const config: SiteConfig = {
...makeConfig(BROWSER_URL, PORTAL_URL, DATA_URL),
...makeConfig(BROWSER_URL, PORTAL_URL, DATA_URL, GIT_HUB_REPO_URL),
};

// Update gtmAuth for the prod environment lookup.
Expand Down
6 changes: 5 additions & 1 deletion site-config/lungmap/dev/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import hcaConfig, {
PORTAL_URL as HCA_PORTAL_URL,
} from "site-config/hca-dcp/ma-dev/config";
import * as C from "../../../app/components/index";
import { FLATTEN } from "../../common/constants";
import { FLATTEN, GIT_HUB_REPO_URL } from "../../common/constants";
import { SiteConfig } from "../../common/entities";
import { filesEntityConfig as hcaFilesEntityConfig } from "../../hca-dcp/dev/index/filesEntityConfig";
import { samplesEntityConfig as hcaSamplesEntityConfig } from "../../hca-dcp/dev/index/samplesEntityConfig";
Expand All @@ -27,6 +27,7 @@ export function makeConfig(
browserUrl: string,
portalUrl: string,
dataUrl: string,
gitHubUrl: string,
catalog: string
): SiteConfig {
return {
Expand Down Expand Up @@ -60,6 +61,7 @@ export function makeConfig(
explorerTitle: "Explore Data",
export: exportConfig,
exportToTerraUrl: EXPORT_TO_TERRA_URL,
gitHubUrl,
layout: {
footer: {
Branding: C.Logo({
Expand All @@ -75,6 +77,7 @@ export function makeConfig(
},
],
socials: socialMedia.socials,
versionInfo: C.VersionInfo(),
},
header: {
authenticationEnabled: false,
Expand Down Expand Up @@ -126,6 +129,7 @@ const config: SiteConfig = makeConfig(
BROWSER_URL,
PORTAL_URL,
DATA_URL,
GIT_HUB_REPO_URL,
CATALOG
);

Expand Down
3 changes: 2 additions & 1 deletion site-config/lungmap/prod/config.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { GIT_HUB_REPO_URL } from "../../common/constants";
import { SiteConfig } from "../../common/entities";
import {
DATA_URL as HCA_DATA_URL,
Expand All @@ -12,7 +13,7 @@ const PORTAL_URL = HCA_PORTAL_URL;
const CATALOG = "lm7";

const config: SiteConfig = {
...makeConfig(BROWSER_URL, PORTAL_URL, DATA_URL, CATALOG),
...makeConfig(BROWSER_URL, PORTAL_URL, DATA_URL, GIT_HUB_REPO_URL, CATALOG),
};

// Update gtmAuth for the prod environment lookup.
Expand Down

0 comments on commit 5ed752c

Please sign in to comment.