diff --git a/packages/admin-ui/src/lib/catalog/src/components/asset-list/asset-list.component.ts b/packages/admin-ui/src/lib/catalog/src/components/asset-list/asset-list.component.ts
index 350036e455..d9fa988c93 100644
--- a/packages/admin-ui/src/lib/catalog/src/components/asset-list/asset-list.component.ts
+++ b/packages/admin-ui/src/lib/catalog/src/components/asset-list/asset-list.component.ts
@@ -80,38 +80,42 @@ export class AssetListComponent extends BaseListComponent
a.id))
.pipe(
switchMap((response) => {
if (response.result === DeletionResult.DELETED) {
return [true];
} else {
- return this.showModalAndDelete(asset.id, response.message || '').pipe(
- map((r) => r.result === DeletionResult.DELETED),
- );
+ return this.showModalAndDelete(
+ assets.map((a) => a.id),
+ response.message || '',
+ ).pipe(map((r) => r.result === DeletionResult.DELETED));
}
}),
)
.subscribe(
() => {
this.notificationService.success(_('common.notify-delete-success'), {
- entity: 'Asset',
+ entity: 'Assets',
});
this.refresh();
},
(err) => {
this.notificationService.error(_('common.notify-delete-error'), {
- entity: 'Asset',
+ entity: 'Assets',
});
},
);
}
- private showModalAndDelete(assetId: string, message?: string) {
+ private showModalAndDelete(assetIds: string[], message?: string) {
return this.modalService
.dialog({
- title: _('catalog.confirm-delete-asset'),
+ title: _('catalog.confirm-delete-assets'),
+ translationVars: {
+ count: assetIds.length,
+ },
body: message,
buttons: [
{ type: 'secondary', label: _('common.cancel') },
@@ -119,8 +123,10 @@ export class AssetListComponent extends BaseListComponent (res ? this.dataService.product.deleteAsset(assetId, !!message) : EMPTY)),
- map((res) => res.deleteAsset),
+ switchMap((res) =>
+ res ? this.dataService.product.deleteAssets(assetIds, !!message) : EMPTY,
+ ),
+ map((res) => res.deleteAssets),
);
}
}
diff --git a/packages/admin-ui/src/lib/core/src/common/generated-types.ts b/packages/admin-ui/src/lib/core/src/common/generated-types.ts
index 5fcef5dd4f..890b4b5650 100644
--- a/packages/admin-ui/src/lib/core/src/common/generated-types.ts
+++ b/packages/admin-ui/src/lib/core/src/common/generated-types.ts
@@ -1816,6 +1816,8 @@ export type Mutation = {
createZone: Zone;
/** Delete an Asset */
deleteAsset: DeletionResponse;
+ /** Delete multiple Assets */
+ deleteAssets: DeletionResponse;
/** Delete a Channel */
deleteChannel: DeletionResponse;
/** Delete a Collection and all of its descendants */
@@ -2075,6 +2077,12 @@ export type MutationDeleteAssetArgs = {
};
+export type MutationDeleteAssetsArgs = {
+ ids: Array;
+ force?: Maybe;
+};
+
+
export type MutationDeleteChannelArgs = {
id: Scalars['ID'];
};
@@ -5310,15 +5318,15 @@ export type UpdateAssetMutation = (
) }
);
-export type DeleteAssetMutationVariables = {
- id: Scalars['ID'];
+export type DeleteAssetsMutationVariables = {
+ ids: Array;
force?: Maybe;
};
-export type DeleteAssetMutation = (
+export type DeleteAssetsMutation = (
{ __typename?: 'Mutation' }
- & { deleteAsset: (
+ & { deleteAssets: (
{ __typename?: 'DeletionResponse' }
& Pick
) }
@@ -7389,10 +7397,10 @@ export namespace UpdateAsset {
export type UpdateAsset = AssetFragment;
}
-export namespace DeleteAsset {
- export type Variables = DeleteAssetMutationVariables;
- export type Mutation = DeleteAssetMutation;
- export type DeleteAsset = DeleteAssetMutation['deleteAsset'];
+export namespace DeleteAssets {
+ export type Variables = DeleteAssetsMutationVariables;
+ export type Mutation = DeleteAssetsMutation;
+ export type DeleteAssets = DeleteAssetsMutation['deleteAssets'];
}
export namespace SearchProducts {
diff --git a/packages/admin-ui/src/lib/core/src/data/definitions/product-definitions.ts b/packages/admin-ui/src/lib/core/src/data/definitions/product-definitions.ts
index 7d5ec45aa1..2ff4f090e7 100644
--- a/packages/admin-ui/src/lib/core/src/data/definitions/product-definitions.ts
+++ b/packages/admin-ui/src/lib/core/src/data/definitions/product-definitions.ts
@@ -385,9 +385,9 @@ export const UPDATE_ASSET = gql`
${ASSET_FRAGMENT}
`;
-export const DELETE_ASSET = gql`
- mutation DeleteAsset($id: ID!, $force: Boolean) {
- deleteAsset(id: $id, force: $force) {
+export const DELETE_ASSETS = gql`
+ mutation DeleteAssets($ids: [ID!]!, $force: Boolean) {
+ deleteAssets(ids: $ids, force: $force) {
result
message
}
diff --git a/packages/admin-ui/src/lib/core/src/data/providers/product-data.service.ts b/packages/admin-ui/src/lib/core/src/data/providers/product-data.service.ts
index 194f8363f0..ee25cf1260 100644
--- a/packages/admin-ui/src/lib/core/src/data/providers/product-data.service.ts
+++ b/packages/admin-ui/src/lib/core/src/data/providers/product-data.service.ts
@@ -13,7 +13,7 @@ import {
CreateProductOptionInput,
CreateProductVariantInput,
CreateProductVariants,
- DeleteAsset,
+ DeleteAssets,
DeleteProduct,
DeleteProductVariant,
GetAsset,
@@ -46,7 +46,7 @@ import {
CREATE_PRODUCT,
CREATE_PRODUCT_OPTION_GROUP,
CREATE_PRODUCT_VARIANTS,
- DELETE_ASSET,
+ DELETE_ASSETS,
DELETE_PRODUCT,
DELETE_PRODUCT_VARIANT,
GET_ASSET,
@@ -284,9 +284,9 @@ export class ProductDataService {
});
}
- deleteAsset(id: string, force: boolean) {
- return this.baseDataService.mutate(DELETE_ASSET, {
- id,
+ deleteAssets(ids: string[], force: boolean) {
+ return this.baseDataService.mutate(DELETE_ASSETS, {
+ ids,
force,
});
}
diff --git a/packages/admin-ui/src/lib/core/src/providers/modal/modal.service.ts b/packages/admin-ui/src/lib/core/src/providers/modal/modal.service.ts
index daa69b560b..c1e2d406ae 100644
--- a/packages/admin-ui/src/lib/core/src/providers/modal/modal.service.ts
+++ b/packages/admin-ui/src/lib/core/src/providers/modal/modal.service.ts
@@ -32,6 +32,7 @@ export interface DialogButtonConfig {
export interface DialogConfig {
title: string;
body?: string;
+ translationVars?: { [key: string]: string | number };
buttons: Array>;
}
@@ -113,13 +114,13 @@ export class ModalService {
const modalFactory = this.componentFactoryResolver.resolveComponentFactory(ModalDialogComponent);
return from(this.overlayHostService.getHostView()).pipe(
- mergeMap(hostView => {
+ mergeMap((hostView) => {
const modalComponentRef = hostView.createComponent(modalFactory);
const modalInstance: ModalDialogComponent = modalComponentRef.instance;
modalInstance.childComponentType = component;
modalInstance.options = options;
- return new Observable(subscriber => {
+ return new Observable((subscriber) => {
modalInstance.closeModal = (result: R) => {
modalComponentRef.destroy();
subscriber.next(result);
diff --git a/packages/admin-ui/src/lib/core/src/shared/components/asset-gallery/asset-gallery.component.html b/packages/admin-ui/src/lib/core/src/shared/components/asset-gallery/asset-gallery.component.html
index 64af98418a..0155424255 100644
--- a/packages/admin-ui/src/lib/core/src/shared/components/asset-gallery/asset-gallery.component.html
+++ b/packages/admin-ui/src/lib/core/src/shared/components/asset-gallery/asset-gallery.component.html
@@ -48,7 +48,7 @@