Merge pull request #2144 from invincibleJai/fix-serverless-trigger

fix Serverless trigger renamed to enabled
openshift · Jul 24, 2019 · 7e0b89a · 7e0b89a
2 parents 271a2da + 3df4d09
commit 7e0b89a
Show file tree

Hide file tree

Showing 12 changed files with 17 additions and 17 deletions.
diff --git a/frontend/packages/dev-console/src/components/import/DeployImage.tsx b/frontend/packages/dev-console/src/components/import/DeployImage.tsx
@@ -38,7 +38,7 @@ const DeployImage: React.FC<DeployImageProps> = ({ namespace }) => {
     },
     isSearchingForImage: false,
     serverless: {
-      trigger: false,
+      enabled: false,
       scaling: {
         minpods: 0,
         maxpods: '',

diff --git a/frontend/packages/dev-console/src/components/import/ImportForm.tsx b/frontend/packages/dev-console/src/components/import/ImportForm.tsx
@@ -70,7 +70,7 @@ const ImportForm: React.FC<ImportFormProps & StateProps> = ({
       },
     },
     serverless: {
-      trigger: false,
+      enabled: false,
       scaling: {
         minpods: 0,
         maxpods: '',

diff --git a/frontend/packages/dev-console/src/components/import/__mocks__/import-validation-mock.ts b/frontend/packages/dev-console/src/components/import/__mocks__/import-validation-mock.ts
@@ -62,7 +62,7 @@ export const mockFormData: GitImportFormData = {
   },
   labels: {},
   serverless: {
-    trigger: false,
+    enabled: false,
     scaling: {
       minpods: 0,
       maxpods: '',

diff --git a/frontend/packages/dev-console/src/components/import/advanced/AdvancedSection.tsx b/frontend/packages/dev-console/src/components/import/advanced/AdvancedSection.tsx
@@ -36,13 +36,13 @@ const AdvancedSection: React.FC<AdvancedSectionProps> = ({ values }) => {
         </ProgressiveListItem>
       )}
       {/* Hide Deployment for Serverless */}
-      {values.serverless.trigger ? null : (
+      {values.serverless.enabled ? null : (
         <ProgressiveListItem name="Deployment Configuration">
           <DeploymentConfigSection namespace={values.project.name} />
         </ProgressiveListItem>
       )}
       <ProgressiveListItem name="Scaling">
-        {values.serverless.trigger ? <ServerlessScalingSection /> : <ScalingSection />}
+        {values.serverless.enabled ? <ServerlessScalingSection /> : <ScalingSection />}
       </ProgressiveListItem>
       <ProgressiveListItem name="Resource Limits">
         <ResourceLimitSection />

diff --git a/frontend/packages/dev-console/src/components/import/deployImage-submit-utils.ts b/frontend/packages/dev-console/src/components/import/deployImage-submit-utils.ts
@@ -238,7 +238,7 @@ export const createResources = async (
 
   const requests: Promise<K8sResourceKind>[] = [];
   requests.push(createImageStream(formData, dryRun));
-  if (!formData.serverless.trigger) {
+  if (!formData.serverless.enabled) {
     requests.push(createDeploymentConfig(formData, dryRun));
 
     if (!_.isEmpty(ports)) {

diff --git a/frontend/packages/dev-console/src/components/import/deployImage-validation-utils.ts b/frontend/packages/dev-console/src/components/import/deployImage-validation-utils.ts
@@ -21,8 +21,8 @@ export const deployValidationSchema = yup.object().shape({
     status: yup.string().required('Required'),
   }),
   serverless: yup.object().shape({
-    trigger: yup.boolean(),
-    scaling: yup.object().when('trigger', {
+    enabled: yup.boolean(),
+    scaling: yup.object().when('enabled', {
       is: true,
       then: yup.object({
         minpods: yup

diff --git a/frontend/packages/dev-console/src/components/import/import-submit-utils.ts b/frontend/packages/dev-console/src/components/import/import-submit-utils.ts
@@ -326,7 +326,7 @@ export const createResources = async (
     createBuildConfig(formData, imageStream, dryRun),
   ];
 
-  if (formData.serverless.trigger) {
+  if (formData.serverless.enabled) {
     // knative service doesn't have dry run capability so returning the promises.
     if (dryRun) {
       return Promise.all(requests);

diff --git a/frontend/packages/dev-console/src/components/import/import-types.ts b/frontend/packages/dev-console/src/components/import/import-types.ts
@@ -125,7 +125,7 @@ export interface DeploymentData {
 }
 
 export interface ServerlessData {
-  trigger: boolean;
+  enabled: boolean;
   scaling: ServerlessScaling;
 }
 

diff --git a/frontend/packages/dev-console/src/components/import/import-validation-utils.ts b/frontend/packages/dev-console/src/components/import/import-validation-utils.ts
@@ -55,8 +55,8 @@ export const validationSchema = yup.object().shape({
       }),
   }),
   serverless: yup.object().shape({
-    trigger: yup.boolean(),
-    scaling: yup.object().when('trigger', {
+    enabled: yup.boolean(),
+    scaling: yup.object().when('enabled', {
       is: true,
       then: yup.object({
         minpods: yup

diff --git a/frontend/packages/dev-console/src/components/import/route/CreateRoute.tsx b/frontend/packages/dev-console/src/components/import/route/CreateRoute.tsx
@@ -10,7 +10,7 @@ const CreateRoute: React.FC = () => {
     values: {
       image: { ports },
       route: { targetPort },
-      serverless: { trigger: serverlessTrigger },
+      serverless: { enabled: serverlessEnabled },
     },
   } = useFormikContext<FormikValues>();
   const portOptions = ports.reduce((acc, port) => {
@@ -23,7 +23,7 @@ const CreateRoute: React.FC = () => {
     return acc;
   }, {});
 
-  if (serverlessTrigger) {
+  if (serverlessEnabled) {
     return (
       <FormGroup>
         <InputField

diff --git a/frontend/packages/dev-console/src/components/import/route/RouteSection.tsx b/frontend/packages/dev-console/src/components/import/route/RouteSection.tsx
@@ -12,15 +12,15 @@ interface RouteSectionProps {
 const RouteSection: React.FC<RouteSectionProps> = ({ route }) => {
   const {
     values: {
-      serverless: { trigger: serverlessTrigger },
+      serverless: { enabled: serverlessEnabled },
     },
   } = useFormikContext<FormikValues>();
   return (
     <FormSection title="Routing">
       {route.create && (
         <React.Fragment>
           <CreateRoute />
-          {!serverlessTrigger && <SecureRoute />}
+          {!serverlessEnabled && <SecureRoute />}
         </React.Fragment>
       )}
     </FormSection>

diff --git a/frontend/packages/dev-console/src/components/import/serverless/ServerlessSection.tsx b/frontend/packages/dev-console/src/components/import/serverless/ServerlessSection.tsx
@@ -17,7 +17,7 @@ const ServerlessSection: React.FC<ServerlessSectionProps> = ({ flags }) => {
         <CheckboxField
           type="checkbox"
           label="Enable scaling to zero when idle"
-          name="serverless.trigger"
+          name="serverless.enabled"
         />
       </FormSection>
     );