Merge pull request #10067 from divyanshiGupta/Bug#2004075

[release-4.9] Bug 2004075: Fix to show image-tag selector in s2i form and re-validate git url on git-type change
openshift · Oct 27, 2021 · 9f85e9d · 9f85e9d
2 parents 14d13a7 + 1cecb46
commit 9f85e9d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/frontend/packages/dev-console/src/components/import/ImportForm.tsx b/frontend/packages/dev-console/src/components/import/ImportForm.tsx
@@ -27,6 +27,7 @@ import {
   ImportData,
   Resources,
   BaseFormData,
+  ImportTypes,
 } from './import-types';
 import { validationSchema } from './import-validation-utils';
 import { useUpdateKnScalingDefaultValues } from './serverless/useUpdateKnScalingDefaultValues';
@@ -113,7 +114,7 @@ const ImportForm: React.FC<ImportFormProps & StateProps> = ({
         detectedFiles: [],
       },
       recommendedStrategy: null,
-      showEditImportStrategy: false,
+      showEditImportStrategy: importData.type !== ImportTypes.git,
       strategyChanged: false,
     },
   };

diff --git a/frontend/packages/dev-console/src/components/import/builder/BuilderImageTagSelector.tsx b/frontend/packages/dev-console/src/components/import/builder/BuilderImageTagSelector.tsx
@@ -69,7 +69,6 @@ const BuilderImageTagSelector: React.FC<BuilderImageTagSelectorProps> = ({
   return (
     <>
       <div style={!showEditImportStrategy ? { display: 'none' } : {}}>
-        <br />
         <DropdownField
           name="image.tag"
           label={t('devconsole~Builder Image version')}

diff --git a/frontend/packages/dev-console/src/components/import/git/GitSection.tsx b/frontend/packages/dev-console/src/components/import/git/GitSection.tsx
@@ -143,7 +143,7 @@ const GitSection: React.FC<GitSectionProps> = ({
     name: nameTouched,
     application: { name: applicationNameTouched } = {},
     image: { selected: imageSelectorTouched } = {},
-    git: { dir: gitDirTouched } = {},
+    git: { dir: gitDirTouched, type: gitTypeTouched } = {},
   } = touched;
   const { git: { url: gitUrlError } = {} } = errors;
 
@@ -312,7 +312,7 @@ const GitSection: React.FC<GitSectionProps> = ({
       setFieldValue('import.loadError', loadError);
       setFieldValue('import.strategies', importStrategies);
       if (importStrategies.length > 0) {
-        values.formType !== 'edit' && setFieldValue('import.showEditImportStrategy', false);
+        setFieldValue('import.showEditImportStrategy', false);
         setFieldValue('import.selectedStrategy', importStrategies[0]);
         setFieldValue('import.recommendedStrategy', importStrategies[0]);
       } else {
@@ -323,7 +323,7 @@ const GitSection: React.FC<GitSectionProps> = ({
           detectedFiles: [],
         });
         setFieldValue('import.recommendedStrategy', null);
-        values.formType !== 'edit' && setFieldValue('import.showEditImportStrategy', true);
+        setFieldValue('import.showEditImportStrategy', true);
       }
       setFieldValue('import.strategyChanged', false);
 
@@ -397,7 +397,7 @@ const GitSection: React.FC<GitSectionProps> = ({
   }, [handleGitUrlChange, sampleRepo, setFieldTouched, setFieldValue, tag]);
 
   React.useEffect(() => {
-    (!dirty || gitDirTouched) &&
+    (!dirty || gitDirTouched || gitTypeTouched) &&
       values.git.url &&
       debouncedHandleGitUrlChange(values.git.url, values.git.ref, values.git.dir);
   }, [
@@ -408,6 +408,8 @@ const GitSection: React.FC<GitSectionProps> = ({
     values.git.url,
     values.git.ref,
     values.git.dir,
+    values.git.type,
+    gitTypeTouched,
   ]);
 
   const helpText = React.useMemo(() => {