Add extensions to request payload & UI #3409

dondonz · 2023-08-23T02:45:37Z

This PR adds extensions to the GraphQL request payload and adds a new Extensions tab to the UI (alongside the Variables and Headers tabs). This PR addresses #3372.

For more background on extensions in the request payload, see the GraphQL over HTTP specification regarding Request Parameters. It is a map of values with no restrictions on content. It's a useful place to send metadata such as development flags.

I tried to keep Extensions UI functionality as close as possible to the existing Variables and Headers behaviour. This PR also adds extensions to history and enables prettifying for extensions.

What happens to the request if the Extensions tab is empty? If the Extensions tab is empty, the corresponding GraphQL request payload will not contain the extensions key. Although the spec states:

Specifying null for optional request parameters is equivalent to not specifying them at all.

I prefer to be consistent with the prior behaviour of not setting an extensions key, rather than setting extensions to null, in case a service somewhere has not covered the null case.

changeset-bot · 2023-08-23T02:45:40Z

🦋 Changeset detected

Latest commit: 69c24ff

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 5 packages

Name	Type
graphiql	Minor
@graphiql/react	Minor
@graphiql/toolkit	Minor
@graphiql/plugin-code-exporter	Major
@graphiql/plugin-explorer	Major

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

dondonz · 2023-08-23T02:47:02Z

@acao could you please grant me permission to run the workflow? I'd like to run through all the build checks

dondonz · 2023-08-23T05:42:27Z

packages/graphiql-toolkit/src/storage/history.ts

