Skip to content

Commit 7c4546f

Browse files
committed
Merge branch 'main' of https://github.com/kyma-project/busola into fix-formOpen-state
2 parents 0239169 + d057aa1 commit 7c4546f

File tree

27 files changed

+5054
-7907
lines changed

27 files changed

+5054
-7907
lines changed

backend/package-lock.json

Lines changed: 2555 additions & 5335 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

backend/package.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"author": "",
1414
"license": "ISC",
1515
"dependencies": {
16-
"@babel/runtime": "^7.13.10",
16+
"@babel/runtime": "^7.26.10",
1717
"compression": "^1.8.0",
1818
"cors": "^2.8.5",
1919
"express": "^4.21.2",
@@ -27,17 +27,17 @@
2727
"uuid": "^11.1.0"
2828
},
2929
"devDependencies": {
30-
"@babel/cli": "^7.12.1",
31-
"@babel/node": "^7.12.10",
32-
"@babel/preset-env": "^7.16.11",
33-
"@babel/register": "^7.12.10",
34-
"babel-loader": "^8.2.2",
30+
"@babel/cli": "^7.27.0",
31+
"@babel/node": "^7.26.0",
32+
"@babel/preset-env": "^7.26.9",
33+
"@babel/register": "^7.25.9",
34+
"babel-loader": "^10.0.0",
3535
"core-js": "^3.41.0",
3636
"jest": "^29.7.0",
3737
"nodemon": "^2.0.7",
38-
"webpack": "^5.10.1",
39-
"webpack-cli": "^4.2.0",
40-
"webpack-node-externals": "^2.5.2"
38+
"webpack": "^5.99.5",
39+
"webpack-cli": "6.0.1",
40+
"webpack-node-externals": "^3.0.0"
4141
},
4242
"node": {
4343
"child_process": false

docs/extensibility/50-list-and-details-widgets.md

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,9 +98,10 @@ This is an exaple of kind only:
9898

9999
The `ConditionList` widget renders the conditions as an expandable list with condition details. This widget is primarily designed for the overview section **data.details.status** or **data.details.status.body**
100100

101-
| Parameter | Required | Type | Description |
102-
| -------------- | -------- | ---- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
103-
| **highlights** | No | | A map of highlight rules that will only be applied to the `condition` matching `type`. Key refers to the type of highlight, while the rule can be a plain array of values ​​or a string containing the [JSONata](100-jsonata.md) rule. Allowed keys are `informative`, `positive`, `negative`, `critical`, and `type`. <br><br> With the `type` key (required), you can specify which condition the highlighting must be applied to. It must contain one of the `types` of the source condition. <br><br> If no highlighting is provided, the following values ​​are automatically supported: <br> - rendered as informational: `Unknown`. <br> - rendered as positive: `True`. <br> - rendered as critical: `False`. |
101+
| Parameter | Required | Type | Description |
102+
| ----------------- | -------- | ---- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
103+
| **highlights** | No | | A map of highlight rules that will only be applied to the `condition` matching `type`. Key refers to the type of highlight, while the rule can be a plain array of values ​​or a string containing the [JSONata](100-jsonata.md) rule. Allowed keys are `informative`, `positive`, `negative`, `critical`, and `type`. <br><br> With the `type` key (required), you can specify which condition the highlighting must be applied to. It must contain one of the `types` of the source condition. <br><br> If no highlighting is provided, the following values ​​are automatically supported: <br> - rendered as informational: `Unknown`. <br> - rendered as positive: `True`. <br> - rendered as critical: `False`. |
104+
| **customContent** | No | | Allows adding custom content to specific condition types. Each object contains: <br> - `type` (required): The condition type to match <br> - `value` (required): A string, JSONata expression, or a widget definition to render custom content <br> - `header`: Optional header text for the custom content section <br><br> The custom content is rendered above the condition's default message. |
104105

105106
See the following example of the standard `ConditionList`:
106107

@@ -141,6 +142,24 @@ status:
141142

142143
<img src="./assets/display-widgets/ConditionListHighlights.png" alt="Example of a condition list widget with overriden statuses">
143144

145+
This is an example of `ConditionList` with added custom content:
146+
147+
```yaml
148+
status:
149+
body:
150+
- name: Condition details
151+
widget: ConditionList
152+
source: status.conditions
153+
customContent:
154+
- value:
155+
widget: Badge
156+
source: $filter(status.conditions, function($c){$c.type = 'AbleToScale'}).reason
157+
type: AbleToScale
158+
header: Reason
159+
```
160+
161+
<img src="./assets/display-widgets/ConditionListContent.png" alt="Example of a condition list widget with custom content" width="30%">
162+
144163
### `ExternalLink`
145164

146165
The `ExternalLink` widgets render the link to an external page.
112 KB
Loading

0 commit comments

Comments
 (0)