Merge branch 'main' into installation-state-manager-resource-check

Author: KonradPietocha

backend/.babelrc backend/babel.config.jsonbackend/.babelrc renamed to backend/babel.config.json

@@ -13,7 +13,7 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@babel/runtime": "^7.13.10",
+    "@babel/runtime": "^7.26.10",
     "compression": "^1.8.0",
     "cors": "^2.8.5",
     "express": "^4.21.2",
@@ -27,17 +27,17 @@
     "uuid": "^11.1.0"
   },
   "devDependencies": {
-    "@babel/cli": "^7.12.1",
-    "@babel/node": "^7.12.10",
-    "@babel/preset-env": "^7.16.11",
-    "@babel/register": "^7.12.10",
-    "babel-loader": "^8.2.2",
+    "@babel/cli": "^7.27.0",
+    "@babel/node": "^7.26.0",
+    "@babel/preset-env": "^7.26.9",
+    "@babel/register": "^7.25.9",
+    "babel-loader": "^10.0.0",
     "core-js": "^3.41.0",
     "jest": "^29.7.0",
     "nodemon": "^2.0.7",
-    "webpack": "^5.10.1",
-    "webpack-cli": "^4.2.0",
-    "webpack-node-externals": "^2.5.2"
+    "webpack": "^5.99.5",
+    "webpack-cli": "6.0.1",
+    "webpack-node-externals": "^3.0.0"
   },
   "node": {
     "child_process": false

backend/package-lock.json

@@ -98,9 +98,10 @@ This is an exaple of kind only:
 
 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**
 
-| Parameter      | Required | Type | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           |
-| -------------- | -------- | ---- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| **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`. |
+| Parameter         | Required | Type | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           |
+| ----------------- | -------- | ---- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| **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`. |
+| **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.                                                                                                                                                                                                                                                                                                                    |
 
 See the following example of the standard `ConditionList`:
 
@@ -141,6 +142,24 @@ status:
 
 <img src="./assets/display-widgets/ConditionListHighlights.png" alt="Example of a condition list widget with overriden statuses">
 
+This is an example of `ConditionList` with added custom content:
+
+```yaml
+status:
+  body:
+    - name: Condition details
+      widget: ConditionList
+      source: status.conditions
+      customContent:
+        - value:
+            widget: Badge
+            source: $filter(status.conditions, function($c){$c.type = 'AbleToScale'}).reason
+          type: AbleToScale
+          header: Reason
+```
+
+<img src="./assets/display-widgets/ConditionListContent.png" alt="Example of a condition list widget with custom content" width="30%">
+
 ### `ExternalLink`
 
 The `ExternalLink` widgets render the link to an external page.

backend/package.json

@@ -1,12 +1,12 @@
-const fetch = require('node-fetch');
-const URL = require('url').URL;
-const fs = require('fs');
-const jsyaml = require('js-yaml');
+import fetch from 'node-fetch';
+import { URL } from 'url';
+import { readFile, lstatSync, readdirSync } from 'fs';
+import { load, dump } from 'js-yaml';
 
-const gulp = require('gulp');
-const through2 = require('through2');
-const concat = require('gulp-concat');
-const clean = require('gulp-clean');
+import { task, src, dest } from 'gulp';
+import { obj as _obj } from 'through2';
+import concat from 'gulp-concat';
+import clean from 'gulp-clean';
 
 const mapValues = (obj, fn) =>
   Object.fromEntries(
@@ -21,12 +21,12 @@ const isUrl = str => {
   }
 };
 
-const loadExtensions = through2.obj(async function(extensionsFile, _, cb) {
+const loadExtensions = _obj(async function(extensionsFile, _, cb) {
   const list = JSON.parse(extensionsFile.contents.toString());
 
   const readLocalFile = filePath =>
     new Promise((resolve, reject) =>
-      fs.readFile(filePath, (err, data) => {
+      readFile(filePath, (err, data) => {
         if (err) {
           reject(err);
         } else {
@@ -50,9 +50,8 @@ const loadExtensions = through2.obj(async function(extensionsFile, _, cb) {
     if (isUrl(source)) {
       return readExternalFile(source);
     } else {
-      if (fs.lstatSync(source).isDirectory()) {
-        return fs
-          .readdirSync(source)
+      if (lstatSync(source).isDirectory()) {
+        return readdirSync(source)
           .map(name => readLocalFile(source + '/' + name));
       } else {
         return readLocalFile(source);
@@ -71,9 +70,9 @@ const loadExtensions = through2.obj(async function(extensionsFile, _, cb) {
   cb();
 });
 
-const loadPreparedExtensions = through2.obj((file, _, cb) => {
+const loadPreparedExtensions = _obj((file, _, cb) => {
   const convertYamlToObject = yamlString => {
-    return jsyaml.load(yamlString, { json: true });
+    return load(yamlString, { json: true });
   };
 
   const checkExtensionVersion = metadata => {
@@ -87,102 +86,93 @@ const loadPreparedExtensions = through2.obj((file, _, cb) => {
     }
   };
 
-  const { data, metadata } = jsyaml.load(file.contents.toString());
+  const { data, metadata } = load(file.contents.toString());
 
   checkExtensionVersion(metadata);
 
   file.contents = Buffer.from(
-    jsyaml.dump(mapValues(data, convertYamlToObject)),
+    dump(mapValues(data, convertYamlToObject)),
   );
   cb(null, file);
 });
 
-gulp.task('clean-extensions', () => {
+task('clean-extensions', () => {
   const env = process.env.ENV;
-  return gulp
-    .src(`environments/temp/${env}/extensions-local`, {
+  return src(`environments/temp/${env}/extensions-local`, {
       read: false,
       allowEmpty: true,
     })
     .pipe(clean({ force: true }));
 });
 
-gulp.task('get-extensions', () => {
-  return gulp
-    .src(`environments/${process.env.ENV}/extensions.json`)
+task('get-extensions', () => {
+  return src(`environments/${process.env.ENV}/extensions.json`)
     .pipe(loadExtensions)
-    .pipe(gulp.dest(`temp/${process.env.ENV}/extensions-local/-/-`)); // gulp strips the 2 last path components?
+    .pipe(dest(`temp/${process.env.ENV}/extensions-local/-/-`)); // gulp strips the 2 last path components?
 });
 
-gulp.task('pack-extensions', () => {
+task('pack-extensions', () => {
   const env = process.env.ENV;
-  return gulp
-    .src(`temp/${env}/extensions-local/**/*.yaml`)
+  return src(`temp/${env}/extensions-local/**/*.yaml`)
     .pipe(loadPreparedExtensions)
     .pipe(
       concat('extensions.yaml', {
         newLine: '---\n',
       }),
     )
-    .pipe(gulp.dest(`build/${env}/extensions`));
+    .pipe(dest(`build/${env}/extensions`));
 });
 
-gulp.task('clean-statics', () => {
+task('clean-statics', () => {
   const env = process.env.ENV;
-  return gulp
-    .src(`environments/temp/${env}/extensions/statics-local`, {
+  return src(`environments/temp/${env}/extensions/statics-local`, {
       read: false,
       allowEmpty: true,
     })
     .pipe(clean());
 });
 
-gulp.task('get-statics', () => {
-  return gulp
-    .src(`environments/${process.env.ENV}/statics.json`)
+task('get-statics', () => {
+  return src(`environments/${process.env.ENV}/statics.json`)
     .pipe(loadExtensions)
-    .pipe(gulp.dest(`temp/${process.env.ENV}/statics-local/-/-`)); // gulp strips the 2 last path components?
+    .pipe(dest(`temp/${process.env.ENV}/statics-local/-/-`)); // gulp strips the 2 last path components?
 });
 
-gulp.task('pack-statics', () => {
+task('pack-statics', () => {
   const env = process.env.ENV;
-  return gulp
-    .src(`temp/${env}/statics-local/**/*.yaml`)
+  return src(`temp/${env}/statics-local/**/*.yaml`)
     .pipe(loadPreparedExtensions)
     .pipe(
       concat('statics.yaml', {
         newLine: '---\n',
       }),
     )
-    .pipe(gulp.dest(`build${env}/extensions`));
+    .pipe(dest(`build${env}/extensions`));
 });
 
-gulp.task('clean-wizards', () => {
+task('clean-wizards', () => {
   const env = process.env.ENV;
-  return gulp
-    .src(`environments/temp/${env}/extensions/wizards-local`, {
+  return src(`environments/temp/${env}/extensions/wizards-local`, {
       read: false,
       allowEmpty: true,
     })
     .pipe(clean());
 });
 
-gulp.task('get-wizards', () => {
-  return gulp
-    .src(`environments/${process.env.ENV}/wizards.json`)
+task('get-wizards', () => {
+  return src(`environments/${process.env.ENV}/wizards.json`)
     .pipe(loadExtensions)
-    .pipe(gulp.dest(`temp/${process.env.ENV}/wizards-local/-/-`)); // gulp strips the 2 last path components?
+    .pipe(dest(`temp/${process.env.ENV}/wizards-local/-/-`)); // gulp strips the 2 last path components?
 });
 
-gulp.task('pack-wizards', () => {
+task('pack-wizards', () => {
   const env = process.env.ENV;
-  return gulp
-    .src(`temp/${env}/wizards-local/**/*.yaml`)
+  return src(`temp/${env}/wizards-local/**/*.yaml`)
     .pipe(loadPreparedExtensions)
     .pipe(
       concat('wizards.yaml', {
         newLine: '---\n',
       }),
     )
-    .pipe(gulp.dest(`build/${env}/extensions`));
+    .pipe(dest(`build/${env}/extensions`));
 });