diff --git a/app/graphql/types/input/node_parameter_input_type.rb b/app/graphql/types/input/node_parameter_input_type.rb index 2aae0304..003b24b6 100644 --- a/app/graphql/types/input/node_parameter_input_type.rb +++ b/app/graphql/types/input/node_parameter_input_type.rb @@ -5,9 +5,6 @@ module Input class NodeParameterInputType < Types::BaseInputObject description 'Input type for Node parameter' - argument :parameter_definition_id, Types::GlobalIdType[::ParameterDefinition], - required: true, description: 'The identifier of the Parameter Definition' - argument :value, Types::Input::NodeParameterValueInputType, required: true, description: 'The value of the parameter' end diff --git a/app/services/error_code.rb b/app/services/error_code.rb index 24841a40..48db2f63 100644 --- a/app/services/error_code.rb +++ b/app/services/error_code.rb @@ -73,7 +73,7 @@ def self.error_codes flow_type_not_found: { description: 'The flow type with the given identifier was not found' }, organization_not_found: { description: 'The organization with the given identifier was not found' }, invalid_function_id: { description: 'The function ID is invalid' }, - invalid_parameter_id: { description: 'The parameter ID is invalid' }, + invalid_parameter_index: { description: 'The parameter index is invalid' }, invalid_reference_value: { description: 'The reference value is invalid' }, referenced_value_not_found: { description: 'A referenced value could not be found' }, invalid_runtime_parameter_definition: { description: 'The runtime parameter definition is invalid' }, diff --git a/app/services/namespaces/projects/flows/update_service.rb b/app/services/namespaces/projects/flows/update_service.rb index 8e785b7d..0c1f021c 100644 --- a/app/services/namespaces/projects/flows/update_service.rb +++ b/app/services/namespaces/projects/flows/update_service.rb @@ -172,13 +172,11 @@ def update_node_parameters(t, current_node, current_node_input, all_nodes) current_node_input.parameters.each_with_index do |parameter, index| db_parameters[index] ||= current_node.node_parameters.build - parameter_definition = current_node.function_definition.parameter_definitions.find_by( - id: parameter.parameter_definition_id.model_id - ) + parameter_definition = current_node.function_definition.parameter_definitions[index] if parameter_definition.nil? t.rollback_and_return! ServiceResponse.error( - message: 'Invalid parameter id', - error_code: :invalid_parameter_id + message: 'Invalid parameter index', + error_code: :invalid_parameter_index ) end diff --git a/docs/graphql/enum/errorcodeenum.md b/docs/graphql/enum/errorcodeenum.md index 8e8c856e..675b3578 100644 --- a/docs/graphql/enum/errorcodeenum.md +++ b/docs/graphql/enum/errorcodeenum.md @@ -40,7 +40,7 @@ Represents the available error responses | `INVALID_NODE_FUNCTION` | The node function is invalid | | `INVALID_NODE_PARAMETER` | The node parameter is invalid | | `INVALID_ORGANIZATION` | The organization is invalid because of active model errors | -| `INVALID_PARAMETER_ID` | The parameter ID is invalid | +| `INVALID_PARAMETER_INDEX` | The parameter index is invalid | | `INVALID_PASSWORD_REPEAT` | The provided password repeat does not match the password | | `INVALID_REFERENCE_VALUE` | The reference value is invalid | | `INVALID_RUNTIME` | The runtime is invalid because of active model errors | diff --git a/docs/graphql/input_object/nodeparameterinput.md b/docs/graphql/input_object/nodeparameterinput.md index 37613566..04ec1c62 100644 --- a/docs/graphql/input_object/nodeparameterinput.md +++ b/docs/graphql/input_object/nodeparameterinput.md @@ -8,5 +8,4 @@ Input type for Node parameter | Name | Type | Description | |------|------|-------------| -| `parameterDefinitionId` | [`ParameterDefinitionID!`](../scalar/parameterdefinitionid.md) | The identifier of the Parameter Definition | | `value` | [`NodeParameterValueInput!`](../input_object/nodeparametervalueinput.md) | The value of the parameter | diff --git a/spec/requests/graphql/mutation/namespace/projects/flows/create_mutation_spec.rb b/spec/requests/graphql/mutation/namespace/projects/flows/create_mutation_spec.rb index 119e50ec..9d135be1 100644 --- a/spec/requests/graphql/mutation/namespace/projects/flows/create_mutation_spec.rb +++ b/spec/requests/graphql/mutation/namespace/projects/flows/create_mutation_spec.rb @@ -92,7 +92,6 @@ nextNodeId: nil, parameters: [ { - parameterDefinitionId: function_definition.parameter_definitions.first.to_global_id.to_s, value: { literalValue: 100, }, @@ -103,7 +102,6 @@ id: 'gid://sagittarius/NodeFunction/1000', functionDefinitionId: function_definition.to_global_id.to_s, parameters: [ - parameterDefinitionId: function_definition.parameter_definitions.first.to_global_id.to_s, value: { nodeFunctionId: 'gid://sagittarius/NodeFunction/2000', } @@ -114,7 +112,6 @@ id: 'gid://sagittarius/NodeFunction/1001', functionDefinitionId: function_definition.to_global_id.to_s, parameters: [ - parameterDefinitionId: function_definition.parameter_definitions.first.to_global_id.to_s, value: { referenceValue: { referencePath: [ diff --git a/spec/requests/graphql/mutation/namespace/projects/flows/update_mutation_spec.rb b/spec/requests/graphql/mutation/namespace/projects/flows/update_mutation_spec.rb index fc10ecea..5bb68b43 100644 --- a/spec/requests/graphql/mutation/namespace/projects/flows/update_mutation_spec.rb +++ b/spec/requests/graphql/mutation/namespace/projects/flows/update_mutation_spec.rb @@ -74,6 +74,7 @@ create(:function_definition, runtime_function_definition: rfd).tap do |fd| create(:parameter_definition, runtime_parameter_definition: rpd, function_definition: fd) + create(:parameter_definition, runtime_parameter_definition: rpd, function_definition: fd) end end @@ -97,7 +98,6 @@ nextNodeId: nil, parameters: [ { - parameterDefinitionId: function_definition.parameter_definitions.first.to_global_id.to_s, value: { literalValue: 100, }, @@ -108,7 +108,6 @@ id: 'gid://sagittarius/NodeFunction/1000', functionDefinitionId: function_definition.to_global_id.to_s, parameters: [ - parameterDefinitionId: function_definition.parameter_definitions.first.to_global_id.to_s, value: { nodeFunctionId: 'gid://sagittarius/NodeFunction/2000', } @@ -120,7 +119,6 @@ functionDefinitionId: function_definition.to_global_id.to_s, parameters: [ { - parameterDefinitionId: function_definition.parameter_definitions.first.to_global_id.to_s, value: { referenceValue: { referencePath: [ @@ -136,7 +134,6 @@ }, }, { - parameterDefinitionId: function_definition.parameter_definitions.first.to_global_id.to_s, value: { referenceValue: { referencePath: [ @@ -341,7 +338,6 @@ nextNodeId: nil, parameters: [ { - parameterDefinitionId: function_definition.parameter_definitions.first.to_global_id.to_s, value: { literalValue: 99, }, @@ -400,7 +396,6 @@ nextNodeId: nil, parameters: [ { - parameterDefinitionId: function_definition.parameter_definitions.first.to_global_id.to_s, value: { literalValue: 42, }, @@ -413,7 +408,6 @@ nextNodeId: nil, parameters: [ { - parameterDefinitionId: function_definition.parameter_definitions.first.to_global_id.to_s, value: { literalValue: 99, },