Skip to content

Commit b327603

Browse files
committed
feat: add hybrid testing support with mini testing module selection
1 parent 605586c commit b327603

File tree

3 files changed

+24
-3
lines changed

3 files changed

+24
-3
lines changed

apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/observe/api_collections/RunTest.jsx

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -693,6 +693,8 @@ function RunTest({ endpoints, filtered, apiCollectionId, disabled, runTestFromOu
693693
generateLabelForSlackIntegration={generateLabelForSlackIntegration}
694694
generateLabelForTeamsIntegration={generateLabelForTeamsIntegration}
695695
getLabel={getLabel}
696+
isHybridTestingEnabled={isHybridTestingEnabled}
697+
miniTestingServiceNames={miniTestingServiceNames}
696698
/>
697699
<AdvancedSettingsComponent dispatchConditions={dispatchConditions} conditions={conditions} />
698700
</>
@@ -867,6 +869,8 @@ function RunTest({ endpoints, filtered, apiCollectionId, disabled, runTestFromOu
867869
generateLabelForSlackIntegration={generateLabelForSlackIntegration}
868870
generateLabelForTeamsIntegration={generateLabelForTeamsIntegration}
869871
getLabel={getLabel}
872+
isHybridTestingEnabled={isHybridTestingEnabled}
873+
miniTestingServiceNames={miniTestingServiceNames}
870874
/>
871875

872876
</VerticalStack>
@@ -897,6 +901,8 @@ function RunTest({ endpoints, filtered, apiCollectionId, disabled, runTestFromOu
897901
generateLabelForSlackIntegration={generateLabelForSlackIntegration}
898902
generateLabelForTeamsIntegration={generateLabelForTeamsIntegration}
899903
getLabel={getLabel}
904+
isHybridTestingEnabled={isHybridTestingEnabled}
905+
miniTestingServiceNames={miniTestingServiceNames}
900906
/>
901907
<AdvancedSettingsComponent dispatchConditions={dispatchConditions} conditions={conditions} />
902908
</>

apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/observe/api_collections/RunTestConfiguration.jsx

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { VerticalStack, HorizontalGrid, Checkbox, TextField, Text } from '@shopi
33
import Dropdown from "../../../components/layouts/Dropdown";
44
import func from "@/util/func"
55

6-
const RunTestConfiguration = ({ testRun, setTestRun, runTypeOptions, hourlyTimes, testRunTimeOptions, testRolesArr, maxConcurrentRequestsOptions, slackIntegrated, generateLabelForSlackIntegration,getLabel, timeFieldsDisabled, teamsTestingWebhookIntegrated, generateLabelForTeamsIntegration}) => {
6+
const RunTestConfiguration = ({ testRun, setTestRun, runTypeOptions, hourlyTimes, testRunTimeOptions, testRolesArr, maxConcurrentRequestsOptions, slackIntegrated, generateLabelForSlackIntegration,getLabel, timeFieldsDisabled, teamsTestingWebhookIntegrated, generateLabelForTeamsIntegration, isHybridTestingEnabled, miniTestingServiceNames}) => {
77
return (
88
<VerticalStack gap={"4"}>
99
<HorizontalGrid gap={"4"} columns={"3"}>
@@ -104,6 +104,21 @@ const RunTestConfiguration = ({ testRun, setTestRun, runTypeOptions, hourlyTimes
104104
}} />
105105
</div>
106106
</HorizontalGrid>
107+
{
108+
isHybridTestingEnabled && miniTestingServiceNames?.length > 0 ?
109+
<Dropdown
110+
label="Select Testing Module"
111+
menuItems={miniTestingServiceNames}
112+
initial={miniTestingServiceNames?.[0]?.value}
113+
selected={(requests) => {
114+
const miniTestingServiceNameOption = getLabel(miniTestingServiceNames, requests)
115+
setTestRun(prev => ({
116+
...prev,
117+
miniTestingServiceName: miniTestingServiceNameOption.value
118+
}))
119+
}}
120+
/> : <></>
121+
}
107122
<Checkbox
108123
label={slackIntegrated ? "Send slack alert post test completion" : generateLabelForSlackIntegration()}
109124
checked={testRun.sendSlackAlert}

libs/dao/src/main/java/com/akto/dto/testing/TestingRun.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,8 @@ public TestingRun(int scheduleTimestamp, String userEmail, TestingEndpoints test
7373
this.isNewTestRun = true;
7474
}
7575

76-
public TestingRun(int scheduleTimestamp, String userEmail, TestingEndpoints testingEndpoints, int testIdConfig, State state, int periodInSeconds, String name, int testRunTime, int maxConcurrentRequests, boolean sendSlackAlert) {
77-
this(scheduleTimestamp, userEmail,testingEndpoints,testIdConfig, state, periodInSeconds, name, testRunTime, maxConcurrentRequests, sendSlackAlert, false);
76+
public TestingRun(int scheduleTimestamp, String userEmail, TestingEndpoints testingEndpoints, int testIdConfig, State state, int periodInSeconds, String name, int testRunTime, int maxConcurrentRequests, boolean sendSlackAlert, String miniTestingServiceName) {
77+
this(scheduleTimestamp, userEmail,testingEndpoints,testIdConfig, state, periodInSeconds, name, testRunTime, maxConcurrentRequests, sendSlackAlert, false, miniTestingServiceName);
7878
}
7979

8080
public TestingRun(int scheduleTimestamp, String userEmail, TestingEndpoints testingEndpoints, int testIdConfig, State state, int periodInSeconds, String name, int testRunTime, int maxConcurrentRequests, boolean sendSlackAlert, boolean sendMsTeamsAlert, String miniTestingServiceName) {

0 commit comments

Comments
 (0)