EPMRPP-91885 || Admin not assigned to a project can not open the proj…

…ect, wrong project name is displayed in the url
reportportal · Jun 19, 2024 · 3f7a47f · 3f7a47f
1 parent 4aa2991
commit 3f7a47f
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 8 deletions.
diff --git a/app/src/controllers/administrate/projects/sagas.js b/app/src/controllers/administrate/projects/sagas.js
@@ -140,11 +140,11 @@ function* watchDeleteProject() {
 
 function* navigateToProject({ payload }) {
   const { project } = payload;
-  const { organizationSlug, projectSlug } = project;
+  const { organizationSlug, projectSlug, projectKey } = project;
 
   yield put({
     type: PROJECT_PAGE,
-    payload: { organizationSlug, projectSlug },
+    payload: { organizationSlug, projectSlug, projectKey },
   });
 }
 

diff --git a/app/src/controllers/initialData/sagas.js b/app/src/controllers/initialData/sagas.js
@@ -32,13 +32,15 @@ import {
 } from 'controllers/plugins';
 import { getStorageItem } from 'common/utils';
 import { SET_ACTIVE_PROJECT_KEY } from 'controllers/user/constants';
+import { fetchOrganizationsAction } from 'controllers/organizations';
 import { setInitialDataReadyAction } from './actionCreators';
 import { FETCH_INITIAL_DATA } from './constants';
 
 function* fetchInitialData() {
   yield put(setTokenAction(getStorageItem(TOKEN_KEY) || DEFAULT_TOKEN));
   yield put(fetchAppInfoAction());
   yield put(fetchUserAction());
+  yield put(fetchOrganizationsAction());
   const userResult = yield take([FETCH_USER_SUCCESS, FETCH_USER_ERROR]);
   if (!userResult.error) {
     const { payload: activeProjectKey } = yield take(SET_ACTIVE_PROJECT_KEY);

diff --git a/app/src/controllers/project/selectors.js b/app/src/controllers/project/selectors.js
@@ -17,7 +17,9 @@
 import { createSelector } from 'reselect';
 import { OWNER } from 'common/constants/permissions';
 import { DEFECT_TYPES_SEQUENCE } from 'common/constants/defectTypes';
-import { assignedOrganizationsSelector } from 'controllers/user';
+import { assignedOrganizationsSelector, userAccountRoleSelector } from 'controllers/user';
+import { organizationsListSelector } from 'controllers/organizations';
+import { ADMINISTRATOR } from 'common/constants/accountRoles';
 import {
   ANALYZER_ATTRIBUTE_PREFIX,
   JOB_ATTRIBUTE_PREFIX,
@@ -55,7 +57,15 @@ export const projectNameSelector = (state) => projectInfoSelector(state).project
 export const organizationNameSelector = createSelector(
   assignedOrganizationsSelector,
   projectInfoSelector,
-  (assignedOrganizations, { organizationId }) => {
+  userAccountRoleSelector,
+  organizationsListSelector,
+  (assignedOrganizations, { organizationId }, accountRole, organizations) => {
+    const isAdmin = accountRole === ADMINISTRATOR;
+
+    if (isAdmin) {
+      return organizations.find(({ id }) => id === organizationId)?.name;
+    }
+
     const assignedOrganizationKey = Object.keys(assignedOrganizations).find(
       (assignedOrganization) =>
         assignedOrganizations[assignedOrganization].organizationId === organizationId,

diff --git a/app/src/routes/routesMap.js b/app/src/routes/routesMap.js
@@ -322,8 +322,13 @@ const routesMap = {
 export const onBeforeRouteChange = (dispatch, getState, { action }) => {
   const {
     type: nextPageType,
-    payload: { organizationSlug: hashOrganizationSlug, projectSlug: hashProjectSlug },
+    payload: {
+      organizationSlug: hashOrganizationSlug,
+      projectSlug: hashProjectSlug,
+      projectKey: hashProjectKey,
+    },
   } = action;
+
   let { organizationSlug, projectSlug } = activeProjectSelector(getState());
   const currentPageType = pageSelector(getState());
   const authorized = isAuthorizedSelector(getState());
@@ -334,12 +339,13 @@ export const onBeforeRouteChange = (dispatch, getState, { action }) => {
   const isAdmin = accountRole === ADMINISTRATOR;
   const isAdminNewPageType = !!adminPageNames[nextPageType];
   const isAdminCurrentPageType = !!adminPageNames[currentPageType];
-  const projectKey = assignedProjects?.[hashProjectSlug]?.projectKey;
+  const projectKey =
+    isAdmin && hashProjectKey ? hashProjectKey : assignedProjects?.[hashProjectSlug]?.projectKey;
   const isProjectExists =
     assignedOrganizations &&
-    hashOrganizationSlug in assignedOrganizations &&
+    (isAdmin || hashOrganizationSlug in assignedOrganizations) &&
     assignedProjects &&
-    hashProjectSlug in assignedProjects;
+    (isAdmin || hashProjectSlug in assignedProjects);
   const isChangedProject =
     organizationSlug !== hashOrganizationSlug || projectSlug !== hashProjectSlug;