creevey 0.9.0-beta.13 → 0.9.0-beta.14

package/lib/cjs/shared/index.js

@@ -4,98 +4,84 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.serializeRawStories = exports.deserializeStory = exports.deserializeRawStories = exports.denormalizeStoryParameters = exports.combineParameters = void 0;
-
 var _lodash = require("lodash");
-
 var _serializeRegExp = require("./serializeRegExp");
-
 // NOTE: Copy-paste from storybook/api
 const combineParameters = function () {
   for (var _len = arguments.length, parameterSets = new Array(_len), _key = 0; _key < _len; _key++) {
     parameterSets[_key] = arguments[_key];
   }
-
-  return (// eslint-disable-next-line @typescript-eslint/no-unsafe-return
+  return (
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-return
     (0, _lodash.mergeWith)({}, ...parameterSets, (_, srcValue) => {
       // Treat arrays as scalars:
       if (Array.isArray(srcValue)) return srcValue;
       return undefined;
     })
   );
-}; // NOTE: Copy-paste from storybook/api
-
+};
 
+// NOTE: Copy-paste from storybook/api
 exports.combineParameters = combineParameters;
-
 const denormalizeStoryParameters = _ref => {
   let {
     globalParameters,
     kindParameters,
     stories
   } = _ref;
-  return (0, _lodash.mapValues)(stories, storyData => {
-    var _kindParameters$story;
-
-    return { ...storyData,
-      parameters: combineParameters(globalParameters, (_kindParameters$story = kindParameters[storyData.kind]) !== null && _kindParameters$story !== void 0 ? _kindParameters$story : {}, storyData.parameters)
-    };
-  });
+  return (0, _lodash.mapValues)(stories, storyData => ({
+    ...storyData,
+    parameters: combineParameters(globalParameters, kindParameters[storyData.kind] ?? {}, storyData.parameters)
+  }));
 };
-
 exports.denormalizeStoryParameters = denormalizeStoryParameters;
