fix: hide course authoring content when enable_course_authoring is off

Author: bra-i-am

src/authz-module/audit-user/index.tsx

@@ -14,6 +14,7 @@ import {
 import AuthZLayout from '@src/authz-module/components/AuthZLayout';
 import { useNavigate, useParams } from 'react-router-dom';
 import { useUserAccount, useValidateUserPermissionsNonSuspense } from '@src/data/hooks';
+import { CONTENT_COURSE_PERMISSIONS, VIEW_TEAM_PERMISSIONS, courseRolesMetadata } from '@src/authz-module/roles-permissions';
 import baseMessages from '@src/authz-module/messages';
 import AddRoleButton from '@src/authz-module/components/AddRoleButton';
 import {
@@ -32,6 +33,8 @@ import messages from './messages';
 import ConfirmDeletionModal from '../components/ConfirmDeletionModal';
 import { getCellHeader, getScopeManageActionPermission } from '../utils';
 
+const COURSE_ROLE_KEYS = new Set(courseRolesMetadata.map((r) => r.role));
+
 const AuditUserPage = () => {
   const { formatMessage } = useIntl();
   const [columnsWithFiltersApplied, setColumnsWithFiltersApplied] = useState<string[]>([]);
@@ -61,6 +64,11 @@ const AuditUserPage = () => {
     data: permissionsToManageScope,
   } = useValidateUserPermissionsNonSuspense(deletePermissions);
 
+  const { data: domainPermissions } = useValidateUserPermissionsNonSuspense(VIEW_TEAM_PERMISSIONS);
+  const isCourseViewAllowed = domainPermissions
+    ? domainPermissions.some((p) => p.action === CONTENT_COURSE_PERMISSIONS.VIEW_COURSE_TEAM && p.allowed)
+    : true;
+
   const rowsWithPermissions = useMemo(() => {
     if (!permissionsToManageScope) { return userAssignments; }
 
@@ -75,6 +83,14 @@ const AuditUserPage = () => {
     });
   }, [userAssignments, permissionsToManageScope]);
 
+  const visibleAssignments = useMemo(
+    () => (
+      isCourseViewAllowed
+        ? rowsWithPermissions
+        : rowsWithPermissions.filter((r) => !COURSE_ROLE_KEYS.has(r.role))),
+    [isCourseViewAllowed, rowsWithPermissions],
+  );
+
   const fetchData = useMemo(() => handleTableFetch, [handleTableFetch]);
 
   useEffect(() => {
@@ -251,7 +267,7 @@ const AuditUserPage = () => {
             isFilterable
             isSortable
             manualPagination
-            data={rowsWithPermissions}
+            data={visibleAssignments}
             manualFilters
             manualSortBy
             fetchData={fetchData}

src/authz-module/components/TableControlBar/RolesFilter.tsx

@@ -2,7 +2,9 @@ import { useMemo } from 'react';
 import { useIntl } from '@edx/frontend-platform/i18n';
 import { Person } from '@openedx/paragon/icons';
 import { useValidateUserPermissionsNonSuspense } from '@src/data/hooks';
-import { CONTENT_COURSE_PERMISSIONS, CONTENT_LIBRARY_PERMISSIONS, MANAGE_TEAM_PERMISSIONS } from '@src/authz-module/roles-permissions';
+import {
+  CONTENT_COURSE_PERMISSIONS, CONTENT_LIBRARY_PERMISSIONS, VIEW_TEAM_PERMISSIONS,
+} from '@src/authz-module/roles-permissions';
 import { CONTEXT_TYPES } from '@src/authz-module/constants';
 import MultipleChoiceFilter from './MultipleChoiceFilter';
 import { MultipleChoiceFilterProps } from './types';
@@ -14,7 +16,7 @@ const RolesFilter = ({
   filterButtonText, filterValue, setFilter, disabled,
 }: RolesFilterProps) => {
   const intl = useIntl();
-  const { data: permissions } = useValidateUserPermissionsNonSuspense(MANAGE_TEAM_PERMISSIONS);
+  const { data: permissions } = useValidateUserPermissionsNonSuspense(VIEW_TEAM_PERMISSIONS);
 
   // Only show role groups for the domains the user can view. Global roles stay
   // hidden until a platform-wide permission is available to gate them on.

src/authz-module/components/TableControlBar/ScopesFilter.test.tsx

@@ -1,31 +1,47 @@
 import { screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import { renderWrapper } from '@src/setupTest';
+import { useValidateUserPermissionsNonSuspense } from '@src/data/hooks';
+import { useScopes } from '@src/authz-module/data/hooks';
+import { CONTENT_COURSE_PERMISSIONS, CONTENT_LIBRARY_PERMISSIONS } from '@src/authz-module/roles-permissions';
 import ScopesFilter from './ScopesFilter';
 
+jest.mock('@src/data/hooks', () => ({
+  useValidateUserPermissionsNonSuspense: jest.fn(),
+}));
+
+const mockUsePermissions = useValidateUserPermissionsNonSuspense as jest.Mock;
+
 jest.mock('@src/authz-module/data/hooks', () => ({
-  useScopes: () => ({
+  useScopes: jest.fn(() => ({
     data: {
       pages: [
         {
           results: [
             {
-              externalKey: 'course:123',
-              name: 'Test Course',
-              organization: { name: 'Test Org' },
+              externalKey: 'course-v1:org+course+run',
+              displayName: 'Test Course',
+              org: { shortName: 'TestOrg' },
             },
             {
-              externalKey: 'library:456',
-              name: 'Test Library',
-              organization: { name: 'Another Org' },
+              externalKey: 'lib:org:library',
+              displayName: 'Test Library',
+              org: { shortName: 'TestOrg' },
             },
           ],
         },
       ],
     },
-  }),
+  })),
 }));
 
+const mockUseScopes = useScopes as jest.Mock;
+
+const permissionsData = ({ library, course }: { library?: boolean; course?: boolean }) => [
+  { action: CONTENT_LIBRARY_PERMISSIONS.VIEW_LIBRARY_TEAM, allowed: !!library },
+  { action: CONTENT_COURSE_PERMISSIONS.VIEW_COURSE_TEAM, allowed: !!course },
+];
+
 describe('ScopesFilter', () => {
   const defaultProps = {
     filterButtonText: 'Scopes',
@@ -36,6 +52,7 @@ describe('ScopesFilter', () => {
 
   beforeEach(() => {
     jest.clearAllMocks();
+    mockUsePermissions.mockReturnValue({ data: permissionsData({ library: true, course: true }) });
   });
 
   it('renders without crashing', () => {
@@ -68,4 +85,27 @@ describe('ScopesFilter', () => {
     renderWrapper(<ScopesFilter {...defaultProps} setFilter={mockSetFilter} />);
     expect(screen.getByText('Scopes')).toBeInTheDocument();
   });
+
+  it('fetches all scope types when the user can view courses', () => {
+    renderWrapper(<ScopesFilter {...defaultProps} />);
+    expect(mockUseScopes).toHaveBeenCalledWith(
+      expect.not.objectContaining({ scopeType: 'library' }),
+    );
+  });
+
+  it('fetches only library scopes when the user cannot view courses', () => {
+    mockUsePermissions.mockReturnValue({ data: permissionsData({ library: true, course: false }) });
+    renderWrapper(<ScopesFilter {...defaultProps} />);
+    expect(mockUseScopes).toHaveBeenCalledWith(
+      expect.objectContaining({ scopeType: 'library' }),
+    );
+  });
+
+  it('defaults to showing all scopes while permissions are loading', () => {
+    mockUsePermissions.mockReturnValue({ data: undefined });
+    renderWrapper(<ScopesFilter {...defaultProps} />);
+    expect(mockUseScopes).toHaveBeenCalledWith(
+      expect.not.objectContaining({ scopeType: 'library' }),
+    );
+  });
 });

src/authz-module/components/TableControlBar/ScopesFilter.tsx

@@ -1,6 +1,8 @@
 import { useMemo, useState } from 'react';
 import { useIntl } from '@edx/frontend-platform/i18n';
 import { LocationOn } from '@openedx/paragon/icons';
+import { useValidateUserPermissionsNonSuspense } from '@src/data/hooks';
+import { CONTENT_COURSE_PERMISSIONS, VIEW_TEAM_PERMISSIONS } from '@src/authz-module/roles-permissions';
 import { useScopes } from '@src/authz-module/data/hooks';
 import { DEFAULT_FILTER_PAGE_SIZE } from '@src/authz-module/constants';
 import { MultipleChoiceFilterProps } from './types';
@@ -15,7 +17,17 @@ const ScopesFilter = ({
 }: ScopesFilterProps) => {
   const { formatMessage } = useIntl();
   const [searchValue, setSearchValue] = useState<string | undefined>(undefined);
-  const { data: scopesData } = useScopes({ search: searchValue, pageSize: DEFAULT_FILTER_PAGE_SIZE });
+
+  const { data: permissions } = useValidateUserPermissionsNonSuspense(VIEW_TEAM_PERMISSIONS);
+  const isCourseViewAllowed = permissions
+    ? permissions.some((p) => p.action === CONTENT_COURSE_PERMISSIONS.VIEW_COURSE_TEAM && p.allowed)
+    : true;
+
+  const { data: scopesData } = useScopes({
+    search: searchValue,
+    pageSize: DEFAULT_FILTER_PAGE_SIZE,
+    ...(isCourseViewAllowed ? {} : { scopeType: 'library' }),
+  });
 
   const filterChoices = useMemo(() => (scopesData?.pages?.flatMap((p) => p.results) ?? []).map((scope) => {
     const scopeIcon = scope.externalKey?.startsWith('lib') ? RESOURCE_ICONS.LIBRARY : RESOURCE_ICONS.COURSE;

src/authz-module/roles-permissions/index.ts

@@ -21,3 +21,8 @@ export const MANAGE_TEAM_PERMISSIONS: { action: string }[] = [
   { action: CONTENT_LIBRARY_PERMISSIONS.MANAGE_LIBRARY_TEAM },
   { action: CONTENT_COURSE_PERMISSIONS.MANAGE_COURSE_TEAM },
 ];
+
+export const VIEW_TEAM_PERMISSIONS: { action: string }[] = [
+  { action: CONTENT_LIBRARY_PERMISSIONS.VIEW_LIBRARY_TEAM },
+  { action: CONTENT_COURSE_PERMISSIONS.VIEW_COURSE_TEAM },
+];

src/authz-module/team-members/TeamMembersTable.tsx

@@ -7,6 +7,8 @@ import {
 } from '@openedx/paragon';
 
 import { useToastManager } from '@src/components/ToastManager/ToastManagerContext';
+import { useValidateUserPermissionsNonSuspense } from '@src/data/hooks';
+import { CONTENT_COURSE_PERMISSIONS, VIEW_TEAM_PERMISSIONS, courseRolesMetadata } from '@src/authz-module/roles-permissions';
 import { useQuerySettings } from '@src/authz-module/hooks/useQuerySettings';
 import OrgFilter from '@src/authz-module/components/TableControlBar/OrgFilter';
 import RolesFilter from '@src/authz-module/components/TableControlBar/RolesFilter';
@@ -18,9 +20,12 @@ import {
 } from '@src/authz-module/components/TableCells';
 import { useAllRoleAssignments } from '@src/authz-module/data/hooks';
 import { TABLE_DEFAULT_PAGE_SIZE } from '@src/authz-module/constants';
+import { UserRole } from '@src/types';
 import messages from './messages';
 import TableFooter from '../components/TableFooter/TableFooter';
 
+const COURSE_ROLE_KEYS = new Set(courseRolesMetadata.map((r) => r.role));
+
 interface TeamMembersTableProps {
   presetScope?: string;
 }
@@ -44,12 +49,22 @@ const TeamMembersTable = ({ presetScope }: TeamMembersTableProps) => {
   const { querySettings, handleTableFetch } = useQuerySettings(initialQuerySettings);
 
   const {
-    data: { results: roleAssignments, count } = { results: [], count: 0 },
+    data: { results: roleAssignments, count } = { results: [] as UserRole[], count: 0 },
     isLoading: isLoadingAllRoleAssignments,
     error,
     refetch,
   } = useAllRoleAssignments(querySettings);
 
+  const { data: domainPermissions } = useValidateUserPermissionsNonSuspense(VIEW_TEAM_PERMISSIONS);
+  const isCourseViewAllowed = domainPermissions
+    ? domainPermissions.some((p) => p.action === CONTENT_COURSE_PERMISSIONS.VIEW_COURSE_TEAM && p.allowed)
+    : true;
+
+  const visibleAssignments = useMemo(
+    () => (isCourseViewAllowed ? roleAssignments : roleAssignments.filter((r) => !COURSE_ROLE_KEYS.has(r.role))),
+    [isCourseViewAllowed, roleAssignments],
+  );
+
   const initialFilters = presetScope ? [{ id: 'scope', value: [presetScope] }] : [];
 
   useEffect(() => {
@@ -75,7 +90,7 @@ const TeamMembersTable = ({ presetScope }: TeamMembersTableProps) => {
         manualSortBy
         numBreakoutFilters={4}
         fetchData={fetchData}
-        data={roleAssignments}
+        data={visibleAssignments}
         itemCount={count}
         pageCount={pageCount}
         initialState={{ pageSize: TABLE_DEFAULT_PAGE_SIZE, filters: initialFilters }}