katello 4.18.1 → 4.19.0.rc2

data/webpack/scenes/ContentViews/Details/Filters/__tests__/CVDebFilterContent.test.js

@@ -0,0 +1,268 @@
+import React from 'react';
+import { renderWithRedux, patientlyWaitFor, fireEvent } from 'react-testing-lib-wrapper';
+import { screen, within } from '@testing-library/react';
+import { Route } from 'react-router-dom';
+
+import ContentViewFilterDetails from '../ContentViewFilterDetails';
+import { cvFilterDetailsKey } from '../../../ContentViewsConstants';
+import { nockInstance, assertNockRequest, mockAutocomplete } from '../../../../../test-utils/nockWrapper';
+import api from '../../../../../services/api';
+
+import cvDebFilterDetails from './cvDebFilterDetail.fixtures.json';
+import cvDebFilterRules from './cvDebFilterRules.fixtures.json';
+import cvFilterFixtures from './contentViewFilters.fixtures.json';
+import details from '../../../__tests__/mockDetails.fixtures.json';
+import emptyDebFilterRules from './emptyCVDebFilterRules.fixtures.json';
+
+const cvFiltersPath = api.getApiUrl('/content_view_filters');
+const cvFilterDetailsPath = api.getApiUrl('/content_view_filters/42');
+const cvDebFilterRulesPath = api.getApiUrl('/content_view_filters/42/rules');
+// const cvDebFilterRulesNew = api.getApiUrl('/content_view_filters/42/rules');
+const cvDebFilterRulesDel = api.getApiUrl('/content_view_filters/42/rules/99');
+const cvDebFilterRulesEdit = api.getApiUrl('/content_view_filters/42/rules/100');
+
+const acRulesUrl = '/content_view_filters/42/rules/auto_complete_search';
+const acNameUrl = '/debs/auto_complete_name';
+const acArchUrl = '/debs/auto_complete_arch';
+
+const acRulesQuery = { organization_id: 1, search: '' };
+const acBlankTermQuery = { organization_id: 1, term: '' };
+
+const renderOptions = {
+  apiNamespace: cvFilterDetailsKey(1, 42),
+  routerParams: {
+    initialEntries: [{ pathname: '/content_views/1#/filters/42', hash: '#/filters' }],
+    initialIndex: 1,
+  },
+};
+
+const withCVRoute = c => (
+  <Route path="/content_views/:id([0-9]+)#/filters/:filterId([0-9]+)">{c}</Route>
+);
+
+test('Can show filter details on Deb rules', async () => {
+  const { name: filterName } = cvDebFilterDetails;
+
+  const cvFilterDetailsScope = nockInstance
+    .get(cvFilterDetailsPath)
+    .query(true)
+    .reply(200, cvDebFilterDetails);
+  const cvFiltersScope = nockInstance
+    .get(cvFiltersPath).query(true).reply(200, cvFilterFixtures)
+    .persist();
+  const cvDebRulesScope = nockInstance
+    .get(cvDebFilterRulesPath).query(true)
+    .reply(200, cvDebFilterRules);
+
+  const acRulesScope = mockAutocomplete(nockInstance, acRulesUrl, acRulesQuery);
+
+  const { getByText, queryByText } = renderWithRedux(
+    withCVRoute(<ContentViewFilterDetails cvId={1} details={details} />),
+    renderOptions,
+  );
+
+  expect(queryByText(filterName)).toBeNull();
+  await patientlyWaitFor(() => expect(getByText(filterName)).toBeInTheDocument());
+
+  assertNockRequest(acRulesScope);
+  assertNockRequest(cvFilterDetailsScope);
+  assertNockRequest(cvFiltersScope);
+  assertNockRequest(cvDebRulesScope);
+});
+
+test('Can search for Deb rules in filter details', async () => {
+  const lastRule = cvDebFilterRules.results[1];
+  const rulesSearchQuery = {
+    organization_id: 1,
+    search: `name = ${lastRule.name}`,
+  };
+
+  const rulesSearchResults = [
+    {
+      completed: `name = ${lastRule.name}`,
+      part: 'and',
+      label: `name = ${lastRule.name} and`,
+      category: 'Operators',
+    },
+    {
+      completed: `name = ${lastRule.name}`,
+      part: 'or',
+      label: `name = ${lastRule.name} or`,
+      category: 'Operators',
+    },
+  ];
+
+  const cvFilterDetailsScope = nockInstance
+    .get(cvFilterDetailsPath).query(true)
+    .reply(200, cvDebFilterDetails);
+
+  nockInstance.get(cvFiltersPath).query(true).reply(200, cvFilterFixtures);
+
+  const cvDebRulesScope = nockInstance
+    .get(cvDebFilterRulesPath).query(true)
+    .reply(200, cvDebFilterRules);
+
+  const ruleSearchScope = nockInstance
+    .get(cvDebFilterRulesPath).query(rulesSearchQuery)
+    .reply(200, { results: [lastRule] });
+
+  const acRulesScope = mockAutocomplete(nockInstance, acRulesUrl, acRulesQuery);
+  const acRulesSearch = mockAutocomplete(
+    nockInstance,
+    acRulesUrl,
+    rulesSearchQuery,
+    rulesSearchResults,
+  );
+
+  const { getByText, getByLabelText } = renderWithRedux(
+    withCVRoute(<ContentViewFilterDetails cvId={1} details={details} />),
+    renderOptions,
+  );
+
+  await patientlyWaitFor(() => expect(getByText(lastRule.name)).toBeInTheDocument());
+
+  fireEvent.change(getByLabelText('Search input'), {
+    target: { value: `name = ${lastRule.name}` },
+  });
+  fireEvent.keyDown(getByLabelText('Search input'), {
+    key: 'Enter',
+    code: 'Enter',
+    charCode: 13,
+  });
+
+  await patientlyWaitFor(() => {
+    expect(getByText(lastRule.name)).toBeInTheDocument();
+  });
+
+  assertNockRequest(acRulesScope);
+  assertNockRequest(acRulesSearch);
+  assertNockRequest(ruleSearchScope);
+  assertNockRequest(cvFilterDetailsScope);
+  assertNockRequest(cvDebRulesScope);
+});
+
+test('Remove deb filter rule in a self-closing modal', async () => {
+  const { name: filterName } = cvDebFilterDetails;
+
+  const acRulesScope = mockAutocomplete(nockInstance, acRulesUrl, acRulesQuery);
+  const acNameScope = mockAutocomplete(nockInstance, acNameUrl, acBlankTermQuery).persist();
+  const acArchScope = mockAutocomplete(nockInstance, acArchUrl, acBlankTermQuery).persist();
+
+  const cvFiltersScope = nockInstance
+    .get(cvFiltersPath).query(true).reply(200, cvFilterFixtures);
+  const cvDetailsScope = nockInstance
+    .get(cvFilterDetailsPath).query(true).reply(200, cvDebFilterDetails);
+  const cvDebRulesScope = nockInstance
+    .get(cvDebFilterRulesPath).times(2).query(true).reply(200, cvDebFilterRules);
+
+  const removeScope = nockInstance
+    .delete(cvDebFilterRulesDel)
+    .reply(201, {});
+
+  const { getByText, queryByText, getAllByLabelText } =
+    renderWithRedux(
+      withCVRoute(<ContentViewFilterDetails cvId={1} details={details} />),
+      renderOptions,
+    );
+
+  expect(queryByText(filterName)).toBeNull();
+  await patientlyWaitFor(() => {
+    expect(getByText(filterName)).toBeInTheDocument();
+    expect(getAllByLabelText('Kebab toggle')[0]).toBeInTheDocument();
+  });
+
+  getAllByLabelText('Kebab toggle')[0].click();
+  await patientlyWaitFor(() => expect(getByText('Remove')).toBeInTheDocument());
+  getByText('Remove').click();
+
+  await patientlyWaitFor(() => {
+    expect(getByText(filterName)).toBeInTheDocument();
+    expect(getAllByLabelText('Kebab toggle')[1]).toBeInTheDocument();
+  });
+
+  assertNockRequest(acRulesScope);
+  assertNockRequest(acNameScope);
+  assertNockRequest(acArchScope);
+  assertNockRequest(cvFiltersScope);
+  assertNockRequest(cvDetailsScope);
+  assertNockRequest(cvDebRulesScope);
+  assertNockRequest(removeScope);
+});
+
+test('Edit deb filter rule in a self-closing modal', async () => {
+  const { name: filterName } = cvDebFilterDetails;
+
+  const acRulesScope = mockAutocomplete(nockInstance, acRulesUrl, true, undefined, 2);
+  const acNameScope = mockAutocomplete(nockInstance, acNameUrl, true, undefined, 2).persist();
+  const acArchScope = mockAutocomplete(nockInstance, acArchUrl, true, undefined, 2).persist();
+
+  nockInstance.get(cvFiltersPath).times(2).query(true).reply(200, cvFilterFixtures);
+  nockInstance.get(cvFilterDetailsPath).times(2).query(true).reply(200, cvDebFilterDetails);
+  nockInstance.persist().get(cvDebFilterRulesPath).query(true).reply(200, cvDebFilterRules);
+
+  const editScope = nockInstance.put(cvDebFilterRulesEdit).query(true).reply(201, {});
+
+  const { getByText, getByLabelText, queryByText } =
+    renderWithRedux(
+      withCVRoute(<ContentViewFilterDetails cvId={1} details={details} />),
+      renderOptions,
+    );
+
+  await patientlyWaitFor(() => expect(getByText(filterName)).toBeInTheDocument());
+  const table = await screen.findByLabelText('Content View Table');
+  const unoRow = within(table).getByText('uno').closest('tr');
+  const kebabBtn = within(unoRow).getByLabelText('Kebab toggle');
+  fireEvent.click(kebabBtn);
+
+  await patientlyWaitFor(() => expect(getByText('Edit')).toBeInTheDocument());
+  fireEvent.click(getByText('Edit'));
+
+  await patientlyWaitFor(() => expect(getByText('Edit DEB rule')).toBeInTheDocument());
+  fireEvent.submit(getByLabelText('add_deb_package_filter_rule'));
+
+  await patientlyWaitFor(() => {
+    expect(queryByText('Edit DEB rule')).not.toBeInTheDocument();
+    expect(getByText(filterName)).toBeInTheDocument();
+  });
+
+  assertNockRequest(acRulesScope);
+  assertNockRequest(acNameScope);
+  assertNockRequest(acArchScope);
+  assertNockRequest(editScope);
+});
+
+test('Shows call-to-action when there are no DEB filters', async () => {
+  const acRulesScope = mockAutocomplete(nockInstance, acRulesUrl);
+  const acNameScope = mockAutocomplete(nockInstance, acNameUrl);
+  const acArchScope = mockAutocomplete(nockInstance, acArchUrl);
+
+  nockInstance.get(cvFiltersPath).query(true).reply(200, cvFilterFixtures);
+  const cvFilterDetailsScope = nockInstance
+    .get(cvFilterDetailsPath).query(true).reply(200, cvDebFilterDetails);
+  const cvDebRulesScope = nockInstance
+    .get(cvDebFilterRulesPath).query(true).reply(200, emptyDebFilterRules);
+
+  const { queryByLabelText, queryByText, getAllByLabelText } =
+    renderWithRedux(
+      withCVRoute(<ContentViewFilterDetails cvId={1} details={details} />),
+      renderOptions,
+    );
+
+  await patientlyWaitFor(() => expect(queryByLabelText('create_deb_rule')).toBeInTheDocument());
+  fireEvent.click(queryByLabelText('create_deb_rule'));
+
+  await patientlyWaitFor(() => {
+    expect(getAllByLabelText('Search input')[0]).toBeInTheDocument();
+    expect(queryByText('Cancel')).toBeInTheDocument();
+  });
+
+  fireEvent.click(queryByText('Cancel'));
+  await patientlyWaitFor(() =>
+    expect(queryByLabelText('add-edit-package-modal-cancel')).not.toBeInTheDocument());
+
+  assertNockRequest(acRulesScope);
+  assertNockRequest(acNameScope);
+  assertNockRequest(acArchScope);
+  assertNockRequest(cvFilterDetailsScope);
+  assertNockRequest(cvDebRulesScope);
+});

