Merge branch 'feature/orgs' into fix/EPMRPP-91791-wrong-organizations…

…-page-is-displayed
reportportal · Jul 4, 2024 · cefcaa3 · cefcaa3
2 parents 3fe30d5 + 956dd0a
commit cefcaa3
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 11 deletions.
diff --git a/app/src/pages/organization/projectTeamPage/projectTeamListTable/projectTeamListTable.jsx b/app/src/pages/organization/projectTeamPage/projectTeamListTable/projectTeamListTable.jsx
@@ -108,7 +108,7 @@ export const ProjectTeamListTableWrapped = ({ members, onChangeSorting, sortingD
     {
       key: 'lastLogin',
       header: formatMessage(messages.lastLogin),
-      width: 138,
+      width: 156,
       align: 'left',
     },
     {

diff --git a/app/src/pages/organization/projectTeamPage/projectTeamListTable/projectTeamListTable.scss b/app/src/pages/organization/projectTeamPage/projectTeamListTable/projectTeamListTable.scss
@@ -16,7 +16,8 @@
 
 .project-team-list-table {
   margin: 24px auto;
-  padding: 0 36px;
+  padding: 0 32px;
+  max-width: 1264px;
 }
 
 .date {

diff --git a/app/src/pages/organization/projectTeamPage/projectTeamPage.jsx b/app/src/pages/organization/projectTeamPage/projectTeamPage.jsx
@@ -21,6 +21,7 @@ import classNames from 'classnames/bind';
 import { loadingSelector, membersSelector } from 'controllers/members';
 import { useIntl } from 'react-intl';
 import { BubblesLoader } from '@reportportal/ui-kit';
+import { ScrollWrapper } from 'components/main/scrollWrapper';
 import { ProjectTeamPageHeader } from './projectTeamPageHeader';
 import { EmptyPageState } from '../emptyPageState';
 import { ProjectTeamListTable } from './projectTeamListTable';
@@ -54,13 +55,15 @@ export const ProjectTeamPage = () => {
     );
 
   return (
-    <div className={cx('project-team-page')}>
-      <ProjectTeamPageHeader
-        hasPermission={hasPermission}
-        title={formatMessage(messages.title)}
-        isNotEmpty={!isEmptyMembers}
-      />
-      {isEmptyMembers ? getEmptyPageState() : <ProjectTeamListTable members={members} />}
-    </div>
+    <ScrollWrapper autoHeightMax={100}>
+      <div className={cx('project-team-page')}>
+        <ProjectTeamPageHeader
+          hasPermission={hasPermission}
+          title={formatMessage(messages.title)}
+          isNotEmpty={!isEmptyMembers}
+        />
+        {isEmptyMembers ? getEmptyPageState() : <ProjectTeamListTable members={members} />}
+      </div>
+    </ScrollWrapper>
   );
 };
diff --git a/app/src/pages/organization/projectTeamPage/projectTeamPage.scss b/app/src/pages/organization/projectTeamPage/projectTeamPage.scss
@@ -17,7 +17,7 @@
 .project-team-page {
   display: flex;
   flex-direction: column;
-  height: 100%;
+  min-height: 100%;
 }
 
 .loader {

diff --git a/app/src/pages/organization/projectTeamPage/projectTeamPageHeader/projectTeamPageHeader.scss b/app/src/pages/organization/projectTeamPage/projectTeamPageHeader/projectTeamPageHeader.scss
@@ -19,6 +19,8 @@
   border-bottom: 1px solid $COLOR--e-100;
   background: $COLOR--bg-000;
   box-sizing: border-box;
+  position: sticky;
+  top: 0;
 }
 
 .header {