feat: Adds support for filtering and sorting by loginUsername with us… by ustraria · Pull Request #51 · aws/dcv-access-console

ustraria · 2026-01-14T18:53:01Z

…erId fallback

Issue #, if available:

Description of changes:
Added support for filtering and sorting users by loginUsername with fallback to userId when loginUsername is null

Backend changes:
Core filtering and sorting logic:

Updated Filter.java to implement proper fallback: check loginUsername first, if null check userId
Updated Sort.java to sort by loginUsername when sorting by user Id column, falling back to userId when loginUsername is null

Session template filtering:

Added backend logic to resolve loginUsername to userId specifically for session template filtering operations - when filtering session templates by loginUsername (CreatedBy, LastModifiedBy, UsersSharedWith), the backend now looks up the corresponding userId(s) to perform the actual filter
Updated API model: Added new filter fields CreatedByLoginUsername, LastModifiedByLoginUsername, and UsersSharedWithLoginUsername to DescribeSessionTemplatesRequestData for loginUsername-based filtering

API model updates:

Updated API model: Renamed filter parameters in DescribeUsersRequestData for clarity - UserIds for internal userIds, LoginUsernames for loginUsernames
Added usingExternalAuth flag to DescribeUserInfoResponse - set to true when external authentication is configured (checks for presence of loginUsernameKey, displayNameKey, roleKey, or defaultGroupsKey configuration)

Frontend changes:
Session template filtering and display:

Updated SessionTemplatesTable to display loginUsername instead of userId for CreatedBy and LastModifiedBy columns
Updated useSessionTemplatesService to fetch only users from current page templates (CreatedBy/LastModifiedBy) instead of all users, building a userId→loginUsername map for table display and filter dropdowns
Added propertyValueToLabelMaps to FilterBar for displaying loginUsername in filter dropdowns and token chips (used for CreatedBy, LastModifiedBy, and UsersSharedWith filters)
Added usingExternalAuth to session and used it to conditionally enable loginUsername-based filtering - when usingExternalAuth is true, user filter keys (CreatedBy, LastModifiedBy, UsersSharedWith) are mapped to their loginUsername equivalents before sending to backend
Display loginUsername for CreatedBy/LastModifiedBy in session template details page and split panel
Display loginUsername instead of userId in create/edit wizard review step for assigned users

Other

Updated SearchUtils to use loginUsername with userId fallback for Users table filter autocomplete
Updated user search in AssignUsersGroups.tsx and EditUserGroupForm.tsx to use LoginUsernames filter instead of UserIds
Updated filter-users-bar-constants.ts to map LoginUsernames instead of UserIds
Fixed pagination reset on sort column change in TableWithPagination
Changed default user sort order from DESC to ASC in user selection

Why is this change necessary:
Users are more easily identified by their loginUsername than by userId. Previously, the UI displayed loginUsername in tables, but filtering and sorting still operated on userId, creating a mismatch between what users see and what they can filter/sort by. This change aligns the filtering and sorting behavior with the displayed values, improving usability while maintaining backward compatibility with users who only have userId populated.
How was this change tested:

Updated or added new unit tests.
Updated or added new integration tests.

Manual Test Cases - Filter and sorting changes
Users Table
Users Table - Filter by User ID (shows loginUsername)

Action: Click filter dropdown, select "User ID="
Result: Filter input appears populated with users

Action: Type a loginUsername value (e.g., "ustraria") and select
Result: Users with matching loginUsername shown

Action: Also checked "User Id !=", "User Id:" and "User Id!:" filters
Result: Filters working and showing correct list of users

Users Table - Sort User ID column

Action: Click Users table
Result: Default sort is on User ID column in ascending order

Action: Click "User ID" column header to sort DESC
Result: Users sorted Z->A

Session Templates Table

Action: Show "Created by" and "Last modified" by columns
Result: These columns display the loginUsername instead of userId

Session Templates Table - Details panel

Action: Select a template
Result: Created by" and "Last modified" show loginUsername instead of userId

Session Templates Table - Filter by Created By

Action: Click filter dropdown, select "Created By"
Result: Dropdown shows loginUsername for users from the current page's templates (CreatedBy/LastModifiedBy columns), not all users in the system

Action: Type a loginUsername value (e.g., "ustraria") and select
Result: Templates created by ustraria shown

Action: Also checked "User Id !=", "User Id:" and "User Id!:" filters
Result: Filters working and showing correct list of users

Session Templates Table - Filter by Last Modified By

Action: Click filter dropdown, select "Last Modified By"
Result: Dropdown shows loginUsername for users

