diff --git a/chaoscenter/web/src/strings/strings.en.yaml b/chaoscenter/web/src/strings/strings.en.yaml index c9fdc0299b4..77586cacbc5 100644 --- a/chaoscenter/web/src/strings/strings.en.yaml +++ b/chaoscenter/web/src/strings/strings.en.yaml @@ -124,6 +124,7 @@ checkStatus: Check the status of your Chaos Infrastructure on your cluster chooseAccessType: Choose Access Type chooseAuthenticationType: Choose Authentication Type chooseHubAccess: Choose Hub Access +chooseMembersAddTheProject: Choose members to add to the project chooseProbeMode: Choose Mode for probe to be executed clickDownload: >- Click on the “Download” button below to download the YML file to a machine @@ -294,6 +295,7 @@ editSameExperimentDescription: >- editSameExperimentTitle: Edit on the existing Experiment editYaml: Edit Yaml editingChaosHub: Editing ChaosHub +editor: Editor effect: Effect email: Email emailIsRequired: Email is a required field @@ -1064,6 +1066,7 @@ totalChaosInfrastructures: Total Infrastructures totalEnvironments: Total Environments totalExp: Total Experiments totalExperiments: Total Faults in Execution +totalPendingInvitations: Total Pending Invitations totalRuns: Total Runs totalUsers: Total Users triggeredBy: Triggered by @@ -1121,6 +1124,7 @@ viewManifest: View YAML Manifest viewProbeDetails: View Probe Details viewProbeProperties: View Probe Properties viewRun: View Run +viewer: Viewer warning: Warning weekly: Weekly weeklyMessage: Your chaos experiment will run weekly at your chosen day and time. diff --git a/chaoscenter/web/src/strings/types.ts b/chaoscenter/web/src/strings/types.ts index bd45af1161b..b921ca172a2 100644 --- a/chaoscenter/web/src/strings/types.ts +++ b/chaoscenter/web/src/strings/types.ts @@ -119,6 +119,7 @@ export interface StringsMap { 'chooseAccessType': unknown 'chooseAuthenticationType': unknown 'chooseHubAccess': unknown + 'chooseMembersAddTheProject': unknown 'chooseProbeMode': unknown 'clickDownload': unknown 'clone': unknown @@ -247,6 +248,7 @@ export interface StringsMap { 'editSameExperimentTitle': unknown 'editYaml': unknown 'editingChaosHub': unknown + 'editor': unknown 'effect': unknown 'email': unknown 'emailIsRequired': unknown @@ -896,6 +898,7 @@ export interface StringsMap { 'totalEnvironments': unknown 'totalExp': unknown 'totalExperiments': unknown + 'totalPendingInvitations': unknown 'totalRuns': unknown 'totalUsers': unknown 'triggeredBy': unknown @@ -951,6 +954,7 @@ export interface StringsMap { 'viewProbeDetails': unknown 'viewProbeProperties': unknown 'viewRun': unknown + 'viewer': unknown 'warning': unknown 'weekly': unknown 'weeklyMessage': unknown diff --git a/chaoscenter/web/src/views/InviteNewMembers/InviteNewMemberListColumns.tsx b/chaoscenter/web/src/views/InviteNewMembers/InviteNewMemberListColumns.tsx index a10d8ef7121..61eedf99935 100644 --- a/chaoscenter/web/src/views/InviteNewMembers/InviteNewMemberListColumns.tsx +++ b/chaoscenter/web/src/views/InviteNewMembers/InviteNewMemberListColumns.tsx @@ -1,7 +1,7 @@ import { Layout, Text } from '@harnessio/uicore'; import type { Row } from 'react-table'; import React from 'react'; -import { Color } from '@harnessio/design-system'; +import { Color, FontVariation } from '@harnessio/design-system'; import { useStrings } from '@strings'; import type { InviteUserDetails } from '@controllers/InviteNewMembers/types'; @@ -13,13 +13,15 @@ const UserName = ({ row: { original: data } }: MemberRow): React.ReactElement => const { username, userID, name } = data; const { getString } = useStrings(); return ( - - {name ?? username} + + + {name ?? username} + {getString('id')}: - + {userID} @@ -30,11 +32,9 @@ const UserName = ({ row: { original: data } }: MemberRow): React.ReactElement => const UserEmail = ({ row: { original: data } }: MemberRow): React.ReactElement => { const { email } = data; return ( - - - {email} - - + + {email} + ); }; diff --git a/chaoscenter/web/src/views/InviteNewMembers/InviteNewMemberTable.module.scss b/chaoscenter/web/src/views/InviteNewMembers/InviteNewMemberTable.module.scss index 1d138e6adbb..704058cfa22 100644 --- a/chaoscenter/web/src/views/InviteNewMembers/InviteNewMemberTable.module.scss +++ b/chaoscenter/web/src/views/InviteNewMembers/InviteNewMemberTable.module.scss @@ -1,3 +1,33 @@ .inviteTable { width: 100%; } + +.tableContainer { + width: 100%; + [role='cell'], + [role='columnheader'] { + width: auto !important; + } + div[class*='TableV2--body'] { + overflow-y: scroll; + height: 400px; + display: flex; + flex-direction: column; + gap: 1rem; + } + div[class*='TableV2--row TableV2--card'] { + margin-bottom: 0 !important; + } + div[class*='TableV2--row TableV2--card'] { + border-radius: 6px !important; + &:hover { + background-color: white !important; + } + } + div[class*='TableV2--header'], + div[class*='TableV2--cells'] { + display: grid !important; + grid-template-columns: 1.5fr 1fr 200px; + gap: 1rem; + } +} diff --git a/chaoscenter/web/src/views/InviteNewMembers/InviteNewMemberTable.module.scss.d.ts b/chaoscenter/web/src/views/InviteNewMembers/InviteNewMemberTable.module.scss.d.ts index fe5265b4a76..8040b520a9d 100644 --- a/chaoscenter/web/src/views/InviteNewMembers/InviteNewMemberTable.module.scss.d.ts +++ b/chaoscenter/web/src/views/InviteNewMembers/InviteNewMemberTable.module.scss.d.ts @@ -1,6 +1,7 @@ declare namespace InviteNewMemberTableModuleScssNamespace { export interface IInviteNewMemberTableModuleScss { inviteTable: string; + tableContainer: string; } } diff --git a/chaoscenter/web/src/views/InviteNewMembers/InviteNewMembers.tsx b/chaoscenter/web/src/views/InviteNewMembers/InviteNewMembers.tsx index a6de91a1c07..e76b043dec1 100644 --- a/chaoscenter/web/src/views/InviteNewMembers/InviteNewMembers.tsx +++ b/chaoscenter/web/src/views/InviteNewMembers/InviteNewMembers.tsx @@ -21,14 +21,18 @@ interface InviteNewMembersViewProps { export default function InviteNewMembersView(props: InviteNewMembersViewProps): React.ReactElement { const { isLoading, data, handleClose, getUsers, searchInput } = props; const { getString } = useStrings(); + return ( - Choose members to add to the project + {getString('chooseMembersAddTheProject')} handleClose()} /> {searchInput} - + - -