Merge branch 'add-missing-project-label-in-ui' into 'master'

fix(ui): add missing project label to pages

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

Author: NikolayS

ui/packages/platform/src/components/JoeHistory/JoeHistory.tsx

@@ -80,6 +80,8 @@ interface CommandDataProps {
   username: string
   useremail: string
   project_name: string
+  project_label: string
+  project_label_or_name: string
   joe_session_id: number
   id: number
 }
@@ -499,7 +501,11 @@ class JoeHistory extends Component<JoeHistoryWithStylesProps, JoeHistoryState> {
   }
 
   getProject(command: CommandDataProps) {
-    return command['project_name']
+    return (
+      command['project_label_or_name'] ||
+      command['project_label'] ||
+      command['project_name']
+    )
   }
 
   getChannel(command: CommandDataProps) {
@@ -1027,7 +1033,10 @@ class JoeHistory extends Component<JoeHistoryWithStylesProps, JoeHistoryState> {
                   provisioned and seconds, behaves as production (same execution
                   plans, same data volumes), writable and isolated for safe
                   "what if" experiments to check various optimization ideas (
-                  <GatewayLink href="https://postgres.ai/docs/joe" target="_blank">
+                  <GatewayLink
+                    href="https://postgres.ai/docs/joe"
+                    target="_blank"
+                  >
                     Learn more
                   </GatewayLink>
                   ).

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

@@ -62,6 +62,8 @@ interface JoeInstancesState {
         [instance: string]: {
           id: number
           project_name: string
+          project_label: string
+          project_label_or_name: string
           url: string
           use_tunnel: boolean
         }
@@ -79,6 +81,8 @@ interface JoeInstancesState {
       data: {
         id: number
         name: string
+        label: string
+        project_label_or_name: string
       }[]
     } | null
   } | null
@@ -274,7 +278,7 @@ class JoeInstances extends Component<
             {projects.data.map((p) => {
               return (
                 <MenuItem value={p.id} key={p.id}>
-                  {p.name}
+                  {p.project_label_or_name || p.label || p.name}
                 </MenuItem>
               )
             })}
@@ -356,7 +360,10 @@ class JoeInstances extends Component<
             Joe Bot is a virtual DBA for SQL Optimization. Joe helps engineers
             quickly troubleshoot and optimize SQL. Joe runs on top of the
             Database Lab Engine. (
-            <GatewayLink href="https://postgres.ai/docs/joe-bot" target="_blank">
+            <GatewayLink
+              href="https://postgres.ai/docs/joe-bot"
+              target="_blank"
+            >
               Learn more
             </GatewayLink>
             ).
@@ -390,7 +397,9 @@ class JoeInstances extends Component<
                     style={{ cursor: 'pointer' }}
                   >
                     <TableCell className={classes.cell}>
-                      {data.data[i].project_name}
+                      {data.data[i].project_label_or_name ||
+                        data.data[i].project_label ||
+                        data.data[i].project_name}
                     </TableCell>
 
                     <TableCell className={classes.cell}>

ui/packages/platform/src/components/Reports/Reports.tsx

@@ -60,6 +60,8 @@ interface ReportsType {
     project_id: string
     created_formatted: string
     project_name: string
+    project_label_or_name: string
+    project_label: string
     epoch: string
   }[]
 }
@@ -342,13 +344,20 @@ class Reports extends Component<ReportsWithStylesProps, ReportsState> {
           >
             <MenuItem value={0}>All</MenuItem>
 
-            {projects.data.map((p: { id: number; name: string }) => {
-              return (
-                <MenuItem value={p.id} key={p.id}>
-                  {p.name}
-                </MenuItem>
-              )
-            })}
+            {projects.data.map(
+              (p: {
+                id: number
+                name: string
+                label: string
+                project_label_or_name: string
+              }) => {
+                return (
+                  <MenuItem value={p.id} key={p.id}>
+                    {p.project_label_or_name || p.label || p.name}
+                  </MenuItem>
+                )
+              },
+            )}
           </TextField>
         </div>
       )
@@ -410,7 +419,10 @@ class Reports extends Component<ReportsWithStylesProps, ReportsState> {
           <p>
             Automated routine checkup for your PostgreSQL databases. Configure
             Checkup agent to start collecting reports (
-            <GatewayLink href="https://postgres.ai/docs/checkup" target="_blank">
+            <GatewayLink
+              href="https://postgres.ai/docs/checkup"
+              target="_blank"
+            >
               Learn more
             </GatewayLink>
             ).
@@ -496,6 +508,8 @@ class Reports extends Component<ReportsWithStylesProps, ReportsState> {
                     created_formatted: string
                     project_name: string
                     epoch: string
+                    project_label_or_name: string
+                    project_label: string
                   }) => {
                     return (
                       <TableRow
@@ -533,7 +547,9 @@ class Reports extends Component<ReportsWithStylesProps, ReportsState> {
                           </NavLink>
                         </TableCell>
                         <TableCell className={classes.cell}>
-                          {r.project_name}
+                          {r.project_label_or_name ||
+                            r.project_label ||
+                            r.project_name}
                         </TableCell>
                         <TableCell className={classes.cell}>
                           {r.created_formatted}