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

HMS-5475, HMS-5503: Fixe copy for use template, small add-repo modal design/copy changes. #482

Merged
merged 3 commits into from
Mar 20, 2025
Merged

HMS-5475, HMS-5503: Fixe copy for use template, small add-repo modal design/copy changes. #482

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8968375
HMS-5475: Add content copy update
Andrewgdewar Mar 18, 2025
ca1bbad
HMS-5475: Update url reference in use template modal
Andrewgdewar Mar 18, 2025
f562c14
HMS-5503: Standardize design of module hotfixes toggle
Andrewgdewar Mar 18, 2025
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
22 changes: 15 additions & 7 deletions src/Pages/Repositories/ContentListTable/components/AddContent/AddContent.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -468,7 +468,7 @@ const AddContent = ({ isEdit = false }: Props) => {
label='Snapshotting'
description={
values.snapshot && values.origin === ContentOrigin.EXTERNAL
? 'Enable snapshotting for an external repository, allowing you to build images with historical snapshots.'
? 'Enable snapshotting for an external repository, allowing you to build images and use templates with historical snapshots'
: ''
}
name='snapshot-radio'
Expand Down Expand Up @@ -654,10 +654,21 @@ const AddContent = ({ isEdit = false }: Props) => {
ouiaId='restrict_to_os_version'
/>
</FormGroup>
<FormGroup fieldId='enable_module_hotfixes'>
<FormGroup
fieldId='enable_module_hotfixes'
label={
modularityFilteringEnabled
? 'Modularity filtering enabled'
: 'Modularity filtering disabled'
}
aria-label='module_hotfix_formgroup'
labelIcon={
<Tooltip content='When enabled, modularity filtering prevents updates to packages contained within an enabled module'>
<OutlinedQuestionCircleIcon className='pf-u-ml-xs' color={global_Color_200.value} />
</Tooltip>
}
>
<Switch
label='Modularity filtering enabled'
labelOff='Modularity filtering disabled'
ouiaId={`module_hotfixes_switch_${modularityFilteringEnabled ? 'on' : 'off'}`}
aria-label='enable_module_hotfixes'
hasCheckIcon
Expand All @@ -670,9 +681,6 @@ const AddContent = ({ isEdit = false }: Props) => {
});
}}
/>
<Tooltip content='When enabled, modularity filtering prevents updates to packages contained within an enabled module'>
<OutlinedQuestionCircleIcon className='pf-u-ml-xs' color={global_Color_200.value} />
</Tooltip>
</FormGroup>
<FormGroup
label='GPG key'
Expand Down
2 changes: 1 addition & 1 deletion src/Pages/Templates/TemplateDetails/components/UseTemplate/AnsibleTab.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ const playbook1 = `---
tasks:
- name: Download template.repo
ansible.builtin.get_url:
url: https://console.redhat.com/api/content-sources/v1/templates/`;
url: https://cert.console.redhat.com/api/content-sources/v1/templates/`;
const playbook2 = `/config.repo
dest: /etc/yum.repos.d/template.repo
mode: '0444'
Expand Down
2 changes: 1 addition & 1 deletion src/Pages/Templates/TemplateDetails/components/UseTemplate/CurlTab.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ const CurlTab = ({ tabContentRef }: Props) => {
clickTip='Copied'
variant={ClipboardCopyVariant.expansion}
>
{'curl -o /etc/yum.repos.d/template.repo https://console.redhat.com/api/content-sources/v1/templates/' +
{'curl -o /etc/yum.repos.d/template.repo https://cert.console.redhat.com/api/content-sources/v1/templates/' +
templateUUID +
'/config.repo'}
</ClipboardCopy>
Expand Down
2 changes: 1 addition & 1 deletion src/Pages/Templates/TemplateDetails/components/UseTemplate/InsightsTab.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ const InsightsTab = ({ tabContentRef }: Props) => {
clickTip='Copied'
variant={ClipboardCopyVariant.expansion}
>
{'curl --cert /etc/pki/consumer/cert.pem --key /etc/pki/consumer/key.pem -X PATCH https://console.redhat.com/api/patch/v3/templates/' +
{'curl --cert /etc/pki/consumer/cert.pem --key /etc/pki/consumer/key.pem -X PATCH https://cert.console.redhat.com/api/patch/v3/templates/' +
templateUUID +
'/subscribed-systems'}
</ClipboardCopy>
Expand Down
Loading