Skip to content

Fix 'Include organization name' cleared when unchecking 'Include user domain' in application subject settings #10541

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.

Sign up for GitHub

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

Merged
PasinduYeshan merged 2 commits into from
Jul 15, 2026
Merged

Fix 'Include organization name' cleared when unchecking 'Include user domain' in application subject settings #10541

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
68f2289
Persist include organization name independently of include user domai…
PasinduYeshan Jul 15, 2026
4f1b4d6
Add console package to changeset
PasinduYeshan Jul 15, 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
6 changes: 6 additions & 0 deletions .changeset/subject-domain-flags-independent.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@wso2is/admin.applications.v1": patch
Comment thread
PasinduYeshan marked this conversation as resolved.
"@wso2is/console": patch
---

Persist the "Include organization name" and "Include user domain" options independently in the application subject identifier settings, so un-checking one no longer clears the other on save.
22 changes: 18 additions & 4 deletions ...n.applications.v1/components/settings/attribute-management/advance-attribute-settings.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,10 @@ export const AdvanceAttributeSettings: FunctionComponent<AdvanceAttributeSetting
useState<boolean>(initialSubject?.useMappedLocalSubject);
const [ mandateLinkedLocalAccount, setMandateLinkedLocalAccount ] =
useState<boolean>(initialSubject?.mappedLocalSubjectMandatory);
const [ subjectIncludeUserDomain, setSubjectIncludeUserDomain ] =
useState<boolean>(initialSubject?.includeUserDomain);
const [ subjectIncludeTenantDomain, setSubjectIncludeTenantDomain ] =
useState<boolean>(initialSubject?.includeTenantDomain);

useEffect(() => {
if (claimMappingOn && dropDownOptions && dropDownOptions.length > 0) {
Expand Down Expand Up @@ -260,8 +264,8 @@ export const AdvanceAttributeSettings: FunctionComponent<AdvanceAttributeSetting
},
subject: {
claim: getSelectedDropDownValue(dropDownOptions, values.subjectAttribute),
includeTenantDomain: !!values.subjectIncludeTenantDomain,
includeUserDomain: !!values.subjectIncludeUserDomain,
includeTenantDomain: !!subjectIncludeTenantDomain,
includeUserDomain: !!subjectIncludeUserDomain,
mappedLocalSubjectMandatory: mandateLinkedLocalAccount,
useMappedLocalSubject: validateLinkedLocalAccount
}
Expand Down Expand Up @@ -353,6 +357,14 @@ export const AdvanceAttributeSettings: FunctionComponent<AdvanceAttributeSetting
setMandateLinkedLocalAccount(value);
};

const subjectIncludeUserDomainChangeHandler = (value: boolean) => {
setSubjectIncludeUserDomain(value);
};

const subjectIncludeTenantDomainChangeHandler = (value: boolean) => {
setSubjectIncludeTenantDomain(value);
};

/**
* To revert the selected subject identifier value to the default value when the checkbox is unchecked.
*/
Expand Down Expand Up @@ -543,13 +555,14 @@ export const AdvanceAttributeSettings: FunctionComponent<AdvanceAttributeSetting
>
<Grid.Column mobile={ 16 } tablet={ 16 } computer={ 16 }>
<Field.CheckboxLegacy
listen={ subjectIncludeUserDomainChangeHandler }
ariaLabel="Subject include user domain"
name="subjectIncludeUserDomain"
label={ t("applications:forms.advancedAttributeSettings." +
"sections.subject.fields.subjectIncludeUserDomain.label") }
required={ false }
value={
initialSubject?.includeUserDomain ? [ "includeUserDomain" ] : [] }
subjectIncludeUserDomain ? [ "includeUserDomain" ] : [] }
readOnly={ readOnly }
data-testid={ `${ componentId }-subject-iInclude-user-domain-checkbox` }
hint={
Expand All @@ -570,6 +583,7 @@ export const AdvanceAttributeSettings: FunctionComponent<AdvanceAttributeSetting
>
<Grid.Column mobile={ 16 } tablet={ 16 } computer={ 16 }>
<Field.CheckboxLegacy
listen={ subjectIncludeTenantDomainChangeHandler }
ariaLabel="Subject include tenant domain"
name="subjectIncludeTenantDomain"
label={
Expand All @@ -578,7 +592,7 @@ export const AdvanceAttributeSettings: FunctionComponent<AdvanceAttributeSetting
}
required={ false }
value={
initialSubject?.includeTenantDomain
subjectIncludeTenantDomain
? [ "includeTenantDomain" ]
: []
}
Expand Down
Loading