@genesislcap/foundation-forms 14.268.4-alpha-477e8bf.0 → 14.268.4
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/custom-elements.json +2 -83
- package/dist/dts/filters/filters.d.ts.map +1 -1
- package/dist/dts/filters/filters.template.d.ts.map +1 -1
- package/dist/dts/jsonforms/renderers/RenderersRanks.d.ts +0 -1
- package/dist/dts/jsonforms/renderers/RenderersRanks.d.ts.map +1 -1
- package/dist/dts/utils/filters.d.ts +0 -1
- package/dist/dts/utils/filters.d.ts.map +1 -1
- package/dist/esm/filters/filters.js +3 -11
- package/dist/esm/filters/filters.template.js +4 -2
- package/dist/esm/jsonforms/renderers/RenderersRanks.js +0 -1
- package/dist/esm/utils/filters.js +2 -19
- package/dist/foundation-forms.d.ts +0 -1
- package/package.json +15 -15
- package/dist/dts/jsonforms/renderers/FilterTimeControlRenderer.d.ts +0 -4
- package/dist/dts/jsonforms/renderers/FilterTimeControlRenderer.d.ts.map +0 -1
- package/dist/dts/jsonforms/testers/isTime.d.ts +0 -2
- package/dist/dts/jsonforms/testers/isTime.d.ts.map +0 -1
- package/dist/esm/jsonforms/renderers/FilterTimeControlRenderer.js +0 -74
- package/dist/esm/jsonforms/testers/isTime.js +0 -5
|
@@ -547,7 +547,7 @@
|
|
|
547
547
|
"type": {
|
|
548
548
|
"text": "array"
|
|
549
549
|
},
|
|
550
|
-
"default": "[\n fallbackEntry,\n stringEntry,\n BooleanControlEntry,\n LayoutVertical2ColumnsEntry,\n LayoutRendererEntry,\n FilterNumberControlRendererEntry,\n ConnectedMultiselectControlRendererEntry,\n EnumControlRendererEntry,\n ConnectedSelectControlRendererEntry,\n FilterDateControlRendererEntry,\n
|
|
550
|
+
"default": "[\n fallbackEntry,\n stringEntry,\n BooleanControlEntry,\n LayoutVertical2ColumnsEntry,\n LayoutRendererEntry,\n FilterNumberControlRendererEntry,\n ConnectedMultiselectControlRendererEntry,\n EnumControlRendererEntry,\n ConnectedSelectControlRendererEntry,\n FilterDateControlRendererEntry,\n InvisibleControlEntry,\n]",
|
|
551
551
|
"description": "Set of default renderers used by the foundation-filters.",
|
|
552
552
|
"privacy": "public"
|
|
553
553
|
},
|
|
@@ -616,7 +616,7 @@
|
|
|
616
616
|
"type": {
|
|
617
617
|
"text": "RendererEntry[]"
|
|
618
618
|
},
|
|
619
|
-
"default": "[\n fallbackEntry,\n stringEntry,\n BooleanControlEntry,\n LayoutVertical2ColumnsEntry,\n LayoutRendererEntry,\n FilterNumberControlRendererEntry,\n ConnectedMultiselectControlRendererEntry,\n EnumControlRendererEntry,\n ConnectedSelectControlRendererEntry,\n FilterDateControlRendererEntry,\n
|
|
619
|
+
"default": "[\n fallbackEntry,\n stringEntry,\n BooleanControlEntry,\n LayoutVertical2ColumnsEntry,\n LayoutRendererEntry,\n FilterNumberControlRendererEntry,\n ConnectedMultiselectControlRendererEntry,\n EnumControlRendererEntry,\n ConnectedSelectControlRendererEntry,\n FilterDateControlRendererEntry,\n InvisibleControlEntry,\n]",
|
|
620
620
|
"description": "Allows to provide the main set of renderers used by the form. If not provided, the built-in renderers will be used by default.",
|
|
621
621
|
"privacy": "public"
|
|
622
622
|
},
|
|
@@ -1819,51 +1819,6 @@
|
|
|
1819
1819
|
}
|
|
1820
1820
|
]
|
|
1821
1821
|
},
|
|
1822
|
-
{
|
|
1823
|
-
"kind": "javascript-module",
|
|
1824
|
-
"path": "src/jsonforms/renderers/FilterTimeControlRenderer.ts",
|
|
1825
|
-
"declarations": [
|
|
1826
|
-
{
|
|
1827
|
-
"kind": "function",
|
|
1828
|
-
"name": "TimeControlRendererTemplate",
|
|
1829
|
-
"parameters": [
|
|
1830
|
-
{
|
|
1831
|
-
"name": "prefix",
|
|
1832
|
-
"default": "'zero'",
|
|
1833
|
-
"type": {
|
|
1834
|
-
"text": "string"
|
|
1835
|
-
}
|
|
1836
|
-
}
|
|
1837
|
-
]
|
|
1838
|
-
},
|
|
1839
|
-
{
|
|
1840
|
-
"kind": "variable",
|
|
1841
|
-
"name": "FilterTimeControlRendererEntry",
|
|
1842
|
-
"type": {
|
|
1843
|
-
"text": "RendererEntry"
|
|
1844
|
-
},
|
|
1845
|
-
"default": "{\n renderer: html`\n ${(x) => TimeControlRendererTemplate(x.prefix)}\n `,\n tester: rankWith(TIME_CONTROL_RANK, isOneOfTime),\n mapper: mapStateToControlProps, // TODO: change mapper to handle dates instead of doing it in the template\n}"
|
|
1846
|
-
}
|
|
1847
|
-
],
|
|
1848
|
-
"exports": [
|
|
1849
|
-
{
|
|
1850
|
-
"kind": "js",
|
|
1851
|
-
"name": "TimeControlRendererTemplate",
|
|
1852
|
-
"declaration": {
|
|
1853
|
-
"name": "TimeControlRendererTemplate",
|
|
1854
|
-
"module": "src/jsonforms/renderers/FilterTimeControlRenderer.ts"
|
|
1855
|
-
}
|
|
1856
|
-
},
|
|
1857
|
-
{
|
|
1858
|
-
"kind": "js",
|
|
1859
|
-
"name": "FilterTimeControlRendererEntry",
|
|
1860
|
-
"declaration": {
|
|
1861
|
-
"name": "FilterTimeControlRendererEntry",
|
|
1862
|
-
"module": "src/jsonforms/renderers/FilterTimeControlRenderer.ts"
|
|
1863
|
-
}
|
|
1864
|
-
}
|
|
1865
|
-
]
|
|
1866
|
-
},
|
|
1867
1822
|
{
|
|
1868
1823
|
"kind": "javascript-module",
|
|
1869
1824
|
"path": "src/jsonforms/renderers/InvisibleControlRenderer.ts",
|
|
@@ -2316,14 +2271,6 @@
|
|
|
2316
2271
|
},
|
|
2317
2272
|
"default": "4"
|
|
2318
2273
|
},
|
|
2319
|
-
{
|
|
2320
|
-
"kind": "variable",
|
|
2321
|
-
"name": "TIME_CONTROL_RANK",
|
|
2322
|
-
"type": {
|
|
2323
|
-
"text": "number"
|
|
2324
|
-
},
|
|
2325
|
-
"default": "4"
|
|
2326
|
-
},
|
|
2327
2274
|
{
|
|
2328
2275
|
"kind": "variable",
|
|
2329
2276
|
"name": "LAYOUT_RANK",
|
|
@@ -2446,14 +2393,6 @@
|
|
|
2446
2393
|
"module": "src/jsonforms/renderers/RenderersRanks.ts"
|
|
2447
2394
|
}
|
|
2448
2395
|
},
|
|
2449
|
-
{
|
|
2450
|
-
"kind": "js",
|
|
2451
|
-
"name": "TIME_CONTROL_RANK",
|
|
2452
|
-
"declaration": {
|
|
2453
|
-
"name": "TIME_CONTROL_RANK",
|
|
2454
|
-
"module": "src/jsonforms/renderers/RenderersRanks.ts"
|
|
2455
|
-
}
|
|
2456
|
-
},
|
|
2457
2396
|
{
|
|
2458
2397
|
"kind": "js",
|
|
2459
2398
|
"name": "LAYOUT_RANK",
|
|
@@ -2985,26 +2924,6 @@
|
|
|
2985
2924
|
}
|
|
2986
2925
|
]
|
|
2987
2926
|
},
|
|
2988
|
-
{
|
|
2989
|
-
"kind": "javascript-module",
|
|
2990
|
-
"path": "src/jsonforms/testers/isTime.ts",
|
|
2991
|
-
"declarations": [
|
|
2992
|
-
{
|
|
2993
|
-
"kind": "variable",
|
|
2994
|
-
"name": "isOneOfTime"
|
|
2995
|
-
}
|
|
2996
|
-
],
|
|
2997
|
-
"exports": [
|
|
2998
|
-
{
|
|
2999
|
-
"kind": "js",
|
|
3000
|
-
"name": "isOneOfTime",
|
|
3001
|
-
"declaration": {
|
|
3002
|
-
"name": "isOneOfTime",
|
|
3003
|
-
"module": "src/jsonforms/testers/isTime.ts"
|
|
3004
|
-
}
|
|
3005
|
-
}
|
|
3006
|
-
]
|
|
3007
|
-
},
|
|
3008
2927
|
{
|
|
3009
2928
|
"kind": "javascript-module",
|
|
3010
2929
|
"path": "src/jsonforms/testers/optionIs.ts",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"filters.d.ts","sourceRoot":"","sources":["../../../src/filters/filters.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAM1D,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAC/D,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"filters.d.ts","sourceRoot":"","sources":["../../../src/filters/filters.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAM1D,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAC/D,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAY1C,OAAO,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AAKnD,gBAAgB;AAChB,eAAO,MAAM,aAAa,iDAAqC,CAAC;AAchE;;;GAGG;AACH,eAAO,MAAM,gBAAgB,OAY5B,CAAC;AAKF;;;;;GAKG;AACH,qBAKa,OAAQ,SAAQ,iBAAiB;IACjC,SAAS,EAAE,SAAS,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IAE/B;;;;OAIG;IACG,YAAY,EAAE,MAAM,CAAC;IACf,eAAe,EAAE,GAAG,EAAE,CAAM;IAExC;;;OAGG;IAEH,6BAA6B,EAAE,OAAO,CAAC;YAEzB,mBAAmB;IAWjC;;OAEG;IACI,gBAAgB;IAMvB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAqCG;IACS,QAAQ,EAAE,QAAQ,CAAC;IAC/B;;;OAGG;IACS,SAAS,EAAE,aAAa,EAAE,CAAoB;IAC1D;;;;;;OAMG;IACS,UAAU,EAAE,WAAW,CAAC;IACpC;;;OAGG;IAC0C,MAAM,EAAE,MAAM,CAAW;IAE7D,OAAO,CAAC,OAAO,CAAW;IACnC;;;OAGG;IACS,IAAI,EAAE,GAAG,CAAM;IAC3B;;;OAGG;IACS,KAAK,EAAE,MAAM,CAAC;IAC1B;;OAEG;IACH,YAAY;IAIZ;;OAEG;IACH,aAAa;IAyBb;;OAEG;IACH,QAAQ,CAAC,KAAK,EAAE,WAAW;IAO3B;;OAEG;IACH,oBAAoB;IAMd,UAAU;IA0CV,YAAY;IA4BZ,iBAAiB;IAOjB,mBAAmB;IAsBzB,iBAAiB,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM;IAU9C,cAAc,CAAC,SAAS,EAAE,MAAM;CAiBvC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"filters.template.d.ts","sourceRoot":"","sources":["../../../src/filters/filters.template.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAMzC,gBAAgB;AAChB,eAAO,MAAM,kBAAkB,WAAY,MAAM,
|
|
1
|
+
{"version":3,"file":"filters.template.d.ts","sourceRoot":"","sources":["../../../src/filters/filters.template.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAMzC,gBAAgB;AAChB,eAAO,MAAM,kBAAkB,WAAY,MAAM,iEAsFhD,CAAC;AAEF,gBAAgB;AAChB,eAAO,MAAM,yBAAyB,8DAErC,CAAC"}
|
|
@@ -5,7 +5,6 @@ export declare const MULTISELECT_CONTROL_RANK = 4;
|
|
|
5
5
|
export declare const ENUM_CONTROL_RANK = 3;
|
|
6
6
|
export declare const SELECT_CONTROL_RANK = 4;
|
|
7
7
|
export declare const DATE_CONTROL_RANK = 4;
|
|
8
|
-
export declare const TIME_CONTROL_RANK = 4;
|
|
9
8
|
export declare const LAYOUT_RANK = 2;
|
|
10
9
|
export declare const LAYOUT_ARRAY_RANK = 2;
|
|
11
10
|
export declare const LAYOUT_CATEGORIZATION_RANK = 2;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RenderersRanks.d.ts","sourceRoot":"","sources":["../../../../src/jsonforms/renderers/RenderersRanks.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,mBAAmB,IAAI,CAAC;AACrC,eAAO,MAAM,oBAAoB,IAAI,CAAC;AACtC,eAAO,MAAM,kBAAkB,IAAI,CAAC;AACpC,eAAO,MAAM,wBAAwB,IAAI,CAAC;AAC1C,eAAO,MAAM,iBAAiB,IAAI,CAAC;AACnC,eAAO,MAAM,mBAAmB,IAAI,CAAC;AACrC,eAAO,MAAM,iBAAiB,IAAI,CAAC;AACnC,eAAO,MAAM,
|
|
1
|
+
{"version":3,"file":"RenderersRanks.d.ts","sourceRoot":"","sources":["../../../../src/jsonforms/renderers/RenderersRanks.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,mBAAmB,IAAI,CAAC;AACrC,eAAO,MAAM,oBAAoB,IAAI,CAAC;AACtC,eAAO,MAAM,kBAAkB,IAAI,CAAC;AACpC,eAAO,MAAM,wBAAwB,IAAI,CAAC;AAC1C,eAAO,MAAM,iBAAiB,IAAI,CAAC;AACnC,eAAO,MAAM,mBAAmB,IAAI,CAAC;AACrC,eAAO,MAAM,iBAAiB,IAAI,CAAC;AACnC,eAAO,MAAM,WAAW,IAAI,CAAC;AAC7B,eAAO,MAAM,iBAAiB,IAAI,CAAC;AACnC,eAAO,MAAM,0BAA0B,IAAI,CAAC;AAC5C,eAAO,MAAM,iBAAiB,IAAI,CAAC;AACnC,eAAO,MAAM,sBAAsB,IAAI,CAAC;AACxC,eAAO,MAAM,mBAAmB,IAAI,CAAC;AACrC,eAAO,MAAM,mBAAmB,IAAI,CAAC;AACrC,eAAO,MAAM,sBAAsB,IAAI,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"filters.d.ts","sourceRoot":"","sources":["../../../src/utils/filters.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAkC,MAAM,kCAAkC,CAAC;AAM9F,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,UAAU,EAAE,CAAC;IACtB,
|
|
1
|
+
{"version":3,"file":"filters.d.ts","sourceRoot":"","sources":["../../../src/utils/filters.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAkC,MAAM,kCAAkC,CAAC;AAM9F,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,UAAU,EAAE,CAAC;IACtB,aAAa,EAAE,UAAU,EAAE,CAAC;IAC5B,WAAW,EAAE,UAAU,EAAE,CAAC;CAC3B,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,iBAAiB,YAAa,GAAG,gBAyC7C,CAAC"}
|
|
@@ -13,7 +13,6 @@ import { ConnectedSelectControlRendererEntry } from '../jsonforms/renderers/Conn
|
|
|
13
13
|
import { EnumControlRendererEntry } from '../jsonforms/renderers/EnumControlRenderer';
|
|
14
14
|
import { FilterDateControlRendererEntry } from '../jsonforms/renderers/FilterDateControlRenderer';
|
|
15
15
|
import { FilterNumberControlRendererEntry } from '../jsonforms/renderers/FilterNumberControlRenderer';
|
|
16
|
-
import { FilterTimeControlRendererEntry } from '../jsonforms/renderers/FilterTimeControlRenderer';
|
|
17
16
|
import { InvisibleControlEntry } from '../jsonforms/renderers/InvisibleControlRenderer';
|
|
18
17
|
import { LayoutRendererEntry } from '../jsonforms/renderers/LayoutRenderer';
|
|
19
18
|
import { LayoutVertical2ColumnsEntry } from '../jsonforms/renderers/LayoutVertical2ColumnsRenderer';
|
|
@@ -48,7 +47,6 @@ export const filtersRenderers = [
|
|
|
48
47
|
EnumControlRendererEntry,
|
|
49
48
|
ConnectedSelectControlRendererEntry,
|
|
50
49
|
FilterDateControlRendererEntry,
|
|
51
|
-
FilterTimeControlRendererEntry,
|
|
52
50
|
InvisibleControlEntry,
|
|
53
51
|
];
|
|
54
52
|
// Add this at the top of the file, outside the class
|
|
@@ -115,16 +113,10 @@ let Filters = class Filters extends FoundationElement {
|
|
|
115
113
|
filtersLogger.debug({ payload });
|
|
116
114
|
if (expressions.dateOptions.length > 0 ||
|
|
117
115
|
expressions.numberOptions.length > 0 ||
|
|
118
|
-
expressions.options.length > 0
|
|
119
|
-
expressions.
|
|
120
|
-
Object.entries(expressions).forEach(([key, value]) => {
|
|
116
|
+
expressions.options.length > 0) {
|
|
117
|
+
Object.values(expressions).forEach((value) => {
|
|
121
118
|
if (value.length > 0) {
|
|
122
|
-
|
|
123
|
-
criteriaBuilder.withExpression(value, { join: Join.Or() });
|
|
124
|
-
}
|
|
125
|
-
else {
|
|
126
|
-
criteriaBuilder.withExpression(value, { join: Join.And() });
|
|
127
|
-
}
|
|
119
|
+
criteriaBuilder.withExpression(value, { join: Join.And() });
|
|
128
120
|
}
|
|
129
121
|
});
|
|
130
122
|
this.value = criteriaBuilder.build();
|
|
@@ -34,14 +34,16 @@ export const getPrefixedFilters = (prefix) => html `
|
|
|
34
34
|
style="margin-bottom: 16px; width: 100%;"
|
|
35
35
|
></rapid-text-field>
|
|
36
36
|
<rapid-button
|
|
37
|
-
|
|
37
|
+
slot="actions-start"
|
|
38
|
+
appearance="primary"
|
|
38
39
|
@click=${(x) => x.saveFilter()}
|
|
39
40
|
:disabled=${(x) => !x.filterName || !x.value}
|
|
40
41
|
>
|
|
41
42
|
Save
|
|
42
43
|
</rapid-button>
|
|
43
44
|
<rapid-button
|
|
44
|
-
|
|
45
|
+
slot="actions-start"
|
|
46
|
+
appearance="primary"
|
|
45
47
|
@click=${(x) => x.deleteFilter()}
|
|
46
48
|
:disabled=${(x) => !x.filterName}
|
|
47
49
|
>
|
|
@@ -5,7 +5,6 @@ export const MULTISELECT_CONTROL_RANK = 4;
|
|
|
5
5
|
export const ENUM_CONTROL_RANK = 3;
|
|
6
6
|
export const SELECT_CONTROL_RANK = 4;
|
|
7
7
|
export const DATE_CONTROL_RANK = 4;
|
|
8
|
-
export const TIME_CONTROL_RANK = 4;
|
|
9
8
|
export const LAYOUT_RANK = 2;
|
|
10
9
|
export const LAYOUT_ARRAY_RANK = 2;
|
|
11
10
|
export const LAYOUT_CATEGORIZATION_RANK = 2;
|
|
@@ -9,21 +9,20 @@ const sec = 999;
|
|
|
9
9
|
export const createExpressions = (payload) => {
|
|
10
10
|
const expressions = {
|
|
11
11
|
options: [],
|
|
12
|
-
arrayOptions: [],
|
|
13
12
|
dateOptions: [],
|
|
14
13
|
numberOptions: [],
|
|
15
14
|
};
|
|
16
15
|
for (const [key, value] of Object.entries(payload)) {
|
|
17
16
|
if ((value && !value.type) || (value && value.max) || (value && value.min)) {
|
|
18
17
|
if (Array.isArray(value)) {
|
|
19
|
-
const
|
|
18
|
+
const optionsExpressions = value.map((item) => {
|
|
20
19
|
return new ExpressionBuilder()
|
|
21
20
|
.withField(key)
|
|
22
21
|
.withValue(item)
|
|
23
22
|
.withSerialiser(Serialisers.EQ)
|
|
24
23
|
.build();
|
|
25
24
|
});
|
|
26
|
-
expressions.
|
|
25
|
+
expressions.options = [...optionsExpressions, ...expressions.options];
|
|
27
26
|
}
|
|
28
27
|
else if (value && (value.min || value.max)) {
|
|
29
28
|
if (value.type == 'number') {
|
|
@@ -38,12 +37,6 @@ export const createExpressions = (payload) => {
|
|
|
38
37
|
...expressions.dateOptions,
|
|
39
38
|
];
|
|
40
39
|
}
|
|
41
|
-
if (value.type == 'time') {
|
|
42
|
-
expressions.dateOptions = [
|
|
43
|
-
...dateNumberExpressions(key, value, 'time'),
|
|
44
|
-
...expressions.dateOptions,
|
|
45
|
-
];
|
|
46
|
-
}
|
|
47
40
|
}
|
|
48
41
|
else {
|
|
49
42
|
const stringOptions = new ExpressionBuilder()
|
|
@@ -64,10 +57,6 @@ const dateNumberExpressions = (key, value, type) => {
|
|
|
64
57
|
startDay = value.min ? convertTimestampToDate(value.min) : undefined;
|
|
65
58
|
endDay = value.max ? convertTimestampToDate(value.max) : undefined;
|
|
66
59
|
}
|
|
67
|
-
if (type == 'time') {
|
|
68
|
-
startDay = value.min ? convertTimeToDateTime(value.min) : undefined;
|
|
69
|
-
endDay = value.max ? convertTimeToDateTime(value.max) : undefined;
|
|
70
|
-
}
|
|
71
60
|
const expressions = [];
|
|
72
61
|
const startExpression = value.min
|
|
73
62
|
? new ExpressionBuilder()
|
|
@@ -93,9 +82,3 @@ const convertTimestampToDate = (timestamp) => {
|
|
|
93
82
|
const year = new Date(timestamp).getUTCFullYear().toString();
|
|
94
83
|
return [year, months, days].join('');
|
|
95
84
|
};
|
|
96
|
-
const convertTimeToDateTime = (time) => {
|
|
97
|
-
// change the value here to append todays date
|
|
98
|
-
const todayDate = convertTimestampToDate(new Date());
|
|
99
|
-
// yyyyMMdd-HH:mm
|
|
100
|
-
return [todayDate, time].join('-');
|
|
101
|
-
};
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@genesislcap/foundation-forms",
|
|
3
3
|
"description": "Genesis Foundation Forms",
|
|
4
|
-
"version": "14.268.4
|
|
4
|
+
"version": "14.268.4",
|
|
5
5
|
"sideEffects": false,
|
|
6
6
|
"license": "SEE LICENSE IN license.txt",
|
|
7
7
|
"main": "dist/esm/index.js",
|
|
@@ -48,23 +48,23 @@
|
|
|
48
48
|
}
|
|
49
49
|
},
|
|
50
50
|
"devDependencies": {
|
|
51
|
-
"@genesislcap/foundation-testing": "14.268.4
|
|
52
|
-
"@genesislcap/genx": "14.268.4
|
|
53
|
-
"@genesislcap/rollup-builder": "14.268.4
|
|
54
|
-
"@genesislcap/ts-builder": "14.268.4
|
|
55
|
-
"@genesislcap/uvu-playwright-builder": "14.268.4
|
|
56
|
-
"@genesislcap/vite-builder": "14.268.4
|
|
57
|
-
"@genesislcap/webpack-builder": "14.268.4
|
|
51
|
+
"@genesislcap/foundation-testing": "14.268.4",
|
|
52
|
+
"@genesislcap/genx": "14.268.4",
|
|
53
|
+
"@genesislcap/rollup-builder": "14.268.4",
|
|
54
|
+
"@genesislcap/ts-builder": "14.268.4",
|
|
55
|
+
"@genesislcap/uvu-playwright-builder": "14.268.4",
|
|
56
|
+
"@genesislcap/vite-builder": "14.268.4",
|
|
57
|
+
"@genesislcap/webpack-builder": "14.268.4",
|
|
58
58
|
"@types/json-schema": "^7.0.11",
|
|
59
59
|
"rimraf": "^5.0.0"
|
|
60
60
|
},
|
|
61
61
|
"dependencies": {
|
|
62
|
-
"@genesislcap/foundation-comms": "14.268.4
|
|
63
|
-
"@genesislcap/foundation-criteria": "14.268.4
|
|
64
|
-
"@genesislcap/foundation-logger": "14.268.4
|
|
65
|
-
"@genesislcap/foundation-notifications": "14.268.4
|
|
66
|
-
"@genesislcap/foundation-ui": "14.268.4
|
|
67
|
-
"@genesislcap/foundation-utils": "14.268.4
|
|
62
|
+
"@genesislcap/foundation-comms": "14.268.4",
|
|
63
|
+
"@genesislcap/foundation-criteria": "14.268.4",
|
|
64
|
+
"@genesislcap/foundation-logger": "14.268.4",
|
|
65
|
+
"@genesislcap/foundation-notifications": "14.268.4",
|
|
66
|
+
"@genesislcap/foundation-ui": "14.268.4",
|
|
67
|
+
"@genesislcap/foundation-utils": "14.268.4",
|
|
68
68
|
"@json-schema-tools/dereferencer": "^1.6.1",
|
|
69
69
|
"@jsonforms/core": "^3.2.1",
|
|
70
70
|
"@microsoft/fast-components": "2.30.6",
|
|
@@ -86,5 +86,5 @@
|
|
|
86
86
|
"access": "public"
|
|
87
87
|
},
|
|
88
88
|
"customElements": "dist/custom-elements.json",
|
|
89
|
-
"gitHead": "
|
|
89
|
+
"gitHead": "0f4ca7a67988ffb11995ec68f6ccf4f7ac98eef5"
|
|
90
90
|
}
|
|
@@ -1,4 +0,0 @@
|
|
|
1
|
-
import { RendererEntry } from '../../types';
|
|
2
|
-
export declare const TimeControlRendererTemplate: (prefix?: string) => import("@microsoft/fast-element").ViewTemplate<any, any>;
|
|
3
|
-
export declare const FilterTimeControlRendererEntry: RendererEntry;
|
|
4
|
-
//# sourceMappingURL=FilterTimeControlRenderer.d.ts.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"FilterTimeControlRenderer.d.ts","sourceRoot":"","sources":["../../../../src/jsonforms/renderers/FilterTimeControlRenderer.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAI5C,eAAO,MAAM,2BAA2B,YAAY,MAAM,6DAwDzD,CAAC;AAEF,eAAO,MAAM,8BAA8B,EAAE,aAM5C,CAAC"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"isTime.d.ts","sourceRoot":"","sources":["../../../../src/jsonforms/testers/isTime.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,WAAW,kCAOvB,CAAC"}
|
|
@@ -1,74 +0,0 @@
|
|
|
1
|
-
import { mapStateToControlProps, rankWith } from '@jsonforms/core';
|
|
2
|
-
import { html } from '@microsoft/fast-element';
|
|
3
|
-
import { isOneOfTime } from '../testers/isTime';
|
|
4
|
-
import { TIME_CONTROL_RANK } from './RenderersRanks';
|
|
5
|
-
export const TimeControlRendererTemplate = (prefix = 'zero') => html `
|
|
6
|
-
<template>
|
|
7
|
-
<control-wrapper :control=${(x) => x.control} ?submitted=${(x) => x.submitted} prefix="${prefix}">
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
<${prefix}-text-field
|
|
11
|
-
:value=${(x) => {
|
|
12
|
-
var _a;
|
|
13
|
-
const time = (_a = x.control.data) === null || _a === void 0 ? void 0 : _a.min;
|
|
14
|
-
if (time === undefined || time === null || time === '')
|
|
15
|
-
return '';
|
|
16
|
-
return `${time}`;
|
|
17
|
-
}}
|
|
18
|
-
|
|
19
|
-
id=${(x) => `min-${x.control.path}`}
|
|
20
|
-
type="time"
|
|
21
|
-
data-test-id=${(x) => `min-${x.control.path}`}
|
|
22
|
-
|
|
23
|
-
@blur=${(x, c) => {
|
|
24
|
-
var _a, _b;
|
|
25
|
-
const minValue = c.event.target.control.value;
|
|
26
|
-
const maxValue = (_a = x.control.data) === null || _a === void 0 ? void 0 : _a.max;
|
|
27
|
-
const setMin = minValue ? minValue : undefined;
|
|
28
|
-
const setMax = maxValue < minValue ? undefined : (_b = x.control.data) === null || _b === void 0 ? void 0 : _b.max;
|
|
29
|
-
x.control.handleChange(x.control.path, {
|
|
30
|
-
min: setMin,
|
|
31
|
-
max: setMax,
|
|
32
|
-
type: 'time',
|
|
33
|
-
});
|
|
34
|
-
x.onBlur();
|
|
35
|
-
}}
|
|
36
|
-
style="width: 100%"
|
|
37
|
-
></${prefix}-text-field>
|
|
38
|
-
|
|
39
|
-
<${prefix}-text-field
|
|
40
|
-
:value=${(x) => {
|
|
41
|
-
var _a;
|
|
42
|
-
const time = (_a = x.control.data) === null || _a === void 0 ? void 0 : _a.max;
|
|
43
|
-
if (time === undefined || time === null || time === '')
|
|
44
|
-
return '';
|
|
45
|
-
return `${time}`;
|
|
46
|
-
}}
|
|
47
|
-
id=${(x) => `max-${x.control.path}`}
|
|
48
|
-
type="time"
|
|
49
|
-
data-test-id=${(x) => `max-${x.control.path}`}
|
|
50
|
-
@blur=${(x, c) => {
|
|
51
|
-
var _a, _b;
|
|
52
|
-
const maxValue = c.event.target.control.value;
|
|
53
|
-
const minValue = (_a = x.control.data) === null || _a === void 0 ? void 0 : _a.min;
|
|
54
|
-
const setMin = minValue > maxValue ? undefined : (_b = x.control.data) === null || _b === void 0 ? void 0 : _b.min;
|
|
55
|
-
const setMax = maxValue ? maxValue : undefined;
|
|
56
|
-
x.control.handleChange(x.control.path, {
|
|
57
|
-
min: setMin,
|
|
58
|
-
max: setMax,
|
|
59
|
-
type: 'time',
|
|
60
|
-
});
|
|
61
|
-
x.onBlur();
|
|
62
|
-
}}
|
|
63
|
-
style="width: 100%"
|
|
64
|
-
></${prefix}-text-field>
|
|
65
|
-
</control-wrapper>
|
|
66
|
-
</template>
|
|
67
|
-
`;
|
|
68
|
-
export const FilterTimeControlRendererEntry = {
|
|
69
|
-
renderer: html `
|
|
70
|
-
${(x) => TimeControlRendererTemplate(x.prefix)}
|
|
71
|
-
`,
|
|
72
|
-
tester: rankWith(TIME_CONTROL_RANK, isOneOfTime),
|
|
73
|
-
mapper: mapStateToControlProps, // TODO: change mapper to handle dates instead of doing it in the template
|
|
74
|
-
};
|
|
@@ -1,5 +0,0 @@
|
|
|
1
|
-
import { or, schemaMatches } from '@jsonforms/core';
|
|
2
|
-
const isTimeDescription = (s) => s.description === 'time';
|
|
3
|
-
const isTime = schemaMatches(isTimeDescription);
|
|
4
|
-
export const isOneOfTime = or(isTime, schemaMatches((schema) => schema.hasOwnProperty('oneOf') &&
|
|
5
|
-
schema.oneOf.some((s) => s.description === 'time')));
|