katello 4.18.0.rc2 → 4.18.0

data/webpack/components/Errata/index.js

@@ -14,6 +14,7 @@ import {
   SecurityIcon,
   EnhancementIcon,
   SquareIcon,
+  QuestionCircleIcon,
 } from '@patternfly/react-icons';
 import { TranslatedAnchor } from '../Table/components/TranslatedPlural';
 
@@ -81,6 +82,21 @@ export const ErrataSummary = ({ type, count, errataCategory }) => {
     );
     break;
   default:
+    label = __('Other');
+    ErrataIcon = QuestionCircleIcon;
+    color = '#6a6e73';
+    url = (
+      <TranslatedAnchor
+        id="errata-card-other-count"
+        style={{ marginLeft: '0.4rem' }}
+        href={`#/Content/errata?type=other&show=${errataCategory}`}
+        count={count}
+        plural="others"
+        singular="other"
+        zeroMsg="# others"
+        ariaLabel={`${count} others`}
+      />
+    );
   }
   if (!ErrataIcon) return null;
 
@@ -126,6 +142,8 @@ export const ErrataType = ({ type }) => {
     ErrataIcon = EnhancementIcon;
     break;
   default:
+    label = __('Other');
+    ErrataIcon = QuestionCircleIcon;
   }
   if (!ErrataIcon) return null;
 

data/webpack/components/extensions/HostDetails/Tabs/ErrataTab/HostErrataConstants.js

