Fix MyHub input validation (#2781)

Signed-off-by: Saswata Mukherjee <[email protected]>
litmuschaos · May 12, 2021 · 2555d26 · 2555d26
1 parent 6c20e5f
commit 2555d26
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 5 deletions.
diff --git a/litmus-portal/frontend/src/views/MyHub/MyHubConnect/index.tsx b/litmus-portal/frontend/src/views/MyHub/MyHubConnect/index.tsx
@@ -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 {
@@ -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>

diff --git a/litmus-portal/frontend/src/views/MyHub/MyHubEdit/index.tsx b/litmus-portal/frontend/src/views/MyHub/MyHubEdit/index.tsx
@@ -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 {
@@ -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"
                                               />
@@ -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>