Single-Select Matrix - The required validation error appears immediat…

…ely when changing a single row value fix #8727 (#8787)
surveyjs · Sep 9, 2024 · fe2e114 · fe2e114
1 parent 67c37bf
commit fe2e114
Show file tree

Hide file tree

Showing 9 changed files with 46 additions and 39 deletions.
diff --git a/packages/survey-core/src/question.ts b/packages/survey-core/src/question.ts
@@ -2145,7 +2145,7 @@ export class Question extends SurveyElement<Question>
  return json;
  }
  public hasErrors(fireCallback: boolean = true, rec: any = null): boolean {
- const errors = this.checkForErrors(!!rec && rec.isOnValueChanged === true);
+ const errors = this.checkForErrors(!!rec && rec.isOnValueChanged === true, fireCallback);
  if (fireCallback) {
  if (!!this.survey) {
  this.survey.beforeSettingQuestionErrors(this, errors);
@@ -2206,21 +2206,18 @@ export class Question extends SurveyElement<Question>
  var index = errors.indexOf(error);
  if (index !== -1) errors.splice(index, 1);
  }
- private checkForErrors(isOnValueChanged: boolean): Array<SurveyError> {
+ private checkForErrors(isOnValueChanged: boolean, fireCallback: boolean): Array<SurveyError> {
  var qErrors = new Array<SurveyError>();
  if (this.isVisible && this.canCollectErrors()) {
- this.collectErrors(qErrors, isOnValueChanged);
+ this.collectErrors(qErrors, isOnValueChanged, fireCallback);
  }
  return qErrors;
  }
  protected canCollectErrors(): boolean {
  return !this.isReadOnly || settings.readOnly.enableValidation;
  }
- private collectErrors(
- qErrors: Array<SurveyError>,
- isOnValueChanged: boolean
- ) {
- this.onCheckForErrors(qErrors, isOnValueChanged);
+ private collectErrors(qErrors: Array<SurveyError>, isOnValueChanged: boolean, fireCallback: boolean): void {
+ this.onCheckForErrors(qErrors, isOnValueChanged, fireCallback);
  if (qErrors.length > 0 || !this.canRunValidators(isOnValueChanged)) return;
  var errors = this.runValidators();
  if (errors.length > 0) {
@@ -2244,7 +2241,7 @@ export class Question extends SurveyElement<Question>
  if (this.validateValueCallback) return this.validateValueCallback();
  return this.survey ? this.survey.validateQuestion(this) : null;
  }
- protected onCheckForErrors(errors: Array<SurveyError>, isOnValueChanged: boolean): void {
+ protected onCheckForErrors(errors: Array<SurveyError>, isOnValueChanged: boolean, fireCallback: boolean): void {
  if ((!isOnValueChanged || this.isOldAnswered) && this.hasRequiredError()) {
  const err = new AnswerRequiredError(this.requiredErrorText, this);
  err.onUpdateErrorTextCallback = (err) => { err.text = this.requiredErrorText; };

diff --git a/packages/survey-core/src/question_baseselect.ts b/packages/survey-core/src/question_baseselect.ts
@@ -1355,18 +1355,15 @@ export class QuestionSelectBase extends Question {
  this.getPropertyByName(propName).visible
  );
  }
- protected onCheckForErrors(
- errors: Array<SurveyError>,
- isOnValueChanged: boolean
- ) {
- super.onCheckForErrors(errors, isOnValueChanged);
+ protected onCheckForErrors(errors: Array<SurveyError>, isOnValueChanged: boolean, fireCallback: boolean): void {
+ super.onCheckForErrors(errors, isOnValueChanged, fireCallback);
  if (!this.hasOther || !this.isOtherSelected || this.otherValue
  || isOnValueChanged && !this.prevOtherErrorValue) return;
  const otherEmptyError = new OtherEmptyError(this.otherErrorText, this);
  otherEmptyError.onUpdateErrorTextCallback = err => { err.text = this.otherErrorText; };
  errors.push(otherEmptyError);
  }
- public setSurveyImpl(value: ISurveyImpl, isLight?: boolean) {
+ public setSurveyImpl(value: ISurveyImpl, isLight?: boolean): void {
  this.isRunningChoices = true;
  super.setSurveyImpl(value, isLight);
  this.isRunningChoices = false;
@@ -1375,7 +1372,7 @@ export class QuestionSelectBase extends Question {
  this.updateVisibleChoices();
  }
  }
- protected setSurveyCore(value: ISurvey) {
+ protected setSurveyCore(value: ISurvey): void {
  super.setSurveyCore(value);
  if (!!value && !!this.choicesFromQuestion) {
  this.onVisibleChoicesChanged();

diff --git a/packages/survey-core/src/question_checkbox.ts b/packages/survey-core/src/question_checkbox.ts
@@ -279,11 +279,8 @@ export class QuestionCheckboxModel extends QuestionCheckboxBase {
  return val.map((item: any) => this.createItemValue(item));
  }
  protected getAnswerCorrectIgnoreOrder(): boolean { return true; }
- protected onCheckForErrors(
- errors: Array<SurveyError>,
- isOnValueChanged: boolean
- ): void {
- super.onCheckForErrors(errors, isOnValueChanged);
+ protected onCheckForErrors(errors: Array<SurveyError>, isOnValueChanged: boolean, fireCallback: boolean): void {
+ super.onCheckForErrors(errors, isOnValueChanged, fireCallback);
  if (isOnValueChanged) return;
 
  if (this.minSelectedChoices > 0 && this.checkMinSelectedChoicesUnreached()) {

diff --git a/packages/survey-core/src/question_custom.ts b/packages/survey-core/src/question_custom.ts
@@ -642,8 +642,8 @@ export abstract class QuestionCustomModelBase extends Question
  super.setNewValue(newValue);
  this.updateElementCss();
  }
- protected onCheckForErrors(errors: Array<SurveyError>, isOnValueChanged: boolean): void {
- super.onCheckForErrors(errors, isOnValueChanged);
+ protected onCheckForErrors(errors: Array<SurveyError>, isOnValueChanged: boolean, fireCallback: boolean): void {
+ super.onCheckForErrors(errors, isOnValueChanged, fireCallback);
  if (!!this.customQuestion) {
  const text = this.customQuestion.onGetErrorText(this);
  if(!!text) {

diff --git a/packages/survey-core/src/question_file.ts b/packages/survey-core/src/question_file.ts
@@ -94,12 +94,8 @@ export class QuestionFileModelBase extends Question {
  if (!this.survey) return;
  this.survey.clearFiles(this, this.name, this.value, null, () => { });
  }
-
- protected onCheckForErrors(
- errors: Array<SurveyError>,
- isOnValueChanged: boolean
- ) {
- super.onCheckForErrors(errors, isOnValueChanged);
+ protected onCheckForErrors(errors: Array<SurveyError>, isOnValueChanged: boolean, fireCallback: boolean): void {
+ super.onCheckForErrors(errors, isOnValueChanged, fireCallback);
  if (this.isUploading && this.waitForUpload) {
  errors.push(
  new UploadingFileError(

diff --git a/packages/survey-core/src/question_matrix.ts b/packages/survey-core/src/question_matrix.ts
@@ -474,11 +474,11 @@ export class QuestionMatrixModel
  return this.isMouseDown === true && this.hasValuesInAllRows();
  }
  private errorsInRow: HashTable<boolean>;
- protected onCheckForErrors(errors: Array<SurveyError>, isOnValueChanged: boolean): void {
- super.onCheckForErrors(errors, isOnValueChanged);
+ protected onCheckForErrors(errors: Array<SurveyError>, isOnValueChanged: boolean, fireCallback: boolean): void {
+ super.onCheckForErrors(errors, isOnValueChanged, fireCallback);
  if (!isOnValueChanged || this.hasCssError()) {
  const rowsErrors = { noValue: false, isNotUnique: false };
- this.checkErrorsAllRows(true, rowsErrors);
+ this.checkErrorsAllRows(fireCallback, rowsErrors);
  if(rowsErrors.noValue) {
  errors.push(new RequiredInAllRowsError(null, this));
  }

diff --git a/packages/survey-core/src/question_matrixdynamic.ts b/packages/survey-core/src/question_matrixdynamic.ts
@@ -735,11 +735,8 @@ export class QuestionMatrixDynamicModel extends QuestionMatrixDropdownModelBase
  public get hasRowText(): boolean {
  return false;
  }
- protected onCheckForErrors(
- errors: Array<SurveyError>,
- isOnValueChanged: boolean
- ) {
- super.onCheckForErrors(errors, isOnValueChanged);
+ protected onCheckForErrors(errors: Array<SurveyError>, isOnValueChanged: boolean, fireCallback: boolean): void {
+ super.onCheckForErrors(errors, isOnValueChanged, fireCallback);
  if (!isOnValueChanged && this.hasErrorInMinRows()) {
  errors.push(new MinRowCountError(this.minRowCount, this));
  }

diff --git a/packages/survey-core/src/question_text.ts b/packages/survey-core/src/question_text.ts
@@ -374,8 +374,8 @@ export class QuestionTextModel extends QuestionTextBase {
  return super.valueFromDataCore(val);
  }
  private dateValidationMessage: string;
- protected onCheckForErrors(errors: Array<SurveyError>, isOnValueChanged: boolean): void {
- super.onCheckForErrors(errors, isOnValueChanged);
+ protected onCheckForErrors(errors: Array<SurveyError>, isOnValueChanged: boolean, fireCallback: boolean): void {
+ super.onCheckForErrors(errors, isOnValueChanged, fireCallback);
  if (isOnValueChanged) return;
  if (this.isValueLessMin) {
  const minError = new CustomError(

diff --git a/packages/survey-core/tests/question_matrix_tests.ts b/packages/survey-core/tests/question_matrix_tests.ts
@@ -380,6 +380,29 @@ QUnit.test("matrix isAllRowRequired & getItemClass", function (assert) {
  assert.equal(question.getItemClass(row, column1).indexOf(itemError) > -1, false, "itemError doesn't exist in column 1, #3");
  assert.equal(question.getItemClass(row, column2).indexOf(itemError) > -1, false, "itemError doesn't exist in column 2, #3");
 });
+QUnit.test("matrix isAllRowRequired & getItemClass", function (assert) {
+ const survey = new SurveyModel({
+ elements: [
+ {
+ type: "matrix",
+ name: "q1",
+ columns: ["col1", "col2"],
+ rows: ["row1", "row2"],
+ isAllRowRequired: true
+ },
+ ],
+ triggers: [{ type: "complete", expression: "{q2} = 1" }]
+ });
+ const itemError = "required_row_error";
+ survey.css = { matrix: { row: "row", rowError: "row_error", itemOnError: itemError } };
+ const question = <QuestionMatrixModel>survey.getQuestionByName("q1");
+ const column1 = question.columns[0];
+ const column2 = question.columns[1];
+ question.visibleRows[0].cellClick(column1);
+ let row = question.visibleRows[1];
+ assert.equal(question.getItemClass(row, column1).indexOf(itemError) > -1, false, "itemError doesn't exist in column 1, #1");
+ assert.equal(question.getItemClass(row, column2).indexOf(itemError) > -1, false, "itemError doesn't exist in column 2, #1");
+});
 QUnit.test("hideIfRowsEmpty & question visibleIf, bug#8459", function (assert) {
  const survey = new SurveyModel({
  elements: [{ type: "matrix", name: "q1", visibleIf: "{a}=1", hideIfRowsEmpty: true, rows: [{ value: "row1", visibleIf: "{b}=2" }] }],