CONSOLE-4880: Bump 'yup' version

frontend/package.json

@@ -217,7 +217,7 @@
     "subscriptions-transport-ws": "^0.9.16",
     "typesafe-actions": "^4.2.1",
     "victory": "^37.3.6",
-    "yup": "^0.27.0"
+    "yup": "^1.7.1"
   },
   "devDependencies": {
     "@babel/core": "^7.10.3",

frontend/packages/dev-console/locales/en/devconsole.json

@@ -607,11 +607,9 @@
   "Port must be between 1 and 65535.": "Port must be between 1 and 65535.",
   "Request must be greater than or equal to 0.": "Request must be greater than or equal to 0.",
   "CPU request must be less than or equal to limit.": "CPU request must be less than or equal to limit.",
-  "Unit must be millicores or cores.": "Unit must be millicores or cores.",
   "Limit must be greater than or equal to 0.": "Limit must be greater than or equal to 0.",
   "CPU limit must be greater than or equal to request.": "CPU limit must be greater than or equal to request.",
   "Memory request must be less than or equal to limit.": "Memory request must be less than or equal to limit.",
-  "Unit must be Mi or Gi.": "Unit must be Mi or Gi.",
   "Memory limit must be greater than or equal to request.": "Memory limit must be greater than or equal to request.",
   "Please enter a URL that is less then 2000 characters.": "Please enter a URL that is less then 2000 characters.",
   "Invalid Git URL.": "Invalid Git URL.",

frontend/packages/dev-console/src/components/buildconfig/form-utils/validation.ts

@@ -14,17 +14,18 @@ const sourceSchema = () =>
         .oneOf(['git', 'dockerfile', 'binary']),
       git: yup.object().when('type', {
         is: 'git',
-        then: yup.object({
-          git: yup.object({
-            url: yup.string().required(i18n.t('devconsole~Required')),
-            ref: yup.string(),
-            dir: yup.string(),
+        then: (schema) =>
+          schema.shape({
+            git: yup.object({
+              url: yup.string().required(i18n.t('devconsole~Required')),
+              ref: yup.string(),
+              dir: yup.string(),
+            }),
           }),
-        }),
       }),
       dockerfile: yup.string().when('type', {
         is: 'dockerfile',
-        then: yup.string(),
+        then: (schema) => schema,
       }),
     })
     .required(i18n.t('devconsole~Required'));
@@ -34,21 +35,22 @@ const imageSchema = (allowedTypes: string[]) =>
     type: yup.string().required(i18n.t('devconsole~Required')).oneOf(allowedTypes),
     imageStreamTag: yup.object().when('type', {
       is: 'imageStreamTag',
-      then: yup.object({
-        imageStream: yup.object({
-          namespace: yup.string().required(i18n.t('devconsole~Required')),
-          image: yup.string().required(i18n.t('devconsole~Required')),
-          tag: yup.string().required(i18n.t('devconsole~Required')),
+      then: (schema) =>
+        schema.shape({
+          imageStream: yup.object({
+            namespace: yup.string().required(i18n.t('devconsole~Required')),
+            image: yup.string().required(i18n.t('devconsole~Required')),
+            tag: yup.string().required(i18n.t('devconsole~Required')),
+          }),
         }),
-      }),
     }),
     imageStreamImage: yup.string().when('type', {
       is: 'imageStreamImage',
-      then: yup.string().required(i18n.t('devconsole~Required')),
+      then: (schema) => schema.required(i18n.t('devconsole~Required')),
     }),
     dockerImage: yup.string().when('type', {
       is: 'dockerImage',
-      then: yup.string().required(i18n.t('devconsole~Required')),
+      then: (schema) => schema.required(i18n.t('devconsole~Required')),
     }),
   });
 
@@ -82,22 +84,23 @@ const formDataSchema = () =>
 
 export const validationSchema = () =>
   yup.mixed().test({
-    test(values: BuildConfigFormikValues) {
+    async test(values: BuildConfigFormikValues) {
       const formYamlDefinition = yup.object({
         editorType: yup
           .string()
           .oneOf(Object.values(EditorType))
           .required(i18n.t('devconsole~Required')),
         formData: yup.mixed().when('editorType', {
           is: EditorType.Form,
-          then: formDataSchema(),
+          then: (schema) => schema.concat(formDataSchema()),
         }),
         yamlData: yup.mixed().when('editorType', {
           is: EditorType.YAML,
-          then: yup.string().required(i18n.t('devconsole~Required')),
+          then: (schema) => schema.concat(yup.string().required(i18n.t('devconsole~Required'))),
         }),
       });
 
-      return formYamlDefinition.validate(values, { abortEarly: false });
+      await formYamlDefinition.validate(values, { abortEarly: false });
+      return true;
     },
   });

frontend/packages/dev-console/src/components/deployments/utils/deployment-validation-utils.ts

@@ -113,32 +113,35 @@ export const editDeploymentFormSchema = (formValues: EditDeploymentFormData) =>
       : {}),
     imageStream: yup.object().when('fromImageStreamTag', {
       is: true,
-      then: yup.object({
-        namespace: yup.string().required(i18n.t('devconsole~Required')),
-        image: yup.string().required(i18n.t('devconsole~Required')),
-        tag: yup.string().required(i18n.t('devconsole~Required')),
-      }),
+      then: (schema) =>
+        schema.shape({
+          namespace: yup.string().required(i18n.t('devconsole~Required')),
+          image: yup.string().required(i18n.t('devconsole~Required')),
+          tag: yup.string().required(i18n.t('devconsole~Required')),
+        }),
     }),
     isi: yup.object().when('fromImageStreamTag', {
       is: true,
-      then: yup.object({
-        name: yup.string().required(i18n.t('devconsole~Required')),
-      }),
+      then: (schema) =>
+        schema.shape({
+          name: yup.string().required(i18n.t('devconsole~Required')),
+        }),
     }),
   });
 
 export const validationSchema = () =>
   yup.mixed().test({
-    test(formValues: EditDeploymentData) {
+    async test(formValues: EditDeploymentData) {
       const formYamlDefinition = yup.object({
         editorType: yup.string().oneOf(Object.values(EditorType)),
         yamlData: yup.string(),
         formData: yup.mixed().when('editorType', {
           is: EditorType.Form,
-          then: editDeploymentFormSchema(formValues.formData),
+          then: (schema) => schema.concat(editDeploymentFormSchema(formValues.formData)),
         }),
       });
 
-      return formYamlDefinition.validate(formValues, { abortEarly: false });
+      await formYamlDefinition.validate(formValues, { abortEarly: false });
+      return true;
     },
   });

frontend/packages/dev-console/src/components/health-checks/health-checks-probe-validation-utils.ts

@@ -13,55 +13,59 @@ export const healthChecksValidationSchema = (t: TFunction) =>
     modified: yup.boolean(),
     data: yup.object().when('showForm', {
       is: true,
-      then: yup.object().shape({
-        periodSeconds: yup
-          .number()
-          .integer(t('devconsole~Value must be an integer.'))
-          .min(1, t('devconsole~Period must be greater than or equal to 1.'))
-          .max(MAX_INT32, t('devconsole~Value is larger than maximum value allowed.')),
-        initialDelaySeconds: yup
-          .number()
-          .integer(t('devconsole~Value must be an integer.'))
-          .min(0, t('devconsole~Initial delay must be greater than or equal to 0.'))
-          .max(MAX_INT32, t('devconsole~Value is larger than maximum value allowed.')),
-        failureThreshold: yup
-          .number()
-          .integer(t('devconsole~Value must be an integer.'))
-          .min(1, t('devconsole~Failure threshold must be greater than or equal to 1.')),
-        timeoutSeconds: yup
-          .number()
-          .integer(t('devconsole~Value must be an integer.'))
-          .min(1, t('devconsole~Timeout must be greater than or equal to 1.'))
-          .max(MAX_INT32, t('devconsole~Value is larger than maximum value allowed.')),
-        successThreshold: yup
-          .number()
-          .integer(t('devconsole~Value must be an integer.'))
-          .min(1, t('devconsole~Success threshold must be greater than or equal to 1.'))
-          .max(MAX_INT32, t('devconsole~Value is larger than maximum value allowed.')),
-        requestType: yup.string(),
-        httpGet: yup.object().when('requestType', {
-          is: 'httpGet',
-          then: yup.object({
-            path: yup.string().matches(pathRegex, {
-              message: t('devconsole~Path must start with /.'),
-              excludeEmptyString: true,
-            }),
-            port: yup.number().required(t('devconsole~Required')),
+      then: (schema) =>
+        schema.shape({
+          periodSeconds: yup
+            .number()
+            .integer(t('devconsole~Value must be an integer.'))
+            .min(1, t('devconsole~Period must be greater than or equal to 1.'))
+            .max(MAX_INT32, t('devconsole~Value is larger than maximum value allowed.')),
+          initialDelaySeconds: yup
+            .number()
+            .integer(t('devconsole~Value must be an integer.'))
+            .min(0, t('devconsole~Initial delay must be greater than or equal to 0.'))
+            .max(MAX_INT32, t('devconsole~Value is larger than maximum value allowed.')),
+          failureThreshold: yup
+            .number()
+            .integer(t('devconsole~Value must be an integer.'))
+            .min(1, t('devconsole~Failure threshold must be greater than or equal to 1.')),
+          timeoutSeconds: yup
+            .number()
+            .integer(t('devconsole~Value must be an integer.'))
+            .min(1, t('devconsole~Timeout must be greater than or equal to 1.'))
+            .max(MAX_INT32, t('devconsole~Value is larger than maximum value allowed.')),
+          successThreshold: yup
+            .number()
+            .integer(t('devconsole~Value must be an integer.'))
+            .min(1, t('devconsole~Success threshold must be greater than or equal to 1.'))
+            .max(MAX_INT32, t('devconsole~Value is larger than maximum value allowed.')),
+          requestType: yup.string(),
+          httpGet: yup.object().when('requestType', {
+            is: 'httpGet',
+            then: (httpGetSchema) =>
+              httpGetSchema.shape({
+                path: yup.string().matches(pathRegex, {
+                  message: t('devconsole~Path must start with /.'),
+                  excludeEmptyString: true,
+                }),
+                port: yup.number().required(t('devconsole~Required')),
+              }),
           }),
-        }),
-        tcpSocket: yup.object().when('requestType', {
-          is: 'tcpSocket',
-          then: yup.object({
-            port: yup.number().required(t('devconsole~Required')),
+          tcpSocket: yup.object().when('requestType', {
+            is: 'tcpSocket',
+            then: (tcpSocketSchema) =>
+              tcpSocketSchema.shape({
+                port: yup.number().required(t('devconsole~Required')),
+              }),
           }),
-        }),
-        exec: yup.object().when('requestType', {
-          is: 'command',
-          then: yup.object({
-            command: yup.array().of(yup.string().required(t('devconsole~Required'))),
+          exec: yup.object().when('requestType', {
+            is: 'command',
+            then: (execSchema) =>
+              execSchema.shape({
+                command: yup.array().of(yup.string().required(t('devconsole~Required'))),
+              }),
           }),
         }),
-      }),
     }),
   });
 

frontend/packages/dev-console/src/components/hpa/validation-utils.ts

@@ -9,49 +9,50 @@ export const hpaValidationSchema = (t: TFunction) =>
     editorType: yup.string(),
     formData: yup.object().when('editorType', {
       is: EditorType.Form,
-      then: yup.object({
-        metadata: yup.object({
-          name: yup
-            .string()
-            .matches(nameRegex, {
-              message: t(
-                'devconsole~Name must consist of lower-case letters, numbers and hyphens. It must start with a letter and end with a letter or number.',
+      then: (schema) =>
+        schema.shape({
+          metadata: yup.object({
+            name: yup
+              .string()
+              .matches(nameRegex, {
+                message: t(
+                  'devconsole~Name must consist of lower-case letters, numbers and hyphens. It must start with a letter and end with a letter or number.',
+                ),
+                excludeEmptyString: true,
+              })
+              .max(253, t('devconsole~Cannot be longer than 253 characters.'))
+              .required(t('devconsole~Required')),
+          }),
+          spec: yup.object({
+            minReplicas: yup
+              .number()
+              .test(isInteger(t('devconsole~Minimum Pods must be an integer.')))
+              .min(1, t('devconsole~Minimum Pods must greater than or equal to 1.'))
+              .test(
+                'test-less-than-max',
+                t('devconsole~Minimum Pods should be less than or equal to Maximum Pods.'),
+                function (minReplicas) {
+                  const { maxReplicas } = this.parent;
+                  return minReplicas <= maxReplicas;
+                },
               ),
-              excludeEmptyString: true,
-            })
-            .max(253, t('devconsole~Cannot be longer than 253 characters.'))
-            .required(t('devconsole~Required')),
+            maxReplicas: yup
+              .number()
+              .test(isInteger(t('devconsole~Maximum Pods must be an integer.')))
+              .max(
+                Number.MAX_SAFE_INTEGER,
+                t('devconsole~Value is larger than maximum value allowed.'),
+              )
+              .test(
+                'test-greater-than-min',
+                t('devconsole~Maximum Pods should be greater than or equal to Minimum Pods.'),
+                function (maxReplicas) {
+                  const { minReplicas } = this.parent;
+                  return minReplicas <= maxReplicas;
+                },
+              )
+              .required(t('devconsole~Max Pods must be defined.')),
+          }),
         }),
-        spec: yup.object({
-          minReplicas: yup
-            .number()
-            .test(isInteger(t('devconsole~Minimum Pods must be an integer.')))
-            .min(1, t('devconsole~Minimum Pods must greater than or equal to 1.'))
-            .test(
-              'test-less-than-max',
-              t('devconsole~Minimum Pods should be less than or equal to Maximum Pods.'),
-              function (minReplicas) {
-                const { maxReplicas } = this.parent;
-                return minReplicas <= maxReplicas;
-              },
-            ),
-          maxReplicas: yup
-            .number()
-            .test(isInteger(t('devconsole~Maximum Pods must be an integer.')))
-            .max(
-              Number.MAX_SAFE_INTEGER,
-              t('devconsole~Value is larger than maximum value allowed.'),
-            )
-            .test(
-              'test-greater-than-min',
-              t('devconsole~Maximum Pods should be greater than or equal to Minimum Pods.'),
-              function (maxReplicas) {
-                const { minReplicas } = this.parent;
-                return minReplicas <= maxReplicas;
-              },
-            )
-            .required(t('devconsole~Max Pods must be defined.')),
-        }),
-      }),
     }),
   });

frontend/packages/dev-console/src/components/import/deployImage-validation-utils.ts

@@ -18,7 +18,9 @@ export const deployValidationSchema = (t: TFunction) =>
     project: projectNameValidationSchema,
     application: applicationNameValidationSchema,
     name: nameValidationSchema(t),
-    isi: isiValidationSchema(t),
+    isi: yup.object().when('registry', ([registry], schema) => {
+      return registry === 'internal' ? schema.concat(isiValidationSchema(t)) : schema;
+    }),
     serverless: serverlessValidationSchema(t),
     deployment: deploymentValidationSchema(t),
     route: routeValidationSchema(t),