fix(topology): update for new GraphQL schema (#1224)

cryostatio · Mar 20, 2024 · dcc22a5 · dcc22a5
1 parent b9977b9
commit dcc22a5
Show file tree

Hide file tree

Showing 16 changed files with 365 additions and 280 deletions.
diff --git a/src/app/Archives/AllTargetsArchivedRecordingsTable.tsx b/src/app/Archives/AllTargetsArchivedRecordingsTable.tsx
@@ -123,7 +123,7 @@ export const AllTargetsArchivedRecordingsTable: React.FC<AllTargetsArchivedRecor
  return {
  target,
  targetAsObs: of(target),
- archiveCount: node.target.recordings.archived.aggregate.count,
+ archiveCount: node.target.archivedRecordings.aggregate.count,
  };
  }),
  );
@@ -146,20 +146,18 @@ export const AllTargetsArchivedRecordingsTable: React.FC<AllTargetsArchivedRecor
  context.api
  .graphql<any>(
  `query AllTargetsArchives {
- targetNodes {
- target {
- connectUrl
- alias
- recordings {
- archived {
- aggregate {
- count
- }
- }
+ targetNodes {
+ target {
+ connectUrl
+ alias
+ archivedRecordings {
+ aggregate {
+ count
  }
  }
  }
- }`,
+ }
+ }`,
  )
  .pipe(map((v) => v.data.targetNodes))
  .subscribe({
@@ -175,20 +173,17 @@ export const AllTargetsArchivedRecordingsTable: React.FC<AllTargetsArchivedRecor
  addSubscription(
  context.api
  .graphql<any>(
- `
- query ArchiveCountForTarget($connectUrl: String) {
- targetNodes(filter: { name: $connectUrl }) {
- target {
- recordings {
- archived {
- aggregate {
- count
+ `query ArchiveCountForTarget($connectUrl: String) {
+ targetNodes(filter: { name: $connectUrl }) {
+ target {
+ archivedRecordings {
+ aggregate {
+ count
+ }
  }
  }
  }
- }
- }
- }`,
+ }`,
  { connectUrl: target.connectUrl },
  )
  .subscribe((v) => {
@@ -198,7 +193,7 @@ export const AllTargetsArchivedRecordingsTable: React.FC<AllTargetsArchivedRecor
  {
  target: target,
  targetAsObs: of(target),
- archiveCount: v.data.targetNodes[0].target.recordings.archived.aggregate.count,
+ archiveCount: v.data.targetNodes[0].target.archivedRecordings.aggregate.count,
  },
  ];
  });

diff --git a/src/app/CreateRecording/CustomRecordingForm.tsx b/src/app/CreateRecording/CustomRecordingForm.tsx
@@ -253,7 +253,7 @@ export const CustomRecordingForm: React.FC = () => {
  events: eventSpecifierString,
  duration: continuous ? undefined : duration * (durationUnit / 1000),
  archiveOnStop: archiveOnStop && !continuous,
- restart: restart,
+ replace: restart ? 'ALWAYS' : 'NEVER',
  advancedOptions: {
  toDisk: toDisk,
  maxAge: toDisk ? (continuous ? maxAge * maxAgeUnit : undefined) : undefined,

diff --git a/src/app/CreateRecording/types.ts b/src/app/CreateRecording/types.ts
@@ -18,6 +18,8 @@ import { ValidatedOptions } from '@patternfly/react-core';
 
 export type EventTemplateIdentifier = Pick<EventTemplate, 'name' | 'type'>;
 
+export type RecordingReplace = 'ALWAYS' | 'NEVER' | 'STOPPED';
+
 interface _FormBaseData {
  name: string;
  template?: EventTemplateIdentifier;

diff --git a/src/app/Dashboard/AutomatedAnalysis/AutomatedAnalysisCard.tsx b/src/app/Dashboard/AutomatedAnalysis/AutomatedAnalysisCard.tsx
@@ -180,21 +180,19 @@ export const AutomatedAnalysisCard: DashboardCardFC<AutomatedAnalysisCardProps>
  query ActiveRecordingsForAutomatedAnalysis($connectUrl: String) {
  targetNodes(filter: { name: $connectUrl }) {
  target {
- recordings {
- active (filter: {
- name: "${automatedAnalysisRecordingName}",
- labels: ["origin=${automatedAnalysisRecordingName}"],
- }) {
- data {
- state
- name
- downloadUrl
- reportUrl
- metadata {
- labels {
- key
- value
- }
+ activeRecordings(filter: {
+ name: "${automatedAnalysisRecordingName}",
+ labels: ["origin=${automatedAnalysisRecordingName}"],
+ }) {
+ data {
+ state
+ name
+ downloadUrl
+ reportUrl
+ metadata {
+ labels {
+ key
+ value
  }
  }
  }
@@ -213,21 +211,25 @@ export const AutomatedAnalysisCard: DashboardCardFC<AutomatedAnalysisCardProps>
  /* eslint-disable-next-line @typescript-eslint/no-explicit-any */
  return context.api.graphql<any>(
  `query ArchivedRecordingsForAutomatedAnalysis($connectUrl: String) {
- archivedRecordings(filter: { sourceTarget: $connectUrl }) {
- data {
- name
- downloadUrl
- reportUrl
- metadata {
- labels {
- key
- value
+ targetNodes(filter: { name: $connectUrl }) {
+ target {
+ archivedRecordings {
+ data {
+ name
+ downloadUrl
+ reportUrl
+ metadata {
+ labels {
+ key
+ value
+ }
+ }
+ size
+ archivedTime
+ }
  }
  }
- size
- archivedTime
  }
- }
  }`,
  { connectUrl },
  );
@@ -311,7 +313,7 @@ export const AutomatedAnalysisCard: DashboardCardFC<AutomatedAnalysisCardProps>
  queryArchivedRecordings(connectUrl)
  .pipe(
  first(),
- map((v) => v.data.archivedRecordings.data as ArchivedRecording[]),
+ map((v) => v.data.targetNodes[0].target.archivedRecordings.data as ArchivedRecording[]),
  )
  .subscribe({
  next: (recordings) => {
@@ -366,7 +368,7 @@ export const AutomatedAnalysisCard: DashboardCardFC<AutomatedAnalysisCardProps>
  }
  }
  }),
- map((v) => v.data.targetNodes[0].target.recordings.active.data[0] as Recording),
+ map((v) => v.data.targetNodes[0].target.activeRecordings.data[0] as Recording),
  tap((recording) => {
  if (recording === null || recording === undefined) {
  throw new Error(NO_RECORDINGS_MESSAGE);

diff --git a/src/app/RecordingMetadata/BulkEditLabels.tsx b/src/app/RecordingMetadata/BulkEditLabels.tsx
@@ -188,8 +188,8 @@ export const BulkEditLabels: React.FC<BulkEditLabelsProps> = ({
  context.api.graphql<any>(
  `query ArchivedRecordingsForTarget($connectUrl: String) {
  targetNodes(filter: { name: $connectUrl }) {
- recordings {
- archived {
+ target {
+ archivedRecordings {
  data {
  name
  downloadUrl
@@ -205,7 +205,7 @@ export const BulkEditLabels: React.FC<BulkEditLabelsProps> = ({
  { connectUrl: target.connectUrl },
  ),
  ),
- map((v) => v.data.targetNodes[0].recordings.archived.data as ArchivedRecording[]),
+ map((v) => v.data.targetNodes[0].target.archivedRecordings.data as ArchivedRecording[]),
  first(),
  );
  }

diff --git a/src/app/Recordings/ArchivedRecordingsTable.tsx b/src/app/Recordings/ArchivedRecordingsTable.tsx
@@ -192,18 +192,22 @@ export const ArchivedRecordingsTable: React.FC<ArchivedRecordingsTableProps> = (
  return context.api.graphql<any>(
  `
  query ArchivedRecordingsForTarget($connectUrl: String) {
- archivedRecordings(filter: { sourceTarget: $connectUrl }) {
- data {
- name
- downloadUrl
- reportUrl
- metadata {
- labels {
- key
- value
+ targetNodes(filter: { name: $connectUrl }) {
+ target {
+ archivedRecordings {
+ data {
+ name
+ downloadUrl
+ reportUrl
+ metadata {
+ labels {
+ key
+ value
+ }
+ }
+ size
  }
  }
- size
  }
  }
  }`,
@@ -256,7 +260,7 @@ export const ArchivedRecordingsTable: React.FC<ArchivedRecordingsTableProps> = (
  filter((target) => !!target),
  first(),
  concatMap((target: Target) => queryTargetRecordings(target.connectUrl)),
- map((v) => v.data.archivedRecordings.data as ArchivedRecording[]),
+ map((v) => v.data.targetNodes[0].target.archivedRecordings.data as ArchivedRecording[]),
  )
  .subscribe({
  next: handleRecordings,