fix(graphql): query target nodes by targets' IDs rather than connectU…

…rls (#1245)
cryostatio · Apr 23, 2024 · 20dcce1 · 20dcce1
1 parent 89e2786
commit 20dcce1
Show file tree

Hide file tree

Showing 6 changed files with 46 additions and 46 deletions.
diff --git a/src/app/Archives/AllTargetsArchivedRecordingsTable.tsx b/src/app/Archives/AllTargetsArchivedRecordingsTable.tsx
@@ -223,8 +223,8 @@ export const AllTargetsArchivedRecordingsTable: React.FC<AllTargetsArchivedRecor
       addSubscription(
         context.api
           .graphql<any>(
-            `query ArchiveCountForTarget($connectUrl: String) {
-              targetNodes(filter: { name: $connectUrl }) {
+            `query ArchiveCountForTarget($id: BigInteger!) {
+              targetNodes(filter: { targetIds: [$id] }) {
                 target {
                   archivedRecordings {
                     data {
@@ -248,7 +248,7 @@ export const AllTargetsArchivedRecordingsTable: React.FC<AllTargetsArchivedRecor
                 }
               }
             }`,
-            { connectUrl: target.connectUrl },
+            { id: target.id! },
           )
           .subscribe((v) => {
             setArchivesForTargets((old) => {

diff --git a/src/app/Dashboard/AutomatedAnalysis/AutomatedAnalysisCard.tsx b/src/app/Dashboard/AutomatedAnalysis/AutomatedAnalysisCard.tsx
@@ -173,12 +173,12 @@ export const AutomatedAnalysisCard: DashboardCardFC<AutomatedAnalysisCardProps>
   // name: 'automated-analysis'; label: 'origin=automated-analysis'
   // Query NEEDS 'state' so that isActiveRecording(result) is valid
   const queryActiveRecordings = React.useCallback(
-    (connectUrl: string) => {
+    (targetId: number) => {
       /* eslint-disable-next-line @typescript-eslint/no-explicit-any */
       return context.api.graphql<any>(
         `
-      query ActiveRecordingsForAutomatedAnalysis($connectUrl: String) {
-        targetNodes(filter: { name: $connectUrl }) {
+      query ActiveRecordingsForAutomatedAnalysis($id: BigInteger!) {
+        targetNodes(filter: { targetIds: [$id] }) {
           target {
             activeRecordings(filter: {
               name: "${automatedAnalysisRecordingName}",
@@ -200,18 +200,18 @@ export const AutomatedAnalysisCard: DashboardCardFC<AutomatedAnalysisCardProps>
           }
         }
       }`,
-        { connectUrl },
+        { id: targetId },
       );
     },
     [context.api],
   );
 
   const queryArchivedRecordings = React.useCallback(
-    (connectUrl: string) => {
+    (targetId: number) => {
       /* eslint-disable-next-line @typescript-eslint/no-explicit-any */
       return context.api.graphql<any>(
-        `query ArchivedRecordingsForAutomatedAnalysis($connectUrl: String) {
-          targetNodes(filter: { name: $connectUrl }) {
+        `query ArchivedRecordingsForAutomatedAnalysis($id: BigInteger!) {
+          targetNodes(filter: { targetIds: [$id] }) {
             target {
               archivedRecordings {
                 data {
@@ -231,7 +231,7 @@ export const AutomatedAnalysisCard: DashboardCardFC<AutomatedAnalysisCardProps>
             }
           }
       }`,
-        { connectUrl },
+        { id: targetId },
       );
     },
     [context.api],
@@ -300,8 +300,8 @@ export const AutomatedAnalysisCard: DashboardCardFC<AutomatedAnalysisCardProps>
 
   // try generating report on cached or archived recordings
   const handleEmptyRecordings = React.useCallback(
-    (connectUrl: string) => {
-      const cachedReportAnalysis = context.reports.getCachedAnalysisReport(connectUrl);
+    (target: Target) => {
+      const cachedReportAnalysis = context.reports.getCachedAnalysisReport(target.connectUrl);
       if (cachedReportAnalysis.report.length > 0) {
         setReport(automatedAnalysisRecordingName);
         setUsingCachedReport(true);
@@ -310,7 +310,7 @@ export const AutomatedAnalysisCard: DashboardCardFC<AutomatedAnalysisCardProps>
         setIsLoading(false);
       } else {
         addSubscription(
-          queryArchivedRecordings(connectUrl)
+          queryArchivedRecordings(target.id!)
             .pipe(
               first(),
               map((v) => v.data.targetNodes[0].target.archivedRecordings.data as ArchivedRecording[]),
@@ -355,7 +355,7 @@ export const AutomatedAnalysisCard: DashboardCardFC<AutomatedAnalysisCardProps>
         )
         .subscribe((target: Target) => {
           addSubscription(
-            queryActiveRecordings(target.connectUrl)
+            queryActiveRecordings(target.id!)
               .pipe(
                 first(),
                 tap((resp) => {
@@ -395,7 +395,7 @@ export const AutomatedAnalysisCard: DashboardCardFC<AutomatedAnalysisCardProps>
                   if (isAuthFail(err.message)) {
                     handleStateErrors(authFailMessage);
                   } else {
-                    handleEmptyRecordings(target.connectUrl);
+                    handleEmptyRecordings(target);
                   }
                 },
               }),

diff --git a/src/app/RecordingMetadata/BulkEditLabels.tsx b/src/app/RecordingMetadata/BulkEditLabels.tsx
@@ -189,8 +189,8 @@ export const BulkEditLabels: React.FC<BulkEditLabelsProps> = ({
             filter((target) => !!target),
             concatMap((target: Target) =>
               context.api.graphql<any>(
-                `query ArchivedRecordingsForTarget($connectUrl: String) {
-                targetNodes(filter: { name: $connectUrl }) {
+                `query ArchivedRecordingsForTarget($id: BigInteger!) {
+                targetNodes(filter: { targetIds: [$id] }) {
                   target {
                     archivedRecordings {
                       data {
@@ -210,7 +210,7 @@ export const BulkEditLabels: React.FC<BulkEditLabelsProps> = ({
                   }
                 }
               }`,
-                { connectUrl: target.connectUrl },
+                { id: target.id! },
               ),
             ),
             map((v) => v.data.targetNodes[0].target.archivedRecordings.data as ArchivedRecording[]),

diff --git a/src/app/Recordings/ArchivedRecordingsTable.tsx b/src/app/Recordings/ArchivedRecordingsTable.tsx
@@ -187,12 +187,12 @@ export const ArchivedRecordingsTable: React.FC<ArchivedRecordingsTableProps> = (
   );
 
   const queryTargetRecordings = React.useCallback(
-    (connectUrl: string) => {
+    (targetId: number) => {
       /* eslint-disable-next-line @typescript-eslint/no-explicit-any */
       return context.api.graphql<any>(
         `
-      query ArchivedRecordingsForTarget($connectUrl: String) {
-        targetNodes(filter: { name: $connectUrl }) {
+      query ArchivedRecordingsForTarget($id: BigInteger!) {
+        targetNodes(filter: { targetIds: [$id] }) {
           target {
             archivedRecordings {
               data {
@@ -211,7 +211,7 @@ export const ArchivedRecordingsTable: React.FC<ArchivedRecordingsTableProps> = (
           }
         }
       }`,
-        { connectUrl },
+        { id: targetId },
       );
     },
     [context.api],
@@ -259,7 +259,7 @@ export const ArchivedRecordingsTable: React.FC<ArchivedRecordingsTableProps> = (
           .pipe(
             filter((target) => !!target),
             first(),
-            concatMap((target: Target) => queryTargetRecordings(target.connectUrl)),
+            concatMap((target: Target) => queryTargetRecordings(target.id!)),
             map((v) => v.data.targetNodes[0].target.archivedRecordings.data as ArchivedRecording[]),
           )
           .subscribe({

diff --git a/src/app/Shared/Services/Api.service.tsx b/src/app/Shared/Services/Api.service.tsx
@@ -945,8 +945,8 @@ export class ApiService {
       concatMap((target) =>
         this.graphql<any>(
           `
-        query PostRecordingMetadata($connectUrl: String, $recordingName: String, $labels: [Entry_String_StringInput]) {
-          targetNodes(filter: { name: $connectUrl }) {
+        query PostRecordingMetadata($id: BigInteger!, $recordingName: String, $labels: [Entry_String_StringInput]) {
+          targetNodes(filter: { targetIds: [$id] }) {
             target {
               archivedRecordings(filter: { name: $recordingName }) {
                 data {
@@ -966,7 +966,7 @@ export class ApiService {
           }
         }`,
           {
-            connectUrl: target.connectUrl,
+            id: target.id!,
             recordingName,
             labels: labels.map((label) => ({ key: label.key, value: label.value })),
           },
@@ -1010,8 +1010,8 @@ export class ApiService {
       concatMap((target: Target) =>
         this.graphql<any>(
           `
-        query PostActiveRecordingMetadata($connectUrl: String, $recordingName: String, $labels: [Entry_String_StringInput]) {
-          targetNodes(filter: { name: $connectUrl }) {
+        query PostActiveRecordingMetadata($id: BigInteger!, $recordingName: String, $labels: [Entry_String_StringInput]) {
+          targetNodes(filter: { targetIds: [$id] }) {
             target {
               activeRecordings(filter: { name: $recordingName }) {
                 data {
@@ -1031,7 +1031,7 @@ export class ApiService {
           }
         }`,
           {
-            connectUrl: target.connectUrl,
+            id: target.id!,
             recordingName,
             labels: labels.map((label) => ({ key: label.key, value: label.value })),
           },
@@ -1193,8 +1193,8 @@ export class ApiService {
   targetHasRecording(target: TargetStub, filter: ActiveRecordingsFilterInput = {}): Observable<boolean> {
     return this.graphql<RecordingCountResponse>(
       `
-        query ActiveRecordingsForJFRMetrics($connectUrl: String, $recordingFilter: ActiveRecordingsFilterInput) {
-          targetNodes(filter: { name: $connectUrl }) {
+        query ActiveRecordingsForJFRMetrics($id: BigInteger!, $recordingFilter: ActiveRecordingsFilterInput) {
+          targetNodes(filter: { targetIds: [$id] }) {
             target {
               activeRecordings(filter: $recordingFilter) {
                 aggregate {
@@ -1205,7 +1205,7 @@ export class ApiService {
           }
         }`,
       {
-        connectUrl: target.connectUrl,
+        id: target.id!,
         recordingFilter: filter,
       },
       true,
@@ -1280,16 +1280,16 @@ export class ApiService {
   getTargetMBeanMetrics(target: TargetStub, queries: string[]): Observable<MBeanMetrics> {
     return this.graphql<MBeanMetricsResponse>(
       `
-        query MBeanMXMetricsForTarget($connectUrl: String) {
-          targetNodes(filter: { name: $connectUrl }) {
+        query MBeanMXMetricsForTarget($id: BigInteger!) {
+          targetNodes(filter: { targetIds: [$id] }) {
             target {
               mbeanMetrics {
                 ${queries.join('\n')}
               }
             }
           }
         }`,
-      { connectUrl: target.connectUrl },
+      { id: target.id! },
     ).pipe(
       map((resp) => {
         const nodes = resp.data.targetNodes;
@@ -1305,8 +1305,8 @@ export class ApiService {
   getTargetArchivedRecordings(target: TargetStub): Observable<ArchivedRecording[]> {
     return this.graphql<any>(
       `
-        query ArchivedRecordingsForTarget($connectUrl: String) {
-          targetNodes(filter: { name: $connectUrl }) {
+        query ArchivedRecordingsForTarget($id: BigInteger!) {
+          targetNodes(filter: { targetIds: [$id] }) {
             target {
               archivedRecordings {
                 data {
@@ -1326,7 +1326,7 @@ export class ApiService {
             }
           }
         }`,
-      { connectUrl: target.connectUrl },
+      { id: target.id! },
       true,
       true,
     ).pipe(map((v) => v.data.targetNodes[0].target.archivedRecordings.data as ArchivedRecording[]));

diff --git a/src/app/Topology/Entity/EntityDetails.tsx b/src/app/Topology/Entity/EntityDetails.tsx
@@ -247,17 +247,17 @@ export const TargetDetails: React.FC<{
         onToggle={onToggle}
         isExpanded={isExpanded}
       >
-        <MBeanDetails isExpanded={isExpanded} connectUrl={serviceRef.connectUrl} columnModifier={columnModifier} />
+        <MBeanDetails isExpanded={isExpanded} targetId={serviceRef.id!} columnModifier={columnModifier} />
       </ExpandableSection>
     </>
   );
 };
 
 const MBeanDetails: React.FC<{
   isExpanded: boolean;
-  connectUrl: string;
+  targetId: number;
   columnModifier?: React.ComponentProps<typeof DescriptionList>['columnModifier'];
-}> = ({ isExpanded, connectUrl, columnModifier }) => {
+}> = ({ isExpanded, targetId, columnModifier }) => {
   const context = React.useContext(ServiceContext);
   const [dayjs, dateTimeFormat] = useDayjs();
   const addSubscription = useSubscriptions();
@@ -269,8 +269,8 @@ const MBeanDetails: React.FC<{
         context.api
           .graphql<MBeanMetricsResponse>(
             `
-            query MBeanMXMetricsForTarget($connectUrl: String) {
-              targetNodes(filter: { name: $connectUrl }) {
+            query MBeanMXMetricsForTarget($id: BigInteger!) {
+              targetNodes(filter: { targetIds: [$id] }) {
                 target {
                   mbeanMetrics {
                     runtime {
@@ -297,7 +297,7 @@ const MBeanDetails: React.FC<{
                 }
               }
             }`,
-            { connectUrl },
+            { id: targetId },
           )
           .pipe(
             map((resp) => resp.data.targetNodes[0].target.mbeanMetrics || {}),
@@ -306,7 +306,7 @@ const MBeanDetails: React.FC<{
           .subscribe(setMbeanMetrics),
       );
     }
-  }, [isExpanded, addSubscription, connectUrl, context.api, setMbeanMetrics]);
+  }, [isExpanded, addSubscription, targetId, context.api, setMbeanMetrics]);
 
   const _collapsedData = React.useMemo((): DescriptionConfig[] => {
     return [