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

refactor(core): minor fixes to the refactored triggers #7024

Merged
merged 2 commits into from
May 17, 2019
Merged

refactor(core): minor fixes to the refactored triggers #7024

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5bcafba
refactor(core): minor fixes to the refactored triggers
May 17, 2019
a4f484e
Merge branch 'master' into clean-up-triggers
May 17, 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
4 changes: 2 additions & 2 deletions app/scripts/modules/core/src/pipeline/config/triggers/artifactory/ArtifactoryTrigger.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { Observable, Subject } from 'rxjs';
import { IArtifactoryTrigger } from 'core/domain/ITrigger';
import { BaseTrigger } from 'core/pipeline';
import { ArtifactoryReaderService } from './artifactoryReader.service';
import { Application } from '@spinnaker/core';
import { Application } from 'core/application';

export interface IArtifactoryTriggerConfigProps {
trigger: IArtifactoryTrigger;
Expand Down Expand Up @@ -40,7 +40,7 @@ export class ArtifactoryTrigger extends React.Component<
});
}

public componentWillUnmount(): void {
public componentWillUnmount() {
this.destroy$.next();
}

Expand Down
8 changes: 6 additions & 2 deletions app/scripts/modules/core/src/pipeline/config/triggers/baseBuild/BaseBuildTrigger.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,13 @@ export class BaseBuildTrigger extends React.Component<IBaseBuildTriggerConfigPro
};
}

public componentDidMount = () => {
public componentDidMount() {
this.initializeMasters();
};
}

public componentWillUnmount() {
this.destroy$.next();
}

private refreshMasters = () => {
this.setState({
Expand Down
2 changes: 1 addition & 1 deletion app/scripts/modules/core/src/pipeline/config/triggers/concourse/ConcourseTrigger.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ export class ConcourseTrigger extends React.Component<IConcourseTriggerConfigPro
};
}

public componentDidMount(): void {
public componentDidMount() {
Observable.fromPromise(IgorService.listMasters(BuildServiceType.Concourse))
.takeUntil(this.destroy$)
.subscribe((masters: string[]) => {
Expand Down
4 changes: 2 additions & 2 deletions app/scripts/modules/core/src/pipeline/config/triggers/git/GitTrigger.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ export class GitTrigger extends React.Component<IGitTriggerConfigProps> {
this.state = {};
}

public componentDidMount = () => {
public componentDidMount() {
const trigger = { ...this.props.trigger };
const { attributes } = this.props.application;

Expand All @@ -63,7 +63,7 @@ export class GitTrigger extends React.Component<IGitTriggerConfigProps> {
}

this.props.triggerUpdated && this.props.triggerUpdated(trigger);
};
}

private onUpdateTrigger = (update: any) => {
this.props.triggerUpdated &&
Expand Down
10 changes: 7 additions & 3 deletions app/scripts/modules/core/src/pipeline/config/triggers/pubsub/PubsubTrigger.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ export class PubsubTrigger extends React.Component<IPubsubTriggerProps, IPubsubT
};
}

public componentDidMount(): void {
public componentDidMount() {
Observable.fromPromise(PubsubSubscriptionReader.getPubsubSubscriptions())
.takeUntil(this.destroy$)
.subscribe(
Expand All @@ -52,6 +52,10 @@ export class PubsubTrigger extends React.Component<IPubsubTriggerProps, IPubsubT
);
}

public componentWillUnmount() {
this.destroy$.next();
}

private onUpdateTrigger = (update: any) => {
this.props.triggerUpdated &&
this.props.triggerUpdated({
Expand All @@ -60,7 +64,7 @@ export class PubsubTrigger extends React.Component<IPubsubTriggerProps, IPubsubT
});
};

public PubSubTriggerContents() {
public PubSubTriggerContents = () => {
const { pubsubSubscriptions, subscriptionsLoaded } = this.state;
const { trigger } = this.props;
const a = trigger.attributeConstraints || {};
Expand Down Expand Up @@ -136,7 +140,7 @@ export class PubsubTrigger extends React.Component<IPubsubTriggerProps, IPubsubT
</div>
);
}
}
};

public render() {
const { PubSubTriggerContents } = this;
Expand Down
12 changes: 8 additions & 4 deletions app/scripts/modules/core/src/pipeline/config/triggers/wercker/WerckerTrigger.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,14 @@ export class WerckerTrigger extends React.Component<IWerckerTriggerConfigProps,
};
}

public componentDidMount = () => {
public componentDidMount() {
this.initializeMasters();
this.updateJob(this.props.trigger.pipeline);
};
}

public componentWillUnmount() {
this.destroy$.next();
}

private initializeMasters = () => {
Observable.fromPromise(IgorService.listMasters(BuildServiceType.Wercker))
Expand Down Expand Up @@ -189,7 +193,7 @@ export class WerckerTrigger extends React.Component<IWerckerTriggerConfigProps,
});
};

public WerkerTriggerContents() {
public WerkerTriggerContents = () => {
const { app, master, pipeline } = this.props.trigger;
const { jobsRefreshing, masters, mastersRefreshing, pipelines } = this.state;
return (
Expand Down Expand Up @@ -250,7 +254,7 @@ export class WerckerTrigger extends React.Component<IWerckerTriggerConfigProps,
</div>
</>
);
}
};

public render() {
const { WerkerTriggerContents } = this;
Expand Down