Skip to content
Merged
Show file tree
Hide file tree
Changes from 57 commits
Commits
Show all changes
64 commits
Select commit Hold shift + click to select a range
d927644
Add user management feature for system administrators
alexbottenberg Feb 3, 2026
665fb9a
Add comprehensive E2E tests for user management feature
alexbottenberg Feb 4, 2026
79779dd
Refine user management filter section styling
alexbottenberg Feb 4, 2026
3ea6188
Fix test import paths and expectations for dynamic routes
alexbottenberg Feb 4, 2026
a0bdf6f
Reorganize filter routes under find-users directory
alexbottenberg Feb 4, 2026
b5db19b
Add comprehensive test coverage for find-users page
alexbottenberg Feb 4, 2026
6ecf23e
Fix E2E test expectations for User Management tile
alexbottenberg Feb 4, 2026
8f6af16
Fix test assertion for database error handling
alexbottenberg Feb 4, 2026
91ddb19
Remove CSS class assertion from E2E test
alexbottenberg Feb 4, 2026
10bb67e
Remove grid layout test from E2E tests
alexbottenberg Feb 4, 2026
788bb3a
Consolidate E2E tests into single journey test
alexbottenberg Feb 4, 2026
3e86629
Remove responsive design tests from E2E suite
alexbottenberg Feb 4, 2026
578e5c0
Use getByRole() selectors in E2E tests
alexbottenberg Feb 4, 2026
b2574f9
Add type safety to delete-user-confirm test
alexbottenberg Feb 4, 2026
9c6ebb0
Fix no-results error check for active filters
alexbottenberg Feb 4, 2026
cae96b4
Use localized labels for role and provenance in table
alexbottenberg Feb 4, 2026
71ab2a6
Update tests for localized role and provenance labels
alexbottenberg Feb 4, 2026
39ed17a
Refactor pagination to match GOV.UK component specification
alexbottenberg Feb 4, 2026
bba1196
Add test users to seed script for pagination testing
alexbottenberg Feb 4, 2026
8ad955f
Fix Nunjucks template syntax error
alexbottenberg Feb 4, 2026
146dc91
Fix cascade deletion for NotificationAuditLog when deleting users
alexbottenberg Feb 4, 2026
e964266
Fix User ID validation to accept UUID format
alexbottenberg Feb 4, 2026
1062923
Fix Prisma select field on Subscription model
alexbottenberg Feb 4, 2026
fe1a005
Remove unused EMAIL_REGEX to fix SonarQube security hotspot
alexbottenberg Feb 4, 2026
fd927e6
Reset page to 1 after removing filter
alexbottenberg Feb 4, 2026
7805846
Fix XSS vulnerability in filter tag labels
alexbottenberg Feb 4, 2026
8facc61
Add error handling for searchUsers in POST validation path
alexbottenberg Feb 4, 2026
e03a3b9
Defer SSO env var validation until redirect detected
alexbottenberg Feb 4, 2026
3bf384c
Track actual user insertions in seed script
alexbottenberg Feb 4, 2026
688ffe1
Fix linting issues
alexbottenberg Feb 4, 2026
73c44bd
Use UUID instead of timestamp for E2E test emails
alexbottenberg Feb 11, 2026
c402091
Fix duplicate back button on user management page
alexbottenberg Feb 19, 2026
35c00c3
Fix User Provenance ID validation to allow hyphens and other valid ch…
alexbottenberg Feb 19, 2026
9fdcd99
Update manage user page: Change 'Last sign in' to 'Last verified' and…
alexbottenberg Feb 19, 2026
e57acca
Fix system admin dashboard test: Update User Management href to /find…
alexbottenberg Feb 19, 2026
43e9899
Update user provenance from B2C to B2C_IDAM and fix filter tag overflow
alexbottenberg Feb 26, 2026
211ffd6
Update manage user page labels from 'verified' to 'sign in'
alexbottenberg Mar 10, 2026
80309fa
Fix Prisma import and add index names migration
abottenberg Apr 23, 2026
f16ddce
Merge master and refactor E2E test data management
ashwini-mv Apr 29, 2026
4d4e57e
fix manage user header
alao-daniel May 1, 2026
7ef5d57
fix filter tag text colour on hover
abottenberg May 7, 2026
1607f7f
set audit metadata before deleting user and fix confirmation page layout
abottenberg May 7, 2026
35408a1
fix test assertion to include action field in auditMetadata check
abottenberg May 7, 2026
4db32fc
replace hardcoded audit action strings with AuditLogAction enum
abottenberg May 7, 2026
3349ec0
update upload summary tests to use processPublication and AuditLogAct…
abottenberg May 8, 2026
c2805a9
Merge remote-tracking branch 'origin/master' into feature/310-user-ma…
abottenberg May 8, 2026
e28f41b
fix manage list types href in system admin dashboard e2e test
abottenberg May 8, 2026
3d1e90d
fix test reporter not finding junit results by switching to filesyste…
abottenberg May 8, 2026
34cad75
fix Azure SDK credentials not available to DefaultAzureCredential in …
abottenberg May 8, 2026
f8f42b5
fix Azure SDK credentials export using env var and jq fallback field …
abottenberg May 11, 2026
5a59274
fix E2E pipeline by fetching Key Vault secrets via az CLI before test…
abottenberg May 11, 2026
1daedd0
Merge master into feature/310-user-management-implementation
abottenberg May 26, 2026
02cb80d
Merge remote-tracking branch 'origin/master' into feature/310-user-ma…
abottenberg May 27, 2026
f8d6aef
fix: restore Helm deployment timeout increase to 15 minutes
abottenberg May 27, 2026
a829abc
fix: resolve postgresql databases coalesce type mismatch
abottenberg May 27, 2026
cc31b04
feat: treat PI_AAD as B2C in find-users page
abottenberg May 28, 2026
e7b46f7
revert: restore postgresql setup.databases to list format matching ma…
abottenberg May 28, 2026
cc30037
fix: remove test user seeding and add missing type field to artefacts
abottenberg May 29, 2026
f548af9
fix: resolve vite build failure causing missing filter border styles
alexbottenberg Jun 2, 2026
94279f3
Merge branch 'master' into feature/310-user-management-implementation
junaidiqbalmoj Jun 4, 2026
489b58d
Merge branch 'master' into feature/310-user-management-implementation
junaidiqbalmoj Jun 5, 2026
eb25173
Merge branch 'master' into feature/310-user-management-implementation
junaidiqbalmoj Jun 5, 2026
fd5c602
Merge branch 'master' into feature/310-user-management-implementation
junaidiqbalmoj Jun 5, 2026
ba43f67
skip admin test
junaidiqbalmoj Jun 5, 2026
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
1 change: 1 addition & 0 deletions .github/workflows/job.e2e-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@ jobs:
path: e2e-tests/junit-results.xml
reporter: java-junit
fail-on-error: false
search-files: filesystem

