External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-07 01:17:37 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'devel' into fix_lang

Browse Source
This commit is contained in:
Michael Abashian
2023-04-11 11:41:12 -04:00
committed by GitHub
parent ede185504c ffa3cd1fff
commit 23f3ab6a66
73 changed files with 1754 additions and 527 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
awx/ui/src/components/Schedule/ScheduleEdit/ScheduleEdit.js
View File

@@ -113,6 +113,9 @@ function ScheduleEdit({
days: values.daysToKeep,
});
} else {
if (typeof requestData.extra_data === 'string') {
requestData.extra_data = JSON.parse(requestData.extra_data);
}
requestData.extra_data.days = values.daysToKeep;
}
}

92
awx/ui/src/screens/Setting/Subscription/SubscriptionDetail/SubscriptionDetail.js
View File

@@ -24,7 +24,7 @@ const HelperText = styled(PFHelperText)`
`;
function SubscriptionDetail() {
const { me = {}, license_info, version } = useConfig();
const { me = {}, license_info, version, systemConfig } = useConfig();
const baseURL = '/settings/subscription';
const tabsArray = [
{
@@ -56,35 +56,38 @@ function SubscriptionDetail() {
<RoutedTabs tabsArray={tabsArray} />
<CardBody>
<DetailList>
<Detail
dataCy="subscription-status"
label={t`Status`}
value={
license_info.compliant ? (
<>
<Label variant="outline" color="green" icon={<CheckIcon />}>
{t`Compliant`}
</Label>
<HelperText>
<HelperTextItem>{t`The number of hosts you have automated against is below your subscription count.`}</HelperTextItem>
</HelperText>
</>
) : (
<>
<Label
variant="outline"
color="red"
icon={<ExclamationCircleIcon />}
>
{t`Out of compliance`}
</Label>
<HelperText>
<HelperTextItem>{t`You have automated against more hosts than your subscription allows.`}</HelperTextItem>
</HelperText>
</>
)
}
/>
{systemConfig?.SUBSCRIPTION_USAGE_MODEL ===
'unique_managed_hosts' && (
<Detail
dataCy="subscription-status"
label={t`Status`}
value={
license_info.compliant ? (
<>
<Label variant="outline" color="green" icon={<CheckIcon />}>
{t`Compliant`}
</Label>
<HelperText>
<HelperTextItem>{t`The number of hosts you have automated against is below your subscription count.`}</HelperTextItem>
</HelperText>
</>
) : (
<>
<Label
variant="outline"
color="red"
icon={<ExclamationCircleIcon />}
>
{t`Out of compliance`}
</Label>
<HelperText>
<HelperTextItem>{t`You have automated against more hosts than your subscription allows.`}</HelperTextItem>
</HelperText>
</>
)
}
/>
)}
{typeof automatedInstancesCount !== 'undefined' &&
automatedInstancesCount !== null && (
<Detail
@@ -107,11 +110,30 @@ function SubscriptionDetail() {
label={t`Hosts imported`}
value={license_info.current_instances}
/>
<Detail
dataCy="subscription-hosts-remaining"
label={t`Hosts remaining`}
value={license_info.free_instances}
/>
{systemConfig?.SUBSCRIPTION_USAGE_MODEL ===
'unique_managed_hosts' && (
<Detail
dataCy="subscription-hosts-remaining"
label={t`Hosts remaining`}
value={license_info.free_instances}
/>
)}
{systemConfig?.SUBSCRIPTION_USAGE_MODEL ===
'unique_managed_hosts' && (
<Detail
dataCy="subscription-hosts-deleted"
label={t`Hosts deleted`}
value={license_info.deleted_instances}
/>
)}
{systemConfig?.SUBSCRIPTION_USAGE_MODEL ===
'unique_managed_hosts' && (
<Detail
dataCy="subscription-hosts-reactivated"
label={t`Active hosts previously deleted`}
value={license_info.reactivated_instances}
/>
)}
{license_info.instance_count < 9999999 && (
<Detail
dataCy="subscription-hosts-available"

3
awx/ui/src/screens/Setting/Subscription/SubscriptionDetail/SubscriptionDetail.test.js
View File

@@ -31,6 +31,9 @@ const config = {
trial: false,
valid_key: true,
},
systemConfig: {
SUBSCRIPTION_USAGE_MODEL: 'unique_managed_hosts',
},
};
describe('<SubscriptionDetail />', () => {