Skip to content

Refactor HTTP credential UI composition #815

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
RhysSullivan wants to merge 1 commit into
base: standardize-http-credentials
Choose a base branch
from
Open

Refactor HTTP credential UI composition #815

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/plugins/google-discovery/src/react/AddGoogleDiscoverySource.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import * as Schema from "effect/Schema";
import { sourceWriteKeys } from "@executor-js/react/api/reactivity-keys";
import { useScope, useUserScope } from "@executor-js/react/api/scope-context";
import type { SecretPickerSecret } from "@executor-js/react/plugins/secret-picker";
import { CreatableSecretPicker } from "@executor-js/react/plugins/secret-header-auth";
import { CreatableSecretPicker } from "@executor-js/react/plugins/creatable-secret-picker";
import { useSecretPickerSecrets } from "@executor-js/react/plugins/use-secret-picker-secrets";
import type { ScopeId } from "@executor-js/sdk";
import { Badge } from "@executor-js/react/components/badge";
Expand Down
9 changes: 6 additions & 3 deletions packages/plugins/graphql/src/react/AddGraphqlSource.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import * as Schema from "effect/Schema";
import { useScope } from "@executor-js/react/api/scope-context";
import { sourceWriteKeys } from "@executor-js/react/api/reactivity-keys";
import {
HttpCredentialsEditor,
HttpCredentials,
httpCredentialsValid,
serializeScopedHttpCredentials,
serializeHttpCredentials,
Expand Down Expand Up @@ -177,15 +177,18 @@ export default function AddGraphqlSource(props: {

<GraphqlSourceFields endpoint={endpoint} onEndpointChange={setEndpoint} identity={identity} />

<HttpCredentialsEditor
<HttpCredentials.Root
credentials={credentials}
onChange={setCredentials}
existingSecrets={secretList}
sourceName={identity.name}
targetScope={requestCredentialTargetScope}
credentialScopeOptions={credentialScopeOptions}
bindingScopeOptions={credentialScopeOptions}
/>
>
<HttpCredentials.Headers />
<HttpCredentials.QueryParams />
</HttpCredentials.Root>

{/* Temporarily hidden while we revisit GraphQL OAuth discovery and UX. */}
<section className="hidden space-y-2.5">
Expand Down
9 changes: 6 additions & 3 deletions packages/plugins/graphql/src/react/EditGraphqlSource.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import { useScope, useScopeStack } from "@executor-js/react/api/scope-context";
import { connectionWriteKeys, sourceWriteKeys } from "@executor-js/react/api/reactivity-keys";
import { useSecretPickerSecrets } from "@executor-js/react/plugins/use-secret-picker-secrets";
import {
HttpCredentialsEditor,
HttpCredentials,
serializeHttpCredentials,
serializeScopedHttpCredentials,
type HttpCredentialsState,
Expand Down Expand Up @@ -191,15 +191,18 @@ function EditForm(props: {
namespaceReadOnly
/>

<HttpCredentialsEditor
<HttpCredentials.Root
credentials={credentials}
onChange={handleCredentialsChange}
existingSecrets={secretList}
sourceName={identity.name}
targetScope={credentialTargetScope}
credentialScopeOptions={credentialScopeOptions}
bindingScopeOptions={credentialScopeOptions}
/>
>
<HttpCredentials.Headers />
<HttpCredentials.QueryParams />
</HttpCredentials.Root>

{/* Temporarily hidden while we revisit GraphQL OAuth discovery and UX. */}
<section className="hidden space-y-2.5">
Expand Down
Loading
Loading