Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(frontend): fix empty body and headers in trigger tab #2540

Merged
merged 1 commit into from
May 16, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion web/src/components/CodeBlock/CodeBlock.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,11 @@ const getInitialLang = (mimeType: string): LanguageName | undefined =>
const formatValue = (value: string, lang: LanguageName | undefined): string => {
switch (lang) {
case 'json':
return JSON.stringify(JSON.parse(value), null, 2);
try {
return JSON.stringify(JSON.parse(value), null, 2);
} catch (error) {
return '';
}

default:
return value;
Expand Down
7 changes: 5 additions & 2 deletions web/src/components/RunDetailTriggerResponse/ResponseBody.tsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
import {isRunStateFinished} from 'models/TestRun.model';
import {TTestRunState} from 'types/TestRun.types';
import SkeletonResponse from './SkeletonResponse';
import CodeBlock from '../CodeBlock';

interface IProps {
body?: string;
bodyMimeType?: string;
state: TTestRunState;
}

const ResponseBody = ({body = '', bodyMimeType = ''}: IProps) =>
!body ? <SkeletonResponse /> : <CodeBlock value={body} mimeType={bodyMimeType} />;
const ResponseBody = ({body = '', bodyMimeType = '', state}: IProps) =>
isRunStateFinished(state) || !!body ? <CodeBlock value={body} mimeType={bodyMimeType} /> : <SkeletonResponse />;

export default ResponseBody;
18 changes: 8 additions & 10 deletions web/src/components/RunDetailTriggerResponse/ResponseHeaders.tsx
Original file line number Diff line number Diff line change
@@ -1,22 +1,20 @@
import {THeader} from 'types/Test.types';
import HeaderRow from 'components/HeaderRow';
import {isRunStateFinished} from 'models/TestRun.model';
import {THeader} from 'types/Test.types';
import {TTestRunState} from 'types/TestRun.types';
import SkeletonResponse from './SkeletonResponse';
import * as S from './RunDetailTriggerResponse.styled';

interface IProps {
headers?: THeader[];
state: TTestRunState;
}

const ResponseHeaders = ({headers}: IProps) => {
return !headers ? (
<SkeletonResponse />
const ResponseHeaders = ({headers, state}: IProps) =>
isRunStateFinished(state) || !!headers ? (
<S.HeadersList>{headers && headers.map(header => <HeaderRow header={header} key={header.key} />)}</S.HeadersList>
) : (
<S.HeadersList>
{headers.map(header => (
<HeaderRow header={header} key={header.key} />
))}
</S.HeadersList>
<SkeletonResponse />
);
};

export default ResponseHeaders;
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,10 @@ const RunDetailTriggerResponse = ({
}}
>
<Tabs.TabPane key={TabsKeys.Body} tab="Body">
<ResponseBody body={body} bodyMimeType={bodyMimeType} />
<ResponseBody body={body} bodyMimeType={bodyMimeType} state={state} />
</Tabs.TabPane>
<Tabs.TabPane key={TabsKeys.Headers} tab="Headers">
<ResponseHeaders headers={headers} />
<ResponseHeaders headers={headers} state={state} />
</Tabs.TabPane>
<Tabs.TabPane key={TabsKeys.Environment} tab="Environment">
<ResponseEnvironment />
Expand Down