diff --git a/apps/web/src/app/admin-console/organizations/shared/components/access-selector/access-selector.models.ts b/apps/web/src/app/admin-console/organizations/shared/components/access-selector/access-selector.models.ts index 8fbca22bc5e..be313c25742 100644 --- a/apps/web/src/app/admin-console/organizations/shared/components/access-selector/access-selector.models.ts +++ b/apps/web/src/app/admin-console/organizations/shared/components/access-selector/access-selector.models.ts @@ -101,7 +101,12 @@ export const getPermissionList = (flexibleCollectionsEnabled: boolean): Permissi * for the dropdown in the AccessSelectorComponent * @param value */ -export const convertToPermission = (value: CollectionAccessSelectionView) => { +export const convertToPermission = ( + value: CollectionAccessSelectionView | undefined, +): CollectionPermission | undefined => { + if (value == null) { + return undefined; + } if (value.manage) { return CollectionPermission.Manage; } else if (value.readOnly) { diff --git a/apps/web/src/app/vault/components/collection-dialog/collection-dialog.component.ts b/apps/web/src/app/vault/components/collection-dialog/collection-dialog.component.ts index 64150245cbe..8e0d610c93b 100644 --- a/apps/web/src/app/vault/components/collection-dialog/collection-dialog.component.ts +++ b/apps/web/src/app/vault/components/collection-dialog/collection-dialog.component.ts @@ -29,9 +29,9 @@ import { CollectionView } from "@bitwarden/common/vault/models/view/collection.v import { BitValidators, DialogService } from "@bitwarden/components"; import { + CollectionAccessSelectionView, GroupService, GroupView, - CollectionAccessSelectionView, } from "../../../admin-console/organizations/core"; import { PermissionMode } from "../../../admin-console/organizations/shared/components/access-selector/access-selector.component"; import { @@ -432,7 +432,10 @@ function mapGroupToAccessItemView(group: GroupView, collectionId: string): Acces labelName: group.name, accessAllItems: group.accessAll, readonly: group.accessAll, - readonlyPermission: convertToPermission(group.collections.find((gc) => gc.id == collectionId)), + readonlyPermission: + collectionId != null + ? convertToPermission(group.collections.find((gc) => gc.id == collectionId)) + : undefined, }; } @@ -456,9 +459,12 @@ function mapUserToAccessItemView( status: user.status, accessAllItems: user.accessAll, readonly: user.accessAll, - readonlyPermission: convertToPermission( - new CollectionAccessSelectionView(user.collections.find((uc) => uc.id == collectionId)), - ), + readonlyPermission: + collectionId != null + ? convertToPermission( + new CollectionAccessSelectionView(user.collections.find((uc) => uc.id == collectionId)), + ) + : undefined, }; }