Merge pull request #794 from kubeshop/release/v1.13.4

Release v1.13.4

package.json

@@ -90,7 +90,6 @@
     "node-fetch": "^2.6.12",
     "query-string": "7.1.1",
     "react": "18.1.0",
-    "react-beautiful-dnd": "^13.1.0",
     "react-dom": "18.1.0",
     "react-gtm-module": "^2.0.11",
     "react-helmet": "^6.1.0",
@@ -102,6 +101,7 @@
     "react-use": "17.4.0",
     "react-use-websocket": "^4.2.0",
     "semver": "^7.5.4",
+    "reactflow": "^11.7.4",
     "strip-ansi": "^7.0.1",
     "styled-components": "5.3.5",
     "zustand": "^4.3.7"

scripts/inject-base-href.sh

@@ -4,5 +4,6 @@
 set -e
 
 # Include the proper <base href> based on the root route
-RENDERED="$(sed -e "s|<base href[^>]*>|<base href=\"${REACT_APP_ROOT_ROUTE:-"/"}\">|" index.html)"
+BASE_URL="$(echo "${REACT_APP_ROOT_ROUTE:-""}" | sed 's|\/*$||')"
+RENDERED="$(sed -e "s|<base href[^>]*>|<base href=\"${BASE_URL}/\">|" index.html)"
 echo "$RENDERED" > index.html

src/components/molecules/ExecutionStepsList/ExecutionStepsList.tsx

@@ -36,56 +36,58 @@ const ExecutionStepsList: FC<ExecutionStepsListProps> = props => {
   const executors = useAppSelector(selectExecutors);
 
   const elements = useMemo(() => {
-    return executionSteps?.map(step => {
-      const groupKey = step.execute.map(item => item.execution?.id || Math.random()).join('-');
-
-      const items = step.execute
-        .map(({execution}, index) => ({execution, result: step.step.execute[index]}))
-        .filter(({result}) => result.delay || result.test)
-        .map(({execution, result}) => {
-          const status = execution.executionResult?.status;
-          if (result.delay) {
+    return executionSteps
+      ?.filter(step => step.execute?.length)
+      .map(step => {
+        const groupKey = step.execute.map(item => item.execution?.id || Math.random()).join('-');
+
+        const items = step.execute
+          .map(({execution}, index) => ({execution, result: step.step.execute[index]}))
+          .filter(({result}) => result.delay || result.test)
+          .map(({execution, result}) => {
+            const status = execution.executionResult?.status;
+            if (result.delay) {
+              return {
+                status,
+                icon: <ClockCircleOutlined style={{fontSize: '26px'}} />,
+                name: `Delay - ${result.delay}`,
+                url: null,
+              };
+            }
             return {
               status,
-              icon: <ClockCircleOutlined style={{fontSize: '26px'}} />,
-              name: `Delay - ${result.delay}`,
-              url: null,
+              icon: <ExecutorIcon type={getTestExecutorIcon(executors, execution.testType)} />,
+              name: result.test!,
+              url:
+                status !== 'queued' && status !== 'aborted'
+                  ? execution?.id
+                    ? `/tests/executions/${result.test}/execution/${execution.id}`
+                    : `/tests/executions/${result.test}`
+                  : null,
             };
-          }
-          return {
-            status,
-            icon: <ExecutorIcon type={getTestExecutorIcon(executors, execution.testType)} />,
-            name: result.test!,
-            url:
-              status !== 'queued' && status !== 'aborted'
-                ? execution?.id
-                  ? `/tests/executions/${result.test}/execution/${execution.id}`
-                  : `/tests/executions/${result.test}`
-                : null,
-          };
-        })
-        .map(({status, icon, name, url}, index) => (
-          <ExecutionStepsListItemExecution
-            // eslint-disable-next-line react/no-array-index-key
-            key={`item-${index}`}
-            className={classNames({clickable: url})}
-            onClick={url ? () => navigate(url) : undefined}
-          >
-            <StyledSpace size={15}>
-              {status ? <StatusIcon status={status} /> : null}
-              {icon}
-              <ExecutionName name={name} />
-              {url ? <StyledExternalLinkIcon /> : <div />}
-            </StyledSpace>
-          </ExecutionStepsListItemExecution>
-        ));
-
-      return (
-        <li key={groupKey}>
-          <ExecutionStepsListItem>{items}</ExecutionStepsListItem>
-        </li>
-      );
-    });
+          })
+          .map(({status, icon, name, url}, index) => (
+            <ExecutionStepsListItemExecution
+              // eslint-disable-next-line react/no-array-index-key
+              key={`item-${index}`}
+              className={classNames({clickable: url})}
+              onClick={url ? () => navigate(url) : undefined}
+            >
+              <StyledSpace size={15}>
+                {status ? <StatusIcon status={status} /> : null}
+                {icon}
+                <ExecutionName name={name} />
+                {url ? <StyledExternalLinkIcon /> : <div />}
+              </StyledSpace>
+            </ExecutionStepsListItemExecution>
+          ));
+
+        return (
+          <li key={groupKey}>
+            <ExecutionStepsListItem>{items}</ExecutionStepsListItem>
+          </li>
+        );
+      });
   }, [executionSteps]);
 
   return <ExecutionStepsListContainer>{elements}</ExecutionStepsListContainer>;

src/components/molecules/index.ts

@@ -10,9 +10,7 @@ export {notificationCall, NotificationContent} from './Notification';
 export {default as EndpointModal} from './EndpointModal';
 export {default as ConfigurationCard} from './ConfigurationCard';
 export {TestExecutionDetailsTabs, TestSuiteExecutionDetailsTabs} from './ExecutionDetails';
-export {default as DragNDropList} from './DragNDropList';
 export {default as ArtifactsList} from './ArtifactsList';
-export {default as TestSuiteStepCard} from './TestSuiteStepCard';
 export {default as HelpCard} from './HelpCard';
 export {default as EmptyListContent} from './EmptyListContent';
 export {default as MetricsBarChart} from './MetricsBarChart';

src/components/organisms/EntityDetails/EntityDetailsContent/Settings/Settings.tsx

@@ -1,4 +1,4 @@
-import React, {FC, ReactElement, useCallback, useContext} from 'react';
+import React, {ReactElement, useContext} from 'react';
 
 import {EntityDetailsContext} from '@contexts';
 
@@ -27,15 +27,11 @@ const testSettings = (
   />
 );
 
-const WrappedSettingsTests: FC<{setId(id: string): void}> = ({setId}) => (
-  <SettingsTests openDefinition={useCallback(() => setId('definition'), [])} />
-);
-
 const testSuiteSettings = (
   <SettingsLayout
     tabs={[
       {id: 'general', label: 'General', children: <General />},
-      {id: 'tests', label: 'Tests', children: WrappedSettingsTests},
+      {id: 'tests', label: 'Tests', children: <SettingsTests />},
       {id: 'variables', label: 'Variables & Secrets', children: <SettingsVariables />},
       {id: 'scheduling', label: 'Scheduling', children: <SettingsScheduling />},
       {id: 'definition', label: 'Definition', children: <SettingsDefinition />},