Merge pull request #15065 from rawagner/vsphere418

OCPBUGS-54434: Update vSphere configuration form to support CM YAML f…

Author: openshift-merge-bot[bot]

frontend/packages/vsphere-plugin/__tests__/__snapshots__/utils.spec.ts.snap

@@ -3,20 +3,19 @@
   "vSphere configurations": "vSphere configurations",
   "Loading vSphere connection status": "Loading vSphere connection status",
   "The vSphere Connection check is failing.": "The vSphere Connection check is failing.",
-  "No errors are reported. Click the link for details.": "No errors are reported. Click the link for details.",
+  "No errors reported": "No errors reported",
   "Missing the vSphere config map.": "Missing the vSphere config map.",
   "Not configured yet": "Not configured yet",
   "Prometheus query failed.": "Prometheus query failed.",
   "Invalid credentials": "Invalid credentials",
   "Failing {{reason}}": "Failing {{reason}}",
-  "Failed to patch {{secret}}": "Failed to patch {{secret}}",
-  "Failed to create {{secret}} secret": "Failed to create {{secret}} secret",
   "Failed to load kubecontrollermanager": "Failed to load kubecontrollermanager",
-  "Not found.": "Not found.",
+  "Failed to parse cloud provider config {{cm}}": "Failed to parse cloud provider config {{cm}}",
+  "Unknown format": "Unknown format",
+  "Failed to persist {{secret}}": "Failed to persist {{secret}}",
   "Failed to patch kubecontrollermanager": "Failed to patch kubecontrollermanager",
-  "Failed to patch {{cm}}": "Failed to patch {{cm}}",
-  "Failed to create {{cm}} ConfigMap": "Failed to create {{cm}} ConfigMap",
-  "Failed to add taint to node {{node}}": "Failed to add taint to node {{node}}",
+  "Failed to patch cloud provider config": "Failed to patch cloud provider config",
+  "Failed to add taint to nodes": "Failed to add taint to nodes",
   "Failed to patch infrastructure spec": "Failed to patch infrastructure spec",
   "Unexpected error": "Unexpected error",
   "vCenter": "vCenter",
@@ -56,7 +55,6 @@
   "Kube API Server": "Kube API Server",
   "Kube Controller Manager": "Kube Controller Manager",
   "Storage": "Storage",
-  "Failed to fetch infrastructure resource": "Failed to fetch infrastructure resource",
   "An error occured": "An error occured",
   "Help": "Help"
 }

frontend/packages/vsphere-plugin/__tests__/utils.spec.ts

@@ -9,7 +9,6 @@
   "dependencies": {
     "@console/dynamic-plugin-sdk": "0.0.0-fixed",
     "formik": "^2.4.5",
-    "ini": "4.1.1",
     "yup": "^0.27.0"
   },
   "consolePlugin": {

frontend/packages/vsphere-plugin/locales/en/vsphere-plugin.json

@@ -63,7 +63,7 @@ export const healthHandler: PrometheusHealthHandler = (responses, t, additionalR
       message = health.message;
       break;
     case HealthState.OK:
-      message = t('vsphere-plugin~No errors are reported. Click the link for details.');
+      message = t('vsphere-plugin~No errors reported');
       break;
     default:
       break;

frontend/packages/vsphere-plugin/package.json

@@ -12,6 +12,7 @@ import {
 } from '@patternfly/react-core';
 import { Modal, ModalVariant } from '@patternfly/react-core/deprecated';
 import { Formik, useFormikContext } from 'formik';
+import { isEqual } from 'lodash';
 import { useTranslation } from 'react-i18next';
 import * as Yup from 'yup';
 import { HealthState, SubsystemHealth } from '@console/dynamic-plugin-sdk';
@@ -27,21 +28,17 @@ import './VSphereConnectionModal.css';
 
 type VSphereConnectionModalFooterProps = {
   onClose: VoidFunction;
-  mustPatch: boolean;
 };
 
-const VSphereConnectionModalFooter: React.FC<VSphereConnectionModalFooterProps> = ({
-  onClose,
-  mustPatch,
-}) => {
+const VSphereConnectionModalFooter: React.FC<VSphereConnectionModalFooterProps> = ({ onClose }) => {
   const { t } = useTranslation('vsphere-plugin');
-  const { isSubmitting, isValid, dirty, submitForm } = useFormikContext();
+  const { isSubmitting, isValid, submitForm, initialValues, values } = useFormikContext();
   return (
     <Split hasGutter>
       <SplitItem>
         <Button
           variant="primary"
-          isDisabled={isSubmitting || !isValid || (mustPatch ? false : !dirty)}
+          isDisabled={isSubmitting || !isValid || isEqual(initialValues, values)}
           onClick={submitForm}
           isLoading={isSubmitting}
         >
@@ -149,9 +146,7 @@ export const VSphereConnectionModal: React.FC<VSphereConnectionProps> = ({
 
   const models = useConnectionModels();
 
-  const { initValues, isLoaded, mustPatch, error: loadError } = useConnectionForm(
-    cloudProviderConfig,
-  );
+  const { initValues, isLoaded, error: loadError } = useConnectionForm();
 
   const onClose = () => {
     setModalOpen(false);
@@ -162,7 +157,7 @@ export const VSphereConnectionModal: React.FC<VSphereConnectionProps> = ({
     setError(undefined);
 
     try {
-      await persist(t, models, values, cloudProviderConfig);
+      await persist(t, models, values, initValues, cloudProviderConfig);
       onClose();
     } catch (e) {
       if (e instanceof PersistError) {
@@ -199,7 +194,7 @@ export const VSphereConnectionModal: React.FC<VSphereConnectionProps> = ({
             <VSphereConnectionModalAlert error={error} health={health} />
           </StackItem>
           <StackItem>
-            <VSphereConnectionModalFooter onClose={onClose} mustPatch={mustPatch || !!error} />
+            <VSphereConnectionModalFooter onClose={onClose} />
           </StackItem>
         </Stack>
       </Formik>