Action: Type a loginUsername value (e.g., "admin2@amazon.com") and select
Result: Templates last modified by admin2@amazon.com shown

Action: Also checked "User Id !=", "User Id:" and "User Id!:" filters
Result: Filters working and showing correct list of users

Session Templates Table - Filter by Users Shared With

Action: Type a loginUsername value (e.g., "testuser@company.com") and select
Result: Templates shared with testuser@company.com shown

Action: Also checked "User Id !=" filter
Result: Filters working and showing correct list of users

Create template and assign user

Action: Create a new template and assign users during creation
Result: Displays login usernames instead of user ids on the review page

Assign Session Templates to Users

Action: Session Template → select a template → Assign users and groups and type in "Add users" search box
Result: Users filtered, shows loginUsername as label

Add Users to User Group

Action: User Groups → select a group → Edit and type in "Add users" search box
Result: Users filtered, shows loginUsername as label

Remove Users from User Group

Action: User Groups → select a group → Edit and filter by user Id
Result: Users filtered

User with no loginUsername

User no_login_name does not have a loginUsername and checked that it was sorted correctly and filterable

Empty filter results

Action: Filter by non-existent loginUsername, "user500"
Resuls: Shows "No users available"

Multiple filters combined

Action: Applied multiple filters on Session Templates (CreatedBy + Name)
Result: Expected templates filtered

Also tested filtering and sorting for internal auth setup

Any additional information or context required to review the change:

Documentation Checklist:

Updated the README if applicable.
Updated the THIRD-PARTY-LICENSES file if applicable.

Compatibility Checklist:

I confirm that the change is backwards compatible.
There is no modification of dependencies or if there is, a corresponding update to THIRD-PARTY-LICENSES is part of the commit.

By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.

github-actions · 2026-01-14T19:00:28Z

Coverage Report

Component	Lines	Branches
dcv-access-console-handler	90.29%	80.03%
dcv-access-console-web-client	19.62%	9.24%
dcv-access-console-auth-server	58.39%	22.22%
dcv-access-console-configuration-wizard	6.27%	0.14%

mitshiv1905 · 2026-01-15T21:36:52Z

dcv-access-console-handler/src/main/java/handler/utils/Filter.java

