diff --git a/app/src/common/urls.js b/app/src/common/urls.js index 22a80614fc..3e2c3b13ca 100644 --- a/app/src/common/urls.js +++ b/app/src/common/urls.js @@ -127,8 +127,8 @@ export const URLS = { apiKeys: (userId) => `${urlCommonBase}users/${userId}/api-keys`, apiKeyById: (userId, apiKeyId) => `${urlCommonBase}users/${userId}/api-keys/${apiKeyId}`, - organizationsList: (name) => `${urlBase}organizations${getQueryParams({ name })}`, - organizationsById: (organizationId) => `${urlBase}organizations/${organizationId}`, + organizationList: (name) => `${urlBase}organizations${getQueryParams({ name })}`, + organizationById: (organizationId) => `${urlBase}organizations/${organizationId}`, projectByName: (projectKey) => `${urlBase}project/${projectKey}`, project: (ids = []) => `${urlBase}project?ids=${ids.join(',')}`, diff --git a/app/src/controllers/auth/sagas.js b/app/src/controllers/auth/sagas.js index ac624cf58f..8ad7cdd7e3 100644 --- a/app/src/controllers/auth/sagas.js +++ b/app/src/controllers/auth/sagas.js @@ -48,7 +48,6 @@ import { activeProjectKeySelector, } from 'controllers/user'; import { FETCH_PROJECT_SUCCESS, fetchProjectAction } from 'controllers/project'; -import { FETCH_ORGANIZATIONS_SUCCESS, fetchOrganizationsAction } from 'controllers/organizations'; import { fetchPluginsAction, fetchGlobalIntegrationsAction, @@ -117,9 +116,7 @@ function* loginSuccessHandler({ payload }) { yield put(fetchUserAction()); yield all([take([FETCH_USER_SUCCESS, FETCH_USER_ERROR]), take(SET_ACTIVE_PROJECT_KEY)]); const projectKey = yield select(activeProjectKeySelector); - yield put(fetchOrganizationsAction()); yield put(fetchProjectAction(projectKey)); - yield all([take(FETCH_PROJECT_SUCCESS), take(FETCH_ORGANIZATIONS_SUCCESS)]); yield take(FETCH_PROJECT_SUCCESS); yield put(fetchPluginsAction()); yield put(fetchGlobalIntegrationsAction()); diff --git a/app/src/controllers/initialData/sagas.js b/app/src/controllers/initialData/sagas.js index ccb150ae8c..f315777084 100644 --- a/app/src/controllers/initialData/sagas.js +++ b/app/src/controllers/initialData/sagas.js @@ -25,7 +25,6 @@ import { authSuccessAction, } from 'controllers/auth'; import { FETCH_PROJECT_SUCCESS, fetchProjectAction } from 'controllers/project'; -import { FETCH_ORGANIZATIONS_SUCCESS, fetchOrganizationsAction } from 'controllers/organizations'; import { fetchGlobalIntegrationsAction, fetchPluginsAction, @@ -43,9 +42,8 @@ function* fetchInitialData() { const userResult = yield take([FETCH_USER_SUCCESS, FETCH_USER_ERROR]); if (!userResult.error) { const { payload: activeProjectKey } = yield take(SET_ACTIVE_PROJECT_KEY); - yield put(fetchOrganizationsAction()); yield put(fetchProjectAction(activeProjectKey)); - yield all([take(FETCH_PROJECT_SUCCESS), take(FETCH_ORGANIZATIONS_SUCCESS)]); + yield take(FETCH_PROJECT_SUCCESS); yield put(fetchPluginsAction()); yield put(fetchGlobalIntegrationsAction()); yield put(authSuccessAction()); diff --git a/app/src/controllers/organizations/sagas.js b/app/src/controllers/organizations/sagas.js index e7002ed419..3f40dab177 100644 --- a/app/src/controllers/organizations/sagas.js +++ b/app/src/controllers/organizations/sagas.js @@ -22,7 +22,7 @@ import { fetchOrganizationsSuccessAction } from './actionCreators'; function* fetchOrganizations() { try { - const organizations = yield call(fetch, URLS.organizationsList()); + const organizations = yield call(fetch, URLS.organizationList()); yield put(fetchOrganizationsSuccessAction(organizations?.content || [])); } catch (error) { yield put(showDefaultErrorNotification(error)); diff --git a/app/src/routes/routesMap.js b/app/src/routes/routesMap.js index f1bc45f66f..89c73953e4 100644 --- a/app/src/routes/routesMap.js +++ b/app/src/routes/routesMap.js @@ -82,6 +82,7 @@ import { fetchAllUsersAction } from 'controllers/administrate/allUsers/actionCre import { fetchLogPageData } from 'controllers/log'; import { fetchHistoryPageInfoAction } from 'controllers/itemsHistory'; import { fetchProjectsAction } from 'controllers/administrate/projects'; +import { fetchOrganizationsAction } from 'controllers/organizations'; import { startSetViewMode } from 'controllers/administrate/projects/actionCreators'; import { SIZE_KEY } from 'controllers/pagination'; import { setSessionItem, updateStorageItem } from 'common/utils/storageUtils'; @@ -127,6 +128,7 @@ const routesMap = { path: '/administrate/projects', thunk: (dispatch) => { dispatch(fetchProjectsAction()); + dispatch(fetchOrganizationsAction()); dispatch(startSetViewMode()); }, },