From b3ea86c36220d22eb0c708503068668182ee2385 Mon Sep 17 00:00:00 2001
From: Maksim Chervonnyi <mail@redmax.dev>
Date: Fri, 18 Oct 2024 16:00:32 +0200
Subject: [PATCH 1/9] Show release version in footer

---
 .github/workflows/deploy-catalog.yaml         |  2 +-
 .../Footer/{Footer.js => Footer.tsx}          | 77 +++++++++++--------
 .../components/Footer/{index.js => index.ts}  |  0
 catalog/app/components/Layout/Layout.tsx      | 34 +++++++-
 .../{Notification.js => Notification.tsx}     | 31 ++++----
 catalog/app/model/graphql/schema.generated.ts | 31 ++++++++
 catalog/app/model/graphql/types.generated.ts  |  6 ++
 catalog/app/utils/Stack.generated.ts          | 35 +++++++++
 catalog/app/utils/Stack.graphql               |  5 ++
 shared/graphql/schema.graphql                 |  5 ++
 10 files changed, 180 insertions(+), 46 deletions(-)
 rename catalog/app/components/Footer/{Footer.js => Footer.tsx} (80%)
 rename catalog/app/components/Footer/{index.js => index.ts} (100%)
 rename catalog/app/containers/Notifications/{Notification.js => Notification.tsx} (70%)
 create mode 100644 catalog/app/utils/Stack.generated.ts
 create mode 100644 catalog/app/utils/Stack.graphql

diff --git a/.github/workflows/deploy-catalog.yaml b/.github/workflows/deploy-catalog.yaml
index 94e31bfda51..7df1108363c 100644
--- a/.github/workflows/deploy-catalog.yaml
+++ b/.github/workflows/deploy-catalog.yaml
@@ -4,7 +4,7 @@ on:
   push:
     branches:
       - master
-      - selective-package-download
+      - stack-version
     paths:
       - '.github/workflows/deploy-catalog.yaml'
       - 'catalog/**'
diff --git a/catalog/app/components/Footer/Footer.js b/catalog/app/components/Footer/Footer.tsx
similarity index 80%
rename from catalog/app/components/Footer/Footer.js
rename to catalog/app/components/Footer/Footer.tsx
index 28850786fa1..c5252462d8f 100644
--- a/catalog/app/components/Footer/Footer.js
+++ b/catalog/app/components/Footer/Footer.tsx
@@ -4,15 +4,18 @@ import * as M from '@material-ui/core'
 
 import * as Intercom from 'components/Intercom'
 import Logo from 'components/Logo'
+import Skeleton from 'components/Skeleton'
 import cfg from 'constants/config'
 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 GQL from 'utils/GraphQL'
 import * as NamedRoutes from 'utils/NamedRoutes'
 import copyToClipboard from 'utils/clipboard'
 
+import STACK_QUERY from 'utils/Stack.generated'
+
 import bg from './bg.png'
 import iconFacebook from './icon-facebook.svg'
 import iconGithub from './icon-github.svg'
@@ -33,45 +36,54 @@ const useVersionStyles = M.makeStyles((t) => ({
 }))
 
 function Version() {
+  const { stack } = GQL.useQueryS(STACK_QUERY)
   const classes = useVersionStyles()
   const { push } = Notifications.use()
   const handleCopy = React.useCallback(() => {
-    copyToClipboard(process.env.REVISION_HASH)
+    copyToClipboard(stack.version || '')
     push('Web catalog container hash has been copied to clipboard')
-  }, [push])
+  }, [push, stack.version])
   return (
-    <div>
-      <M.Typography
-        className={classes.revision}
-        onClick={handleCopy}
-        title="Copy product revision hash to clipboard"
-        variant="caption"
-      >
-        Revision: {process.env.REVISION_HASH.substring(0, 8)}
-      </M.Typography>
-    </div>
+    <M.Typography
+      className={classes.revision}
+      onClick={handleCopy}
+      title="Copy product revision hash to clipboard"
+      variant="caption"
+    >
+      Version: {stack.version}
+    </M.Typography>
   )
 }
 
 const FooterLogo = () => <Logo height="29px" width="76.5px" />
 
