mirror of
https://github.com/bitwarden/browser
synced 2026-01-07 02:53:28 +00:00
* [EC-73] feat: add inital version of modal using dialog service * [EC-73] feat: create story for dialog * [EC-73] feat: setup story with support for injected data * [EC-73] feat: add inital version of subtitle * [EC-73] feat: add tabs * [EC-73] feat: initial version of collection info form * [EC-73] feat: start of working form * [EC-73] feat: add custom form validator * [EC-73] fix: dialog directive names after rebase * [EC-73] feat: use custom validator * [EC-73] fix: story * [EC-73] feat: allow parent picking * [EC-73] feat: remove tabs to allow for merging * [EC-73] feat: extend story with new and edit dialogs * [EC-73] feat: change title depending on if editing or not * [EC-73] fix: parent not connected to form * [EC-73] feat: add organizationId to dialog data * [EC-73] feat: only allow nesting within collections with access * [EC-73] feat: handle loading with spinner * [EC-73] feat: update collections on submit * [EC-73] feat: reload on save * [EC-73] feat: update story to work with latest changes * [EC-73] feat: always fetch collections from server * [EC-73] fix: do not submit if form invalid * [EC-73] feat: create new collections using new ui * [EC-73] fix: external id not being saved * [EC-73] chore: move calls to separete collection admin service * [EC-73] feat: use new admin views * [EC-73] feat: implement deletion * [EC-73] feat: add support for collection details in service * [EC-73] fix: story * [EC-73] fix: cancel button * [EC-73] feat: re-add tabs * [EC-73] fix: jslib service collection deps * [EC-73] chore: rename component to collection-dialog * [EC-73] chore: clean up collection api service which was replaced * [EC-73] chore: restore collection.service * [EC-73] chore: restore dialog component changes * [EC-73] fix: move subscription to ngOnInit * [EC-73] feat: disable padding when using tabbed content * [EC-73] chore: re-add collections page * [EC-73] chore: move component to shared org module * [EC-73] feat: add empty access selector * [EC-73] feat: add groups to access selector * [EC-73] chore: improve storybook support * [EC-73] feat: tweak item assignment * [EC-73] feat: add support for showing users * [EC-73] feat: use async actions * [EC-73] chore: clean up casting * [EC-73] fix: permissions not loading correctly in access selector * [EC-73] feat: implement saving group permissions * [EC-73] feat: rename to collection access selection view * [EC-73] feat: save users as well * [EC-73] fix: access selector usage * [EC-73] feat: new collection creation * [EC-73] feat: fetch users from collection details * [EC-73] chore: clean up * [EC-73] fix: circular dependency issues * [EC-73] fix: import shared module directly to workaround build issues * [EC-73] fix: missing dependencies in story * [EC-73] chore: move story * [EC-73] feat: hide delete button if no permission * [EC-73] feat: properly handle orgs without groups * [EC-73] fix: use correct functions in template * [EC-73] feat: properly handle non-existing parent * [EC-73] chore: use double ngIf instead of else template * [EC-73] fix: add type to dialog ref * [EC-73] fix: restrict field modifiers * [EC-73] fix: use result enum directly * [EC-73] fix: simplify mapping logic * [EC-73] * [EC-73] feat: add story for free orgs without groups * [EC-73] fix: parametrized i18n * [EC-73] feat: create new shared org module * [EC-73] feat: move collection dialog to shared * [EC-73] feat: move access selector to shared * [EC-73] feat: create core organization module * [EC-73] feat: move collection admin service to web * [EC-73] feat: move collection admin views to web * [EC-73] fix: missing i18n * [EC-73] fix: refactor for type safety * [EC-73] fix: storybook not compiling again * [EC-73] feat: use helper function to open dialog * [EC-73] chore: remove comment * [EC-73] fix: only show delete if in edit mode * [EC-73] chore: remove ngIf else in template * [EC-73] fix: add missing appA11yTitle * [EC-73] chore: rename remove to delete * [EC-73] chore: refactor ngOnInit * [EC-73] fix: dialog position strategy * [EC-73] fix: revert spinner to old way of doing it * Fix remaining errors after rebase/merge * fix: import shared module directly Co-authored-by: Andreas Coroiu <andreas.coroiu@gmail.com>
247 lines
8.2 KiB
TypeScript
247 lines
8.2 KiB
TypeScript
import { Overlay } from "@angular/cdk/overlay";
|
|
import { Component, OnInit, ViewChild, ViewContainerRef } from "@angular/core";
|
|
import { ActivatedRoute } from "@angular/router";
|
|
import { lastValueFrom } from "rxjs";
|
|
import { first } from "rxjs/operators";
|
|
|
|
import { ModalService } from "@bitwarden/angular/services/modal.service";
|
|
import { ApiService } from "@bitwarden/common/abstractions/api.service";
|
|
import { CollectionService } from "@bitwarden/common/abstractions/collection.service";
|
|
import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
|
|
import { LogService } from "@bitwarden/common/abstractions/log.service";
|
|
import { OrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction";
|
|
import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
|
|
import { SearchService } from "@bitwarden/common/abstractions/search.service";
|
|
import { CollectionData } from "@bitwarden/common/models/data/collection.data";
|
|
import { Collection } from "@bitwarden/common/models/domain/collection";
|
|
import { Organization } from "@bitwarden/common/models/domain/organization";
|
|
import {
|
|
CollectionDetailsResponse,
|
|
CollectionResponse,
|
|
} from "@bitwarden/common/models/response/collection.response";
|
|
import { ListResponse } from "@bitwarden/common/models/response/list.response";
|
|
import { CollectionView } from "@bitwarden/common/models/view/collection.view";
|
|
import { DialogService } from "@bitwarden/components";
|
|
|
|
import { CollectionDialogResult, openCollectionDialog } from "../shared";
|
|
|
|
import { EntityUsersComponent } from "./entity-users.component";
|
|
|
|
@Component({
|
|
selector: "app-org-manage-collections",
|
|
templateUrl: "collections.component.html",
|
|
})
|
|
// eslint-disable-next-line rxjs-angular/prefer-takeuntil
|
|
export class CollectionsComponent implements OnInit {
|
|
@ViewChild("addEdit", { read: ViewContainerRef, static: true }) addEditModalRef: ViewContainerRef;
|
|
@ViewChild("usersTemplate", { read: ViewContainerRef, static: true })
|
|
usersModalRef: ViewContainerRef;
|
|
|
|
loading = true;
|
|
organization: Organization;
|
|
canCreate = false;
|
|
organizationId: string;
|
|
collections: CollectionView[];
|
|
assignedCollections: CollectionView[];
|
|
pagedCollections: CollectionView[];
|
|
searchText: string;
|
|
|
|
protected didScroll = false;
|
|
protected pageSize = 100;
|
|
|
|
private pagedCollectionsCount = 0;
|
|
|
|
constructor(
|
|
private apiService: ApiService,
|
|
private route: ActivatedRoute,
|
|
private collectionService: CollectionService,
|
|
private modalService: ModalService,
|
|
private i18nService: I18nService,
|
|
private platformUtilsService: PlatformUtilsService,
|
|
private searchService: SearchService,
|
|
private logService: LogService,
|
|
private organizationService: OrganizationService,
|
|
private dialogService: DialogService,
|
|
private overlay: Overlay
|
|
) {}
|
|
|
|
async ngOnInit() {
|
|
// eslint-disable-next-line rxjs-angular/prefer-takeuntil, rxjs/no-async-subscribe
|
|
this.route.parent.parent.params.subscribe(async (params) => {
|
|
this.organizationId = params.organizationId;
|
|
await this.load();
|
|
// eslint-disable-next-line rxjs-angular/prefer-takeuntil, rxjs/no-async-subscribe, rxjs/no-nested-subscribe
|
|
this.route.queryParams.pipe(first()).subscribe(async (qParams) => {
|
|
this.searchText = qParams.search;
|
|
});
|
|
});
|
|
}
|
|
|
|
async load() {
|
|
this.organization = await this.organizationService.get(this.organizationId);
|
|
this.canCreate = this.organization.canCreateNewCollections;
|
|
|
|
const decryptCollections = async (r: ListResponse<CollectionResponse>) => {
|
|
const collections = r.data
|
|
.filter((c) => c.organizationId === this.organizationId)
|
|
.map((d) => new Collection(new CollectionData(d as CollectionDetailsResponse)));
|
|
return await this.collectionService.decryptMany(collections);
|
|
};
|
|
|
|
if (this.organization.canViewAssignedCollections) {
|
|
const response = await this.apiService.getUserCollections();
|
|
this.assignedCollections = await decryptCollections(response);
|
|
}
|
|
|
|
if (this.organization.canViewAllCollections) {
|
|
const response = await this.apiService.getCollections(this.organizationId);
|
|
this.collections = await decryptCollections(response);
|
|
} else {
|
|
this.collections = this.assignedCollections;
|
|
}
|
|
|
|
this.resetPaging();
|
|
this.loading = false;
|
|
}
|
|
|
|
loadMore() {
|
|
if (!this.collections || this.collections.length <= this.pageSize) {
|
|
return;
|
|
}
|
|
const pagedLength = this.pagedCollections.length;
|
|
let pagedSize = this.pageSize;
|
|
if (pagedLength === 0 && this.pagedCollectionsCount > this.pageSize) {
|
|
pagedSize = this.pagedCollectionsCount;
|
|
}
|
|
if (this.collections.length > pagedLength) {
|
|
this.pagedCollections = this.pagedCollections.concat(
|
|
this.collections.slice(pagedLength, pagedLength + pagedSize)
|
|
);
|
|
}
|
|
this.pagedCollectionsCount = this.pagedCollections.length;
|
|
this.didScroll = this.pagedCollections.length > this.pageSize;
|
|
}
|
|
|
|
async edit(collection?: CollectionView) {
|
|
const canCreate = collection == undefined && this.canCreate;
|
|
const canEdit = collection != undefined && this.canEdit(collection);
|
|
const canDelete = collection != undefined && this.canDelete(collection);
|
|
|
|
if (!(canCreate || canEdit || canDelete)) {
|
|
this.platformUtilsService.showToast("error", null, this.i18nService.t("missingPermissions"));
|
|
return;
|
|
}
|
|
|
|
const dialog = openCollectionDialog(this.dialogService, this.overlay, {
|
|
data: { collectionId: collection?.id, organizationId: this.organizationId },
|
|
});
|
|
|
|
const result = await lastValueFrom(dialog.closed);
|
|
if (result === CollectionDialogResult.Saved || result === CollectionDialogResult.Deleted) {
|
|
this.load();
|
|
}
|
|
}
|
|
|
|
add() {
|
|
this.edit(null);
|
|
}
|
|
|
|
async delete(collection: CollectionView) {
|
|
const confirmed = await this.platformUtilsService.showDialog(
|
|
this.i18nService.t("deleteCollectionConfirmation"),
|
|
collection.name,
|
|
this.i18nService.t("yes"),
|
|
this.i18nService.t("no"),
|
|
"warning"
|
|
);
|
|
if (!confirmed) {
|
|
return false;
|
|
}
|
|
|
|
try {
|
|
await this.apiService.deleteCollection(this.organizationId, collection.id);
|
|
this.platformUtilsService.showToast(
|
|
"success",
|
|
null,
|
|
this.i18nService.t("deletedCollectionId", collection.name)
|
|
);
|
|
this.removeCollection(collection);
|
|
} catch (e) {
|
|
this.logService.error(e);
|
|
this.platformUtilsService.showToast("error", null, this.i18nService.t("missingPermissions"));
|
|
}
|
|
}
|
|
|
|
async users(collection: CollectionView) {
|
|
const [modal] = await this.modalService.openViewRef(
|
|
EntityUsersComponent,
|
|
this.usersModalRef,
|
|
(comp) => {
|
|
comp.organizationId = this.organizationId;
|
|
comp.entity = "collection";
|
|
comp.entityId = collection.id;
|
|
comp.entityName = collection.name;
|
|
|
|
// eslint-disable-next-line rxjs-angular/prefer-takeuntil
|
|
comp.onEditedUsers.subscribe(() => {
|
|
this.load();
|
|
modal.close();
|
|
});
|
|
}
|
|
);
|
|
}
|
|
|
|
async resetPaging() {
|
|
this.pagedCollections = [];
|
|
this.loadMore();
|
|
}
|
|
|
|
isSearching() {
|
|
return this.searchService.isSearchable(this.searchText);
|
|
}
|
|
|
|
isPaging() {
|
|
const searching = this.isSearching();
|
|
if (searching && this.didScroll) {
|
|
this.resetPaging();
|
|
}
|
|
return !searching && this.collections && this.collections.length > this.pageSize;
|
|
}
|
|
|
|
canEdit(collection: CollectionView) {
|
|
if (this.organization.canEditAnyCollection) {
|
|
return true;
|
|
}
|
|
|
|
if (
|
|
this.organization.canEditAssignedCollections &&
|
|
this.assignedCollections.some((c) => c.id === collection.id)
|
|
) {
|
|
return true;
|
|
}
|
|
return false;
|
|
}
|
|
|
|
canDelete(collection: CollectionView) {
|
|
if (this.organization.canDeleteAnyCollection) {
|
|
return true;
|
|
}
|
|
|
|
if (
|
|
this.organization.canDeleteAssignedCollections &&
|
|
this.assignedCollections.some((c) => c.id === collection.id)
|
|
) {
|
|
return true;
|
|
}
|
|
return false;
|
|
}
|
|
|
|
private removeCollection(collection: CollectionView) {
|
|
const index = this.collections.indexOf(collection);
|
|
if (index > -1) {
|
|
this.collections.splice(index, 1);
|
|
this.resetPaging();
|
|
}
|
|
}
|
|
}
|