@@ -28,6 +28,7 @@ export class HistoryStore {
  private shouldSaveQuery(
    query?: string,
    variables?: string,
+    // extensions?: string, // dz todo: ask about saving strategy for extensions


In this method, there is logic to determine whether a query should be saved depending on the difference to the last saved query.

I would prefer to not add more logic for extensions here, but I wanted to highlight this in case you had something in mind.

ah so - this will be important for extensions because it's how unique tabs are determined, and how extension input values can be saved in history and/or active tabs. you could leave this out for now, but then the lack of persistence will be reported as a bug knowing the expectations of users

dondonz · 2023-08-23T05:46:31Z

.changeset/tricky-lions-try.md

+---
+'graphiql': minor
+'@graphiql/react': minor
+'@graphiql/toolkit': minor


I set these as minor changes but I am happy to be corrected. I chose minor as

an empty Extensions tab will result in the same behaviour as before (no extensions key in the request payload)

FetcherParams are backwards compatible, it is fine to not set extensions

export type FetcherParams = { query: string; operationName?: string | null; variables?: any; extensions?: any; };

@dondonz agreed on the minor release, and users will appreciate the backwards compatibility!

dondonz · 2023-08-23T05:48:12Z

DEVELOPMENT.md

@@ -44,7 +44,7 @@ this repo._
   If you are focused on GraphiQL development, you can run —

   ```sh
-   yarn start-graphiql
+   yarn dev-graphiql


Updating the documentation

dondonz · 2023-08-23T05:48:55Z

packages/graphiql-toolkit/src/create-fetcher/types.ts

@@ -28,6 +28,7 @@ export type FetcherParams = {
  query: string;
  operationName?: string | null;
  variables?: any;
+  extensions?: any;


This is the key line which adds extensions to the payload. Everything else in this PR is for the Extensions UI tab

dondonz · 2023-08-23T05:50:35Z

packages/graphiql/src/components/GraphiQL.tsx

-                        activeSecondaryEditor === 'variables'
-                          ? 'Variables'
-                          : 'Headers'
-                      }


I replaced this ternary with a basic method to accommodate the extensions tab (the third tab). I tried to not be clever and go for a plain method rather than a .capitalize for the tab name

dondonz · 2023-08-23T05:52:44Z

packages/graphiql/src/components/GraphiQL.tsx

+    if (currentTab === 'headers') {
+      return 'Headers';
+    }
+  };


This looks like a pretty basic method, I thought I'd make it as simple as possible and not be clever with a .capitalize

Previously this was a ternary in the component, which was fine when there were only 2 tabs.

nice that works. and it's still in the component scope so we can readily translate it later

dondonz · 2023-08-23T05:53:51Z

packages/graphiql/src/components/GraphiQL.tsx

-      editorContext.initialHeaders &&
-      isHeadersEditorEnabled
-      ? 'headers'
-      : 'variables';


I had to remove the ternary and use plain old if statements when introducing the extensions tab (the third tab)

Well I guess I could have kept going with nested ternaries but nobody wants to see that 😄

dondonz · 2023-08-23T05:56:36Z

packages/graphiql-react/src/editor/hooks.ts

+      } catch {
+        /* Parsing JSON failed, skip prettification */
+      }
+    }


Support for prettifying

dondonz · 2023-08-23T05:58:02Z

packages/graphiql-react/src/history/components.tsx

+    useEditorContext({
+      nonNull: true,
+      caller: HistoryItem,
+    });


Add extensions to history items so they can be retrieved later

dondonz · 2023-08-23T05:59:58Z

@acao I'm ready for a review, please let me know what you think. Thanks!

codecov · 2023-08-23T07:44:25Z

Codecov Report

Merging #3409 (92c2d63) into main (2348641) will increase coverage by 0.16%.
Report is 15 commits behind head on main.
The diff coverage is 75.97%.

❗ Current head 92c2d63 differs from pull request most recent head 69c24ff. Consider uploading reports for the commit 69c24ff to get more accurate results

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #3409      +/-   ##
==========================================
+ Coverage   55.75%   55.91%   +0.16%     
==========================================
  Files         110      112       +2     
  Lines        5243     5340      +97     
  Branches     1426     1463      +37     
==========================================
+ Hits         2923     2986      +63     
- Misses       1897     1922      +25     
- Partials      423      432       +9

Files	Coverage Δ
...l-react/src/editor/components/extension-editor.tsx	`100.00% <100.00%> (ø)`
packages/graphiql-react/src/editor/context.tsx	`74.33% <100.00%> (+0.94%)`	⬆️
packages/graphiql-react/src/editor/tabs.ts	`67.81% <100.00%> (+2.81%)`	⬆️
packages/graphiql-react/src/history/context.tsx	`60.00% <ø> (ø)`
packages/graphiql-react/src/provider.tsx	`100.00% <ø> (ø)`
packages/graphiql-toolkit/src/storage/history.ts	`11.11% <ø> (ø)`
packages/graphiql-toolkit/src/storage/query.ts	`36.84% <ø> (ø)`
packages/graphiql-react/src/history/components.tsx	`34.28% <66.66%> (-0.50%)`	⬇️
...nguage-service/src/utils/getVariablesJSONSchema.ts	`94.59% <98.38%> (+0.71%)`	⬆️
packages/graphiql-react/src/execution.tsx	`12.82% <0.00%> (-0.58%)`	⬇️
... and 3 more

dondonz · 2023-08-29T05:29:59Z

Hello, checking in, is there anything else you need from me?

dondonz · 2023-10-24T02:44:58Z

Hi @acao could you please review this PR?

acao · 2023-10-24T07:07:47Z

hi @dondonz, yes I can take a look today!

acao · 2023-10-25T09:07:38Z

packages/graphiql-react/src/editor/context.tsx

@@ -288,6 +312,7 @@ export function EditorContextProvider(props: EditorContextProviderProps) {
  useSynchronizeValue(queryEditor, props.query);
  useSynchronizeValue(responseEditor, props.response);
  useSynchronizeValue(variableEditor, props.variables);
+  useSynchronizeValue(extensionEditor, props.extensions);


awesome stuff! i would prefer this to be possible via improvements to the plugin ecosystem, however extensions are already spec and 100% be a built-in feature of the execution context, though it will be tricky because as you can see there are many touchpoints. eventually each of these tabs will be provided by plugins, so someone could replace with a yaml and/or json schema react hook form implementation or some such

Here's an example to illustrate:

say you have 4 tabs, each with the exact same query/variables/headers combination, but each with unique extension values. when you reload the browser, you'll only have one tab, because without extensions, the persistence only finds one unique operation context

acao

awesome work! looking forward to getting this shipped!

the only thing I want to add, as you can see from the comment, is persistence and query param support to the renderExample.ts, if that's ok?

acao · 2023-10-25T09:20:07Z

I would also like to add an extensions response example to our test schema, just so we can validate that extension payload responses are coming through, I think they are already yeah? at work we've been using apollo sandbox so i haven't tried graphiql with a schema with extensions in a while and I've forgotten haha. i would assume it works or there would be a bug haha

dondonz · 2023-11-06T05:46:52Z

Thanks for the review!! I was a bit busy with other things at work but I also want to get this merged in as soon as I can. I'll work on putting through your changes.

acao · 2023-11-06T10:00:20Z

@dondonz thank you!

dondonz commented Aug 23, 2023

View reviewed changes

dondonz marked this pull request as ready for review August 23, 2023 05:59

acao reviewed Oct 25, 2023

View reviewed changes

acao approved these changes Oct 25, 2023

View reviewed changes

dondonz added 10 commits October 25, 2023 11:29

Add extensions to request payload in fetcher

1c4d93a

Add basic extensions input and propagate props

bc6e80a

Add extensions tab to main GraphiQL

8a4d2a3

Add extensions to history

5f2124e

Set extensions in history, add prettify

19f94ad

Add GraphiQL.spec test

9172636

Add components spec test

ef4c207

Add tabs test

91ea8b5

Add extensions to Cypress setup and tabs e2e test

96fabcd

Fix documentation

eef1f03

dondonz added 2 commits October 25, 2023 11:29

Prettify code changes

da66056

Add changeset

69c24ff

acao force-pushed the graphiql-request-extensions branch from 92c2d63 to 69c24ff Compare October 25, 2023 09:29

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add extensions to request payload & UI #3409

Add extensions to request payload & UI #3409

dondonz commented Aug 23, 2023 •

edited

Loading

changeset-bot bot commented Aug 23, 2023 •

edited

Loading

dondonz commented Aug 23, 2023

dondonz Aug 23, 2023

acao Oct 25, 2023

dondonz Aug 23, 2023

acao Oct 25, 2023

dondonz Aug 23, 2023

dondonz Aug 23, 2023

dondonz Aug 23, 2023 •

edited

Loading

dondonz Aug 23, 2023

acao Oct 25, 2023 •

edited

Loading

dondonz Aug 23, 2023

dondonz Aug 23, 2023

dondonz Aug 23, 2023

dondonz Aug 23, 2023

dondonz commented Aug 23, 2023

codecov bot commented Aug 23, 2023 •

edited

Loading

dondonz commented Aug 29, 2023

dondonz commented Oct 24, 2023

acao commented Oct 24, 2023

acao Oct 25, 2023

acao Oct 25, 2023 •

edited

Loading

acao left a comment •

edited

Loading

acao commented Oct 25, 2023 •

edited

Loading

dondonz commented Nov 6, 2023

acao commented Nov 6, 2023

Add extensions to request payload & UI #3409

Are you sure you want to change the base?

Add extensions to request payload & UI #3409

Conversation

dondonz commented Aug 23, 2023 • edited Loading

changeset-bot bot commented Aug 23, 2023 • edited Loading

🦋 Changeset detected

dondonz commented Aug 23, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

dondonz Aug 23, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

acao Oct 25, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

dondonz commented Aug 23, 2023

codecov bot commented Aug 23, 2023 • edited Loading

Codecov Report

dondonz commented Aug 29, 2023

dondonz commented Oct 24, 2023

acao commented Oct 24, 2023

Choose a reason for hiding this comment

acao Oct 25, 2023 • edited Loading

Choose a reason for hiding this comment

acao left a comment • edited Loading

Choose a reason for hiding this comment

acao commented Oct 25, 2023 • edited Loading

dondonz commented Nov 6, 2023

acao commented Nov 6, 2023

dondonz commented Aug 23, 2023 •

edited

Loading

changeset-bot bot commented Aug 23, 2023 •

edited

Loading

dondonz Aug 23, 2023 •

edited

Loading

acao Oct 25, 2023 •

edited

Loading

codecov bot commented Aug 23, 2023 •

edited

Loading

acao Oct 25, 2023 •

edited

Loading

acao left a comment •

edited

Loading

acao commented Oct 25, 2023 •

edited

Loading