Skip to content

Aggregate-dedicated editors: AggregateGroupByEditor, AggregateAggrega… #8773

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

Draft
arkadius wants to merge 1 commit into
base: staging
Choose a base branch
from
Draft

Aggregate-dedicated editors: AggregateGroupByEditor, AggregateAggrega… #8773

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
3 changes: 2 additions & 1 deletion components-api/src/main/java/pl/touk/nussknacker/engine/api/editor/EditorType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,6 @@ public enum EditorType {
TYPED_TABULAR_DATA_EDITOR,
SPEL_EDITOR,
JSON_TEMPLATE_EDITOR,
MULTI_SELECT_EDITOR
MULTI_SELECT_EDITOR,
SPEL_EXPRESSIONS_LIST_EDITOR,
}
2 changes: 2 additions & 0 deletions ...onents-api/src/main/scala/pl/touk/nussknacker/engine/api/definition/ParameterEditor.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,3 +100,5 @@ case object CronParameterEditor extends ParameterEditor with StaticParameterEdit
@JsonCodec case class MultiSelectEditor(possibleValues: List[MultiSelectFixedValue])
extends ParameterEditor
with StaticParameterEditor

case object SpelExpressionsListEditor extends ParameterEditor
6 changes: 3 additions & 3 deletions ...cala/pl/touk/nussknacker/engine/flink/util/transformer/aggregate/sampleTransformers.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ object sampleTransformers {

@MethodToInvoke(returnType = classOf[AnyRef])
def execute(
@ParamName("groupBy") groupBy: LazyParameter[AnyRef],
@ParamName("groupBy") @Editor(`type` = EditorType.SPEL_EXPRESSIONS_LIST_EDITOR) groupBy: LazyParameter[AnyRef],
@ParamName("aggregator")
@AdditionalVariables(Array(new AdditionalVariable(name = "AGG", clazz = classOf[AggregateHelper])))
@Editor(
Expand Down Expand Up @@ -90,7 +90,7 @@ object sampleTransformers {

@MethodToInvoke(returnType = classOf[AnyRef])
def execute(
@ParamName("groupBy") groupBy: LazyParameter[AnyRef],
@ParamName("groupBy") @Editor(`type` = EditorType.SPEL_EXPRESSIONS_LIST_EDITOR) groupBy: LazyParameter[AnyRef],
@ParamName("aggregator")
@AdditionalVariables(Array(new AdditionalVariable(name = "AGG", clazz = classOf[AggregateHelper])))
@Editor(
Expand Down Expand Up @@ -154,7 +154,7 @@ object sampleTransformers {

@MethodToInvoke(returnType = classOf[AnyRef])
def execute(
@ParamName("groupBy") groupBy: LazyParameter[AnyRef],
@ParamName("groupBy") @Editor(`type` = EditorType.SPEL_EXPRESSIONS_LIST_EDITOR) groupBy: LazyParameter[AnyRef],
@ParamName("aggregator")
@AdditionalVariables(Array(new AdditionalVariable(name = "AGG", clazz = classOf[AggregateHelper])))
@Editor(
Expand Down
2 changes: 1 addition & 1 deletion ...nacker/engine/definition/component/parameter/defaults/EditorBasedLanguageDeterminer.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ object EditorBasedLanguageDeterminer {
case BoolParameterEditor | DateParameterEditor | TimeParameterEditor | DateTimeParameterEditor |
TextareaParameterEditor | DurationParameterEditor(_) | PeriodParameterEditor(_) | CronParameterEditor |
FixedValuesParameterEditor(_) | FixedValuesWithIconParameterEditor(_) |
FixedValuesWithRadioParameterEditor(_) =>
FixedValuesWithRadioParameterEditor(_) | SpelExpressionsListEditor =>
Expression.Language.Spel
case JsonParameterEditor | MultiSelectEditor(_) => Expression.Language.Json
case JsonTemplateParameterEditor => Expression.Language.JsonTemplate
Expand Down
1 change: 1 addition & 0 deletions ...nition/component/parameter/defaults/EditorPossibleValuesBasedDefaultValueDeterminer.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ protected object EditorPossibleValuesBasedDefaultValueDeterminer extends Paramet
case DateTimeParameterEditor => None
case BoolParameterEditor => None
case TextareaParameterEditor => None
case SpelExpressionsListEditor => None
}

}
29 changes: 15 additions & 14 deletions ...la/pl/touk/nussknacker/engine/definition/component/parameter/editor/EditorExtractor.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,20 +44,21 @@ object EditorExtractor {
.map(value => FixedExpressionValue(value.expression(), value.label()))
.toList
)
case EditorType.DATE_EDITOR => DateParameterEditor
case EditorType.TIME_EDITOR => TimeParameterEditor
case EditorType.DATE_TIME_EDITOR => DateTimeParameterEditor
case EditorType.DURATION_EDITOR => DurationParameterEditor(editor.timeRangeComponents().toList)
case EditorType.PERIOD_EDITOR => PeriodParameterEditor(editor.timeRangeComponents().toList)
case EditorType.CRON_EDITOR => CronParameterEditor
case EditorType.TEXTAREA_EDITOR => TextareaParameterEditor
case EditorType.JSON_EDITOR => JsonParameterEditor
case EditorType.SQL_EDITOR => SqlParameterEditor
case EditorType.SPEL_TEMPLATE_EDITOR => SpelTemplateParameterEditor
case EditorType.DICT_EDITOR => DictParameterEditor(editor.dictId())
case EditorType.TYPED_TABULAR_DATA_EDITOR => TabularTypedDataEditor
case EditorType.SPEL_EDITOR => SpelParameterEditor
case EditorType.JSON_TEMPLATE_EDITOR => JsonTemplateParameterEditor
case EditorType.DATE_EDITOR => DateParameterEditor
case EditorType.TIME_EDITOR => TimeParameterEditor
case EditorType.DATE_TIME_EDITOR => DateTimeParameterEditor
case EditorType.DURATION_EDITOR => DurationParameterEditor(editor.timeRangeComponents().toList)
case EditorType.PERIOD_EDITOR => PeriodParameterEditor(editor.timeRangeComponents().toList)
case EditorType.CRON_EDITOR => CronParameterEditor
case EditorType.TEXTAREA_EDITOR => TextareaParameterEditor
case EditorType.JSON_EDITOR => JsonParameterEditor
case EditorType.SQL_EDITOR => SqlParameterEditor
case EditorType.SPEL_TEMPLATE_EDITOR => SpelTemplateParameterEditor
case EditorType.DICT_EDITOR => DictParameterEditor(editor.dictId())
case EditorType.TYPED_TABULAR_DATA_EDITOR => TabularTypedDataEditor
case EditorType.SPEL_EDITOR => SpelParameterEditor
case EditorType.SPEL_EXPRESSIONS_LIST_EDITOR => SpelExpressionsListEditor
case EditorType.JSON_TEMPLATE_EDITOR => JsonTemplateParameterEditor
case EditorType.MULTI_SELECT_EDITOR =>
MultiSelectEditor(
editor
Expand Down
Loading