-
 const serializeRawStories = stories => {
   return (0, _lodash.mapValues)(stories, storyData => {
     const creevey = storyData.parameters.creevey;
-
-    if (creevey !== null && creevey !== void 0 && creevey.skip) {
-      return { ...storyData,
-        parameters: { ...storyData.parameters,
-          creevey: { ...creevey,
+    if (creevey?.skip) {
+      return {
+        ...storyData,
+        parameters: {
+          ...storyData.parameters,
+          creevey: {
+            ...creevey,
             skip: (0, _lodash.cloneDeepWith)(creevey.skip, value => {
               if ((0, _serializeRegExp.isRegExp)(value)) {
                 return (0, _serializeRegExp.serializeRegExp)(value);
               }
-
               return undefined;
             })
           }
         }
       };
     }
-
     return storyData;
   });
 };
-
 exports.serializeRawStories = serializeRawStories;
-
 const deserializeRawStories = stories => {
   return (0, _lodash.mapValues)(stories, deserializeStory);
 };
-
 exports.deserializeRawStories = deserializeRawStories;
-
 const deserializeStory = story => {
   const creevey = story.parameters.creevey;
-
-  if (creevey !== null && creevey !== void 0 && creevey.skip) {
-    return { ...story,
-      parameters: { ...story.parameters,
-        creevey: { ...creevey,
+  if (creevey?.skip) {
+    return {
+      ...story,
+      parameters: {
+        ...story.parameters,
+        creevey: {
+          ...creevey,
           skip: (0, _lodash.cloneDeepWith)(creevey.skip, value => {
             if ((0, _serializeRegExp.isSerializedRegExp)(value)) {
               return (0, _serializeRegExp.deserializeRegExp)(value);
             }
-
             return undefined;
           })
         }
       }
     };
   }
-
   return story;
 };
-
 exports.deserializeStory = deserializeStory;

package/lib/cjs/shared/serializeRegExp.js

@@ -4,19 +4,14 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.serializeRegExp = exports.isSerializedRegExp = exports.isRegExp = exports.deserializeRegExp = void 0;
-
 const isRegExp = exp => {
   return exp instanceof RegExp;
 };
-
 exports.isRegExp = isRegExp;
-
 const isSerializedRegExp = exp => {
   return typeof exp === 'object' && exp !== null && Reflect.get(exp, '__regexp') === true;
 };
-
 exports.isSerializedRegExp = isSerializedRegExp;
-
 const serializeRegExp = exp => {
   const {
     source,
@@ -28,9 +23,7 @@ const serializeRegExp = exp => {
     flags
   };
 };
-
 exports.serializeRegExp = serializeRegExp;
-
 const deserializeRegExp = _ref => {
   let {
     source,
@@ -38,5 +31,4 @@ const deserializeRegExp = _ref => {
   } = _ref;
   return new RegExp(source, flags);
 };
-
 exports.deserializeRegExp = deserializeRegExp;

package/lib/cjs/types.js

@@ -16,60 +16,50 @@ exports.isTestMessage = isTestMessage;
 exports.isWebpackMessage = isWebpackMessage;
 exports.isWorkerMessage = isWorkerMessage;
 exports.noop = noop;
-
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
 /* eslint-enable @typescript-eslint/no-explicit-any */
+
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
+
 function noop() {
   /* noop */
 }
-
 function isDefined(value) {
   return value !== null && value !== undefined;
 }
-
 function isTest(x) {
   return isDefined(x) && 'id' in x && 'storyId' in x && typeof x.id == 'string' && typeof x.storyId == 'string';
 }
-
 function isObject(x) {
   return typeof x == 'object' && x != null;
 }
-
 function isString(x) {
   return typeof x == 'string';
-} // eslint-disable-next-line @typescript-eslint/no-explicit-any
-
+}
 
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 function isFunction(x) {
   return typeof x == 'function';
 }
-
 function isImageError(error) {
   return error instanceof Error && 'images' in error;
 }
-
 function isProcessMessage(message) {
   return isObject(message) && 'scope' in message;
 }
-
 function isWorkerMessage(message) {
   return isProcessMessage(message) && message.scope == 'worker';
 }
-
 function isStoriesMessage(message) {
   return isProcessMessage(message) && message.scope == 'stories';
 }
-
 function isTestMessage(message) {
   return isProcessMessage(message) && message.scope == 'test';
 }
-
 function isWebpackMessage(message) {
   return isProcessMessage(message) && message.scope == 'webpack';
 }
-
 function isDockerMessage(message) {
   return isProcessMessage(message) && message.scope == 'docker';
 }

package/lib/esm/cli.js

@@ -1,4 +1,4 @@
 #!/usr/bin/env node
-// eslint-disable-next-line node/shebang
 
+// eslint-disable-next-line node/shebang
 require('./creevey');

package/lib/esm/client/addon/Manager.js

@@ -1,5 +1,3 @@
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
 import { SET_STORIES, STORY_RENDERED } from '@storybook/core-events';
 import { denormalizeStoryParameters } from '../../shared';
 import { isDefined } from '../../types';
@@ -8,226 +6,165 @@ import { calcStatus } from '../shared/helpers';
 import { ADDON_ID } from './register';
 import { getEmojiByTestStatus } from './utils';
 export class CreeveyManager {
+  storyId = '';
+  activeBrowser = '';
+  selectedTestId = '';
+  status = {
+    isRunning: false,
+    tests: {},
+    browsers: []
+  };
+  creeveyApi = null;
+  stories = {};
+  updateStatusListeners = [];
+  changeTestListeners = [];
   constructor(storybookApi) {
     this.storybookApi = storybookApi;
-
-    _defineProperty(this, "storyId", '');
-
-    _defineProperty(this, "activeBrowser", '');
-
-    _defineProperty(this, "selectedTestId", '');
-
-    _defineProperty(this, "status", {
-      isRunning: false,
-      tests: {},
-      browsers: []
-    });
-
-    _defineProperty(this, "creeveyApi", null);
-
-    _defineProperty(this, "stories", {});
-
-    _defineProperty(this, "updateStatusListeners", []);
-
-    _defineProperty(this, "changeTestListeners", []);
-
-    _defineProperty(this, "initAll", async () => {
-      this.storybookApi.on(STORY_RENDERED, this.onStoryRendered);
-      this.storybookApi.on(SET_STORIES, this.onSetStories);
-      this.creeveyApi = await initCreeveyClientApi();
-      this.creeveyApi.onUpdate(this.handleCreeveyUpdate);
-      this.status = await this.creeveyApi.status;
-    });
-
-    _defineProperty(this, "handleCreeveyUpdate", update => {
-      const {
-        tests,
-        removedTests = [],
-        isRunning
-      } = update;
-
-      if (isDefined(isRunning)) {
-        this.status.isRunning = isRunning;
-      }
-
-      if (isDefined(tests)) {
-        const prevTests = this.status.tests;
-        const prevStories = this.stories || {};
-        Object.values(tests).filter(isDefined).forEach(update => {
-          const {
-            id,
-            skip,
-            status,
-            results,
-            approved,
-            storyId
-          } = update;
-          const test = prevTests[id];
-
-          if (!test) {
-            return prevTests[id] = update;
-          }
-
-          if (isDefined(skip)) test.skip = skip;
-
-          if (isDefined(status)) {
-            test.status = status;
-
-            if (isDefined(storyId) && isDefined(prevStories[storyId])) {
-              const story = prevStories[storyId];
-              const storyStatus = this.getStoryTests(storyId);
-              const oldStatus = storyStatus.map(x => x.id === id ? status : x.status).reduce((oldStatus, newStatus) => calcStatus(oldStatus, newStatus), undefined);
-              story.name = this.addStatusToStoryName(story.name, calcStatus(oldStatus, status), skip || false);
-            }
-          }
-
-          if (isDefined(results)) test.results ? test.results.push(...results) : test.results = results;
-
-          if (isDefined(approved)) {
-            Object.entries(approved).forEach(_ref => {
-              let [image, retry] = _ref;
-              return retry !== undefined && test && ((test.approved = (test === null || test === void 0 ? void 0 : test.approved) || {})[image] = retry);
-            });
-          }
-        });
-        removedTests.forEach(_ref2 => {
-          let {
-            id
-          } = _ref2;
-          return delete prevTests[id];
-        });
-        this.status.tests = prevTests;
-        this.stories = prevStories;
-        this.setPanelsTitle();
-        void this.storybookApi.setStories(this.stories);
-      }
-
-      this.updateStatusListeners.forEach(x => x(update));
-    });
-
-    _defineProperty(this, "getCurrentTest", () => {
-      return this.status.tests[this.selectedTestId];
-    });
-
-    _defineProperty(this, "onStoryRendered", storyId => {
-      if (this.storyId === '') void this.addStatusesToSideBar();
-
-      if (this.storyId !== storyId) {
-        var _this$getTestsByStory, _this$getTestsByStory2;
-
-        this.storyId = storyId;
-        this.selectedTestId = (_this$getTestsByStory = (_this$getTestsByStory2 = this.getTestsByStoryIdAndBrowser(this.activeBrowser)[0]) === null || _this$getTestsByStory2 === void 0 ? void 0 : _this$getTestsByStory2.id) !== null && _this$getTestsByStory !== void 0 ? _this$getTestsByStory : '';
-        this.setPanelsTitle();
-        this.changeTestListeners.forEach(x => x(this.selectedTestId));
-      }
-    });
-
-    _defineProperty(this, "onStart", () => {
-      var _this$creeveyApi;
-
-      (_this$creeveyApi = this.creeveyApi) === null || _this$creeveyApi === void 0 ? void 0 : _this$creeveyApi.start([this.selectedTestId]);
-    });
-
-    _defineProperty(this, "onStop", () => {
-      var _this$creeveyApi2;
-
-      (_this$creeveyApi2 = this.creeveyApi) === null || _this$creeveyApi2 === void 0 ? void 0 : _this$creeveyApi2.stop();
-    });
-
-    _defineProperty(this, "onImageApprove", (id, retry, image) => {
-      var _this$creeveyApi3;
-
-      return (_this$creeveyApi3 = this.creeveyApi) === null || _this$creeveyApi3 === void 0 ? void 0 : _this$creeveyApi3.approve(id, retry, image);
-    });
-
-    _defineProperty(this, "onStartAllStoryTests", () => {
-      var _this$creeveyApi4;
-
-      const ids = Object.values(this.status.tests).filter(isDefined).filter(x => x.storyId === this.storyId).map(x => x.id);
-      (_this$creeveyApi4 = this.creeveyApi) === null || _this$creeveyApi4 === void 0 ? void 0 : _this$creeveyApi4.start(ids);
-    });
-
-    _defineProperty(this, "onStartAllTests", () => {
-      var _this$creeveyApi5;
-
-      const ids = Object.values(this.status.tests).filter(isDefined).map(x => x.id);
-      (_this$creeveyApi5 = this.creeveyApi) === null || _this$creeveyApi5 === void 0 ? void 0 : _this$creeveyApi5.start(ids);
-    });
-
-    _defineProperty(this, "onSetStories", data => {
-      const stories = data.v ? denormalizeStoryParameters(data) : data.stories;
-      this.stories = stories;
-    });
-
-    _defineProperty(this, "setActiveBrowser", browser => {
-      var _this$getTestsByStory3, _this$getTestsByStory4;
-
-      this.activeBrowser = browser;
-      this.selectedTestId = (_this$getTestsByStory3 = (_this$getTestsByStory4 = this.getTestsByStoryIdAndBrowser(this.activeBrowser)[0]) === null || _this$getTestsByStory4 === void 0 ? void 0 : _this$getTestsByStory4.id) !== null && _this$getTestsByStory3 !== void 0 ? _this$getTestsByStory3 : '';
-      this.changeTestListeners.forEach(x => x(this.selectedTestId));
-    });
-
-    _defineProperty(this, "setSelectedTestId", testId => {
-      this.selectedTestId = testId;
-      this.changeTestListeners.forEach(x => x(this.selectedTestId));
-    });
-
-    _defineProperty(this, "getStoryTests", storyId => {
-      if (!this.status || !this.status.tests) return [];
-      return Object.values(this.status.tests).filter(result => (result === null || result === void 0 ? void 0 : result.storyId) === storyId).filter(isDefined);
-    });
-
-    _defineProperty(this, "getBrowsers", () => {
-      return this.status.browsers;
-    });
-
-    _defineProperty(this, "getTestsByStoryIdAndBrowser", browser => {
-      return Object.values(this.status.tests).filter(x => (x === null || x === void 0 ? void 0 : x.browser) === browser && x.storyId === this.storyId).filter(isDefined);
-    });
-
-    _defineProperty(this, "getTabTitle", browser => {
-      const tests = this.getTestsByStoryIdAndBrowser(browser);
-      const browserStatus = tests.map(x => x && x.status).reduce((oldStatus, newStatus) => calcStatus(oldStatus, newStatus), undefined);
-      const browserSkip = tests.length > 0 ? tests.every(x => x && x.skip) : false;
-      const emojiStatus = getEmojiByTestStatus(browserStatus, browserSkip);
-      return "".concat(emojiStatus ? "".concat(emojiStatus, " ") : '', "Creevey/").concat(browser);
-    });
-
-    _defineProperty(this, "setPanelsTitle", () => {
-      var _this$storybookApi;
-
-      const panels = (_this$storybookApi = this.storybookApi) === null || _this$storybookApi === void 0 ? void 0 : _this$storybookApi.getPanels();
-      if (!panels) return;
-      let firstPanelBrowser = this.activeBrowser;
-
-      for (const p in panels) {
-        var _panel$id;
-
-        const panel = panels[p];
-
-        if (((_panel$id = panel.id) === null || _panel$id === void 0 ? void 0 : _panel$id.indexOf(ADDON_ID)) === 0 && panel.paramKey) {
-          panel.title = this.getTabTitle(panel.paramKey);
-          if (!firstPanelBrowser) firstPanelBrowser = panel.paramKey;
-        }
-      }
-
-      this.storybookApi.setSelectedPanel("".concat(ADDON_ID, "/panel/").concat(firstPanelBrowser));
-    });
-
     this.storybookApi = storybookApi;
   }
-
+  initAll = async () => {
+    this.storybookApi.on(STORY_RENDERED, this.onStoryRendered);
+    this.storybookApi.on(SET_STORIES, this.onSetStories);
+    this.creeveyApi = await initCreeveyClientApi();
+    this.creeveyApi.onUpdate(this.handleCreeveyUpdate);
+    this.status = await this.creeveyApi.status;
+  };
   onUpdateStatus(listener) {
     this.updateStatusListeners.push(listener);
     return () => void (this.updateStatusListeners = this.updateStatusListeners.filter(x => x != listener));
   }
-
   onChangeTest(listener) {
     this.changeTestListeners.push(listener);
     return () => void (this.changeTestListeners = this.changeTestListeners.filter(x => x != listener));
   }
-
-  async addStatusesToSideBar() {
+  handleCreeveyUpdate = update => {
+    const {
+      tests,
+      removedTests = [],
+      isRunning
+    } = update;
+    if (isDefined(isRunning)) {
+      this.status.isRunning = isRunning;
+    }
+    if (isDefined(tests)) {
+      const prevTests = this.status.tests;
+      const prevStories = this.stories || {};
+      Object.values(tests).filter(isDefined).forEach(update => {
+        const {
+          id,
+          skip,
+          status,
+          results,
+          approved,
+          storyId
+        } = update;
+        const test = prevTests[id];
+        if (!test) {
+          return prevTests[id] = update;
+        }
+        if (isDefined(skip)) test.skip = skip;
+        if (isDefined(status)) {
+          test.status = status;
+          if (isDefined(storyId) && isDefined(prevStories[storyId])) {
+            const story = prevStories[storyId];
+            const storyStatus = this.getStoryTests(storyId);
+            const oldStatus = storyStatus.map(x => x.id === id ? status : x.status).reduce((oldStatus, newStatus) => calcStatus(oldStatus, newStatus), undefined);
+            story.name = this.addStatusToStoryName(story.name, calcStatus(oldStatus, status), skip || false);
+          }
+        }
+        if (isDefined(results)) test.results ? test.results.push(...results) : test.results = results;
+        if (isDefined(approved)) {
+          Object.entries(approved).forEach(_ref => {
+            let [image, retry] = _ref;
+            return retry !== undefined && test && ((test.approved = test?.approved || {})[image] = retry);
+          });
+        }
+      });
+      removedTests.forEach(_ref2 => {
+        let {
+          id
+        } = _ref2;
+        return delete prevTests[id];
+      });
+      this.status.tests = prevTests;
+      this.stories = prevStories;
+      this.setPanelsTitle();
+      // TODO Check setStories method in 6.x and migrate properly
+      this.storybookApi.emit(SET_STORIES, this.stories);
+    }
+    this.updateStatusListeners.forEach(x => x(update));
+  };
+  getCurrentTest = () => {
+    return this.status.tests[this.selectedTestId];
+  };
+  onStoryRendered = storyId => {
+    if (this.storyId === '') this.addStatusesToSideBar();
+    if (this.storyId !== storyId) {
+      this.storyId = storyId;
+      this.selectedTestId = this.getTestsByStoryIdAndBrowser(this.activeBrowser)[0]?.id ?? '';
+      this.setPanelsTitle();
+      this.changeTestListeners.forEach(x => x(this.selectedTestId));
+    }
+  };
+  onStart = () => {
+    this.creeveyApi?.start([this.selectedTestId]);
+  };
+  onStop = () => {
+    this.creeveyApi?.stop();
+  };
+  onImageApprove = (id, retry, image) => this.creeveyApi?.approve(id, retry, image);
+  onStartAllStoryTests = () => {
+    const ids = Object.values(this.status.tests).filter(isDefined).filter(x => x.storyId === this.storyId).map(x => x.id);
+    this.creeveyApi?.start(ids);
+  };
+  onStartAllTests = () => {
+    const ids = Object.values(this.status.tests).filter(isDefined).map(x => x.id);
+    this.creeveyApi?.start(ids);
+  };
+  onSetStories = data => {
+    const stories = data.v ? denormalizeStoryParameters(data) : data.stories;
+    this.stories = stories;
+  };
+  setActiveBrowser = browser => {
+    this.activeBrowser = browser;
+    this.selectedTestId = this.getTestsByStoryIdAndBrowser(this.activeBrowser)[0]?.id ?? '';
+    this.changeTestListeners.forEach(x => x(this.selectedTestId));
+  };
+  setSelectedTestId = testId => {
+    this.selectedTestId = testId;
+    this.changeTestListeners.forEach(x => x(this.selectedTestId));
+  };
+  getStoryTests = storyId => {
+    if (!this.status || !this.status.tests) return [];
+    return Object.values(this.status.tests).filter(result => result?.storyId === storyId).filter(isDefined);
+  };
+  getBrowsers = () => {
+    return this.status.browsers;
+  };
+  getTestsByStoryIdAndBrowser = browser => {
+    return Object.values(this.status.tests).filter(x => x?.browser === browser && x.storyId === this.storyId).filter(isDefined);
+  };
+  getTabTitle = browser => {
+    const tests = this.getTestsByStoryIdAndBrowser(browser);
+    const browserStatus = tests.map(x => x && x.status).reduce((oldStatus, newStatus) => calcStatus(oldStatus, newStatus), undefined);
+    const browserSkip = tests.length > 0 ? tests.every(x => x && x.skip) : false;
+    const emojiStatus = getEmojiByTestStatus(browserStatus, browserSkip);
+    return `${emojiStatus ? `${emojiStatus} ` : ''}Creevey/${browser}`;
+  };
+  setPanelsTitle = () => {
+    const panels = this.storybookApi?.getPanels();
+    if (!panels) return;
+    let firstPanelBrowser = this.activeBrowser;
+    for (const p in panels) {
+      const panel = panels[p];
+      if (panel.id?.indexOf(ADDON_ID) === 0 && panel.paramKey) {
+        panel.title = this.getTabTitle(panel.paramKey);
+        if (!firstPanelBrowser) firstPanelBrowser = panel.paramKey;
+      }
+    }
+    this.storybookApi.setSelectedPanel(`${ADDON_ID}/panel/${firstPanelBrowser}`);
+  };
+  addStatusesToSideBar() {
     if (!Object.keys(this.stories).length) return;
     const stories = this.stories;
     Object.keys(this.stories).forEach(storyId => {
@@ -236,13 +173,13 @@ export class CreeveyManager {
       const skip = storyStatus.length > 0 ? storyStatus.every(x => x.skip) : false;
       this.stories[storyId].name = this.addStatusToStoryName(stories[storyId].name, status, skip);
     });
-    await this.storybookApi.setStories(this.stories);
-  }
 
+    // TODO Check setStories method in 6.x and migrate properly
+    this.storybookApi.emit(SET_STORIES, this.stories);
+  }
   addStatusToStoryName(name, status, skip) {
     name = name.replace(/^(❌|✔|🟡|🕗|⏸) /, '');
     const emojiStatus = getEmojiByTestStatus(status, skip);
-    return "".concat(emojiStatus ? "".concat(emojiStatus, " ") : '', " ").concat(name);
+    return `${emojiStatus ? `${emojiStatus} ` : ''} ${name}`;
   }
-
 }

package/lib/esm/client/addon/components/Panel.js

@@ -19,12 +19,10 @@ const TestSelectContainer = styled.div(_ref2 => {
   } = _ref2;
   return {
     padding: '8px',
-    border: "1px solid ".concat(theme.appBorderColor)
+    border: `1px solid ${theme.appBorderColor}`
   };
 });
 export const Panel = _ref3 => {
-  var _result$results, _result$results$lengt, _result$results2;
-
   let {
     tests,
     selectedTestId,
@@ -32,16 +30,16 @@ export const Panel = _ref3 => {
     onImageApprove
   } = _ref3;
   const result = tests.find(x => x.id === selectedTestId);
-  const isRunning = (result === null || result === void 0 ? void 0 : result.status) === 'running';
+  const isRunning = result?.status === 'running';
   return /*#__PURE__*/React.createElement("div", null, tests.length > 1 && /*#__PURE__*/React.createElement(TestSelectContainer, null, /*#__PURE__*/React.createElement(TestSelect, {
     tests: tests,
     selectedTestId: selectedTestId,
     onChangeTest: onChangeTest
-  })), isRunning && /*#__PURE__*/React.createElement(Loader, null), result !== null && result !== void 0 && (_result$results = result.results) !== null && _result$results !== void 0 && _result$results.length ? /*#__PURE__*/React.createElement(Wrapper, {
+  })), isRunning && /*#__PURE__*/React.createElement(Loader, null), result?.results?.length ? /*#__PURE__*/React.createElement(Wrapper, {
     isRunning: isRunning
   }, /*#__PURE__*/React.createElement(ResultsPage, {
     height: '100%',
-    key: "".concat(result.id, "_").concat((_result$results$lengt = (_result$results2 = result.results) === null || _result$results2 === void 0 ? void 0 : _result$results2.length) !== null && _result$results$lengt !== void 0 ? _result$results$lengt : 0) // TODO
+    key: `${result.id}_${result.results?.length ?? 0}` // TODO
     ,
     id: result.id,
     path: getTestPath(result) // TODO Memo?