Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove extra data for AoC #14254

Merged
merged 1 commit into from
Jul 19, 2023
+26 −20
Merged

Remove extra data for AoC #14254

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 26 additions & 20 deletions awx/ui/src/screens/Setting/Subscription/SubscriptionDetail/SubscriptionDetail.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,8 @@ function SubscriptionDetail() {
/>
)}
{typeof automatedInstancesCount !== 'undefined' &&
automatedInstancesCount !== null && (
automatedInstancesCount !== null &&
systemConfig?.SUBSCRIPTION_USAGE_MODEL !== '' && (
<Detail
dataCy="subscription-hosts-automated"
label={t`Hosts automated`}
Expand All @@ -105,11 +106,13 @@ function SubscriptionDetail() {
}
/>
)}
<Detail
dataCy="subscription-hosts-imported"
label={t`Hosts imported`}
value={license_info.current_instances}
/>
{systemConfig?.SUBSCRIPTION_USAGE_MODEL !== '' && (
<Detail
dataCy="subscription-hosts-imported"
label={t`Hosts imported`}
value={license_info.current_instances}
/>
)}
{systemConfig?.SUBSCRIPTION_USAGE_MODEL ===
'unique_managed_hosts' && (
<Detail
Expand All @@ -134,20 +137,23 @@ function SubscriptionDetail() {
value={license_info.reactivated_instances}
/>
)}
{license_info.instance_count < 9999999 && (
<Detail
dataCy="subscription-hosts-available"
label={t`Hosts available`}
value={license_info.available_instances}
/>
)}
{license_info.instance_count >= 9999999 && (
<Detail
dataCy="subscription-unlimited-hosts-available"
label={t`Hosts available`}
value={t`Unlimited`}
/>
)}

{systemConfig?.SUBSCRIPTION_USAGE_MODEL !== '' &&
license_info.instance_count < 9999999 && (
<Detail
dataCy="subscription-hosts-available"
label={t`Hosts available`}
value={license_info.available_instances}
/>
)}
{systemConfig?.SUBSCRIPTION_USAGE_MODEL !== '' &&
license_info.instance_count >= 9999999 && (
<Detail
dataCy="subscription-unlimited-hosts-available"
label={t`Hosts available`}
value={t`Unlimited`}
/>
)}
<Detail
dataCy="subscription-type"
label={t`Subscription type`}
Expand Down
Loading