revert ErrorBoundary and GQL changes; use config for getting stackVer…

…sion

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,21 +33,20 @@ 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}
       onClick={handleCopy}
       title="Copy product revision hash to clipboard"
       variant="caption"
     >
-      Version: {stack.version}
+      Version: {cfg.stackVersion}
     </M.Typography>
   )
 }

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>

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',

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>

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 })

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": [

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