katello 4.18.1 → 4.19.0.rc2

data/webpack/scenes/Subscriptions/Details/__tests__/__snapshots__/SubscriptionDetails.test.js.snap

@@ -27,7 +27,7 @@ exports[`subscriptions details page should render and contain appropiate compone
       }
     }
   />
-  <Uncontrolled(TabContainer)
+  <ForwardRef
     defaultActiveKey={1}
     id="subscription-tabs-container"
   >
@@ -531,6 +531,6 @@ exports[`subscriptions details page should render and contain appropiate compone
         </Grid>
       </LoadingState>
     </div>
-  </Uncontrolled(TabContainer)>
+  </ForwardRef>
 </div>
 `;

data/webpack/scenes/Subscriptions/SubscriptionConstants.js

@@ -51,8 +51,6 @@ export const BLOCKING_FOREMAN_TASK_TYPES = [
   'Actions::Katello::UpstreamSubscriptions::UpdateEntitlement',
   'Actions::Katello::UpstreamSubscriptions::RemoveEntitlements',
   'Actions::Katello::UpstreamSubscriptions::UpdateEntitlements',
-  'Actions::Katello::Organization::SimpleContentAccess::Enable',
-  'Actions::Katello::Organization::SimpleContentAccess::Disable',
 ];
 
 export const SUBSCRIPTION_TABLE_NAME = 'Katello::Subscriptions';

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 } });
 

data/webpack/scenes/Subscriptions/__tests__/__snapshots__/SubscriptionsActions.test.js.snap

@@ -64,7 +64,7 @@ Array [
     "payload": Object {
       "key": "SUBSCRIPTIONS_TASK_SEARCH",
       "params": Object {
-        "search": "organization_id=1 and result=pending and label=Actions::Katello::Organization::ManifestImport or Actions::Katello::Organization::ManifestRefresh or Actions::Katello::Organization::ManifestDelete or Actions::Katello::UpstreamSubscriptions::BindEntitlements or Actions::Katello::UpstreamSubscriptions::UpdateEntitlement or Actions::Katello::UpstreamSubscriptions::RemoveEntitlements or Actions::Katello::UpstreamSubscriptions::UpdateEntitlements or Actions::Katello::Organization::SimpleContentAccess::Enable or Actions::Katello::Organization::SimpleContentAccess::Disable",
+        "search": "organization_id=1 and result=pending and label=Actions::Katello::Organization::ManifestImport or Actions::Katello::Organization::ManifestRefresh or Actions::Katello::Organization::ManifestDelete or Actions::Katello::UpstreamSubscriptions::BindEntitlements or Actions::Katello::UpstreamSubscriptions::UpdateEntitlement or Actions::Katello::UpstreamSubscriptions::RemoveEntitlements or Actions::Katello::UpstreamSubscriptions::UpdateEntitlements",
       },
       "url": "/foreman_tasks/api/tasks",
     },
@@ -100,7 +100,7 @@ Object {
   "payload": Object {
     "key": "SUBSCRIPTIONS_TASK_SEARCH",
     "params": Object {
-      "search": "organization_id=1 and result=pending and label=Actions::Katello::Organization::ManifestImport or Actions::Katello::Organization::ManifestRefresh or Actions::Katello::Organization::ManifestDelete or Actions::Katello::UpstreamSubscriptions::BindEntitlements or Actions::Katello::UpstreamSubscriptions::UpdateEntitlement or Actions::Katello::UpstreamSubscriptions::RemoveEntitlements or Actions::Katello::UpstreamSubscriptions::UpdateEntitlements or Actions::Katello::Organization::SimpleContentAccess::Enable or Actions::Katello::Organization::SimpleContentAccess::Disable",
+      "search": "organization_id=1 and result=pending and label=Actions::Katello::Organization::ManifestImport or Actions::Katello::Organization::ManifestRefresh or Actions::Katello::Organization::ManifestDelete or Actions::Katello::UpstreamSubscriptions::BindEntitlements or Actions::Katello::UpstreamSubscriptions::UpdateEntitlement or Actions::Katello::UpstreamSubscriptions::RemoveEntitlements or Actions::Katello::UpstreamSubscriptions::UpdateEntitlements",
     },
     "url": "/foreman_tasks/api/tasks",
   },