data/webpack/scenes/ContentViews/Details/Filters/__tests__/cvDebFilterDetail.fixtures.json

@@ -0,0 +1,95 @@
+{
+  "inclusion": true,
+  "original_packages": false,
+  "id": 42,
+  "name": "test_deb_filter",
+  "description": null,
+  "created_at": "2025-07-28 12:00:00 -0400",
+  "updated_at": "2025-07-28 12:00:00 -0400",
+  "content_view": {
+    "composite": false,
+    "rolling": false,
+    "component_ids": [],
+    "default": false,
+    "version_count": 1,
+    "latest_version": "1.0",
+    "auto_publish": false,
+    "solve_dependencies": false,
+    "import_only": false,
+    "repository_ids": [ 11 ],
+    "id": 7,
+    "name": "Debian-CV",
+    "label": "Debian_CV",
+    "description": "",
+    "organization_id": 1,
+    "organization": {
+      "name": "Default Organization",
+      "label": "Default_Organization",
+      "id": 1
+    },
+    "created_at": "2025-07-28 11:50:00 -0400",
+    "updated_at": "2025-07-28 11:50:00 -0400",
+    "environments": [
+      {
+        "id": 1,
+        "name": "Library",
+        "label": "Library",
+        "permissions": {
+          "readable": true
+        }
+      }
+    ],
+    "repositories": [
+      {
+        "id": 11,
+        "name": "debian_10_amd64",
+        "label": "debian_10_amd64",
+        "content_type": "deb",
+        "product": {
+          "id": 5,
+          "name": "Debian 10"
+        },
+        "content_counts": {
+          "deb": 8,
+          "package": 8,
+          "package_group": 0,
+          "erratum": 0,
+          "module_stream": 0
+        }
+      }
+    ],
+    "versions": [
+      {
+        "id": 31,
+        "version": "1.0",
+        "published": "2025-07-28 11:55:00 -0400",
+        "environment_ids": []
+      }
+    ],
+    "components": [],
+    "content_view_components": [],
+    "activation_keys": [],
+    "next_version": "2.0",
+    "last_published": "2025-07-28 11:55:00 -0400",
+    "permissions": {
+      "view_content_views": true,
+      "edit_content_views": true,
+      "destroy_content_views": true,
+      "publish_content_views": true,
+      "promote_or_remove_content_views": true
+    }
+  },
+  "repositories": [],
+  "type": "deb",
+  "rules": [
+    {
+      "content_view_filter_id": 42,
+      "min_version": "1.0",
+      "architecture": "amd64",
+      "id": 99,
+      "name": "tre",
+      "created_at": "2025-07-28 12:01:00 -0400",
+      "updated_at": "2025-07-28 12:01:00 -0400"
+    }
+  ]
+}

