Update apollo client take 2

js_modules/dagster-ui/packages/app-oss/package.json

@@ -5,7 +5,7 @@
   "description": "Dagster UI OSS Application Shell",
   "license": "Apache-2.0",
   "dependencies": {
-    "@apollo/client": "3.7.13",
+    "@apollo/client": "3.9.11",
     "@blueprintjs/core": "^4.20.2",
     "@blueprintjs/popover2": "1.13.12",
     "@blueprintjs/select": "^4.9.12",

js_modules/dagster-ui/packages/app-oss/src/App.tsx

@@ -9,6 +9,7 @@ import {UserSettingsButton} from '@dagster-io/ui-core/app/UserSettingsButton';
 import {logLink, timeStartLink} from '@dagster-io/ui-core/app/apolloLinks';
 import {DeploymentStatusType} from '@dagster-io/ui-core/instance/DeploymentStatusProvider';
 import {LiveDataPollRateContext} from '@dagster-io/ui-core/live-data-provider/LiveDataProvider';
+import {Suspense} from 'react';
 
 import {InjectedComponents} from './InjectedComponents';
 import {CommunityNux} from './NUX/CommunityNux';
@@ -48,7 +49,9 @@ export default function AppPage() {
           </AppTopNav>
           <App>
             <ContentRoot />
-            <CommunityNux />
+            <Suspense>
+              <CommunityNux />
+            </Suspense>
           </App>
         </AppProvider>
       </LiveDataPollRateContext.Provider>

js_modules/dagster-ui/packages/app-oss/src/NUX/CommunityNux.tsx

@@ -1,4 +1,4 @@
-import {gql, useMutation, useQuery} from '@apollo/client';
+import {gql, useMutation, useSuspenseQuery} from '@apollo/client';
 import {
   Body,
   Box,
@@ -21,14 +21,18 @@ export const CommunityNux = () => {
     'communityNux',
     (data) => data,
   );
-  const {data, loading} = useQuery(GET_SHOULD_SHOW_NUX_QUERY);
+  const {data} = useSuspenseQuery(GET_SHOULD_SHOW_NUX_QUERY);
   const [dismissOnServer] = useMutation(SET_NUX_SEEN_MUTATION);
 
   if (!isLocalhost()) {
     // Yes, we only want to show this on localhost for now.
     return null;
   }
-  if (didDismissCommunityNux || loading || (data && !data.shouldShowNux)) {
+  if (
+    didDismissCommunityNux ||
+    !data ||
+    (typeof data === 'object' && 'shouldShowNux' in data && !data.shouldShowNux)
+  ) {
     return null;
   }
   return (

js_modules/dagster-ui/packages/ui-core/package.json

@@ -18,7 +18,7 @@
     "build-storybook": "storybook build"
   },
   "peerDependencies": {
-    "@apollo/client": "3.7.13",
+    "@apollo/client": "3.9.11",
     "@blueprintjs/core": "^4.20.2",
     "@blueprintjs/popover2": "1.13.12",
     "@blueprintjs/select": "^4.9.12",
@@ -72,7 +72,7 @@
     "yaml": "2.4.0"
   },
   "devDependencies": {
-    "@apollo/client": "3.7.13",
+    "@apollo/client": "3.9.11",
     "@babel/cli": "^7.13.15",
     "@babel/core": "^7.13.15",
     "@babel/plugin-proposal-class-properties": "^7.14.5",

js_modules/dagster-ui/packages/ui-core/src/app/AppError.tsx

@@ -1,6 +1,4 @@
-import {ServerError} from '@apollo/client';
-import {ErrorResponse, onError} from '@apollo/client/link/error';
-import {Observable} from '@apollo/client/utilities';
+import {onError} from '@apollo/client/link/error';
 import {Colors, FontFamily, Toaster} from '@dagster-io/ui-components';
 import {GraphQLError} from 'graphql';
 import memoize from 'lodash/memoize';
@@ -48,22 +46,13 @@ const showNetworkError = async (statusCode: number) => {
   }
 };
 
-export const errorLink = onError((response: ErrorResponse) => {
+export const errorLink = onError((response) => {
   if (response.graphQLErrors) {
     const {graphQLErrors, operation} = response;
     const {operationName} = operation;
     graphQLErrors.forEach((error) => showGraphQLError(error as DagsterGraphQLError, operationName));
   }
   if (response.networkError) {
-    // if we have a network error but there is still graphql data
-    // the payload should contain a meaningful error for the product to handle
-    const serverError = response.networkError as ServerError;
-    if (serverError.result && serverError.result.data) {
-      // we can return an observable here (normally used to perform retries)
-      // to flow the error payload to the product
-      return Observable.from([serverError.result]);
-    }
-
     if (response.networkError && 'statusCode' in response.networkError) {
       showNetworkError(response.networkError.statusCode);
     }

js_modules/dagster-ui/packages/ui-core/src/instance/backfill/__tests__/BackfillPage.test.tsx

@@ -32,6 +32,7 @@ const mocks = [
       query: BACKFILL_DETAILS_QUERY,
       variables: {backfillId: mockBackfillId},
     },
+    delay: 10,
     result: {
       __typename: 'CloudQuery',
       data: {

js_modules/dagster-ui/packages/ui-core/src/testing/mocking.ts

@@ -17,7 +17,7 @@ export function buildQueryMock<
   variables?: TVariables;
   data?: Omit<TQuery, '__typename'>;
   errors?: ReadonlyArray<GraphQLError>;
-}): MockedResponse<TQuery> {
+}): Omit<MockedResponse<TQuery>, 'newData'> {
   return {
     request: {
       query,
@@ -50,7 +50,7 @@ export function buildMutationMock<
   variables: TVariables;
   data?: Omit<TMutation, '__typename'>;
   errors?: ReadonlyArray<GraphQLError>;
-}): MockedResponse<TMutation> {
+}): Omit<MockedResponse<TMutation>, 'newData'> {
   return {
     request: {
       query,
@@ -89,11 +89,14 @@ export function mergeMockQueries<T extends Record<string, any>>(
   defaultData: MockedResponse<T>,
   ...queries: Array<MockedResponse<T>>
 ): MockedResponse<T> {
-  let mergedResult = resultData(queries[0]!.result);
+  let mergedResult = resultData(queries[0]!.result, queries[0]!.request.variables);
   for (let i = 1; i < queries.length; i++) {
     mergedResult = deepmerge(
       mergedResult,
-      removeDefaultValues(resultData(defaultData.result!), resultData(queries[i]!.result!)),
+      removeDefaultValues(
+        resultData(defaultData.result!),
+        resultData(queries[i]!.result!, queries[i]?.request.variables),
+      ),
     );
   }
   return {
@@ -102,9 +105,9 @@ export function mergeMockQueries<T extends Record<string, any>>(
   };
 }
 
-function resultData<T>(result: MockedResponse<T>['result']) {
+function resultData<T>(result: MockedResponse<T>['result'], variables: Record<string, any> = {}) {
   if (result instanceof Function) {
-    return result()!;
+    return result(variables)!;
   } else {
     return result!;
   }

js_modules/dagster-ui/yarn.lock

@@ -29,25 +29,26 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@apollo/client@npm:3.7.13":
-  version: 3.7.13
-  resolution: "@apollo/client@npm:3.7.13"
+"@apollo/client@npm:3.9.11":
+  version: 3.9.11
+  resolution: "@apollo/client@npm:3.9.11"
   dependencies:
     "@graphql-typed-document-node/core": "npm:^3.1.1"
-    "@wry/context": "npm:^0.7.0"
-    "@wry/equality": "npm:^0.5.0"
-    "@wry/trie": "npm:^0.3.0"
+    "@wry/caches": "npm:^1.0.0"
+    "@wry/equality": "npm:^0.5.6"
+    "@wry/trie": "npm:^0.5.0"
     graphql-tag: "npm:^2.12.6"
     hoist-non-react-statics: "npm:^3.3.2"
-    optimism: "npm:^0.16.2"
+    optimism: "npm:^0.18.0"
     prop-types: "npm:^15.7.2"
+    rehackt: "npm:0.0.6"
     response-iterator: "npm:^0.2.6"
     symbol-observable: "npm:^4.0.0"
     ts-invariant: "npm:^0.10.3"
     tslib: "npm:^2.3.0"
     zen-observable-ts: "npm:^1.2.5"
   peerDependencies:
-    graphql: ^14.0.0 || ^15.0.0 || ^16.0.0
+    graphql: ^15.0.0 || ^16.0.0
     graphql-ws: ^5.5.5
     react: ^16.8.0 || ^17.0.0 || ^18.0.0
     react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
@@ -61,7 +62,7 @@ __metadata:
       optional: true
     subscriptions-transport-ws:
       optional: true
-  checksum: 10/a6d9a44163b5f7688b8f72a48ab8945556c6e3c74895dc5448ea96a42f436eda88df1eecb37a4b68d2a0798350a8e77c0700d7f8cc99508488ec78b778e4e48f
+  checksum: 10/d16a334c9675955c79388bbb8b0b7ebf702bb6a24cb907a723be7e08ed878891ab6bfb37e46c6a4568a4f254f511405962896f06dd766c1cb01af41bc39566cf
   languageName: node
   linkType: hard
 
@@ -2365,7 +2366,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@dagster-io/app-oss@workspace:packages/app-oss"
   dependencies:
-    "@apollo/client": "npm:3.7.13"
+    "@apollo/client": "npm:3.9.11"
     "@blueprintjs/core": "npm:^4.20.2"
     "@blueprintjs/popover2": "npm:1.13.12"
     "@blueprintjs/select": "npm:^4.9.12"
@@ -2529,7 +2530,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@dagster-io/ui-core@workspace:packages/ui-core"
   dependencies:
-    "@apollo/client": "npm:3.7.13"
+    "@apollo/client": "npm:3.9.11"
     "@babel/cli": "npm:^7.13.15"
     "@babel/core": "npm:^7.13.15"
     "@babel/plugin-proposal-class-properties": "npm:^7.14.5"
@@ -2654,7 +2655,7 @@ __metadata:
     worker-loader: "npm:^3.0.8"
     yaml: "npm:2.4.0"
   peerDependencies:
-    "@apollo/client": 3.7.13
+    "@apollo/client": 3.9.11
     "@blueprintjs/core": ^4.20.2
     "@blueprintjs/popover2": 1.13.12
     "@blueprintjs/select": ^4.9.12
@@ -8809,6 +8810,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@wry/caches@npm:^1.0.0":
+  version: 1.0.1
+  resolution: "@wry/caches@npm:1.0.1"
+  dependencies:
+    tslib: "npm:^2.3.0"
+  checksum: 10/055f592ee52b5fd9aa86e274e54e4a8b2650f619000bf6f61880ce14aaf47eb2ab34f3ada2eab964fe8b2f19bf8097ecacddcea4638fcc64c3d3a0a512aaa07c
+  languageName: node
+  linkType: hard
+
 "@wry/context@npm:^0.7.0":
   version: 0.7.3
   resolution: "@wry/context@npm:0.7.3"
@@ -8818,21 +8828,30 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@wry/equality@npm:^0.5.0":
-  version: 0.5.6
-  resolution: "@wry/equality@npm:0.5.6"
+"@wry/equality@npm:^0.5.6":
+  version: 0.5.7
+  resolution: "@wry/equality@npm:0.5.7"
   dependencies:
     tslib: "npm:^2.3.0"
-  checksum: 10/dcfec6f2c8ed0a7b9b3322195485eec4bbc8199f4ed400f246eb4b0238b6b041ce1c5ec73bc8f22ec409e275fe8253cd15d1a7057a016c6ecaff32214ec74aff
+  checksum: 10/69dccf33c0c41fd7ec5550f5703b857c6484a949412ad747001da941270ea436648c3ab988a2091765304249585ac30c7b417fad8be9a7ce19c1221f71548e35
   languageName: node
   linkType: hard
 
-"@wry/trie@npm:^0.3.0":
-  version: 0.3.2
-  resolution: "@wry/trie@npm:0.3.2"
+"@wry/trie@npm:^0.4.3":
+  version: 0.4.3
+  resolution: "@wry/trie@npm:0.4.3"
   dependencies:
     tslib: "npm:^2.3.0"
-  checksum: 10/151d06b519e1ff1c3acf6ee6846161b1d7d50bbecd4c48e5cd1b05f9e37c30602aff02e88f20105f6e6c54ae4123f9c4eb7715044d7fd927d4ba4ec3e755cd36
+  checksum: 10/106e021125cfafd22250a6631a0438a6a3debae7bd73f6db87fe42aa0757fe67693db0dfbe200ae1f60ba608c3e09ddb8a4e2b3527d56ed0a7e02aa0ee4c94e1
+  languageName: node
+  linkType: hard
+
+"@wry/trie@npm:^0.5.0":
+  version: 0.5.0
+  resolution: "@wry/trie@npm:0.5.0"
+  dependencies:
+    tslib: "npm:^2.3.0"
+  checksum: 10/578a08f3a96256c9b163230337183d9511fd775bdfe147a30561ccaacedc9ce33b9731ee6e591bb1f5f53e41b26789e519b47dff5100c7bf4e1cd2df3062f797
   languageName: node
   linkType: hard
 
@@ -18802,13 +18821,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"optimism@npm:^0.16.2":
-  version: 0.16.2
-  resolution: "optimism@npm:0.16.2"
+"optimism@npm:^0.18.0":
+  version: 0.18.0
+  resolution: "optimism@npm:0.18.0"
   dependencies:
+    "@wry/caches": "npm:^1.0.0"
     "@wry/context": "npm:^0.7.0"
-    "@wry/trie": "npm:^0.3.0"
-  checksum: 10/b9fc5f6549cf98fcb67cd9a2c1c30b4a0f52d4e9c41191def5855ec753ec2b2796f7b114fdc67354b3d3b7f48a7293914e903cedc8c17454a1864051ec50862d
+    "@wry/trie": "npm:^0.4.3"
+    tslib: "npm:^2.3.0"
+  checksum: 10/b461968008eb7aafd5b5dd63b81fd41fbd907f39858bdd5190f10b71db6a5bf54541cdb3d2a569b2bf5585ca917ac192f953e6239d81702a4391fdb476a00ae8
   languageName: node
   linkType: hard
 
@@ -20791,6 +20812,21 @@ __metadata:
   languageName: node
   linkType: hard
 
+"rehackt@npm:0.0.6":
+  version: 0.0.6
+  resolution: "rehackt@npm:0.0.6"
+  peerDependencies:
+    "@types/react": "*"
+    react: "*"
+  peerDependenciesMeta:
+    "@types/react":
+      optional: true
+    react:
+      optional: true
+  checksum: 10/3897c93270836159406529e0fa983bf4a11c07d2efc5c8f6bdfd7f6821d3b84a30d911c3f3b9c689948739e6955c5835c8dd9d91579150bec5092f356c0d91df
+  languageName: node
+  linkType: hard
+
 "rehype-highlight@npm:^6.0.0":
   version: 6.0.0
   resolution: "rehype-highlight@npm:6.0.0"