EPMRPP-87545 || Rebase the feature/organization branch onto develop

reportportal · Dec 19, 2023 · fd13d5b · fd13d5b
1 parent 1fd3ba7
commit fd13d5b
Show file tree

Hide file tree

Showing 12 changed files with 15 additions and 45 deletions.
diff --git a/app/src/common/constants/permissions.js b/app/src/common/constants/permissions.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { PROJECT_MANAGER, MEMBER } from 'common/constants/projectRoles';
+import { PROJECT_MANAGER, OPERATOR, CUSTOMER, MEMBER } from 'common/constants/projectRoles';
 
 export const ALL = 'ALL';
 export const OWNER = 'OWNER';

diff --git a/app/src/common/constants/projectRoles.js b/app/src/common/constants/projectRoles.js
@@ -16,6 +16,8 @@
 
 export const PROJECT_MANAGER = 'PROJECT_MANAGER';
 export const MEMBER = 'MEMBER';
+export const CUSTOMER = 'CUSTOMER';
+export const OPERATOR = 'OPERATOR';
 export const PROJECT_ROLES = [MEMBER, PROJECT_MANAGER];
 export const DEFAULT_PROJECT_ROLE = MEMBER;
 export const ROLES_MAP = [

diff --git a/app/src/common/constants/projectSections.js b/app/src/common/constants/projectSections.js
@@ -17,3 +17,4 @@
 export const MEMBERS = 'members';
 export const MONITORING = 'monitoring';
 export const SETTINGS = 'settings';
+export const EVENTS = 'events';
diff --git a/app/src/components/widgets/singleLevelWidgets/tables/launchesTable/launchesTable.jsx b/app/src/components/widgets/singleLevelWidgets/tables/launchesTable/launchesTable.jsx
@@ -52,7 +52,6 @@ import { ScrollWrapper } from 'components/main/scrollWrapper';
 import { getItemNameConfig } from 'components/widgets/common/utils';
 import { formatAttribute } from 'common/utils/attributeUtils';
 import { projectOrganizationSlugSelector } from 'controllers/project';
-import { projectOrganizationSlugSelector } from 'controllers/project';
 import { activeProjectKeySelector } from 'controllers/user';
 import { defaultDefectsMessages, defaultStatisticsMessages } from '../components/messages';
 import { getStatisticsStatuses, groupFieldsWithDefectTypes } from '../components/utils';

diff --git a/app/src/controllers/administrate/sagas.js b/app/src/controllers/administrate/sagas.js
@@ -16,8 +16,6 @@
 
 import { all, select, put, takeEvery } from 'redux-saga/effects';
 import { MONITORING, MEMBERS } from 'common/constants/projectSections';
-import { projectSectionSelector } from 'controllers/pages';
-import { MEMBERS } from 'common/constants/projectSections';
 import { projectSectionSelector, urlProjectKeySelector } from 'controllers/pages';
 import { fetchProjectAction } from 'controllers/project';
 import { fetchMembersAction } from 'controllers/members';

diff --git a/app/src/controllers/filter/sagas.js b/app/src/controllers/filter/sagas.js
@@ -34,7 +34,6 @@ import { FETCH_PROJECT_PREFERENCES_SUCCESS } from 'controllers/project/constants
 import { launchDistinctSelector } from 'controllers/launch/selectors';
 import { fetchLaunchesAction } from 'controllers/launch/actionCreators';
 import { projectOrganizationSlugSelector } from 'controllers/project';
-import { launchDistinctSelector } from 'controllers/launch';
 import { PROJECT_LAUNCHES_PAGE } from 'controllers/pages';
 import { omit } from 'common/utils/omit';
 import { NEW_FILTER_PREFIX } from 'common/constants/reservedFilterIds';
@@ -106,7 +105,7 @@ function* updateLaunchesFilter({ payload: filter }) {
   );
 }
 
