refactor(cf): use new inline RadioInput (#7085)

spinnaker · Jun 7, 2019 · be14551 · be14551
1 parent 94dc56d
commit be14551
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 65 deletions.
diff --git a/...ripts/modules/cloudfoundry/src/presentation/forms/inputs/CloudFoundryRadioButtonInput.tsx b/...ripts/modules/cloudfoundry/src/presentation/forms/inputs/CloudFoundryRadioButtonInput.tsx
diff --git a/app/scripts/modules/cloudfoundry/src/presentation/forms/inputs/index.ts b/app/scripts/modules/cloudfoundry/src/presentation/forms/inputs/index.ts
@@ -1,2 +1 @@
-export * from './CloudFoundryRadioButtonInput';
 export * from './FormikConfigField';
diff --git a/app/scripts/modules/cloudfoundry/src/presentation/forms/serverGroup/HealthCheck.tsx b/app/scripts/modules/cloudfoundry/src/presentation/forms/serverGroup/HealthCheck.tsx
@@ -1,8 +1,6 @@
 import * as React from 'react';
 
-import { FormikFormField, TextInput } from '@spinnaker/core';
-
-import { CloudFoundryRadioButtonInput } from 'cloudfoundry/presentation/forms/inputs/CloudFoundryRadioButtonInput';
+import { FormikFormField, RadioButtonInput, TextInput } from '@spinnaker/core';
 
 export interface IHealthCheckProps {
   healthCheckHttpEndpointFieldName: string;
@@ -35,7 +33,7 @@ export class HealthCheck extends React.Component<IHealthCheckProps> {
             name={healthCheckTypeFieldName}
             label="Health Check Type"
             fastField={false}
-            input={props => <CloudFoundryRadioButtonInput {...props} options={this.HEALTH_CHECK_TYPE_OPTIONS} />}
+            input={props => <RadioButtonInput {...props} inline={true} options={this.HEALTH_CHECK_TYPE_OPTIONS} />}
             onChange={value => {
               onHealthCheckTypeChange && onHealthCheckTypeChange(value);
             }}

diff --git a/.../serverGroup/configure/wizard/sections/configurationSettings/ConfigurationSettings.cf.tsx b/.../serverGroup/configure/wizard/sections/configurationSettings/ConfigurationSettings.cf.tsx
@@ -8,6 +8,7 @@ import {
   IWizardPageComponent,
   IPipeline,
   IStage,
+  RadioButtonInput,
   StageArtifactSelector,
   ArtifactTypePatterns,
 } from '@spinnaker/core';
@@ -17,7 +18,6 @@ import {
   ICloudFoundryManifest,
 } from 'cloudfoundry/serverGroup/configure/serverGroupConfigurationModel.cf';
 
-import { CloudFoundryRadioButtonInput } from 'cloudfoundry/presentation/forms/inputs/CloudFoundryRadioButtonInput';
 import { ICloudFoundryEnvVar } from 'cloudfoundry/domain';
 import {
   Buildpacks,
@@ -145,10 +145,11 @@ export class CloudFoundryServerGroupConfigurationSettings
       <>
         <div className="form-group">
           <div className="col-md-11">
-            <div className="StandardFieldLayout flex-container-h margin-between-lg">
+            <div className="StandardFieldLayout flex-container-h baseline margin-between-lg">
               <div className="sm-label-right">Source Type</div>
               <div className="flex-grow">
-                <CloudFoundryRadioButtonInput
+                <RadioButtonInput
+                  inline={true}
                   value={direct ? 'direct' : 'artifact'}
                   options={[{ label: 'Artifact', value: 'artifact' }, { label: 'Form', value: 'direct' }]}
                   onChange={(e: any) => this.manifestSourceUpdated(e.target.value)}