Skip to content

Commit

Permalink
refactor(provider/cf): improve error messages on multiple route issues
Browse files Browse the repository at this point in the history
  • Loading branch information
@jmelchio @jkschneider
jmelchio authored and jkschneider committed Nov 13, 2018
1 parent 8cd7b34 commit 23cd1d6
Showing 1 changed file with 48 additions and 70 deletions.
118 changes: 48 additions & 70 deletions ...dules/cloudfoundry/src/serverGroup/configure/wizard/sections/configurationSettings.cf.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ import {
ICloudFoundryManifestTriggerSource,
} from '../../serverGroupConfigurationModel.cf';

import { Field, FieldArray } from 'formik';

export interface ICloudFoundryServerGroupConfigurationSettingsProps
extends IWizardPageProps<ICloudFoundryCreateServerGroupCommand> {
artifactAccounts: IArtifactAccount[];
Expand Down Expand Up @@ -98,33 +100,6 @@ class ConfigurationSettingsImpl extends React.Component<ICloudFoundryServerGroup
this.props.formik.setFieldValue('manifest', this.props.formik.values.manifest);
};

private routeUpdated = (index: number, event: React.ChangeEvent<HTMLInputElement>): void => {
const { manifest } = this.props.formik.values;
if (isManifestDirectSource(manifest)) {
manifest.routes[index] = event.target.value;
this.props.formik.setFieldValue('manifest.routes', manifest.routes);
}
};

private addRoutesVariable = (): void => {
const { manifest } = this.props.formik.values;
if (isManifestDirectSource(manifest)) {
if (manifest.routes === undefined) {
manifest.routes = [];
}
manifest.routes.push('');
this.props.formik.setFieldValue('manifest.routes', manifest.routes);
}
};

private removeRoutesVariable = (index: number): void => {
const { manifest } = this.props.formik.values;
if (isManifestDirectSource(manifest)) {
manifest.routes.splice(index, 1);
this.props.formik.setFieldValue('manifest.routes', manifest.routes);
}
};

private addEnvironmentVariable = (): void => {
const { manifest } = this.props.formik.values;
if (isManifestDirectSource(manifest)) {
Expand Down Expand Up @@ -221,9 +196,6 @@ class ConfigurationSettingsImpl extends React.Component<ICloudFoundryServerGroup

private directConfiguration = (manifest: ICloudFoundryManifestSource): JSX.Element => {
const {
routeUpdated,
removeRoutesVariable,
addRoutesVariable,
addEnvironmentVariable,
removeEnvironmentVariable,
environmentKeyUpdated,
Expand Down Expand Up @@ -266,41 +238,42 @@ class ConfigurationSettingsImpl extends React.Component<ICloudFoundryServerGroup
<b>Routes</b>
&nbsp;
<HelpField id="cf.serverGroup.routes" />
<table className="table table-condensed packed metadata">
<tbody>
{manifest.routes &&
manifest.routes.map(function(route, index) {
return (
<tr key={index}>
<td>
<input
className="form-control input-sm"
value={route}
type="text"
ng-model="command.services[$index]"
required={true}
onChange={event => routeUpdated(index, event)}
/>
</td>
<td>
<a className="btn btn-link sm-label" onClick={() => removeRoutesVariable(index)}>
<span className="glyphicon glyphicon-trash" />
</a>
</td>
</tr>
);
})}
</tbody>
<tfoot>
<tr>
<td colSpan={1}>
<button type="button" className="add-new col-md-12" onClick={addRoutesVariable}>
<span className="glyphicon glyphicon-plus-sign" /> Add New Route
</button>
</td>
</tr>
</tfoot>
</table>
<FieldArray
name="manifest.routes"
render={arrayHelpers => (
<table className="table table-condensed packed metadata">
<tbody>
{manifest.routes &&
manifest.routes.map((_, index) => (
<tr key={index}>
<td>
<Field
className="form-control input-sm"
name={`manifest.routes.${index}`}
type="text"
required={true}
/>
</td>
<td>
<a className="btn btn-link sm-label" onClick={() => arrayHelpers.remove(index)}>
<span className="glyphicon glyphicon-trash" />
</a>
</td>
</tr>
))}
</tbody>
<tfoot>
<tr>
<td colSpan={1}>
<button type="button" className="add-new col-md-12" onClick={() => arrayHelpers.push('')}>
<span className="glyphicon glyphicon-plus-sign" /> Add New Route
</button>
</td>
</tr>
</tfoot>
</table>
)}
/>
</div>
</div>

Expand Down Expand Up @@ -415,11 +388,12 @@ class ConfigurationSettingsImpl extends React.Component<ICloudFoundryServerGroup
</div>
)}
{errors.manifest &&
errors.manifest.routes && (
errors.manifest.routes &&
errors.manifest.routes.map((routeError: string) => (
<div className="wizard-pod-row-errors">
<ValidationMessage message={errors.manifest.routes} type={'error'} />
<ValidationMessage message={routeError} type={'error'} />
</div>
)}
))}
{errors.manifest &&
errors.manifest.env && (
<div className="wizard-pod-row-errors">
Expand Down Expand Up @@ -624,12 +598,16 @@ class ConfigurationSettingsImpl extends React.Component<ICloudFoundryServerGroup
values.manifest.routes.forEach(function(route) {
if (!route) {
errors.manifest = errors.manifest || {};
errors.manifest.routes = `A route was not specified`;
errors.manifest.routes = errors.manifest.routes || [];
errors.manifest.routes.push(`A route was not specified`);
}
const regex = /^([a-zA-Z0-9_-]+)\.([a-zA-Z0-9_.-]+)(\:[0-9]+)?([\/a-zA-Z0-9_-]+)?$/gm;
if (route && regex.exec(route) === null) {
errors.manifest = errors.manifest || {};
errors.manifest.routes = `A route did not match the expected format "host.some.domain[:9999][/some/path]"`;
errors.manifest.routes = errors.manifest.routes || [];
errors.manifest.routes.push(
`A route did not match the expected format "host.some.domain[:9999][/some/path]"`,
);
}
});
}
Expand Down

0 comments on commit 23cd1d6

Please sign in to comment.