@genesislcap/foundation-forms 14.268.3 → 14.268.4-alpha-c620667.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 (9) hide show
  1. package/dist/dts/filters/filters.d.ts.map +1 -1
  2. package/dist/dts/filters/filters.template.d.ts.map +1 -1
  3. package/dist/dts/utils/filters.d.ts +1 -0
  4. package/dist/dts/utils/filters.d.ts.map +1 -1
  5. package/dist/esm/filters/filters.js +9 -3
  6. package/dist/esm/filters/filters.template.js +2 -4
  7. package/dist/esm/utils/filters.js +3 -2
  8. package/dist/foundation-forms.d.ts +1 -0
  9. package/package.json +15 -15
package/dist/dts/filters/filters.d.ts.map CHANGED
@@ -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;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
+ {"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;IA8Bb;;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"}
package/dist/dts/filters/filters.template.d.ts.map CHANGED
@@ -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,iEAsFhD,CAAC;AAEF,gBAAgB;AAChB,eAAO,MAAM,yBAAyB,8DAErC,CAAC"}
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,iEAoFhD,CAAC;AAEF,gBAAgB;AAChB,eAAO,MAAM,yBAAyB,8DAErC,CAAC"}
package/dist/dts/utils/filters.d.ts CHANGED
@@ -1,6 +1,7 @@
1
1
  import { Expression } from '@genesislcap/foundation-criteria';
2
2
  type Expressions = {
3
3
  options: Expression[];
4
+ arrayOptions: Expression[];
4
5
  numberOptions: Expression[];
5
6
  dateOptions: Expression[];
6
7
  };
