From 5a70989ff55b3db1cbaa0459d70d51d954265a08 Mon Sep 17 00:00:00 2001 From: mabashian Date: Tue, 15 Dec 2020 16:16:10 -0500 Subject: [PATCH] Hide Prompted Fields section when tags/skip tags are prompted but have no values --- .../Schedule/ScheduleDetail/ScheduleDetail.jsx | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/awx/ui_next/src/components/Schedule/ScheduleDetail/ScheduleDetail.jsx b/awx/ui_next/src/components/Schedule/ScheduleDetail/ScheduleDetail.jsx index 597d499cbe..5831c09b6a 100644 --- a/awx/ui_next/src/components/Schedule/ScheduleDetail/ScheduleDetail.jsx +++ b/awx/ui_next/src/components/Schedule/ScheduleDetail/ScheduleDetail.jsx @@ -158,6 +158,9 @@ function ScheduleDetail({ schedule, i18n }) { (ask_variables_on_launch || survey_enabled) && ((typeof extra_data === 'string' && extra_data !== '') || (typeof extra_data === 'object' && Object.keys(extra_data).length > 0)); + const showTagsDetail = ask_tags_on_launch && job_tags && job_tags.length > 0; + const showSkipTagsDetail = + ask_skip_tags_on_launch && skip_tags && skip_tags.length > 0; const showPromptedFields = showCredentialsDetail || @@ -166,8 +169,8 @@ function ScheduleDetail({ schedule, i18n }) { ask_job_type_on_launch || ask_limit_on_launch || ask_scm_branch_on_launch || - ask_skip_tags_on_launch || - ask_tags_on_launch || + showSkipTagsDetail || + showTagsDetail || ask_verbosity_on_launch || showVariablesDetail; @@ -266,7 +269,7 @@ function ScheduleDetail({ schedule, i18n }) { } /> )} - {ask_tags_on_launch && job_tags && job_tags.length > 0 && ( + {showTagsDetail && ( )} - {ask_skip_tags_on_launch && skip_tags && skip_tags.length > 0 && ( + {showSkipTagsDetail && (