Skip to content

fix: add domain to teams or entities on actors #3233

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

Open
ab-smith wants to merge 17 commits into
base: main
Choose a base branch
from
+49 −5
Open

fix: add domain to teams or entities on actors #3233

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
5d5e421
fix(actors): visibility rules
nas-tabchiche Jan 20, 2026
3cf50a1
add exclude_third_parties filter
nas-tabchiche Jan 20, 2026
ff16fce
update forms with actors
nas-tabchiche Jan 20, 2026
1a1553a
fix exclude_third_parties filter
nas-tabchiche Jan 20, 2026
2f64e8d
Merge branch 'main' into fix/actor-visibility
ab-smith Jan 20, 2026
f5e55b0
revert core.models changes
nas-tabchiche Jan 20, 2026
6166ebb
remove unused imports
nas-tabchiche Jan 20, 2026
4f7fd72
remove folder property
nas-tabchiche Jan 20, 2026
fb16862
remove actor.folder from serializer
nas-tabchiche Jan 20, 2026
19a09e0
filter out third parties by default
nas-tabchiche Jan 20, 2026
371f200
fix: add domain to actors to avoid confusion
ab-smith Jan 20, 2026
6b7456b
Merge branch 'main' into domains_on_actors_autocomplete
ab-smith Jan 20, 2026
0486b2c
generalize the pattern
ab-smith Jan 20, 2026
51c60b8
missing folders on entities
ab-smith Jan 20, 2026
b9c4c1d
fixup
ab-smith Jan 20, 2026
6c19923
fixup
ab-smith Jan 20, 2026
6976c1a
workaround for the conflict with get_scope
ab-smith Jan 20, 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
5 changes: 5 additions & 0 deletions backend/core/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7837,6 +7837,11 @@ def specific(self):
return self.entity
raise ValueError("Actor has no underlying instance")

@property
def _folder(self):
"""Returns the folder of the underlying instance."""
return self.specific.folder

def get_emails(self) -> list[str]:
return self.specific.get_emails()

Expand Down
7 changes: 6 additions & 1 deletion backend/core/serializers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1208,11 +1208,16 @@ class Meta:

class ActorReadSerializer(BaseModelSerializer):
specific = FieldsRelatedField()
folder = serializers.SerializerMethodField()
str = serializers.CharField(source="__str__")

class Meta:
model = Actor
fields = ["id", "str", "type", "specific"]
fields = ["id", "str", "type", "specific", "folder"]

def get_folder(self, obj):
folder = obj._folder
return {"id": folder.id, "str": str(folder)} if folder else None


class TeamWriteSerializer(BaseModelSerializer):
Expand Down
13 changes: 9 additions & 4 deletions frontend/src/lib/components/Forms/AutocompleteSelect.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,10 +223,15 @@
? append(object.ref_id, object.name || object.description)
: getNestedValue(object, optionsLabelField);
const extraParts = optionsExtraFields.map((fieldPath) => {
const value = getNestedValue(object, fieldPath[0], fieldPath[1]);
return value !== undefined ? value.toString() : '';
});
const extraParts =
object.type === 'user'
? []
: optionsExtraFields
.map((fieldPath) => {
const value = getNestedValue(object, fieldPath[0], fieldPath[1]);
return value !== undefined ? value.toString() : '';
})
.filter(Boolean);
Comment on lines +226 to +234
Copy link
Contributor

@coderabbitai coderabbitai bot Jan 20, 2026

Choose a reason for hiding this comment

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

⚠️ Potential issue | 🟡 Minor

Potential runtime error when nested value is null.

The condition value !== undefined passes when value is null, causing null.toString() to throw a TypeError. Consider using a nullish check instead.

🐛 Proposed fix 
 const extraParts =
   object.type === 'user'
     ? []
     : optionsExtraFields
         .map((fieldPath) => {
           const value = getNestedValue(object, fieldPath[0], fieldPath[1]);
-          return value !== undefined ? value.toString() : '';
+          return value != null ? value.toString() : '';
         })
         .filter(Boolean);
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
const extraParts =
object.type === 'user'
? []
: optionsExtraFields
.map((fieldPath) => {
const value = getNestedValue(object, fieldPath[0], fieldPath[1]);
return value !== undefined ? value.toString() : '';
})
.filter(Boolean);
const extraParts =
object.type === 'user'
? []
: optionsExtraFields
.map((fieldPath) => {
const value = getNestedValue(object, fieldPath[0], fieldPath[1]);
return value != null ? value.toString() : '';
})
.filter(Boolean);
🤖 Prompt for AI Agents 
In `@frontend/src/lib/components/Forms/AutocompleteSelect.svelte` around lines 226
- 234, The extraParts construction can throw if getNestedValue returns null
because it checks only !== undefined and then calls toString(); update the
conditional to guard against nullish values (use a nullish check such as value
!= null or value !== null && value !== undefined) before calling toString(), or
coerce with the nullish coalescing operator so the map in
AutocompleteSelect.svelte (referencing extraParts, getNestedValue,
optionsExtraFields, and object.type) only calls toString() on non-null values
and filters out empty results.

