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.

Sign up for GitHub

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

type(bugfix): Fix MyHub input validation #2781

Merged
merged 1 commit into from
May 12, 2021
Merged

type(bugfix): Fix MyHub input validation #2781

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 12 additions & 2 deletions litmus-portal/frontend/src/views/MyHub/MyHubConnect/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,10 @@ import {
} from '../../../models/graphql/user';
import { history } from '../../../redux/configureStore';
import { getProjectID, getProjectRole } from '../../../utils/getSearchParams';
import { validateStartEmptySpacing } from '../../../utils/validate';
import {
isValidWebUrl,
validateStartEmptySpacing,
} from '../../../utils/validate';
import useStyles from './styles';

interface GitHub {
Expand Down Expand Up @@ -445,7 +448,14 @@ const MyHub: React.FC = () => {
</div>
</div>
<div className={classes.submitBtnDiv}>
<ButtonFilled variant="success" type="submit">
<ButtonFilled
variant="success"
type="submit"
disabled={
!isValidWebUrl(gitHub.GitURL) ||
validateStartEmptySpacing(gitHub.GitBranch)
}
>
{t('myhub.connectHubPage.submitBtn')}
</ButtonFilled>
</div>
Expand Down
16 changes: 13 additions & 3 deletions litmus-portal/frontend/src/views/MyHub/MyHubEdit/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,10 @@ import {
import { HubStatus } from '../../../models/redux/myhub';
import { history } from '../../../redux/configureStore';
import { getProjectID, getProjectRole } from '../../../utils/getSearchParams';
import { validateStartEmptySpacing } from '../../../utils/validate';
import {
isValidWebUrl,
validateStartEmptySpacing,
} from '../../../utils/validate';
import useStyles from './styles';

interface MyHubParams {
Expand Down Expand Up @@ -385,7 +388,7 @@ const MyHub: React.FC = () => {
{!copying ? (
<div className={classes.rowDiv}>
<img
src="./icons/copy.svg"
src="/icons/copy.svg"
className={classes.copyBtnImg}
alt="copy"
/>
Expand Down Expand Up @@ -415,7 +418,14 @@ const MyHub: React.FC = () => {
</div>
</div>
<div className={classes.submitBtnDiv}>
<ButtonFilled variant="success" type="submit">
<ButtonFilled
variant="success"
type="submit"
disabled={
!isValidWebUrl(gitHub.GitURL) ||
validateStartEmptySpacing(gitHub.GitBranch)
}
>
{t('myhub.editPage.submit')}
</ButtonFilled>
</div>
Expand Down