@grafana/k6-test-builder 0.8.7 → 0.8.9

package/dist/index.d.ts

@@ -203,12 +203,15 @@ type ThresholdValue = string | {
     abortOnFail: boolean;
 };
 type Thresholds = Record<string, ThresholdValue[]>;
+interface CloudOptions {
+    distribution: Record<string, LoadZoneOption>;
+    apm: APM[];
+}
 export interface LogOptions {
-    ext: {
-        loadimpact: {
-            distribution: Record<string, LoadZoneOption>;
-            apm: APM[];
-        };
+    cloud: CloudOptions;
+    /** @deprecated Only old (pre cloud options) tests has this property */
+    ext?: {
+        loadimpact: CloudOptions;
     };
     /** @deprecated Only old (pre scenarios) tests has this property */
     stages?: RampingStage[];

package/dist/index.js

@@ -609,13 +609,11 @@ const $e96a968658210988$export$807b1b70df68fbc6 = {
 const $e96a968658210988$export$93ca5d3f8675ae4c = {
     vus: 20,
     duration: "5m",
-    ext: {
-        loadimpact: {
-            distribution: {
-                "amazon:us:ashburn": {
-                    loadZone: "amazon:us:ashburn",
-                    percent: 100
-                }
+    cloud: {
+        distribution: {
+            "amazon:us:ashburn": {
+                loadZone: "amazon:us:ashburn",
+                percent: 100
             }
         }
     }
@@ -2569,6 +2567,7 @@ class $5e61066313dfdf41$export$d74eb9a6e453f567 {
         $5e61066313dfdf41$var$_defineProperty(this, "request", void 0);
         $5e61066313dfdf41$var$_defineProperty(this, "variables", []);
         $5e61066313dfdf41$var$_defineProperty(this, "sleep", void 0);
+        $5e61066313dfdf41$var$_defineProperty(this, "startedDateTime", "");
         // Note: har-to-k6 will not add automatic sleep if we pass an empty array
         this.sleep = sleep && sleep.length ? sleep : undefined;
         const { config: config , request: request , checks: checks , variables: variables  } = node;
@@ -2606,6 +2605,7 @@ class $9c9b5794851acede$export$437940182842cc21 {
         $9c9b5794851acede$var$_defineProperty(this, "title", void 0);
         $9c9b5794851acede$var$_defineProperty(this, "name", void 0);
         $9c9b5794851acede$var$_defineProperty(this, "sleep", void 0);
+        $9c9b5794851acede$var$_defineProperty(this, "startedDateTime", "");
         const { id: id , title: title , name: name  } = node;
         this.id = id;
         this.title = title;
@@ -2652,11 +2652,9 @@ class $08703cbb0c917710$export$e5858e3f1a067a7 {
     static getEmptyLog() {
         return {
             options: {
-                ext: {
-                    loadimpact: {
-                        distribution: {},
-                        apm: []
-                    }
+                cloud: {
+                    distribution: {},
+                    apm: []
                 },
                 thresholds: {},
                 scenarios: {}
@@ -3686,20 +3684,16 @@ function $4f39a7e6764d7df8$export$ce9e7b45132a9c55(apm) {
 }
 
 
-const $49f027a0602fd918$export$892f281b890b5148 = ({ loadZones: loadZones , apm: apm  })=>{
+const $b0785620de6fffeb$export$eea562e3d032aaa4 = ({ loadZones: loadZones , apm: apm  })=>{
     const distribution = (0, $19f0e6d9506aaebf$export$365e3fcb5ffcc8c6)(loadZones);
     const serializedAPM = (0, $4f39a7e6764d7df8$export$ce9e7b45132a9c55)(apm);
     if (serializedAPM.length > 0) return {
-        loadimpact: {
-            distribution: distribution,
-            apm: serializedAPM
-        }
+        distribution: distribution,
+        apm: serializedAPM
     };
     return {
-        loadimpact: {
-            distribution: distribution,
-            apm: []
-        }
+        distribution: distribution,
+        apm: []
     };
 };
 
@@ -4048,7 +4042,7 @@ class $09bbc5e14b02adac$export$dbf96015a8a67c16 {
     }
     static createLogOptions(loadZones, thresholds, apm) {
         return {
-            ext: (0, $49f027a0602fd918$export$892f281b890b5148)({
+            cloud: (0, $b0785620de6fffeb$export$eea562e3d032aaa4)({
                 loadZones: loadZones,
                 apm: apm
             }),
@@ -4468,9 +4462,11 @@ class $27b7f69a914929cd$export$1576fc997deee1a4 {
         });
     }
     getLoadZonesFromOptions(options) {
-        const { ext: ext  } = options || {};
-        if (!ext || !ext.loadimpact || !ext.loadimpact.distribution) return this.loadZones;
-        return Object.values(ext.loadimpact.distribution);
+        const { cloud: cloud , ext: ext  } = options || {};
+        const legacyPath = ext && ext.loadimpact;
+        const cloudOptions = cloud || legacyPath;
+        if (!cloudOptions || !cloudOptions.distribution) return this.loadZones;
+        return Object.values(cloudOptions.distribution);
     }
     getThresholdsFromOptions(options) {
         const { thresholds: thresholds  } = options || {};
@@ -5848,7 +5844,7 @@ const $2f1b8f749d0252f0$export$5820f661515dab4f = /*#__PURE__*/ (0, ($parcel$int
 ], ({ theme: theme  })=>theme.palette.background.paper, ({ theme: theme  })=>theme.palette.text.secondary, ({ theme: theme  })=>theme.palette.background.default, ({ theme: theme  })=>theme.palette.background.default, $2f1b8f749d0252f0$export$eddf54ea3db8d0f0, $2f1b8f749d0252f0$export$a0c24614540b0efb, $2f1b8f749d0252f0$export$a0c24614540b0efb, $2f1b8f749d0252f0$export$eddf54ea3db8d0f0, $2f1b8f749d0252f0$export$eddf54ea3db8d0f0, $2f1b8f749d0252f0$export$f06e977173f1857c, $2f1b8f749d0252f0$export$7004694e7c14858d, $2f1b8f749d0252f0$export$cb8e6a2fd2fdc16b, $2f1b8f749d0252f0$export$a0c24614540b0efb, $2f1b8f749d0252f0$export$eddf54ea3db8d0f0, $2f1b8f749d0252f0$export$f06e977173f1857c, $2f1b8f749d0252f0$export$f06e977173f1857c, $2f1b8f749d0252f0$export$f06e977173f1857c, $2f1b8f749d0252f0$export$f06e977173f1857c, $2f1b8f749d0252f0$export$f06e977173f1857c);
 const $2f1b8f749d0252f0$export$1c180cb67301903c = /*#__PURE__*/ (0, ($parcel$interopDefault($gkIgo$styledcomponents))).div.attrs((props)=>({
         "data-parent-id": props.id,
-        id: null
+        id: undefined
     })).withConfig({
     displayName: "styled__RootNode",
     componentId: "sc-1kgh2zd-7"
@@ -7831,7 +7827,9 @@ function $ac2f6d2ef648627b$export$a977df6ccef00812({ disabledValues: disabledVal
         });
     }, [
         disabledValues,
-        availableLoadZones
+        availableLoadZones,
+        onChange,
+        value
     ]);
     return /*#__PURE__*/ (0, $gkIgo$reactjsxruntime.jsx)((0, $df621c65e95d0d5b$export$ef9b1a59e592288f), {
         ...props,
@@ -8860,7 +8858,8 @@ function $44828b75e076e511$var$convertGroupToPage(group, sleep = []) {
         id: id,
         name: name,
         title: title,
-        sleep: sleep && sleep.length ? sleep : undefined
+        sleep: sleep && sleep.length ? sleep : undefined,
+        startedDateTime: ""
     };
 }
 function $44828b75e076e511$var$keyValuePairsToText(keyValuePairs) {
@@ -8933,7 +8932,8 @@ function $44828b75e076e511$var$convertRequestToEntry(request, sleep = [], parent
         // remove id's from variables
         variables: (0, $1fa7dc7d3bd71b64$export$78936e15dcfe90b6)(request.variables),
         pageref: parentId,
-        sleep: sleep && sleep.length ? sleep : undefined
+        sleep: sleep && sleep.length ? sleep : undefined,
+        startedDateTime: ""
     };
 }
 /** @deprecated */ function $44828b75e076e511$var$closestValue(subject, target) {
@@ -8951,7 +8951,7 @@ function $44828b75e076e511$var$convertRequestToEntry(request, sleep = [], parent
 function $44828b75e076e511$export$830e3e7c910fe629(loadZones, // stages: Array<Stage>,
 thresholds, apm) {
     return {
-        ext: (0, $49f027a0602fd918$export$892f281b890b5148)({
+        cloud: (0, $b0785620de6fffeb$export$eea562e3d032aaa4)({
             loadZones: loadZones,
             apm: apm
         }),
@@ -9132,6 +9132,7 @@ const $d5b57d1cbe7f2b8f$export$ca5d2fb09291d9a8 = ({ parentId: parentId = "" , c
                     name: "nested",
                     put: canDrop
                 },
+                // @ts-expect-error - 'handle' prop is typed as string in ReactSortable. Hopefully it will be fixed in the future.
                 handle: (0, $2f1b8f749d0252f0$export$a0c24614540b0efb),
                 swapThreshold: 0.65,
                 onEnd: handleOnEnd,

package/dist/module.js

@@ -586,13 +586,11 @@ const $977f5f8f585fbb2c$export$807b1b70df68fbc6 = {
 const $977f5f8f585fbb2c$export$93ca5d3f8675ae4c = {
     vus: 20,
     duration: "5m",
-    ext: {
-        loadimpact: {
-            distribution: {
-                "amazon:us:ashburn": {
-                    loadZone: "amazon:us:ashburn",
-                    percent: 100
-                }
+    cloud: {
+        distribution: {
+            "amazon:us:ashburn": {
+                loadZone: "amazon:us:ashburn",
+                percent: 100
             }
         }
     }
@@ -2546,6 +2544,7 @@ class $9e8f84151ee086d5$export$d74eb9a6e453f567 {
         $9e8f84151ee086d5$var$_defineProperty(this, "request", void 0);
         $9e8f84151ee086d5$var$_defineProperty(this, "variables", []);
         $9e8f84151ee086d5$var$_defineProperty(this, "sleep", void 0);
+        $9e8f84151ee086d5$var$_defineProperty(this, "startedDateTime", "");
         // Note: har-to-k6 will not add automatic sleep if we pass an empty array
         this.sleep = sleep && sleep.length ? sleep : undefined;
         const { config: config , request: request , checks: checks , variables: variables  } = node;
@@ -2583,6 +2582,7 @@ class $d7709c101a6a93ad$export$437940182842cc21 {
         $d7709c101a6a93ad$var$_defineProperty(this, "title", void 0);
         $d7709c101a6a93ad$var$_defineProperty(this, "name", void 0);
         $d7709c101a6a93ad$var$_defineProperty(this, "sleep", void 0);
+        $d7709c101a6a93ad$var$_defineProperty(this, "startedDateTime", "");
         const { id: id , title: title , name: name  } = node;
         this.id = id;
         this.title = title;
@@ -2629,11 +2629,9 @@ class $53c71a9068d90815$export$e5858e3f1a067a7 {
     static getEmptyLog() {
         return {
             options: {
-                ext: {
-                    loadimpact: {
-                        distribution: {},
-                        apm: []
-                    }
+                cloud: {
+                    distribution: {},
+                    apm: []
                 },
                 thresholds: {},
                 scenarios: {}
@@ -3663,20 +3661,16 @@ function $54905f88e4d0aee6$export$ce9e7b45132a9c55(apm) {
 }
 
 
-const $eab7139be51067d7$export$892f281b890b5148 = ({ loadZones: loadZones , apm: apm  })=>{
+const $0018c28bbc45422b$export$eea562e3d032aaa4 = ({ loadZones: loadZones , apm: apm  })=>{
     const distribution = (0, $2e7731019bf383f7$export$365e3fcb5ffcc8c6)(loadZones);
     const serializedAPM = (0, $54905f88e4d0aee6$export$ce9e7b45132a9c55)(apm);
     if (serializedAPM.length > 0) return {
-        loadimpact: {
-            distribution: distribution,
-            apm: serializedAPM
-        }
+        distribution: distribution,
+        apm: serializedAPM
     };
     return {
-        loadimpact: {
-            distribution: distribution,
-            apm: []
-        }
+        distribution: distribution,
+        apm: []
     };
 };
 
@@ -4025,7 +4019,7 @@ class $d875af20a6533bde$export$dbf96015a8a67c16 {
     }
     static createLogOptions(loadZones, thresholds, apm) {
         return {
-            ext: (0, $eab7139be51067d7$export$892f281b890b5148)({
+            cloud: (0, $0018c28bbc45422b$export$eea562e3d032aaa4)({
                 loadZones: loadZones,
                 apm: apm
             }),
@@ -4445,9 +4439,11 @@ class $ab0d82593c0c1516$export$1576fc997deee1a4 {
         });
     }
     getLoadZonesFromOptions(options) {
-        const { ext: ext  } = options || {};
-        if (!ext || !ext.loadimpact || !ext.loadimpact.distribution) return this.loadZones;
-        return Object.values(ext.loadimpact.distribution);
+        const { cloud: cloud , ext: ext  } = options || {};
+        const legacyPath = ext && ext.loadimpact;
+        const cloudOptions = cloud || legacyPath;
+        if (!cloudOptions || !cloudOptions.distribution) return this.loadZones;
+        return Object.values(cloudOptions.distribution);
     }
     getThresholdsFromOptions(options) {
         const { thresholds: thresholds  } = options || {};
@@ -5825,7 +5821,7 @@ const $7506a092cb35f299$export$5820f661515dab4f = /*#__PURE__*/ (0, $b7VBt$style
 ], ({ theme: theme  })=>theme.palette.background.paper, ({ theme: theme  })=>theme.palette.text.secondary, ({ theme: theme  })=>theme.palette.background.default, ({ theme: theme  })=>theme.palette.background.default, $7506a092cb35f299$export$eddf54ea3db8d0f0, $7506a092cb35f299$export$a0c24614540b0efb, $7506a092cb35f299$export$a0c24614540b0efb, $7506a092cb35f299$export$eddf54ea3db8d0f0, $7506a092cb35f299$export$eddf54ea3db8d0f0, $7506a092cb35f299$export$f06e977173f1857c, $7506a092cb35f299$export$7004694e7c14858d, $7506a092cb35f299$export$cb8e6a2fd2fdc16b, $7506a092cb35f299$export$a0c24614540b0efb, $7506a092cb35f299$export$eddf54ea3db8d0f0, $7506a092cb35f299$export$f06e977173f1857c, $7506a092cb35f299$export$f06e977173f1857c, $7506a092cb35f299$export$f06e977173f1857c, $7506a092cb35f299$export$f06e977173f1857c, $7506a092cb35f299$export$f06e977173f1857c);
 const $7506a092cb35f299$export$1c180cb67301903c = /*#__PURE__*/ (0, $b7VBt$styledcomponents).div.attrs((props)=>({
         "data-parent-id": props.id,
-        id: null
+        id: undefined
     })).withConfig({
     displayName: "styled__RootNode",
     componentId: "sc-1kgh2zd-7"
@@ -7808,7 +7804,9 @@ function $d11389a8752f23d8$export$a977df6ccef00812({ disabledValues: disabledVal
         });
     }, [
         disabledValues,
-        availableLoadZones
+        availableLoadZones,
+        onChange,
+        value
     ]);
     return /*#__PURE__*/ (0, $b7VBt$jsx)((0, $7b2e34940da063e7$export$ef9b1a59e592288f), {
         ...props,
@@ -8837,7 +8835,8 @@ function $a712508a121abd88$var$convertGroupToPage(group, sleep = []) {
         id: id,
         name: name,
         title: title,
-        sleep: sleep && sleep.length ? sleep : undefined
+        sleep: sleep && sleep.length ? sleep : undefined,
+        startedDateTime: ""
     };
 }
 function $a712508a121abd88$var$keyValuePairsToText(keyValuePairs) {
@@ -8910,7 +8909,8 @@ function $a712508a121abd88$var$convertRequestToEntry(request, sleep = [], parent
         // remove id's from variables
         variables: (0, $f3225c9cfb4c8b15$export$78936e15dcfe90b6)(request.variables),
         pageref: parentId,
-        sleep: sleep && sleep.length ? sleep : undefined
+        sleep: sleep && sleep.length ? sleep : undefined,
+        startedDateTime: ""
     };
 }
 /** @deprecated */ function $a712508a121abd88$var$closestValue(subject, target) {
@@ -8928,7 +8928,7 @@ function $a712508a121abd88$var$convertRequestToEntry(request, sleep = [], parent
 function $a712508a121abd88$export$830e3e7c910fe629(loadZones, // stages: Array<Stage>,
 thresholds, apm) {
     return {
-        ext: (0, $eab7139be51067d7$export$892f281b890b5148)({
+        cloud: (0, $0018c28bbc45422b$export$eea562e3d032aaa4)({
             loadZones: loadZones,
             apm: apm
         }),
@@ -9109,6 +9109,7 @@ const $89b7eccc62773a08$export$ca5d2fb09291d9a8 = ({ parentId: parentId = "" , c
                     name: "nested",
                     put: canDrop
                 },
+                // @ts-expect-error - 'handle' prop is typed as string in ReactSortable. Hopefully it will be fixed in the future.
                 handle: (0, $7506a092cb35f299$export$a0c24614540b0efb),
                 swapThreshold: 0.65,
                 onEnd: handleOnEnd,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@grafana/k6-test-builder",
-  "version": "0.8.7",
+  "version": "0.8.9",
   "license": "AGPL-3.0",
   "main": "dist/index.js",
   "module": "dist/module.js",
@@ -48,7 +48,7 @@
     "react-dom": "^16.14.0",
     "sortablejs": "1.14.0",
     "storybook-dark-mode": "^1.1.2",
-    "styled-components": "^5.3.1",
+    "styled-components": "^6.1.1",
     "typescript": "4.6.4",
     "web-vitals": "^2.1.4",
     "webpack": "5"
@@ -58,7 +58,7 @@
     "react": ">= 16.14.0",
     "react-dom": ">= 16.14.0",
     "sortablejs": "^1.10.2",
-    "styled-components": "^5.3.1"
+    "styled-components": "^6.1.1"
   },
   "dependencies": {
     "@material-ui/core": "^4.12.4",