package/dist/dts/utils/filters.d.ts.map CHANGED
@@ -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,aAAa,EAAE,UAAU,EAAE,CAAC;IAC5B,WAAW,EAAE,UAAU,EAAE,CAAC;CAC3B,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,iBAAiB,YAAa,GAAG,gBAyC7C,CAAC"}
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,YAAY,EAAE,UAAU,EAAE,CAAC;IAC3B,aAAa,EAAE,UAAU,EAAE,CAAC;IAC5B,WAAW,EAAE,UAAU,EAAE,CAAC;CAC3B,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,iBAAiB,YAAa,GAAG,gBA0C7C,CAAC"}
package/dist/esm/filters/filters.js CHANGED
@@ -113,10 +113,16 @@ let Filters = class Filters extends FoundationElement {
113
113
  filtersLogger.debug({ payload });
114
114
  if (expressions.dateOptions.length > 0 ||
115
115
  expressions.numberOptions.length > 0 ||
116
- expressions.options.length > 0) {
117
- Object.values(expressions).forEach((value) => {
116
+ expressions.options.length > 0 ||
117
+ expressions.arrayOptions.length > 0) {
118
+ Object.entries(expressions).forEach(([key, value]) => {
118
119
  if (value.length > 0) {
119
- criteriaBuilder.withExpression(value, { join: Join.And() });
120
+ if (key === 'arrayOptions') {
121
+ criteriaBuilder.withExpression(value, { join: Join.Or() });
122
+ }
123
+ else {
124
+ criteriaBuilder.withExpression(value, { join: Join.And() });
125
+ }
120
126
  }
121
127
  });
122
128
  this.value = criteriaBuilder.build();
package/dist/esm/filters/filters.template.js CHANGED
@@ -34,16 +34,14 @@ export const getPrefixedFilters = (prefix) => html `
34
34
  style="margin-bottom: 16px; width: 100%;"
35
35
  ></rapid-text-field>
36
36
  <rapid-button
37
- slot="actions-start"
38
- appearance="primary"
37
+ appearance="secondary"
39
38
  @click=${(x) => x.saveFilter()}
40
39
  :disabled=${(x) => !x.filterName || !x.value}
41
40
  >
42
41
  Save
43
42
  </rapid-button>
44
43
  <rapid-button
45
- slot="actions-start"
46
- appearance="primary"
44
+ appearance="secondary"
47
45
  @click=${(x) => x.deleteFilter()}
48
46
  :disabled=${(x) => !x.filterName}
49
47
  >
package/dist/esm/utils/filters.js CHANGED
@@ -9,20 +9,21 @@ const sec = 999;
9
9
  export const createExpressions = (payload) => {
10
10
  const expressions = {
11
11
  options: [],
12
+ arrayOptions: [],
12
13
  dateOptions: [],
13
14
  numberOptions: [],
14
15
  };
15
16
  for (const [key, value] of Object.entries(payload)) {
16
17
  if ((value && !value.type) || (value && value.max) || (value && value.min)) {
17
18
  if (Array.isArray(value)) {
18
- const optionsExpressions = value.map((item) => {
19
+ const arrayOptions = value.map((item) => {
19
20
  return new ExpressionBuilder()
20
21
  .withField(key)
21
22
  .withValue(item)
22
23
  .withSerialiser(Serialisers.EQ)
23
24
  .build();
24
25
  });
25
- expressions.options = [...optionsExpressions, ...expressions.options];
26
+ expressions.arrayOptions = [...arrayOptions, ...expressions.arrayOptions];
26
27
  }
27
28
  else if (value && (value.min || value.max)) {
28
29
  if (value.type == 'number') {
package/dist/foundation-forms.d.ts CHANGED
@@ -172,6 +172,7 @@ declare class DispatchRenderer extends FASTElement {
172
172
 
173
173
  declare type Expressions = {
174
174
  options: Expression[];
175
+ arrayOptions: Expression[];
175
176
  numberOptions: Expression[];
176
177
  dateOptions: Expression[];
177
178
  };
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.3",
4
+ "version": "14.268.4-alpha-c620667.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.268.3",
52
- "@genesislcap/genx": "14.268.3",
53
- "@genesislcap/rollup-builder": "14.268.3",
54
- "@genesislcap/ts-builder": "14.268.3",
55
- "@genesislcap/uvu-playwright-builder": "14.268.3",
56
- "@genesislcap/vite-builder": "14.268.3",
57
- "@genesislcap/webpack-builder": "14.268.3",
51
+ "@genesislcap/foundation-testing": "14.268.4-alpha-c620667.0",
52
+ "@genesislcap/genx": "14.268.4-alpha-c620667.0",
53
+ "@genesislcap/rollup-builder": "14.268.4-alpha-c620667.0",
54
+ "@genesislcap/ts-builder": "14.268.4-alpha-c620667.0",
55
+ "@genesislcap/uvu-playwright-builder": "14.268.4-alpha-c620667.0",
56
+ "@genesislcap/vite-builder": "14.268.4-alpha-c620667.0",
57
+ "@genesislcap/webpack-builder": "14.268.4-alpha-c620667.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.268.3",
63
- "@genesislcap/foundation-criteria": "14.268.3",
64
- "@genesislcap/foundation-logger": "14.268.3",
65
- "@genesislcap/foundation-notifications": "14.268.3",
66
- "@genesislcap/foundation-ui": "14.268.3",
67
- "@genesislcap/foundation-utils": "14.268.3",
62
+ "@genesislcap/foundation-comms": "14.268.4-alpha-c620667.0",
63
+ "@genesislcap/foundation-criteria": "14.268.4-alpha-c620667.0",
64
+ "@genesislcap/foundation-logger": "14.268.4-alpha-c620667.0",
65
+ "@genesislcap/foundation-notifications": "14.268.4-alpha-c620667.0",
66
+ "@genesislcap/foundation-ui": "14.268.4-alpha-c620667.0",
67
+ "@genesislcap/foundation-utils": "14.268.4-alpha-c620667.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": "5adc8596d5fe7a96f5c3efe289a40d188f432b0e"
89
+ "gitHead": "f20a8d87e72e4a8ac3d89b846f74e4046cf7dfb7"
90
90
  }