Skip to content

Commit 6178684

Browse files
read remediation from template
1 parent e8518d8 commit 6178684

File tree

3 files changed

+12
-7
lines changed

3 files changed

+12
-7
lines changed

apps/dashboard/src/main/java/com/akto/action/testing/TestTemplatesAction.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,10 @@ public String fetchRemediationInfo() {
2525
Remediation remediationObj = RemediationsDao.instance.findOne(Constants.ID, testId);
2626

2727
if (remediationObj == null) {
28-
addActionError("remediation missing from db for testId: " + testId);
29-
return ERROR.toUpperCase();
28+
this.remediation = "";
29+
} else {
30+
this.remediation = remediationObj.getRemediationText();
3031
}
31-
32-
this.remediation = remediationObj.getRemediationText();
3332

3433
return SUCCESS.toUpperCase();
3534
}

apps/dashboard/src/main/java/com/akto/action/testing_issues/IssuesAction.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
import com.mongodb.client.result.InsertOneResult;
4444
import com.opensymphony.xwork2.Action;
4545

46+
import org.apache.commons.lang3.StringUtils;
4647
import org.bson.Document;
4748
import org.bson.conversions.Bson;
4849
import org.bson.types.ObjectId;
@@ -463,8 +464,11 @@ public static BasicDBObject createSubcategoriesInfoObj(TestConfig testConfig) {
463464
infoObj.put("content", testConfig.getContent());
464465
infoObj.put("templateSource", testConfig.getTemplateSource());
465466

466-
467-
infoObj.put("remediation", testConfig.getAuthor().equalsIgnoreCase(Constants._AKTO));
467+
String remediationContent = info.getRemediation();
468+
469+
if (!StringUtils.isEmpty(remediationContent)) {
470+
infoObj.put("remediation", remediationContent);
471+
}
468472

469473

470474
infoObj.put("updatedTs", testConfig.getUpdateTs());

apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/testing/TestRunResultPage/TestRunResultFlyout.jsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,10 @@ function TestRunResultFlyout(props) {
7878
},[issueDetails?.id?.apiInfoKey])
7979

8080
useEffect(() => {
81-
if (remediationSrc) {
81+
if (!remediationSrc) {
8282
fetchRemediationInfo("tests-library-master/remediation/"+selectedTestRunResult.testCategoryId+".md")
83+
} else {
84+
setRemediationText(remediationSrc)
8385
}
8486
}, [selectedTestRunResult.testCategoryId, remediationSrc])
8587

0 commit comments

Comments
 (0)