Merge branch 'staging' into feature/NU-2009

Author: coutoPL

designer/client/src/actions/actionTypes.ts

@@ -21,7 +21,6 @@ export type ActionTypes =
     | "EDIT_LABELS"
     | "SHOW_METRICS"
     | "UPDATE_TEST_CAPABILITIES"
-    | "UPDATE_TEST_FORM_PARAMETERS"
     | "UPDATE_TEST_TYPE"
     | "DISPLAY_PROCESS"
     | "GET_SCENARIO_ACTIVITIES"

designer/client/src/actions/nk/adhocTesting.ts

@@ -1,8 +1,9 @@
-import HttpService, { SourceWithParametersTest } from "../../http/HttpService";
-import { Expression, NodeValidationError, ScenarioGraph, TypingResult, VariableTypes } from "../../types";
-
 import { debounce } from "lodash";
 
+import type { SourceWithParametersTest } from "../../http/HttpService";
+import HttpService from "../../http/HttpService";
+import type { Expression, NodeValidationError, ScenarioGraph, TypingResult, VariableTypes } from "../../types";
+
 export interface GenericValidationData {
     validationErrors: NodeValidationError[];
     validationPerformed: boolean;
@@ -20,7 +21,10 @@ export interface GenericValidationRequest {
 }
 
 export interface TestAdhocValidationRequest {
-    sourceParameters: SourceWithParametersTest;
+    testData: {
+        type: string;
+        sourceParameters?: SourceWithParametersTest;
+    };
     scenarioGraph: ScenarioGraph;
 }
 

designer/client/src/actions/nk/displayTestResults.ts

@@ -42,7 +42,7 @@ export function testScenarioWithGeneratedData(testSampleSize: string, processNam
         });
         dispatch({ type: "TEST_RESULTS_LOADING" });
 
