From aab69181a30d65b80cc77ba4a2be87f9ef5628af Mon Sep 17 00:00:00 2001 From: Raphael Date: Thu, 1 May 2025 11:42:12 +0200 Subject: [PATCH 1/6] feat: added flow_type_identifier field --- proto/shared/shared.flow_definition.proto | 1 + 1 file changed, 1 insertion(+) diff --git a/proto/shared/shared.flow_definition.proto b/proto/shared/shared.flow_definition.proto index 4373dc3..0380d74 100644 --- a/proto/shared/shared.flow_definition.proto +++ b/proto/shared/shared.flow_definition.proto @@ -12,6 +12,7 @@ import "shared.flow.proto"; message FlowType { FlowDefinition definition = 1; repeated shared.Translation name = 2; + string flow_type_identifier = 3; } message FlowDefinitionSetting { From 3b5fb09da6781f56def35e568dc1ba3d8892e3ad Mon Sep 17 00:00:00 2001 From: Raphael Date: Thu, 1 May 2025 11:45:23 +0200 Subject: [PATCH 2/6] fix: data_types to data_type_identifier --- proto/shared/shared.flow_definition.proto | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/proto/shared/shared.flow_definition.proto b/proto/shared/shared.flow_definition.proto index 0380d74..93af8cf 100644 --- a/proto/shared/shared.flow_definition.proto +++ b/proto/shared/shared.flow_definition.proto @@ -5,7 +5,6 @@ option ruby_package = "Tucana::Shared"; package shared; import "shared.translation.proto"; -import "shared.data_type.proto"; import "shared.struct.proto"; import "shared.flow.proto"; @@ -17,7 +16,7 @@ message FlowType { message FlowDefinitionSetting { bool unique = 1; - shared.DataType type = 2; + string data_type_identifier = 2; optional shared.Struct default_value = 3; repeated shared.Translation name = 4; repeated shared.Translation description = 5; @@ -25,7 +24,7 @@ message FlowDefinitionSetting { message FlowDefinition { repeated FlowDefinitionSetting settings = 1; - shared.DataType input_type = 2; - optional shared.DataType return_type = 3; + string input_type_identifier = 2; + optional string return_type_identifier = 3; bool editable = 4; } From cdb2f44dacf7de397708d9e2258d5d8b14facc26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Raphael=20G=C3=B6tz?= <52959657+raphael-goetz@users.noreply.github.com> Date: Sat, 3 May 2025 17:56:38 +0200 Subject: [PATCH 3/6] Update proto/shared/shared.flow_definition.proto Co-authored-by: Niklas van Schrick --- proto/shared/shared.flow_definition.proto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proto/shared/shared.flow_definition.proto b/proto/shared/shared.flow_definition.proto index 93af8cf..d87b94c 100644 --- a/proto/shared/shared.flow_definition.proto +++ b/proto/shared/shared.flow_definition.proto @@ -17,7 +17,7 @@ message FlowType { message FlowDefinitionSetting { bool unique = 1; string data_type_identifier = 2; - optional shared.Struct default_value = 3; + optional shared.Value default_value = 3; repeated shared.Translation name = 4; repeated shared.Translation description = 5; } From b4eb9fa41d2e3854bce2cc26fb8ea8fae6bb95ef Mon Sep 17 00:00:00 2001 From: Raphael Date: Sun, 4 May 2025 22:12:22 +0200 Subject: [PATCH 4/6] drop: removed FlowDefinition & renamed FlowDefinitionSetting into FlowTypeSetting --- proto/shared/shared.flow_definition.proto | 27 ++++++++++------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/proto/shared/shared.flow_definition.proto b/proto/shared/shared.flow_definition.proto index d87b94c..4c7574b 100644 --- a/proto/shared/shared.flow_definition.proto +++ b/proto/shared/shared.flow_definition.proto @@ -9,22 +9,19 @@ import "shared.struct.proto"; import "shared.flow.proto"; message FlowType { - FlowDefinition definition = 1; + string identifier = 1; repeated shared.Translation name = 2; - string flow_type_identifier = 3; + repeated FlowDefinitionSetting settings = 3; + optional string input_type_identifier = 4; + optional string return_type_identifier = 5; + bool editable = 6; } -message FlowDefinitionSetting { - bool unique = 1; - string data_type_identifier = 2; - optional shared.Value default_value = 3; - repeated shared.Translation name = 4; - repeated shared.Translation description = 5; -} - -message FlowDefinition { - repeated FlowDefinitionSetting settings = 1; - string input_type_identifier = 2; - optional string return_type_identifier = 3; - bool editable = 4; +message FlowTypeSetting { + string identifier = 1; + bool unique = 2; + string data_type_identifier = 3; + optional shared.Value default_value = 4; + repeated shared.Translation name = 5; + repeated shared.Translation description = 6; } From 25143f87bd886c9416660135b111aac53e4c90a2 Mon Sep 17 00:00:00 2001 From: Raphael Date: Sun, 4 May 2025 22:15:28 +0200 Subject: [PATCH 5/6] feat: added description field --- proto/shared/shared.flow_definition.proto | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/proto/shared/shared.flow_definition.proto b/proto/shared/shared.flow_definition.proto index 4c7574b..c02423f 100644 --- a/proto/shared/shared.flow_definition.proto +++ b/proto/shared/shared.flow_definition.proto @@ -10,11 +10,12 @@ import "shared.flow.proto"; message FlowType { string identifier = 1; - repeated shared.Translation name = 2; - repeated FlowDefinitionSetting settings = 3; - optional string input_type_identifier = 4; - optional string return_type_identifier = 5; - bool editable = 6; + repeated FlowDefinitionSetting settings = 2; + optional string input_type_identifier = 3; + optional string return_type_identifier = 4; + bool editable = 5; + repeated shared.Translation name = 6; + repeated shared.Translation description = 7; } message FlowTypeSetting { From 42c13ce05427e73d2517d0ffb657b1b69aafb004 Mon Sep 17 00:00:00 2001 From: Raphael Date: Sun, 4 May 2025 22:17:27 +0200 Subject: [PATCH 6/6] fix: changed field of settings into correct data type --- proto/shared/shared.flow_definition.proto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proto/shared/shared.flow_definition.proto b/proto/shared/shared.flow_definition.proto index c02423f..efced69 100644 --- a/proto/shared/shared.flow_definition.proto +++ b/proto/shared/shared.flow_definition.proto @@ -10,7 +10,7 @@ import "shared.flow.proto"; message FlowType { string identifier = 1; - repeated FlowDefinitionSetting settings = 2; + repeated FlowTypeSetting settings = 2; optional string input_type_identifier = 3; optional string return_type_identifier = 4; bool editable = 5;