+                for (String prop : property) {
+                    Object value = PropertyAccessorFactory.forBeanPropertyAccess(obj).getPropertyValue(prop);
+                    if (value == null) continue;
+                    if (isNegation) return filter(value, filter);


Is this for the case when loginUsername value does not match but userId does i.e. to support filtering on userId even when loginUsername exists? The customer only sees the loginUsername on the web client if it is present, so we shouldn't need to care.

This code is not correct. userId should only be checked if loginUsername is null. I've updated this part in revision.

mitshiv1905 · 2026-01-15T21:49:02Z

dcv-access-console-handler/src/main/java/handler/utils/Sort.java

+            Object propertyValue1;
+            Object propertyValue2;
+
+            if ("userId".equalsIgnoreCase(sortToken.getKey())) {


Why ignoreCase?

Ok yeah we don't need that we can just match it as it expects as "UserId"

mitshiv1905 · 2026-01-15T21:49:25Z

dcv-access-console-handler/src/main/java/handler/utils/Sort.java

+            Object propertyValue1;
+            Object propertyValue2;
+
+            if ("userId".equalsIgnoreCase(sortToken.getKey())) {


Let's declare the string constants at the top of the class

mitshiv1905 · 2026-01-15T22:50:10Z

...nt/server/src/components/session-templates/session-templates-table/SessionTemplatesTable.tsx

+    useEffect(() => {
+        const fetchAllUsers = async () => {
+            try {
+                const response = await dataAccessService.describeUsers({} as DescribeUsersRequestData)


We're retrieving all users? There are two issues with this:

We don't need all users, we need mapping only for the CreatedBy and LastModified userIds on the current page of SessionTemplates table

We need to paginate through the response to get all the values

We can add this method here

In fact, we can call the method as part of the useSessionTemplatesService here instead of using a useEffect

I was getting all users because UsersSharedWith could possibly be any user.
If we only get the users on the current page, the filter would not be right? For example, if all the templates created by user1 are on page 1 and templates by user3 are on page 2 and I want to filter templates created by user3. If only users are fetched that are on the corresponding page we would not be able to filter by user3?

Maybe we could get all users corresponding to CreatedBy, LastModified, and UsersSharedWith and then create the userId -> loginUsername map with just this subset of users instead of all.

Ok, updated to fetch only users from the current page's CreatedBy/LastModifiedBy fields instead of all users. This builds a map of userId→loginUsername for:

Displaying loginUsername in table columns (instead of userId)

Populating the filter dropdown with relevant users

Showing loginUsername in filter chips (instead of userId)

mitshiv1905 · 2026-01-15T23:13:10Z

dcv-access-console-web-client/server/src/components/common/filter-bar/FilterBar.tsx

    }

    const fetchFilteringOptions = async (filteringText: string, filteringProperty: string) => {
+        const labelMap = props.propertyValueToLabelMaps?.get(filteringProperty)


Wow what's going on here? Could you please help me understand?

propertyValueToLabelMaps is passed to FilterBar as a prop from SessionTemplatesTable. This map maps the 3 filtering properties CreatedBy, LastModifiedBy and UsersSharedWith to userIdToLoginUsernameMap which maps userIds to loginUsernames for all the users. This map is created when fetching all users.

So when CreatedBy, LastModifiedBy or UsersSharedWith is selected as the filtering property the map is retrieved and the loop takes the users in the map and makes them dropdown options where value is the userId which is sent to the backend when selected and label is the loginUsername shown in the dropdown.

…erId fallback

github-actions · 2026-01-16T17:13:13Z

Coverage Report

Component	Lines	Branches
dcv-access-console-handler	90.28%	79.85%
dcv-access-console-web-client	19.8%	9.37%
dcv-access-console-auth-server	58.39%	22.22%
dcv-access-console-configuration-wizard	6.27%	0.14%

github-actions · 2026-01-20T07:37:04Z

Coverage Report

Component	Lines	Branches
dcv-access-console-handler	90.28%	79.85%
dcv-access-console-web-client	19.8%	9.37%
dcv-access-console-auth-server	58.39%	22.22%
dcv-access-console-configuration-wizard	6.26%	0.14%

…lates

github-actions · 2026-01-20T15:42:31Z

Coverage Report

Component	Lines	Branches
dcv-access-console-handler	90.28%	79.85%
dcv-access-console-web-client	19.7%	9.26%
dcv-access-console-auth-server	58.39%	22.22%
dcv-access-console-configuration-wizard	6.26%	0.14%

mitshiv1905 · 2026-01-20T19:28:49Z

dcv-access-console-model/model/dcv-access-console-handler-api.yaml

@@ -2029,7 +2029,12 @@ components:
      description: "The entity that represents the data that the user passes for describing the users"
      properties:
        UserIds:


Should we simplify the filter names? UserIds for internal userIds, LoginUsernames for loginUsernames

…UserIds to LoginUsernames

github-actions · 2026-01-21T18:22:13Z

Coverage Report

Component	Lines	Branches
dcv-access-console-handler	89.62%	78.65%
dcv-access-console-web-client	19.77%	9.32%
dcv-access-console-auth-server	58.39%	22.22%
dcv-access-console-configuration-wizard	6.26%	0.14%

github-actions · 2026-01-21T18:35:31Z

Coverage Report

Component	Lines	Branches
dcv-access-console-handler	89.62%	78.65%
dcv-access-console-web-client	19.77%	9.32%
dcv-access-console-auth-server	58.39%	22.22%
dcv-access-console-configuration-wizard	6.26%	0.14%

mitshiv1905 · 2026-01-22T18:28:38Z

dcv-access-console-web-client/server/src/components/common/utils/DataAccessService.ts

        return (await this.getUsersApi()).describeUsers(describeUsersRequest)
    }

+    public async describeUsersByIds(userIds: string[]): Promise<Map<string, string>> {


nit: name the method more appropriately? This returns the map for provided userIds right?

mitshiv1905 · 2026-01-22T18:31:39Z

...lient/server/src/components/session-templates/create-wizard/SessionTemplatesCreateWizard.tsx

                        sessionTemplateId={existingSessionTemplateId!}
                        handleUsersChange={(users: [OptionDefinition]) => {
                            let userIds: [string] = []
+                            let labels: string[] = []


Do we still need userIds[]?

mitshiv1905 · 2026-01-22T18:33:37Z

...erver/src/components/session-templates/session-template-overview/SessionTemplateOverview.tsx

 import {SESSION_TEMPLATES_TABLE_CONSTANTS} from "@/constants/session-templates-table-constants";

-export default function SessionTemplateOverview({sessionTemplate}: { sessionTemplate: SessionTemplate | undefined }) {
+type Props = {


nit: More appropriate naming, follow the pattern for other components and their props

mitshiv1905 · 2026-01-22T18:38:07Z

...erver/src/components/session-templates/session-template-overview/SessionTemplateOverview.tsx

-export default function SessionTemplateOverview({sessionTemplate}: { sessionTemplate: SessionTemplate | undefined }) {
+type Props = {
+    sessionTemplate: SessionTemplate | undefined
+    userDisplayNames?: Map<string, string>


nit: These are loginUsernames right?

mitshiv1905

As discussed offline, let's try to ensure that the number of describeUsers() calls are minimized for SessionTemplate display purposes

mitshiv1905 · 2026-01-22T21:16:28Z

...ss-console-handler/src/main/java/handler/controllers/DescribeSessionTemplatesController.java

+
+            DescribeUsersRequestData userRequest = new DescribeUsersRequestData();
+            userRequest.setLoginUsernames(List.of(new FilterToken().operator(lookupOp).value(filter.getValue())));
+            List<User> users = userService.describeUsers(userRequest).getUsers();


A describeUsers() call per filter is too expensive. Can we group the calls by EQUAL, CONTAINS, NOT_CONTAINS? That way we will only need 3 calls at most.

github-actions · 2026-01-23T00:04:00Z

Coverage Report

Component	Lines	Branches
dcv-access-console-handler	89.64%	78.58%
dcv-access-console-web-client	19.8%	9.35%
dcv-access-console-auth-server	58.39%	22.22%
dcv-access-console-configuration-wizard	6.26%	0.14%

github-actions · 2026-01-23T00:27:48Z

Coverage Report

Component	Lines	Branches
dcv-access-console-handler	90.40%	79.79%
dcv-access-console-web-client	19.8%	9.35%
dcv-access-console-auth-server	58.39%	22.22%
dcv-access-console-configuration-wizard	6.26%	0.14%

mitshiv1905

In the interest of time, decided to leave the filtering code in DescribeSessionTemplatesController which should ideally be in a separate component or the SessionTemplatesService.

ustraria marked this pull request as ready for review January 14, 2026 19:04

ustraria requested review from akashgosi, mitshiv1905 and mukesh-gov January 14, 2026 19:04

mitshiv1905 reviewed Jan 15, 2026

View reviewed changes

feat: Adds support for filtering and sorting by loginUsername with us…

1b51244

…erId fallback

ustraria force-pushed the wip/ustraria/loginusername-filter-sort branch from a758a16 to 1b51244 Compare January 16, 2026 17:05

refactor: DataAccessServiceHooks

e14e3c0

ustraria force-pushed the wip/ustraria/loginusername-filter-sort branch from f2ec97c to e14e3c0 Compare January 20, 2026 07:29

fix: Additional userId to loginUsername display fixes in session temp…

d3080dd

…lates

mitshiv1905 reviewed Jan 20, 2026

View reviewed changes

refactor: Move loginUsername filter resolution to backend and rename …

7096b85

…UserIds to LoginUsernames

fix: Remove debug log and fix User Id casing

12018b5

ustraria requested a review from mitshiv1905 January 21, 2026 19:03

mitshiv1905 reviewed Jan 22, 2026

View reviewed changes

refactor: address multiple calls on handler and refactors display

b0c5a42

test: Updates unit tests for DescribeSEssionTemplatesController

db8513c

mitshiv1905 approved these changes Jan 23, 2026

View reviewed changes

ustraria merged commit 2d90b97 into main Jan 23, 2026
3 checks passed

ustraria deleted the wip/ustraria/loginusername-filter-sort branch January 27, 2026 00:53

Conversation

ustraria commented Jan 14, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions bot commented Jan 14, 2026

Coverage Report

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

mitshiv1905 Jan 15, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

github-actions bot commented Jan 16, 2026

Coverage Report

Uh oh!

github-actions bot commented Jan 20, 2026

Coverage Report

Uh oh!

github-actions bot commented Jan 20, 2026

Coverage Report

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

github-actions bot commented Jan 21, 2026

Coverage Report

Uh oh!

github-actions bot commented Jan 21, 2026

Coverage Report

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

mitshiv1905 left a comment

Choose a reason for hiding this comment

Uh oh!

mitshiv1905 Jan 22, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

github-actions bot commented Jan 23, 2026

Coverage Report

Uh oh!

github-actions bot commented Jan 23, 2026

Coverage Report

Uh oh!

mitshiv1905 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

ustraria commented Jan 14, 2026 •

edited

Loading

mitshiv1905 Jan 15, 2026 •

edited

Loading

mitshiv1905 Jan 22, 2026 •

edited

Loading