diff --git a/.github/workflows/deploy-catalog.yaml b/.github/workflows/deploy-catalog.yaml index 94e31bfda51..fc4f8aed0fe 100644 --- a/.github/workflows/deploy-catalog.yaml +++ b/.github/workflows/deploy-catalog.yaml @@ -4,7 +4,6 @@ on: push: branches: - master - - selective-package-download paths: - '.github/workflows/deploy-catalog.yaml' - 'catalog/**' diff --git a/catalog/CHANGELOG.md b/catalog/CHANGELOG.md index a834a3e8d46..5bb0bf9fd17 100644 --- a/catalog/CHANGELOG.md +++ b/catalog/CHANGELOG.md @@ -17,6 +17,7 @@ where verb is one of ## Changes +- [Changed] Show stack release version in footer ([#4200](https://github.com/quiltdata/quilt/pull/4200)) - [Added] Selective package downloading ([#4173](https://github.com/quiltdata/quilt/pull/4173)) - [Added] Qurator Omni: initial public release ([#4032](https://github.com/quiltdata/quilt/pull/4032), [#4181](https://github.com/quiltdata/quilt/pull/4181)) - [Added] Admin: UI for configuring longitudinal queries (Tabulator) ([#4135](https://github.com/quiltdata/quilt/pull/4135), [#4164](https://github.com/quiltdata/quilt/pull/4164), [#4165](https://github.com/quiltdata/quilt/pull/4165)) diff --git a/catalog/app/components/Footer/Footer.js b/catalog/app/components/Footer/Footer.tsx similarity index 84% rename from catalog/app/components/Footer/Footer.js rename to catalog/app/components/Footer/Footer.tsx index 28850786fa1..d10b6299b3a 100644 --- a/catalog/app/components/Footer/Footer.js +++ b/catalog/app/components/Footer/Footer.tsx @@ -9,7 +9,6 @@ import * as style from 'constants/style' import * as URLS from 'constants/urls' import * as Notifications from 'containers/Notifications' import * as CatalogSettings from 'utils/CatalogSettings' -import HashLink from 'utils/HashLink' import * as NamedRoutes from 'utils/NamedRoutes' import copyToClipboard from 'utils/clipboard' @@ -36,42 +35,50 @@ function Version() { const classes = useVersionStyles() const { push } = Notifications.use() const handleCopy = React.useCallback(() => { - copyToClipboard(process.env.REVISION_HASH) + copyToClipboard(cfg.stackVersion) push('Web catalog container hash has been copied to clipboard') }, [push]) return ( -
- - Revision: {process.env.REVISION_HASH.substring(0, 8)} - -
+ + Version: {cfg.stackVersion} + ) } const FooterLogo = () => -const NavLink = (props) => ( - +const NavLink = (props: M.LinkProps) => ( + ) const NavSpacer = () => -const NavIcon = ({ icon, ...props }) => ( - - - -) +const useNavIconStyles = M.makeStyles({ + root: { + display: 'block', + height: '18px', + }, +}) + +interface NavIconProps extends M.BoxProps { + href: string + icon: string + target: string +} + +const NavIcon = ({ icon, ...props }: NavIconProps) => { + const classes = useNavIconStyles() + return ( + + + + ) +} const useStyles = M.makeStyles((t) => ({ root: { @@ -80,7 +87,7 @@ const useStyles = M.makeStyles((t) => ({ '0px -12px 24px 0px rgba(25, 22, 59, 0.05)', '0px -16px 40px 0px rgba(25, 22, 59, 0.07)', '0px -24px 88px 0px rgba(25, 22, 59, 0.16)', - ], + ].join(', '), height: 230, paddingTop: t.spacing(6), position: 'relative', @@ -114,6 +121,9 @@ const useStyles = M.makeStyles((t) => ({ `, }, }, + logoLink: { + display: 'block', + }, })) export default function Footer() { @@ -137,9 +147,9 @@ export default function Footer() { ) : ( - + - + )} diff --git a/catalog/app/components/Footer/index.js b/catalog/app/components/Footer/index.ts similarity index 100% rename from catalog/app/components/Footer/index.js rename to catalog/app/components/Footer/index.ts diff --git a/catalog/app/components/Layout/Layout.tsx b/catalog/app/components/Layout/Layout.tsx index f74da8f2b7d..f9c3c4d2435 100644 --- a/catalog/app/components/Layout/Layout.tsx +++ b/catalog/app/components/Layout/Layout.tsx @@ -53,7 +53,7 @@ export function Layout({ bare = false, dark = false, children, pre }: LayoutProp {!!pre && pre} {!!children && {children}} - {!!isHomepage && isHomepage.isExact &&