Skip to content
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

Jump to bottom

[AC-1649] Remove organizationId from collection-bulk-delete.request #6343

Merged
merged 2 commits into from
Sep 20, 2023
Merged

[AC-1649] Remove organizationId from collection-bulk-delete.request #6343

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
534fb73
refactor: remove organizationId from collection-bulk-delete-request, …
vincentsalucci Sep 19, 2023
3095596
refactor: remove request model from dialog component, refs AC-1649
vincentsalucci Sep 20, 2023
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
4 changes: 1 addition & 3 deletions ...t/individual-vault/bulk-action-dialogs/bulk-delete-dialog/bulk-delete-dialog.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import { Component, Inject } from "@angular/core";

import { ApiService } from "@bitwarden/common/abstractions/api.service";
import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
import { CollectionBulkDeleteRequest } from "@bitwarden/common/models/request/collection-bulk-delete.request";
import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
Expand Down Expand Up @@ -127,8 +126,7 @@ export class BulkDeleteDialogComponent {
);
return;
}
const deleteRequest = new CollectionBulkDeleteRequest(this.collectionIds, this.organization.id);
return await this.apiService.deleteManyCollections(deleteRequest);
return await this.apiService.deleteManyCollections(this.organization.id, this.collectionIds);
}

private close(result: BulkDeleteDialogResult) {
Expand Down
3 changes: 1 addition & 2 deletions libs/common/src/abstractions/api.service.ts
View file
Open in desktop
shane-melton marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,6 @@ import { PlanResponse } from "../billing/models/response/plan.response";
import { SubscriptionResponse } from "../billing/models/response/subscription.response";
import { TaxInfoResponse } from "../billing/models/response/tax-info.response";
import { TaxRateResponse } from "../billing/models/response/tax-rate.response";
import { CollectionBulkDeleteRequest } from "../models/request/collection-bulk-delete.request";
import { DeleteRecoverRequest } from "../models/request/delete-recover.request";
import { EventRequest } from "../models/request/event.request";
import { IapCheckRequest } from "../models/request/iap-check.request";
Expand Down Expand Up @@ -301,7 +300,7 @@ export abstract class ApiService {
request: CollectionRequest
) => Promise<CollectionResponse>;
deleteCollection: (organizationId: string, id: string) => Promise<any>;
deleteManyCollections: (request: CollectionBulkDeleteRequest) => Promise<any>;
deleteManyCollections: (organizationId: string, collectionIds: string[]) => Promise<any>;
deleteCollectionUser: (
organizationId: string,
id: string,
Expand Down
4 changes: 1 addition & 3 deletions libs/common/src/models/request/collection-bulk-delete.request.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
export class CollectionBulkDeleteRequest {
ids: string[];
organizationId: string;

constructor(ids: string[], organizationId?: string) {
constructor(ids: string[]) {
this.ids = ids == null ? [] : ids;
this.organizationId = organizationId;
}
}
6 changes: 3 additions & 3 deletions libs/common/src/services/api.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ApiService as ApiServiceAbstraction } from "../abstractions/api.service";

Check notice on line 1 in libs/common/src/services/api.service.ts

View check run for this annotation

CodeScene Delta Analysis / CodeScene Cloud Delta Analysis (feature/flexible-collections)

ℹ Getting worse: Primitive Obsession 

The ratio of primitive types in function arguments increases from 58.56% to 59.09%, threshold = 30.0%. The functions in this file have too many primitive types (e.g. int, double, float) in their function argument lists. Using many primitive types lead to the code smell Primitive Obsession. Avoid adding more primitive arguments.

Check notice on line 1 in libs/common/src/services/api.service.ts

View check run for this annotation

CodeScene Delta Analysis / CodeScene Cloud Delta Analysis (feature/flexible-collections)

ℹ Getting worse: String Heavy Function Arguments 

The ratio of strings in function arguments increases from 57.79% to 58.33%, threshold = 39.0%. The functions in this file have a high ratio of strings as arguments. Avoid adding more.
import { OrganizationConnectionType } from "../admin-console/enums";
import { OrganizationSponsorshipCreateRequest } from "../admin-console/models/request/organization/organization-sponsorship-create.request";
import { OrganizationSponsorshipRedeemRequest } from "../admin-console/models/request/organization/organization-sponsorship-redeem.request";
Expand Down Expand Up @@ -834,11 +834,11 @@
);
}

deleteManyCollections(request: CollectionBulkDeleteRequest): Promise<any> {
deleteManyCollections(organizationId: string, collectionIds: string[]): Promise<any> {
return this.send(
"DELETE",
"/organizations/" + request.organizationId + "/collections",
request,
"/organizations/" + organizationId + "/collections",
new CollectionBulkDeleteRequest(collectionIds),
true,
false
);
Expand Down
Loading