Skip to content

Feature/2025/03/06 improve dcql complex query UI#433

Open
acrusage-iaik wants to merge 9 commits intodevelopmentfrom
feature/2025/03/06-improve-dcql-complex-query-ui
Open

Feature/2025/03/06 improve dcql complex query UI#433
acrusage-iaik wants to merge 9 commits intodevelopmentfrom
feature/2025/03/06-improve-dcql-complex-query-ui

Conversation

@acrusage-iaik
Copy link
Collaborator

@acrusage-iaik acrusage-iaik commented Mar 12, 2026

Change: Improve UI flow
Add: Going back and forth retains selected credentials
Add: Show request summary in initial screen
Add: Show credential query details when selecting credentials
Add: Show error messages for non-matching credentials

Add: Going back and forth retains selected credentials
Add: Show request summary in initial screen
Add: Show credential query details when selecting credentials
@chatgpt-codex-connector
Copy link

Codex usage limits have been reached for code reviews. Please check with the admins of this repo to increase the limits by adding credits.
Credits must be used to enable repository wide code reviews.

@acrusage-iaik acrusage-iaik requested a review from nodh March 12, 2026 20:01
@acrusage-iaik
Copy link
Collaborator Author

Screenshot 2026-03-12 at 21 45 36 Screenshot 2026-03-12 at 21 45 42 Screenshot 2026-03-12 at 21 45 49 Screenshot 2026-03-12 at 21 45 57 Screenshot 2026-03-12 at 21 45 59

@nodh
Copy link
Member

nodh commented Mar 13, 2026

@codex review

Copy link

@chatgpt-codex-connector chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: c2eb1cf98b

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

Comment on lines 170 to 174
!it.required && it.options.all {
it.any {
selectedSubmissionIndices[it]?.isNotEmpty() != true
confirmedSubmissionIndices[it]?.isNotEmpty() != true
}
} && index.toUInt() !in selectedCredentialSetQueryOptionIndices.keys

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P1 Badge Keep optional selections in the confirmed query set

This branch now mixes confirmedSubmissionIndices with selectedCredentialSetQueryOptionIndices, so after a user picks an optional option (unconfirmed) the optional chooser disappears, but its credential queries are still excluded from requestedCredentialQueries (which is based on confirmed options). In a DCQL request with optional credential sets, that can skip the credential-selection step and submit without the optional data the user just chose.

Useful? React with 👍 / 👎.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is intended, as long as the submission isn't confirmed with "Confirm", it should be excluded from requestedCredentialQueries. This allows going back to the previous selection while preserving the selected items

Comment on lines +200 to +202
onContinue = onContinueWithSelection.takeIf {
selectedOptionIndex != null
},

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P1 Badge Enable continue when user picks no optional dataset

The optional page encodes the "no optional dataset" choice as null, but continue is gated by selectedOptionIndex != null, so choosing "none" leaves the continue action disabled indefinitely. This traps users on the optional-step screen unless they select a real option, which changes the consent outcome.

Useful? React with 👍 / 👎.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is intended, for optional credential sets there is always the option to choose to send no data.

Copy link
Member

@nodh nodh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice! does this also work for DCAPI requests coming in?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why are those files needed?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These queries can be used for manual testing, moved to commonTest to make this clear

}

is CredentialPresentationRequest.PresentationExchangeRequest -> {
// TODO?
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So there is no preview of requested attributes when using presentation exchange, e.g. on proximity calls?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed

onToggleSelection = onToggleSelection,
option = option,
)
// selectableCredentialSubmissionCards = matchingResult.value.matchingResult.credentialQueryMatches.mapValues {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can be removed probably?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

@chatgpt-codex-connector
Copy link

Codex usage limits have been reached for code reviews. Please check with the admins of this repo to increase the limits by adding credits.
Credits must be used to enable repository wide code reviews.

@chatgpt-codex-connector
Copy link

Codex usage limits have been reached for code reviews. Please check with the admins of this repo to increase the limits by adding credits.
Credits must be used to enable repository wide code reviews.

@acrusage-iaik
Copy link
Collaborator Author

acrusage-iaik commented Mar 13, 2026

Nice! does this also work for DCAPI requests coming in?

Yes, this also works with DCAPI, but it seems like DCAPI only allows selection of 1 credential anyway, and non-selected credentials aren't even shown in that case

Also changed it so that unsuitable credentials are not selectable and their card is shown with disabled colors. This is reasonable since there is no matching result anyway, so we couldn't even submit them if we wanted to.
Also added credential ordering, so that credentials are shown in order (valid&timely, valid&untimely, invalid).

Screenshot 2026-03-13 at 19 38 03

@chatgpt-codex-connector
Copy link

Codex usage limits have been reached for code reviews. Please check with the admins of this repo to increase the limits by adding credits.
Credits must be used to enable repository wide code reviews.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants