feature: adding part of transaction info to the test run page (#1903)

* feature: adding part of transaction info to the test run page * feature: adding part of transaction info to the test run page
kubeshop · Jan 27, 2023 · 436e3af · 436e3af
1 parent 6d01dcb
commit 436e3af
Show file tree

Hide file tree

Showing 14 changed files with 405 additions and 190 deletions.
diff --git a/api/tests.yaml b/api/tests.yaml
@@ -179,6 +179,10 @@ components:
           type: object
           additionalProperties:
             type: string
+        transactionId:
+          type: string
+        transactionRunId:
+          type: string
 
     RunInformation:
       type: object

diff --git a/cli/openapi/api_api.go b/cli/openapi/api_api.go
diff --git a/cli/openapi/model_test_run.go b/cli/openapi/model_test_run.go
diff --git a/server/http/mappings/tests.go b/server/http/mappings/tests.go
@@ -311,6 +311,8 @@ func (m OpenAPI) Run(in *model.Run) openapi.TestRun {
 		Outputs:                   m.RunOutputs(in.Outputs),
 		Metadata:                  in.Metadata,
 		Environment:               m.Environment(in.Environment),
+		TransactionId:             in.TransactionID,
+		TransactionRunId:          in.TransactionRunID,
 	}
 }
 

