@equinor/fusion-framework-cli 10.7.4-next-c88655f3c93bff52499b1301c9a009301f818f5a → 10.7.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/CHANGELOG.md +2 -2
- package/dist/bin/dev-portal/ContextSelector/useContextResolver.js +65 -20
- package/dist/bin/dev-portal/ContextSelector/useContextResolver.js.map +1 -1
- package/dist/bin/public/assets/{index-zNJWGyEE.js → index-Cyqq53lr.js} +70 -70
- package/dist/bin/public/index.html +1 -1
- package/dist/types/version.d.ts +1 -1
- package/dist/version.js +1 -1
- package/package.json +16 -16
package/CHANGELOG.md
CHANGED
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
# Change Log
|
|
2
2
|
|
|
3
|
-
## 10.7.4
|
|
3
|
+
## 10.7.4
|
|
4
4
|
|
|
5
5
|
### Patch Changes
|
|
6
6
|
|
|
7
|
-
-
|
|
7
|
+
- [#3064](https://github.com/equinor/fusion-framework/pull/3064) [`231e24e`](https://github.com/equinor/fusion-framework/commit/231e24eef9ca33db2fbde2fdd1c918eeb620c8c4) Thanks [@asbjornhaland](https://github.com/asbjornhaland)! - Add support for html and svg in meta and graphic for context result
|
|
8
8
|
|
|
9
9
|
## 10.7.3
|
|
10
10
|
|
|
@@ -9,6 +9,52 @@ import { EMPTY, catchError, lastValueFrom, map, of } from 'rxjs';
|
|
|
9
9
|
function capitalizeFirstLetter(string) {
|
|
10
10
|
return string.charAt(0).toUpperCase() + string.slice(1).toLowerCase();
|
|
11
11
|
}
|
|
12
|
+
function convertGraphic(graphic) {
|
|
13
|
+
if (graphic === undefined) {
|
|
14
|
+
return {};
|
|
15
|
+
}
|
|
16
|
+
if (typeof graphic === 'string') {
|
|
17
|
+
return {
|
|
18
|
+
graphicType: graphic.startsWith('<')
|
|
19
|
+
? 'inline-html'
|
|
20
|
+
: 'eds',
|
|
21
|
+
graphic: graphic,
|
|
22
|
+
};
|
|
23
|
+
}
|
|
24
|
+
if (graphic.type === 'svg') {
|
|
25
|
+
return {
|
|
26
|
+
graphicType: 'inline-svg',
|
|
27
|
+
graphic: graphic.content,
|
|
28
|
+
};
|
|
29
|
+
}
|
|
30
|
+
return {
|
|
31
|
+
graphicType: 'inline-html',
|
|
32
|
+
graphic: graphic.content,
|
|
33
|
+
};
|
|
34
|
+
}
|
|
35
|
+
function convertMeta(meta) {
|
|
36
|
+
if (meta === undefined) {
|
|
37
|
+
return {};
|
|
38
|
+
}
|
|
39
|
+
if (typeof meta === 'string') {
|
|
40
|
+
return {
|
|
41
|
+
metaType: meta.startsWith('<')
|
|
42
|
+
? 'inline-html'
|
|
43
|
+
: 'eds',
|
|
44
|
+
meta: meta,
|
|
45
|
+
};
|
|
46
|
+
}
|
|
47
|
+
if (meta.type === 'svg') {
|
|
48
|
+
return {
|
|
49
|
+
metaType: 'inline-svg',
|
|
50
|
+
meta: meta.content,
|
|
51
|
+
};
|
|
52
|
+
}
|
|
53
|
+
return {
|
|
54
|
+
metaType: 'inline-html',
|
|
55
|
+
meta: meta.content,
|
|
56
|
+
};
|
|
57
|
+
}
|
|
12
58
|
/**
|
|
13
59
|
* Map context query result to ContextSelectorResult.
|
|
14
60
|
* Add any icons to selected types by using the 'graphic' property
|
|
@@ -21,28 +67,27 @@ const mapper = (src) => {
|
|
|
21
67
|
id: i.id,
|
|
22
68
|
title: i.title,
|
|
23
69
|
subTitle: i.subTitle ?? i.type.id,
|
|
24
|
-
|
|
25
|
-
|
|
70
|
+
...convertGraphic(i.graphic),
|
|
71
|
+
...convertMeta(i.meta),
|
|
26
72
|
};
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
default:
|
|
44
|
-
return baseResult;
|
|
73
|
+
// Displays the status of the EquinorTask if it is not 'active'
|
|
74
|
+
const isEquinorTaskInactive = !!(i.value.taskState && i.value.taskState.toLowerCase() !== 'active');
|
|
75
|
+
if (i.type.id === 'EquinorTask' && isEquinorTaskInactive) {
|
|
76
|
+
baseResult.meta = `<fwc-chip disabled variant="outlined" value="${i.value.taskState}" />`;
|
|
77
|
+
baseResult.metaType = 'inline-html';
|
|
78
|
+
}
|
|
79
|
+
if (i.type.id === 'OrgChart') {
|
|
80
|
+
// Org charts should always have 'list' icon
|
|
81
|
+
baseResult.graphic = 'list';
|
|
82
|
+
baseResult.graphicType = 'eds';
|
|
83
|
+
// Displays the org chart status if it is not 'active'
|
|
84
|
+
const isOrgChartInactive = !!(i.value.state && i.value.state.toLowerCase() !== 'active');
|
|
85
|
+
if (isOrgChartInactive) {
|
|
86
|
+
baseResult.meta = `<fwc-chip disabled variant="outlined" value="${capitalizeFirstLetter(i.value.state ?? '')}" />`;
|
|
87
|
+
baseResult.metaType = 'inline-html';
|
|
88
|
+
}
|
|
45
89
|
}
|
|
90
|
+
return baseResult;
|
|
46
91
|
});
|
|
47
92
|
};
|
|
48
93
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useContextResolver.js","sourceRoot":"","sources":["../../../../src/bin/dev-portal/ContextSelector/useContextResolver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAClE,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAC/D,OAAO,EAAE,aAAa,EAAE,MAAM,qCAAqC,CAAC;AAQpE,OAAO,EAAE,kBAAkB,EAAE,yBAAyB,EAAE,MAAM,kCAAkC,CAAC;AACjG,OAAO,+BAA+B,CAAC;AACvC,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AACtD,WAAW,CAAC;AAEZ,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE,aAAa,EAAE,GAAG,EAAE,EAAE,EAAE,MAAM,MAAM,CAAC;AAWjE,SAAS,qBAAqB,CAAC,MAAc;IAC3C,OAAO,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;AACxE,CAAC;AAED
|
|
1
|
+
{"version":3,"file":"useContextResolver.js","sourceRoot":"","sources":["../../../../src/bin/dev-portal/ContextSelector/useContextResolver.ts"],"names":[],"mappings":"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"}
|