[MM-60514] Accessing bot_accounts page directly fails to load (#28247)
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
a03972e502
Коммит
df901b132e
@@ -403,4 +403,17 @@ describe('doesRouteBelongToTeamControllerRoutes', () => {
|
|||||||
expect(doesRouteBelongToTeamControllerRoutes('/login')).toBe(false);
|
expect(doesRouteBelongToTeamControllerRoutes('/login')).toBe(false);
|
||||||
expect(doesRouteBelongToTeamControllerRoutes('/error')).toBe(false);
|
expect(doesRouteBelongToTeamControllerRoutes('/error')).toBe(false);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
test('should return false for admin_console routes', () => {
|
||||||
|
expect(doesRouteBelongToTeamControllerRoutes('/admin_console/about')).toBe(false);
|
||||||
|
expect(doesRouteBelongToTeamControllerRoutes('/admin_console/reporting')).toBe(false);
|
||||||
|
expect(doesRouteBelongToTeamControllerRoutes('/admin_console/user_management')).toBe(false);
|
||||||
|
expect(doesRouteBelongToTeamControllerRoutes('/admin_console/environment')).toBe(false);
|
||||||
|
expect(doesRouteBelongToTeamControllerRoutes('/admin_console/site_config')).toBe(false);
|
||||||
|
expect(doesRouteBelongToTeamControllerRoutes('/admin_console/plugins/')).toBe(false);
|
||||||
|
expect(doesRouteBelongToTeamControllerRoutes('/admin_console/integrations/')).toBe(false);
|
||||||
|
expect(doesRouteBelongToTeamControllerRoutes('/admin_console/integrations/bot_accounts')).toBe(false);
|
||||||
|
expect(doesRouteBelongToTeamControllerRoutes('/admin_console/compliance')).toBe(false);
|
||||||
|
expect(doesRouteBelongToTeamControllerRoutes('/admin_console/experimental')).toBe(false);
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -571,6 +571,9 @@ export default class Root extends React.PureComponent<Props, State> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export function doesRouteBelongToTeamControllerRoutes(pathname: RouteComponentProps['location']['pathname']): boolean {
|
export function doesRouteBelongToTeamControllerRoutes(pathname: RouteComponentProps['location']['pathname']): boolean {
|
||||||
const TEAM_CONTROLLER_PATH_PATTERN = /^\/([a-z0-9\-_]+)\/(channels|messages|threads|drafts|integrations|emoji)(\/.*)?$/;
|
// Note: we have specifically added admin_console to the negative lookahead as admin_console can have integrations as subpaths (admin_console/integrations/bot_accounts)
|
||||||
|
// and we don't want to treat those as team controller routes.
|
||||||
|
const TEAM_CONTROLLER_PATH_PATTERN = /^\/(?!admin_console)([a-z0-9\-_]+)\/(channels|messages|threads|drafts|integrations|emoji)(\/.*)?$/;
|
||||||
|
|
||||||
return TEAM_CONTROLLER_PATH_PATTERN.test(pathname);
|
return TEAM_CONTROLLER_PATH_PATTERN.test(pathname);
|
||||||
}
|
}
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user