Merge branch '531-ui-package-updates' into 'master'

chore(ui): update ui packages, fix types (https://gitlab.com/postgres-ai/database-lab/-/issues/531)

Closes #531

See merge request postgres-ai/database-lab!792

Author: NikolayS

ui/packages/ce/src/App/Menu/StickyTopBar/index.tsx

@@ -123,10 +123,13 @@ export const StickyTopBar = () => {
           message:
             'No active payment methods are found for your organization on the Postgres.ai Platform; please, visit the',
         })
-      } else if (!res.response?.recognized_org) {
+      } else if (
+        !res.response?.billing_active &&
+        !res.response?.recognized_org
+      ) {
         setState({
           type: 'missingOrgKey',
-          message: capitalizeFirstLetter(res.error.message),
+          message: capitalizeFirstLetter(res.error?.message),
         })
       }
     })

ui/packages/ce/src/App/Menu/StickyTopBar/utils/index.ts

@@ -1,2 +1,5 @@
-export const capitalizeFirstLetter = (string: string) =>
-  string.charAt(0).toUpperCase() + string.slice(1) + '.'
+export const capitalizeFirstLetter = (string: string) => {
+  if (!string) return ''
+
+  return string.charAt(0).toUpperCase() + string.slice(1) + '.'
+}

ui/packages/platform/src/components/DbLabInstances/DbLabInstancesWrapper.tsx

@@ -12,6 +12,8 @@ export interface DbLabInstancesProps {
   history: RouteComponentProps['history']
   match: {
     params: {
+      org?: string
+      project?: string
       projectId?: string | number | undefined
     }
   }

ui/packages/platform/src/components/JoeInstances/JoeInstancesWrapper.tsx

@@ -16,7 +16,9 @@ export interface JoeInstancesProps {
   }
   match: {
     params: {
-      projectId?: number
+      org?: string
+      project?: string
+      projectId?: string | number | undefined
     }
   }
 }

ui/packages/platform/src/components/types/index.ts

@@ -54,8 +54,9 @@ export interface ProjectWrapperProps {
   location: RouteComponentProps['location']
   match: {
     params: {
-      org: string
-      project: string
+      org?: string
+      project?: string
+      projectId?: string
     }
   }
   raw?: boolean
@@ -87,7 +88,7 @@ export interface ProjectWrapperProps {
 
 export interface OrganizationWrapperProps {
   classes: ClassesType
-  match: { params: { org: string | undefined } }
+  match: { params: { org?: string, projectId?: number, project?: string } }
   location: RouteComponentProps['location']
   env: {
     data: {
@@ -115,7 +116,9 @@ export interface OrganizationMenuProps {
   location: RouteComponentProps['location']
   match: {
     params: {
-      org: string
+      org?: string
+      project?: string
+      projectId?: string
     }
   }
   env: {