fix(designer): Reverting part of #7006 (#7267)

* filtering fixes

* :revert "fix(designer): Reset id replacements when reset designer dirty state (#7105)"

This reverts commit fefe073.

* revert part of pr

* revert

* fix test

* Actully fix test

Author: Eric-B-Wu

libs/designer/src/lib/core/utils/parameters/__test__/segment.spec.ts

@@ -70,19 +70,17 @@ describe('core/utils/parameters/segment', () => {
       expectOutputTokenSegment(segments[1], 'b', OutputSource.Body, 'bar', 'outputs.$.body.bar', undefined, true);
     });
 
-    it('should have double quote for single non interpolated token.', () => {
+    it('should not have double quote for single non interpolated token.', () => {
       const convertor = new ValueSegmentConvertor();
       const segments = convertor.convertToValueSegments({
         foo: '@triggerBody().foo',
       });
-      expect(segments.length).toEqual(7);
+      expect(segments.length).toEqual(5);
       expectLiteralSegment(segments[0], '{\n  ');
       expectLiteralSegment(segments[1], '"foo"');
       expectLiteralSegment(segments[2], ': ');
-      expectLiteralSegment(segments[3], '"');
-      expectOutputTokenSegment(segments[4], undefined, OutputSource.Body, 'foo', 'outputs.$.body.foo', undefined, true);
-      expectLiteralSegment(segments[5], '"');
-      expectLiteralSegment(segments[6], '\n}');
+      expectOutputTokenSegment(segments[3], undefined, OutputSource.Body, 'foo', 'outputs.$.body.foo', undefined, true);
+      expectLiteralSegment(segments[4], '\n}');
     });
 
     it('should add @ if the string starts with @ when raw mode is enabled.', () => {
@@ -181,7 +179,7 @@ describe('core/utils/parameters/segment', () => {
         interpolation: "@{triggerBody().foo}@{variables('v')}",
         expression: '@triggerBody().foo',
       });
-      expect(segments.length).toEqual(20);
+      expect(segments.length).toEqual(18);
       expectLiteralSegment(segments[0], '{\n  ');
       expectLiteralSegment(segments[1], '"boolean"');
       expectLiteralSegment(segments[2], ': false,\n  ');
@@ -198,10 +196,8 @@ describe('core/utils/parameters/segment', () => {
       expectLiteralSegment(segments[13], ',\n  ');
       expectLiteralSegment(segments[14], '"expression"');
       expectLiteralSegment(segments[15], ': ');
-      expectLiteralSegment(segments[16], '"');
-      expectOutputTokenSegment(segments[17], undefined, OutputSource.Body, 'foo', 'outputs.$.body.foo', undefined, true);
-      expectLiteralSegment(segments[18], '"');
-      expectLiteralSegment(segments[19], '\n}');
+      expectOutputTokenSegment(segments[16], undefined, OutputSource.Body, 'foo', 'outputs.$.body.foo', undefined, true);
+      expectLiteralSegment(segments[17], '\n}');
     });
 
     it('should convert FX token expression to token segment successfully.', () => {

libs/designer/src/lib/core/utils/parameters/segment.ts

@@ -127,8 +127,13 @@ export class ValueSegmentConvertor {
       const expression = ExpressionParser.parseTemplateExpression(value);
       const segments = this._convertTemplateExpressionToValueSegments(expression);
 
-      // Note: Previously if there was a non-interpolated single expression, we wouldn't surround with double quotes.
-      // However, this just complicates the logic on deserialization/serialization when it can be managed by the interpolated expression.
+      // Note: If an non-interpolated expression is turned into a single TOKEN, we don't surround with double quote. Otherwise,
+      // double quotes are added to surround the expression. This is the existing behaviour.
+
+      if (segments.length === 1 && isTokenValueSegment(segments[0]) && !isStringInterpolation(expression)) {
+        return segments;
+      }
+
       const escapedSegments = segments.map((segment) => {
         // Note: All literal segments must be escaped since they are inside a JSON string.
         if (isLiteralValueSegment(segment)) {