# Upload artifacts on failure for debugging
- name: Upload Playwright test results
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/job.helm-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@ jobs:
oci-registry: ${{ env.REGISTRY }}
oci-username: ${{ secrets.REGISTRY_USERNAME }}
oci-password: ${{ secrets.REGISTRY_PASSWORD }}
timeout: 15m0s

- name: Deploy to STG
if: inputs.environment == 'stg'
Expand All @@ -123,6 +124,7 @@ jobs:
oci-registry: ${{ env.REGISTRY }}
oci-username: ${{ secrets.REGISTRY_USERNAME }}
oci-password: ${{ secrets.REGISTRY_PASSWORD }}
timeout: 15m0s

- name: Register DNS for STG
if: inputs.environment == 'stg'
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
-- CreateIndex
CREATE INDEX "user_email_idx" ON "user"("email");

-- CreateIndex
CREATE INDEX "user_role_idx" ON "user"("role");

-- CreateIndex
CREATE INDEX "user_user_provenance_idx" ON "user"("user_provenance");
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
-- RenameIndex
ALTER INDEX IF EXISTS "idx_artefact_type" RENAME TO "artefact_type_idx";
45 changes: 44 additions & 1 deletion apps/postgres/prisma/seed.ts
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,50 @@
}
}

console.log("Seed completed successfully!");
// Create test users for pagination testing
const testUsers = [];
const roles = ["VERIFIED", "INTERNAL_ADMIN_CTSC", "INTERNAL_ADMIN_LOCAL", "SYSTEM_ADMIN"];
const provenances = ["CFT_IDAM", "SSO", "B2C_IDAM", "CRIME_IDAM"];

// Create 50 test users to test pagination (25 per page = 2 pages)
// Using fixed UUIDs with pattern: 10000000-0000-0000-0000-000000000001 to 10000000-0000-0000-0000-000000000050
for (let i = 1; i <= 50; i++) {
const role = roles[i % roles.length];
const provenance = provenances[i % provenances.length];
const paddedNumber = i.toString().padStart(12, "0");

testUsers.push({
userId: `10000000-0000-0000-0000-${paddedNumber}`,
email: `test.user.${i}@example.com`,
firstName: `Test${i}`,
surname: `User`,
userProvenance: provenance,
userProvenanceId: `prov-${i.toString().padStart(3, "0")}`,
role: role,
createdDate: new Date(Date.now() - i * 24 * 60 * 60 * 1000), // Stagger creation dates
lastSignedInDate: i % 3 === 0 ? null : new Date(Date.now() - i * 60 * 60 * 1000) // Some never signed in
});
}

let createdCount = 0;
let skippedCount = 0;

for (const user of testUsers) {
const existing = await prisma.user.findUnique({
where: { userId: user.userId }
});

if (!existing) {

Check warning on line 99 in apps/postgres/prisma/seed.ts

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Unexpected negated condition.

See more on https://sonarcloud.io/project/issues?id=hmcts.cath&issues=AZ5pNMlbtZSF80BMiC07&open=AZ5pNMlbtZSF80BMiC07&pullRequest=335
await prisma.user.create({ data: user });
console.log(`Created test user: ${user.email}`);
createdCount++;
} else {
console.log(`User ${user.email} already exists`);
skippedCount++;
}
}

console.log(`Seed completed successfully! Created ${createdCount} test users, skipped ${skippedCount} existing users.`);
}

main()
Expand Down
1 change: 1 addition & 0 deletions apps/web/src/assets/css/index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
@use "@hmcts/web-core/src/assets/css/button-as-link.scss";
@use "@hmcts/admin-pages/src/assets/css/index.scss" as admin;
@use "@hmcts/system-admin-pages/src/assets/css/dashboard.scss";
@use "@hmcts/system-admin-pages/src/assets/css/user-management.scss";
@use "@hmcts/verified-pages/src/assets/css/verified-pages.scss" as verified;
@use "@hmcts/auth/src/assets/css/session-timeout.scss";
@use "@hmcts/sjp-press-list/src/assets/css/sjp-filters.scss";
Expand Down
Loading
Loading