Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages/form/addon/components/document-validity.hbs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{{#if @validateOnEnter}}
<div {{in-viewport onEnter=this.validate}}>
{{yield this.isValid this.validate}}
{{yield this.isValid this.validate this.isValidating}}
</div>
{{else}}
{{yield this.isValid this.validate}}
{{yield this.isValid this.validate this.isValidating}}
{{/if}}
21 changes: 13 additions & 8 deletions packages/form/addon/components/document-validity.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { action } from "@ember/object";
import Component from "@glimmer/component";
import { restartableTask } from "ember-concurrency";
import { task } from "ember-concurrency";
import { cached } from "tracked-toolbox";

/**
Expand Down Expand Up @@ -39,8 +39,11 @@ export default class DocumentValidity extends Component {
.every((f) => f.isValid);
}

@restartableTask
*_validate() {
get isValidating() {
return this._validate.isRunning;
}

_validate = task({ restartable: true }, async () => {
const saveTasks = this.args.document.fields
.flatMap((field) => [
...[...(field._components ?? [])].map((c) => c.save.last),
Expand All @@ -50,11 +53,13 @@ export default class DocumentValidity extends Component {

// Wait until all currently running save tasks in the UI and in the field
// itself are finished
yield Promise.all(saveTasks);
await Promise.all(saveTasks);

for (const field of this.args.document.fields) {
yield field.validate.linked().perform();
}
await Promise.all(
this.args.document.fields.map(
async (field) => await field.validate.linked().perform(),
),
);

if (this.isValid) {
this.args.onValid?.();
Expand All @@ -63,7 +68,7 @@ export default class DocumentValidity extends Component {
}

return this.isValid;
}
});

@action
validate() {
Expand Down
Loading