diff --git a/apps/web/src/app/organizations/core/services/user-admin.service.ts b/apps/web/src/app/organizations/core/services/user-admin.service.ts index 2f5c238b90f..2d7635c5c6c 100644 --- a/apps/web/src/app/organizations/core/services/user-admin.service.ts +++ b/apps/web/src/app/organizations/core/services/user-admin.service.ts @@ -72,6 +72,7 @@ export class UserAdminService { view.userId = u.userId; view.type = u.type; view.status = u.status; + view.externalId = u.externalId; view.accessAll = u.accessAll; view.permissions = u.permissions; view.resetPasswordEnrolled = u.resetPasswordEnrolled; diff --git a/apps/web/src/app/organizations/core/views/organization-user-admin-view.ts b/apps/web/src/app/organizations/core/views/organization-user-admin-view.ts index 3d8c83a5a31..ff76f1540f5 100644 --- a/apps/web/src/app/organizations/core/views/organization-user-admin-view.ts +++ b/apps/web/src/app/organizations/core/views/organization-user-admin-view.ts @@ -10,6 +10,7 @@ export class OrganizationUserAdminView { organizationId: string; type: OrganizationUserType; status: OrganizationUserStatusType; + externalId: string; accessAll: boolean; permissions: PermissionsApi; resetPasswordEnrolled: boolean; diff --git a/apps/web/src/app/organizations/members/components/member-dialog/member-dialog.component.html b/apps/web/src/app/organizations/members/components/member-dialog/member-dialog.component.html index c7a826b5932..a2daff86e31 100644 --- a/apps/web/src/app/organizations/members/components/member-dialog/member-dialog.component.html +++ b/apps/web/src/app/organizations/members/components/member-dialog/member-dialog.component.html @@ -26,7 +26,7 @@ {{ "inviteMultipleEmailDesc" | i18n: "20" }} -
+
-
+
+ + {{ "externalId" | i18n }} + + {{ "externalIdDesc" | i18n }} +

{{ "permissions" | i18n }} diff --git a/apps/web/src/app/organizations/members/components/member-dialog/member-dialog.component.ts b/apps/web/src/app/organizations/members/components/member-dialog/member-dialog.component.ts index f52fe284a06..60a53b14044 100644 --- a/apps/web/src/app/organizations/members/components/member-dialog/member-dialog.component.ts +++ b/apps/web/src/app/organizations/members/components/member-dialog/member-dialog.component.ts @@ -78,6 +78,7 @@ export class MemberDialogComponent implements OnInit, OnDestroy { protected formGroup = this.formBuilder.group({ emails: ["", [Validators.required, commaSeparatedEmails]], type: OrganizationUserType.User, + externalId: this.formBuilder.control({ value: "", disabled: true }), accessAllCollections: false, accessSecretsManager: false, access: [[] as AccessItemValue[]], @@ -227,6 +228,7 @@ export class MemberDialogComponent implements OnInit, OnDestroy { this.formGroup.removeControl("emails"); this.formGroup.patchValue({ type: userDetails.type, + externalId: userDetails.externalId, accessAllCollections: userDetails.accessAll, access: accessSelections, accessSecretsManager: userDetails.accessSecretsManager, diff --git a/libs/common/src/abstractions/organization-user/responses/organization-user.response.ts b/libs/common/src/abstractions/organization-user/responses/organization-user.response.ts index f0f536ad601..a6e43c5c5ec 100644 --- a/libs/common/src/abstractions/organization-user/responses/organization-user.response.ts +++ b/libs/common/src/abstractions/organization-user/responses/organization-user.response.ts @@ -10,6 +10,7 @@ export class OrganizationUserResponse extends BaseResponse { userId: string; type: OrganizationUserType; status: OrganizationUserStatusType; + externalId: string; accessAll: boolean; accessSecretsManager: boolean; permissions: PermissionsApi; @@ -24,6 +25,7 @@ export class OrganizationUserResponse extends BaseResponse { this.type = this.getResponseProperty("Type"); this.status = this.getResponseProperty("Status"); this.permissions = new PermissionsApi(this.getResponseProperty("Permissions")); + this.externalId = this.getResponseProperty("ExternalId"); this.accessAll = this.getResponseProperty("AccessAll"); this.accessSecretsManager = this.getResponseProperty("AccessSecretsManager"); this.resetPasswordEnrolled = this.getResponseProperty("ResetPasswordEnrolled");