From e678cee306fa0d48eaeded9cfd3bf79af67f3446 Mon Sep 17 00:00:00 2001
From: Andrew Azores <aazores@redhat.com>
Date: Fri, 1 Mar 2024 16:04:07 -0500
Subject: [PATCH] fix(archives): adjust queries and response handling for
 updated data schema

---
 .../AllTargetsArchivedRecordingsTable.tsx     | 28 ++++++++++---------
 .../Recordings/ArchivedRecordingsTable.tsx    | 10 +++++--
 2 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/src/app/Archives/AllTargetsArchivedRecordingsTable.tsx b/src/app/Archives/AllTargetsArchivedRecordingsTable.tsx
index a52104a5eb..6ddb90d8af 100644
--- a/src/app/Archives/AllTargetsArchivedRecordingsTable.tsx
+++ b/src/app/Archives/AllTargetsArchivedRecordingsTable.tsx
@@ -112,7 +112,7 @@ export const AllTargetsArchivedRecordingsTable: React.FC<AllTargetsArchivedRecor
       setArchivesForTargets(
         targetNodes.map((node) => {
           const target: Target = {
-            connectUrl: node.target.serviceUri,
+            connectUrl: node.target.connectUrl,
             alias: node.target.alias,
             labels: [],
             annotations: {
@@ -123,7 +123,7 @@ export const AllTargetsArchivedRecordingsTable: React.FC<AllTargetsArchivedRecor
           return {
             target,
             targetAsObs: of(target),
-            archiveCount: node.recordings.archived.aggregate.count,
+            archiveCount: node.target.recordings.archived.aggregate.count,
           };
         }),
       );
@@ -148,13 +148,13 @@ export const AllTargetsArchivedRecordingsTable: React.FC<AllTargetsArchivedRecor
           `query AllTargetsArchives {
                targetNodes {
                  target {
-                   serviceUri
+                   connectUrl
                    alias
-                 }
-                 recordings {
-                   archived {
-                     aggregate {
-                       count
+                   recordings {
+                     archived {
+                       aggregate {
+                         count
+                       }
                      }
                    }
                  }
@@ -178,10 +178,12 @@ export const AllTargetsArchivedRecordingsTable: React.FC<AllTargetsArchivedRecor
             `
         query ArchiveCountForTarget($connectUrl: String) {
           targetNodes(filter: { name: $connectUrl }) {
-            recordings {
-              archived {
-                aggregate {
-                  count
+            target {
+              recordings {
+                archived {
+                  aggregate {
+                    count
+                  }
                 }
               }
             }
@@ -196,7 +198,7 @@ export const AllTargetsArchivedRecordingsTable: React.FC<AllTargetsArchivedRecor
                 {
                   target: target,
                   targetAsObs: of(target),
-                  archiveCount: v.data.targetNodes[0].recordings.archived.aggregate.count,
+                  archiveCount: v.data.targetNodes[0].target.recordings.archived.aggregate.count,
                 },
               ];
             });
diff --git a/src/app/Recordings/ArchivedRecordingsTable.tsx b/src/app/Recordings/ArchivedRecordingsTable.tsx
index 3d23450f85..38a8df4e30 100644
--- a/src/app/Recordings/ArchivedRecordingsTable.tsx
+++ b/src/app/Recordings/ArchivedRecordingsTable.tsx
@@ -198,7 +198,10 @@ export const ArchivedRecordingsTable: React.FC<ArchivedRecordingsTableProps> = (
             downloadUrl
             reportUrl
             metadata {
-              labels
+              labels {
+                key
+                value
+              }
             }
             size
           }
@@ -220,7 +223,10 @@ export const ArchivedRecordingsTable: React.FC<ArchivedRecordingsTableProps> = (
             downloadUrl
             reportUrl
             metadata {
-              labels
+              labels {
+                key
+                value
+              }
             }
             size
           }