@genesislcap/foundation-forms 14.278.3-alpha-5ef80da.0 → 14.280.0

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.
Files changed (2) hide show
  1. package/dist/esm/utils/filters.js +28 -32
  2. package/package.json +15 -15
package/dist/esm/utils/filters.js CHANGED
@@ -27,19 +27,19 @@ export const createExpressions = (payload) => {
27
27
  else if (value && (value.min || value.max)) {
28
28
  if (value.type == 'number') {
29
29
  expressions.numberOptions = [
30
- ...rangeExpressions(key, value, 'number'),
30
+ ...dateNumberExpressions(key, value, 'number'),
31
31
  ...expressions.numberOptions,
32
32
  ];
33
33
  }
34
34
  if (value.type == 'date') {
35
35
  expressions.dateOptions = [
36
- ...rangeExpressions(key, value, 'date'),
36
+ ...dateNumberExpressions(key, value, 'date'),
37
37
  ...expressions.dateOptions,
38
38
  ];
39
39
  }
40
40
  if (value.type == 'time') {
41
41
  expressions.dateOptions = [
42
- ...rangeExpressions(key, value, 'time'),
42
+ ...dateNumberExpressions(key, value, 'time'),
43
43
  ...expressions.dateOptions,
44
44
  ];
45
45
  }
@@ -80,44 +80,40 @@ export const createExpressions = (payload) => {
80
80
  .withSerialiser(Serialisers.containsIgnoreCase)
81
81
  .build();
82
82
  }
83
- expressions.options.push(stringOptions);
83
+ expressions.options = [stringOptions, ...expressions.options];
84
84
  }
85
85
  }
86
86
  }
87
87
  return expressions;
88
88
  };
89
- const rangeExpressions = (key, value, type) => {
90
- let start;
91
- let end;
92
- switch (type) {
93
- case 'date':
94
- start = value.min ? convertTimestampToDate(value.min) : undefined;
95
- end = value.max ? convertTimestampToDate(value.max) : undefined;
96
- break;
97
- case 'time':
98
- start = value.min ? convertTimeToDateTime(value.min) : undefined;
99
- end = value.max ? convertTimeToDateTime(value.max) : undefined;
100
- break;
101
- case 'number':
102
- default:
103
- start = value.min;
104
- end = value.max;
89
+ const dateNumberExpressions = (key, value, type) => {
90
+ let startDay;
91
+ let endDay;
92
+ if (type == 'date') {
93
+ startDay = value.min ? convertTimestampToDate(value.min) : undefined;
94
+ endDay = value.max ? convertTimestampToDate(value.max) : undefined;
95
+ }
96
+ if (type == 'time') {
97
+ startDay = value.min ? convertTimeToDateTime(value.min) : undefined;
98
+ endDay = value.max ? convertTimeToDateTime(value.max) : undefined;
105
99
  }
106
100
  const expressions = [];
107
- if (value.min !== undefined) {
108
- expressions.push(new ExpressionBuilder()
101
+ const startExpression = value.min
102
+ ? new ExpressionBuilder()
109
103
  .withField(key)
110
- .withValue(start)
111
- .withSerialiser(type === 'date' ? Serialisers.dateIsGreaterEqual : Serialisers.GE)
112
- .build());
113
- }
114
- if (value.max !== undefined) {
115
- expressions.push(new ExpressionBuilder()
104
+ .withValue(startDay !== null && startDay !== void 0 ? startDay : value.min)
105
+ .withSerialiser(startDay ? Serialisers.dateIsGreaterEqual : Serialisers.GE)
106
+ .build()
107
+ : undefined;
108
+ const endExpression = value.max
109
+ ? new ExpressionBuilder()
116
110
  .withField(key)
117
- .withValue(end)
118
- .withSerialiser(type === 'date' ? Serialisers.dateIsLessEqual : Serialisers.LE)
119
- .build());
120
- }
111
+ .withValue(endDay !== null && endDay !== void 0 ? endDay : value.max)
112
+ .withSerialiser(endDay ? Serialisers.dateIsLessEqual : Serialisers.LE)
113
+ .build()
114
+ : undefined;
115
+ startExpression ? expressions.push(startExpression) : '';
116
+ endExpression ? expressions.push(endExpression) : '';
121
117
  return expressions;
122
118
  };
123
119
  const convertTimestampToDate = (timestamp) => {
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.278.3-alpha-5ef80da.0",
4
+ "version": "14.280.0",
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.278.3-alpha-5ef80da.0",
52
- "@genesislcap/genx": "14.278.3-alpha-5ef80da.0",
53
- "@genesislcap/rollup-builder": "14.278.3-alpha-5ef80da.0",
54
- "@genesislcap/ts-builder": "14.278.3-alpha-5ef80da.0",
55
- "@genesislcap/uvu-playwright-builder": "14.278.3-alpha-5ef80da.0",
56
- "@genesislcap/vite-builder": "14.278.3-alpha-5ef80da.0",
57
- "@genesislcap/webpack-builder": "14.278.3-alpha-5ef80da.0",
51
+ "@genesislcap/foundation-testing": "14.280.0",
52
+ "@genesislcap/genx": "14.280.0",
53
+ "@genesislcap/rollup-builder": "14.280.0",
54
+ "@genesislcap/ts-builder": "14.280.0",
55
+ "@genesislcap/uvu-playwright-builder": "14.280.0",
56
+ "@genesislcap/vite-builder": "14.280.0",
57
+ "@genesislcap/webpack-builder": "14.280.0",
58
58
  "@types/json-schema": "^7.0.11",
59
59
  "rimraf": "^5.0.0"
60
60
  },
61
61
  "dependencies": {
62
- "@genesislcap/foundation-comms": "14.278.3-alpha-5ef80da.0",
63
- "@genesislcap/foundation-criteria": "14.278.3-alpha-5ef80da.0",
64
- "@genesislcap/foundation-logger": "14.278.3-alpha-5ef80da.0",
65
- "@genesislcap/foundation-notifications": "14.278.3-alpha-5ef80da.0",
66
- "@genesislcap/foundation-ui": "14.278.3-alpha-5ef80da.0",
67
- "@genesislcap/foundation-utils": "14.278.3-alpha-5ef80da.0",
62
+ "@genesislcap/foundation-comms": "14.280.0",
63
+ "@genesislcap/foundation-criteria": "14.280.0",
64
+ "@genesislcap/foundation-logger": "14.280.0",
65
+ "@genesislcap/foundation-notifications": "14.280.0",
66
+ "@genesislcap/foundation-ui": "14.280.0",
67
+ "@genesislcap/foundation-utils": "14.280.0",
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": "1ae5cce744c43846e16858f04b5237117e91d7c9"
89
+ "gitHead": "7e89766c4e599c7eea739cd24de3be1e65357472"
90
90
  }