@dative-gpi/foundation-core-components 1.0.144 → 1.0.145

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/components/customProperties/helpers.ts +59 -57
  2. package/package.json +7 -7
package/components/customProperties/helpers.ts CHANGED
@@ -1,81 +1,83 @@
1
1
  import { useDateExpression } from "@dative-gpi/foundation-shared-services/composables";
2
2
  import { FilterType, PropertyDataType } from "@dative-gpi/foundation-shared-domain/enums";
3
3
 
4
- import { type CustomPropertyInfos, } from "../../../foundation-core-domain/models";
4
+ import { type CustomPropertyInfos } from "@dative-gpi/foundation-core-domain/models";
5
5
 
6
6
  const { convert: convertExpressionToEpoch } = useDateExpression();
7
7
 
8
8
  export const getColor = (property: CustomPropertyInfos, value: string): string | undefined => {
9
- if (property.colorful) {
10
- for (const color of [...property.colorMap].sort((a, b) => b.priority - a.priority)) {
11
- let filterValues = [...color.filterValues];
12
- if ([PropertyDataType.DateTime].includes(property.dataType)) {
13
- filterValues = filterValues.map(fv => convertExpressionToEpoch(fv).toString());
9
+ if (!property.colorful) {
10
+ return undefined;
11
+ }
12
+
13
+ for (const color of [...property.colorMap].sort((a, b) => b.priority - a.priority)) {
14
+ let filterValues = [...color.filterValues];
15
+ if ([PropertyDataType.DateTime].includes(property.dataType)) {
16
+ filterValues = filterValues.map(fv => convertExpressionToEpoch(fv).toString());
17
+ }
18
+ switch (color.filterType) {
19
+ case FilterType.None: return color.color;
20
+ case FilterType.Equal: {
21
+ if (filterValues.includes(value)) {
22
+ return color.color;
23
+ }
24
+ break;
14
25
  }
15
- switch (color.filterType) {
16
- case FilterType.None: return color.color;
17
- case FilterType.Equal: {
18
- if (filterValues.includes(value)) {
26
+ case FilterType.More: {
27
+ if (!isNaN(parseFloat(value))) {
28
+ if (filterValues.some(fv => !isNaN(parseFloat(fv)) && parseFloat(fv) < parseFloat(value))) {
19
29
  return color.color;
20
30
  }
21
- break;
22
- }
23
- case FilterType.More: {
24
- if (!isNaN(parseFloat(value))) {
25
- if (filterValues.some(fv => !isNaN(parseFloat(fv)) && parseFloat(fv) < parseFloat(value))) {
26
- return color.color;
27
- }
28
- }
29
- break;
30
- }
31
- case FilterType.Less: {
32
- if (!isNaN(parseFloat(value))) {
33
- if (filterValues.some(fv => !isNaN(parseFloat(fv)) && parseFloat(fv) > parseFloat(value))) {
34
- return color.color;
35
- }
36
- }
37
- break;
38
- }
39
- case FilterType.MoreOrEqual: {
40
- if (!isNaN(parseFloat(value))) {
41
- if (filterValues.some(fv => !isNaN(parseFloat(fv)) && parseFloat(fv) <= parseFloat(value))) {
42
- return color.color;
43
- }
44
- }
45
- break;
46
- }
47
- case FilterType.LessOrEqual: {
48
- if (!isNaN(parseFloat(value))) {
49
- if (filterValues.some(fv => !isNaN(parseFloat(fv)) && parseFloat(fv) >= parseFloat(value))) {
50
- return color.color;
51
- }
52
- }
53
- break;
54
31
  }
55
- case FilterType.Different: {
56
- if (!filterValues.includes(value)) {
32
+ break;
33
+ }
34
+ case FilterType.Less: {
35
+ if (!isNaN(parseFloat(value))) {
36
+ if (filterValues.some(fv => !isNaN(parseFloat(fv)) && parseFloat(fv) > parseFloat(value))) {
57
37
  return color.color;
58
38
  }
59
- break;
60
39
  }
61
- case FilterType.Contains: {
62
- if (filterValues.some(fv => value.includes(fv))) {
40
+ break;
41
+ }
42
+ case FilterType.MoreOrEqual: {
43
+ if (!isNaN(parseFloat(value))) {
44
+ if (filterValues.some(fv => !isNaN(parseFloat(fv)) && parseFloat(fv) <= parseFloat(value))) {
63
45
  return color.color;
64
46
  }
65
- break;
66
47
  }
67
- case FilterType.StartsWith: {
68
- if (filterValues.some(fv => value.startsWith(fv))) {
48
+ break;
49
+ }
50
+ case FilterType.LessOrEqual: {
51
+ if (!isNaN(parseFloat(value))) {
52
+ if (filterValues.some(fv => !isNaN(parseFloat(fv)) && parseFloat(fv) >= parseFloat(value))) {
69
53
  return color.color;
70
54
  }
71
- break;
72
55
  }
73
- case FilterType.EndsWith: {
74
- if (filterValues.some(fv => value.endsWith(fv))) {
75
- return color.color;
76
- }
77
- break;
56
+ break;
57
+ }
58
+ case FilterType.Different: {
59
+ if (!filterValues.includes(value)) {
60
+ return color.color;
61
+ }
62
+ break;
63
+ }
64
+ case FilterType.Contains: {
65
+ if (filterValues.some(fv => value.includes(fv))) {
66
+ return color.color;
67
+ }
68
+ break;
69
+ }
70
+ case FilterType.StartsWith: {
71
+ if (filterValues.some(fv => value.startsWith(fv))) {
72
+ return color.color;
73
+ }
74
+ break;
75
+ }
76
+ case FilterType.EndsWith: {
77
+ if (filterValues.some(fv => value.endsWith(fv))) {
78
+ return color.color;
78
79
  }
80
+ break;
79
81
  }
80
82
  }
81
83
  }
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@dative-gpi/foundation-core-components",
3
3
  "sideEffects": false,
4
- "version": "1.0.144",
4
+ "version": "1.0.145",
5
5
  "description": "",
6
6
  "publishConfig": {
7
7
  "access": "public"
@@ -10,11 +10,11 @@
10
10
  "author": "",
11
11
  "license": "ISC",
12
12
  "dependencies": {
13
- "@dative-gpi/foundation-core-domain": "1.0.144",
14
- "@dative-gpi/foundation-core-services": "1.0.144",
15
- "@dative-gpi/foundation-shared-components": "1.0.144",
16
- "@dative-gpi/foundation-shared-domain": "1.0.144",
17
- "@dative-gpi/foundation-shared-services": "1.0.144"
13
+ "@dative-gpi/foundation-core-domain": "1.0.145",
14
+ "@dative-gpi/foundation-core-services": "1.0.145",
15
+ "@dative-gpi/foundation-shared-components": "1.0.145",
16
+ "@dative-gpi/foundation-shared-domain": "1.0.145",
17
+ "@dative-gpi/foundation-shared-services": "1.0.145"
18
18
  },
19
19
  "peerDependencies": {
20
20
  "@dative-gpi/bones-ui": "^1.0.0",
@@ -26,5 +26,5 @@
26
26
  "sass": "1.71.1",
27
27
  "sass-loader": "13.3.2"
28
28
  },
29
- "gitHead": "885ad0c42bb531c28c3d0f948e343b0e6cea912b"
29
+ "gitHead": "6c88c1ce189ab312cb04f5956ca391e94b1a0dbe"
30
30
  }