Adjust cancelation token

Barbarur · Mar 5, 2024 · cf69b73 · cf69b73
1 parent 97ea598
commit cf69b73
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 6 deletions.
diff --git a/src/NovaPointLibrary/Solutions/Automation/CheckInFileAuto.cs b/src/NovaPointLibrary/Solutions/Automation/CheckInFileAuto.cs
@@ -115,6 +115,8 @@ private async Task ProcessItems(string siteUrl, List oList, ProgressTracker pare
             var spoItem = new SPOListItemCSOM(_logger, _appInfo);
             await foreach (ListItem oItem in spoItem.GetAsync(siteUrl, oList, _param.ItemsParam))
             {
+                _appInfo.IsCancelled();
+
                 if (oItem.FileSystemObjectType.ToString() == "Folder") { continue; }
 
                 if (oItem.File.CheckOutType == CheckOutType.None) { continue; }

diff --git a/src/NovaPointLibrary/Solutions/Automation/RemoveFileVersionAuto.cs b/src/NovaPointLibrary/Solutions/Automation/RemoveFileVersionAuto.cs
@@ -99,6 +99,8 @@ private async Task ProcessItems(string siteUrl, List oList, ProgressTracker pare
             var spoItem = new SPOListItemCSOM(_logger, _appInfo);
             await foreach (ListItem oItem in spoItem.GetAsync(siteUrl, oList, _param.ItemsParam))
             {
+                _appInfo.IsCancelled();
+
                 if (oItem.FileSystemObjectType.ToString() == "Folder") { continue; }
 
                 try
@@ -175,8 +177,6 @@ private async Task RemoveFileVersions(string siteUrl, List oList, ListItem oItem
                                     fileVersionCollection.DeleteByID(fileVersionToDelete.ID);
                                 }
                                 clientContext.ExecuteQueryRetry();
-
-
                             }
                         }
                         catch (Exception ex)

diff --git a/src/NovaPointLibrary/Solutions/Automation/SetSiteCollectionAdminAuto.cs b/src/NovaPointLibrary/Solutions/Automation/SetSiteCollectionAdminAuto.cs
@@ -72,6 +72,8 @@ private async Task RunScriptAsync()
                 progress = new(_logger, collSiteCollections.Count);
                 foreach (var oSiteCollection in collSiteCollections)
                 {
+                    _appInfo.IsCancelled();
+
                     await SetAdmin(oSiteCollection.Url);
 
                     progress.ProgressUpdateReport();

diff --git a/src/NovaPointLibrary/Solutions/Report/PermissionsReport.cs b/src/NovaPointLibrary/Solutions/Report/PermissionsReport.cs
@@ -70,6 +70,7 @@ private async Task RunScriptAsync()
             SPOSitePermissionsCSOM sitePermissions = new(_logger, _appInfo, _param.PermissionsParam);
             await foreach (var siteResults in new SPOTenantSiteUrlsWithAccessCSOM(_logger, _appInfo, _param.SiteAccParam).GetAsyncNEW())
             {
+                _appInfo.IsCancelled();
 
                 if (!String.IsNullOrWhiteSpace(siteResults.ErrorMessage))
                 {
@@ -84,6 +85,8 @@ private async Task RunScriptAsync()
 
                     await foreach (var oUser in new SPOSiteUserCSOM(_logger, _appInfo).GetAsync(siteResults.SiteUrl, _param.UserParam, _userRetrievalExpressions))
                     {
+                        _appInfo.IsCancelled();
+
                         sb.Append($"{oUser.Title}: {oUser.UserPrincipalName} ");
                     }
 
@@ -99,6 +102,8 @@ private async Task RunScriptAsync()
                     {
                         await foreach(var record in sitePermissions.GetAsync(siteResults.SiteUrl, siteResults.Progress))
                         {
+                            _appInfo.IsCancelled();
+
                             FilterRecord(record);
                         }
                     }

diff --git a/src/NovaPointLibrary/Solutions/Report/SiteReport.cs b/src/NovaPointLibrary/Solutions/Report/SiteReport.cs
@@ -114,6 +114,8 @@ private async Task RunScriptAsync()
                 {
                     await foreach (var admins in _sitePermissions.GetAsync(oSiteCollection.Url, progress))
                     {
+                        _appInfo.IsCancelled();
+
                         recordSiteCollection.AddAdmins(admins);
                         _logger.RecordCSV(recordSiteCollection);
                     }
@@ -179,6 +181,8 @@ private async Task GetSubsitesAsync(string siteUrl, ProgressTracker parentProgre
             ProgressTracker progress = new(parentProgress, collSubsites.Count);
             foreach (var oSubsite in collSubsites)
             {
+                _appInfo.IsCancelled(); 
+
                 SiteReportRecord siteRecord = new(oSubsite);
 
                 _logger.RecordCSV(siteRecord);

diff --git a/src/NovaPointWPF/Pages/Solutions/Automation/RemoveFileVersionAutoForm.xaml b/src/NovaPointWPF/Pages/Solutions/Automation/RemoveFileVersionAutoForm.xaml
@@ -6,7 +6,7 @@
       xmlns:local="clr-namespace:NovaPointWPF.Pages.Solutions.Automation"
       xmlns:designmaterial="clr-namespace:NovaPointWPF.UserControls"
       mc:Ignorable="d" 
-      d:DesignHeight="1200" d:DesignWidth="600"
+      d:DesignHeight="1000" d:DesignWidth="600"
       Title="RemoveFileVersionAutoForm">
 
     <Grid Background="Transparent">

diff --git a/src/NovaPointWPF/Pages/Solutions/Automation/SetVersioningLimitAutoForm.xaml b/src/NovaPointWPF/Pages/Solutions/Automation/SetVersioningLimitAutoForm.xaml
@@ -31,23 +31,23 @@
 
                     <Label
                         Style="{DynamicResource SolutionFormLabel}"
-                        Content="Library major versioning limit"/>
+                        Content="Document Library major versioning limit"/>
 
                     <TextBox
                         Style="{DynamicResource SolutionFormTextBox}"
                         Text="{Binding LibraryMajorVersionLimit, Mode=TwoWay, NotifyOnSourceUpdated=True, NotifyOnTargetUpdated=True}"/>
 
                     <Label
                         Style="{DynamicResource SolutionFormLabel}"
-                        Content="Library minor versioning limit"/>
+                        Content="Document Library minor versioning limit"/>
 
                     <TextBox
                         Style="{DynamicResource SolutionFormTextBox}"
                         Text="{Binding LibraryMinorVersionLimit, Mode=TwoWay, NotifyOnSourceUpdated=True, NotifyOnTargetUpdated=True}"/>
 
                     <Label
                         Style="{DynamicResource SolutionFormLabel}"
-                        Content="List major versioning limit"/>
+                        Content="Item List major versioning limit"/>
 
                     <TextBox
                         Style="{DynamicResource SolutionFormTextBox}"