Merge branch 'staging' into preview/aggregate-ui

TouK · Oct 22, 2024 · c110f56 · c110f56
2 parents 415c449 + b35d2df
commit c110f56
Show file tree

Hide file tree

Showing 35 changed files with 1,555 additions and 319 deletions.
diff --git a/components-api/src/main/scala/pl/touk/nussknacker/engine/api/typed/typing.scala b/components-api/src/main/scala/pl/touk/nussknacker/engine/api/typed/typing.scala
@@ -51,12 +51,6 @@ object typing {
     override def withoutValue: SingleTypingResult
 
     def runtimeObjType: TypedClass
-
-    // This type should be used only for: type hints, suggester and validation
-    def typeHintsObjType: TypedClass =
-      if (runtimeObjType.klass.isArray) TypedClass(classOf[java.util.List[_]], runtimeObjType.params)
-      else runtimeObjType
-
   }
 
   object TypedObjectTypingResult {
@@ -215,7 +209,7 @@ object typing {
     override def withoutValue: TypedClass = this
 
     override def display: String = {
-      val className = ReflectUtils.simpleNameWithoutSuffix(typeHintsObjType.klass)
+      val className = if (klass.isArray) "List" else ReflectUtils.simpleNameWithoutSuffix(runtimeObjType.klass)
       if (params.nonEmpty) s"$className[${params.map(_.display).mkString(",")}]"
       else className
     }

diff --git a/designer/client/src/components/Process/types.ts b/designer/client/src/components/Process/types.ts
@@ -47,7 +47,6 @@ export interface Scenario {
     isFragment: boolean;
     isLatestVersion: boolean;
     processCategory: string;
-    processType: string;
     modificationDate: Instant; // Deprecated
     modifiedBy: string;
     createdAt: Instant;
@@ -77,6 +76,7 @@ export type ProcessStateType = {
     startTime?: Date;
     attributes?: UnknownRecord;
     errors?: Array<string>;
+    version?: number | null;
 };
 
 export type StatusType = {