Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

User Management Redesign and User Details Page #9080

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
72 commits
Select commit Hold shift + click to select a range
24a9dac
User page and components
Jacobjeevan Nov 1, 2024
c74888f
Minor fixes/refactoring
Jacobjeevan Nov 1, 2024
64b7176
Added LinkedFacilitiesTab and components
Jacobjeevan Nov 3, 2024
3c9d014
Adding Roles and LinkedSkills
Jacobjeevan Nov 4, 2024
3426182
removing unused fields in UserInformation
Jacobjeevan Nov 4, 2024
9839002
adjusted user detail page urls
Jacobjeevan Nov 4, 2024
3256e7c
Page title adjustments
Jacobjeevan Nov 4, 2024
4cd3142
minor tweaks
Jacobjeevan Nov 4, 2024
98f9f0b
FormEdits, fixes, customization
Jacobjeevan Nov 5, 2024
3b8803d
Editing userAdd component to be reusable
Jacobjeevan Nov 6, 2024
2e6bb42
Convert addUser to be reusable Pt2
Jacobjeevan Nov 6, 2024
86aee7a
form validation edits and translations
Jacobjeevan Nov 7, 2024
164f797
Merge branch 'develop' into issues/8878-user-management-redesign
Jacobjeevan Nov 7, 2024
3dc2ee2
Manage Users: card modifications
Jacobjeevan Nov 7, 2024
f44e122
Added list and card views
Jacobjeevan Nov 7, 2024
eaf37d4
Refactor
Jacobjeevan Nov 8, 2024
d581402
Route and perms updates
Jacobjeevan Nov 8, 2024
f553ade
Refactoring
Jacobjeevan Nov 9, 2024
65547f8
update import paths and minor fixes
Jacobjeevan Nov 10, 2024
cee9671
Delete unused modals, reuse older ones
Jacobjeevan Nov 11, 2024
b9742b7
Merge branch 'develop' into issues/8878-user-management-redesign
Jacobjeevan Nov 11, 2024
bedbae6
minor styling changes and reordering
Jacobjeevan Nov 11, 2024
a8ff61f
Conditionally render delete button/password reset form
Jacobjeevan Nov 11, 2024
0565d84
Reword role to qualifications
Jacobjeevan Nov 11, 2024
d7bdfbc
RabbitAi suggestions and form fixes
Jacobjeevan Nov 12, 2024
e038198
Merge branch 'develop' into issues/8878-user-management-redesign
Jacobjeevan Nov 12, 2024
76a47be
show district column only if data is available
Jacobjeevan Nov 12, 2024
f0cc362
RabbitAI comments
Jacobjeevan Nov 12, 2024
461cf75
Suggestions and error fixes
Jacobjeevan Nov 12, 2024
4f736a8
UsersManage tests
Jacobjeevan Nov 13, 2024
25cfc73
Fixed Usercreation tests
Jacobjeevan Nov 13, 2024
8d8d7cf
UsersHomepage tests, responsive design changes
Jacobjeevan Nov 13, 2024
9152343
separated out form components to diff functions
Jacobjeevan Nov 13, 2024
4e233b3
added username to more details btn Id for testing
Jacobjeevan Nov 13, 2024
02a90e6
Test fixes, more suggestions
Jacobjeevan Nov 14, 2024
413bf75
minor additions
Jacobjeevan Nov 14, 2024
df56df0
switched to using userListview's get route
Jacobjeevan Nov 18, 2024
3df8444
Added a profile view for read-only
Jacobjeevan Nov 18, 2024
a6e4668
User View
Jacobjeevan Nov 19, 2024
7c1b6a6
UserInformation
Jacobjeevan Nov 19, 2024
63efaa0
Merge branch 'develop' into issues/8878-user-management-redesign
nihal467 Nov 19, 2024
07a4212
UserDetails
Jacobjeevan Nov 19, 2024
dd40aee
UserSummary Tab Changes
Jacobjeevan Nov 20, 2024
5972cd7
Merge branch 'issues/8878-user-management-redesign' of https://github…
Jacobjeevan Nov 20, 2024
0ec3c06
Tests and minor fixes
Jacobjeevan Nov 20, 2024
e060aa3
Merge branch 'develop' into issues/8878-user-management-redesign
Jacobjeevan Nov 20, 2024
d6255c5
rabbit suggestions
Jacobjeevan Nov 20, 2024
3d7266c
Additional coderabbit suggestions
Jacobjeevan Nov 22, 2024
fd6150c
more coderabbit suggestions
Jacobjeevan Nov 22, 2024
fa8e51a
added user delete tests
Jacobjeevan Nov 22, 2024
759e897
fixes and suggestions
Jacobjeevan Nov 22, 2024
871c845
updated notes for user details view
Jacobjeevan Nov 25, 2024
d131ef7
changed password perms to reflect changes in BE
Jacobjeevan Nov 25, 2024
a7eb294
Merge branch 'develop' into issues/8878-user-management-redesign
Jacobjeevan Nov 26, 2024
e36ac80
Merge branch 'develop' into issues/8878-user-management-redesign
Jacobjeevan Nov 26, 2024
093f875
perms changes, form reset, sticky header on list
Jacobjeevan Nov 27, 2024
c983194
Merge branch 'develop' into issues/8878-user-management-redesign
Jacobjeevan Nov 27, 2024
abeefa9
phone validation msg
Jacobjeevan Nov 27, 2024
56ae6a0
changes based on review comments
Jacobjeevan Nov 28, 2024
0b05a20
user create phone invalid messsage
Jacobjeevan Nov 28, 2024
0300807
Merge branch 'develop' into issues/8878-user-management-redesign
Jacobjeevan Nov 28, 2024
c5a6e5f
fixing back button for camera asset
SwanandBhuskute Nov 29, 2024
1affac1
Merge branch 'develop' into issues/9233/fixedbackButtonForCamera
SwanandBhuskute Nov 29, 2024
4a48d93
Merge branch 'issues/9233/fixedbackButtonForCamera' of github.com:Swa…
Jacobjeevan Nov 29, 2024
3c208ab
Merge branch 'develop' into issues/8878-user-management-redesign
Jacobjeevan Dec 2, 2024
c0744c5
Merge branch 'develop' into issues/8878-user-management-redesign
Jacobjeevan Dec 4, 2024
efa2feb
Merge branch 'develop' into issues/8878-user-management-redesign
Jacobjeevan Dec 5, 2024
3a02614
validateRule in UserAdd
Jacobjeevan Dec 5, 2024
8b462dc
Merge branch 'develop' into issues/8878-user-management-redesign
Jacobjeevan Dec 6, 2024
8512b34
Merge remote-tracking branch 'origin' into issues/8878-user-managemen…
rithviknishad Dec 10, 2024
3fa1e76
removed superuser in password reset change perms
Jacobjeevan Dec 10, 2024
7359cc1
test fix
Jacobjeevan Dec 10, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions cypress/e2e/users_spec/UsersCreation.cy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ describe("User Creation", () => {
"Please enter valid phone number",
"Please enter the username",
"Please enter date in DD/MM/YYYY format",
"Please enter the password",
"Password is required",
Jacobjeevan marked this conversation as resolved.
Show resolved Hide resolved
"Confirm password is required",
"First Name is required",
"Last Name is required",
Expand Down Expand Up @@ -164,13 +164,10 @@ describe("User Creation", () => {
cy.verifyNotification("User added successfully");
userPage.typeInSearchInput(username);
userPage.checkUsernameText(username);
cy.verifyContentPresence("#name", [newUserFirstName]);
cy.verifyContentPresence(`#name-${username}`, [newUserFirstName]);
cy.verifyContentPresence("#role", [role]);
cy.verifyContentPresence("#district", [district]);
cy.verifyContentPresence("#home_facility", [homeFacility]);
cy.verifyContentPresence("#qualification", [qualification]);
cy.verifyContentPresence("#doctor-experience", [experience]);
cy.verifyContentPresence("#medical-council-registration", [regNo]);
cy.verifyContentPresence("#home-facility", [homeFacility]);
});

it("create new user form throwing mandatory field error", () => {
Expand Down
12 changes: 12 additions & 0 deletions cypress/e2e/users_spec/UsersHomepage.cy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,18 @@ describe("User Homepage", () => {
pageNavigation.verifyCurrentPageNumber(1);
});

it("Switch to list view, search by username and verify the results", () => {
userPage.switchToListView();
userPage.verifyListView();
userPage.checkSearchInputVisibility();
userPage.typeInSearchInput(doctorUserName);
userPage.checkUrlForUsername(doctorUserName);
userPage.checkUsernameText(doctorUserName);
userPage.checkUsernameBadgeVisibility(true);
userPage.clearSearchInput();
userPage.verifyListView();
});

afterEach(() => {
cy.saveLocalStorage();
});
Expand Down
274 changes: 248 additions & 26 deletions cypress/e2e/users_spec/UsersManage.cy.ts

Large diffs are not rendered by default.

6 changes: 4 additions & 2 deletions cypress/pageobject/Login/LoginPage.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,11 @@ class LoginPage {
cy.clickSubmitButton("Login");
}

loginManuallyAsNurse(): void {
loginManuallyAsNurse(password?: string): void {
cy.get("input[id='username']").click().type("dummynurse1");
cy.get("input[id='password']").click().type("Coronasafe@123");
cy.get("input[id='password']")
.click()
.type(password || "Coronasafe@123");
cy.clickSubmitButton("Login");
}

Expand Down
Loading
Loading