From 190400512081dfde0b44b3bc45bb180ba1412ea1 Mon Sep 17 00:00:00 2001
From: Buck Doyle <buck@hashicorp.com>
Date: Fri, 12 Jun 2020 09:43:54 -0500
Subject: [PATCH] Rename clashing property

---
 ui/app/templates/components/exec/task-contents.hbs     | 2 +-
 ui/app/templates/components/exec/task-group-parent.hbs | 6 +++---
 ui/app/templates/exec.hbs                              | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ui/app/templates/components/exec/task-contents.hbs b/ui/app/templates/components/exec/task-contents.hbs
index e36bea0fc..615723f3d 100644
--- a/ui/app/templates/components/exec/task-contents.hbs
+++ b/ui/app/templates/components/exec/task-contents.hbs
@@ -7,7 +7,7 @@
     </svg>
   {{/if}}
 </div>
-{{#if openInNewWindow}}
+{{#if shouldOpenInNewWindow}}
   <span class="tooltip" aria-label="Open in a new window">
     {{x-icon "exit" class="show-on-hover"}}
   </span>
diff --git a/ui/app/templates/components/exec/task-group-parent.hbs b/ui/app/templates/components/exec/task-group-parent.hbs
index 2109ca14e..72ea41808 100644
--- a/ui/app/templates/components/exec/task-group-parent.hbs
+++ b/ui/app/templates/components/exec/task-group-parent.hbs
@@ -5,19 +5,19 @@
 {{#if isOpen}}
   <ul class="task-list">
     {{#each sortedTasks as |task|}}
-      {{#if openInNewWindow}}
+      {{#if shouldOpenInNewWindow}}
         <a {{on "click" (action "openInNewWindow" taskGroup.job taskGroup task)}} class="task-item" data-test-task>
           <Exec::TaskContents
             @task={{task}}
             @active={{and currentRouteIsThisTaskGroup (eq task.name activeTaskName)}}
-            @openInNewWindow={{openInNewWindow}} />
+            @shouldOpenInNewWindow={{shouldOpenInNewWindow}} />
         </a>
       {{else}}
         <LinkTo @route="exec.task-group.task" @models={{array taskGroup.job.plainId taskGroup.name task.name}} class="task-item" data-test-task={{true}}>
           <Exec::TaskContents
             @task={{task}}
             @active={{and currentRouteIsThisTaskGroup (eq task.name activeTaskName)}}
-            @openInNewWindow={{openInNewWindow}} />
+            @shouldOpenInNewWindow={{shouldOpenInNewWindow}} />
         </LinkTo>
       {{/if}}
     {{/each}}
diff --git a/ui/app/templates/exec.hbs b/ui/app/templates/exec.hbs
index 385bc7025..8d853b487 100644
--- a/ui/app/templates/exec.hbs
+++ b/ui/app/templates/exec.hbs
@@ -46,7 +46,7 @@
           <li data-test-task-group>
             <Exec::TaskGroupParent
               @taskGroup={{taskGroup}}
-              @openInNewWindow={{socketOpen}}
+              @shouldOpenInNewWindow={{socketOpen}}
               @activeTaskName={{taskName}}
               @activeTaskGroupName={{taskGroupName}} />
           </li>