这是indexloc提供的服务，不要输入任何密码
Skip to content

make the arguments field optional in ActionDefinition #4285

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

Merged
merged 4 commits into from
Apr 4, 2020
Merged

make the arguments field optional in ActionDefinition #4285

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
49542e5
make the Arguments field optional in ActionDefinition
codingkarthik Apr 3, 2020
2a36e29
Merge branch 'master' into actions-empty-arguments
rakeshkky Apr 3, 2020
7973867
docs: update required to false of (ActionDefinition arguments)
codingkarthik Apr 3, 2020
8794680
Merge branch 'master' into actions-empty-arguments
rakeshkky Apr 3, 2020
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 docs/graphql/manual/api-reference/schema-metadata-api/actions.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ ActionDefinition
- Schema
- Description
* - arguments
- true
- false
- Array of InputArgument_
- Input arguments
* - output_type
Expand Down
3 changes: 1 addition & 2 deletions server/src-lib/Hasura/RQL/DDL/Metadata/Types.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -487,12 +487,11 @@ replaceMetadataToOrdJSON ( ReplaceMetadata
actionDefinitionToOrdJSON (ActionDefinition args outputType kind headers frwrdClientHdrs handler) =
AO.object $ [ ("kind", AO.toOrdered kind)
, ("handler", AO.toOrdered handler)
, ("arguments", AO.array $ map argDefinitionToOrdJSON args)
, ("output_type", AO.toOrdered outputType)
]
<> [("forward_client_headers", AO.toOrdered frwrdClientHdrs) | frwrdClientHdrs]
<> catMaybes [ listToMaybeOrdPair "headers" AO.toOrdered headers
]
, listToMaybeOrdPair "arguments" argDefinitionToOrdJSON args]
where
argDefinitionToOrdJSON :: ArgumentDefinition -> AO.Value
argDefinitionToOrdJSON (ArgumentDefinition argName ty descM) =
Expand Down
2 changes: 1 addition & 1 deletion server/src-lib/Hasura/RQL/Types/Action.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ $(J.deriveToJSON (J.aesonDrop 3 J.snakeCase) ''ActionDefinition)
instance (J.FromJSON a) => J.FromJSON (ActionDefinition a) where
parseJSON = J.withObject "ActionDefinition" $ \o ->
ActionDefinition
<$> o J..: "arguments"
<$> o J..:? "arguments" J..!= []
<*> o J..: "output_type"
<*> o J..:? "kind" J..!= ActionSynchronous -- Synchronous is default action kind
<*> o J..:? "headers" J..!= []
Expand Down