Skip to content

Commit b9adcaa

Browse files
committed
Define different set of advanced parameters for redeploy.
1 parent 190cf9c commit b9adcaa

File tree

3 files changed

+28
-4
lines changed

3 files changed

+28
-4
lines changed

designer/client/src/components/modals/DeployWithParametersDialog.tsx

+9-2
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ import { NodeTable } from "../graph/node-modal/NodeDetailsContent/NodeTable";
2121
import { ToggleProcessActionModalData } from "./DeployProcessDialog";
2222
import LoaderSpinner from "../spinner/Spinner";
2323
import { useErrorBoundary } from "react-error-boundary";
24+
import { RootState } from "../../reducers";
25+
import { getProcessState } from "../../reducers/selectors/scenarioState";
2426

2527
function initialNodesData(params: ActionNodeParameters[]): NodesDeploymentData {
2628
return params.reduce(
@@ -44,11 +46,16 @@ export function DeployWithParametersDialog(props: WindowContentProps<WindowKind,
4446
const [parametersDefinition, setParametersDefinition] = useState<ActionNodeParameters[]>([]);
4547
const [parametersValues, setParametersValues] = useState<NodesDeploymentData>({});
4648

49+
const scenarioState = useSelector((state: RootState) => getProcessState(state));
50+
const scenarioStatusesToActiveDeploy = ["RUNNING", "SCHEDULED"];
51+
const isDeploymentActive = scenarioStatusesToActiveDeploy.includes(scenarioState.status.name);
52+
4753
const getActionParameters = useCallback(async () => {
4854
setIsLoading(true);
4955
await HttpService.getActionParameters(processName)
5056
.then((response) => {
51-
const definition = response.data.actionNameToParameters["DEPLOY"] || ([] as ActionNodeParameters[]);
57+
const actionName = response.data.actionNameToParameters["REDEPLOY"] && isDeploymentActive ? "REDEPLOY" : "DEPLOY";
58+
const definition = response.data.actionNameToParameters[actionName] || ([] as ActionNodeParameters[]);
5259
const initialValues = initialNodesData(definition);
5360
setParametersDefinition(definition);
5461
setParametersValues(initialValues);
@@ -59,7 +66,7 @@ export function DeployWithParametersDialog(props: WindowContentProps<WindowKind,
5966
.finally(() => {
6067
setIsLoading(false);
6168
});
62-
}, [processName, showBoundary]);
69+
}, [processName, showBoundary, isDeploymentActive]);
6370

6471
useEffect(() => {
6572
getActionParameters();

designer/client/src/components/toolbars/scenarioDetails/ScenarioLabels.tsx

-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ interface AddLabelProps {
3232
const isValidWidthsArray = (widths: number[]): boolean => widths.every((w) => w >= 0 && w !== undefined);
3333

3434
const findThresholdIndex = (numbers: number[], threshold: number): number => {
35-
console.log(threshold);
3635
let sum = 0;
3736
for (let i = 0; i < numbers.length; i++) {
3837
sum += numbers[i];

engine/flink/kafka-components-utils/src/main/scala/pl/touk/nussknacker/engine/kafka/source/flink/FlinkKafkaSource.scala

+19-1
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,25 @@ class FlinkKafkaSource[T](
106106
label = Some("Offset reset strategy"),
107107
hintText = None
108108
),
109-
)
109+
),
110+
ScenarioActionName("REDEPLOY") -> Map(
111+
OFFSET_RESET_STRATEGY_PARAM_NAME -> ParameterConfig(
112+
defaultValue = Some(OffsetResetStrategy.None.toString),
113+
editor = Some(
114+
FixedValuesWithRadioParameterEditor(
115+
List(
116+
FixedExpressionValue(
117+
OffsetResetStrategy.None.toString,
118+
s"Resume reading where it previously stopped"
119+
),
120+
)
121+
)
122+
),
123+
validators = None,
124+
label = Some("Offset reset strategy"),
125+
hintText = None
126+
),
127+
),
110128
)
111129
}
112130

0 commit comments

Comments
 (0)