katello 4.19.0.rc1 → 4.19.0.rc2

data/webpack/ForemanColumnExtensions/index.js

@@ -12,6 +12,7 @@ import {
   FlexItem,
   Popover,
   Badge,
+  Button,
   DescriptionList,
   DescriptionListGroup,
   DescriptionListDescription as Dd,
@@ -206,9 +207,9 @@ const hostsIndexColumnExtensions = [
               </Flex>
             }
           >
-            <FlexItem>
+            <Button variant="plain" style={{ padding: 0, color: 'inherit' }} ouiaId="content-view-environments-button">
               {truncate(contentViewEnvironments.map(cve => cve.label).join(', '), 35)}
-            </FlexItem>
+            </Button>
           </Popover>
         </Flex>
       );
@@ -237,6 +238,49 @@ const hostsIndexColumnExtensions = [
     weight: 2600,
     isSorted: true,
   },
+  {
+    columnName: 'host_collections',
+    title: __('Host collections'),
+    wrapper: (hostDetails) => {
+      const hostCollections = hostDetails?.host_collections ?? [];
+      if (hostCollections.length === 0) return '—';
+
+      // Show count badge if more than one collection
+      if (hostCollections.length > 1) {
+        return (
+          <Flex>
+            <FlexItem>
+              <Badge isRead>{hostCollections.length}</Badge>
+            </FlexItem>
+            <Popover
+              id="host-collections-tooltip"
+              className="host-collections-tooltip"
+              maxWidth="34rem"
+              headerContent={hostDetails.display_name}
+              bodyContent={
+                <Flex direction={{ default: 'column' }}>
+                  {hostCollections.map((hc, index) => (
+                    <FlexItem key={hc.id}>
+                      <Text component={TextVariants.p} ouiaId={`host-collection-name-${index}`}>{hc.name}</Text>
+                    </FlexItem>
+                  ))}
+                </Flex>
+              }
+            >
+              <Button variant="plain" style={{ padding: 0, color: 'inherit' }} ouiaId="host-collections-button">
+                {truncate(hostCollections.map(hc => hc.name).join(', '), 35)}
+              </Button>
+            </Popover>
+          </Flex>
+        );
+      }
+
+      // Just show the name if only one collection
+      return truncate(hostCollections[0].name, 35);
+    },
+    weight: 2700,
+    isSorted: false,
+  },
 ];
 
 hostsIndexColumnExtensions.forEach((column) => {

data/webpack/components/extensions/Hosts/BulkActions/BulkErrataWizard/02_BulkErrataTable.js

@@ -11,7 +11,7 @@ import TableIndexPage from 'foremanReact/components/PF4/TableIndexPage/TableInde
 import { translate as __ } from 'foremanReact/common/I18n';
 import SelectAllCheckbox from 'foremanReact/components/PF4/TableIndexPage/Table/SelectAllCheckbox';
 import { STATUS, getControllerSearchProps } from 'foremanReact/constants';
-import { RowSelectTd } from 'foremanReact/components/HostsIndex/RowSelectTd';
+import { RowSelectTd } from 'foremanReact/components/PF4/TableIndexPage/RowSelectTd';
 import { getPageStats } from 'foremanReact/components/PF4/TableIndexPage/Table/helpers';
 import { BulkErrataWizardContext, ERRATA_URL } from './BulkErrataWizard';
 import { ErrataType, ErrataSeverity } from '../../../../../components/Errata';

data/webpack/components/extensions/Hosts/BulkActions/BulkPackagesWizard/02_BulkPackagesTable.js

@@ -12,7 +12,7 @@ import { translate as __ } from 'foremanReact/common/I18n';
 import SelectAllCheckbox from 'foremanReact/components/PF4/TableIndexPage/Table/SelectAllCheckbox';
 import { getControllerSearchProps } from 'foremanReact/constants';
 import { noop } from 'foremanReact/common/helpers';
-import { RowSelectTd } from 'foremanReact/components/HostsIndex/RowSelectTd';
+import { RowSelectTd } from 'foremanReact/components/PF4/TableIndexPage/RowSelectTd';
 import { getPageStats } from 'foremanReact/components/PF4/TableIndexPage/Table/helpers';
 import { BulkPackagesWizardContext, getPackagesUrl } from './BulkPackagesWizard';
 import katelloApi from '../../../../../services/api';

data/webpack/components/extensions/Hosts/BulkActions/BulkRepositorySetsWizard/01_BulkRepositorySetsTable.js

@@ -14,7 +14,7 @@ import { useSet } from 'foremanReact/components/PF4/TableIndexPage/Table/TableHo
 import TableIndexPage from 'foremanReact/components/PF4/TableIndexPage/TableIndexPage';
 import { Table } from 'foremanReact/components/PF4/TableIndexPage/Table/Table';
 import { translate as __ } from 'foremanReact/common/I18n';
-import { RowSelectTd } from 'foremanReact/components/HostsIndex/RowSelectTd';
+import { RowSelectTd } from 'foremanReact/components/PF4/TableIndexPage/RowSelectTd';
 import SelectAllCheckbox from 'foremanReact/components/PF4/TableIndexPage/Table/SelectAllCheckbox';
 import { noop } from 'foremanReact/common/helpers';
 

data/webpack/components/extensions/Hosts/BulkActions/HostReview.js

@@ -11,7 +11,7 @@ import TableIndexPage from 'foremanReact/components/PF4/TableIndexPage/TableInde
 import { HOSTS_API_PATH } from 'foremanReact/routes/Hosts/constants';
 import { translate as __ } from 'foremanReact/common/I18n';
 import SelectAllCheckbox from 'foremanReact/components/PF4/TableIndexPage/Table/SelectAllCheckbox';
-import { RowSelectTd } from 'foremanReact/components/HostsIndex/RowSelectTd';
+import { RowSelectTd } from 'foremanReact/components/PF4/TableIndexPage/RowSelectTd';
 import { getPageStats } from 'foremanReact/components/PF4/TableIndexPage/Table/helpers';
 
 const HostReview = ({

data/webpack/scenes/Subscriptions/SubscriptionReducer.js

@@ -115,15 +115,25 @@ export default (state = initialState, action) => {
     });
   }
 
-  case SUBSCRIPTIONS_FAILURE:
+  case SUBSCRIPTIONS_FAILURE: {
+    // Try multiple paths to extract permission errors
+    const explicitMissingPermissions = get(action, ['payload', 'messages', 0, 'missing_permissions']);
+    const statusCode = get(action, ['payload', 'result', 'response', 'status']);
+    const errorMessages = get(action, ['payload', 'messages'], []);
+
+    // If we got a 403 Forbidden or 404 Not Found, treat it as a permission error
+    let missingPermissions = explicitMissingPermissions;
+    if (!missingPermissions && (statusCode === 403 || statusCode === 404)) {
+      // Use error messages as missing permissions
+      missingPermissions = errorMessages.length > 0 ? errorMessages : ['view_subscriptions'];
+    }
+
     return state
       .set('loading', false)
       .set('results', [])
       .set('itemCount', 0)
-      .set(
-        'missingPermissions',
-        get(action, ['payload', 'messages', 0, 'missing_permissions']),
-      );
+      .set('missingPermissions', missingPermissions);
+  }
 
   case SUBSCRIPTIONS_QUANTITIES_REQUEST:
     return state.merge({

data/webpack/scenes/Subscriptions/SubscriptionsPage.js

@@ -32,11 +32,9 @@ class SubscriptionsPage extends Component {
 
   componentDidMount() {
     this.props.resetTasks();
-
-    const { id } = this.props.organization;
-    if (id) { // navigating from another react page
-      this.loadData();
-    }
+    // Always load data, even if organization doesn't have an ID yet
+    // This allows us to detect permission errors
+    this.loadData();
   }
 
   componentDidUpdate(prevProps) {
@@ -137,7 +135,21 @@ class SubscriptionsPage extends Component {
       deleteButtonDisabled, disableDeleteButton, enableDeleteButton,
       searchQuery, updateSearchQuery, hasUpstreamConnection,
       task, activePermissions, subscriptions, subscriptionTableSettings, isManifestImported,
+      organization,
     } = this.props;
+
+    // If organization failed to load (404/403), the user doesn't have
+    // permission to view this organization. Show permission denied
+    // regardless of whether subscriptions returned results
+    if (organization?.error && !organization.loading) {
+      const statusCode = organization.error.response?.status;
+
+      if (statusCode === 404 || statusCode === 403) {
+        const errorMessage = 'You do not have permission to view this organization.';
+        return <PermissionDenied missingPermissions={[errorMessage]} />;
+      }
+    }
+
     // Basic permissions - should we even show this page?
     if (subscriptions.missingPermissions && subscriptions.missingPermissions.length > 0) {
       return <PermissionDenied missingPermissions={subscriptions.missingPermissions} />;
@@ -345,6 +357,11 @@ SubscriptionsPage.propTypes = {
         uuid: PropTypes.string,
       }),
     }),
+    error: PropTypes.shape({
+      response: PropTypes.shape({
+        status: PropTypes.number,
+      }),
+    }),
   }),
   task: PropTypes.shape({
     id: PropTypes.string,

data/webpack/scenes/Subscriptions/__tests__/SubscriptionsPage.test.js

@@ -106,6 +106,147 @@ describe('subscriptions page', () => {
     expect(toJson(permissionDeniedPage)).toMatchSnapshot();
   });
 
+  it('should render <PermissionDenied /> when organization load fails with 403', async () => {
+    const orgWith403Error = {
+      loading: false,
+      error: {
+        response: {
+          status: 403,
+        },
+      },
+    };
+    const pageWithOrgError = shallow(<SubscriptionsPage
+      setModalOpen={noop}
+      setModalClosed={noop}
+      organization={orgWith403Error}
+      subscriptions={successState}
+      subscriptionTableSettings={settingsSuccessState}
+      loadTables={loadTables}
+      loadTableColumns={loadTableColumns}
+      createColumns={createColumns}
+      updateColumns={updateColumns}
+      loadSubscriptions={loadSubscriptions}
+      loadAvailableQuantities={loadAvailableQuantities}
+      pingUpstreamSubscriptions={pingUpstreamSubscriptions}
+      checkSimpleContentAccessEligible={checkSimpleContentAccessEligible}
+      updateQuantity={updateQuantity}
+      handleStartTask={handleStartTask}
+      handleFinishedTask={handleFinishedTask}
+      pollTaskUntilDone={noop}
+      pollBulkSearch={noop}
+      pollTasks={pollTasks}
+      cancelPollTasks={noop}
+      deleteSubscriptions={() => {}}
+      resetTasks={noop}
+      uploadManifest={noop}
+      deleteManifest={noop}
+      refreshManifest={noop}
+      updateSearchQuery={noop}
+      openManageManifestModal={noop}
+      closeManageManifestModal={noop}
+      openDeleteModal={noop}
+      closeDeleteModal={noop}
+      disableDeleteButton={noop}
+      enableDeleteButton={noop}
+    />);
+    expect(pageWithOrgError.find('PermissionDenied')).toHaveLength(1);
+  });
+
+  it('should render <PermissionDenied /> when organization load fails with 404', async () => {
+    const orgWith404Error = {
+      loading: false,
+      error: {
+        response: {
+          status: 404,
+        },
+      },
+    };
+    const pageWithOrgError = shallow(<SubscriptionsPage
+      setModalOpen={noop}
+      setModalClosed={noop}
+      organization={orgWith404Error}
+      subscriptions={successState}
+      subscriptionTableSettings={settingsSuccessState}
+      loadTables={loadTables}
+      loadTableColumns={loadTableColumns}
+      createColumns={createColumns}
+      updateColumns={updateColumns}
+      loadSubscriptions={loadSubscriptions}
+      loadAvailableQuantities={loadAvailableQuantities}
+      pingUpstreamSubscriptions={pingUpstreamSubscriptions}
+      checkSimpleContentAccessEligible={checkSimpleContentAccessEligible}
+      updateQuantity={updateQuantity}
+      handleStartTask={handleStartTask}
+      handleFinishedTask={handleFinishedTask}
+      pollTaskUntilDone={noop}
+      pollBulkSearch={noop}
+      pollTasks={pollTasks}
+      cancelPollTasks={noop}
+      deleteSubscriptions={() => {}}
+      resetTasks={noop}
+      uploadManifest={noop}
+      deleteManifest={noop}
+      refreshManifest={noop}
+      updateSearchQuery={noop}
+      openManageManifestModal={noop}
+      closeManageManifestModal={noop}
+      openDeleteModal={noop}
+      closeDeleteModal={noop}
+      disableDeleteButton={noop}
+      enableDeleteButton={noop}
+    />);
+
+    expect(pageWithOrgError.find('PermissionDenied')).toHaveLength(1);
+  });
+
+  it('should not render <PermissionDenied /> when organization is still loading', async () => {
+    const orgStillLoading = {
+      loading: true,
+      error: {
+        response: {
+          status: 403,
+        },
+      },
+    };
+    const pageWithLoadingOrg = shallow(<SubscriptionsPage
+      setModalOpen={noop}
+      setModalClosed={noop}
+      organization={orgStillLoading}
+      subscriptions={successState}
+      subscriptionTableSettings={settingsSuccessState}
+      loadTables={loadTables}
+      loadTableColumns={loadTableColumns}
+      createColumns={createColumns}
+      updateColumns={updateColumns}
+      loadSubscriptions={loadSubscriptions}
+      loadAvailableQuantities={loadAvailableQuantities}
+      pingUpstreamSubscriptions={pingUpstreamSubscriptions}
+      checkSimpleContentAccessEligible={checkSimpleContentAccessEligible}
+      updateQuantity={updateQuantity}
+      handleStartTask={handleStartTask}
+      handleFinishedTask={handleFinishedTask}
+      pollTaskUntilDone={noop}
+      pollBulkSearch={noop}
+      pollTasks={pollTasks}
+      cancelPollTasks={noop}
+      deleteSubscriptions={() => {}}
+      resetTasks={noop}
+      uploadManifest={noop}
+      deleteManifest={noop}
+      refreshManifest={noop}
+      updateSearchQuery={noop}
+      openManageManifestModal={noop}
+      closeManageManifestModal={noop}
+      openDeleteModal={noop}
+      closeDeleteModal={noop}
+      disableDeleteButton={noop}
+      enableDeleteButton={noop}
+    />);
+
+    // Should not show PermissionDenied while organization is still loading
+    expect(pageWithLoadingOrg.find('PermissionDenied')).toHaveLength(0);
+  });
+
   it('should poll tasks when org changes', async () => {
     page.setProps({ organization: { id: 1 } });
 

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: katello
 version: !ruby/object:Gem::Version
-  version: 4.19.0.rc1
+  version: 4.19.0.rc2
 platform: ruby
 authors:
 - N/A
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-11-11 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -4456,6 +4455,7 @@ files:
 - lib/proxy_api/pulp_node.rb
 - locale/Makefile
 - locale/README
+- locale/action_names.rb
 - locale/bn/LC_MESSAGES/katello.mo
 - locale/bn/katello.po
 - locale/bn/katello.po.time_stamp
@@ -5613,7 +5613,6 @@ homepage: http://www.katello.org
 licenses:
 - GPL-2.0
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -5627,12 +5626,11 @@ 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:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Content and Subscription Management plugin for Foreman
 test_files: []