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

2767 automate tab include deeplink technique update #2801

Merged
merged 5 commits into from
Jun 23, 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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 9 additions & 1 deletion web/src/components/CodeBlock/CodeBlock.styled.ts
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,16 @@ export const CopyButton = styled(Button)`
background: ${({theme}) => theme.color.white};
font-weight: 600;

&:hover, &:focus, &:active {
&:hover,
&:focus,
&:active {
background: ${({theme}) => theme.color.white};
}
}
`;

export const ActionsContainer = styled.div`
display: flex;
align-items: center;
gap: 6px;
`;
12 changes: 8 additions & 4 deletions web/src/components/CodeBlock/FramedCodeBlock.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,22 @@ import useCopy from '../../hooks/useCopy';

interface IProps extends ICodeBlockProps {
title: string;
actions?: React.ReactNode;
}

const FramedCodeBlock = ({title, ...props}: IProps) => {
const FramedCodeBlock = ({title, actions, ...props}: IProps) => {
const copy = useCopy();

return (
<S.FrameContainer>
<S.FrameHeader>
<S.FrameTitle>{title}</S.FrameTitle>
<S.CopyButton ghost type="primary" onClick={() => copy(props.value)}>
Copy
</S.CopyButton>
<S.ActionsContainer>
{actions}
<S.CopyButton ghost type="primary" onClick={() => copy(props.value)}>
Copy
</S.CopyButton>
</S.ActionsContainer>
</S.FrameHeader>
<CodeBlock {...props} />
</S.FrameContainer>
Expand Down
2 changes: 1 addition & 1 deletion web/src/components/Router/Router.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ const Router = () => (
<Route path=":mode" element={<RunDetail />} />
</Route>

<Route path="/test/:testId/version/:version/run" element={<AutomatedTestRun />} />
<Route path="/test/:testId/run" element={<AutomatedTestRun />} />

<Route path="/transaction/:transactionId" element={<Transaction />} />
<Route path="/transaction/:transactionId/run/:runId" element={<TransactionRunDetail />} />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ const Controls = ({onChange, test, environmentId}: IProps) => {
format: CliCommandFormat.Pretty,
}}
layout="horizontal"
name="DEEP_LINK"
name="CLI_COMMAND"
>
<S.ControlsContainer>
<S.OptionsContainer>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,15 @@ const Controls = ({onChange, environment: {values} = Environment({}), test, envi
const defaultValues = useMemo(
() => ({
variables: values,
useEnvironmentId: false,
useEnvironmentId: true,
}),
[values]
);

useEffect(() => {
onChange({
variables: variables ?? [],
useEnvironmentId: useEnvironmentId ?? false,
useEnvironmentId: useEnvironmentId ?? true,
environmentId,
test,
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,7 @@ export const ControlsContainer = styled.div`

export const OptionsContainer = styled.div``;

export const EntryContainer = styled.div`
// align-items: center;
// display: grid;
// justify-content: center;
// grid-template-columns: 1fr auto;
// margin-bottom: 8px;
`;
export const EntryContainer = styled.div``;

export const ValuesContainer = styled.div`
align-items: center;
Expand All @@ -78,3 +72,17 @@ export const DeleteVariableButton = styled(Button)``;
export const VariablesContainer = styled.div`
margin: 16px 0;
`;

export const TryItButton = styled(Button)`
&& {
padding: 0 8px;
background: ${({theme}) => theme.color.white};
font-weight: 600;

&:hover,
&:focus,
&:active {
background: ${({theme}) => theme.color.white};
}
}
`;
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
import {FramedCodeBlock} from 'components/CodeBlock';
import {Typography} from 'antd';
// import {ReadOutlined} from '@ant-design/icons';
// import {CLI_RUNNING_TESTS_URL} from 'constants/Common.constants';
import {FramedCodeBlock} from 'components/CodeBlock';
import * as S from './DeepLink.styled';
import Controls from './Controls';
import {IMethodProps} from '../../RunDetailAutomateMethods';
Expand All @@ -14,9 +12,6 @@ const DeepLink = ({test, environmentId, run: {environment}}: IMethodProps) => {
<S.Container>
<S.TitleContainer>
<S.Title>Deep Link Usage</S.Title>
{/* <a href={CLI_RUNNING_TESTS_URL} target="_blank">
<ReadOutlined />
</a> */}
</S.TitleContainer>
<Typography.Paragraph>
The deep link below enables you to run this test via a browser. It is useful as you can create dashboards to run
Expand All @@ -28,6 +23,13 @@ const DeepLink = ({test, environmentId, run: {environment}}: IMethodProps) => {
value={deepLink}
minHeight="80px"
maxHeight="80px"
actions={
<a target="_blank" href={deepLink}>
<S.TryItButton ghost type="primary">
Try it
</S.TryItButton>
</a>
}
/>
<Controls onChange={onGetDeepLink} environment={environment} test={test} environmentId={environmentId} />
</S.Container>
Expand Down
2 changes: 1 addition & 1 deletion web/src/components/WithAnalytics/WithAnalytics.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {useEffect} from 'react';
import AnalyticsService from '../../services/Analytics/Analytics.service';
import AnalyticsService from 'services/Analytics/Analytics.service';

const withAnalytics = <P extends object>(Component: React.ComponentType<P>, name: string) => {
const FunctionComponent = (props: P) => {
Expand Down
8 changes: 5 additions & 3 deletions web/src/pages/AutomatedTestRun/AutomatedTestRun.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {useParams} from 'react-router-dom';
import {useParams, useSearchParams} from 'react-router-dom';

import Layout from 'components/Layout';
import TestSpecFormProvider from 'components/TestSpecForm/TestSpecForm.provider';
Expand All @@ -7,11 +7,13 @@ import TestProvider from 'providers/Test/Test.provider';
import Content from './Content';

const AutomatedTestRun = () => {
const {testId = '', version = '1'} = useParams();
const {testId = ''} = useParams();
const [query] = useSearchParams();
const version = query.get('version') ? Number(query.get('version')) : undefined;

return (
<Layout hasMenu>
<TestProvider testId={testId} version={Number(version)}>
<TestProvider testId={testId} version={version}>
<TestSpecFormProvider testId={testId}>
<Content />
</TestSpecFormProvider>
Expand Down
13 changes: 7 additions & 6 deletions web/src/providers/Test/Test.provider.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -49,14 +49,15 @@ const TestProvider = ({children, testId, version = 0}: IProps) => {
} = useGetTestVersionByIdQuery({testId, version}, {skip: !version});
const {data: latestTest, isLoading: isLatestLoading, isError: isLatestError} = useGetTestByIdQuery({testId});

const isLatestVersion = useMemo(
() => Boolean(version) && version === latestTest?.version,
[latestTest?.version, version]
);
const isLoading = isLatestLoading || isCurrentLoading;
const isError = isLatestError || isCurrentError;
const currentTest = (version ? test : latestTest)!;

const isLatestVersion = useMemo(
() => (Boolean(version) && version === latestTest?.version) || currentTest?.version === latestTest?.version,
[currentTest?.version, latestTest?.version, version]
);

const onEdit = useCallback(
(values: TDraftTest) => {
if (isLatestVersion) edit(test!, values);
Expand All @@ -73,15 +74,15 @@ const TestProvider = ({children, testId, version = 0}: IProps) => {
(request: Partial<TTestRunRequest> = {}) => {
if (isLatestVersion)
runTest({
test: test!,
test: currentTest,
...request,
});
else {
setAction('run');
setIsVersionModalOpen(true);
}
},
[isLatestVersion, runTest, test]
[currentTest, isLatestVersion, runTest]
);

const onConfirm = useCallback(() => {
Expand Down
8 changes: 4 additions & 4 deletions web/src/services/DeepLink.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ export type TDeepLinkConfig = {
};

const DeepLinkService = () => ({
getLink({variables, useEnvironmentId, test: {id: testId, version}, environmentId}: TDeepLinkConfig) {
getLink({variables, useEnvironmentId, test: {id: testId}, environmentId}: TDeepLinkConfig) {
const baseUrl = getServerBaseUrl();
const filteredVariables = variables.filter(variable => !!variable && variable.key);
const stringVariables = encodeURI(JSON.stringify(filteredVariables));

const url = `${baseUrl}test/${testId}/version/${version}/run?${
filteredVariables.length ? `variables=${stringVariables}` : ''
}${useEnvironmentId && environmentId ? `&environmentId=${environmentId}` : ''}`;
const url = `${baseUrl}test/${testId}/run?${filteredVariables.length ? `variables=${stringVariables}` : ''}${
useEnvironmentId && environmentId ? `&environmentId=${environmentId}` : ''
}`;

return url;
},
Expand Down