@ni/nimble-components 17.0.5 → 17.0.7
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/all-components-bundle.js +85 -57
- package/dist/all-components-bundle.js.map +1 -1
- package/dist/all-components-bundle.min.js +224 -226
- package/dist/all-components-bundle.min.js.map +1 -1
- package/dist/esm/table/components/row/index.d.ts +1 -0
- package/dist/esm/table/components/row/index.js +4 -1
- package/dist/esm/table/components/row/index.js.map +1 -1
- package/dist/esm/table/index.js +12 -15
- package/dist/esm/table/index.js.map +1 -1
- package/dist/esm/table/models/table-validator.d.ts +4 -4
- package/dist/esm/table/models/table-validator.js +18 -16
- package/dist/esm/table/models/table-validator.js.map +1 -1
- package/dist/esm/table/models/table-validator.spec.js +57 -57
- package/dist/esm/table/models/table-validator.spec.js.map +1 -1
- package/dist/esm/table/template.js +1 -0
- package/dist/esm/table/template.js.map +1 -1
- package/dist/esm/table/types.d.ts +4 -3
- package/dist/esm/wafer-map/modules/rendering.d.ts +7 -2
- package/dist/esm/wafer-map/modules/rendering.js +45 -13
- package/dist/esm/wafer-map/modules/rendering.js.map +1 -1
- package/dist/esm/wafer-map/modules/zoom-handler.js +3 -3
- package/dist/esm/wafer-map/modules/zoom-handler.js.map +1 -1
- package/dist/esm/wafer-map/styles.js +1 -8
- package/dist/esm/wafer-map/styles.js.map +1 -1
- package/dist/esm/wafer-map/template.js +2 -2
- package/package.json +1 -1
|
@@ -11,6 +11,7 @@ declare global {
|
|
|
11
11
|
* @internal
|
|
12
12
|
*/
|
|
13
13
|
export declare class TableRow<TDataRecord extends TableDataRecord = TableDataRecord> extends FoundationElement {
|
|
14
|
+
recordId?: string;
|
|
14
15
|
dataRecord?: TDataRecord;
|
|
15
16
|
columns: TableColumn[];
|
|
16
17
|
getCellState(column: TableColumn): TableCellState;
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { __decorate } from "tslib";
|
|
2
|
-
import { observable } from '@microsoft/fast-element';
|
|
2
|
+
import { attr, observable } from '@microsoft/fast-element';
|
|
3
3
|
import { DesignSystem, FoundationElement } from '@microsoft/fast-foundation';
|
|
4
4
|
import { styles } from './styles';
|
|
5
5
|
import { template } from './template';
|
|
@@ -33,6 +33,9 @@ export class TableRow extends FoundationElement {
|
|
|
33
33
|
return keys.every(key => key !== undefined);
|
|
34
34
|
}
|
|
35
35
|
}
|
|
36
|
+
__decorate([
|
|
37
|
+
attr({ attribute: 'record-id' })
|
|
38
|
+
], TableRow.prototype, "recordId", void 0);
|
|
36
39
|
__decorate([
|
|
37
40
|
observable
|
|
38
41
|
], TableRow.prototype, "dataRecord", void 0);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/table/components/row/index.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/table/components/row/index.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAC7E,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AActC;;;GAGG;AACH,MAAM,OAAO,QAEX,SAAQ,iBAAiB;IAF3B;;QAUW,YAAO,GAAkB,EAAE,CAAC;IA8BvC,CAAC;IA5BU,YAAY,CAAC,MAAmB;QACnC,MAAM,UAAU,GAAG,MAAM,CAAC,uBAAuB,EAAE,CAAC;QACpD,IAAI,IAAI,CAAC,kBAAkB,CAAC,UAAU,CAAC,IAAI,IAAI,CAAC,UAAU,EAAE;YACxD,MAAM,cAAc,GAAG,UAAU,CAAC,GAAG,CACjC,KAAK,CAAC,EAAE,CAAC,IAAI,CAAC,UAAW,CAAC,KAAK,CAAC,CACnC,CAAC;YACF,MAAM,UAAU,GAAG,MAAM,CAAC,WAAW,CACjC,MAAM,CAAC,oBAAoB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;gBACtC,CAAC;gBACD,cAAc,CAAC,CAAC,CAAC;aACpB,CAAC,CACL,CAAC;YACF,MAAM,YAAY,GAAG,MAAM,CAAC,eAAe,EAAE,EAAE,IAAI,EAAE,CAAC;YACtD,MAAM,SAAS,GAAmB;gBAC9B,UAAU;gBACV,YAAY;aACf,CAAC;YACF,OAAO,SAAS,CAAC;SACpB;QAED,OAAO,EAAE,UAAU,EAAE,EAAE,EAAE,YAAY,EAAE,EAAE,EAAE,CAAC;IAChD,CAAC;IAEO,kBAAkB,CACtB,IAAoC;QAEpC,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,SAAS,CAAC,CAAC;IAChD,CAAC;CACJ;AApCG;IADC,IAAI,CAAC,EAAE,SAAS,EAAE,WAAW,EAAE,CAAC;0CACR;AAGzB;IADC,UAAU;4CACqB;AAGhC;IADC,UAAU;yCACwB;AAgCvC,MAAM,cAAc,GAAG,QAAQ,CAAC,OAAO,CAAC;IACpC,QAAQ,EAAE,WAAW;IACrB,QAAQ;IACR,MAAM;CACT,CAAC,CAAC;AAEH,YAAY,CAAC,WAAW,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,QAAQ,CAAC,cAAc,EAAE,CAAC,CAAC"}
|
package/dist/esm/table/index.js
CHANGED
|
@@ -36,13 +36,6 @@ export class Table extends FoundationElement {
|
|
|
36
36
|
data: [],
|
|
37
37
|
onStateChange: (_) => { },
|
|
38
38
|
getCoreRowModel: tanStackGetCoreRowModel(),
|
|
39
|
-
getRowId: record => {
|
|
40
|
-
if (this.idFieldName) {
|
|
41
|
-
return record[this.idFieldName];
|
|
42
|
-
}
|
|
43
|
-
// Return a falsey value to use the default ID from TanStack.
|
|
44
|
-
return '';
|
|
45
|
-
},
|
|
46
39
|
columns: [],
|
|
47
40
|
state: {},
|
|
48
41
|
renderFallbackValue: null,
|
|
@@ -72,18 +65,22 @@ export class Table extends FoundationElement {
|
|
|
72
65
|
return this.tableValidator.isValid();
|
|
73
66
|
}
|
|
74
67
|
trySetData(newData) {
|
|
75
|
-
const areIdsValid = this.tableValidator.
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
68
|
+
const areIdsValid = this.tableValidator.validateRecordIds(newData, this.idFieldName);
|
|
69
|
+
const getRowIdFunction = this.idFieldName === null || this.idFieldName === undefined
|
|
70
|
+
? undefined
|
|
71
|
+
: (record) => record[this.idFieldName];
|
|
72
|
+
this.updateTableOptions({
|
|
73
|
+
data: areIdsValid ? newData : [],
|
|
74
|
+
getRowId: getRowIdFunction
|
|
75
|
+
});
|
|
82
76
|
}
|
|
83
77
|
refreshRows() {
|
|
84
78
|
const rows = this.table.getRowModel().rows;
|
|
85
79
|
this.tableData = rows.map(row => {
|
|
86
|
-
const rowState = {
|
|
80
|
+
const rowState = {
|
|
81
|
+
record: row.original,
|
|
82
|
+
id: row.id
|
|
83
|
+
};
|
|
87
84
|
return rowState;
|
|
88
85
|
});
|
|
89
86
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/table/index.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAC7E,OAAO,EAKH,WAAW,IAAI,mBAAmB,EAClC,eAAe,IAAI,uBAAuB,EAE7C,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC1D,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAStC;;GAEG;AACH,MAAM,OAAO,KAEX,SAAQ,iBAAiB;IAyBvB;QACI,KAAK,EAAE,CAAC;QArBL,SAAI,GAAY,EAAE,CAAC;QAE1B;;WAEG;QAEI,cAAS,GAA2B,EAAE,CAAC;QAG9B,YAAO,GAAkB,EAAE,CAAC;QAQ3B,qBAAgB,GAAY,KAAK,CAAC;QAClC,mBAAc,GAAG,IAAI,cAAc,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/table/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,10 +4,10 @@ import type { TableRecord, TableValidity } from '../types';
|
|
|
4
4
|
* is valid and report which aspects of the configuration are valid or invalid.
|
|
5
5
|
*/
|
|
6
6
|
export declare class TableValidator<TData extends TableRecord> {
|
|
7
|
-
private
|
|
8
|
-
private
|
|
9
|
-
private
|
|
7
|
+
private duplicateRecordId;
|
|
8
|
+
private missingRecordId;
|
|
9
|
+
private invalidRecordId;
|
|
10
10
|
getValidity(): TableValidity;
|
|
11
11
|
isValid(): boolean;
|
|
12
|
-
|
|
12
|
+
validateRecordIds(data: TData[], idFieldName: string | null | undefined): boolean;
|
|
13
13
|
}
|
|
@@ -4,45 +4,47 @@
|
|
|
4
4
|
*/
|
|
5
5
|
export class TableValidator {
|
|
6
6
|
constructor() {
|
|
7
|
-
this.
|
|
8
|
-
this.
|
|
9
|
-
this.
|
|
7
|
+
this.duplicateRecordId = false;
|
|
8
|
+
this.missingRecordId = false;
|
|
9
|
+
this.invalidRecordId = false;
|
|
10
10
|
}
|
|
11
11
|
getValidity() {
|
|
12
12
|
return {
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
13
|
+
duplicateRecordId: this.duplicateRecordId,
|
|
14
|
+
missingRecordId: this.missingRecordId,
|
|
15
|
+
invalidRecordId: this.invalidRecordId
|
|
16
16
|
};
|
|
17
17
|
}
|
|
18
18
|
isValid() {
|
|
19
19
|
return Object.values(this.getValidity()).every(x => x === false);
|
|
20
20
|
}
|
|
21
|
-
|
|
21
|
+
validateRecordIds(data, idFieldName) {
|
|
22
22
|
// Start off by assuming all IDs are valid.
|
|
23
|
-
this.
|
|
24
|
-
this.
|
|
25
|
-
this.
|
|
26
|
-
if (idFieldName
|
|
23
|
+
this.duplicateRecordId = false;
|
|
24
|
+
this.missingRecordId = false;
|
|
25
|
+
this.invalidRecordId = false;
|
|
26
|
+
if (idFieldName === undefined || idFieldName === null) {
|
|
27
27
|
return true;
|
|
28
28
|
}
|
|
29
29
|
const ids = new Set();
|
|
30
30
|
for (const record of data) {
|
|
31
31
|
if (!Object.prototype.hasOwnProperty.call(record, idFieldName)) {
|
|
32
|
-
this.
|
|
32
|
+
this.missingRecordId = true;
|
|
33
33
|
continue;
|
|
34
34
|
}
|
|
35
35
|
const id = record[idFieldName];
|
|
36
|
-
if (typeof id !== 'string'
|
|
37
|
-
this.
|
|
36
|
+
if (typeof id !== 'string') {
|
|
37
|
+
this.invalidRecordId = true;
|
|
38
38
|
continue;
|
|
39
39
|
}
|
|
40
40
|
if (ids.has(id)) {
|
|
41
|
-
this.
|
|
41
|
+
this.duplicateRecordId = true;
|
|
42
42
|
}
|
|
43
43
|
ids.add(id);
|
|
44
44
|
}
|
|
45
|
-
return !this.
|
|
45
|
+
return (!this.missingRecordId
|
|
46
|
+
&& !this.invalidRecordId
|
|
47
|
+
&& !this.duplicateRecordId);
|
|
46
48
|
}
|
|
47
49
|
}
|
|
48
50
|
//# sourceMappingURL=table-validator.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"table-validator.js","sourceRoot":"","sources":["../../../../src/table/models/table-validator.ts"],"names":[],"mappings":"AAEA;;;GAGG;AACH,MAAM,OAAO,cAAc;IAA3B;QACY,
|
|
1
|
+
{"version":3,"file":"table-validator.js","sourceRoot":"","sources":["../../../../src/table/models/table-validator.ts"],"names":[],"mappings":"AAEA;;;GAGG;AACH,MAAM,OAAO,cAAc;IAA3B;QACY,sBAAiB,GAAG,KAAK,CAAC;QAC1B,oBAAe,GAAG,KAAK,CAAC;QACxB,oBAAe,GAAG,KAAK,CAAC;IAoDpC,CAAC;IAlDU,WAAW;QACd,OAAO;YACH,iBAAiB,EAAE,IAAI,CAAC,iBAAiB;YACzC,eAAe,EAAE,IAAI,CAAC,eAAe;YACrC,eAAe,EAAE,IAAI,CAAC,eAAe;SACxC,CAAC;IACN,CAAC;IAEM,OAAO;QACV,OAAO,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,KAAK,CAAC,CAAC;IACrE,CAAC;IAEM,iBAAiB,CACpB,IAAa,EACb,WAAsC;QAEtC,2CAA2C;QAC3C,IAAI,CAAC,iBAAiB,GAAG,KAAK,CAAC;QAC/B,IAAI,CAAC,eAAe,GAAG,KAAK,CAAC;QAC7B,IAAI,CAAC,eAAe,GAAG,KAAK,CAAC;QAE7B,IAAI,WAAW,KAAK,SAAS,IAAI,WAAW,KAAK,IAAI,EAAE;YACnD,OAAO,IAAI,CAAC;SACf;QAED,MAAM,GAAG,GAAG,IAAI,GAAG,EAAU,CAAC;QAC9B,KAAK,MAAM,MAAM,IAAI,IAAI,EAAE;YACvB,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,MAAM,EAAE,WAAW,CAAC,EAAE;gBAC5D,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC;gBAC5B,SAAS;aACZ;YAED,MAAM,EAAE,GAAG,MAAM,CAAC,WAAW,CAAC,CAAC;YAC/B,IAAI,OAAO,EAAE,KAAK,QAAQ,EAAE;gBACxB,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC;gBAC5B,SAAS;aACZ;YAED,IAAI,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE;gBACb,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC;aACjC;YACD,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;SACf;QAED,OAAO,CACH,CAAC,IAAI,CAAC,eAAe;eAClB,CAAC,IAAI,CAAC,eAAe;eACrB,CAAC,IAAI,CAAC,iBAAiB,CAC7B,CAAC;IACN,CAAC;CACJ"}
|
|
@@ -6,13 +6,13 @@ describe('TableValidator', () => {
|
|
|
6
6
|
{ stringField: 'value-2', numberField: 11 }
|
|
7
7
|
];
|
|
8
8
|
const validator = new TableValidator();
|
|
9
|
-
const isValid = validator.
|
|
9
|
+
const isValid = validator.validateRecordIds(data, 'stringField');
|
|
10
10
|
expect(isValid).toBeTrue();
|
|
11
11
|
expect(validator.isValid()).toBeTrue();
|
|
12
12
|
const validity = validator.getValidity();
|
|
13
|
-
expect(validity.
|
|
14
|
-
expect(validity.
|
|
15
|
-
expect(validity.
|
|
13
|
+
expect(validity.duplicateRecordId).toBeFalse();
|
|
14
|
+
expect(validity.invalidRecordId).toBeFalse();
|
|
15
|
+
expect(validity.missingRecordId).toBeFalse();
|
|
16
16
|
});
|
|
17
17
|
it('setting `undefined` field for ID is valid', () => {
|
|
18
18
|
const data = [
|
|
@@ -20,13 +20,13 @@ describe('TableValidator', () => {
|
|
|
20
20
|
{ stringField: 'value-2', numberField: 11 }
|
|
21
21
|
];
|
|
22
22
|
const validator = new TableValidator();
|
|
23
|
-
const isValid = validator.
|
|
23
|
+
const isValid = validator.validateRecordIds(data, undefined);
|
|
24
24
|
expect(isValid).toBeTrue();
|
|
25
25
|
expect(validator.isValid()).toBeTrue();
|
|
26
26
|
const validity = validator.getValidity();
|
|
27
|
-
expect(validity.
|
|
28
|
-
expect(validity.
|
|
29
|
-
expect(validity.
|
|
27
|
+
expect(validity.duplicateRecordId).toBeFalse();
|
|
28
|
+
expect(validity.invalidRecordId).toBeFalse();
|
|
29
|
+
expect(validity.missingRecordId).toBeFalse();
|
|
30
30
|
});
|
|
31
31
|
it('setting `null` field for ID is valid', () => {
|
|
32
32
|
const data = [
|
|
@@ -34,13 +34,13 @@ describe('TableValidator', () => {
|
|
|
34
34
|
{ stringField: 'value-2', numberField: 11 }
|
|
35
35
|
];
|
|
36
36
|
const validator = new TableValidator();
|
|
37
|
-
const isValid = validator.
|
|
37
|
+
const isValid = validator.validateRecordIds(data, null);
|
|
38
38
|
expect(isValid).toBeTrue();
|
|
39
39
|
expect(validator.isValid()).toBeTrue();
|
|
40
40
|
const validity = validator.getValidity();
|
|
41
|
-
expect(validity.
|
|
42
|
-
expect(validity.
|
|
43
|
-
expect(validity.
|
|
41
|
+
expect(validity.duplicateRecordId).toBeFalse();
|
|
42
|
+
expect(validity.invalidRecordId).toBeFalse();
|
|
43
|
+
expect(validity.missingRecordId).toBeFalse();
|
|
44
44
|
});
|
|
45
45
|
it('setting data with duplicate IDs is invalid', () => {
|
|
46
46
|
const data = [
|
|
@@ -48,13 +48,13 @@ describe('TableValidator', () => {
|
|
|
48
48
|
{ stringField: 'value-1', numberField: 11 }
|
|
49
49
|
];
|
|
50
50
|
const validator = new TableValidator();
|
|
51
|
-
const isValid = validator.
|
|
51
|
+
const isValid = validator.validateRecordIds(data, 'stringField');
|
|
52
52
|
expect(isValid).toBeFalse();
|
|
53
53
|
expect(validator.isValid()).toBeFalse();
|
|
54
54
|
const validity = validator.getValidity();
|
|
55
|
-
expect(validity.
|
|
56
|
-
expect(validity.
|
|
57
|
-
expect(validity.
|
|
55
|
+
expect(validity.duplicateRecordId).toBeTrue();
|
|
56
|
+
expect(validity.invalidRecordId).toBeFalse();
|
|
57
|
+
expect(validity.missingRecordId).toBeFalse();
|
|
58
58
|
});
|
|
59
59
|
it('setting data with invalid ID value type is invalid', () => {
|
|
60
60
|
const data = [
|
|
@@ -62,27 +62,27 @@ describe('TableValidator', () => {
|
|
|
62
62
|
{ stringField: 'value-2', numberField: 11 }
|
|
63
63
|
];
|
|
64
64
|
const validator = new TableValidator();
|
|
65
|
-
const isValid = validator.
|
|
65
|
+
const isValid = validator.validateRecordIds(data, 'numberField');
|
|
66
66
|
expect(isValid).toBeFalse();
|
|
67
67
|
expect(validator.isValid()).toBeFalse();
|
|
68
68
|
const validity = validator.getValidity();
|
|
69
|
-
expect(validity.
|
|
70
|
-
expect(validity.
|
|
71
|
-
expect(validity.
|
|
69
|
+
expect(validity.duplicateRecordId).toBeFalse();
|
|
70
|
+
expect(validity.invalidRecordId).toBeTrue();
|
|
71
|
+
expect(validity.missingRecordId).toBeFalse();
|
|
72
72
|
});
|
|
73
|
-
it('setting data with empty ID value is
|
|
73
|
+
it('setting data with empty ID value is valid', () => {
|
|
74
74
|
const data = [
|
|
75
75
|
{ stringField: 'value-1', numberField: 10 },
|
|
76
76
|
{ stringField: '', numberField: 11 }
|
|
77
77
|
];
|
|
78
78
|
const validator = new TableValidator();
|
|
79
|
-
const isValid = validator.
|
|
80
|
-
expect(isValid).
|
|
81
|
-
expect(validator.isValid()).
|
|
79
|
+
const isValid = validator.validateRecordIds(data, 'stringField');
|
|
80
|
+
expect(isValid).toBeTrue();
|
|
81
|
+
expect(validator.isValid()).toBeTrue();
|
|
82
82
|
const validity = validator.getValidity();
|
|
83
|
-
expect(validity.
|
|
84
|
-
expect(validity.
|
|
85
|
-
expect(validity.
|
|
83
|
+
expect(validity.duplicateRecordId).toBeFalse();
|
|
84
|
+
expect(validity.invalidRecordId).toBeFalse();
|
|
85
|
+
expect(validity.missingRecordId).toBeFalse();
|
|
86
86
|
});
|
|
87
87
|
it('setting data with undefined ID value is invalid', () => {
|
|
88
88
|
const data = [
|
|
@@ -90,13 +90,13 @@ describe('TableValidator', () => {
|
|
|
90
90
|
{ stringField: undefined, numberField: 11 }
|
|
91
91
|
];
|
|
92
92
|
const validator = new TableValidator();
|
|
93
|
-
const isValid = validator.
|
|
93
|
+
const isValid = validator.validateRecordIds(data, 'stringField');
|
|
94
94
|
expect(isValid).toBeFalse();
|
|
95
95
|
expect(validator.isValid()).toBeFalse();
|
|
96
96
|
const validity = validator.getValidity();
|
|
97
|
-
expect(validity.
|
|
98
|
-
expect(validity.
|
|
99
|
-
expect(validity.
|
|
97
|
+
expect(validity.duplicateRecordId).toBeFalse();
|
|
98
|
+
expect(validity.invalidRecordId).toBeTrue();
|
|
99
|
+
expect(validity.missingRecordId).toBeFalse();
|
|
100
100
|
});
|
|
101
101
|
it('setting data with null ID value is invalid', () => {
|
|
102
102
|
const data = [
|
|
@@ -104,13 +104,13 @@ describe('TableValidator', () => {
|
|
|
104
104
|
{ stringField: undefined, numberField: 11 }
|
|
105
105
|
];
|
|
106
106
|
const validator = new TableValidator();
|
|
107
|
-
const isValid = validator.
|
|
107
|
+
const isValid = validator.validateRecordIds(data, 'stringField');
|
|
108
108
|
expect(isValid).toBeFalse();
|
|
109
109
|
expect(validator.isValid()).toBeFalse();
|
|
110
110
|
const validity = validator.getValidity();
|
|
111
|
-
expect(validity.
|
|
112
|
-
expect(validity.
|
|
113
|
-
expect(validity.
|
|
111
|
+
expect(validity.duplicateRecordId).toBeFalse();
|
|
112
|
+
expect(validity.invalidRecordId).toBeTrue();
|
|
113
|
+
expect(validity.missingRecordId).toBeFalse();
|
|
114
114
|
});
|
|
115
115
|
it('setting data with missing IDs is invalid', () => {
|
|
116
116
|
const data = [
|
|
@@ -118,13 +118,13 @@ describe('TableValidator', () => {
|
|
|
118
118
|
{ stringField: 'value-2', numberField: 11 }
|
|
119
119
|
];
|
|
120
120
|
const validator = new TableValidator();
|
|
121
|
-
const isValid = validator.
|
|
121
|
+
const isValid = validator.validateRecordIds(data, 'missingField');
|
|
122
122
|
expect(isValid).toBeFalse();
|
|
123
123
|
expect(validator.isValid()).toBeFalse();
|
|
124
124
|
const validity = validator.getValidity();
|
|
125
|
-
expect(validity.
|
|
126
|
-
expect(validity.
|
|
127
|
-
expect(validity.
|
|
125
|
+
expect(validity.duplicateRecordId).toBeFalse();
|
|
126
|
+
expect(validity.invalidRecordId).toBeFalse();
|
|
127
|
+
expect(validity.missingRecordId).toBeTrue();
|
|
128
128
|
});
|
|
129
129
|
it('multiple errors are reported during validation', () => {
|
|
130
130
|
const data = [
|
|
@@ -135,13 +135,13 @@ describe('TableValidator', () => {
|
|
|
135
135
|
{ stringField: true, numberField: 12 }
|
|
136
136
|
];
|
|
137
137
|
const validator = new TableValidator();
|
|
138
|
-
const isValid = validator.
|
|
138
|
+
const isValid = validator.validateRecordIds(data, 'stringField');
|
|
139
139
|
expect(isValid).toBeFalse();
|
|
140
140
|
expect(validator.isValid()).toBeFalse();
|
|
141
141
|
const validity = validator.getValidity();
|
|
142
|
-
expect(validity.
|
|
143
|
-
expect(validity.
|
|
144
|
-
expect(validity.
|
|
142
|
+
expect(validity.duplicateRecordId).toBeTrue();
|
|
143
|
+
expect(validity.invalidRecordId).toBeTrue();
|
|
144
|
+
expect(validity.missingRecordId).toBeTrue();
|
|
145
145
|
});
|
|
146
146
|
it('setting ID field name to undefined makes configuration valid', () => {
|
|
147
147
|
const data = [
|
|
@@ -149,10 +149,10 @@ describe('TableValidator', () => {
|
|
|
149
149
|
{ stringField: 'value-2', numberField: 11 }
|
|
150
150
|
];
|
|
151
151
|
const validator = new TableValidator();
|
|
152
|
-
let isValid = validator.
|
|
152
|
+
let isValid = validator.validateRecordIds(data, 'missingField');
|
|
153
153
|
expect(isValid).toBeFalse();
|
|
154
154
|
expect(validator.isValid()).toBeFalse();
|
|
155
|
-
isValid = validator.
|
|
155
|
+
isValid = validator.validateRecordIds(data, undefined);
|
|
156
156
|
expect(isValid).toBeTrue();
|
|
157
157
|
expect(validator.isValid()).toBeTrue();
|
|
158
158
|
});
|
|
@@ -162,10 +162,10 @@ describe('TableValidator', () => {
|
|
|
162
162
|
{ stringField: 'value-2', numberField: 11 }
|
|
163
163
|
];
|
|
164
164
|
const validator = new TableValidator();
|
|
165
|
-
let isValid = validator.
|
|
165
|
+
let isValid = validator.validateRecordIds(data, 'missingField');
|
|
166
166
|
expect(isValid).toBeFalse();
|
|
167
167
|
expect(validator.isValid()).toBeFalse();
|
|
168
|
-
isValid = validator.
|
|
168
|
+
isValid = validator.validateRecordIds(data, 'stringField');
|
|
169
169
|
expect(isValid).toBeTrue();
|
|
170
170
|
expect(validator.isValid()).toBeTrue();
|
|
171
171
|
});
|
|
@@ -175,10 +175,10 @@ describe('TableValidator', () => {
|
|
|
175
175
|
{ stringField: 'value-2', numberField: 11 }
|
|
176
176
|
];
|
|
177
177
|
const validator = new TableValidator();
|
|
178
|
-
let isValid = validator.
|
|
178
|
+
let isValid = validator.validateRecordIds(data, 'stringField');
|
|
179
179
|
expect(isValid).toBeTrue();
|
|
180
180
|
expect(validator.isValid()).toBeTrue();
|
|
181
|
-
isValid = validator.
|
|
181
|
+
isValid = validator.validateRecordIds(data, 'missingField');
|
|
182
182
|
expect(isValid).toBeFalse();
|
|
183
183
|
expect(validator.isValid()).toBeFalse();
|
|
184
184
|
});
|
|
@@ -190,13 +190,13 @@ describe('TableValidator', () => {
|
|
|
190
190
|
{ stringField: 'value-2', numberField: 11, '': 'empty-2' }
|
|
191
191
|
];
|
|
192
192
|
const validator = new TableValidator();
|
|
193
|
-
const isValid = validator.
|
|
193
|
+
const isValid = validator.validateRecordIds(data, '');
|
|
194
194
|
expect(isValid).toBeTrue();
|
|
195
195
|
expect(validator.isValid()).toBeTrue();
|
|
196
196
|
const validity = validator.getValidity();
|
|
197
|
-
expect(validity.
|
|
198
|
-
expect(validity.
|
|
199
|
-
expect(validity.
|
|
197
|
+
expect(validity.duplicateRecordId).toBeFalse();
|
|
198
|
+
expect(validity.invalidRecordId).toBeFalse();
|
|
199
|
+
expect(validity.missingRecordId).toBeFalse();
|
|
200
200
|
});
|
|
201
201
|
it('validation occurs when ID field name is an empty string', () => {
|
|
202
202
|
const data = [
|
|
@@ -206,13 +206,13 @@ describe('TableValidator', () => {
|
|
|
206
206
|
{ stringField: 'value-2', numberField: 11, '': 'empty-1' }
|
|
207
207
|
];
|
|
208
208
|
const validator = new TableValidator();
|
|
209
|
-
const isValid = validator.
|
|
209
|
+
const isValid = validator.validateRecordIds(data, '');
|
|
210
210
|
expect(isValid).toBeFalse();
|
|
211
211
|
expect(validator.isValid()).toBeFalse();
|
|
212
212
|
const validity = validator.getValidity();
|
|
213
|
-
expect(validity.
|
|
214
|
-
expect(validity.
|
|
215
|
-
expect(validity.
|
|
213
|
+
expect(validity.duplicateRecordId).toBeTrue();
|
|
214
|
+
expect(validity.invalidRecordId).toBeFalse();
|
|
215
|
+
expect(validity.missingRecordId).toBeFalse();
|
|
216
216
|
});
|
|
217
217
|
});
|
|
218
218
|
//# sourceMappingURL=table-validator.spec.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"table-validator.spec.js","sourceRoot":"","sources":["../../../../src/table/models/table-validator.spec.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAEnD,QAAQ,CAAC,gBAAgB,EAAE,GAAG,EAAE;IAC5B,EAAE,CAAC,qCAAqC,EAAE,GAAG,EAAE;QAC3C,MAAM,IAAI,GAAG;YACT,EAAE,WAAW,EAAE,SAAS,EAAE,WAAW,EAAE,EAAE,EAAE;YAC3C,EAAE,WAAW,EAAE,SAAS,EAAE,WAAW,EAAE,EAAE,EAAE;SAC9C,CAAC;QACF,MAAM,SAAS,GAAG,IAAI,cAAc,EAAE,CAAC;QAEvC,MAAM,OAAO,GAAG,SAAS,CAAC,
|
|
1
|
+
{"version":3,"file":"table-validator.spec.js","sourceRoot":"","sources":["../../../../src/table/models/table-validator.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"template.js","sourceRoot":"","sources":["../../../src/table/template.ts"],"names":[],"mappings":"AAAA,OAAO,EAEH,IAAI,EACJ,MAAM,EACN,OAAO,EACP,IAAI,EACP,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAG1D,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAEnD,MAAM,aAAa,GAAG,GAAmB,EAAE;IACvC,MAAM,MAAM,GAAmB,CAC3B,KAAW,EACX,CAAS,EACT,EAAU,EACH,EAAE;QACT,OAAO,KAAK,YAAY,WAAW,CAAC;IACxC,CAAC,CAAC;IACF,OAAO,MAAM,CAAC;AAClB,CAAC,CAAC;AAEF,kBAAkB;AAClB,MAAM,CAAC,MAAM,QAAQ,GAAG,IAAI,CAAO;;;;;sBAKb,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,EAAE,IAAI,CAAa;2BACnC,YAAY,CAAC,MAAM,CAAC,WAAW,CAAC;8BAC7B,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,WAAW;4BACpB,YAAY,CAAC,MAAM,CAAC,WAAW,CAAC;qBACvC,CAAC;;;;cAIR,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,IAAI,CAAO;kBACvC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,EAAE,IAAI,CAAe;uBACvC,YAAY,CAAC,MAAM,CAAC,QAAQ,CAAC;;
|
|
1
|
+
{"version":3,"file":"template.js","sourceRoot":"","sources":["../../../src/table/template.ts"],"names":[],"mappings":"AAAA,OAAO,EAEH,IAAI,EACJ,MAAM,EACN,OAAO,EACP,IAAI,EACP,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAG1D,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAEnD,MAAM,aAAa,GAAG,GAAmB,EAAE;IACvC,MAAM,MAAM,GAAmB,CAC3B,KAAW,EACX,CAAS,EACT,EAAU,EACH,EAAE;QACT,OAAO,KAAK,YAAY,WAAW,CAAC;IACxC,CAAC,CAAC;IACF,OAAO,MAAM,CAAC;AAClB,CAAC,CAAC;AAEF,kBAAkB;AAClB,MAAM,CAAC,MAAM,QAAQ,GAAG,IAAI,CAAO;;;;;sBAKb,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,EAAE,IAAI,CAAa;2BACnC,YAAY,CAAC,MAAM,CAAC,WAAW,CAAC;8BAC7B,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,WAAW;4BACpB,YAAY,CAAC,MAAM,CAAC,WAAW,CAAC;qBACvC,CAAC;;;;cAIR,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,IAAI,CAAO;kBACvC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,EAAE,IAAI,CAAe;uBACvC,YAAY,CAAC,MAAM,CAAC,QAAQ,CAAC;;qCAEf,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE;uCACP,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM;oCAChB,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAE,CAAC,CAAC,MAAgB,CAAC,OAAO;;wBAEjD,YAAY,CAAC,MAAM,CAAC,QAAQ,CAAC;iBACpC,CAAC;aACL,CAAC;;;gBAGE,OAAO,CAAC,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,aAAa,EAAE,EAAE,CAAC;;CAExE,CAAC"}
|
|
@@ -33,10 +33,11 @@ export interface TableCellState<TCellRecord extends TableCellRecord = TableCellR
|
|
|
33
33
|
columnConfig: TColumnConfig;
|
|
34
34
|
}
|
|
35
35
|
export interface TableValidity {
|
|
36
|
-
readonly
|
|
37
|
-
readonly
|
|
38
|
-
readonly
|
|
36
|
+
readonly duplicateRecordId: boolean;
|
|
37
|
+
readonly missingRecordId: boolean;
|
|
38
|
+
readonly invalidRecordId: boolean;
|
|
39
39
|
}
|
|
40
40
|
export interface TableRowState<TData extends TableRecord = TableRecord> {
|
|
41
41
|
record: TData;
|
|
42
|
+
id: string;
|
|
42
43
|
}
|
|
@@ -3,9 +3,14 @@ import type { DataManager } from './data-manager';
|
|
|
3
3
|
* Responsible for drawing the dies inside the wafer map
|
|
4
4
|
*/
|
|
5
5
|
export declare class RenderingModule {
|
|
6
|
-
private readonly waferData;
|
|
7
6
|
private readonly context;
|
|
7
|
+
private dieSize?;
|
|
8
|
+
private readonly dies;
|
|
9
|
+
private readonly dimensions;
|
|
10
|
+
private readonly labelFontSize;
|
|
8
11
|
constructor(waferData: DataManager, canvas: HTMLCanvasElement);
|
|
9
|
-
drawWafer(): void;
|
|
12
|
+
drawWafer(transform?: number): void;
|
|
10
13
|
clearCanvas(width: number, height: number): void;
|
|
14
|
+
private renderDies;
|
|
15
|
+
private renderText;
|
|
11
16
|
}
|
|
@@ -3,24 +3,56 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export class RenderingModule {
|
|
5
5
|
constructor(waferData, canvas) {
|
|
6
|
-
this.waferData = waferData;
|
|
7
6
|
this.context = canvas.getContext('2d');
|
|
7
|
+
this.dies = waferData.diesRenderInfo;
|
|
8
|
+
this.dimensions = waferData.dieDimensions;
|
|
9
|
+
this.labelFontSize = waferData.labelsFontSize;
|
|
8
10
|
}
|
|
9
|
-
drawWafer() {
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
for (const die of dies) {
|
|
13
|
-
this.context.fillStyle = die.fillStyle;
|
|
14
|
-
this.context?.fillRect(die.x, die.y, dimensions.width, dimensions.height);
|
|
15
|
-
this.context.font = this.waferData.labelsFontSize.toString();
|
|
16
|
-
this.context.fillStyle = '#ffffff';
|
|
17
|
-
this.context.textAlign = 'center';
|
|
18
|
-
const aproxTextHeight = this.context.measureText('M');
|
|
19
|
-
this.context.fillText(die.text, die.x + dimensions.width / 2, die.y + dimensions.height / 2 + aproxTextHeight.width / 2);
|
|
20
|
-
}
|
|
11
|
+
drawWafer(transform) {
|
|
12
|
+
this.renderDies(transform);
|
|
13
|
+
this.renderText(transform);
|
|
21
14
|
}
|
|
22
15
|
clearCanvas(width, height) {
|
|
23
16
|
this.context.clearRect(0, 0, width, height);
|
|
24
17
|
}
|
|
18
|
+
renderDies(transform) {
|
|
19
|
+
this.dieSize = this.dimensions.width * this.dimensions.height * (transform || 1);
|
|
20
|
+
this.dies.sort((a, b) => {
|
|
21
|
+
if (a.fillStyle > b.fillStyle) {
|
|
22
|
+
return 1;
|
|
23
|
+
}
|
|
24
|
+
if (b.fillStyle > a.fillStyle) {
|
|
25
|
+
return -1;
|
|
26
|
+
}
|
|
27
|
+
return 0;
|
|
28
|
+
});
|
|
29
|
+
let prev;
|
|
30
|
+
for (const die of this.dies) {
|
|
31
|
+
if (!prev) {
|
|
32
|
+
this.context.fillStyle = die.fillStyle;
|
|
33
|
+
}
|
|
34
|
+
if (prev && die.fillStyle !== prev.fillStyle && die.fillStyle) {
|
|
35
|
+
this.context.fillStyle = die.fillStyle;
|
|
36
|
+
}
|
|
37
|
+
this.context.fillRect(die.x, die.y, this.dimensions.width, this.dimensions.height);
|
|
38
|
+
prev = die;
|
|
39
|
+
}
|
|
40
|
+
}
|
|
41
|
+
renderText(transform) {
|
|
42
|
+
this.dieSize = this.dimensions.width * this.dimensions.height * (transform || 1);
|
|
43
|
+
const fontsize = this.labelFontSize;
|
|
44
|
+
this.context.font = `${fontsize.toString()}px sans-serif`;
|
|
45
|
+
this.context.fillStyle = '#ffffff';
|
|
46
|
+
this.context.textAlign = 'center';
|
|
47
|
+
this.context.lineCap = 'butt';
|
|
48
|
+
const aproxTextHeight = this.context.measureText('M');
|
|
49
|
+
if (this.dieSize >= 50) {
|
|
50
|
+
for (const die of this.dies) {
|
|
51
|
+
this.context.fillText(die.text, die.x + this.dimensions.width / 2, die.y
|
|
52
|
+
+ this.dimensions.height / 2
|
|
53
|
+
+ aproxTextHeight.width / 2, this.dimensions.width - (this.dimensions.width / 100) * 20);
|
|
54
|
+
}
|
|
55
|
+
}
|
|
56
|
+
}
|
|
25
57
|
}
|
|
26
58
|
//# sourceMappingURL=rendering.js.map
|