From 4bafe02a94cab69acbf5f451cf5ebf1c72bef06c Mon Sep 17 00:00:00 2001
From: Haokun-Chen <haokchen@redhat.com>
Date: Fri, 8 Jun 2018 10:55:07 -0400
Subject: [PATCH] Hide run selection when current tab is different from
 selected

---
 .../workflow-maker.partial.html               | 71 ++++++++++---------
 1 file changed, 38 insertions(+), 33 deletions(-)

diff --git a/awx/ui/client/src/templates/workflows/workflow-maker/workflow-maker.partial.html b/awx/ui/client/src/templates/workflows/workflow-maker/workflow-maker.partial.html
index 9580b72bfc..3f45da0b0c 100644
--- a/awx/ui/client/src/templates/workflows/workflow-maker/workflow-maker.partial.html
+++ b/awx/ui/client/src/templates/workflows/workflow-maker/workflow-maker.partial.html
@@ -93,42 +93,47 @@
                     <div id="workflow-project-sync-list" ui-view="projectSyncList" ng-show="workflowMakerFormConfig.activeTab === 'project_sync'"></div>
                     <div id="workflow-inventory-sync-list" ui-view="inventorySyncList" ng-show="workflowMakerFormConfig.activeTab === 'inventory_sync'"></div>
                 </div>
-                <div ng-if="selectedTemplate && selectedTemplateInvalid">
-                    <div class="WorkflowMaker-invalidJobTemplateWarning">
-                        <span class="fa fa-warning"></span>
-                        <span>{{:: strings.get('workflows.INVALID_JOB_TEMPLATE') }}</span>
+                <span ng-show="selectedTemplate &&
+                    ((selectedTemplate.type === 'job_template' && workflowMakerFormConfig.activeTab === 'jobs') ||
+                    (selectedTemplate.type === 'project' && workflowMakerFormConfig.activeTab === 'project_sync') ||
+                    (selectedTemplate.type === 'inventory_source' && workflowMakerFormConfig.activeTab === 'inventory_sync'))">
+                    <div ng-if="selectedTemplate && selectedTemplateInvalid">
+                        <div class="WorkflowMaker-invalidJobTemplateWarning">
+                            <span class="fa fa-warning"></span>
+                            <span>{{:: strings.get('workflows.INVALID_JOB_TEMPLATE') }}</span>
+                        </div>
                     </div>
-                </div>
-                <div ng-if="selectedTemplate && credentialRequiresPassword">
-                    <div class="WorkflowMaker-invalidJobTemplateWarning">
-                        <span class="fa fa-warning"></span>
-                        <span>{{:: strings.get('workflows.CREDENTIAL_WITH_PASS') }}</span>
+                    <div ng-if="selectedTemplate && credentialRequiresPassword">
+                        <div class="WorkflowMaker-invalidJobTemplateWarning">
+                            <span class="fa fa-warning"></span>
+                            <span>{{:: strings.get('workflows.CREDENTIAL_WITH_PASS') }}</span>
+                        </div>
                     </div>
-                </div>
-                <div class="form-group Form-formGroup Form-formGroup--singleColumn" ng-show="selectedTemplate && !selectedTemplateInvalid && !(credentialRequiresPassword && !promptData.launchConf.ask_credential_on_launch)">
-                    <label for="verbosity" class="Form-inputLabelContainer">
-                        <span class="Form-requiredAsterisk">*</span>
-                        <span class="Form-inputLabel">RUN</span>
-                    </label>
-                    <div>
-                        <select
-                            id="workflow_node_edge"
-                            ng-options="v as v.label for v in edgeTypeOptions track by v.value"
-                            ng-model="edgeType"
-                            class="form-control Form-dropDown"
-                            name="edgeType"
-                            tabindex="-1"
-                            ng-disabled="!workflowJobTemplateObj.summary_fields.user_capabilities.edit"
-                            aria-hidden="true">
-                        </select>
+                    <div class="form-group Form-formGroup Form-formGroup--singleColumn" ng-show="selectedTemplate && !selectedTemplateInvalid && !(credentialRequiresPassword && !promptData.launchConf.ask_credential_on_launch)">
+                        <label for="verbosity" class="Form-inputLabelContainer">
+                            <span class="Form-requiredAsterisk">*</span>
+                            <span class="Form-inputLabel">RUN</span>
+                        </label>
+                        <div>
+                            <select
+                                id="workflow_node_edge"
+                                ng-options="v as v.label for v in edgeTypeOptions track by v.value"
+                                ng-model="edgeType"
+                                class="form-control Form-dropDown"
+                                name="edgeType"
+                                tabindex="-1"
+                                ng-disabled="!workflowJobTemplateObj.summary_fields.user_capabilities.edit"
+                                aria-hidden="true">
+                            </select>
+                        </div>
                     </div>
-                </div>
-                <div class="buttons Form-buttons" id="workflow_maker_controls">
-                    <button type="button" class="btn btn-sm Form-primaryButton Form-primaryButton--noMargin" id="workflow_maker_prompt_btn" ng-show="showPromptButton" ng-click="openPromptModal()"> Prompt</button>
-                    <button type="button" class="btn btn-sm Form-cancelButton" id="workflow_maker_cancel_btn" ng-show="(workflowJobTemplateObj.summary_fields.user_capabilities.edit || canAddWorkflowJobTemplate)" ng-click="cancelNodeForm()"> Cancel</button>
-                    <button type="button" class="btn btn-sm Form-cancelButton" id="workflow_maker_close_btn" ng-show="!(workflowJobTemplateObj.summary_fields.user_capabilities.edit || canAddWorkflowJobTemplate)" ng-click="cancelNodeForm()"> Close</button>
-                    <button type="button" class="btn btn-sm Form-saveButton" id="workflow_maker_select_btn" ng-show="(workflowJobTemplateObj.summary_fields.user_capabilities.edit || canAddWorkflowJobTemplate) && !selectedTemplateInvalid && !(credentialRequiresPassword && !promptData.launchConf.ask_credential_on_launch)" ng-click="confirmNodeForm()" ng-disabled="!selectedTemplate || promptModalMissingReqFields || credentialRequiresPassword"> Select</button>
-                </div>
+                    <div class="buttons Form-buttons" id="workflow_maker_controls">
+                        <button type="button" class="btn btn-sm Form-primaryButton Form-primaryButton--noMargin" id="workflow_maker_prompt_btn" ng-show="showPromptButton" ng-click="openPromptModal()"> Prompt</button>
+                        <button type="button" class="btn btn-sm Form-cancelButton" id="workflow_maker_cancel_btn" ng-show="(workflowJobTemplateObj.summary_fields.user_capabilities.edit || canAddWorkflowJobTemplate)" ng-click="cancelNodeForm()"> Cancel</button>
+                        <button type="button" class="btn btn-sm Form-cancelButton" id="workflow_maker_close_btn" ng-show="!(workflowJobTemplateObj.summary_fields.user_capabilities.edit || canAddWorkflowJobTemplate)" ng-click="cancelNodeForm()"> Close</button>
+                        <button type="button" class="btn btn-sm Form-saveButton" id="workflow_maker_select_btn" ng-show="(workflowJobTemplateObj.summary_fields.user_capabilities.edit || canAddWorkflowJobTemplate) && !selectedTemplateInvalid && !(credentialRequiresPassword && !promptData.launchConf.ask_credential_on_launch)" ng-click="confirmNodeForm()" ng-disabled="!selectedTemplate || promptModalMissingReqFields || credentialRequiresPassword"> Select</button>
+                    </div>
+                </span>
             </div>
         </div>
     </div>