Merge pull request #2858 from WISE-Community/issue-2856-constraint-without-removal-criteria-name-bug

hirokiterashima · web-flow · commit ac19905f9936 · 2021-01-05T14:44:35.000-08:00
Constraint without Removal Criteria Name breaks preview project
diff --git a/src/main/webapp/wise5/services/studentDataService.ts b/src/main/webapp/wise5/services/studentDataService.ts
@@ -457,8 +457,12 @@ export class StudentDataService extends DataService {
     return true;
   }
 
-  evaluateCriteria(criteria) {
-    return this.criteriaFunctionNameToFunction[criteria.name](criteria);
+  evaluateCriteria(criteria: any): boolean {
+    const criteriaFunction = this.criteriaFunctionNameToFunction[criteria.name];
+    if (criteriaFunction == null) {
+      return true;
+    }
+    return criteriaFunction(criteria);
   }
 
   evaluateIsCompletedCriteria(criteria) {

Original file line number	Diff line number	Diff line change
`@@ -457,8 +457,12 @@ export class StudentDataService extends DataService {`
`457`	`457`	`return true;`
`458`	`458`	`}`
`459`	`459`
`460`		`- evaluateCriteria(criteria) {`
`461`		`- return this.criteriaFunctionNameToFunction[criteria.name](criteria);`
	`460`	`+ evaluateCriteria(criteria: any): boolean {`
	`461`	`+ const criteriaFunction = this.criteriaFunctionNameToFunction[criteria.name];`
	`462`	`+ if (criteriaFunction == null) {`
	`463`	`+ return true;`
	`464`	`+ }`
	`465`	`+ return criteriaFunction(criteria);`
`462`	`466`	`}`
`463`	`467`
`464`	`468`	`evaluateIsCompletedCriteria(criteria) {`