katello 4.17.0 → 4.18.0.rc1

data/webpack/components/extensions/Hosts/BulkActions/BulkRepositorySetsWizard/actions.js

@@ -0,0 +1,23 @@
+import { translate as __ } from 'foremanReact/common/I18n';
+import { API_OPERATIONS, put } from 'foremanReact/redux/API';
+import { errorToast, renderTaskStartedToast } from '../../../../../scenes/Tasks/helpers';
+import { foremanApi } from '../../../../../services/api';
+
+const BULK_HOST_CONTENT_OVERRIDES_KEY = 'BULK_HOST_CONTENT_OVERRIDES';
+
+export const bulkUpdateHostContentOverrides =
+  (params, handleSuccess, handleError) => put({
+    type: API_OPERATIONS.PUT,
+    key: BULK_HOST_CONTENT_OVERRIDES_KEY,
+    url: foremanApi.getApiUrl('/hosts/bulk/content_overrides'),
+    successToast: () => __('Content overrides updating.'),
+    handleSuccess: (response) => {
+      if (handleSuccess) handleSuccess(response);
+      return renderTaskStartedToast(response.data);
+    },
+    handleError,
+    errorToast,
+    params,
+  });
+
+export default bulkUpdateHostContentOverrides;

data/webpack/components/extensions/Hosts/BulkActions/BulkRepositorySetsWizard/helpers.js

@@ -0,0 +1,28 @@
+export const pendingOverrideToApiParamItem = ({ repoLabel, value }) => {
+  switch (Number(value)) {
+  case 0: // No change
+    return null;
+  case 1: // Override to enabled
+    return {
+      content_label: repoLabel,
+      name: 'enabled',
+      value: true,
+    };
+  case 2: // Override to disabled
+    return {
+      content_label: repoLabel,
+      name: 'enabled',
+      value: false,
+    };
+  case 3: // Reset to default
+    return {
+      content_label: repoLabel,
+      name: 'enabled',
+      remove: true,
+    };
+  default:
+    return null;
+  }
+};
+
+export default pendingOverrideToApiParamItem;

data/webpack/components/extensions/Hosts/BulkActions/BulkRepositorySetsWizard/index.js

@@ -0,0 +1,23 @@
+import React from 'react';
+import { Modal, ModalVariant } from '@patternfly/react-core';
+import { useForemanModal } from 'foremanReact/components/ForemanModal/ForemanModalHooks';
+import BulkRepositorySetsWizard from './BulkRepositorySetsWizard';
+
+const BulkRepositorySetsWizardModal = () => {
+  const { modalOpen: isOpen } = useForemanModal({ id: 'bulk-repo-sets-wizard' });
+
+  return (
+    <Modal
+      ouiaId="bulk-repo-sets-wizard-modal"
+      isOpen={isOpen}
+      showClose={false}
+      aria-label="Wizard modal"
+      hasNoBodyWrapper
+      variant={ModalVariant.large}
+    >
+      <BulkRepositorySetsWizard />
+    </Modal>
+  );
+};
+
+export default BulkRepositorySetsWizardModal;

data/webpack/components/extensions/RegistrationCommands/fields/SetupContainerRegistryCerts.js

@@ -0,0 +1,39 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { noop } from 'foremanReact/common/helpers';
+
+import { FormGroup, Checkbox } from '@patternfly/react-core';
+import LabelIcon from 'foremanReact/components/common/LabelIcon';
+import { translate as __ } from 'foremanReact/common/I18n';
+
+const SetupContainerRegistryCerts = ({ value, onChange, isLoading }) => (
+  <FormGroup fieldId="reg_container_certs">
+    <Checkbox
+      ouiaId="reg-container-certs"
+      label={
+        <span>
+          {__('Set up container registry certs')}{' '}
+          <LabelIcon text={__('Place symlinks to entitlement certificates on the host, enabling container/flatpak registry access without a username or password.')} />
+        </span>
+            }
+      id="reg_container_certs"
+      onChange={() => onChange({ setupContainerRegistryCerts: !value })}
+      isDisabled={isLoading}
+      isChecked={value}
+    />
+  </FormGroup>
+);
+
+SetupContainerRegistryCerts.propTypes = {
+  value: PropTypes.bool,
+  onChange: PropTypes.func,
+  isLoading: PropTypes.bool,
+};
+
+SetupContainerRegistryCerts.defaultProps = {
+  value: false,
+  onChange: noop,
+  isLoading: false,
+};
+
+export default SetupContainerRegistryCerts;

