feat/teaming: Added revamped UI of teaming for litmus 3.0.0 #4134

Saranya-jena · 2023-08-16T16:43:47Z

Proposed changes

Summarize your changes here to communicate with the maintainers and make sure to put the link of that issue

Types of changes

What types of changes does your code introduce to Litmus? Put an x in the boxes that apply

New feature (non-breaking change which adds functionality)
Bugfix (non-breaking change which fixes an issue)
Breaking change (fix or feature that would cause existing functionality to not work as expected)
Documentation Update (if none of the other choices applies)

Checklist

Put an x in the boxes that apply. You can also fill these out after creating the PR. If you're unsure about any of them, don't hesitate to ask. We're here to help! This is simply a reminder of what we are going to look for before merging your code.

I have read the CONTRIBUTING doc
I have signed the commit for DCO to be passed.
Lint and unit tests pass locally with my changes
I have added tests that prove my fix is effective or that my feature works (if appropriate)
I have added necessary documentation (if appropriate)

Dependency

Please add the links to the dependent PR need to be merged before this (if any).

Special notes for your reviewer:

Signed-off-by: Saranya-jena <saranya.jena@harness.io>

…tmus into graphql-server Signed-off-by: Saranya-jena <saranya.jena@harness.io>

Signed-off-by: Saranya-jena <saranya.jena@harness.io>

….0.0/project

SahilKr24

Looks good! Great improvement over last time. 🚀

hrishavjha · 2023-08-17T05:23:17Z

chaoscenter/web/src/api/entities/project.ts

+export interface Members {
+  userID: string;
+  name: string;
+  username: string;
+  email: string;
+  role: PermissionGroup;
+  invitation: Invitation;
+  joinedAt: string;
+}
+
+export interface Project {
+  projectID: string;
+  name: string;
+  members: Members[];
+  UID: string;
+}


Are these two interfaced being used anywhere?

it's always good to type them all out @hrishavjha

Types are automatically generated from swagger file, these are ig old ones.

chaoscenter/web/src/controllers/ActiveProjectMemberList/ActiveProjectMembers.tsx

chaoscenter/web/src/controllers/PendingProjectMemberList/PendingProjectMembers.tsx

arkajyotiMukherjee

make sure the strings are flattened out and not nested.

arkajyotiMukherjee · 2023-08-17T10:28:35Z

chaoscenter/graphql/server/api/middleware/logger.go

+		//} else {
+		//	logrus.WithFields(logFields).Info()
+		//}


commented code

arkajyotiMukherjee · 2023-08-17T10:29:06Z

chaoscenter/web/src/api/entities/project.ts

+export interface Members {
+  userID: string;
+  name: string;
+  username: string;
+  email: string;
+  role: PermissionGroup;
+  invitation: Invitation;
+  joinedAt: string;
+}
+
+export interface Project {
+  projectID: string;
+  name: string;
+  members: Members[];
+  UID: string;
+}


it's always good to type them all out @hrishavjha

arkajyotiMukherjee · 2023-08-17T10:30:51Z

chaoscenter/web/src/controllers/ActiveProjectMemberList/ActiveProjectMembers.tsx

+    data,
+    isLoading,
+    refetch: getMembersRefetch
+  } = useGetProjectMembersQuery({ project_id: projectID, state: 'accepted' });


Invitation.ACCEPTED has a value of 'Accepted' but this requires 'accepted'
Can we make it the same...follow one convention

These are also generated by swagger, typing is not possible.

arkajyotiMukherjee · 2023-08-17T10:32:28Z

chaoscenter/web/src/controllers/ActiveProjectMemberList/helper.ts

+            userID: member.userID,
+            name: member.name,
+            username: member.username,
+            email: member.email,
+            invitation: member.invitation,
+            joinedAt: member.joinedAt,
+            role: member.role


Suggested change

userID: member.userID,

name: member.name,

username: member.username,

email: member.email,

invitation: member.invitation,

joinedAt: member.joinedAt,

role: member.role

...member

arkajyotiMukherjee · 2023-08-17T10:33:17Z

chaoscenter/web/src/controllers/ActiveProjectMemberList/helper.ts

