Fix 403 from organizations endpoint when retrieving users (#1437)

Author: romanowska

web_ui/src/pages/user-management/user-management.component.tsx

@@ -151,7 +151,7 @@ export const UserManagement = () => {
                 id: `${UserManagementTabs.USERS}-user-page`,
                 key: UserManagementTabs.USERS,
                 name: capitalize(UserManagementTabs.USERS),
-                children: <UsersTab activeUser={activeUser as User} />,
+                children: <UsersTab activeUser={activeUser as User} resourceId={organizationId} />,
             },
             {
                 id: `${UserManagementTabs.PERSONAL_ACCESS_TOKEN}-user-page`,

web_ui/src/pages/user-management/users/users-tab.component.tsx

@@ -4,17 +4,15 @@
 import { RESOURCE_TYPE, User } from '@geti/core/src/users/users.interface';
 import { Flex, Text } from '@geti/ui';
 
-import { useOrganization } from '../../../intel-admin-app/pages/organization/hooks/organization.hook';
 import { OrganizationUserActions } from './actions/organization-user-actions.component';
 import { Users } from './users.component';
 
 interface UsersTabProps {
     activeUser: User | undefined;
+    resourceId: string;
 }
 
-export const UsersTab = ({ activeUser }: UsersTabProps) => {
-    const { organizationId } = useOrganization();
-
+export const UsersTab = ({ activeUser, resourceId }: UsersTabProps) => {
     if (!activeUser) return <></>;
 
     return (
@@ -28,7 +26,7 @@ export const UsersTab = ({ activeUser }: UsersTabProps) => {
             <Users
                 activeUser={activeUser}
                 resourceType={RESOURCE_TYPE.ORGANIZATION}
-                resourceId={organizationId}
+                resourceId={resourceId}
                 UserActions={OrganizationUserActions}
             />
         </Flex>

web_ui/src/pages/user-management/users/users-tab.test.tsx

@@ -45,7 +45,7 @@ describe('UsersTab', () => {
                 platformUtilsService.getProductInfo = async () =>
                     Promise.resolve(getMockedProductInfo({ isSmtpDefined: false }));
 
-                await render(<UsersTab activeUser={adminUser} />, {
+                await render(<UsersTab activeUser={adminUser} resourceId='org-id' />, {
                     services: { platformUtilsService, usersService },
                 });
 
@@ -58,7 +58,7 @@ describe('UsersTab', () => {
                 platformUtilsService.getProductInfo = async () =>
                     Promise.resolve(getMockedProductInfo({ isSmtpDefined: true }));
 
-                await render(<UsersTab activeUser={adminUser} />, {
+                await render(<UsersTab activeUser={adminUser} resourceId='org-id' />, {
                     services: { platformUtilsService, usersService },
                 });
 
@@ -76,7 +76,7 @@ describe('UsersTab', () => {
                 platformUtilsService.getProductInfo = async () =>
                     Promise.resolve(getMockedProductInfo({ isSmtpDefined: false }));
 
-                await render(<UsersTab activeUser={contributorUser} />, {
+                await render(<UsersTab activeUser={contributorUser} resourceId='org-id' />, {
                     services: { platformUtilsService, usersService },
                 });
 
@@ -89,7 +89,7 @@ describe('UsersTab', () => {
                 platformUtilsService.getProductInfo = async () =>
                     Promise.resolve(getMockedProductInfo({ isSmtpDefined: true }));
 
-                await render(<UsersTab activeUser={contributorUser} />, {
+                await render(<UsersTab activeUser={contributorUser} resourceId='org-id' />, {
                     services: { platformUtilsService, usersService },
                 });
 
@@ -113,7 +113,7 @@ describe('UsersTab', () => {
                 platformUtilsService.getProductInfo = async () =>
                     Promise.resolve(getMockedProductInfo({ isSmtpDefined: false }));
 
-                await render(<UsersTab activeUser={adminUser} />, {
+                await render(<UsersTab activeUser={adminUser} resourceId='org-id' />, {
                     services: { platformUtilsService, usersService },
                 });
 
@@ -131,7 +131,7 @@ describe('UsersTab', () => {
                 platformUtilsService.getProductInfo = async () =>
                     Promise.resolve(getMockedProductInfo({ isSmtpDefined: true }));
 
-                await render(<UsersTab activeUser={contributorUser} />, {
+                await render(<UsersTab activeUser={contributorUser} resourceId='org-id' />, {
                     services: { platformUtilsService, usersService },
                 });