-function* changeActiveFilter({ payload: filterId }) {
+function* changeActiveFilter({ payload: filterId, meta }) {
   const organizationSlug = yield select(projectOrganizationSlugSelector);
   const projectKey = yield select(activeProjectKeySelector);
 

diff --git a/app/src/controllers/user/sagas.js b/app/src/controllers/user/sagas.js
@@ -24,15 +24,11 @@ import { userIdSelector, userInfoSelector } from './selectors';
 import {
   ASSIGN_TO_PROJECT,
   UNASSIGN_FROM_PROJECT,
-  SET_ACTIVE_PROJECT,
   ADD_API_KEY,
   FETCH_API_KEYS,
   DELETE_API_KEY,
   FETCH_USER,
   DELETE_USER_ACCOUNT,
-  GENERATE_API_TOKEN,
-  FETCH_API_TOKEN,
-  FETCH_USER,
   SET_ACTIVE_PROJECT_KEY,
 } from './constants';
 import {
@@ -146,7 +142,6 @@ function* fetchUserWorker() {
   const activeProjectName =
     user.assignedProjects[savedActiveProjectKey]?.projectName ?? defaultProjectName;
 
-  yield put(fetchApiTokenAction());
   yield put(setActiveProjectAction(activeProjectName));
   yield put(setActiveProjectKeyAction(activeProjectKey));
 }

diff --git a/app/src/pages/common/membersPage/modals/permissionMapModal/permissionMap/permissions.js b/app/src/pages/common/membersPage/modals/permissionMapModal/permissionMap/permissions.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { PROJECT_MANAGER, MEMBER } from 'common/constants/projectRoles';
+import { PROJECT_MANAGER, MEMBER, OPERATOR, CUSTOMER } from 'common/constants/projectRoles';
 import { ALL, OWNER } from 'common/constants/permissions';
 
 export const ACTIONS = {
@@ -32,7 +32,6 @@ export const ACTIONS = {
   EDIT_DELETE_ITEM: 'EDIT_DELETE_ITEM',
   RERUN_LAUNCHES: 'RERUN_LAUNCHES',
   CHANGE_STATUS: 'CHANGE_STATUS',
-  EDIT_DELETE_ITEM: 'EDIT_DELETE_ITEM',
 };
 
 export const PERMISSIONS_MAP = {

diff --git a/app/src/pages/inside/dashboardItemPage/dashboardItemPage.jsx b/app/src/pages/inside/dashboardItemPage/dashboardItemPage.jsx
@@ -34,15 +34,7 @@ import {
   deleteDashboardAction,
   updateDashboardAction,
 } from 'controllers/dashboard';
-<<<<<<< HEAD
-import { userInfoSelector } from 'controllers/user';
-=======
-import {
-  userInfoSelector,
-  activeProjectRoleSelector,
-  activeProjectKeySelector,
-} from 'controllers/user';
->>>>>>> 01f1459e2 (EPMRPP 79767 || reduce selectors for new routing (#3284))
+import { userInfoSelector, activeProjectKeySelector } from 'controllers/user';
 import {
   PROJECT_DASHBOARD_PAGE,
   PROJECT_DASHBOARD_PRINT_PAGE,

diff --git a/.../inside/dashboardPage/dashboardList/dashboardGrid/dashboardGridItem/dashboardGridItem.jsx b/.../inside/dashboardPage/dashboardList/dashboardGrid/dashboardGridItem/dashboardGridItem.jsx
@@ -24,7 +24,6 @@ import { PROJECT_DASHBOARD_ITEM_PAGE } from 'controllers/pages';
 import { activeProjectKeySelector, activeProjectRoleSelector } from 'controllers/user';
 import { Icon } from 'components/main/icon';
 import { NavLink } from 'components/main/navLink';
-import { canEditDashboard, canDeleteDashboard } from 'common/utils/permissions';
 import { projectOrganizationSlugSelector } from 'controllers/project';
 import styles from './dashboardGridItem.scss';
 
@@ -81,15 +80,8 @@ export class DashboardGridItem extends Component {
   };
 
   render() {
-    const {
-      item,
-      currentUser: { userId, userRole },
-      projectKey,
-      projectRole,
-      organizationSlug,
-    } = this.props;
+    const { item, projectKey, organizationSlug } = this.props;
     const { name, description, owner, id } = item;
-    const isOwner = userId === owner;
 
     return (
       <div className={cx('grid-view')}>
@@ -115,16 +107,12 @@ export class DashboardGridItem extends Component {
             <p>{description}</p>
           </div>
           <div className={cx('grid-cell', 'owner')}>{owner}</div>
-          {canEditDashboard(userRole, projectRole, isOwner) && (
-            <div className={cx('grid-cell', 'edit')} onClick={this.editItem}>
-              <Icon type="icon-pencil" />
-            </div>
-          )}
-          {canDeleteDashboard(userRole, projectRole, isOwner) && (
-            <div className={cx('grid-cell', 'delete')} onClick={this.deleteItem}>
-              <Icon type="icon-close" />
-            </div>
-          )}
+          <div className={cx('grid-cell', 'edit')} onClick={this.editItem}>
+            <Icon type="icon-pencil" />
+          </div>
+          <div className={cx('grid-cell', 'delete')} onClick={this.deleteItem}>
+            <Icon type="icon-close" />
+          </div>
         </NavLink>
       </div>
     );

diff --git a/...tainer/content/notifications/modals/addEditNotificationModal/addEditNotificationModal.jsx b/...tainer/content/notifications/modals/addEditNotificationModal/addEditNotificationModal.jsx
@@ -36,10 +36,7 @@ import { FieldText } from 'componentLibrary/fieldText';
 import { Checkbox } from 'componentLibrary/checkbox';
 import { PROJECT_SETTINGS_NOTIFICATIONS_EVENTS } from 'analyticsEvents/projectSettingsPageEvents';
 import { AttributeListFormField } from 'components/containers/AttributeListFormField';
-<<<<<<< HEAD
 import { RadioGroup } from 'componentLibrary/radioGroup';
-=======
->>>>>>> 465d0e092 (Fix linter errors (#3320))
 import { RecipientsContainer } from './recipientsContainer';
 import { LaunchNamesContainer } from './launchNamesContainer';
 import {

diff --git a/app/src/routes/routesMap.js b/app/src/routes/routesMap.js
@@ -59,7 +59,7 @@ import {
 import { GENERAL, AUTHORIZATION_CONFIGURATION, ANALYTICS } from 'common/constants/settingsTabs';
 import { ADMINISTRATOR } from 'common/constants/accountRoles';
 import { INSTALLED, STORE } from 'common/constants/pluginsTabs';
-import { MEMBERS, MONITORING } from 'common/constants/projectSections';
+import { MEMBERS, SETTINGS, EVENTS } from 'common/constants/projectSections';
 import { ANONYMOUS_REDIRECT_PATH_STORAGE_KEY, isAuthorizedSelector } from 'controllers/auth';
 import {
   fetchDashboardsAction,