From faa6b0c3a6eb1546bda11480a0b0d0628f5f610b Mon Sep 17 00:00:00 2001
From: Charlton Austin <charlton.austin@gmail.com>
Date: Mon, 15 May 2017 10:44:45 -0500
Subject: [PATCH] fix(custom git trigger): fixed init

correctly added in default parameters for config

[TESTING -> locally with docker]

Issue: https://www.pivotaltracker.com/story/show/145071887

- [ ] It works!
- [ ] Comments provide sufficient explanations for the next contributor
- [ ] Tests cover changes and corner cases
- [ ] Follows Quay syntax patterns and format
---
 .../manage-trigger-custom-git.component.html      |  4 ++--
 .../manage-trigger-custom-git.component.ts        | 15 +++++++++++++--
 2 files changed, 15 insertions(+), 4 deletions(-)

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 @@
       <div class="col-lg-7 col-md-7 col-sm-12 main-col">
         <h3>Select build context directory</h3>
         <strong>Please select the build context directory under the git repository:</strong>
-        <input class="form-control" type="text" placeholder="/"
+        <input class="form-control" type="text"
                ng-model="$ctrl.config.context"
                ng-pattern="/^($|\/|\/.+)/">
       </div>
@@ -50,7 +50,7 @@
       <div class="col-lg-7 col-md-7 col-sm-12 main-col">
         <h3>Select dockerfile path</h3>
         <strong>Please select the build context directory under the git repository:</strong>
-        <input class="form-control" type="text" placeholder="{{ $ctrl.config.context }}"
+        <input class="form-control" type="text"
                ng-model="$ctrl.config.dockerfile_path"
                ng-pattern="/^($|\/|\/.+)/">
       </div>
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";
+      }
+    }
   }
 }