Update search SDK and apollo version (stolostron#3644)

zlayne · web-flow · commit 02d067ed177f · 2024-07-10T21:10:41.000Z
* [WIP] Update search SDK and apollo version

Signed-off-by: zlayne &lt;zlayne@redhat.com&gt;

* exclude search-sdk.ts generated code from sonar coverage

Signed-off-by: zlayne &lt;zlayne@redhat.com&gt;

---------

Signed-off-by: zlayne &lt;zlayne@redhat.com&gt;
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
diff --git a/frontend/package.json b/frontend/package.json
@@ -35,7 +35,7 @@
     "serve:plugin:mce": "PLUGIN=mce PORT=3001 npm run serve:plugin"
   },
   "dependencies": {
-    "@apollo/client": "3.5.10",
+    "@apollo/client": "3.10.8",
     "@babel/runtime": "7.18.9",
     "@emotion/css": "^11.11.2",
     "@emotion/react": "^11.10.5",
@@ -72,7 +72,7 @@
     "formik-pf": "0.0.1-alpha8",
     "fuse.js": "6.6.2",
     "get-value": "3.0.1",
-    "graphql": "16.4.0",
+    "graphql": "16.9.0",
     "handlebars": "4.7.7",
     "highlight.js": "^11.9.0",
     "i18next": "21.7.1",
diff --git a/frontend/src/routes/Applications/ApplicationDetails/ApplicationDetails.test.tsx b/frontend/src/routes/Applications/ApplicationDetails/ApplicationDetails.test.tsx
@@ -1,5 +1,10 @@
 /* Copyright Contributors to the Open Cluster Management project */
 
+import { MockedProvider } from '@apollo/client/testing'
+import { render, screen } from '@testing-library/react'
+import userEvent from '@testing-library/user-event'
+import { MemoryRouter } from 'react-router-dom-v5-compat'
+import { RecoilRoot } from 'recoil'
 import {
   applicationSetsState,
   applicationsState,
@@ -13,18 +18,12 @@ import {
   subscriptionsState,
 } from '../../../atoms'
 import { nockIgnoreApiPaths, nockIgnoreRBAC, nockSearch } from '../../../lib/nock-util'
-import { render, screen } from '@testing-library/react'
-import { RecoilRoot } from 'recoil'
-import { MemoryRouter } from 'react-router-dom-v5-compat'
-import { ocpApi, waitForText } from '../../../lib/test-util'
-import ApplicationDetailsPage from './ApplicationDetails'
-import { GetMessagesDocument, SearchSchemaDocument } from '../../Home/Search/search-sdk/search-sdk'
-import { MockedProvider } from '@apollo/client/testing'
-import userEvent from '@testing-library/user-event'
 import { PluginContext } from '../../../lib/PluginContext'
-import { AcmExtension } from '../../../plugin-extensions/types'
-import { ApplicationActionProps } from '../../../plugin-extensions/properties'
 import { PluginDataContext } from '../../../lib/PluginDataContext'
+import { ocpApi, waitForText } from '../../../lib/test-util'
+import { ApplicationActionProps } from '../../../plugin-extensions/properties'
+import { AcmExtension } from '../../../plugin-extensions/types'
+import { GetMessagesDocument, SearchSchemaDocument } from '../../Home/Search/search-sdk/search-sdk'
 import {
   mockApplication0,
   mockApplications,
@@ -38,6 +37,7 @@ import {
   mockPlacementsDecisions,
   mockSubscriptions,
 } from '../Application.sharedmocks'
+import ApplicationDetailsPage from './ApplicationDetails'
 
 const applicationActionProps: ApplicationActionProps[] = [
   {
@@ -63,7 +63,7 @@ const acmExtension: AcmExtension = {
 }
 
 const mockSearchQuery = {
-  operationName: 'searchResultRelatedItems',
+  operationName: 'searchResultItemsAndRelatedItems',
   variables: {
     input: [
       {
@@ -78,7 +78,7 @@ const mockSearchQuery = {
     ],
   },
   query:
-    'query searchResultRelatedItems($input: [SearchInput]) {\n  searchResult: search(input: $input) {\n    items\n    related {\n      kind\n      items\n      __typename\n    }\n    __typename\n  }\n}',
+    'query searchResultItemsAndRelatedItems($input: [SearchInput]) {\n  searchResult: search(input: $input) {\n    items\n    related {\n      kind\n      items\n      __typename\n    }\n    __typename\n  }\n}',
 }
 
 const mockSearchResponse = {
diff --git a/frontend/src/routes/Applications/ApplicationDetails/ApplicationTopology/model/relatedResources.js b/frontend/src/routes/Applications/ApplicationDetails/ApplicationTopology/model/relatedResources.js
@@ -3,7 +3,7 @@
 import { get, set } from 'lodash'
 import { fireManagedClusterView } from '../../../../../resources/managedclusterview'
 import { searchClient } from '../../../../Home/Search/search-sdk/search-client'
-import { SearchResultRelatedItemsDocument } from '../../../../Home/Search/search-sdk/search-sdk'
+import { SearchResultItemsAndRelatedItemsDocument } from '../../../../Home/Search/search-sdk/search-sdk'
 
 export async function getRelatedResources(reports = []) {
   const promises = []
@@ -79,7 +79,7 @@ const getSearchPromise = (cluster, kind, name, namespace, relatedKinds) => {
     query.filters.push({ property: 'cluster', values: [cluster] })
   }
   return searchClient.query({
-    query: SearchResultRelatedItemsDocument,
+    query: SearchResultItemsAndRelatedItemsDocument,
     variables: {
       input: [{ ...query, relatedKinds }],
       limit: 1000,
diff --git a/frontend/src/routes/Applications/ApplicationDetails/ApplicationTopology/model/resourceStatusesAppSet.js b/frontend/src/routes/Applications/ApplicationDetails/ApplicationTopology/model/resourceStatusesAppSet.js
@@ -2,7 +2,7 @@
 
 import _ from 'lodash'
 import { searchClient } from '../../../../Home/Search/search-sdk/search-client'
-import { SearchResultRelatedItemsDocument } from '../../../../Home/Search/search-sdk/search-sdk'
+import { SearchResultItemsAndRelatedItemsDocument } from '../../../../Home/Search/search-sdk/search-sdk'
 import { getArgoSecret, getQueryStringForResource } from './resourceStatusesArgo'
 
 export async function getAppSetResourceStatuses(application, appData) {
@@ -69,7 +69,7 @@ async function getResourceStatuses(name, namespace, appSetApps, appData) {
   query.relatedKinds.push('cluster', 'pod', 'replicaset', 'replicationcontroller')
 
   return searchClient.query({
-    query: SearchResultRelatedItemsDocument,
+    query: SearchResultItemsAndRelatedItemsDocument,
     variables: {
       input: [{ ...query }, ...queryNotNamespaceScoped],
       limit: 1000,
diff --git a/frontend/src/routes/Applications/ApplicationDetails/ApplicationTopology/model/resourceStatusesAppSet.test.js b/frontend/src/routes/Applications/ApplicationDetails/ApplicationTopology/model/resourceStatusesAppSet.test.js
@@ -7,7 +7,7 @@ import { waitFor } from '@testing-library/react'
 import { nockSearch } from '../../../../../lib/nock-util'
 
 const mockSearchQuery = {
-  operationName: 'searchResultRelatedItems',
+  operationName: 'searchResultItemsAndRelatedItems',
   variables: {
     input: [
       {
@@ -55,7 +55,7 @@ const mockSearchQuery = {
     ],
   },
   query:
-    'query searchResultRelatedItems($input: [SearchInput]) {\n  searchResult: search(input: $input) {\n    items\n    related {\n      kind\n      items\n      __typename\n    }\n    __typename\n  }\n}',
+    'query searchResultItemsAndRelatedItems($input: [SearchInput]) {\n  searchResult: search(input: $input) {\n    items\n    related {\n      kind\n      items\n      __typename\n    }\n    __typename\n  }\n}',
 }
 
 const mockSearchResponse = {
diff --git a/frontend/src/routes/Applications/ApplicationDetails/ApplicationTopology/model/resourceStatusesArgo.js b/frontend/src/routes/Applications/ApplicationDetails/ApplicationTopology/model/resourceStatusesArgo.js
@@ -2,7 +2,7 @@
 
 import _ from 'lodash'
 import { searchClient } from '../../../../Home/Search/search-sdk/search-client'
-import { SearchResultRelatedItemsDocument } from '../../../../Home/Search/search-sdk/search-sdk'
+import { SearchResultItemsAndRelatedItemsDocument } from '../../../../Home/Search/search-sdk/search-sdk'
 import { convertStringToQuery } from '../helpers/search-helper'
 
 export async function getArgoResourceStatuses(application, appData, topology) {
@@ -51,7 +51,7 @@ async function getArgoSource(application, appData) {
     }
   }
   return searchClient.query({
-    query: SearchResultRelatedItemsDocument,
+    query: SearchResultItemsAndRelatedItemsDocument,
     variables: {
       input: [{ ...query }],
       limit: 1000,
@@ -153,7 +153,7 @@ async function getResourceStatuses(app, appData, topology, argoSource) {
     query.relatedKinds.push('cluster', 'pod', 'replicaset', 'replicationcontroller')
   }
   return searchClient.query({
-    query: SearchResultRelatedItemsDocument,
+    query: SearchResultItemsAndRelatedItemsDocument,
     variables: {
       input: [{ ...query }, ...queryNotNamespaceScoped],
       limit: 1000,
@@ -207,7 +207,7 @@ export const getArgoSecret = (appData, resourceStatuses = {}) => {
         `kind:secret namespace:${argoAppNS.join()} label:apps.open-cluster-management.io/acm-cluster='true'`
       )
       return searchClient.query({
-        query: SearchResultRelatedItemsDocument,
+        query: SearchResultItemsAndRelatedItemsDocument,
         variables: {
           input: [{ ...query }],
           limit: 1000,
diff --git a/frontend/src/routes/Applications/ApplicationDetails/ApplicationTopology/model/resourceStatusesArgo.test.js b/frontend/src/routes/Applications/ApplicationDetails/ApplicationTopology/model/resourceStatusesArgo.test.js
@@ -7,7 +7,7 @@ import { waitFor } from '@testing-library/react'
 import { nockSearch } from '../../../../../lib/nock-util'
 
 const mockSearchQuery = {
-  operationName: 'searchResultRelatedItems',
+  operationName: 'searchResultItemsAndRelatedItems',
   variables: {
     input: [
       {
@@ -27,11 +27,11 @@ const mockSearchQuery = {
     ],
   },
   query:
-    'query searchResultRelatedItems($input: [SearchInput]) {\n  searchResult: search(input: $input) {\n    items\n    related {\n      kind\n      items\n      __typename\n    }\n    __typename\n  }\n}',
+    'query searchResultItemsAndRelatedItems($input: [SearchInput]) {\n  searchResult: search(input: $input) {\n    items\n    related {\n      kind\n      items\n      __typename\n    }\n    __typename\n  }\n}',
 }
 
 const mockSearchQuery2 = {
-  operationName: 'searchResultRelatedItems',
+  operationName: 'searchResultItemsAndRelatedItems',
   variables: {
     input: [
       {
@@ -63,11 +63,11 @@ const mockSearchQuery2 = {
     ],
   },
   query:
-    'query searchResultRelatedItems($input: [SearchInput]) {\n  searchResult: search(input: $input) {\n    items\n    related {\n      kind\n      items\n      __typename\n    }\n    __typename\n  }\n}',
+    'query searchResultItemsAndRelatedItems($input: [SearchInput]) {\n  searchResult: search(input: $input) {\n    items\n    related {\n      kind\n      items\n      __typename\n    }\n    __typename\n  }\n}',
 }
 
 const mockSearchQuery3 = {
-  operationName: 'searchResultRelatedItems',
+  operationName: 'searchResultItemsAndRelatedItems',
   variables: {
     input: [
       {
@@ -99,11 +99,11 @@ const mockSearchQuery3 = {
     ],
   },
   query:
-    'query searchResultRelatedItems($input: [SearchInput]) {\n  searchResult: search(input: $input) {\n    items\n    related {\n      kind\n      items\n      __typename\n    }\n    __typename\n  }\n}',
+    'query searchResultItemsAndRelatedItems($input: [SearchInput]) {\n  searchResult: search(input: $input) {\n    items\n    related {\n      kind\n      items\n      __typename\n    }\n    __typename\n  }\n}',
 }
 
 const mockSearchQuery4 = {
-  operationName: 'searchResultRelatedItems',
+  operationName: 'searchResultItemsAndRelatedItems',
   variables: {
     input: [
       {
@@ -203,11 +203,11 @@ const mockSearchQuery4 = {
     ],
   },
   query:
-    'query searchResultRelatedItems($input: [SearchInput]) {\n  searchResult: search(input: $input) {\n    items\n    related {\n      kind\n      items\n      __typename\n    }\n    __typename\n  }\n}',
+    'query searchResultItemsAndRelatedItems($input: [SearchInput]) {\n  searchResult: search(input: $input) {\n    items\n    related {\n      kind\n      items\n      __typename\n    }\n    __typename\n  }\n}',
 }
 
 const mockSearchQuery5 = {
-  operationName: 'searchResultRelatedItems',
+  operationName: 'searchResultItemsAndRelatedItems',
   variables: {
     input: [
       {
@@ -231,7 +231,7 @@ const mockSearchQuery5 = {
     ],
   },
   query:
-    'query searchResultRelatedItems($input: [SearchInput]) {\n  searchResult: search(input: $input) {\n    items\n    related {\n      kind\n      items\n      __typename\n    }\n    __typename\n  }\n}',
+    'query searchResultItemsAndRelatedItems($input: [SearchInput]) {\n  searchResult: search(input: $input) {\n    items\n    related {\n      kind\n      items\n      __typename\n    }\n    __typename\n  }\n}',
 }
 
 const mockSearchResponse = {
diff --git a/frontend/src/routes/Applications/ApplicationDetails/ApplicationTopology/model/resourceStatusesSubscription.js b/frontend/src/routes/Applications/ApplicationDetails/ApplicationTopology/model/resourceStatusesSubscription.js
@@ -3,7 +3,7 @@
 import { get, set } from 'lodash'
 import { fireManagedClusterView } from '../../../../../resources/managedclusterview'
 import { searchClient } from '../../../../Home/Search/search-sdk/search-client'
-import { SearchResultRelatedItemsDocument } from '../../../../Home/Search/search-sdk/search-sdk'
+import { SearchResultItemsAndRelatedItemsDocument } from '../../../../Home/Search/search-sdk/search-sdk'
 import { convertStringToQuery } from '../helpers/search-helper'
 
 export async function getSubscriptionResourceStatuses(application, appData) {
@@ -41,7 +41,7 @@ async function getResourceStatuses(application, appData) {
     query = getQueryStringForResource('Application', name, namespace)
   }
   return searchClient.query({
-    query: SearchResultRelatedItemsDocument,
+    query: SearchResultItemsAndRelatedItemsDocument,
     variables: {
       input: [{ ...query }],
       limit: 1000,
@@ -135,7 +135,7 @@ const getSearchPromise = (cluster, kind, name, namespace, relatedKinds) => {
     query.filters.push({ property: 'cluster', values: [cluster] })
   }
   return searchClient.query({
-    query: SearchResultRelatedItemsDocument,
+    query: SearchResultItemsAndRelatedItemsDocument,
     variables: {
       input: [{ ...query, relatedKinds }],
       limit: 1000,
diff --git a/frontend/src/routes/Applications/ApplicationDetails/ApplicationTopology/model/topologyAppSet.js b/frontend/src/routes/Applications/ApplicationDetails/ApplicationTopology/model/topologyAppSet.js
@@ -3,7 +3,7 @@
 import { get, set, uniqBy } from 'lodash'
 import { fireManagedClusterView, getResource, listNamespacedResources } from '../../../../../resources'
 import { searchClient } from '../../../../Home/Search/search-sdk/search-client'
-import { SearchResultRelatedItemsDocument } from '../../../../Home/Search/search-sdk/search-sdk'
+import { SearchResultItemsAndRelatedItemsDocument } from '../../../../Home/Search/search-sdk/search-sdk'
 import { convertStringToQuery } from '../helpers/search-helper'
 import { createReplicaChild } from './topologySubscription'
 import { addClusters, getClusterName, processMultiples } from './utils'
@@ -277,7 +277,7 @@ const getArgoRouteFromSearch = async (appName, appNamespace, cluster, t) => {
 
   searchClient
     .query({
-      query: SearchResultRelatedItemsDocument,
+      query: SearchResultItemsAndRelatedItemsDocument,
       variables: {
         input: [{ ...query }],
         limit: 1000,
diff --git a/frontend/src/routes/Applications/ApplicationDetails/ApplicationTopology/model/topologyOCPFluxApp.js b/frontend/src/routes/Applications/ApplicationDetails/ApplicationTopology/model/topologyOCPFluxApp.js
@@ -1,8 +1,8 @@
 /* Copyright Contributors to the Open Cluster Management project */
 
-import { get, uniqBy, filter, includes } from 'lodash'
+import { filter, get, includes, uniqBy } from 'lodash'
 import { searchClient } from '../../../../Home/Search/search-sdk/search-client'
-import { SearchResultRelatedItemsDocument } from '../../../../Home/Search/search-sdk/search-sdk'
+import { SearchResultItemsAndRelatedItemsDocument } from '../../../../Home/Search/search-sdk/search-sdk'
 import { convertStringToQuery } from '../helpers/search-helper'
 import { createReplicaChild } from './topologySubscription'
 import { addClusters, getClusterName, processMultiples } from './utils'
@@ -29,7 +29,7 @@ async function getResourcesWithAppLabel(application) {
   const query = getQueryStringForLabel(label, namespace, cluster.name)
 
   return searchClient.query({
-    query: SearchResultRelatedItemsDocument,
+    query: SearchResultItemsAndRelatedItemsDocument,
     variables: {
       input: [{ ...query }],
       limit: 1000,
diff --git a/frontend/src/routes/Applications/CreateApplication/Subscription/components/SharedResourceWarning.js b/frontend/src/routes/Applications/CreateApplication/Subscription/components/SharedResourceWarning.js
@@ -8,7 +8,7 @@ import PropTypes from 'prop-types'
 import { Fragment, useEffect, useState } from 'react'
 import { useTranslation } from '../../../../../lib/acm-i18next'
 import { searchClient } from '../../../../Home/Search/search-sdk/search-client'
-import { SearchResultRelatedItemsDocument } from '../../../../Home/Search/search-sdk/search-sdk'
+import { SearchResultItemsAndRelatedItemsDocument } from '../../../../Home/Search/search-sdk/search-sdk'
 import './style.css'
 
 export const RESOURCE_TYPES = {
@@ -103,7 +103,7 @@ const SharedResourceWarning = ({ resourceType, control }) => {
       const query = getQuery(resourceType, resourceName, resourceNamespace)
       searchClient
         .query({
-          query: SearchResultRelatedItemsDocument,
+          query: SearchResultItemsAndRelatedItemsDocument,
           variables: {
             input: [{ ...query }],
             limit: 1000,
diff --git a/frontend/src/routes/Home/Search/search-sdk/search-sdk.ts b/frontend/src/routes/Home/Search/search-sdk/search-sdk.ts
diff --git a/frontend/src/routes/Home/Search/search-sdk/search-sdk.yml b/frontend/src/routes/Home/Search/search-sdk/search-sdk.yml
diff --git a/frontend/src/routes/Home/Search/search-sdk/searchQueries.graphql b/frontend/src/routes/Home/Search/search-sdk/searchQueries.graphql
diff --git a/sonar-project.properties b/sonar-project.properties
