Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(docker,titus): re-align digest field on image + tag selector #7526

Merged
merged 3 commits into from
Oct 15, 2019
Merged

fix(docker,titus): re-align digest field on image + tag selector #7526

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1d5f36f
fix(docker,titus): re-align digest field on image + tag selector
Oct 14, 2019
939b8ef
Merge branch 'master' into fix-misaligned-digest-field
Oct 15, 2019
9832f8b
Merge branch 'master' into fix-misaligned-digest-field
Oct 15, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 17 additions & 17 deletions app/scripts/modules/docker/src/image/DockerImageAndTagSelector.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,6 @@ export interface IDockerImageAndTagSelectorProps {
digest: string;
account: string;
showRegistry?: boolean;
labelClass?: string;
fieldClass?: string;
onChange: (changes: IDockerImageAndTagChanges) => void;
deferInitialization?: boolean;
showDigest?: boolean;
Expand All @@ -57,8 +55,6 @@ export class DockerImageAndTagSelector extends React.Component<
IDockerImageAndTagSelectorState
> {
public static defaultProps: Partial<IDockerImageAndTagSelectorProps> = {
fieldClass: 'col-md-8',
labelClass: 'col-md-3',
organization: '',
registry: '',
repository: '',
Expand Down Expand Up @@ -414,9 +410,7 @@ export class DockerImageAndTagSelector extends React.Component<
const {
account,
digest,
fieldClass,
imageId,
labelClass,
organization,
repository,
showDigest,
Expand Down Expand Up @@ -672,18 +666,24 @@ export class DockerImageAndTagSelector extends React.Component<

const Digest =
lookupType === 'digest' ? (
<div className="form-group">
<div className={`sm-label-right ${labelClass}`}>
Digest <HelpField id="pipeline.config.docker.trigger.digest" />
<div className="sp-formItem">
<div className="sp-formItem__left">
<div className="sp-formLabel">
Digest <HelpField id="pipeline.config.docker.trigger.digest" />
</div>
</div>
<div className={fieldClass}>
<input
className="form-control input-sm"
placeholder="sha256:abc123"
value={digest || parsedImageId.digest || ''}
onChange={e => this.valueChanged('digest', e.target.value)}
required={true}
/>
<div className="sp-formItem__right">
<div className="sp-form">
<span className="field">
<input
className="form-control input-sm"
placeholder="sha256:abc123"
value={digest || parsedImageId.digest || ''}
onChange={e => this.valueChanged('digest', e.target.value)}
required={true}
/>
</span>
</div>
</div>
</div>
) : null;
Expand Down
2 changes: 0 additions & 2 deletions app/scripts/modules/titus/src/pipeline/stages/runJob/TitusRunJobStageConfig.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,8 +222,6 @@ export class TitusRunJobStageConfig extends React.Component<IStageConfigProps, I
showRegistry={false}
onChange={this.dockerChanged}
deferInitialization={stage.deferredInitialization}
labelClass="col-md-2 col-md-offset-1 sm-label-right"
fieldClass="col-md-6"
/>

<StageConfigField label="CPU(s)">
Expand Down
2 changes: 0 additions & 2 deletions ...scripts/modules/titus/src/serverGroup/configure/wizard/pages/ServerGroupBasicSettings.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,8 +257,6 @@ export class ServerGroupBasicSettings
tag={values.tag}
showRegistry={false}
deferInitialization={values.deferredInitialization}
labelClass="col-md-3"
fieldClass="col-md-7"
onChange={this.dockerValuesChanged}
/>
)}
Expand Down