@@ -0,0 +1,20 @@
+import type { ProjectMember } from '@api/auth';
+
+export function generateActiveMemberTableContent(memberData: Array<ProjectMember> | undefined): Array<ProjectMember> {


I don't understand the utility of this function...it's not doing any modification on memberData

arkajyotiMukherjee · 2023-08-17T10:42:33Z

chaoscenter/web/src/views/ProjectMembers/PendingMembersTable.tsx

+          messageTitle: 'No pending invitations present',
+          message: 'No pending invitations present'


arkajyotiMukherjee · 2023-08-17T10:43:06Z

chaoscenter/web/src/views/ProjectMembers/ProjectMembers.tsx

+                        data-testid="add-members"
+                        icon="plus"
+                        iconProps={{ size: 10 }}
+                        text="New Member"


arkajyotiMukherjee · 2023-08-17T10:43:14Z

chaoscenter/web/src/views/ProjectMembers/ProjectMembers.tsx

+          tabList={[
+            {
+              id: 'active-members',
+              title: 'Active Members',


arkajyotiMukherjee · 2023-08-17T10:43:24Z

chaoscenter/web/src/views/ProjectMembers/ProjectMembers.tsx

+            },
+            {
+              id: 'pending-members',
+              title: 'Pending Members',


arkajyotiMukherjee · 2023-08-17T10:43:42Z

chaoscenter/web/src/views/RemoveMember/RemoveMember.tsx

+      <Layout.Horizontal flex={{ alignItems: 'center', justifyContent: 'space-between' }}>
+        <Text font={{ variation: FontVariation.H4 }}>Remove Member</Text>
+      </Layout.Horizontal>
+      <Text font={{ variation: FontVariation.BODY }}>Are you sure you want to remove {username}?</Text>


Signed-off-by: Saranya-jena <saranya.jena@harness.io>

…aos#4134) * Added UI screens for active project members Signed-off-by: Saranya-jena <saranya.jena@harness.io> * Added auth endpoints to fetch active and pending members Signed-off-by: Saranya-jena <saranya.jena@harness.io> * Added api integration for active and pending members Signed-off-by: Saranya-jena <saranya.jena@harness.io> * Added api integration for invite users Signed-off-by: Saranya-jena <saranya.jena@harness.io> * Api refactor for invite users Signed-off-by: Saranya-jena <saranya.jena@harness.io> * Integrated table v2 with invite users api Signed-off-by: Saranya-jena <saranya.jena@harness.io> * Adding pending mebers screen Signed-off-by: Saranya-jena <saranya.jena@harness.io> * Added pending members table Signed-off-by: Saranya-jena <saranya.jena@harness.io> * Added json schema for all the fields Signed-off-by: Saranya-jena <saranya.jena@harness.io> * updated schema in frontend Signed-off-by: Saranya-jena <saranya.jena@harness.io> * Added epi integration for teaming Signed-off-by: Saranya-jena <saranya.jena@harness.io> * Added refetch functions in the modals and tables Signed-off-by: Saranya-jena <saranya.jena@harness.io> * Added ui fixes Signed-off-by: Saranya-jena <saranya.jena@harness.io> * Added loader and default text for empty array Signed-off-by: Saranya-jena <saranya.jena@harness.io> * Added user details fields while sending invitations Signed-off-by: Saranya-jena <saranya.jena@harness.io> * Added user details fields while project initialization Signed-off-by: Saranya-jena <saranya.jena@harness.io> * removed unused comments Signed-off-by: Saranya-jena <saranya.jena@harness.io> * resolved review comments Signed-off-by: Saranya-jena <saranya.jena@harness.io> * uncommented the logs Signed-off-by: Saranya-jena <saranya.jena@harness.io> --------- Signed-off-by: Saranya-jena <saranya.jena@harness.io>

Saranya-jena added 17 commits July 6, 2023 12:42

Added UI screens for active project members

1717ea5

Signed-off-by: Saranya-jena <saranya.jena@harness.io>

Added auth endpoints to fetch active and pending members

02e58db

Signed-off-by: Saranya-jena <saranya.jena@harness.io>

Added api integration for active and pending members

a0bda77

Signed-off-by: Saranya-jena <saranya.jena@harness.io>

Added api integration for invite users

2005eb2

Signed-off-by: Saranya-jena <saranya.jena@harness.io>

Api refactor for invite users

87438b4

Signed-off-by: Saranya-jena <saranya.jena@harness.io>

Integrated table v2 with invite users api

5287015

Signed-off-by: Saranya-jena <saranya.jena@harness.io>

Adding pending mebers screen

f33f5f2

Signed-off-by: Saranya-jena <saranya.jena@harness.io>

Added pending members table

53ecff9

Signed-off-by: Saranya-jena <saranya.jena@harness.io>

Added json schema for all the fields

0d512e0

Signed-off-by: Saranya-jena <saranya.jena@harness.io>

Merge branch '3.0.0-ux-refactor' of https://github.com/litmuschaos/li…

f8c1389

…tmus into graphql-server Signed-off-by: Saranya-jena <saranya.jena@harness.io>

updated schema in frontend

8fbeadd

Signed-off-by: Saranya-jena <saranya.jena@harness.io>

updated branch

0aaf19a

Signed-off-by: Saranya-jena <saranya.jena@harness.io>

Added epi integration for teaming

78540c8

Signed-off-by: Saranya-jena <saranya.jena@harness.io>

Added refetch functions in the modals and tables

a2d1579

Signed-off-by: Saranya-jena <saranya.jena@harness.io>

Added ui fixes

8cb996e

Signed-off-by: Saranya-jena <saranya.jena@harness.io>

Added loader and default text for empty array

04a0db5

Signed-off-by: Saranya-jena <saranya.jena@harness.io>

Added user details fields while sending invitations

6705d7a

Signed-off-by: Saranya-jena <saranya.jena@harness.io>

Saranya-jena requested review from hrishavjha, arkajyotiMukherjee, SarthakJain26 and SahilKr24 August 16, 2023 16:43

Saranya-jena self-assigned this Aug 16, 2023

Saranya-jena added 3 commits August 16, 2023 22:14

Added user details fields while project initialization

f9980ef

Signed-off-by: Saranya-jena <saranya.jena@harness.io>

removed unused comments

fceaf80

Signed-off-by: Saranya-jena <saranya.jena@harness.io>

Merge branch 'master' of https://github.com/litmuschaos/litmus into 3…

09d4d46

….0.0/project

SahilKr24 approved these changes Aug 17, 2023

View reviewed changes

hrishavjha approved these changes Aug 17, 2023

View reviewed changes

arkajyotiMukherjee reviewed Aug 17, 2023

View reviewed changes

Saranya-jena added 2 commits August 21, 2023 16:54

resolved review comments

a86e56e

Signed-off-by: Saranya-jena <saranya.jena@harness.io>

Merge branch 'master' into 3.0.0/project

2e4f70a

uncommented the logs

5de62c4

Signed-off-by: Saranya-jena <saranya.jena@harness.io>

arkajyotiMukherjee approved these changes Aug 21, 2023

View reviewed changes

Saranya-jena merged commit 4b778f5 into litmuschaos:master Aug 21, 2023
13 of 14 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat/teaming: Added revamped UI of teaming for litmus 3.0.0 #4134

feat/teaming: Added revamped UI of teaming for litmus 3.0.0 #4134

Saranya-jena commented Aug 16, 2023

SahilKr24 left a comment

hrishavjha Aug 17, 2023

arkajyotiMukherjee Aug 17, 2023

hrishavjha Aug 17, 2023

arkajyotiMukherjee left a comment

arkajyotiMukherjee Aug 17, 2023

arkajyotiMukherjee Aug 17, 2023

arkajyotiMukherjee Aug 17, 2023

Saranya-jena Aug 21, 2023

arkajyotiMukherjee Aug 17, 2023

arkajyotiMukherjee Aug 17, 2023

arkajyotiMukherjee Aug 17, 2023

arkajyotiMukherjee Aug 17, 2023

arkajyotiMukherjee Aug 17, 2023

arkajyotiMukherjee Aug 17, 2023

arkajyotiMukherjee Aug 17, 2023

		@@ -0,0 +1,20 @@
		import type { ProjectMember } from '@api/auth';

		export function generateActiveMemberTableContent(memberData: Array<ProjectMember> \| undefined): Array<ProjectMember> {

		messageTitle: 'No pending invitations present',
		message: 'No pending invitations present'

feat/teaming: Added revamped UI of teaming for litmus 3.0.0 #4134

feat/teaming: Added revamped UI of teaming for litmus 3.0.0 #4134

Conversation

Saranya-jena commented Aug 16, 2023

Proposed changes

Types of changes

Checklist

Dependency

Special notes for your reviewer:

SahilKr24 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

arkajyotiMukherjee left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment