Merge pull request #4226 from reportportal/rc/5.12.4

Merge rc/5.12.4 into develop

Author: AmsterGet

app/src/controllers/dashboard/index.js

@@ -37,6 +37,8 @@ export {
   loadingSelector,
   totalDashboardsSelector,
   dashboardPaginationSelector,
+  querySelector,
+  getDashboardItemPageLinkSelector,
 } from './selectors';
 export {
   DASHBOARDS_TABLE_VIEW,

app/src/controllers/dashboard/sagas.js

@@ -30,6 +30,7 @@ import {
   activeDashboardIdSelector,
   pageSelector,
   projectIdSelector,
+  pagePropertiesSelector,
 } from 'controllers/pages';
 import { provideEcGA } from 'components/main/analytics/utils';
 import { formatEcDashboardData } from 'components/main/analytics/events/common/widgetPages/utils';
@@ -166,9 +167,13 @@ function* addDashboard({ payload }) {
     );
 
     yield put(hideModalAction());
+    const query = yield select(pagePropertiesSelector);
     yield put({
       type: PROJECT_DASHBOARD_ITEM_PAGE,
       payload: { projectId: activeProject, dashboardId: id },
+      meta: {
+        query,
+      },
     });
   } catch (error) {
     if (isPreconfigured && onError) {
@@ -221,6 +226,7 @@ function* copyDashboardConfig({ payload: dashboard }) {
     yield put(showDefaultErrorNotification(error));
   }
 }
+
 function* updateDashboard({ payload: dashboard }) {
   const activeProject = yield select(activeProjectSelector);
   const { name, description, id } = dashboard;

app/src/controllers/dashboard/selectors.js

@@ -15,7 +15,13 @@
  */
 
 import { createSelector } from 'reselect';
-import { activeDashboardIdSelector, createQueryParametersSelector } from 'controllers/pages';
+import {
+  activeDashboardIdSelector,
+  pagePropertiesSelector,
+  createQueryParametersSelector,
+  PROJECT_DASHBOARD_ITEM_PAGE,
+} from 'controllers/pages';
+import { activeProjectSelector } from 'controllers/user';
 
 const domainSelector = (state) => state.dashboards || {};
 export const loadingSelector = (state) => domainSelector(state).loading || false;
@@ -43,3 +49,16 @@ export const dashboardFullScreenModeSelector = (state) => domainSelector(state).
 export const querySelector = createQueryParametersSelector();
 
 export const dashboardPaginationSelector = (state) => domainSelector(state).pagination;
+
+export const getDashboardItemPageLinkSelector = (state) => (dashboardId) => {
+  const activeProject = activeProjectSelector(state);
+  const queryParams = pagePropertiesSelector(state);
+
+  return {
+    type: PROJECT_DASHBOARD_ITEM_PAGE,
+    payload: { projectId: activeProject, dashboardId },
+    meta: {
+      query: queryParams,
+    },
+  };
+};

app/src/pages/inside/common/dashboardPageHeader/dashboardPageHeader.jsx

@@ -22,14 +22,15 @@ import classNames from 'classnames/bind';
 import { activeProjectSelector } from 'controllers/user';
 import {
   activeDashboardIdSelector,
+  pagePropertiesSelector,
   PROJECT_DASHBOARD_PAGE,
-  PROJECT_DASHBOARD_ITEM_PAGE,
 } from 'controllers/pages';
 import {
   dashboardItemsSelector,
   dashboardItemPropTypes,
   totalDashboardsSelector,
   loadingSelector,
+  getDashboardItemPageLinkSelector,
 } from 'controllers/dashboard';
 import { InputDropdown } from 'components/inputs/inputDropdown';
 import { NavLink } from 'components/main/navLink';
@@ -53,53 +54,63 @@ const DASHBOARDS_LIMIT = 3000;
   activeItemId: activeDashboardIdSelector(state),
   totalDashboards: totalDashboardsSelector(state),
   isLoading: loadingSelector(state),
+  getDashboardItemPageLink: getDashboardItemPageLinkSelector(state),
+  query: pagePropertiesSelector(state),
 }))
 @injectIntl
 export class DashboardPageHeader extends Component {
   static propTypes = {
     intl: PropTypes.object.isRequired,
     projectId: PropTypes.string.isRequired,
+    getDashboardItemPageLink: PropTypes.func.isRequired,
     activeItemId: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
     dashboardsToDisplay: PropTypes.arrayOf(dashboardItemPropTypes),
     isLoading: PropTypes.bool,
     totalDashboards: PropTypes.number,
+    query: PropTypes.object,
   };
 
   static defaultProps = {
     activeItemId: '',
     dashboardsToDisplay: [],
     isLoading: true,
     totalDashboards: 0,
+    query: {},
   };
 
-  getDashboardPageItem = () => ({
-    label: (
-      <NavLink
-        exact
-        to={{
-          type: PROJECT_DASHBOARD_PAGE,
-          payload: { projectId: this.props.projectId },
-        }}
-        className={cx('link')}
-        activeClassName={cx('active-link')}
-      >
-        {this.props.intl.formatMessage(messages.allDashboardsTitle)}
-      </NavLink>
-    ),
-    value: DASHBOARD_PAGE_ITEM_VALUE,
-  });
-
-  createDashboardLink = (dashboardId) => ({
-    type: PROJECT_DASHBOARD_ITEM_PAGE,
-    payload: { projectId: this.props.projectId, dashboardId },
-  });
+  getDashboardPageItem = () => {
+    const {
+      query,
+      projectId,
+      intl: { formatMessage },
+    } = this.props;
+    return {
+      label: (
+        <NavLink
+          exact
+          to={{
+            type: PROJECT_DASHBOARD_PAGE,
+            payload: { projectId },
+            meta: {
+              query,
+            },
+          }}
+          className={cx('link')}
+          activeClassName={cx('active-link')}
+        >
+          {formatMessage(messages.allDashboardsTitle)}
+        </NavLink>
+      ),
+      value: DASHBOARD_PAGE_ITEM_VALUE,
+    };
+  };
 
   generateOptions = () =>
     [this.getDashboardPageItem()].concat(
       this.props.dashboardsToDisplay.map((item) => ({
         label: (
           <NavLink
-            to={this.createDashboardLink(item.id)}
+            to={this.props.getDashboardItemPageLink(item.id)}
             className={cx('link')}
             activeClassName={cx('active-link')}
           >

app/src/pages/inside/dashboardItemPage/dashboardItemPage.jsx

@@ -39,6 +39,7 @@ import {
   PROJECT_DASHBOARD_PAGE,
   PROJECT_DASHBOARD_PRINT_PAGE,
   activeDashboardIdSelector,
+  pagePropertiesSelector,
 } from 'controllers/pages';
 import { showModalAction } from 'controllers/modal';
 import { showNotification, NOTIFICATION_TYPES } from 'controllers/notification';
@@ -113,6 +114,7 @@ const messages = defineMessages({
     userInfo: userInfoSelector(state),
     fullScreenMode: dashboardFullScreenModeSelector(state),
     activeDashboardId: activeDashboardIdSelector(state),
+    query: pagePropertiesSelector(state),
   }),
   {
     showModalAction,
@@ -146,11 +148,13 @@ export class DashboardItemPage extends Component {
     deleteDashboard: PropTypes.func.isRequired,
     editDashboard: PropTypes.func.isRequired,
     activeDashboardId: PropTypes.number,
+    query: PropTypes.object,
   };
 
   static defaultProps = {
     fullScreenMode: false,
     activeDashboardId: undefined,
+    query: {},
   };
 
   onDeleteDashboard = () => {
@@ -206,13 +210,16 @@ export class DashboardItemPage extends Component {
   };
 
   getBreadcrumbs = () => {
-    const { activeProject, intl } = this.props;
+    const { activeProject, query, intl } = this.props;
     return [
       {
         title: intl.formatMessage(messages.pageTitle),
         link: {
           type: PROJECT_DASHBOARD_PAGE,
           payload: { projectId: activeProject },
+          meta: {
+            query,
+          },
         },
         eventInfo: DASHBOARD_PAGE_EVENTS.BREADCRUMB_ALL_DASHBOARD,
       },

app/src/pages/inside/dashboardItemPage/modals/widgetWizardModal/widgetWizardContent/widgetWizardContent.jsx

@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 EPAM Systems
+ * Copyright 2025 EPAM Systems
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -111,13 +111,17 @@ export class WidgetWizardContent extends Component {
       step: 0,
     };
     const {
-      fetchDashboards,
       intl: { formatMessage },
     } = this.props;
-    fetchDashboards();
     this.widgets = getWidgets(formatMessage);
   }
 
+  componentDidMount() {
+    if (!this.props.activeDashboardId) {
+      this.props.fetchDashboards();
+    }
+  }
+
   onClickNextStep = () => {
     const {
       tracking,

app/src/pages/inside/dashboardPage/dashboardList/dashboardGrid/dashboardGrid.jsx

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import React, { Fragment, Component } from 'react';
+import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { injectIntl } from 'react-intl';
 import { DASHBOARD_PAGE_EVENTS } from 'components/main/analytics/events';
@@ -35,13 +35,11 @@ export class DashboardGrid extends Component {
     const { dashboardItems, intl, ...rest } = this.props;
 
     return (
-      <Fragment>
-        <DashboardGridList
-          dashboardList={dashboardItems}
-          nameEventInfo={DASHBOARD_PAGE_EVENTS.DASHBOARD_NAME_CLICK}
-          {...rest}
-        />
-      </Fragment>
+      <DashboardGridList
+        dashboardList={dashboardItems}
+        nameEventInfo={DASHBOARD_PAGE_EVENTS.DASHBOARD_NAME_CLICK}
+        {...rest}
+      />
     );
   }
 }

app/src/pages/inside/dashboardPage/dashboardList/dashboardGrid/dashboardGridItem/dashboardGridItem.jsx

@@ -19,16 +19,15 @@ import track from 'react-tracking';
 import classNames from 'classnames/bind';
 import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
-import { PROJECT_DASHBOARD_ITEM_PAGE } from 'controllers/pages';
-import { activeProjectSelector } from 'controllers/user';
+import { getDashboardItemPageLinkSelector } from 'controllers/dashboard/selectors';
 import { Icon } from 'components/main/icon';
 import { NavLink } from 'components/main/navLink';
 import styles from './dashboardGridItem.scss';
 
 const cx = classNames.bind(styles);
 
 @connect((state) => ({
-  projectId: activeProjectSelector(state),
+  getDashboardItemPageLink: getDashboardItemPageLinkSelector(state),
 }))
 @track()
 export class DashboardGridItem extends Component {
@@ -37,7 +36,6 @@ export class DashboardGridItem extends Component {
   }
 
   static propTypes = {
-    projectId: PropTypes.string.isRequired,
     item: PropTypes.object,
     onEdit: PropTypes.func,
     onDelete: PropTypes.func,
@@ -46,6 +44,7 @@ export class DashboardGridItem extends Component {
       trackEvent: PropTypes.func,
       getTrackingData: PropTypes.func,
     }).isRequired,
+    getDashboardItemPageLink: PropTypes.func.isRequired,
   };
 
   static defaultProps = {
@@ -72,13 +71,13 @@ export class DashboardGridItem extends Component {
   };
 
   render() {
-    const { item, projectId } = this.props;
+    const { item, getDashboardItemPageLink } = this.props;
     const { name, description, owner, id } = item;
 
     return (
       <div className={cx('grid-view')}>
         <NavLink
-          to={{ type: PROJECT_DASHBOARD_ITEM_PAGE, payload: { projectId, dashboardId: id } }}
+          to={getDashboardItemPageLink(id)}
           className={cx('grid-view-inner')}
           onClick={() => this.props.tracking.trackEvent(this.props.nameEventInfo)}
         >

app/src/pages/inside/dashboardPage/dashboardList/dashboardTable/dashboardTable.jsx

@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 EPAM Systems
+ * Copyright 2025 EPAM Systems
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,10 +18,10 @@ import React, { Component, Fragment } from 'react';
 import classNames from 'classnames/bind';
 import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
-import { activeProjectSelector } from 'controllers/user';
 import { injectIntl } from 'react-intl';
 import { Grid, ALIGN_CENTER } from 'components/main/grid';
 import { EmptyDashboards } from 'pages/inside/dashboardPage/dashboardList/EmptyDashboards';
+import { getDashboardItemPageLinkSelector } from 'controllers/dashboard';
 import { messages } from './messages';
 import {
   NameColumn,
@@ -37,16 +37,16 @@ const cx = classNames.bind(styles);
 
 @injectIntl
 @connect((state) => ({
-  projectId: activeProjectSelector(state),
+  getDashboardItemPageLink: getDashboardItemPageLinkSelector(state),
 }))
 export class DashboardTable extends Component {
   static propTypes = {
     intl: PropTypes.object.isRequired,
+    getDashboardItemPageLink: PropTypes.func.isRequired,
     onDeleteItem: PropTypes.func,
     onEditItem: PropTypes.func,
     onDuplicate: PropTypes.func,
     onAddItem: PropTypes.func,
-    projectId: PropTypes.string,
     dashboardItems: PropTypes.array,
     loading: PropTypes.bool,
     filter: PropTypes.string,
@@ -57,14 +57,13 @@ export class DashboardTable extends Component {
     onEditItem: () => {},
     onDuplicate: () => {},
     onAddItem: () => {},
-    projectId: '',
     dashboardItems: [],
     loading: false,
     filter: '',
   };
 
   getTableColumns() {
-    const { onDeleteItem, onEditItem, onDuplicate, intl, projectId } = this.props;
+    const { onDeleteItem, onEditItem, onDuplicate, intl, getDashboardItemPageLink } = this.props;
 
     return [
       {
@@ -74,7 +73,7 @@ export class DashboardTable extends Component {
         },
         component: NameColumn,
         customProps: {
-          projectId,
+          getLink: getDashboardItemPageLink,
         },
       },
       {