yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove last static event and implement canceable notification where users are able to cancel the import process

Browse Source
This commit is contained in:
Warren Buckley
2021-03-17 12:57:24 +00:00
parent 8563643e80
commit 2901cb10f8
1 changed files with 8 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/Umbraco.Infrastructure/Services/Implement/PackagingService.cs
View File

@@ -120,7 +120,12 @@ namespace Umbraco.Cms.Core.Services.Implement
var compiledPackage = GetCompiledPackageInfo(packageFile);
if (compiledPackage == null) throw new InvalidOperationException("Could not read the package file " + packageFile);
if (ImportingPackage.IsRaisedEventCancelled(new ImportPackageEventArgs<string>(packageFile.Name, compiledPackage), this))
// Trigger the Importing Package Notification
var notification = new ImportingPackageNotification(packageFile.Name, compiledPackage);
_eventAggregator.Publish(notification);
// Stop execution if event/user is cancelling it
if (notification.Cancel)
return new InstallationSummary { MetaData = compiledPackage };
var summary = _packageInstallation.InstallPackageData(packageDefinition, compiledPackage, userId);
@@ -129,8 +134,8 @@ namespace Umbraco.Cms.Core.Services.Implement
_auditService.Add(AuditType.PackagerInstall, userId, -1, "Package", $"Package data installed for package '{compiledPackage.Name}'.");
// trigger the ImportPackage event
_eventAggregator.Publish(new ImportPackageNotification(summary, compiledPackage));
// trigger the ImportedPackage event
_eventAggregator.Publish(new ImportedPackageNotification(summary, compiledPackage));
return summary;
}
@@ -240,22 +245,5 @@ namespace Umbraco.Cms.Core.Services.Implement
}
#endregion
#region Event Handlers
/// <summary>
/// Occurs before Importing umbraco package
/// </summary>
public static event TypedEventHandler<IPackagingService, ImportPackageEventArgs<string>> ImportingPackage;
/// <summary>
/// Occurs after a package is imported
/// </summary>
public static event TypedEventHandler<IPackagingService, ImportPackageEventArgs<InstallationSummary>> ImportedPackage;
#endregion
}
}