Skip to content
Merged
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
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { Guid } from '@ts/core/m_guid';
import { Deferred } from '@ts/core/utils/m_deferred';
import { extend } from '@ts/core/utils/m_extend';
import { each, map } from '@ts/core/utils/m_iterator';
import ValidationEngine from '@ts/ui/m_validation_engine';
import ValidationEngine from '@ts/ui/validation_engine';
// eslint-disable-next-line import/no-extraneous-dependencies
import ko from 'knockout';

Expand Down Expand Up @@ -50,19 +50,17 @@ if (ko) {
validate() {
const currentResult = this._validationInfo?.result;
const value = this.target();
if (currentResult
&& currentResult.status === VALIDATION_STATUS_PENDING
if (currentResult?.status === VALIDATION_STATUS_PENDING
&& currentResult.value === value
) {
// eslint-disable-next-line @typescript-eslint/no-unsafe-return
return extend({}, currentResult);
}
const result = ValidationEngine.validate(value, this.validationRules, this.name);
// @ts-expect-error
result.id = new Guid().toString();
this._applyValidationResult(result);
// @ts-expect-error
result.complete?.then((res) => {
// eslint-disable-next-line @typescript-eslint/no-floating-promises
result?.complete?.then((res) => {
if (res.id === this._validationInfo.result.id) {
this._applyValidationResult(res);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import {
import type Form from '@ts/ui/form/form';
import type LayoutManager from '@ts/ui/form/form.layout_manager';
import type { FieldItemOptions } from '@ts/ui/form/form.layout_manager.utils';
import Validator from '@ts/ui/m_validator';
import Validator from '@ts/ui/validator';

export const FLEX_LAYOUT_CLASS = 'dx-flex-layout';
export const FIELD_ITEM_OPTIONAL_CLASS = 'dx-field-item-optional';
Expand Down
4 changes: 2 additions & 2 deletions packages/devextreme/js/__internal/ui/form/form.ts
Original file line number Diff line number Diff line change
Expand Up @@ -103,14 +103,14 @@ import {
} from '@ts/ui/form/form.utils';
import type { LoadPanelProperties } from '@ts/ui/load_panel';
import LoadPanel from '@ts/ui/load_panel';
import ValidationEngine from '@ts/ui/m_validation_engine';
import ValidationSummary from '@ts/ui/m_validation_summary';
import type { ScreenSizeQualifier } from '@ts/ui/responsive_box';
import Scrollable from '@ts/ui/scroll_view/scrollable';
import type { TabPanelProperties } from '@ts/ui/tab_panel/tab_panel';
import TabPanel from '@ts/ui/tab_panel/tab_panel';
import { TEXTEDITOR_CLASS, TEXTEDITOR_INPUT_CLASS } from '@ts/ui/text_box/text_editor.base';
import { TOOLBAR_CLASS } from '@ts/ui/toolbar/constants';
import ValidationEngine from '@ts/ui/validation_engine';
import ValidationSummary from '@ts/ui/validation_summary';

export type FormAICommandName = 'smartPaste';
export interface AICommandParamsMap {
Expand Down
Loading
Loading