data/webpack/scenes/ContentViews/Details/Filters/__tests__/cvDebFilterRules.fixtures.json

@@ -0,0 +1,31 @@
+{
+  "total": 2,
+  "subtotal": 2,
+  "page": "1",
+  "per_page": "20",
+  "error": null,
+  "search": null,
+  "sort": {
+    "by": "id",
+    "order": "asc"
+  },
+  "results": [
+    {
+      "content_view_filter_id": 42,
+      "min_version": "1.0",
+      "architecture": "amd64",
+      "id": 99,
+      "name": "tre",
+      "created_at": "2025-07-28 12:01:00 -0400",
+      "updated_at": "2025-07-28 12:01:00 -0400"
+    },
+    {
+      "content_view_filter_id": 42,
+      "architecture": "amd64",
+      "id": 100,
+      "name": "uno",
+      "created_at": "2025-07-28 12:02:00 -0400",
+      "updated_at": "2025-07-28 12:02:00 -0400"
+    }
+  ]
+}

data/webpack/scenes/ContentViews/Details/Filters/__tests__/emptyCVDebFilterRules.fixtures.json

@@ -0,0 +1,10 @@
+{
+  "total": 0,
+  "subtotal": 0,
+  "page": "1",
+  "per_page": "20",
+  "error": null,
+  "search": null,
+  "sort": { "by": "id", "order": "asc" },
+  "results": []
+}

data/webpack/scenes/ContentViews/Details/Versions/BulkDelete/__tests__/hosts.fixtures.json

@@ -132,7 +132,6 @@
         "last_checkin": "2022-02-15 14:49:39 -0700",
         "service_level": "",
         "release_version": null,
-        "autoheal": true,
         "registered_at": "2022-01-11 15:17:54 -0700",
         "registered_through": "steve8.satellite.lab.eng.rdu2.redhat.com",
         "purpose_role": "",

data/webpack/scenes/ContentViews/Details/Versions/Delete/__tests__/cvAffectedHosts.fixture.json

@@ -126,7 +126,6 @@
         "last_checkin": "2021-09-16 10:59:32 -0400",
         "service_level": "",
         "release_version": null,
-        "autoheal": true,
         "registered_at": "2021-09-13 12:53:31 -0400",
         "registered_through": "centos7-devel4.samir.example.com",
         "purpose_role": "",

data/webpack/scenes/ContentViews/Details/__tests__/contentViewRollingDetail.test.js

@@ -6,6 +6,7 @@ import api from '../../../../services/api';
 import ContentViewDetails from '../ContentViewDetails';
 import CONTENT_VIEWS_KEY from '../../ContentViewsConstants';
 import cvDetailData from './contentViewRollingDetails.fixtures.json';