diff --git a/server/model/tests.go b/server/model/tests.go
@@ -105,6 +105,11 @@ type (
 
 		// environment
 		Environment Environment
+
+		// transaction
+
+		TransactionID    string
+		TransactionRunID string
 	}
 
 	RunResults struct {

diff --git a/server/openapi/model_test_run.go b/server/openapi/model_test_run.go
@@ -56,6 +56,10 @@ type TestRun struct {
 	Outputs []TestRunOutputs `json:"outputs,omitempty"`
 
 	Metadata map[string]string `json:"metadata,omitempty"`
+
+	TransactionId string `json:"transactionId,omitempty"`
+
+	TransactionRunId string `json:"transactionRunId,omitempty"`
 }
 
 // AssertTestRunRequired checks if the required fields are not zero-ed

diff --git a/server/testdb/runs.go b/server/testdb/runs.go
@@ -327,11 +327,17 @@ SELECT
 	"test_results",
 	"trace",
 	"outputs",
-	"last_error",
-
+	"last_error",	
 	"metadata",
-	"environment"
+	"environment",
+
+	-- transaction run
+	transaction_run.transaction_run_id,
+	transaction_run.transaction_run_transaction_id
 FROM test_runs
+LEFT OUTER JOIN
+	transaction_run_steps transaction_run
+ON transaction_run.test_run_id = id
 `
 
 func (td *postgresDB) GetRun(ctx context.Context, testID id.ID, runID int) (model.Run, error) {
@@ -437,6 +443,9 @@ func readRunRow(row scanner) (model.Run, error) {
 		lastError *string
 		traceID,
 		spanID string
+
+		transactionID,
+		transactionRunID sql.NullString
 	)
 
 	err := row.Scan(
@@ -458,6 +467,8 @@ func readRunRow(row scanner) (model.Run, error) {
 		&lastError,
 		&jsonMetadata,
 		&jsonEnvironment,
+		&transactionRunID,
+		&transactionID,
 	)
 
 	switch err {
@@ -528,6 +539,11 @@ func readRunRow(row scanner) (model.Run, error) {
 			r.LastError = fmt.Errorf(*lastError)
 		}
 
+		if transactionID.Valid && transactionRunID.Valid {
+			r.TransactionID = transactionID.String
+			r.TransactionRunID = transactionRunID.String
+		}
+
 		return r, nil
 
 	default:

diff --git a/web/src/components/RunActionsMenu/RunActionsMenu.tsx b/web/src/components/RunActionsMenu/RunActionsMenu.tsx
@@ -12,9 +12,18 @@ interface IProps {
   testId: string;
   testVersion: number;
   isRunView?: boolean;
+  transactionId?: string;
+  transactionRunId: string;
 }
 
-const RunActionsMenu = ({resultId, testId, testVersion, isRunView = false}: IProps) => {
+const RunActionsMenu = ({
+  resultId,
+  testId,
+  testVersion,
+  transactionId,
+  transactionRunId,
+  isRunView = false,
+}: IProps) => {
   const {loadJUnit, loadDefinition} = useFileViewerModal();
 
   const navigate = useNavigate();
@@ -26,6 +35,17 @@ const RunActionsMenu = ({resultId, testId, testVersion, isRunView = false}: IPro
       <Dropdown
         overlay={
           <Menu>
+            {!!transactionId && !!transactionRunId && (
+              <Menu.Item
+                data-cy="transaction-run-button"
+                key="transaction-run"
+                onClick={() => {
+                  navigate(`/transaction/${transactionId}/run/${transactionRunId}`);
+                }}
+              >
+                Transaction Run
+              </Menu.Item>
+            )}
             <Menu.Item
               data-cy="view-junit-button"
               key="view-junit"

diff --git a/web/src/components/RunCard/TestRunCard.tsx b/web/src/components/RunCard/TestRunCard.tsx
@@ -25,7 +25,18 @@ function getIcon(state: TTestRun['state'], failedAssertions: number) {
 }
 
 const TestRunCard = ({
-  run: {id: runId, executionTime, passedAssertionCount, failedAssertionCount, state, createdAt, testVersion, metadata},
+  run: {
+    id: runId,
+    executionTime,
+    passedAssertionCount,
+    failedAssertionCount,
+    state,
+    createdAt,
+    testVersion,
+    metadata,
+    transactionId,
+    transactionRunId,
+  },
   testId,
   linkTo,
 }: IProps) => {
@@ -61,6 +72,8 @@ const TestRunCard = ({
           </S.Row>
         </S.Info>
 
+        {!!transactionId && !!transactionRunId && <S.Text>Part of transaction</S.Text>}
+
         {state !== TestStateEnum.FAILED && state !== TestStateEnum.FINISHED && (
           <div data-cy={`test-run-result-status-${runId}`}>
             <TestState testState={state} />
@@ -85,7 +98,13 @@ const TestRunCard = ({
         )}
 
         <div>
-          <RunActionsMenu resultId={runId} testId={testId} testVersion={testVersion} />
+          <RunActionsMenu
+            resultId={runId}
+            testId={testId}
+            testVersion={testVersion}
+            transactionRunId={transactionRunId}
+            transactionId={transactionId}
+          />
         </div>
       </S.Container>
     </Link>

diff --git a/web/src/components/RunDetailLayout/HeaderLeft.tsx b/web/src/components/RunDetailLayout/HeaderLeft.tsx
@@ -1,4 +1,6 @@
 import {Link} from 'react-router-dom';
+import {useMemo} from 'react';
+import {LinkOutlined} from '@ant-design/icons';
 
 import {useTestRun} from 'providers/TestRun/TestRun.provider';
 import Date from 'utils/Date';
@@ -12,8 +14,26 @@ interface IProps {
 }
 
 const HeaderLeft = ({name, testId, triggerType}: IProps) => {
-  const {run} = useTestRun();
-  const createdTimeAgo = Date.getTimeAgo(run?.createdAt ?? '');
+  const {run: {createdAt, transactionId, transactionRunId, executionTime, trace, traceId, testVersion} = {}, run} =
+    useTestRun();
+  const createdTimeAgo = Date.getTimeAgo(createdAt ?? '');
+
+  const description = useMemo(() => {
+    return (
+      <>
+        {triggerType} • Ran {createdTimeAgo}
+        {transactionId && transactionRunId && (
+          <>
+            {' '}
+            •{' '}
+            <S.TransactionLink to={`/transaction/${transactionId}/run/${transactionRunId}`} target="_blank">
+              Part of transaction <LinkOutlined />
+            </S.TransactionLink>
+          </>
+        )}
+      </>
+    );
+  }, [createdTimeAgo, transactionId, transactionRunId, triggerType]);
 
   return (
     <S.Section $justifyContent="flex-start">
@@ -23,19 +43,17 @@ const HeaderLeft = ({name, testId, triggerType}: IProps) => {
       <S.InfoContainer>
         <S.Row>
           <S.Title data-cy="test-details-name">
-            {name} (v{run.testVersion})
+            {name} (v{testVersion})
           </S.Title>
           <Info
-            date={run?.createdAt ?? ''}
-            executionTime={run?.executionTime ?? 0}
+            date={createdAt ?? ''}
+            executionTime={executionTime ?? 0}
             state={run.state}
-            totalSpans={run?.trace?.spans?.length ?? 0}
-            traceId={run?.traceId ?? ''}
+            totalSpans={trace?.spans?.length ?? 0}
+            traceId={traceId ?? ''}
           />
         </S.Row>
-        <S.Text>
-          {triggerType} • {`Ran ${createdTimeAgo}`}
-        </S.Text>
+        <S.Text>{description}</S.Text>
       </S.InfoContainer>
     </S.Section>
   );

diff --git a/web/src/components/RunDetailLayout/HeaderRight.tsx b/web/src/components/RunDetailLayout/HeaderRight.tsx
@@ -36,7 +36,14 @@ const HeaderRight = ({testId, testVersion}: IProps) => {
           Run Test
         </Button>
       )}
-      <RunActionsMenu isRunView resultId={run.id} testId={testId} testVersion={testVersion} />
+      <RunActionsMenu
+        isRunView
+        resultId={run.id}
+        testId={testId}
+        testVersion={testVersion}
+        transactionId={run.transactionId}
+        transactionRunId={run.transactionRunId}
+      />
     </S.Section>
   );
 };

diff --git a/web/src/components/RunDetailLayout/RunDetailLayout.styled.ts b/web/src/components/RunDetailLayout/RunDetailLayout.styled.ts
@@ -17,6 +17,12 @@ export const Container = styled.div`
   }
 `;
 
+export const TransactionLink = styled(Link)`
+  && {
+    color: ${({theme}) => theme.color.textSecondary};
+  }
+`;
+
 export const ContainerHeader = styled.div`
   background-color: ${({theme}) => theme.color.white};
   border-bottom: ${({theme}) => `1px solid ${theme.color.borderLight}`};

diff --git a/web/src/models/TestRun.model.ts b/web/src/models/TestRun.model.ts
@@ -50,6 +50,8 @@ const TestRun = ({
   metadata = {},
   outputs = [],
   environment = {},
+  transactionId = '',
+  transactionRunId = '',
 }: TRawTestRun): TTestRun => {
   return {
     obtainedTraceAt,
@@ -74,6 +76,8 @@ const TestRun = ({
     metadata,
     outputs: outputs?.map(rawOutput => TestRunOutput(rawOutput)),
     environment: Environment(environment),
+    transactionId,
+    transactionRunId,
   };
 };
 

diff --git a/web/src/types/Generated.types.ts b/web/src/types/Generated.types.ts
@@ -1397,6 +1397,8 @@ export interface external {
             value?: string;
           }[];
           metadata?: { [key: string]: string };
+          transactionId?: string;
+          transactionRunId?: string;
         };
         RunInformation: {
           metadata?: { [key: string]: string } | null;