data/webpack/components/extensions/RegistrationCommands/index.js

@@ -7,6 +7,7 @@ import { determineInitialAKSelection } from './helpers';
 import ActivationKeys from './fields/ActivationKeys';
 import IgnoreSubmanErrors from './fields/IgnoreSubmanErrors';
 import Force from './fields/Force';
+import SetupContainerRegistryCerts from './fields/SetupContainerRegistryCerts';
 
 export const RegistrationCommands = ({
   pluginValues,
@@ -26,6 +27,12 @@ export const RegistrationCommands = ({
       onChange={onChange}
       isLoading={isLoading}
     />
+    <SetupContainerRegistryCerts
+      value={pluginValues?.setupContainerRegistryCerts}
+      pluginValues={pluginValues}
+      onChange={onChange}
+      isLoading={isLoading}
+    />
   </>
 );
 

data/webpack/components/pf3Table/formatters/ellipsisCellFormatter.js

@@ -1,5 +1,6 @@
 import React from 'react';
-import EllipsisWithTooltip from 'react-ellipsis-with-tooltip';
+import { Truncate } from '@patternfly/react-core';
+
 import cellFormatter from './cellFormatter';
 
-export default value => cellFormatter(<EllipsisWithTooltip>{value}</EllipsisWithTooltip>);
+export default value => cellFormatter(<Truncate content={value} />);

data/webpack/containers/Application/config.js

@@ -16,6 +16,8 @@ import withHeader from './withHeaders';
 import ChangeContentSource from '../../scenes/Hosts/ChangeContentSource';
 import AlternateContentSource from '../../scenes/AlternateContentSources';
 import BootedContainerImages from '../../scenes/BootedContainerImages';
+import FlatpakRemotes from '../../scenes/FlatpakRemotes';
+import FlatpakRemoteDetails from '../../scenes/FlatpakRemotes/Details';
 
 // eslint-disable-next-line import/prefer-default-export
 export const links = [
@@ -90,4 +92,13 @@ export const links = [
     path: 'booted_container_images',
     component: WithOrganization(withHeader(BootedContainerImages, { title: __('Booted container images') })),
   },
+  {
+    path: 'flatpak_remotes',
+    component: WithOrganization(withHeader(FlatpakRemotes, { title: __('Flatpak Remotes') })),
+  },
+  {
+    path: 'flatpak_remotes/:id([0-9]+)',
+    component: WithOrganization(withHeader(FlatpakRemoteDetails, { title: __('Flatpak Remote Details') })),
+    exact: false,
+  },
 ];

data/webpack/global_index.js

@@ -38,6 +38,7 @@ import SystemPurposeCard from './components/extensions/HostDetails/Cards/SystemP
 import BulkChangeHostCVModal from './components/extensions/Hosts/BulkActions/BulkChangeHostCVModal/index.js';
 import BulkPackagesWizardModal from './components/extensions/Hosts/BulkActions/BulkPackagesWizard/index.js';
 import BulkErrataWizardModal from './components/extensions/Hosts/BulkActions/BulkErrataWizard/index.js';
+import BulkRepositorySetsWizardModal from './components/extensions/Hosts/BulkActions/BulkRepositorySetsWizard/index.js';
 import ActivationKeysSearch from './components/ActivationKeysSearch';
 import { CVEDetailsCard } from './scenes/ActivationKeys/Details/components/CVEDetailsCard.js';
 
@@ -96,7 +97,8 @@ addGlobalFill(
 // Hosts Index page extensions
 addGlobalFill('_all-hosts-modals', 'BulkChangeHostCVModal', <BulkChangeHostCVModal key="bulk-change-host-cv-modal" />, 100);
 addGlobalFill('_all-hosts-modals', 'BulkPackagesWizardModal', <BulkPackagesWizardModal key="bulk-packages-wizard-modal" />, 200);
-addGlobalFill('_all-hosts-modals', 'BulkErrataWizardModal', <BulkErrataWizardModal key="bulk-errata-wizard-modal" />, 200);
+addGlobalFill('_all-hosts-modals', 'BulkErrataWizardModal', <BulkErrataWizardModal key="bulk-errata-wizard-modal" />, 300);
+addGlobalFill('_all-hosts-modals', 'BulkRepositorySetsWizardModal', <BulkRepositorySetsWizardModal key="bulk-repo-sets-wizard-modal" />, 400);
 
 registerColumns(hostsIndexColumnExtensions);
 registerGetActions({

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

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

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

@@ -0,0 +1,38 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { translate as __ } from 'foremanReact/common/I18n';
+import { Modal, ModalVariant } from '@patternfly/react-core';
+import FlatpakRemotesForm from './FlatpakRemoteform';
+
+const EditFlatpakModal = ({ show, setIsOpen, remoteData }) => (
+  <Modal
+    ouiaId="edit-flatpak-modal"
+    title={__('Edit Flatpak Remote')}
+    variant={ModalVariant.small}
+    isOpen={show}
+    onClose={() => { setIsOpen(false); }}
+    appendTo={document.body}
+  >
+    <FlatpakRemotesForm setModalOpen={setIsOpen} remoteData={remoteData} />
+  </Modal>
+);
+
+EditFlatpakModal.propTypes = {
+  show: PropTypes.bool,
+  setIsOpen: PropTypes.func,
+  remoteData: PropTypes.shape({
+    id: PropTypes.number,
+    name: PropTypes.string,
+    url: PropTypes.string,
+    username: PropTypes.string,
+    password: PropTypes.string,
+  }),
+};
+
+EditFlatpakModal.defaultProps = {
+  show: false,
+  setIsOpen: null,
+  remoteData: null,
+};
+
+export default EditFlatpakModal;

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

@@ -0,0 +1,218 @@
+import React, { useState } from 'react';
+import useDeepCompareEffect from 'use-deep-compare-effect';
+import { STATUS } from 'foremanReact/constants';
+import { translate as __ } from 'foremanReact/common/I18n';
+import PropTypes from 'prop-types';
+import { useDispatch, useSelector } from 'react-redux';
+import {
+  Form,
+  FormGroup,
+  TextInput,
+  ActionGroup,
+  Button,
+  FormHelperText,
+  HelperText,
+  HelperTextItem,
+
+} from '@patternfly/react-core';
+import { createFlatpakRemote } from '../FlatpakRemotesActions';
+import {
+  selectCreateFlatpakRemotes,
+  selectCreateFlatpakRemotesStatus,
+  selectCreateFlatpakRemotesError,
+} from '../FlatpakRemotesSelectors';
+import { updateFlatpakRemote } from '../Details/FlatpakRemoteDetailActions';
+
+// eslint-disable-next-line react/prop-types
+const FlatpakRemotesForm = ({ setModalOpen, remoteData }) => {
+  const {
+    id: editingId,
+    name: editingName,
+    url: editingUrl,
+    username: editingUsername,
+    upstream_password_exists: passwordExists,
+  } = remoteData || {};
+
+  const isEditing = !!editingName;
+  const dispatch = useDispatch();
+  const [name, setName] = useState(editingName || '');
+  const [url, setUrl] = useState(editingUrl || '');
+  const [username, setUsername] = useState(editingUsername || '');
+  const [password, setPassword] = useState(passwordExists ? '*****' : '');
+  const [redirect, setRedirect] = useState(false);
+  const [saving, setSaving] = useState(false);
+
+  const [urlValidated, setUrlValidated] = useState('default');
+  const handleUrlChange = (newurl, _event) => {
+    setUrl(newurl);
+    if (newurl === '') {
+      setUrlValidated('default');
+    } else if (/^(http(s)?:\/\/)[-a-zA-Z0-9@:%._~#=]{2,256}\.[a-z]{2,6}\b([-a-zA-Z0-9@:%_.~#?&//=]*)$/g.test(newurl)) {
+      setUrlValidated('success');
+    } else {
+      setUrlValidated('error');
+    }
+  };
+
+  const response = useSelector(selectCreateFlatpakRemotes);
+  const status = useSelector(selectCreateFlatpakRemotesStatus);
+  const error = useSelector(selectCreateFlatpakRemotesError);
+
+  useDeepCompareEffect(() => {
+    const { id } = response;
+    if (id && status === STATUS.RESOLVED && saving) {
+      setSaving(false);
+      setRedirect(true);
+    } else if (status === STATUS.ERROR) {
+      setSaving(false);
+    }
+  }, [response, status, error, saving]);
+
+  const onSave = () => {
+    setSaving(true);
+    let editingParams = {};
+    if (isEditing && password === '*****') {
+      editingParams = {
+        name,
+        url,
+        username,
+      };
+    } else {
+      editingParams = {
+        name,
+        url,
+        username,
+        token: password,
+      };
+    }
+    dispatch(isEditing ?
+      updateFlatpakRemote(
+        editingId, editingParams, () => window.location.assign(`/flatpak_remotes/${editingId}`),
+        () => setModalOpen(false),
+      ) :
+      createFlatpakRemote({
+        name,
+        url,
+        username,
+        token: password,
+      }));
+  };
+
+  if (redirect) {
+    const { id } = response;
+    window.location.assign(`/flatpak_remotes/${id}`);
+  }
+
+  const submitDisabled =
+    !name?.length || !url?.length || saving || redirect || urlValidated === 'error';
+
+  return (
+    <Form
+      onSubmit={(e) => {
+        e.preventDefault();
+        onSave();
+      }}
+      id="create-flatpak-form"
+    >
+      <FormGroup
+        label={__('Name')}
+        isRequired
+        fieldId="name"
+      >
+        <TextInput
+          isRequired
+          type="text"
+          id="name"
+          aria-label="input_name"
+          ouiaId="input_name"
+          name="name"
+          value={name}
+          onChange={(_event, value) => setName(value)}
+        />
+      </FormGroup>
+      <FormGroup
+        label={__('URL')}
+        isRequired
+        fieldId="url"
+      >
+        <TextInput
+          isRequired
+          type="url"
+          id="url"
+          aria-label="input_url"
+          ouiaId="input_url"
+          name="url"
+          value={url}
+          validated={urlValidated}
+          onChange={(_event, newurl) => handleUrlChange(newurl, _event)}
+        />
+        {urlValidated === 'error' && (
+          <FormHelperText>
+            <HelperText>
+              <HelperTextItem variant="error">
+                {__('Must be a vaild URL')}
+              </HelperTextItem>
+            </HelperText>
+          </FormHelperText>
+        )}
+      </FormGroup>
+      <FormGroup label={__('Username')} fieldId="username">
+        <TextInput
+          type="text"
+          id="username"
+          ouiaId="input_username"
+          name="username"
+          aria-label="input_username"
+          value={username}
+          onChange={(_event, value) => setUsername(value)}
+        />
+        <FormHelperText>
+          <HelperText>
+            <HelperTextItem>Authentication for registry</HelperTextItem>
+          </HelperText>
+        </FormHelperText>
+      </FormGroup>
+      <FormGroup label={__('Password')} fieldId="password">
+        <TextInput
+          type="password"
+          id="password"
+          ouiaId="input_password"
+          name="password"
+          aria-label="input_password"
+          value={password}
+          onChange={(_event, value) => setPassword(value)}
+        />
+      </FormGroup>
+
+      <ActionGroup>
+        <Button
+          ouiaId="create-flatpak-form-submit"
+          aria-label="create_flatpak"
+          variant="primary"
+          isDisabled={submitDisabled}
+          isLoading={saving || redirect}
+          type="submit"
+        >
+          {isEditing ? __('Update') : __('Create')}
+        </Button>
+        <Button
+          ouiaId="create-flatpakcancel"
+          variant="link"
+          onClick={() => setModalOpen(false)}
+        >
+          {__('Cancel')}
+        </Button>
+      </ActionGroup>
+    </Form>
+  );
+};
+
+FlatpakRemotesForm.propTypes = {
+  setModalOpen: PropTypes.func,
+};
+
+FlatpakRemotesForm.defaultProps = {
+  setModalOpen: null,
+};
+
+export default FlatpakRemotesForm;

data/webpack/scenes/FlatpakRemotes/CreateEdit/__tests__/flatpakRemoteform.test.js

@@ -0,0 +1,117 @@
+import React from 'react';
+import { renderWithRedux, patientlyWaitFor, fireEvent } from 'react-testing-lib-wrapper';
+import { nockInstance, assertNockRequest } from '../../../../test-utils/nockWrapper';
+import FlatpakRemotesForm from '../FlatpakRemoteform';
+import api from '../../../../services/api';
+
+const mockFn = jest.fn();
+delete window.location;
+window.location = { assign: mockFn };
+
+afterEach(() => {
+  mockFn.mockClear();
+});
+
+const createFlatpakPath = api.getApiUrl('/flatpak_remotes');
+const updateFlatpakPath = id => api.getApiUrl(`/flatpak_remotes/${id}`);
+
+const mockRemoteData = {
+  id: 1,
+  name: 'Test Remote',
+  url: 'https://example.com',
+  username: 'testuser',
+  upstream_password_exists: true,
+};
+
+test('Renders FlatpakRemotesForm fields correctly', () => {
+  const { getByText } = renderWithRedux(<FlatpakRemotesForm setModalOpen={mockFn} />);
+  expect(getByText('Name')).toBeInTheDocument();
+  expect(getByText('URL')).toBeInTheDocument();
+  expect(getByText('Username')).toBeInTheDocument();
+  expect(getByText('Password')).toBeInTheDocument();
+});
+
+test('Can save Flatpak remote from form', async (done) => {
+  const createScope = nockInstance
+    .post(createFlatpakPath, {
+      organization_id: 1,
+      name: 'New Remote',
+      url: 'https://example.com',
+      username: 'testuser',
+      token: 'password123',
+    })
+    .reply(201, { id: 2 });
+
+  const { getByLabelText, getByText } = renderWithRedux(<FlatpakRemotesForm
+    setModalOpen={mockFn}
+  />);
+  fireEvent.change(getByLabelText('input_name'), { target: { value: 'New Remote' } });
+  fireEvent.change(getByLabelText('input_url'), { target: { value: 'https://example.com' } });
+  fireEvent.change(getByLabelText('input_username'), { target: { value: 'testuser' } });
+  fireEvent.change(getByLabelText('input_password'), { target: { value: 'password123' } });
+
+  getByText('Create').click();
+
+  await patientlyWaitFor(() => {
+    expect(window.location.assign).toHaveBeenCalledWith('/flatpak_remotes/2');
+  });
+
+  assertNockRequest(createScope);
+  done();
+});
+
+test('Can update Flatpak remote from form', async (done) => {
+  const updateScope = nockInstance
+    .put(updateFlatpakPath(mockRemoteData.id), {
+      name: 'Updated Remote',
+      url: 'https://updated.com',
+      username: 'updateduser',
+    })
+    .reply(200);
+
+  const { getByLabelText, getByText } = renderWithRedux(<FlatpakRemotesForm
+    setModalOpen={mockFn}
+    remoteData={mockRemoteData}
+  />);
+
+  fireEvent.change(getByLabelText('input_name'), { target: { value: 'Updated Remote' } });
+  fireEvent.change(getByLabelText('input_url'), { target: { value: 'https://updated.com' } });
+  fireEvent.change(getByLabelText('input_username'), { target: { value: 'updateduser' } });
+
+  getByText('Update').click();
+
+  await patientlyWaitFor(() => {
+    expect(window.location.assign).toHaveBeenCalledWith('/flatpak_remotes/1');
+  });
+
+  assertNockRequest(updateScope);
+  done();
+});
+
+test('Can update Flatpak remote password from placeholder', async (done) => {
+  const updateScope = nockInstance
+    .put(updateFlatpakPath(mockRemoteData.id), {
+      name: mockRemoteData.name,
+      url: mockRemoteData.url,
+      username: mockRemoteData.username,
+      token: 'newpassword123',
+    })
+    .reply(200);
+
+  const { getByLabelText, getByText } = renderWithRedux(<FlatpakRemotesForm
+    setModalOpen={mockFn}
+    remoteData={mockRemoteData}
+  />);
+
+  // Simulate changing the password from the placeholder to a new value
+  fireEvent.change(getByLabelText('input_password'), { target: { value: 'newpassword123' } });
+
+  getByText('Update').click();
+
+  await patientlyWaitFor(() => {
+    expect(window.location.assign).toHaveBeenCalledWith('/flatpak_remotes/1');
+  });
+
+  assertNockRequest(updateScope);
+  done();
+});

data/webpack/scenes/FlatpakRemotes/Delete/DeleteFlatpakModal.js

@@ -0,0 +1,59 @@
+import React from 'react';
+import { useDispatch } from 'react-redux';
+import PropTypes from 'prop-types';
+import { Modal, ModalVariant, Button, Icon, Title, Flex } from '@patternfly/react-core';
+import { ExclamationTriangleIcon } from '@patternfly/react-icons';
+import { translate as __ } from 'foremanReact/common/I18n';
+import { deleteFlatpakRemote } from '../Details/FlatpakRemoteDetailActions';
+
+const DeleteFlatpakModal = ({ isModalOpen, handleModalToggle, remoteId }) => {
+  const dispatch = useDispatch();
+
+  const handleDelete = () => {
+    dispatch(deleteFlatpakRemote(remoteId, () => window.location.replace('/flatpak_remotes')));
+    handleModalToggle();
+  };
+
+  return (
+    <Modal
+      ouiaId="flatpak-delete-modal"
+      variant={ModalVariant.small}
+      title={[
+        <Flex key="delete-modal-header">
+          <Icon status="warning" key="exclamation-triangle">
+            <ExclamationTriangleIcon />
+          </Icon>
+          <Title ouiaId="flatpak-delete-header" key="delete-flatpak-title" headingLevel="h5" size="2xl">
+            {__('Delete Flatpak remote?')}
+          </Title>
+        </Flex>,
+      ]}
+      isOpen={isModalOpen}
+      onClose={handleModalToggle}
+      actions={[
+        <Button ouiaId="delete-button" key="delete" variant="danger" onClick={handleDelete}>
+          {__('Delete')}
+        </Button>,
+        <Button ouiaId="cancel-button" key="cancel" variant="link" onClick={handleModalToggle}>
+          {__('Cancel')}
+        </Button>,
+      ]}
+    >
+      {__('This Flatpak remote will be deleted. Repositories mirrored from this remote will remain available and functional for use')}
+    </Modal>
+  );
+};
+
+DeleteFlatpakModal.propTypes = {
+  isModalOpen: PropTypes.bool,
+  handleModalToggle: PropTypes.func,
+  remoteId: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
+};
+
+DeleteFlatpakModal.defaultProps = {
+  isModalOpen: false,
+  handleModalToggle: () => {},
+  remoteId: undefined,
+};
+
+export default DeleteFlatpakModal;