-        HttpService.testScenarioWithGeneratedData(processName, testSampleSize, scenarioGraph)
+        HttpService.testScenarioWithGeneratedData(processName, +testSampleSize, scenarioGraph)
             .then((response) => dispatch(displayTestResults(response.data)))
             .catch(() => {
                 dispatch({ type: "LOADING_FAILED" });

designer/client/src/actions/nk/process.ts

@@ -50,16 +50,6 @@ export function loadProcessState(processName: ProcessName, processVersionId: num
         );
 }
 
-export function fetchTestFormParameters(processName: ProcessName, scenarioGraph: ScenarioGraph) {
-    return (dispatch) =>
-        HttpService.getTestFormParameters(processName, scenarioGraph).then(({ data }) => {
-            dispatch({
-                type: "UPDATE_TEST_FORM_PARAMETERS",
-                testFormParameters: data,
-            });
-        });
-}
-
 export function displayTestCapabilities(processName: ProcessName, scenarioGraph: ScenarioGraph) {
     return (dispatch) =>
         HttpService.getTestCapabilities(processName, scenarioGraph).then(({ data }) =>

designer/client/src/common/TestResultUtils.ts

@@ -1,6 +1,7 @@
 /* eslint-disable i18next/no-literal-string */
 import { head, uniq, values } from "lodash";
-import { NodeId, UIParameter } from "../types";
+
+import type { NodeId, UIParameter } from "../types";
 
 export interface Variable {
     original?: string;
@@ -29,9 +30,22 @@ interface ExternalInvocationResult {
 }
 
 export interface TestCapabilities {
-    canBeTested: boolean;
-    canGenerateTestData: boolean;
-    canTestWithForm: boolean;
+    testWithParameters: TestWithParametersCapability;
+    testWithGeneratedData: GenericCapability;
+}
+
+export interface TestWithParametersCapability {
+    status: TestCapabilityStatus;
+    sourceParameters?: TestFormParameters[];
+}
+
+export interface GenericCapability {
+    status: TestCapabilityStatus;
+}
+
+export enum TestCapabilityStatus {
+    AVAILABLE = "AVAILABLE",
+    NOT_AVAILABLE = "NOT_AVAILABLE",
 }
 
 export interface TestFormParameters {

designer/client/src/components/modals/AdhocTesting/useAdhocTestingAvailability.tsx

@@ -1,13 +1,15 @@
+import { useEffect, useMemo } from "react";
 import { useDispatch, useSelector } from "react-redux";
+
+import { displayTestCapabilities } from "../../../actions/nk";
+import { TestCapabilityStatus } from "../../../common/TestResultUtils";
 import {
     getProcessName,
     getScenarioGraph,
     getTestCapabilities,
     isLatestProcessVersion,
     isProcessRenamed,
 } from "../../../reducers/selectors/graph";
-import { useEffect, useMemo } from "react";
-import { displayTestCapabilities, fetchTestFormParameters } from "../../../actions/nk";
 
 // TODO: fetch TestCapabilities and TestFormParameters in chain to avoid stupid errors
 export function useAdhocTestingAvailability(disabled: boolean) {
@@ -20,18 +22,13 @@ export function useAdhocTestingAvailability(disabled: boolean) {
     const scenarioGraph = useSelector(getScenarioGraph);
 
     const isAvailable = useMemo(() => {
-        return !disabled && processIsLatestVersion && testCapabilities?.canTestWithForm;
-    }, [disabled, processIsLatestVersion, testCapabilities?.canTestWithForm]);
+        return !disabled && processIsLatestVersion && testCapabilities?.testWithParameters.status == TestCapabilityStatus.AVAILABLE;
+    }, [disabled, processIsLatestVersion, testCapabilities?.testWithParameters.status]);
 
     useEffect(() => {
         if (isRenamed) return;
         dispatch(displayTestCapabilities(scenarioName, scenarioGraph));
     }, [dispatch, isRenamed, scenarioGraph, scenarioName]);
 
-    useEffect(() => {
-        if (isRenamed || !isAvailable) return;
-        dispatch(fetchTestFormParameters(scenarioName, scenarioGraph));
-    }, [dispatch, isRenamed, scenarioName, scenarioGraph, isAvailable]);
-
     return isAvailable;
 }

designer/client/src/components/modals/Testing/TestingForm.tsx

@@ -5,6 +5,7 @@ import React, { useCallback, useMemo, useState } from "react";
 import { Trans, useTranslation } from "react-i18next";
 import { useDispatch, useSelector } from "react-redux";
 
+import { TestCapabilityStatus } from "../../../common/TestResultUtils";
 import { getTestCapabilities, getTestType } from "../../../reducers/selectors/graph";
 import type { WindowKind } from "../../../windowManager";
 import { CustomRadio } from "../../customRadio/CustomRadio";
@@ -35,9 +36,12 @@ export function TestingForm({ testingData, closeDialog }: TestingFormProps): JSX
     const dispatch = useDispatch();
 
     const testCapabilities = useSelector(getTestCapabilities);
-    const testWithParametersIsAvailable = useMemo(() => testCapabilities.canTestWithForm, [testCapabilities]);
+    const testWithParametersIsAvailable = useMemo(
+        () => testCapabilities.testWithParameters.status == TestCapabilityStatus.AVAILABLE,
+        [testCapabilities],
+    );
     const testWithGeneratedDataIsAvailable = useMemo(
-        () => testCapabilities.canGenerateTestData && testCapabilities.canBeTested,
+        () => testCapabilities.testWithGeneratedData.status == TestCapabilityStatus.AVAILABLE,
         [testCapabilities],
     );
 

designer/client/src/components/toolbars/test/buttons/FromFileButton.tsx

@@ -1,11 +1,13 @@
 import React from "react";
 import { useTranslation } from "react-i18next";
 import { useDispatch, useSelector } from "react-redux";
-import { CapabilitiesToolbarButton } from "../../../toolbarComponents/CapabilitiesToolbarButton";
-import { getProcessName, getScenarioGraph, getTestCapabilities } from "../../../../reducers/selectors/graph";
-import Icon from "../../../../assets/img/toolbarButtons/from-file.svg";
-import { ToolbarButtonProps } from "../../types";
+
 import { testProcessFromFile } from "../../../../actions/nk/displayTestResults";
+import Icon from "../../../../assets/img/toolbarButtons/from-file.svg";
+import { TestCapabilityStatus } from "../../../../common/TestResultUtils";
+import { getProcessName, getScenarioGraph, getTestCapabilities } from "../../../../reducers/selectors/graph";
+import { CapabilitiesToolbarButton } from "../../../toolbarComponents/CapabilitiesToolbarButton";
+import type { ToolbarButtonProps } from "../../types";
 
 function FromFileButton(props: ToolbarButtonProps) {
     const dispatch = useDispatch();
@@ -15,7 +17,7 @@ function FromFileButton(props: ToolbarButtonProps) {
     const { disabled, type } = props;
     const { t } = useTranslation();
 
-    const available = !disabled && testCapabilities && testCapabilities.canBeTested;
+    const available = !disabled && testCapabilities && testCapabilities.testWithGeneratedData.status == TestCapabilityStatus.AVAILABLE;
 
     return (
         <CapabilitiesToolbarButton

designer/client/src/components/toolbars/test/buttons/GenerateAndTestButton.tsx

@@ -1,11 +1,13 @@
 import React from "react";
 import { useTranslation } from "react-i18next";
 import { useSelector } from "react-redux";
+
 import Icon from "../../../../assets/img/toolbarButtons/generate-and-test.svg";
+import { TestCapabilityStatus } from "../../../../common/TestResultUtils";
 import { getTestCapabilities, isLatestProcessVersion } from "../../../../reducers/selectors/graph";
 import { useWindows, WindowKind } from "../../../../windowManager";
 import { CapabilitiesToolbarButton } from "../../../toolbarComponents/CapabilitiesToolbarButton";
-import { ToolbarButtonProps } from "../../types";
+import type { ToolbarButtonProps } from "../../types";
 
 type Props = ToolbarButtonProps;
 
@@ -14,7 +16,11 @@ function GenerateAndTestButton(props: Props) {
     const { t } = useTranslation();
     const testCapabilities = useSelector(getTestCapabilities);
     const processIsLatestVersion = useSelector(isLatestProcessVersion);
-    const available = !disabled && processIsLatestVersion && testCapabilities && testCapabilities.canGenerateTestData;
+    const available =
+        !disabled &&
+        processIsLatestVersion &&
+        testCapabilities &&
+        testCapabilities.testWithGeneratedData.status == TestCapabilityStatus.AVAILABLE;
     const { open } = useWindows();
 
     return (

designer/client/src/components/toolbars/test/buttons/GenerateButton.tsx

@@ -1,11 +1,13 @@
 import React from "react";
 import { useTranslation } from "react-i18next";
 import { useSelector } from "react-redux";
+
 import Icon from "../../../../assets/img/toolbarButtons/generate.svg";
+import { TestCapabilityStatus } from "../../../../common/TestResultUtils";
 import { getTestCapabilities, isLatestProcessVersion } from "../../../../reducers/selectors/graph";
 import { useWindows, WindowKind } from "../../../../windowManager";
 import { CapabilitiesToolbarButton } from "../../../toolbarComponents/CapabilitiesToolbarButton";
-import { ToolbarButtonProps } from "../../types";
+import type { ToolbarButtonProps } from "../../types";
 
 type Props = ToolbarButtonProps;
 
@@ -14,7 +16,11 @@ function GenerateButton(props: Props) {
     const { t } = useTranslation();
     const testCapabilities = useSelector(getTestCapabilities);
     const processIsLatestVersion = useSelector(isLatestProcessVersion);
-    const available = !disabled && processIsLatestVersion && testCapabilities && testCapabilities.canGenerateTestData;
+    const available =
+        !disabled &&
+        processIsLatestVersion &&
+        testCapabilities &&
+        testCapabilities.testWithGeneratedData.status == TestCapabilityStatus.AVAILABLE;
     const { open } = useWindows();
 
     return (