Merge branch 'staging' into integer-dictionary-support-in-fragment-in…

…puts

designer/client/src/components/Process/ProcessStateUtils.ts

@@ -18,11 +18,9 @@ class ProcessStateUtils {
 
     public canArchive = (state: ProcessStateType): boolean => state?.allowedActions.includes(PredefinedActionName.Archive);
 
-    public canSeePerformSingleExecution = (state: ProcessStateType): boolean =>
-        state?.visibleActions.includes(PredefinedActionName.PerformSingleExecution);
+    public canSeeRunOffSchedule = (state: ProcessStateType): boolean => state?.visibleActions.includes(PredefinedActionName.RunOffSchedule);
 
-    public canPerformSingleExecution = (state: ProcessStateType): boolean =>
-        state?.allowedActions.includes(PredefinedActionName.PerformSingleExecution);
+    public canRunOffSchedule = (state: ProcessStateType): boolean => state?.allowedActions.includes(PredefinedActionName.RunOffSchedule);
 
     getStateDescription({ isArchived, isFragment }: Scenario, processState: ProcessStateType): string {
         if (isArchived) {

designer/client/src/components/Process/types.ts

@@ -9,7 +9,7 @@ export enum PredefinedActionName {
     Archive = "ARCHIVE",
     UnArchive = "UNARCHIVE",
     Pause = "PAUSE",
-    PerformSingleExecution = "PERFORM_SINGLE_EXECUTION",
+    RunOffSchedule = "RUN_OFF_SCHEDULE",
 }
 
 export type ActionName = string;

designer/client/src/components/toolbarSettings/buttons/BuiltinButtonTypes.ts

@@ -2,7 +2,7 @@ export enum BuiltinButtonTypes {
     processSave = "process-save",
     processDeploy = "process-deploy",
     processCancel = "process-cancel",
-    processPerformSingleExecution = "process-perform-single-execution",
+    processRunOffSchedule = "process-run-off-schedule",
     editUndo = "edit-undo",
     editRedo = "edit-redo",
     editCopy = "edit-copy",

designer/client/src/components/toolbarSettings/buttons/TOOLBAR_BUTTONS_MAP.ts

@@ -31,7 +31,7 @@ import { ZoomOutButton } from "../../toolbars/view/buttons/ZoomOutButton";
 import { BuiltinButtonTypes } from "./BuiltinButtonTypes";
 import { CustomButtonTypes } from "./CustomButtonTypes";
 import { ToolbarButton, ToolbarButtonTypes } from "./types";
-import PerformSingleExecutionButton from "../../toolbars/scenarioActions/buttons/PerformSingleExecutionButton";
+import RunOffScheduleButton from "../../toolbars/scenarioActions/buttons/RunOffScheduleButton";
 
 export type PropsOfButton<T> = ToolbarButton & {
     type: T;
@@ -45,7 +45,7 @@ export const TOOLBAR_BUTTONS_MAP: ToolbarButtonsMap = {
     [BuiltinButtonTypes.processSave]: SaveButton,
     [BuiltinButtonTypes.processDeploy]: DeployButton,
     [BuiltinButtonTypes.processCancel]: CancelDeployButton,
-    [BuiltinButtonTypes.processPerformSingleExecution]: PerformSingleExecutionButton,
+    [BuiltinButtonTypes.processRunOffSchedule]: RunOffScheduleButton,
     [BuiltinButtonTypes.viewZoomIn]: ZoomInButton,
     [BuiltinButtonTypes.viewZoomOut]: ZoomOutButton,
     [BuiltinButtonTypes.viewReset]: ResetViewButton,

designer/client/src/components/toolbarSettings/defaultToolbarsConfig.ts

@@ -29,7 +29,7 @@ export function defaultToolbarsConfig(isFragment: boolean, isArchived: boolean):
                     { type: BuiltinButtonTypes.processSave },
                     { type: BuiltinButtonTypes.processDeploy },
                     { type: BuiltinButtonTypes.processCancel },
-                    { type: BuiltinButtonTypes.processPerformSingleExecution },
+                    { type: BuiltinButtonTypes.processRunOffSchedule },
                 ],
             },
             {

designer/client/src/components/toolbars/scenarioActions/buttons/PerformSingleExecutionButton.tsx → designer/client/src/components/toolbars/scenarioActions/buttons/RunOffScheduleButton.tsx

@@ -2,13 +2,13 @@ import React from "react";
 import { useTranslation } from "react-i18next";
 import { useDispatch, useSelector } from "react-redux";
 import { loadProcessState } from "../../../../actions/nk";
-import Icon from "../../../../assets/img/toolbarButtons/perform-single-execution.svg";
+import Icon from "../../../../assets/img/toolbarButtons/run-off-schedule.svg";
 import HttpService from "../../../../http/HttpService";
 import {
     getProcessName,
     getProcessVersionId,
-    isPerformSingleExecutionPossible,
-    isPerformSingleExecutionVisible,
+    isRunOffSchedulePossible,
+    isRunOffScheduleVisible,
 } from "../../../../reducers/selectors/graph";
 import { getCapabilities } from "../../../../reducers/selectors/other";
 import { useWindows, WindowKind } from "../../../../windowManager";
@@ -21,30 +21,29 @@ import { RootState } from "../../../../reducers";
 import { getProcessState } from "../../../../reducers/selectors/scenarioState";
 import { PredefinedActionName } from "../../../Process/types";
 
-export default function PerformSingleExecutionButton(props: ToolbarButtonProps) {
+export default function RunOffScheduleButton(props: ToolbarButtonProps) {
     const { t } = useTranslation();
     const dispatch = useDispatch();
     const { disabled, type } = props;
     const scenarioState = useSelector((state: RootState) => getProcessState(state));
-    const isVisible = useSelector(isPerformSingleExecutionVisible);
-    const isPossible = useSelector(isPerformSingleExecutionPossible);
+    const isVisible = useSelector(isRunOffScheduleVisible);
+    const isPossible = useSelector(isRunOffSchedulePossible);
     const processName = useSelector(getProcessName);
     const processVersionId = useSelector(getProcessVersionId);
     const capabilities = useSelector(getCapabilities);
     const available = !disabled && isPossible && capabilities.deploy;
 
     const { open } = useWindows();
-    const action = (p, c) =>
-        HttpService.performSingleExecution(p, c).finally(() => dispatch(loadProcessState(processName, processVersionId)));
-    const message = t("panels.actions.perform-single-execution.dialog", "Perform single execution", { name: processName });
+    const action = (p, c) => HttpService.runOffSchedule(p, c).finally(() => dispatch(loadProcessState(processName, processVersionId)));
+    const message = t("panels.actions.run-of-out-schedule.dialog", "Perform single execution", { name: processName });
 
-    const defaultTooltip = t("panels.actions.perform-single-execution.tooltip", "run now");
-    const tooltip = ProcessStateUtils.getActionCustomTooltip(scenarioState, PredefinedActionName.PerformSingleExecution) ?? defaultTooltip;
+    const defaultTooltip = t("panels.actions.run-off-schedule.tooltip", "run now");
+    const tooltip = ProcessStateUtils.getActionCustomTooltip(scenarioState, PredefinedActionName.RunOffSchedule) ?? defaultTooltip;
 
     if (isVisible) {
         return (
             <ToolbarButton
-                name={t("panels.actions.perform-single-execution.button", "run now")}
+                name={t("panels.actions.run-off-schedule.button", "run now")}
                 title={tooltip}
                 disabled={!available}
                 icon={<Icon />}

designer/client/src/containers/event-tracking/helpers.ts

@@ -92,8 +92,8 @@ export const mapToolbarButtonToStatisticsEvent = (
         case BuiltinButtonTypes.processCancel: {
             return EventTrackingSelector.ScenarioCancel;
         }
-        case BuiltinButtonTypes.processPerformSingleExecution: {
-            return EventTrackingSelector.ScenarioPerformSingleExecution;
+        case BuiltinButtonTypes.processRunOffSchedule: {
+            return EventTrackingSelector.ScenarioRunOffSchedule;
         }
         case BuiltinButtonTypes.processArchiveToggle: {
             return EventTrackingSelector.ScenarioArchiveToggle;

designer/client/src/containers/event-tracking/use-register-tracking-events.ts

@@ -51,7 +51,7 @@ enum ClickEventsSelector {
     ScenarioSave = "SCENARIO_SAVE",
     TestCounts = "TEST_COUNTS",
     ScenarioCancel = "SCENARIO_CANCEL",
-    ScenarioPerformSingleExecution = "SCENARIO_PERFORM_SINGLE_EXECUTION",
+    ScenarioRunOffSchedule = "SCENARIO_RUN_OFF_SCHEDULE",
     ScenarioArchiveToggle = "SCENARIO_ARCHIVE_TOGGLE",
     ScenarioUnarchive = "SCENARIO_UNARCHIVE",
     ScenarioCustomAction = "SCENARIO_CUSTOM_ACTION",

designer/client/src/http/HttpService.ts

@@ -360,12 +360,12 @@ class HttpService {
             });
     }
 
-    performSingleExecution(processName: string, comment?: string) {
+    runOffSchedule(processName: string, comment?: string) {
         const data = {
             comment: comment,
         };
         return api
-            .post(`/processManagement/performSingleExecution/${encodeURIComponent(processName)}`, data)
+            .post(`/processManagement/runOffSchedule/${encodeURIComponent(processName)}`, data)
             .then((res) => {
                 const msg = res.data.msg;
                 this.#addInfo(msg);

designer/client/src/reducers/selectors/graph.ts

@@ -57,12 +57,10 @@ export const isDeployedVersion = createSelector(
     (visibleVersion, deployedVersion) => visibleVersion === deployedVersion,
 );
 export const isCancelPossible = createSelector(getProcessState, (state) => ProcessStateUtils.canCancel(state));
-export const isPerformSingleExecutionVisible = createSelector([getProcessState], (state) =>
-    ProcessStateUtils.canSeePerformSingleExecution(state),
-);
-export const isPerformSingleExecutionPossible = createSelector(
+export const isRunOffScheduleVisible = createSelector([getProcessState], (state) => ProcessStateUtils.canSeeRunOffSchedule(state));
+export const isRunOffSchedulePossible = createSelector(
     [hasError, getProcessState, isFragment],
-    (error, state, fragment) => !fragment && !error && ProcessStateUtils.canPerformSingleExecution(state),
+    (error, state, fragment) => !fragment && !error && ProcessStateUtils.canRunOffSchedule(state),
 );
 export const isMigrationPossible = createSelector(
     [isSaveDisabled, hasError, getProcessState, isFragment],

designer/deployment-manager-api/src/main/scala/pl/touk/nussknacker/engine/api/deployment/DMScenarioCommand.scala

@@ -81,8 +81,8 @@ case class DMCancelScenarioCommand(scenarioName: ProcessName, user: User) extend
 case class DMStopScenarioCommand(scenarioName: ProcessName, savepointDir: Option[String], user: User)
     extends DMScenarioCommand[SavepointResult]
 
-case class DMPerformSingleExecutionCommand(
+case class DMRunOffScheduleCommand(
     processVersion: ProcessVersion,
     canonicalProcess: CanonicalProcess,
     user: User,
-) extends DMScenarioCommand[SingleExecutionResult]
+) extends DMScenarioCommand[RunOffScheduleResult]

designer/deployment-manager-api/src/main/scala/pl/touk/nussknacker/engine/testing/DeploymentManagerStub.scala

@@ -76,7 +76,7 @@ trait StubbingCommands { self: DeploymentManager =>
     case _: DMCancelDeploymentCommand      => Future.successful(())
     case _: DMCancelScenarioCommand        => Future.successful(())
     case _: DMMakeScenarioSavepointCommand => Future.successful(SavepointResult(""))
-    case _: DMPerformSingleExecutionCommand | _: DMCustomActionCommand | _: DMTestScenarioCommand => notImplemented
+    case _: DMRunOffScheduleCommand | _: DMCustomActionCommand | _: DMTestScenarioCommand => notImplemented
   }
 
 }

designer/restmodel/src/main/scala/pl/touk/nussknacker/restmodel/PerformSingleExecutionRequest.scala → designer/restmodel/src/main/scala/pl/touk/nussknacker/restmodel/RunOffScheduleRequest.scala

@@ -2,6 +2,6 @@ package pl.touk.nussknacker.restmodel
 
 import io.circe.generic.JsonCodec
 
-@JsonCodec final case class PerformSingleExecutionRequest(
+@JsonCodec final case class RunOffScheduleRequest(
     comment: Option[String] = None,
 )

designer/restmodel/src/main/scala/pl/touk/nussknacker/restmodel/PerformSingleExecutionResponse.scala → designer/restmodel/src/main/scala/pl/touk/nussknacker/restmodel/RunOffScheduleResponse.scala

@@ -3,4 +3,4 @@ package pl.touk.nussknacker.restmodel
 import io.circe.generic.JsonCodec
 
 @JsonCodec
-final case class PerformSingleExecutionResponse(isSuccess: Boolean, msg: String)
+final case class RunOffScheduleResponse(isSuccess: Boolean, msg: String)

designer/server/src/main/resources/defaultDesignerConfig.conf

@@ -133,7 +133,7 @@ processToolbarConfig {
           { type: "process-deploy", disabled: { fragment: true, archived: true, type: "oneof" } }
           { type: "process-cancel", disabled: { fragment: true, archived: true, type: "oneof" } }
           { type: "custom-link", name: "metrics", icon: "/assets/buttons/metrics.svg", url: "/metrics/$processName", disabled: { fragment: true } }
-          { type: "process-perform-single-execution", disabled: { fragment: true, archived: true, type: "oneof" } }
+          { type: "process-run-off-schedule", disabled: { fragment: true, archived: true, type: "oneof" } }
         ]
       }
       {

designer/server/src/main/scala/pl/touk/nussknacker/ui/api/ManagementResources.scala

@@ -19,8 +19,8 @@ import pl.touk.nussknacker.engine.testmode.TestProcess._
 import pl.touk.nussknacker.restmodel.{
   CustomActionRequest,
   CustomActionResponse,
-  PerformSingleExecutionRequest,
-  PerformSingleExecutionResponse
+  RunOffScheduleRequest,
+  RunOffScheduleResponse
 }
 import pl.touk.nussknacker.ui.api.ProcessesResources.ProcessUnmarshallingError
 import pl.touk.nussknacker.ui.api.description.NodesApiEndpoints.Dtos.AdhocTestParametersRequest
@@ -275,24 +275,25 @@ class ManagementResources(
                 )
             }
           }
-        } ~ path("performSingleExecution" / ProcessNameSegment) { processName =>
-          (post & processId(processName) & entity(as[PerformSingleExecutionRequest])) { (processIdWithName, req) =>
-            canDeploy(processIdWithName) {
-              complete {
-                measureTime("singleExecution", metricRegistry) {
-                  deploymentService
-                    .processCommand(
-                      PerformSingleExecutionCommand(
-                        commonData = CommonCommandData(processIdWithName, req.comment.flatMap(Comment.from), user),
+        } ~ path(("runOffSchedule" | "performSingleExecution") / ProcessNameSegment) {
+          processName => // backward compatibility purpose
+            (post & processId(processName) & entity(as[RunOffScheduleRequest])) { (processIdWithName, req) =>
+              canDeploy(processIdWithName) {
+                complete {
+                  measureTime("singleExecution", metricRegistry) {
+                    deploymentService
+                      .processCommand(
+                        RunOffScheduleCommand(
+                          commonData = CommonCommandData(processIdWithName, req.comment.flatMap(Comment.from), user),
+                        )
                       )
-                    )
-                    .flatMap(actionResult =>
-                      toHttpResponse(PerformSingleExecutionResponse(isSuccess = true, actionResult.msg))(StatusCodes.OK)
-                    )
+                      .flatMap(actionResult =>
+                        toHttpResponse(RunOffScheduleResponse(isSuccess = true, actionResult.msg))(StatusCodes.OK)
+                      )
+                  }
                 }
               }
             }
-          }
         }
     }
 

designer/server/src/main/scala/pl/touk/nussknacker/ui/config/scenariotoolbar/ToolbarButtonConfig.scala

@@ -43,10 +43,10 @@ object ToolbarButtonConfigType extends Enumeration {
     CustomLink
   )
 
-  val ProcessSave: Value                   = Value("process-save")
-  val ProcessCancel: Value                 = Value("process-cancel")
-  val ProcessDeploy: Value                 = Value("process-deploy")
-  val ProcessPerformSingleExecution: Value = Value("process-perform-single-execution")
+  val ProcessSave: Value           = Value("process-save")
+  val ProcessCancel: Value         = Value("process-cancel")
+  val ProcessDeploy: Value         = Value("process-deploy")
+  val ProcessRunOffSchedule: Value = Value("process-run-off-schedule")
 
   val EditUndo: Value   = Value("edit-undo")
   val EditRedo: Value   = Value("edit-redo")

designer/server/src/main/scala/pl/touk/nussknacker/ui/process/deployment/DeploymentService.scala

@@ -75,10 +75,10 @@ class DeploymentService(
 
   def processCommand[Result](command: ScenarioCommand[Result]): Future[Result] = {
     command match {
-      case command: RunDeploymentCommand          => runDeployment(command)
-      case command: CancelScenarioCommand         => cancelScenario(command)
-      case command: PerformSingleExecutionCommand => processSingleExecution(command)
-      case command: CustomActionCommand           => processCustomAction(command)
+      case command: RunDeploymentCommand  => runDeployment(command)
+      case command: CancelScenarioCommand => cancelScenario(command)
+      case command: RunOffScheduleCommand => runOffSchedule(command)
+      case command: CustomActionCommand   => processCustomAction(command)
     }
   }
 
@@ -313,7 +313,7 @@ class DeploymentService(
     val fixedActionDefinitions = List(
       CustomActionDefinition(ScenarioActionName.Deploy, Nil, Nil, None),
       CustomActionDefinition(ScenarioActionName.Cancel, Nil, Nil, None),
-      CustomActionDefinition(ScenarioActionName.PerformSingleExecution, Nil, Nil, None)
+      CustomActionDefinition(ScenarioActionName.RunOffSchedule, Nil, Nil, None)
     )
     val actionsDefinedInCustomActions = dispatcher
       .deploymentManagerUnsafe(processingType)
@@ -731,13 +731,13 @@ class DeploymentService(
     Await.result(dbioRunner.run(actionRepository.deleteInProgressActions()), 10 seconds)
   }
 
-  private def processSingleExecution(command: PerformSingleExecutionCommand): Future[SingleExecutionResult] = {
+  private def runOffSchedule(command: RunOffScheduleCommand): Future[RunOffScheduleResult] = {
     processAction(
       command = command,
-      actionName = ScenarioActionName.PerformSingleExecution,
+      actionName = ScenarioActionName.RunOffSchedule,
       actionParams = Map.empty,
       dmCommandCreator = ctx =>
-        DMPerformSingleExecutionCommand(
+        DMRunOffScheduleCommand(
           ctx.latestScenarioDetails.toEngineProcessVersion,
           ctx.latestScenarioDetails.json,
           command.commonData.user.toManagerUser,

designer/server/src/main/scala/pl/touk/nussknacker/ui/process/deployment/ScenarioCommand.scala

@@ -5,7 +5,7 @@ import pl.touk.nussknacker.engine.api.component.NodesDeploymentData
 import pl.touk.nussknacker.engine.api.deployment.DeploymentUpdateStrategy.StateRestoringStrategy
 import pl.touk.nussknacker.engine.api.deployment.ScenarioActionName
 import pl.touk.nussknacker.engine.api.process.ProcessIdWithName
-import pl.touk.nussknacker.engine.deployment.{CustomActionResult, ExternalDeploymentId, SingleExecutionResult}
+import pl.touk.nussknacker.engine.deployment.{CustomActionResult, ExternalDeploymentId, RunOffScheduleResult}
 import pl.touk.nussknacker.ui.security.api.LoggedUser
 
 import scala.concurrent.Future
@@ -34,9 +34,9 @@ case class CustomActionCommand(
     params: Map[String, String],
 ) extends ScenarioCommand[CustomActionResult]
 
-case class PerformSingleExecutionCommand(
+case class RunOffScheduleCommand(
     commonData: CommonCommandData,
-) extends ScenarioCommand[SingleExecutionResult]
+) extends ScenarioCommand[RunOffScheduleResult]
 
 // TODO CancelScenarioCommand will be legacy in some future because it operates on the scenario level instead of deployment level -
 //      we should replace it by command operating on deployment

designer/server/src/main/scala/pl/touk/nussknacker/ui/process/repository/ScenarioActionRepository.scala

@@ -290,7 +290,7 @@ class DbScenarioActionRepository private (
         ScenarioActivityType.ScenarioPaused
       case ScenarioActionName.Rename =>
         ScenarioActivityType.ScenarioNameChanged
-      case ScenarioActionName.PerformSingleExecution =>
+      case ScenarioActionName.RunOffSchedule =>
         ScenarioActivityType.PerformedSingleExecution
       case otherCustomName =>
         ScenarioActivityType.CustomAction(otherCustomName.value)
@@ -518,7 +518,7 @@ class DbScenarioActionRepository private (
       case ScenarioActivityType.OutgoingMigration =>
         None
       case ScenarioActivityType.PerformedSingleExecution =>
-        Some(ScenarioActionName.PerformSingleExecution)
+        Some(ScenarioActionName.RunOffSchedule)
       case ScenarioActivityType.PerformedScheduledExecution =>
         None
       case ScenarioActivityType.AutomaticUpdate =>

designer/server/src/test/scala/db/migration/V1_057__MigrateActionsAndCommentsToScenarioActivities.scala

@@ -229,7 +229,7 @@ class V1_057__MigrateActionsAndCommentsToScenarioActivities
     }
     "migrate custom action 'run now' with comment to scenario_activities table" in {
       testMigratingActionWithComment(
-        scenarioActionName = ScenarioActionName.PerformSingleExecution,
+        scenarioActionName = ScenarioActionName.RunOffSchedule,
         actionComment = Some("Run now: Deployed at the request of business"),
         expectedActivity = (sid, sad, user, date, sv) =>
           ScenarioActivity.PerformedSingleExecution(

docs/MigrationGuide.md

@@ -26,6 +26,8 @@ To see the biggest differences please consult the [changelog](Changelog.md).
             * `def actionTooltips(processStatus: ProcessStatus): Map[ScenarioActionName, String]` - allows to define custom tooltips for actions, if not defined the default is still used
         * modified method:
             * `def statusActions(processStatus: ProcessStatus): List[ScenarioActionName]` - changed argument, to include information about latest and deployed versions
+* [#7347](https://github.com/TouK/nussknacker/pull/7347) All calls to `org.apache.flink.api.common.functions.RichFunction.open(Configuration)`,
+  which is deprecated, were replaced with calls to `org.apache.flink.api.common.functions.RichFunction.open(OpenContext)`
 
 ## In version 1.18.0