FE adjustments

Łukasz Bigorajski · Łukasz Bigorajski · commit 7e9a85fa05e8 · 2025-03-22T09:33:57.000+01:00
diff --git a/designer/client/src/components/graph/node-modal/editors/expression/Editor.ts b/designer/client/src/components/graph/node-modal/editors/expression/Editor.ts
@@ -1,7 +1,7 @@
 import { BoolEditor } from "./BoolEditor";
 import { SpelEditor } from "./SpelEditor";
 import { SqlEditor } from "./SqlEditor";
-import { StringEditor } from "./StringEditor";
+import { StaticStringEditor } from "./StaticStringEditor";
 import { FixedValuesEditor } from "./FixedValuesEditor";
 import { EditorType, ExpressionLang, ExpressionObj } from "./types";
 import React, { ForwardRefExoticComponent, LegacyRef, ReactNode } from "react";
@@ -62,7 +62,7 @@ export const editors: Record<EditorType, SimpleEditor | ExtendedEditor> = {
     [EditorType.JSON_PARAMETER_EDITOR]: JsonEditor,
     [EditorType.PERIOD_EDITOR]: PeriodEditor,
     [EditorType.SPEL_PARAMETER_EDITOR]: SpelEditor,
-    [EditorType.STRING_PARAMETER_EDITOR]: StringEditor,
+    [EditorType.STATIC_STRING_PARAMETER_EDITOR]: StaticStringEditor,
     [EditorType.TEXTAREA_PARAMETER_EDITOR]: TextareaEditor,
     [EditorType.TIME]: TimeEditor,
     [EditorType.SQL_PARAMETER_EDITOR]: SqlEditor,
diff --git a/designer/client/src/components/graph/node-modal/editors/expression/SqlEditor.tsx b/designer/client/src/components/graph/node-modal/editors/expression/SqlEditor.tsx
@@ -6,10 +6,10 @@ import ReactAce from "react-ace/lib/ace";
 import { ExtendedEditor } from "./Editor";
 import { Formatter } from "./Formatter";
 import { SpelEditor, SpelEditorProps } from "./SpelEditor";
-import { isSwitchableTo } from "./StringEditor";
-import { EditorMode } from "./types";
+import { EditorMode, ExpressionLang, ExpressionObj } from "./types";
 import { Ace } from "ace-builds";
 import { editorsParameters } from "./editorsParameters";
+import { isQuoted } from "./SpelQuotesUtils";
 
 interface SyntaxMode extends Ace.SyntaxMode {
     $highlightRules: {
@@ -114,6 +114,14 @@ export const SqlEditor: ExtendedEditor<Props> = (props: Props) => {
     );
 };
 
+const splitConcats = (value: string) => {
+    return value.split(/\s*\+\s*/gm);
+};
+
+export const isSwitchableTo = ({ expression, language }: ExpressionObj): boolean => {
+    return language === ExpressionLang.SpEL && splitConcats(expression.trim()).some(isQuoted);
+};
+
 SqlEditor.isSwitchableTo = isSwitchableTo;
 SqlEditor.notSwitchableToHint = () =>
     i18next.t(
diff --git a/designer/client/src/components/graph/node-modal/editors/expression/StaticStringEditor.tsx b/designer/client/src/components/graph/node-modal/editors/expression/StaticStringEditor.tsx
@@ -0,0 +1,34 @@
+import React from "react";
+import Input from "../field/Input";
+import { OnValueChange, SimpleEditor } from "./Editor";
+import { Formatter, FormatterType, typeFormatters } from "./Formatter";
+import { ExpressionObj } from "./types";
+import { FieldError } from "../Validators";
+import { editorsParameters } from "./editorsParameters";
+
+type Props = {
+    expressionObj: ExpressionObj;
+    onValueChange: OnValueChange;
+    className: string;
+    formatter: Formatter;
+    fieldErrors: FieldError[];
+    showValidation: boolean;
+};
+
+export const StaticStringEditor: SimpleEditor<Props> = (props: Props) => {
+    const { expressionObj, onValueChange, formatter, ...passProps } = props;
+    const stringFormatter = formatter == null ? typeFormatters[FormatterType.String] : formatter;
+
+    return (
+        <Input
+            {...passProps}
+            onChange={(event) =>
+                onValueChange({
+                    expression: stringFormatter.encode(event.target.value),
+                    language: editorsParameters.StaticStringParameterEditor.language,
+                })
+            }
+            value={stringFormatter.decode(expressionObj.expression) as string}
+        />
+    );
+};
diff --git a/designer/client/src/components/graph/node-modal/editors/expression/StringEditor.tsx b/designer/client/src/components/graph/node-modal/editors/expression/StringEditor.tsx
diff --git a/designer/client/src/components/graph/node-modal/editors/expression/editorsParameters.ts b/designer/client/src/components/graph/node-modal/editors/expression/editorsParameters.ts
@@ -21,7 +21,7 @@ export const editorsParameters: Record<EditorType, { displayName: string; langua
     [EditorType.JSON_PARAMETER_EDITOR]: { displayName: "Json", language: ExpressionLang.JSON },
     [EditorType.PERIOD_EDITOR]: { displayName: "Period", language: ExpressionLang.SpEL },
     [EditorType.SPEL_PARAMETER_EDITOR]: { displayName: "Expression", language: ExpressionLang.SpEL },
-    [EditorType.STRING_PARAMETER_EDITOR]: { displayName: "Text", language: ExpressionLang.String },
+    [EditorType.STATIC_STRING_PARAMETER_EDITOR]: { displayName: "Text", language: ExpressionLang.String },
     [EditorType.TEXTAREA_PARAMETER_EDITOR]: { displayName: "Text", language: ExpressionLang.SpEL },
     [EditorType.TIME]: { displayName: "Time", language: ExpressionLang.SpEL },
     [EditorType.SQL_PARAMETER_EDITOR]: { displayName: "SQL", language: ExpressionLang.SQL },
diff --git a/designer/client/src/components/graph/node-modal/editors/expression/types.ts b/designer/client/src/components/graph/node-modal/editors/expression/types.ts
@@ -23,7 +23,7 @@ export enum EditorMode {
 export enum EditorType {
     SPEL_PARAMETER_EDITOR = "SpelParameterEditor",
     BOOL_PARAMETER_EDITOR = "BoolParameterEditor",
-    STRING_PARAMETER_EDITOR = "StringParameterEditor",
+    STATIC_STRING_PARAMETER_EDITOR = "StaticStringParameterEditor",
     FIXED_VALUES_PARAMETER_EDITOR = "FixedValuesParameterEditor",
     FIXED_VALUES_WITH_ICON_PARAMETER_EDITOR = "FixedValuesWithIconParameterEditor",
     FIXED_VALUES_WITH_RADIO_PARAMETER_EDITOR = "FixedValuesWithRadioParameterEditor",
diff --git a/designer/client/test/Editors/StaticStringEditor-test.tsx b/designer/client/test/Editors/StaticStringEditor-test.tsx
@@ -1,16 +1,16 @@
 import * as React from "react";
 
 import { render, screen } from "@testing-library/react";
-import { StringEditor } from "../../src/components/graph/node-modal/editors/expression/StringEditor";
+import { StaticStringEditor } from "../../src/components/graph/node-modal/editors/expression/StaticStringEditor";
 import { mockFieldErrors, mockFormatter, mockValueChange } from "./helpers";
 import { NuThemeProvider } from "../../src/containers/theme/nuThemeProvider";
 import { nodeInputWithError } from "../../src/components/graph/node-modal/NodeDetailsContent/NodeTableStyled";
 
-describe(StringEditor.name, () => {
+describe(StaticStringEditor.name, () => {
     it("should display validation error when the field is required", () => {
         render(
             <NuThemeProvider>
-                <StringEditor
+                <StaticStringEditor
                     className={""}
                     onValueChange={mockValueChange}
                     expressionObj={{ language: "spel", expression: "" }}
diff --git a/docs-internal/api/nu-designer-openapi.yaml b/docs-internal/api/nu-designer-openapi.yaml
@@ -5682,9 +5682,6 @@ components:
           format: date-time
         createdBy:
           type: string
-    StaticStringParameterEditor:
-      title: StaticStringParameterEditor
-      type: object
     CronParameterEditor:
       title: CronParameterEditor
       type: object
@@ -7281,7 +7278,6 @@ components:
       title: StaticParameterEditor
       oneOf:
       - $ref: '#/components/schemas/BoolParameterEditor'
-      - $ref: '#/components/schemas/StaticStringParameterEditor'
       - $ref: '#/components/schemas/CronParameterEditor'
       - $ref: '#/components/schemas/DateParameterEditor'
       - $ref: '#/components/schemas/DateTimeParameterEditor'
@@ -7292,8 +7288,12 @@ components:
       - $ref: '#/components/schemas/FixedValuesWithRadioParameterEditor'
       - $ref: '#/components/schemas/JsonParameterEditor'
       - $ref: '#/components/schemas/PeriodParameterEditor'
+      - $ref: '#/components/schemas/StaticStringParameterEditor'
       - $ref: '#/components/schemas/TextareaParameterEditor'
       - $ref: '#/components/schemas/TimeParameterEditor'
+    StaticStringParameterEditor:
+      title: StaticStringParameterEditor
+      type: object
     StatisticDto:
       title: StatisticDto
       type: object
diff --git a/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/DevProcessConfigCreator.scala b/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/DevProcessConfigCreator.scala
@@ -147,7 +147,7 @@ class DevProcessConfigCreator extends ProcessConfigCreator {
           ComponentConfig.zero.copy(
             params = Some(
               Map(
-                ParameterName("bar") -> ParameterConfig(Some("'barValueFromProviderCode'"), None, None, None, None)
+                ParameterName("bar") -> ParameterConfig(Some("barValueFromProviderCode"), None, None, None, None)
               )
             )
           )
diff --git a/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/LoggingService.scala b/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/LoggingService.scala
@@ -4,7 +4,7 @@ import cats.implicits.catsSyntaxOptionId
 import org.slf4j.LoggerFactory
 import org.slf4j.event.Level
 import pl.touk.nussknacker.engine.api._
-import pl.touk.nussknacker.engine.api.component.{ParameterConfig, StaticParameterConfig}
+import pl.touk.nussknacker.engine.api.component.StaticParameterConfig
 import pl.touk.nussknacker.engine.api.definition.BoolParameterEditor
 import pl.touk.nussknacker.engine.api.deployment.{ScenarioActionName, WithActionParametersSupport}
 import pl.touk.nussknacker.engine.api.editor.{Editor, EditorType}
diff --git a/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/service/DynamicMultipleParamsService.scala b/engine/flink/management/dev-model/src/main/scala/pl/touk/nussknacker/engine/management/sample/service/DynamicMultipleParamsService.scala
@@ -54,7 +54,7 @@ object DynamicMultipleParamsService extends EagerService with SingleInputDynamic
       NextParameters(
         List(
           Parameter(ParameterName("baz"), Typed[String])
-            .copy(defaultValue = Some(Expression.spel(s"'$fooValue' + '-' + ${barValue.renderedTemplate}")))
+            .copy(defaultValue = Some(Expression.spel(s"'$fooValue' + '-' + '${barValue.renderedTemplate}''")))
         )
       )
     case TransformationStep(
diff --git a/utils/schemed-kafka-components-utils/src/test/scala/pl/touk/nussknacker/engine/schemedkafka/sink/flink/AvroSinkValueParameterTest.scala b/utils/schemed-kafka-components-utils/src/test/scala/pl/touk/nussknacker/engine/schemedkafka/sink/flink/AvroSinkValueParameterTest.scala
@@ -64,15 +64,15 @@ class AvroSchemaBasedParameterTest extends AnyFunSuite with Matchers {
     ) shouldBe List(
       Parameter(name = ParameterName("a"), typ = typing.Typed[String]).copy(
         isLazyParameter = true,
-        editors = List(SpelParameterEditor, SpelTemplateParameterEditor),
-        defaultValue = Some(Expression.spel("''"))
+        editors = List(SpelTemplateParameterEditor, SpelParameterEditor),
+        defaultValue = Some(Expression.spelTemplate(""))
       ),
       Parameter(name = ParameterName("b.c"), typ = typing.Typed[Long])
         .copy(isLazyParameter = true, defaultValue = Some(Expression.spel("0"))),
       Parameter(name = ParameterName("c"), typ = typing.Typed[String]).copy(
         isLazyParameter = true,
         defaultValue = Some(Expression.spel("'c-field-default'")),
-        editors = List(SpelParameterEditor, SpelTemplateParameterEditor),
+        editors = List(SpelTemplateParameterEditor, SpelParameterEditor),
       ),
       Parameter(name = ParameterName("d"), typ = typing.Typed[Long])
         .copy(isLazyParameter = true, defaultValue = Some(Expression.spel("42L"))),

Original file line number	Diff line number	Diff line change
`@@ -147,7 +147,7 @@ class DevProcessConfigCreator extends ProcessConfigCreator {`
`147`	`147`	`ComponentConfig.zero.copy(`
`148`	`148`	`params = Some(`
`149`	`149`	`Map(`
`150`		`- ParameterName("bar") -> ParameterConfig(Some("'barValueFromProviderCode'"), None, None, None, None)`
	`150`	`+ ParameterName("bar") -> ParameterConfig(Some("barValueFromProviderCode"), None, None, None, None)`
`151`	`151`	`)`
`152`	`152`	`)`
`153`	`153`	`)`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ object DynamicMultipleParamsService extends EagerService with SingleInputDynamic`
`54`	`54`	`NextParameters(`
`55`	`55`	`List(`
`56`	`56`	`Parameter(ParameterName("baz"), Typed[String])`
`57`		`- .copy(defaultValue = Some(Expression.spel(s"'$fooValue' + '-' + ${barValue.renderedTemplate}")))`
	`57`	`+ .copy(defaultValue = Some(Expression.spel(s"'$fooValue' + '-' + '${barValue.renderedTemplate}''")))`
`58`	`58`	`)`
`59`	`59`	`)`
`60`	`60`	`case TransformationStep(`