-const NavLink = (props) => (
-  <M.Link
-    variant="button"
-    underline="none"
-    color="textPrimary"
-    component={props.to ? HashLink : undefined}
-    {...props}
-  />
+const NavLink = (props: M.LinkProps) => (
+  <M.Link variant="button" underline="none" color="textPrimary" {...props} />
 )
 
 const NavSpacer = () => <M.Box ml={{ xs: 2, sm: 3 }} />
 
-const NavIcon = ({ icon, ...props }) => (
-  <M.Box component="a" {...props}>
-    <M.Box component="img" height={18} src={icon} alt="" display="block" />
-  </M.Box>
-)
+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 (
+    <M.Box component="a" {...props}>
+      <img className={classes.root} src={icon} alt="" />
+    </M.Box>
+  )
+}
 
 const useStyles = M.makeStyles((t) => ({
   root: {
@@ -80,7 +92,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 +126,9 @@ const useStyles = M.makeStyles((t) => ({
       `,
     },
   },
+  logoLink: {
+    display: 'block',
+  },
 }))
 
 export default function Footer() {
@@ -137,9 +152,9 @@ export default function Footer() {
                 <FooterLogo />
               </a>
             ) : (
-              <M.Box component={Link} to={urls.home()} display="block">
+              <Link className={classes.logoLink} to={urls.home()}>
                 <FooterLogo />
-              </M.Box>
+              </Link>
             )}
           </M.Box>
 
@@ -195,7 +210,9 @@ export default function Footer() {
           </M.Box>
         </M.Container>
         <M.Container maxWidth="lg">
-          <Version />
+          <React.Suspense fallback={<Skeleton width={80} height={14} />}>
+            <Version />
+          </React.Suspense>
         </M.Container>
       </footer>
     </M.MuiThemeProvider>
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..8335222c4ae 100644
--- a/catalog/app/components/Layout/Layout.tsx
+++ b/catalog/app/components/Layout/Layout.tsx
@@ -3,10 +3,40 @@ import { useRouteMatch } from 'react-router-dom'
 import * as M from '@material-ui/core'
 
 import Footer from 'components/Footer'
+import * as style from 'constants/style'
 import * as Bookmarks from 'containers/Bookmarks'
 import * as NavBar from 'containers/NavBar'
+import { createBoundary } from 'utils/ErrorBoundary'
 import * as NamedRoutes from 'utils/NamedRoutes'
 
+const useComponentErrorStyles = M.makeStyles((t) => ({
+  root: {
+    background: t.palette.secondary.dark,
+    position: 'relative',
+  },
+  container: {
+    color: t.palette.error.light,
+    padding: t.spacing(2),
+  },
+}))
+
+function ComponentError() {
+  const classes = useComponentErrorStyles()
+  return (
+    <div className={classes.root}>
+      <M.Container maxWidth="lg" className={classes.container}>
+        <M.Typography>Failed to render component</M.Typography>
+      </M.Container>
+    </div>
+  )
+}
+
+const ErrorBoundary = createBoundary(() => () => (
+  <M.MuiThemeProvider theme={style.navTheme}>
+    <ComponentError />
+  </M.MuiThemeProvider>
+))
+
 const useRootStyles = M.makeStyles({
   root: {
     overflowX: 'hidden',
@@ -49,11 +79,11 @@ export function Layout({ bare = false, dark = false, children, pre }: LayoutProp
   return (
     <Root dark={dark}>
       <NavBar.Provider>
-        {bare ? <NavBar.Container /> : <NavBar.NavBar />}
+        <ErrorBoundary>{bare ? <NavBar.Container /> : <NavBar.NavBar />}</ErrorBoundary>
         {!!pre && pre}
         {!!children && <M.Box p={4}>{children}</M.Box>}
         <M.Box flexGrow={1} />
-        {!!isHomepage && isHomepage.isExact && <Footer />}
+        <ErrorBoundary>{!!isHomepage && isHomepage.isExact && <Footer />}</ErrorBoundary>
         {bookmarks && <Bookmarks.Sidebar bookmarks={bookmarks} bucket={bucket} />}
       </NavBar.Provider>
     </Root>
diff --git a/catalog/app/containers/Notifications/Notification.js b/catalog/app/containers/Notifications/Notification.tsx
similarity index 70%
rename from catalog/app/containers/Notifications/Notification.js
rename to catalog/app/containers/Notifications/Notification.tsx
index a8ead6821f5..d8de1f354fa 100644
--- a/catalog/app/containers/Notifications/Notification.js
+++ b/catalog/app/containers/Notifications/Notification.tsx
@@ -1,4 +1,3 @@
-import PT from 'prop-types'
 import React from 'react'
 import * as M from '@material-ui/core'
 
@@ -8,7 +7,24 @@ const useStyles = M.makeStyles((t) => ({
   },
 }))
 
-export default function Notification({ id, ttl, message, action, dismiss }) {
+interface NotificationProps {
+  id: string
+  ttl?: number | null
+  message: React.ReactNode
+  action: {
+    onClick: () => void
+    label: React.ReactNode
+  }
+  dismiss: (id: string) => void
+}
+
+export default function Notification({
+  id,
+  ttl,
+  message,
+  action,
+  dismiss,
+}: NotificationProps) {
   const classes = useStyles()
 
   const handleClose = React.useCallback(() => dismiss(id), [dismiss, id])
@@ -40,14 +56,3 @@ export default function Notification({ id, ttl, message, action, dismiss }) {
     />
   )
 }
-
-Notification.propTypes = {
-  id: PT.string.isRequired,
-  ttl: PT.oneOf([null, PT.number.isRequired]),
-  message: PT.node.isRequired,
-  action: PT.shape({
-    label: PT.string.isRequired,
-    onClick: PT.func.isRequired,
-  }),
-  dismiss: PT.func.isRequired,
-}
diff --git a/catalog/app/model/graphql/schema.generated.ts b/catalog/app/model/graphql/schema.generated.ts
index ba8ed87e3fd..84552d94167 100644
--- a/catalog/app/model/graphql/schema.generated.ts
+++ b/catalog/app/model/graphql/schema.generated.ts
@@ -4176,6 +4176,18 @@ export default {
               },
             ],
           },
+          {
+            name: 'stack',
+            type: {
+              kind: 'NON_NULL',
+              ofType: {
+                kind: 'OBJECT',
+                name: 'Stack',
+                ofType: null,
+              },
+            },
+            args: [],
+          },
           {
             name: 'subscription',
             type: {
@@ -5015,6 +5027,25 @@ export default {
         ],
         interfaces: [],
       },
+      {
+        kind: 'OBJECT',
+        name: 'Stack',
+        fields: [
+          {
+            name: 'version',
+            type: {
+              kind: 'NON_NULL',
+              ofType: {
+                kind: 'SCALAR',
+                name: 'String',
+                ofType: null,
+              },
+            },
+            args: [],
+          },
+        ],
+        interfaces: [],
+      },
       {
         kind: 'OBJECT',
         name: 'Status',
diff --git a/catalog/app/model/graphql/types.generated.ts b/catalog/app/model/graphql/types.generated.ts
index 8ad7b159639..d39b9640f38 100644
--- a/catalog/app/model/graphql/types.generated.ts
+++ b/catalog/app/model/graphql/types.generated.ts
@@ -863,6 +863,7 @@ export interface Query {
   readonly searchPackages: PackagesSearchResult
   readonly searchMoreObjects: ObjectsSearchMoreResult
   readonly searchMorePackages: PackagesSearchMoreResult
+  readonly stack: Stack
   readonly subscription: SubscriptionState
   readonly admin: AdminQueries
   readonly policies: ReadonlyArray<Policy>
@@ -1078,6 +1079,11 @@ export interface SsoConfigConflict {
   readonly _: Maybe<Scalars['Boolean']>
 }
 
+export interface Stack {
+  readonly __typename: 'Stack'
+  readonly version: Scalars['String']
+}
+
 export interface Status {
   readonly __typename: 'Status'
   readonly canaries: ReadonlyArray<Canary>
diff --git a/catalog/app/utils/Stack.generated.ts b/catalog/app/utils/Stack.generated.ts
new file mode 100644
index 00000000000..63b47793d90
--- /dev/null
+++ b/catalog/app/utils/Stack.generated.ts
@@ -0,0 +1,35 @@
+/* eslint-disable @typescript-eslint/naming-convention */
+import type { TypedDocumentNode as DocumentNode } from '@graphql-typed-document-node/core'
+import * as Types from '../model/graphql/types.generated'
+
+export type utils_StackQueryVariables = Types.Exact<{ [key: string]: never }>
+
+export type utils_StackQuery = { readonly __typename: 'Query' } & {
+  readonly stack: { readonly __typename: 'Stack' } & Pick<Types.Stack, 'version'>
+}
+
+export const utils_StackDocument = {
+  kind: 'Document',
+  definitions: [
+    {
+      kind: 'OperationDefinition',
+      operation: 'query',
+      name: { kind: 'Name', value: 'utils_Stack' },
+      selectionSet: {
+        kind: 'SelectionSet',
+        selections: [
+          {
+            kind: 'Field',
+            name: { kind: 'Name', value: 'stack' },
+            selectionSet: {
+              kind: 'SelectionSet',
+              selections: [{ kind: 'Field', name: { kind: 'Name', value: 'version' } }],
+            },
+          },
+        ],
+      },
+    },
+  ],
+} as unknown as DocumentNode<utils_StackQuery, utils_StackQueryVariables>
+
+export { utils_StackDocument as default }
diff --git a/catalog/app/utils/Stack.graphql b/catalog/app/utils/Stack.graphql
new file mode 100644
index 00000000000..4e88c241093
--- /dev/null
+++ b/catalog/app/utils/Stack.graphql
@@ -0,0 +1,5 @@
+query {
+  stack {
+    version
+  }
+}
diff --git a/shared/graphql/schema.graphql b/shared/graphql/schema.graphql
index 0bb997e7809..2b42bb1a5d6 100644
--- a/shared/graphql/schema.graphql
+++ b/shared/graphql/schema.graphql
@@ -532,6 +532,10 @@ type Me {
 
 union SwitchRoleResult = Me | InvalidInput | OperationError
 
+type Stack {
+  version: String!
+}
+
 type Query {
   me: Me
 
@@ -554,6 +558,7 @@ type Query {
   ): PackagesSearchResult!
   searchMoreObjects(after: String!, size: Int = 30): ObjectsSearchMoreResult!
   searchMorePackages(after: String!, size: Int = 30): PackagesSearchMoreResult!
+  stack: Stack!
   subscription: SubscriptionState!
 
   admin: AdminQueries! @admin

From 904fefeeac3fb9d164019fe3b13d3604cc13359c Mon Sep 17 00:00:00 2001
From: Maksim Chervonnyi <mail@redmax.dev>
Date: Mon, 4 Nov 2024 15:31:37 +0100
Subject: [PATCH 2/9] revert ErrorBoundary and GQL changes; use config for
 getting stackVersion

---
 catalog/app/components/Footer/Footer.tsx      | 10 ++----
 catalog/app/components/Layout/Layout.tsx      | 34 ++----------------
 catalog/app/model/graphql/schema.generated.ts | 31 ----------------
 catalog/app/model/graphql/types.generated.ts  |  6 ----
 catalog/app/utils/Config.ts                   |  1 +
 catalog/app/utils/Stack.generated.ts          | 35 -------------------
 catalog/app/utils/Stack.graphql               |  5 ---
 catalog/config-schema.json                    |  4 +++
 shared/graphql/schema.graphql                 |  5 ---
 9 files changed, 10 insertions(+), 121 deletions(-)
 delete mode 100644 catalog/app/utils/Stack.generated.ts
 delete mode 100644 catalog/app/utils/Stack.graphql

diff --git a/catalog/app/components/Footer/Footer.tsx b/catalog/app/components/Footer/Footer.tsx
index c5252462d8f..918d099f29f 100644
--- a/catalog/app/components/Footer/Footer.tsx
+++ b/catalog/app/components/Footer/Footer.tsx
@@ -10,12 +10,9 @@ 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 * as GQL from 'utils/GraphQL'
 import * as NamedRoutes from 'utils/NamedRoutes'
 import copyToClipboard from 'utils/clipboard'
 
-import STACK_QUERY from 'utils/Stack.generated'
-
 import bg from './bg.png'
 import iconFacebook from './icon-facebook.svg'
 import iconGithub from './icon-github.svg'
@@ -36,13 +33,12 @@ const useVersionStyles = M.makeStyles((t) => ({
 }))
 
 function Version() {
-  const { stack } = GQL.useQueryS(STACK_QUERY)
   const classes = useVersionStyles()
   const { push } = Notifications.use()
   const handleCopy = React.useCallback(() => {
-    copyToClipboard(stack.version || '')
+    copyToClipboard(cfg.stackVersion || '')
     push('Web catalog container hash has been copied to clipboard')
-  }, [push, stack.version])
+  }, [push])
   return (
     <M.Typography
       className={classes.revision}
@@ -50,7 +46,7 @@ function Version() {
       title="Copy product revision hash to clipboard"
       variant="caption"
     >
-      Version: {stack.version}
+      Version: {cfg.stackVersion}
     </M.Typography>
   )
 }
diff --git a/catalog/app/components/Layout/Layout.tsx b/catalog/app/components/Layout/Layout.tsx
index 8335222c4ae..f9c3c4d2435 100644
--- a/catalog/app/components/Layout/Layout.tsx
+++ b/catalog/app/components/Layout/Layout.tsx
@@ -3,40 +3,10 @@ import { useRouteMatch } from 'react-router-dom'
 import * as M from '@material-ui/core'
 
 import Footer from 'components/Footer'
-import * as style from 'constants/style'
 import * as Bookmarks from 'containers/Bookmarks'
 import * as NavBar from 'containers/NavBar'
-import { createBoundary } from 'utils/ErrorBoundary'
 import * as NamedRoutes from 'utils/NamedRoutes'
 
-const useComponentErrorStyles = M.makeStyles((t) => ({
-  root: {
-    background: t.palette.secondary.dark,
-    position: 'relative',
-  },
-  container: {
-    color: t.palette.error.light,
-    padding: t.spacing(2),
-  },
-}))
-
-function ComponentError() {
-  const classes = useComponentErrorStyles()
-  return (
-    <div className={classes.root}>
-      <M.Container maxWidth="lg" className={classes.container}>
-        <M.Typography>Failed to render component</M.Typography>
-      </M.Container>
-    </div>
-  )
-}
-
-const ErrorBoundary = createBoundary(() => () => (
-  <M.MuiThemeProvider theme={style.navTheme}>
-    <ComponentError />
-  </M.MuiThemeProvider>
-))
-
 const useRootStyles = M.makeStyles({
   root: {
     overflowX: 'hidden',
@@ -79,11 +49,11 @@ export function Layout({ bare = false, dark = false, children, pre }: LayoutProp
   return (
     <Root dark={dark}>
       <NavBar.Provider>
-        <ErrorBoundary>{bare ? <NavBar.Container /> : <NavBar.NavBar />}</ErrorBoundary>
+        {bare ? <NavBar.Container /> : <NavBar.NavBar />}
         {!!pre && pre}
         {!!children && <M.Box p={4}>{children}</M.Box>}
         <M.Box flexGrow={1} />
-        <ErrorBoundary>{!!isHomepage && isHomepage.isExact && <Footer />}</ErrorBoundary>
+        {isHomepage?.isExact && <Footer />}
         {bookmarks && <Bookmarks.Sidebar bookmarks={bookmarks} bucket={bucket} />}
       </NavBar.Provider>
     </Root>
diff --git a/catalog/app/model/graphql/schema.generated.ts b/catalog/app/model/graphql/schema.generated.ts
index 84552d94167..ba8ed87e3fd 100644
--- a/catalog/app/model/graphql/schema.generated.ts
+++ b/catalog/app/model/graphql/schema.generated.ts
@@ -4176,18 +4176,6 @@ export default {
               },
             ],
           },
-          {
-            name: 'stack',
-            type: {
-              kind: 'NON_NULL',
-              ofType: {
-                kind: 'OBJECT',
-                name: 'Stack',
-                ofType: null,
-              },
-            },
-            args: [],
-          },
           {
             name: 'subscription',
             type: {
@@ -5027,25 +5015,6 @@ export default {
         ],
         interfaces: [],
       },
-      {
-        kind: 'OBJECT',
-        name: 'Stack',
-        fields: [
-          {
-            name: 'version',
-            type: {
-              kind: 'NON_NULL',
-              ofType: {
-                kind: 'SCALAR',
-                name: 'String',
-                ofType: null,
-              },
-            },
-            args: [],
-          },
-        ],
-        interfaces: [],
-      },
       {
         kind: 'OBJECT',
         name: 'Status',
diff --git a/catalog/app/model/graphql/types.generated.ts b/catalog/app/model/graphql/types.generated.ts
index d39b9640f38..8ad7b159639 100644
--- a/catalog/app/model/graphql/types.generated.ts
+++ b/catalog/app/model/graphql/types.generated.ts
@@ -863,7 +863,6 @@ export interface Query {
   readonly searchPackages: PackagesSearchResult
   readonly searchMoreObjects: ObjectsSearchMoreResult
   readonly searchMorePackages: PackagesSearchMoreResult
-  readonly stack: Stack
   readonly subscription: SubscriptionState
   readonly admin: AdminQueries
   readonly policies: ReadonlyArray<Policy>
@@ -1079,11 +1078,6 @@ export interface SsoConfigConflict {
   readonly _: Maybe<Scalars['Boolean']>
 }
 
-export interface Stack {
-  readonly __typename: 'Stack'
-  readonly version: Scalars['String']
-}
-
 export interface Status {
   readonly __typename: 'Status'
   readonly canaries: ReadonlyArray<Canary>
diff --git a/catalog/app/utils/Config.ts b/catalog/app/utils/Config.ts
index 977015fe6a7..a9acb7c0907 100644
--- a/catalog/app/utils/Config.ts
+++ b/catalog/app/utils/Config.ts
@@ -47,6 +47,7 @@ export interface ConfigJson {
   qurator?: boolean
 
   build_version?: string // not sure where this comes from
+  stackVersion?: string // FIXME: Make required
 }
 
 const ajv = new Ajv({ allErrors: true, removeAdditional: true })
diff --git a/catalog/app/utils/Stack.generated.ts b/catalog/app/utils/Stack.generated.ts
deleted file mode 100644
index 63b47793d90..00000000000
--- a/catalog/app/utils/Stack.generated.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-/* eslint-disable @typescript-eslint/naming-convention */
-import type { TypedDocumentNode as DocumentNode } from '@graphql-typed-document-node/core'
-import * as Types from '../model/graphql/types.generated'
-
-export type utils_StackQueryVariables = Types.Exact<{ [key: string]: never }>
-
-export type utils_StackQuery = { readonly __typename: 'Query' } & {
-  readonly stack: { readonly __typename: 'Stack' } & Pick<Types.Stack, 'version'>
-}
-
-export const utils_StackDocument = {
-  kind: 'Document',
-  definitions: [
-    {
-      kind: 'OperationDefinition',
-      operation: 'query',
-      name: { kind: 'Name', value: 'utils_Stack' },
-      selectionSet: {
-        kind: 'SelectionSet',
-        selections: [
-          {
-            kind: 'Field',
-            name: { kind: 'Name', value: 'stack' },
-            selectionSet: {
-              kind: 'SelectionSet',
-              selections: [{ kind: 'Field', name: { kind: 'Name', value: 'version' } }],
-            },
-          },
-        ],
-      },
-    },
-  ],
-} as unknown as DocumentNode<utils_StackQuery, utils_StackQueryVariables>
-
-export { utils_StackDocument as default }
diff --git a/catalog/app/utils/Stack.graphql b/catalog/app/utils/Stack.graphql
deleted file mode 100644
index 4e88c241093..00000000000
--- a/catalog/app/utils/Stack.graphql
+++ /dev/null
@@ -1,5 +0,0 @@
-query {
-  stack {
-    version
-  }
-}
diff --git a/catalog/config-schema.json b/catalog/config-schema.json
index 33a9476a46f..333fb9c8006 100644
--- a/catalog/config-schema.json
+++ b/catalog/config-schema.json
@@ -96,6 +96,10 @@
     "qurator": {
       "type": "boolean",
       "description": "Enable Qurator AI Assistant (powered by Amazon Bedrock)"
+    },
+    "stack_version": {
+      "type": "string",
+      "description": "Stack release version, uses semver"
     }
   },
   "required": [
diff --git a/shared/graphql/schema.graphql b/shared/graphql/schema.graphql
index 2b42bb1a5d6..0bb997e7809 100644
--- a/shared/graphql/schema.graphql
+++ b/shared/graphql/schema.graphql
@@ -532,10 +532,6 @@ type Me {
 
 union SwitchRoleResult = Me | InvalidInput | OperationError
 
-type Stack {
-  version: String!
-}
-
 type Query {
   me: Me
 
@@ -558,7 +554,6 @@ type Query {
   ): PackagesSearchResult!
   searchMoreObjects(after: String!, size: Int = 30): ObjectsSearchMoreResult!
   searchMorePackages(after: String!, size: Int = 30): PackagesSearchMoreResult!
-  stack: Stack!
   subscription: SubscriptionState!
 
   admin: AdminQueries! @admin

From 6661d124ccd257fd042009533d1ad4c7c6fbc05f Mon Sep 17 00:00:00 2001
From: Maksim Chervonnyi <mail@redmax.dev>
Date: Mon, 4 Nov 2024 15:58:20 +0100
Subject: [PATCH 3/9] make cfg.stackVersion required

---
 catalog/app/components/Footer/Footer.tsx | 7 ++-----
 catalog/app/utils/Config.ts              | 2 +-
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/catalog/app/components/Footer/Footer.tsx b/catalog/app/components/Footer/Footer.tsx
index 918d099f29f..78346502854 100644
--- a/catalog/app/components/Footer/Footer.tsx
+++ b/catalog/app/components/Footer/Footer.tsx
@@ -4,7 +4,6 @@ import * as M from '@material-ui/core'
 
 import * as Intercom from 'components/Intercom'
 import Logo from 'components/Logo'
-import Skeleton from 'components/Skeleton'
 import cfg from 'constants/config'
 import * as style from 'constants/style'
 import * as URLS from 'constants/urls'
@@ -36,7 +35,7 @@ function Version() {
   const classes = useVersionStyles()
   const { push } = Notifications.use()
   const handleCopy = React.useCallback(() => {
-    copyToClipboard(cfg.stackVersion || '')
+    copyToClipboard(cfg.stackVersion)
     push('Web catalog container hash has been copied to clipboard')
   }, [push])
   return (
@@ -206,9 +205,7 @@ export default function Footer() {
           </M.Box>
         </M.Container>
         <M.Container maxWidth="lg">
-          <React.Suspense fallback={<Skeleton width={80} height={14} />}>
-            <Version />
-          </React.Suspense>
+          <Version />
         </M.Container>
       </footer>
     </M.MuiThemeProvider>
diff --git a/catalog/app/utils/Config.ts b/catalog/app/utils/Config.ts
index a9acb7c0907..ae388d62766 100644
--- a/catalog/app/utils/Config.ts
+++ b/catalog/app/utils/Config.ts
@@ -47,7 +47,7 @@ export interface ConfigJson {
   qurator?: boolean
 
   build_version?: string // not sure where this comes from
-  stackVersion?: string // FIXME: Make required
+  stackVersion: string
 }
 
 const ajv = new Ajv({ allErrors: true, removeAdditional: true })

From ef62e3cd4dd774f7a4df98ba46568a216b5c6ed6 Mon Sep 17 00:00:00 2001
From: nl_0 <nl.imbecile@gmail.com>
Date: Tue, 5 Nov 2024 10:11:45 +0100
Subject: [PATCH 4/9] add stackVersion to config template

---
 catalog/config.json.tmpl | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/catalog/config.json.tmpl b/catalog/config.json.tmpl
index 45bfe147d87..24f8250c5a7 100644
--- a/catalog/config.json.tmpl
+++ b/catalog/config.json.tmpl
@@ -15,5 +15,6 @@
     "serviceBucket": "${SERVICE_BUCKET}",
     "mode": "${CATALOG_MODE}",
     "chunkedChecksums": ${CHUNKED_CHECKSUMS},
-    "qurator": ${QURATOR}
+    "qurator": ${QURATOR},
+    "stackVersion": "${STACK_VERSION}"
 }

From fd9a209047d76fdc80a4f577b6efe520bc68b0e2 Mon Sep 17 00:00:00 2001
From: Maksim Chervonnyi <mail@redmax.dev>
Date: Tue, 5 Nov 2024 12:07:27 +0100
Subject: [PATCH 5/9] use cfg.stackVersion instead of REVISION_HASH for sentry
 and tracking

---
 catalog/app/utils/Sentry.ts               | 4 +---
 catalog/app/utils/tracking.js             | 2 +-
 catalog/internals/webpack/webpack.base.js | 4 ----
 3 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/catalog/app/utils/Sentry.ts b/catalog/app/utils/Sentry.ts
index 210b9659412..02b99626958 100644
--- a/catalog/app/utils/Sentry.ts
+++ b/catalog/app/utils/Sentry.ts
@@ -6,14 +6,12 @@ import * as Sentry from '@sentry/react'
 import * as AuthSelectors from 'containers/Auth/selectors'
 import type { Config } from 'utils/Config'
 
-const RELEASE = `catalog@${process.env.REVISION_HASH}`
-
 export function init(cfg: Config, history?: History) {
   if (!cfg.sentryDSN) return false
 
   Sentry.init({
     dsn: cfg.sentryDSN,
-    release: RELEASE,
+    release: cfg.stackVersion,
     environment: process.env.NODE_ENV === 'development' ? 'dev' : 'prod',
     integrations: [
       history
diff --git a/catalog/app/utils/tracking.js b/catalog/app/utils/tracking.js
index a99b0c70ec8..10b3da94020 100644
--- a/catalog/app/utils/tracking.js
+++ b/catalog/app/utils/tracking.js
@@ -76,7 +76,7 @@ export function TrackingProvider({ userSelector, children }) {
       origin: window.location.origin,
       location,
       user,
-      catalog_release: process.env.REVISION_HASH,
+      catalog_release: cfg.stackVersion,
     }),
     [location, user],
   )
diff --git a/catalog/internals/webpack/webpack.base.js b/catalog/internals/webpack/webpack.base.js
index e20cb0ede1f..4bf9c41743a 100644
--- a/catalog/internals/webpack/webpack.base.js
+++ b/catalog/internals/webpack/webpack.base.js
@@ -9,9 +9,6 @@ const CopyWebpackPlugin = require('copy-webpack-plugin')
 const ForkTsCheckerWebpackPlugin = require('fork-ts-checker-webpack-plugin')
 const HtmlWebpackPlugin = require('html-webpack-plugin')
 const webpack = require('webpack')
-const { execSync } = require('child_process')
-
-const revisionHash = execSync('git rev-parse HEAD').toString()
 
 class RevertPathOverwriteByPerspective {
   apply(compiler) {
@@ -144,7 +141,6 @@ module.exports = (options) => ({
     // NODE_ENV is exposed automatically based on the "mode" option
     new webpack.EnvironmentPlugin({
       LOGGER_REDUX: process.env.LOGGER_REDUX || 'enabled',
-      REVISION_HASH: revisionHash,
     }),
 
     new webpack.ProvidePlugin({

From 6b6cf33419b7a716d1e113318f95999c026a6145 Mon Sep 17 00:00:00 2001
From: Maksim Chervonnyi <mail@redmax.dev>
Date: Tue, 5 Nov 2024 12:13:41 +0100
Subject: [PATCH 6/9] add changelog entry; dont deploy

---
 .github/workflows/deploy-catalog.yaml | 1 -
 catalog/CHANGELOG.md                  | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/deploy-catalog.yaml b/.github/workflows/deploy-catalog.yaml
index 7df1108363c..fc4f8aed0fe 100644
--- a/.github/workflows/deploy-catalog.yaml
+++ b/.github/workflows/deploy-catalog.yaml
@@ -4,7 +4,6 @@ on:
   push:
     branches:
       - master
-      - stack-version
     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))

From 37f5b2275d90310948aebe46105c5a1a76c4ba72 Mon Sep 17 00:00:00 2001
From: Maksim Chervonnyi <mail@redmax.dev>
Date: Tue, 5 Nov 2024 12:58:33 +0100
Subject: [PATCH 7/9] Apply suggestions from code review

Co-authored-by: Alexei Mochalov <nl_0@quiltdata.io>
---
 catalog/app/components/Footer/Footer.tsx | 4 ++--
 catalog/config-schema.json               | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/catalog/app/components/Footer/Footer.tsx b/catalog/app/components/Footer/Footer.tsx
index 78346502854..d10b6299b3a 100644
--- a/catalog/app/components/Footer/Footer.tsx
+++ b/catalog/app/components/Footer/Footer.tsx
@@ -42,7 +42,7 @@ function Version() {
     <M.Typography
       className={classes.revision}
       onClick={handleCopy}
-      title="Copy product revision hash to clipboard"
+      title="Copy Platform release version to clipboard"
       variant="caption"
     >
       Version: {cfg.stackVersion}
@@ -87,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(' '),
+    ].join(', '),
     height: 230,
     paddingTop: t.spacing(6),
     position: 'relative',
diff --git a/catalog/config-schema.json b/catalog/config-schema.json
index 333fb9c8006..05b48cbb65f 100644
--- a/catalog/config-schema.json
+++ b/catalog/config-schema.json
@@ -97,9 +97,9 @@
       "type": "boolean",
       "description": "Enable Qurator AI Assistant (powered by Amazon Bedrock)"
     },
-    "stack_version": {
+    "stackVersion": {
       "type": "string",
-      "description": "Stack release version, uses semver"
+      "description": "Stack release version"
     }
   },
   "required": [

From 1f33b2e5ebba7f19bb262880ce2befbd1320c682 Mon Sep 17 00:00:00 2001
From: Maksim Chervonnyi <mail@redmax.dev>
Date: Tue, 5 Nov 2024 13:14:26 +0100
Subject: [PATCH 8/9] adjust json schema and config example

---
 catalog/config-schema.json | 3 ++-
 catalog/config.js.example  | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/catalog/config-schema.json b/catalog/config-schema.json
index 05b48cbb65f..b17071fe0ba 100644
--- a/catalog/config-schema.json
+++ b/catalog/config-schema.json
@@ -113,7 +113,8 @@
     "s3Proxy",
     "serviceBucket",
     "ssoAuth",
-    "ssoProviders"
+    "ssoProviders",
+    "stackVersion"
   ],
   "definitions": {
     "Url": {
diff --git a/catalog/config.js.example b/catalog/config.js.example
index ecc830da567..bf259cd5f42 100644
--- a/catalog/config.js.example
+++ b/catalog/config.js.example
@@ -7,4 +7,5 @@ window.QUILT_CATALOG_CONFIG = {
   "passwordAuth": "ENABLED",
   "ssoAuth": "SIGN_IN_ONLY",
   "ssoProviders": "google",
+  "stackVersion": "1.55.0"
 }

From b0d92f65028b9ab14e876b1b896feaf0e4ef2fa7 Mon Sep 17 00:00:00 2001
From: Maksim Chervonnyi <mail@redmax.dev>
Date: Tue, 5 Nov 2024 13:55:44 +0100
Subject: [PATCH 9/9] Update catalog/config.js.example

Co-authored-by: Alexei Mochalov <nl_0@quiltdata.io>
---
 catalog/config.js.example | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/catalog/config.js.example b/catalog/config.js.example
index bf259cd5f42..95b99240161 100644
--- a/catalog/config.js.example
+++ b/catalog/config.js.example
@@ -7,5 +7,5 @@ window.QUILT_CATALOG_CONFIG = {
   "passwordAuth": "ENABLED",
   "ssoAuth": "SIGN_IN_ONLY",
   "ssoProviders": "google",
-  "stackVersion": "1.55.0"
+  "stackVersion": "local-dev"
 }