diff --git a/src/components/Organizations/GroupMembers/index.js b/src/components/Organizations/GroupMembers/index.js
index 2d338258..92a5472f 100644
--- a/src/components/Organizations/GroupMembers/index.js
+++ b/src/components/Organizations/GroupMembers/index.js
@@ -21,6 +21,7 @@ import {
RemoveModalParagraph,
TableActions,
TableWrapper,
+ Tag,
} from '../SharedStyles';
import { StyledGroupMembers } from './Styles';
@@ -89,15 +90,28 @@ const GroupMembers = ({
width: '20%',
key: 'name',
render: ({ user }) => {
- const name = user.firstName;
- return name ?
{name}
: <> - >;
+ const { firstName, email } = user;
+
+ const isDefaultUser = email.startsWith('default-user');
+
+ if (isDefaultUser) return ;
+
+ return firstName ? {firstName}
: <> - >;
},
},
{
width: '20%',
key: 'lastName',
render: ({ user }) => {
- const lastName = user.lastName;
+ const { lastName, email } = user;
+
+ const isDefaultUser = email.startsWith('default-user');
+ if (isDefaultUser)
+ return (
+
+ DEFAULT USER
+
+ );
return lastName ? {lastName}
: <> - >;
},
},
diff --git a/src/components/Organizations/Manage/index.js b/src/components/Organizations/Manage/index.js
index 52c32a22..4462ed18 100644
--- a/src/components/Organizations/Manage/index.js
+++ b/src/components/Organizations/Manage/index.js
@@ -66,14 +66,25 @@ const Manage = ({ users = [], organization, organizationId, organizationName, re
{
width: '15%',
key: 'firstName',
- render: ({ firstName }) => {
+ render: ({ firstName, email }) => {
+ const isDefaultUser = email.startsWith('default-user');
+
+ if (isDefaultUser) return ;
+
return firstName ? {firstName}
: <> - >;
},
},
{
width: '15%',
key: 'lastName',
- render: ({ lastName }) => {
+ render: ({ lastName, email }) => {
+ const isDefaultUser = email.startsWith('default-user');
+ if (isDefaultUser)
+ return (
+
+ DEFAULT USER
+
+ );
return lastName ? {lastName}
: <> - >;
},
},
diff --git a/src/components/Organizations/PaginatedTable/PaginatedTable.tsx b/src/components/Organizations/PaginatedTable/PaginatedTable.tsx
index fda709e9..dd393d9d 100644
--- a/src/components/Organizations/PaginatedTable/PaginatedTable.tsx
+++ b/src/components/Organizations/PaginatedTable/PaginatedTable.tsx
@@ -275,7 +275,7 @@ const PaginatedTable: FC = ({
{labelText ? (
- {labelText} {`(${resultsToDisplay.length})`}
+ {labelText} {`(${sortedFilteredData.length})`}
) : (
''
diff --git a/src/components/Organizations/ProjectGroupMembers/index.js b/src/components/Organizations/ProjectGroupMembers/index.js
index 3d5d2ce1..fdb6222d 100644
--- a/src/components/Organizations/ProjectGroupMembers/index.js
+++ b/src/components/Organizations/ProjectGroupMembers/index.js
@@ -60,7 +60,7 @@ const ProjectGroupMembers = ({ groups = [], organizationId, organizationName, pr
{group.type.includes('project-default-group') && (
-
+
)}
diff --git a/src/components/Organizations/Projects/Styles.tsx b/src/components/Organizations/Projects/Styles.tsx
index b9afabd8..ca694ed9 100644
--- a/src/components/Organizations/Projects/Styles.tsx
+++ b/src/components/Organizations/Projects/Styles.tsx
@@ -166,7 +166,7 @@ export const OrgProjectWrapper = styled.div`
}
`;
-export const ProjectRoute = styled.div`
+export const ProjectDashboard = styled.div`
margin-left:1.5rem;
font-size:13px;
background:${props => props.theme.backgrounds.sidebar};
diff --git a/src/components/Organizations/Projects/index.js b/src/components/Organizations/Projects/index.js
index 3df2a757..2109f465 100644
--- a/src/components/Organizations/Projects/index.js
+++ b/src/components/Organizations/Projects/index.js
@@ -12,7 +12,7 @@ import { DeleteButton } from '../Groups/Styles';
import NewProject from '../NewProject';
import PaginatedTable from '../PaginatedTable/PaginatedTable';
import { Footer, RemoveModalHeader, RemoveModalParagraph, TableActions, Tag } from '../SharedStyles';
-import { ProjectRoute, StyledOrgProjects } from './Styles';
+import { ProjectDashboard, StyledOrgProjects } from './Styles';
const DELETE_PROJECT = gql`
mutation deleteProject($project: String!) {
@@ -45,8 +45,8 @@ const OrgProjects = ({ projects = [], organizationId, organizationName, refresh,
{project.name}
-
- ROUTE
+
+ View in Dashboard
>
);
diff --git a/src/components/link/Project.js b/src/components/link/Project.js
index 9a092bc8..9146e6eb 100644
--- a/src/components/link/Project.js
+++ b/src/components/link/Project.js
@@ -11,12 +11,14 @@ export const getLinkData = projectSlug => ({
/**
* Links to the project page given the project name.
*/
-const ProjectLink = ({ projectSlug, children, className = null, prefetch = false }) => {
+const ProjectLink = ({ projectSlug, children, className = null, prefetch = false, openInTab = false }) => {
const linkData = getLinkData(projectSlug);
return (
- {children}
+
+ {children}
+
);
};
diff --git a/src/pages/organizations/project.js b/src/pages/organizations/project.js
index 7d2ef374..8e16f9f9 100644
--- a/src/pages/organizations/project.js
+++ b/src/pages/organizations/project.js
@@ -14,7 +14,7 @@ import ProjectGroupMembers from 'components/Organizations/ProjectGroupMembers';
import ProjectGroupSkeleton from 'components/Organizations/ProjectGroupMembers/ProjectGroupSkeleton';
import ProjectNotifications from 'components/Organizations/ProjectNotifications';
import ProjectNotificationsSkeleton from 'components/Organizations/ProjectNotifications/ProjectNotificationsSkeleton';
-import { OrgProjectWrapper, ProjectRoute } from 'components/Organizations/Projects/Styles';
+import { OrgProjectWrapper, ProjectDashboard } from 'components/Organizations/Projects/Styles';
import ProjectLink from 'components/link/Project';
import MainLayout from 'layouts/MainLayout';
import ProjectAndOrganizationByID from 'lib/query/organizations/ProjectAndOrganizationByID';
@@ -107,8 +107,8 @@ export const PageGroupProject = ({ router }) => {
{project.name}
-
- ROUTE
+
+ View in Dashboard