@@ -5,6 +5,7 @@ export const ERRATA_TYPES = {
   SECURITY: 'Security',
   BUGFIX: 'Bugfix',
   ENHANCEMENT: 'Enhancement',
+  OTHER: 'Other',
 };
 export const ERRATA_SEVERITIES = {
   NOT_APPLICABLE: 'N/A',
@@ -18,6 +19,7 @@ export const TYPES_TO_PARAM = {
   [ERRATA_TYPES.SECURITY]: 'security',
   [ERRATA_TYPES.BUGFIX]: 'bugfix',
   [ERRATA_TYPES.ENHANCEMENT]: 'enhancement',
+  [ERRATA_TYPES.OTHER]: 'other',
 };
 
 export const SEVERITIES_TO_PARAM = {
@@ -32,6 +34,7 @@ export const PARAM_TO_FRIENDLY_NAME = {
   security: 'Security',
   bugfix: 'Bugfix',
   enhancement: 'Enhancement',
+  other: 'Other',
   none: 'N/A',
   low: 'Low',
   moderate: 'Moderate',

data/webpack/global_index.js

@@ -8,7 +8,6 @@ import { registerGetActions } from 'foremanReact/components/HostsIndex/TableRowA
 
 import hostsIndexColumnExtensions from './ForemanColumnExtensions/index';
 import hostTableRowActions from './components/extensions/Hosts/TableRowActions';
-import SystemStatuses from './components/extensions/about';
 import {
   RegistrationCommands,
   RegistrationActivationKeys,
@@ -22,7 +21,6 @@ import HwPropertiesCard from './components/extensions/HostDetails/DetailsTabCard
 import ImageModeCard from './components/extensions/HostDetails/DetailsTabCards/ImageModeCard';
 
 import TracesTab from './components/extensions/HostDetails/Tabs/TracesTab/TracesTab.js';
-import extendReducer from './components/extensions/reducers';
 import rootReducer from './redux/reducers';
 import HostCollectionsCard from './components/extensions/HostDetails/Cards/HostCollectionsCard/HostCollectionsCard';
 import { hostIsNotRegistered } from './components/extensions/HostDetails/hostDetailsHelpers';
@@ -42,10 +40,8 @@ import BulkRepositorySetsWizardModal from './components/extensions/Hosts/BulkAct
 import ActivationKeysSearch from './components/ActivationKeysSearch';
 import { CVEDetailsCard } from './scenes/ActivationKeys/Details/components/CVEDetailsCard.js';
 
-registerReducer('katelloExtends', extendReducer);
 registerReducer('katello', rootReducer);
 
-addGlobalFill('aboutFooterSlot', '[katello]AboutSystemStatuses', <SystemStatuses key="katello-system-statuses" />, 100);
 addGlobalFill('registrationAdvanced', '[katello]RegistrationCommands', <RegistrationCommands key="katello-reg" />, 100);
 addGlobalFill('registrationGeneral', '[katello]RegistrationActivationKeys', <RegistrationActivationKeys key="katello-reg-ak" />, 100);
 

data/webpack/redux/actions/RedHatRepositories/helpers.js

@@ -40,9 +40,9 @@ const recommendedRepositoriesSatTools = [
 ];
 
 const recommendedRepositoriesMisc = [
-  'satellite-utils-6.17-for-rhel-9-x86_64-rpms',
-  'satellite-maintenance-6.17-for-rhel-9-x86_64-rpms',
-  'satellite-capsule-6.17-for-rhel-9-x86_64-rpms',
+  'satellite-utils-6.18-for-rhel-9-x86_64-rpms',
+  'satellite-maintenance-6.18-for-rhel-9-x86_64-rpms',
+  'satellite-capsule-6.18-for-rhel-9-x86_64-rpms',
 ];
 
 const recommendedRepositorySetLables = recommendedRepositoriesRHEL

data/webpack/redux/reducers/index.js

@@ -9,7 +9,6 @@ import { setOrganization } from '../../components/SelectOrg/SetOrganization';
 import { moduleStreams } from '../../scenes/ModuleStreams';
 import { reducers as organizationProductsReducers } from '../OrganizationProducts';
 import { moduleStreamDetails } from '../../scenes/ModuleStreams/Details';
-import { reducers as systemStatuses } from '../../components/extensions/about';
 import { contentViewDetails } from '../../scenes/ContentViews/Details';
 import hostDetails from '../../components/extensions/HostDetails/HostDetailsReducer';
 import searchBar from '../../components/extensions/SearchBar/SearchBarReducer';
@@ -28,5 +27,4 @@ export default combineReducers({
   hostDetails,
   searchBar,
   ...organizationProductsReducers,
-  ...systemStatuses,
 });

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katello
 version: !ruby/object:Gem::Version
-  version: 4.18.0.rc2
+  version: 4.18.0
 platform: ruby
 authors:
 - N/A
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-08-26 00:00:00.000000000 Z
+date: 2025-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -4912,18 +4912,6 @@ files:
 - webpack/components/extensions/SearchBar/SearchBarHooks.js
 - webpack/components/extensions/SearchBar/SearchBarReducer.js
 - webpack/components/extensions/SearchBar/SearchBarSelectors.js
-- webpack/components/extensions/about/SystemStatuses.js
-- webpack/components/extensions/about/SystemStatusesActions.js
-- webpack/components/extensions/about/SystemStatusesConsts.js
-- webpack/components/extensions/about/SystemStatusesReducer.js
-- webpack/components/extensions/about/SystemStatusesSelectors.js
-- webpack/components/extensions/about/__tests__/SystemStatuses.fixtures.js
-- webpack/components/extensions/about/__tests__/SystemStatuses.test.js
-- webpack/components/extensions/about/__tests__/SystemStatusesReducer.test.js
-- webpack/components/extensions/about/__tests__/__snapshots__/SystemStatuses.test.js.snap
-- webpack/components/extensions/about/__tests__/__snapshots__/SystemStatusesReducer.test.js.snap
-- webpack/components/extensions/about/index.js
-- webpack/components/extensions/reducers.js
 - webpack/components/pf3Table/components/CollapseSubscriptionGroupButton.js
 - webpack/components/pf3Table/components/CollapseSubscriptionGroupButton.test.js
 - webpack/components/pf3Table/components/Table.js
@@ -5611,9 +5599,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.2.33
 signing_key:

data/webpack/components/extensions/about/SystemStatuses.js

@@ -1,55 +0,0 @@
-import React, { Component } from 'react';
-import PropTypes from 'prop-types';
-import { translate as __ } from 'foremanReact/common/I18n';
-import { LoadingState } from 'patternfly-react';
-
-class SystemStatuses extends Component {
-  componentDidMount() {
-    this.props.getSystemStatuses('/katello/api/ping');
-  }
-
-  render() {
-    const { services, status } = this.props;
-    const isLoading = status === 'PENDING';
-
-    return (
-      <div className="col-md-7">
-        <div className="stats-well">
-          <h4>{__('Backend System Status')}</h4>
-          <LoadingState loading={isLoading} loadingText="">
-            <table className="table table-striped">
-              <tbody>
-                <tr>
-                  <th>{__('Component')}</th>
-                  <th>{__('Status')}</th>
-                  <th>{__('Message')}</th>
-                </tr>
-
-                {Object.entries(services).map(([key, value]) => (
-                  <tr key={key}>
-                    <td> {key} </td>
-                    <td>{value.status.toUpperCase()}</td>
-                    <td> {value.message}</td>
-                  </tr>
-                ))}
-              </tbody>
-            </table>
-          </LoadingState>
-        </div>
-      </div>
-    );
-  }
-}
-
-SystemStatuses.propTypes = {
-  getSystemStatuses: PropTypes.func.isRequired,
-  services: PropTypes.shape({}),
-  status: PropTypes.string,
-};
-
-SystemStatuses.defaultProps = {
-  services: {},
-  status: '',
-};
-
-export default SystemStatuses;

data/webpack/components/extensions/about/SystemStatusesActions.js

@@ -1,16 +0,0 @@
-import { ajaxRequestAction } from 'foremanReact/redux/actions/common';
-import {
-  SYSTEM_STATUSES_FAILURE,
-  SYSTEM_STATUSES_SUCCESS,
-  SYSTEM_STATUSES_REQUEST,
-} from './SystemStatusesConsts';
-
-// eslint-disable-next-line import/prefer-default-export
-export const getSystemStatuses = url => dispatch =>
-  ajaxRequestAction({
-    dispatch,
-    requestAction: SYSTEM_STATUSES_REQUEST,
-    successAction: SYSTEM_STATUSES_SUCCESS,
-    failedAction: SYSTEM_STATUSES_FAILURE,
-    url,
-  });

data/webpack/components/extensions/about/SystemStatusesConsts.js

@@ -1,3 +0,0 @@
-export const SYSTEM_STATUSES_REQUEST = 'SYSTEM_STATUSES_REQUEST';
-export const SYSTEM_STATUSES_SUCCESS = 'SYSTEM_STATUSES_SUCCESS';
-export const SYSTEM_STATUSES_FAILURE = 'SYSTEM_STATUSES_FAILURE';

data/webpack/components/extensions/about/SystemStatusesReducer.js

@@ -1,26 +0,0 @@
-import Immutable from 'seamless-immutable';
-import {
-  SYSTEM_STATUSES_FAILURE,
-  SYSTEM_STATUSES_SUCCESS,
-  SYSTEM_STATUSES_REQUEST,
-} from './SystemStatusesConsts';
-
-const initialState = Immutable({
-  services: {},
-  loaderStatus: '',
-});
-
-export default (state = initialState, action) => {
-  switch (action.type) {
-  case SYSTEM_STATUSES_REQUEST:
-    return state.set('loaderStatus', 'PENDING');
-  case SYSTEM_STATUSES_SUCCESS:
-    return state
-      .set('services', action.payload.services)
-      .set('loaderStatus', 'RESOLVED');
-  case SYSTEM_STATUSES_FAILURE:
-    return state.set('loaderStatus', 'ERROR');
-  default:
-    return state;
-  }
-};

data/webpack/components/extensions/about/SystemStatusesSelectors.js

@@ -1,3 +0,0 @@
-export const selectAllServices = state => state.systemServices.services || {};
-
-export const selectStatus = state => state.systemServices.loaderStatus;

data/webpack/components/extensions/about/__tests__/SystemStatuses.fixtures.js

@@ -1,20 +0,0 @@
-
-export const services = {
-  candlepin: { status: 'ok', message: 'a message' },
-  candlepin_auth: { status: 'error', message: 'error message' },
-  foreman_tasks: { status: 'ok' },
-  pulp: { status: 'ok' },
-  pulp_auth: { status: 'ok' },
-};
-
-export const withServices = {
-  status: 'RESOLVED',
-  services,
-  getSystemStatuses: jest.fn(),
-};
-
-export const pending = {
-  status: 'PENDING',
-  services: {},
-  getSystemStatuses: jest.fn(),
-};

data/webpack/components/extensions/about/__tests__/SystemStatuses.test.js

@@ -1,14 +0,0 @@
-import { testComponentSnapshotsWithFixtures } from 'react-redux-test-utils';
-
-import SystemStatuses from '../SystemStatuses';
-import { withServices, pending } from './SystemStatuses.fixtures';
-
-jest.unmock('../../../../components/LoadingState');
-
-const fixtures = {
-  'renders a table': withServices,
-  'renders a loader': pending,
-};
-
-describe('SystemStatuses', () =>
-  testComponentSnapshotsWithFixtures(SystemStatuses, fixtures));

data/webpack/components/extensions/about/__tests__/SystemStatusesReducer.test.js

@@ -1,32 +0,0 @@
-import { testReducerSnapshotWithFixtures } from 'react-redux-test-utils';
-import {
-  SYSTEM_STATUSES_FAILURE,
-  SYSTEM_STATUSES_SUCCESS,
-  SYSTEM_STATUSES_REQUEST,
-} from '../SystemStatusesConsts';
-import reducer from '../SystemStatusesReducer';
-import { services } from './SystemStatuses.fixtures';
-
-const fixtures = {
-  'should return the initial state': {},
-  'should return PENDING': {
-    action: {
-      type: SYSTEM_STATUSES_REQUEST,
-    },
-  },
-  'should handle success': {
-    action: {
-      type: SYSTEM_STATUSES_SUCCESS,
-      payload: { services },
-    },
-  },
-  'should handle SYSTEM_STATUSES_FAILURE': {
-    action: {
-      type: SYSTEM_STATUSES_FAILURE,
-    },
-  },
-};
-
-describe('AutoComplete reducer', () =>
-  testReducerSnapshotWithFixtures(reducer, fixtures));
-

data/webpack/components/extensions/about/__tests__/__snapshots__/SystemStatuses.test.js.snap

@@ -1,156 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`SystemStatuses renders a loader 1`] = `
-<div
-  className="col-md-7"
->
-  <div
-    className="stats-well"
-  >
-    <h4>
-      Backend System Status
-    </h4>
-    <LoadingState
-      additionalClasses=""
-      loading={true}
-      loadingText=""
-      size="lg"
-      timeout={300}
-    >
-      <table
-        className="table table-striped"
-      >
-        <tbody>
-          <tr>
-            <th>
-              Component
-            </th>
-            <th>
-              Status
-            </th>
-            <th>
-              Message
-            </th>
-          </tr>
-        </tbody>
-      </table>
-    </LoadingState>
-  </div>
-</div>
-`;
-
-exports[`SystemStatuses renders a table 1`] = `
-<div
-  className="col-md-7"
->
-  <div
-    className="stats-well"
-  >
-    <h4>
-      Backend System Status
-    </h4>
-    <LoadingState
-      additionalClasses=""
-      loading={false}
-      loadingText=""
-      size="lg"
-      timeout={300}
-    >
-      <table
-        className="table table-striped"
-      >
-        <tbody>
-          <tr>
-            <th>
-              Component
-            </th>
-            <th>
-              Status
-            </th>
-            <th>
-              Message
-            </th>
-          </tr>
-          <tr
-            key="candlepin"
-          >
-            <td>
-               
-              candlepin
-               
-            </td>
-            <td>
-              OK
-            </td>
-            <td>
-               
-              a message
-            </td>
-          </tr>
-          <tr
-            key="candlepin_auth"
-          >
-            <td>
-               
-              candlepin_auth
-               
-            </td>
-            <td>
-              ERROR
-            </td>
-            <td>
-               
-              error message
-            </td>
-          </tr>
-          <tr
-            key="foreman_tasks"
-          >
-            <td>
-               
-              foreman_tasks
-               
-            </td>
-            <td>
-              OK
-            </td>
-            <td>
-               
-            </td>
-          </tr>
-          <tr
-            key="pulp"
-          >
-            <td>
-               
-              pulp
-               
-            </td>
-            <td>
-              OK
-            </td>
-            <td>
-               
-            </td>
-          </tr>
-          <tr
-            key="pulp_auth"
-          >
-            <td>
-               
-              pulp_auth
-               
-            </td>
-            <td>
-              OK
-            </td>
-            <td>
-               
-            </td>
-          </tr>
-        </tbody>
-      </table>
-    </LoadingState>
-  </div>
-</div>
-`;

data/webpack/components/extensions/about/__tests__/__snapshots__/SystemStatusesReducer.test.js.snap

@@ -1,47 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`AutoComplete reducer should handle SYSTEM_STATUSES_FAILURE 1`] = `
-Object {
-  "loaderStatus": "ERROR",
-  "services": Object {},
-}
-`;
-
-exports[`AutoComplete reducer should handle success 1`] = `
-Object {
-  "loaderStatus": "RESOLVED",
-  "services": Object {
-    "candlepin": Object {
-      "message": "a message",
-      "status": "ok",
-    },
-    "candlepin_auth": Object {
-      "message": "error message",
-      "status": "error",
-    },
-    "foreman_tasks": Object {
-      "status": "ok",
-    },
-    "pulp": Object {
-      "status": "ok",
-    },
-    "pulp_auth": Object {
-      "status": "ok",
-    },
-  },
-}
-`;
-
-exports[`AutoComplete reducer should return PENDING 1`] = `
-Object {
-  "loaderStatus": "PENDING",
-  "services": Object {},
-}
-`;
-
-exports[`AutoComplete reducer should return the initial state 1`] = `
-Object {
-  "loaderStatus": "",
-  "services": Object {},
-}
-`;

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

@@ -1,19 +0,0 @@
-import { connect } from 'react-redux';
-import * as actions from './SystemStatusesActions';
-import { selectAllServices, selectStatus } from './SystemStatusesSelectors';
-import reducer from './SystemStatusesReducer';
-
-import SystemStatuses from './SystemStatuses';
-
-const mapStateToProps = ({ katelloExtends }) => ({
-  services: selectAllServices(katelloExtends),
-  status: selectStatus(katelloExtends),
-});
-
-// export reducers
-export const reducers = { systemServices: reducer };
-
-export default connect(
-  mapStateToProps,
-  actions,
-)(SystemStatuses);

data/webpack/components/extensions/reducers.js

@@ -1,6 +0,0 @@
-import { combineReducers } from 'redux';
-import { reducers as systemStatuses } from './about';
-
-export default combineReducers({
-  ...systemStatuses,
-});