const path: string[] =
pathField && object?.[pathField]
Expand Down
1 change: 1 addition & 0 deletions frontend/src/lib/components/Forms/ModelForm/AppliedControlPolicyForm.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@
multiple
optionsEndpoint="actors"
optionsLabelField="str"
optionsExtraFields={[['folder', 'str']]}
optionsInfoFields={{
fields: [{ field: 'type', translate: true }],
position: 'prefix'
Expand Down
1 change: 1 addition & 0 deletions frontend/src/lib/components/Forms/ModelForm/AssetForm.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@
{form}
multiple
optionsEndpoint="actors"
optionsExtraFields={[['folder', 'str']]}
optionsLabelField="str"
optionsInfoFields={{
fields: [{ field: 'type', translate: true }],
Expand Down
2 changes: 2 additions & 0 deletions frontend/src/lib/components/Forms/ModelForm/BusinessImpactAnalysisForm.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@
{form}
multiple
optionsEndpoint="actors"
optionsExtraFields={[['folder', 'str']]}
optionsLabelField="str"
optionsInfoFields={{
fields: [{ field: 'type', translate: true }],
Expand All @@ -90,6 +91,7 @@
{form}
multiple
optionsEndpoint="actors"
optionsExtraFields={[['folder', 'str']]}
optionsLabelField="str"
optionsInfoFields={{
fields: [{ field: 'type', translate: true }],
Expand Down
2 changes: 2 additions & 0 deletions frontend/src/lib/components/Forms/ModelForm/ComplianceAssessmentForm.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,7 @@
{form}
multiple
optionsEndpoint="actors"
optionsExtraFields={[['folder', 'str']]}
optionsLabelField="str"
optionsInfoFields={{
fields: [{ field: 'type', translate: true }],
Expand Down Expand Up @@ -269,6 +270,7 @@
{form}
multiple
optionsEndpoint="actors"
optionsExtraFields={[['folder', 'str']]}
optionsLabelField="str"
optionsInfoFields={{
fields: [{ field: 'type', translate: true }],
Expand Down
3 changes: 3 additions & 0 deletions frontend/src/lib/components/Forms/ModelForm/ContractForm.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@
{form}
optionsEndpoint="entities"
field="provider_entity"
optionsExtraFields={[['folder', 'str']]}
cacheLock={cacheLocks['provider_entity']}
bind:cachedValue={formDataCache['provider_entity']}
label={m.providerEntity()}
Expand All @@ -88,6 +89,7 @@
{form}
optionsEndpoint="entities"
field="beneficiary_entity"
optionsExtraFields={[['folder', 'str']]}
cacheLock={cacheLocks['beneficiary_entity']}
bind:cachedValue={formDataCache['beneficiary_entity']}
label={m.beneficiaryEntity()}
Expand Down Expand Up @@ -130,6 +132,7 @@
{form}
multiple
optionsEndpoint="actors"
optionsExtraFields={[['folder', 'str']]}
optionsLabelField="str"
optionsInfoFields={{
fields: [{ field: 'type', translate: true }],
Expand Down
2 changes: 2 additions & 0 deletions frontend/src/lib/components/Forms/ModelForm/EbiosRmForm.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,7 @@
multiple
{form}
optionsEndpoint="actors"
optionsExtraFields={[['folder', 'str']]}
optionsLabelField="str"
optionsInfoFields={{
fields: [{ field: 'type', translate: true }],
Expand All @@ -164,6 +165,7 @@
multiple
{form}
optionsEndpoint="actors"
optionsExtraFields={[['folder', 'str']]}
optionsLabelField="str"
optionsInfoFields={{
fields: [{ field: 'type', translate: true }],
Expand Down
2 changes: 2 additions & 0 deletions frontend/src/lib/components/Forms/ModelForm/EntityAssessmentForm.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,7 @@
{form}
multiple
optionsEndpoint="actors"
optionsExtraFields={[['folder', 'str']]}
optionsLabelField="str"
optionsInfoFields={{
fields: [{ field: 'type', translate: true }],
Expand All @@ -194,6 +195,7 @@
{form}
multiple
optionsEndpoint="actors"
optionsExtraFields={[['folder', 'str']]}
optionsLabelField="str"
optionsInfoFields={{
fields: [{ field: 'type', translate: true }],
Expand Down
1 change: 1 addition & 0 deletions frontend/src/lib/components/Forms/ModelForm/EvidenceForm.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@
{form}
multiple
optionsEndpoint="actors"
optionsExtraFields={[['folder', 'str']]}
optionsLabelField="str"
optionsInfoFields={{
fields: [{ field: 'type', translate: true }],
Expand Down
1 change: 1 addition & 0 deletions frontend/src/lib/components/Forms/ModelForm/FindingForm.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@
{form}
multiple
optionsEndpoint="actors"
optionsExtraFields={[['folder', 'str']]}
optionsLabelField="str"
optionsInfoFields={{
fields: [{ field: 'type', translate: true }],
Expand Down
2 changes: 2 additions & 0 deletions frontend/src/lib/components/Forms/ModelForm/FindingsAssessmentForm.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@
{form}
multiple
optionsEndpoint="actors"
optionsExtraFields={[['folder', 'str']]}
optionsLabelField="str"
optionsInfoFields={{
fields: [{ field: 'type', translate: true }],
Expand All @@ -104,6 +105,7 @@
{form}
multiple
optionsEndpoint="actors"
optionsExtraFields={[['folder', 'str']]}
optionsLabelField="str"
optionsInfoFields={{
fields: [{ field: 'type', translate: true }],
Expand Down
1 change: 1 addition & 0 deletions frontend/src/lib/components/Forms/ModelForm/IncidentForm.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,7 @@
{form}
multiple
optionsEndpoint="actors"
optionsExtraFields={[['folder', 'str']]}
optionsLabelField="str"
optionsInfoFields={{
fields: [{ field: 'type', translate: true }],
Expand Down
1 change: 1 addition & 0 deletions frontend/src/lib/components/Forms/ModelForm/MetricInstanceForm.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@
{form}
multiple
optionsEndpoint="actors"
optionsExtraFields={[['folder', 'str']]}
optionsLabelField="str"
optionsInfoFields={{
fields: [{ field: 'type', translate: true }],
Expand Down
1 change: 1 addition & 0 deletions frontend/src/lib/components/Forms/ModelForm/QuantitativeRiskScenarioForm.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,7 @@
{form}
multiple
optionsEndpoint="actors"
optionsExtraFields={[['folder', 'str']]}
optionsLabelField="str"
optionsInfoFields={{
fields: [{ field: 'type', translate: true }],
Expand Down
2 changes: 2 additions & 0 deletions frontend/src/lib/components/Forms/ModelForm/QuantitativeRiskStudyForm.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,7 @@
{form}
multiple
optionsEndpoint="actors"
optionsExtraFields={[['folder', 'str']]}
optionsLabelField="str"
optionsInfoFields={{
fields: [{ field: 'type', translate: true }],
Expand Down Expand Up @@ -252,6 +253,7 @@
{form}
multiple
optionsEndpoint="actors"
optionsExtraFields={[['folder', 'str']]}
optionsLabelField="str"
optionsInfoFields={{
fields: [{ field: 'type', translate: true }],
Expand Down
1 change: 1 addition & 0 deletions frontend/src/lib/components/Forms/ModelForm/RightRequestForm.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
{form}
multiple
optionsEndpoint="actors"
optionsExtraFields={[['folder', 'str']]}
optionsLabelField="str"
optionsInfoFields={{
fields: [{ field: 'type', translate: true }],
Expand Down
2 changes: 2 additions & 0 deletions frontend/src/lib/components/Forms/ModelForm/RiskAssessmentForm.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,7 @@
{form}
multiple
optionsEndpoint="actors"
optionsExtraFields={[['folder', 'str']]}
optionsLabelField="str"
optionsInfoFields={{
fields: [{ field: 'type', translate: true }],
Expand All @@ -148,6 +149,7 @@
{form}
multiple
optionsEndpoint="actors"
optionsExtraFields={[['folder', 'str']]}
optionsLabelField="str"
optionsInfoFields={{
fields: [{ field: 'type', translate: true }],
Expand Down
1 change: 1 addition & 0 deletions frontend/src/lib/components/Forms/ModelForm/SecurityExceptionForm.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@
{form}
multiple
optionsEndpoint="actors"
optionsExtraFields={[['folder', 'str']]}
optionsLabelField="str"
optionsInfoFields={{
fields: [{ field: 'type', translate: true }],
Expand Down
1 change: 1 addition & 0 deletions frontend/src/lib/components/Forms/ModelForm/SolutionForm.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@
{form}
multiple
optionsEndpoint="actors"
optionsExtraFields={[['folder', 'str']]}
optionsLabelField="str"
optionsInfoFields={{
fields: [{ field: 'type', translate: true }],
Expand Down
1 change: 1 addition & 0 deletions frontend/src/lib/components/Forms/ModelForm/StakeholderForm.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,7 @@
label={m.entity()}
hidden={initialData.entity}
helpText={m.stakeholderEntityHelpText()}
optionsExtraFields={[['folder', 'str']]}
includeAllOptionFields={true}
optionsInfoFields={{
fields: [
Expand Down
1 change: 1 addition & 0 deletions frontend/src/routes/(app)/(internal)/risk-scenarios/[id=uuid]/edit/+page.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,7 @@
baseClass="flex-1"
multiple
optionsEndpoint="actors"
optionsExtraFields={[['folder', 'str']]}
optionsLabelField="str"
optionsInfoFields={{
fields: [{ field: 'type', translate: true }],
Expand Down
Loading