Merge pull request #1337 from umbraco/bugfix/confirm-modal-method

fix modal controllers rejection

src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/delete/delete.action.ts

@@ -17,6 +17,7 @@ export class UmbDeleteEntityAction<
 			color: 'danger',
 			confirmLabel: 'Delete',
 		});
+
 		await this.repository?.delete(this.unique);
 	}
 }

src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/collection/extension-collection.element.ts

@@ -27,6 +27,7 @@ export class UmbExtensionCollectionElement extends UmbCollectionDefaultElement {
 		});
 	}
 
+	// TODO: make this a utility function, please check that we do not already have on for this: [NL]
 	// credit: https://stackoverflow.com/a/7225450/12787 [LK]
 	#camelCaseToWords(input: string) {
 		const result = input.replace(/([A-Z])/g, ' $1');
@@ -35,7 +36,6 @@ export class UmbExtensionCollectionElement extends UmbCollectionDefaultElement {
 
 	#onChange(event: UUISelectEvent) {
 		const extensionType = event.target.value;
-		console.log('onChange', extensionType);
 		this.#collectionContext?.setFilter({ type: extensionType });
 	}
 

src/Umbraco.Web.UI.Client/src/packages/core/modal/common/confirm/confirm-modal.controller.ts

@@ -13,9 +13,11 @@ export class UmbConfirmModalController extends UmbControllerBase {
 			data: args,
 		});
 
-		await modalContext.onSubmit().catch(() => {
+		const p = modalContext.onSubmit();
+		p.catch(() => {
 			this.destroy();
 		});
+		await p;
 
 		// This is a one time off, so we can destroy our selfs.
 		this.destroy();

src/Umbraco.Web.UI.Client/src/packages/documents/documents/modals/pick-document-variant-modal.controller.ts

@@ -36,7 +36,9 @@ export class UmbPickDocumentVariantModalController extends UmbControllerBase {
 			value: { selection: selected.map((x) => x.toString()).filter((v, i, a) => a.indexOf(v) === i) ?? [] },
 		});
 
-		const result = await modalContext.onSubmit().catch(() => undefined);
+		const p = modalContext.onSubmit();
+		p.catch(() => this.destroy());
+		const result = await p;
 
 		// This is a one time off, so we can destroy our selfs.
 		this.destroy();