+import environmentPathsData from '../../Publish/__tests__/environmentPaths.fixtures.json';
 
 
 const withCVRoute = component => <Route path="/content_views/:id([0-9]+)">{component}</Route>;
@@ -19,6 +20,19 @@ const renderOptions = {
 };
 
 const cvDetailsPath = api.getApiUrl('/content_views/1');
+const environmentPathsPath = api.getApiUrl('/organizations/1/environments/paths');
+let envScope;
+
+beforeEach(() => {
+  envScope = nockInstance
+    .get(environmentPathsPath)
+    .query(true)
+    .reply(200, environmentPathsData);
+});
+
+afterEach(() => {
+  assertNockRequest(envScope);
+});
 
 test('Can call API and show details on page load', async (done) => {
   const { label, name, description } = cvDetailData;
@@ -104,6 +118,7 @@ test('Page contains Rolling CV type', async (done) => {
   await patientlyWaitFor(() => {
     expect(queryByText('Content view')).not.toBeInTheDocument();
     expect(queryByText('Rolling content view')).toBeInTheDocument();
+    expect(queryByText('Lifecycle Environments')).toBeInTheDocument();
     expect(queryByText('Composite content view')).not.toBeInTheDocument();
     expect(queryByText('Versions')).not.toBeInTheDocument();
     expect(queryByText('Filters')).not.toBeInTheDocument();

data/webpack/scenes/ContentViews/Details/__tests__/contentViewRollingDetails.fixtures.json

@@ -8,6 +8,7 @@
   "latest_version": "1.0",
   "auto_publish": false,
   "solve_dependencies": false,
+  "environment_ids": [1],
   "needs_publish": false,
   "generated_for": "none",
   "repository_ids": [

data/webpack/scenes/ContentViews/__tests__/contentViewPage.test.js

@@ -10,9 +10,11 @@ import {
 } from '../../../test-utils/nockWrapper';
 import createBasicCVs from './basicContentViews.fixtures';
 import cvIndexData from './contentViewList.fixtures.json';
+import environmentPathsData from '../Publish/__tests__/environmentPaths.fixtures.json';
 
 const cvIndexPath = api.getApiUrl('/content_views');
 const autocompleteUrl = '/content_views/auto_complete_search';
+const environmentPathsPath = api.getApiUrl('/organizations/1/environments/paths');
 const renderOptions = { apiNamespace: CONTENT_VIEWS_KEY };
 const autocompleteQuery = {
   organization_id: 1,
@@ -409,6 +411,10 @@ test('Displays Create Content View and opens modal with Form', async () => {
     .get(cvIndexPath)
     .query(true)
     .reply(200, noResults);
+  const scope = nockInstance
+    .get(environmentPathsPath)
+    .query(true)
+    .reply(200, environmentPathsData);
   const {
     getByText, queryByText, getByLabelText,
   } = renderWithRedux(<ContentViewsPage />, renderOptions);
@@ -421,6 +427,7 @@ test('Displays Create Content View and opens modal with Form', async () => {
   expect(queryByText('Content view')).not.toBeInTheDocument();
   expect(queryByText('Solve dependencies')).not.toBeInTheDocument();
   expect(queryByText('Auto publish')).not.toBeInTheDocument();
+  expect(queryByText('Lifecycle Environments')).not.toBeInTheDocument();
 
   getByLabelText('create_content_view').click();
 
@@ -432,6 +439,8 @@ test('Displays Create Content View and opens modal with Form', async () => {
   expect(getByText('Content view')).toBeInTheDocument();
   expect(getByText('Solve dependencies')).toBeInTheDocument();
   expect(queryByText('Auto publish')).not.toBeInTheDocument();
+  expect(queryByText('Lifecycle Environments')).not.toBeInTheDocument();
+  assertNockRequest(scope);
 });
 
 /* eslint-enable no-useless-escape */

data/webpack/scenes/FlatpakRemotes/CreateEdit/CreateFlatpakRemoteModal.js

@@ -4,27 +4,29 @@ import { translate as __ } from 'foremanReact/common/I18n';
 import { Modal, ModalVariant } from '@patternfly/react-core';
 import FlatpakRemotesForm from './FlatpakRemoteform';
 
-const CreateFlatpakModal = ({ show, setIsOpen }) => (
+const CreateFlatpakModal = ({ show, setIsOpen, hasRedhatRemote }) => (
   <Modal
     ouiaId="create-flatpak-modal"
     title={__('Create Flatpak Remote')}
-    variant={ModalVariant.small}
+    variant={ModalVariant.medium}
     isOpen={show}
     onClose={() => { setIsOpen(false); }}
     appendTo={document.body}
   >
-    <FlatpakRemotesForm setModalOpen={setIsOpen} />
+    <FlatpakRemotesForm setModalOpen={setIsOpen} hasRedhatRemote={hasRedhatRemote} />
   </Modal>
 );
 
 CreateFlatpakModal.propTypes = {
   show: PropTypes.bool,
   setIsOpen: PropTypes.func,
+  hasRedhatRemote: PropTypes.bool,
 };
 
 CreateFlatpakModal.defaultProps = {
   show: false,
   setIsOpen: null,
+  hasRedhatRemote: true,
 };
 
 export default CreateFlatpakModal;

data/webpack/scenes/FlatpakRemotes/CreateEdit/EditFlatpakRemotesModal.js

@@ -8,7 +8,7 @@ const EditFlatpakModal = ({ show, setIsOpen, remoteData }) => (
   <Modal
     ouiaId="edit-flatpak-modal"
     title={__('Edit Flatpak Remote')}
-    variant={ModalVariant.small}
+    variant={ModalVariant.medium}
     isOpen={show}
     onClose={() => { setIsOpen(false); }}
     appendTo={document.body}

data/webpack/scenes/FlatpakRemotes/CreateEdit/FlatpakRemoteform.js

@@ -13,8 +13,12 @@ import {
   FormHelperText,
   HelperText,
   HelperTextItem,
-
+  Alert,
+  AlertActionCloseButton,
+  AlertActionLink,
+  TextContent,
 } from '@patternfly/react-core';
+import { ExternalLinkAltIcon } from '@patternfly/react-icons';
 import { createFlatpakRemote } from '../FlatpakRemotesActions';
 import {
   selectCreateFlatpakRemotes,
@@ -24,7 +28,7 @@ import {
 import { updateFlatpakRemote } from '../Details/FlatpakRemoteDetailActions';
 
 // eslint-disable-next-line react/prop-types
-const FlatpakRemotesForm = ({ setModalOpen, remoteData }) => {
+const FlatpakRemotesForm = ({ setModalOpen, remoteData, hasRedhatRemote }) => {
   const {
     id: editingId,
     name: editingName,
@@ -42,6 +46,7 @@ const FlatpakRemotesForm = ({ setModalOpen, remoteData }) => {
   const [redirect, setRedirect] = useState(false);
   const [saving, setSaving] = useState(false);
 
+  const [alertDismissed, setAlertDismissed] = useState(false);
   const [urlValidated, setUrlValidated] = useState('default');
   const handleUrlChange = (newurl, _event) => {
     setUrl(newurl);
@@ -114,6 +119,29 @@ const FlatpakRemotesForm = ({ setModalOpen, remoteData }) => {
       }}
       id="create-flatpak-form"
     >
+      {!alertDismissed && !hasRedhatRemote && (
+      <Alert
+        ouiaId="flatpak-remote-info-alert"
+        isInline
+        title={__('Add Red Hat Flatpak remote')}
+        actionClose={<AlertActionCloseButton onClose={() => setAlertDismissed(true)} />}
+        actionLinks={
+          <React.Fragment>
+            <AlertActionLink onClick={() => setUrl('https://flatpaks.redhat.io/rhel')}>
+              {__('Add Red Hat flatpak remote')}
+            </AlertActionLink>
+            <AlertActionLink component="a" href="https://access.redhat.com/terms-based-registry/" target="_blank">
+              {__('Generate username and password')} <ExternalLinkAltIcon />
+            </AlertActionLink>
+          </React.Fragment>
+            }
+      >
+        <TextContent>
+          {__('To continue with Red Hat Flatpak remote, you need to generate your username and password in')} <a target="_blank" href="https://access.redhat.com/terms-based-registry/" rel="noreferrer">access.redhat.com/terms-based-registry/</a>
+        </TextContent>
+      </Alert>
+      )}
+
       <FormGroup
         label={__('Name')}
         isRequired
@@ -168,7 +196,9 @@ const FlatpakRemotesForm = ({ setModalOpen, remoteData }) => {
         />
         <FormHelperText>
           <HelperText>
-            <HelperTextItem>Authentication for registry</HelperTextItem>
+            <HelperTextItem>
+              {__('Provide credentials if the registry requires authentication')}
+            </HelperTextItem>
           </HelperText>
         </FormHelperText>
       </FormGroup>
@@ -209,10 +239,12 @@ const FlatpakRemotesForm = ({ setModalOpen, remoteData }) => {
 
 FlatpakRemotesForm.propTypes = {
   setModalOpen: PropTypes.func,
+  hasRedhatRemote: PropTypes.bool,
 };
 
 FlatpakRemotesForm.defaultProps = {
   setModalOpen: null,
+  hasRedhatRemote: true,
 };
 
 export default FlatpakRemotesForm;

data/webpack/scenes/FlatpakRemotes/Details/FlatpakRemoteDetails.js

@@ -149,7 +149,7 @@ export default function FlatpakRemoteDetails() {
         </TextContent>
       </GridItem>
 
-      <GridItem span={12}>
+      <GridItem span={12} id="remote-repositories-table">
         <RemoteRepositoriesTable frId={frId} canMirror={canMirror} />
       </GridItem>
       { isEditing &&

data/webpack/scenes/FlatpakRemotes/Details/RemoteRepositories/RemoteRepositoriesTable.css

@@ -0,0 +1,3 @@
+#remote-repositories-table .pf-v5-c-toolbar__content-section {
+  gap: 1rem;
+}