diff --git a/static/js/directives/ui/manage-trigger-custom-git/manage-trigger-custom-git.component.html b/static/js/directives/ui/manage-trigger-custom-git/manage-trigger-custom-git.component.html index 8100dfc57..42175e616 100644 --- a/static/js/directives/ui/manage-trigger-custom-git/manage-trigger-custom-git.component.html +++ b/static/js/directives/ui/manage-trigger-custom-git/manage-trigger-custom-git.component.html @@ -31,7 +31,7 @@

Select build context directory

Please select the build context directory under the git repository: -
@@ -50,7 +50,7 @@

Select dockerfile path

Please select the build context directory under the git repository: -
diff --git a/static/js/directives/ui/manage-trigger-custom-git/manage-trigger-custom-git.component.ts b/static/js/directives/ui/manage-trigger-custom-git/manage-trigger-custom-git.component.ts index de13ab20c..3705c6e87 100644 --- a/static/js/directives/ui/manage-trigger-custom-git/manage-trigger-custom-git.component.ts +++ b/static/js/directives/ui/manage-trigger-custom-git/manage-trigger-custom-git.component.ts @@ -1,4 +1,4 @@ -import { Input, Output, Component, EventEmitter, OnChanges, SimpleChanges } from 'ng-metadata/core'; +import {Component, EventEmitter, Input, OnChanges, Output, SimpleChanges} from "ng-metadata/core"; /** @@ -13,12 +13,23 @@ export class ManageTriggerCustomGitComponent implements OnChanges { // FIXME: Use one-way data binding @Input('=') public trigger: {config: any}; @Output() public activateTrigger: EventEmitter<{config: any, pull_robot?: any}> = new EventEmitter(); - private config: any = {}; + private config: any = {"context": "/", "dockerfile_path": "/Dockerfile"}; private currentState: any | null; public ngOnChanges(changes: SimpleChanges): void { if (changes['trigger'] !== undefined) { this.config = Object.assign({}, changes['trigger'].currentValue.config); } + if (this.config.context === "") { + this.config.context = "/"; + } + + if (this.config.dockerfile_path === "") { + if (this.config.context.endsWith("/")) { + this.config.dockerfile_path = this.config.context + "Dockerfile"; + } else { + this.config.dockerfile_path = this.config.context + "/Dockerfile"; + } + } } }