Skip to content

Commit b867ced

Browse files
author
Blueshift Staff
committed
Synced from the Blueshift Repository
1 parent ad37ca3 commit b867ced

File tree

9 files changed

+0
-255
lines changed

9 files changed

+0
-255
lines changed
Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,12 @@
1-
import { EMetadataType } from '../../typings/enums'
21
import { IGridCellCoordinates, IGridValueValidationResult } from '../../typings/interfaces'
32
import { ICellOperationFactory } from '../../typings/interfaces/grid-cell-operation-factory.interface'
4-
import { ColumnValidatorMap } from '../../ui/cell/cell-types/value-validation/column-validators/column-validator.map'
53
import { ValueValidator } from '../../ui/cell/cell-types/value-validation/value-validator'
6-
import { DistinctValues } from '../../utils/distinct-values'
7-
import { BufferOperation } from '../buffer-operation'
84
import { Operation } from '../operation.abstract'
95

106
export class ValidateCell extends Operation {
117

128
constructor(factory: ICellOperationFactory) { super(factory.gridController) }
139

14-
public bufferColumnValidation = new BufferOperation((args: string[][]) => this._columnValidation(args))
15-
1610
public run(cellCoordinates: IGridCellCoordinates): IGridValueValidationResult[] {
1711

1812
const cellValue = this.cellOperations.GetCellValue.run(cellCoordinates)
@@ -27,21 +21,6 @@ export class ValidateCell extends Operation {
2721

2822
if (cellValue) cellValue.validationState = nextState
2923
if (!nextIsValid || nextIsValid != previousIsValid) this.gridEvents.CellValidationStateChangedEvent.emit(nextState)
30-
this.bufferColumnValidation.next([cellCoordinates.columnKey])
3124
return validationResults
3225
}
33-
34-
private async _columnValidation(args: string[][]) {
35-
for (const columnKey of DistinctValues(args.map(a => a[0]))) {
36-
const column = this.dataSource.getColumn(columnKey)
37-
for (const metaDataType of column?.metadata.getAllMetaTypes() ?? []) {
38-
const columnValidators = ColumnValidatorMap[EMetadataType[metaDataType] as keyof typeof EMetadataType]
39-
if (columnValidators) {
40-
for (const validator of columnValidators) {
41-
new validator(this.controller, columnKey).run()
42-
}
43-
}
44-
}
45-
}
46-
}
4726
}

projects/ngx-grid-core/src/lib/controller/grid-controller.service.ts

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -159,22 +159,6 @@ export class GridControllerService {
159159
if (component) this.cell.SetCellStylesFromMeta.run(component)
160160
}))
161161

162-
// Listen to events to re-run column validators
163-
addSubscription(
164-
combineLatest([
165-
gridEvents.RowStatusChangedEvent.onChanges().pipe(startWith([undefined, undefined] as const)),
166-
gridEvents.RowsRevertedEvent.on().pipe(startWith<TPrimaryKey[]>([]))
167-
])
168-
.subscribe(event => {
169-
const [ statusChangeEvent, revertedEvent ] = event
170-
const [prev, next] = statusChangeEvent
171-
if ([...(prev??[]).map(m => m.status), ...(next??[]).map(m => m.status)].includes(ERowStatus.Deleted) || revertedEvent.length) {
172-
for (const col of this.dataSource.columns) {
173-
this.cell.ValidateCell.bufferColumnValidation.next([col.columnKey])
174-
}
175-
}
176-
}))
177-
178162
// React to metadata changes
179163
addSubscription(gridEvents.MetadataChangedEvent.on().subscribe(change => {
180164
let affectedCellComponents = new Set<IGridCellComponent>()

projects/ngx-grid-core/src/lib/typings/enums/metadata-type.enum.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ export enum EMetadataType {
66
MinWidth,
77
IsRequired,
88
MaxLength,
9-
IsUnique,
10-
ExactlyOneRecordWithValue,
119
Style,
1210
RecordPreviewTemplateString,
1311
ForeignEntityName,
Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
export enum EValidatorType {
22
CellValidator,
3-
ColumnValidator,
43
RowValidator
54
}

projects/ngx-grid-core/src/lib/ui/cell/cell-types/value-validation/column-validators/base-column-validator.abstract.ts

Lines changed: 0 additions & 58 deletions
This file was deleted.

projects/ngx-grid-core/src/lib/ui/cell/cell-types/value-validation/column-validators/column-validator.map.ts

Lines changed: 0 additions & 10 deletions
This file was deleted.

projects/ngx-grid-core/src/lib/ui/cell/cell-types/value-validation/column-validators/exactly-one-record-with-value.column-validator.ts

Lines changed: 0 additions & 85 deletions
This file was deleted.

projects/ngx-grid-core/src/lib/ui/cell/cell-types/value-validation/column-validators/index.ts

Lines changed: 0 additions & 2 deletions
This file was deleted.

projects/ngx-grid-core/src/lib/ui/cell/cell-types/value-validation/column-validators/is-unique.column-validator.ts

Lines changed: 0 additions & 60 deletions
This file was deleted.

0 commit comments

Comments
 (0)