Master changes

eFormAPI/Plugins/BackendConfiguration.Pn/BackendConfiguration.Pn.Integration.Test/BackendConfiguration.Pn.Integration.Test.csproj

@@ -14,7 +14,7 @@
         <PackageReference Include="NSubstitute" Version="5.3.0" />
         <PackageReference Include="NUnit" Version="4.4.0" />
         <PackageReference Include="NUnit3TestAdapter" Version="5.2.0" />
-        <PackageReference Include="NUnit.Analyzers" Version="4.11.1">
+        <PackageReference Include="NUnit.Analyzers" Version="4.11.2">
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>

eFormAPI/Plugins/BackendConfiguration.Pn/BackendConfiguration.Pn.Test/BackendConfiguration.Pn.Test.csproj

@@ -11,7 +11,7 @@
       <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.0" />
       <PackageReference Include="NSubstitute" Version="5.3.0" />
       <PackageReference Include="NUnit" Version="4.4.0" />
-      <PackageReference Include="NUnit.Analyzers" Version="4.11.1">
+      <PackageReference Include="NUnit.Analyzers" Version="4.11.2">
         <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         <PrivateAssets>all</PrivateAssets>
       </PackageReference>

eFormAPI/Plugins/BackendConfiguration.Pn/BackendConfiguration.Pn/BackendConfiguration.Pn.csproj

@@ -219,15 +219,15 @@
       <PackageReference Include="Google.Apis.Sheets.v4" Version="1.70.0.3819" />
       <PackageReference Include="HtmlToOpenXml.dll" Version="3.2.8" />
       <PackageReference Include="Ical.Net" Version="5.1.1" />
-      <PackageReference Include="Microting.eForm" Version="9.0.69" />
-      <PackageReference Include="Microting.EformAngularFrontendBase" Version="9.0.57" />
-      <PackageReference Include="Microting.eFormApi.BasePn" Version="9.0.61" />
+      <PackageReference Include="Microting.eForm" Version="9.0.70" />
+      <PackageReference Include="Microting.EformAngularFrontendBase" Version="9.0.58" />
+      <PackageReference Include="Microting.eFormApi.BasePn" Version="9.0.62" />
       <PackageReference Include="McMaster.NETCore.Plugins" Version="2.0.0" />
-      <PackageReference Include="Microting.EformBackendConfigurationBase" Version="9.0.3" />
-      <PackageReference Include="Microting.eFormCaseTemplateBase" Version="8.0.119" />
-      <PackageReference Include="Microting.ItemsPlanningBase" Version="8.0.119" />
-      <PackageReference Include="Microting.TimePlanningBase" Version="9.0.62" />
-      <PackageReference Include="QuestPDF" Version="2025.7.3" />
+      <PackageReference Include="Microting.EformBackendConfigurationBase" Version="9.0.4" />
+      <PackageReference Include="Microting.eFormCaseTemplateBase" Version="8.0.120" />
+      <PackageReference Include="Microting.ItemsPlanningBase" Version="8.0.120" />
+      <PackageReference Include="Microting.TimePlanningBase" Version="9.0.63" />
+      <PackageReference Include="QuestPDF" Version="2025.7.4" />
       <PackageReference Include="HarfBuzzSharp.NativeAssets.Linux" Version="8.3.1.2" />
       <PackageReference Include="SkiaSharp.NativeAssets.Linux.NoDependencies" Version="3.119.1" />
       <PackageReference Include="Sentry" Version="5.16.2" />

eFormAPI/Plugins/BackendConfiguration.Pn/BackendConfiguration.Pn/Infrastructure/Helpers/BackendConfigurationAreaRulePlanningsServiceHelper.cs

@@ -1,3 +1,4 @@
+#nullable enable
 using System;
 using System.Collections.Generic;
 using System.Linq;

eFormAPI/Plugins/BackendConfiguration.Pn/BackendConfiguration.Pn/Infrastructure/Helpers/BackendConfigurationTaskTrackerHelper.cs

@@ -70,7 +70,8 @@ public static async Task<OperationDataResult<List<TaskTrackerModel>>> Index(
 				.Select(x => new
 				{
 					x.PropertyId, x.PlanningId, x.Deadline, x.MicrotingSdkCaseId, x.MicrotingSdkeFormId, x.Id, x.AreaId,
-					x.PlanningCaseSiteId
+					x.PlanningCaseSiteId,
+					x.MovedToExpiredFolder
 				})
 				.ToListAsync();
 
@@ -289,6 +290,7 @@ public static async Task<OperationDataResult<List<TaskTrackerModel>>> Index(
 						SdkFolderName =
 							folderTranslations.FirstOrDefault(x => x.FolderId == planning.SdkFolderId) == null ? "" : folderTranslations.First(x => x.FolderId == planning.SdkFolderId).Name,
 						CreatedInWizard = areaRuleCreatedInWizard,
+						MovedToExpiredFolder = compliance.MovedToExpiredFolder
 					};
 
 					if (complianceModel.SdkCaseId == 0 && complianceModel.DeadlineTask < dateTimeNow)

eFormAPI/Plugins/BackendConfiguration.Pn/BackendConfiguration.Pn/Infrastructure/Helpers/GoogleSheetHelper.cs

@@ -163,7 +163,7 @@ public static async Task PushToGoogleSheet(Core core, TimePlanningPnDbContext db
 
                 // ... existing code ...
 
-                SetAlternatingColumnColors(service, googleSheetId, sheetId!.Value, newHeaders.Count, logger);
+                // SetAlternatingColumnColors(service, googleSheetId, sheetId!.Value, newHeaders.Count, logger);
 
                 logger.LogInformation("Headers are already up-to-date.");
             }

eFormAPI/Plugins/BackendConfiguration.Pn/BackendConfiguration.Pn/Infrastructure/Helpers/WorkOrderHelper.cs

@@ -1,3 +1,4 @@
+#nullable enable
 using System;
 using System.Collections.Generic;
 using System.Globalization;

eFormAPI/Plugins/BackendConfiguration.Pn/BackendConfiguration.Pn/Infrastructure/Models/Files/BackendConfigurationFileRequestModel.cs

@@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
+#nullable enable
 namespace BackendConfiguration.Pn.Infrastructure.Models.Files;
 
 using Microting.eFormApi.BasePn.Infrastructure.Models.Common;

eFormAPI/Plugins/BackendConfiguration.Pn/BackendConfiguration.Pn/Infrastructure/Models/TaskTracker/TaskTrackerModel.cs

@@ -47,7 +47,7 @@ public class TaskTrackerModel
 	/// <summary>
 	/// Gets or sets the tags of the task tracker model.
 	/// </summary>
-	public List<CommonTagModel> Tags { get; set; } 
+	public List<CommonTagModel> Tags { get; set; }
 		= [];
 
 	/// <summary>
@@ -130,4 +130,6 @@ public class TaskTrackerModel
     public string SdkFolderName { get; set; }
 
     public bool CreatedInWizard { get; set; }
+
+    public bool MovedToExpiredFolder { get; set; }
 }

eFormAPI/Plugins/BackendConfiguration.Pn/BackendConfiguration.Pn/Infrastructure/PairItemWithSiteHelper.cs

@@ -396,7 +396,7 @@ await sdkDbContext.FolderTranslations.SingleOrDefaultAsync(x =>
 
     private static async Task<Folder> GetTopFolder(int folderId, MicrotingDbContext dbContext)
     {
-        var result = await dbContext.Folders.FirstOrDefaultAsync(y => y.Id == folderId).ConfigureAwait(false);
+        var result = await dbContext.Folders.FirstAsync(y => y.Id == folderId).ConfigureAwait(false);
         if (result.ParentId != null)
         {
             result = await GetTopFolder((int)result.ParentId, dbContext).ConfigureAwait(false);

eFormAPI/Plugins/BackendConfiguration.Pn/BackendConfiguration.Pn/Services/BackendConfigurationPropertiesService/BackendConfigurationPropertiesService.cs

@@ -611,7 +611,7 @@ public async Task<OperationDataResult<List<PropertyFolderModel>>> GetLinkedFolde
                 .Where(x => x.Id == propertyId)
                 .Where(x => x.WorkflowState != Constants.WorkflowStates.Removed)
                 .Where(x => x.FolderId.HasValue)
-                .Select(x => x.FolderId.Value)
+                .Select(x => x.FolderId!.Value)
                 .ToListAsync();
 
             folderIds.AddRange(await backendConfigurationPnDbContext.ProperyAreaFolders
@@ -655,7 +655,7 @@ public async Task<OperationDataResult<List<PropertyFolderModel>>> GetLinkedFolde
                 .Where(x => propertyIds.Contains(x.Id))
                 .Where(x => x.WorkflowState != Constants.WorkflowStates.Removed)
                 .Where(x => x.FolderId.HasValue)
-                .Select(x => x.FolderId.Value)
+                .Select(x => x.FolderId!.Value)
                 .ToListAsync();
 
             folderIds.AddRange(await backendConfigurationPnDbContext.ProperyAreaFolders
@@ -748,6 +748,12 @@ public async Task<OperationDataResult<List<CommonDictionaryModel>>> GetLinkedSit
                 //.Where(x => propertyIds.Contains(x.PropertyId))
                 .Where(x => x.WorkflowState != Constants.WorkflowStates.Removed);
 
+            // if propertyIds is null or empty return an empty list
+            if (propertyIds == null || !propertyIds.Any())
+            {
+                return new OperationDataResult<List<CommonDictionaryModel>>(true, new List<CommonDictionaryModel>());
+            }
+
             if (propertyIds.Any())
             {
                 query = query.Where(x => propertyIds.Contains(x.PropertyId));

eform-client/cypress/e2e/plugins/backend-configuration-pn/c/task-wizard.delete.spec.cy.ts

@@ -98,12 +98,38 @@ describe('Area rules type 1', () => {
     cy.wait(500);
 
     cy.get('.cdk-row').should('have.length', 1);
-    cy.get('.cdk-row .cdk-column-actions .deleteBtn.mat-warn').first().click();
+    // Open the action menu
+    cy.get('.task-actions')
+      .first()
+      .find('#actionMenu')
+      .should('be.visible')
+      .click({ force: true });
+
+    // Click the Delete Task button inside the opened menu
+    cy.get('.cdk-overlay-container')
+      .find('[id^=deleteTaskBtn]')
+      .should('be.visible')
+      .first()
+      .click({ force: true });
+
     cy.get('#taskWizardDeleteCancelBtn').click();
     cy.wait(500);
     cy.get('.cdk-row').should('have.length', 1);
 
-    cy.get('.cdk-row .cdk-column-actions .deleteBtn.mat-warn').first().click();
+    // Open the action menu again
+    cy.get('.task-actions')
+      .first()
+      .find('#actionMenu')
+      .should('be.visible')
+      .click({ force: true });
+
+    // Click the Delete Task button inside the opened menu
+    cy.get('.cdk-overlay-container')
+      .find('[id^=deleteTaskBtn]')
+      .should('be.visible')
+      .first()
+      .click({ force: true });
+
     cy.get('#taskWizardDeleteDeleteBtn').click();
     cy.wait(500);
     cy.get('.cdk-row').should('not.exist');

eform-client/e2e/Page objects/BackendConfiguration/BackendConfigurationAreaRules.page.ts

@@ -167,6 +167,14 @@ export class BackendConfigurationAreaRulesPage extends Page {
   }
 
   public async updateEntityList() {
+    // Open the action menu first (required for type 3 area rules where the button is in a dropdown)
+    await browser.pause(1000);
+    const actionMenu = await $$('#actionMenu')[0];
+    await actionMenu.waitForDisplayed({ timeout: 40000 });
+    await actionMenu.waitForClickable({ timeout: 40000 });
+    await actionMenu.click();
+    await browser.pause(1000);
+
     const ele = await $(`.updateEntityList`);
     await ele.waitForDisplayed({ timeout: 40000 });
     await ele.waitForClickable({ timeout: 40000 });
@@ -333,7 +341,9 @@ export class BackendConfigurationAreaRulesPage extends Page {
     } else {
       await (await this.entityListSaveBtn()).click();
     }
-    await (await this.updateEntityList()).waitForClickable({ timeout: 40000 })
+    // Wait for the action menu button to be clickable again (instead of opening the menu)
+    const actionMenu = await $$('#actionMenu')[0];
+    await actionMenu.waitForClickable({ timeout: 40000 });
   }
 
   public async editEntityItem(index: number, newName: string, clickCancel = false) {
@@ -466,6 +476,7 @@ export class AreaRuleRowObject {
   }
 
   public async delete(clickCancel = false, waitCreateBtn = true) {
+    // await this.clickActionsMenu();
     if (this.deleteRuleBtn) {
       await this.openDeleteModal();
       await this.closeDeleteModal(clickCancel, waitCreateBtn);
@@ -505,10 +516,17 @@ export class AreaRuleRowObject {
     clickCancel = false,
     waitCreateBtn = true
   ) {
+    // await this.clickActionsMenu();
     await this.openEditModal(areaRule);
     await this.closeEditModal(clickCancel, waitCreateBtn);
   }
 
+  private async clickActionsMenu() {
+    await browser.pause(1000);
+    await $$('#actionMenu')[0].click();
+    await browser.pause(1000);
+  }
+
   public async openEditModal(areaRule: AreaRuleCreateUpdate) {
     await this.editRuleBtn.click();
     await browser.pause(500);

eform-client/e2e/Page objects/BackendConfiguration/BackendConfigurationDocuments.page.ts

@@ -283,10 +283,17 @@ export class FileRowObject {
   }
 
   public async delete(clickCancel = false) {
+    await this.clickActionsMenu();
     await this.openDeleteModal();
     await this.closeDeleteModal(clickCancel);
   }
 
+  private async clickActionsMenu() {
+    await browser.pause(1000);
+    await $$('#actionMenu')[0].click();
+    await browser.pause(1000);
+  }
+
   public async openDeleteModal() {
     await this.deleteFileBtn.click();
     await (
@@ -310,6 +317,7 @@ export class FileRowObject {
   }
 
   public async editFile(fileEdit: BackendFileEdit, clickCancel = false) {
+    await this.clickActionsMenu();
     await this.openEditModal(fileEdit);
     await this.closeEditModal(clickCancel);
     if (fileEdit.tags && fileEdit.tags.length > 0) {

eform-client/e2e/Page objects/BackendConfiguration/BackendConfigurationFiles.page.ts

@@ -268,8 +268,6 @@ export class FileRowObject {
   constructor() {
   }
 
-  public row: WebdriverIO.Element;
-  public checkbox: WebdriverIO.Element;
   public id: number;
   public createDate: string;
   public fileName: string;
@@ -282,45 +280,32 @@ export class FileRowObject {
 
   public async getRow(rowNum: number): Promise<FileRowObject> {
     rowNum = rowNum - 1;
-    this.row = (await $$('tbody > tr'))[rowNum];
-    if (this.row) {
-      this.checkbox = await this.row.$('.mat-column-select .column-select');
-      this.id = +await (await this.row.$('.mat-column-id span')).getText();
-      this.createDate = await (await this.row.$('.mat-column-createDate span')).getText();
-      this.fileName = await (await this.row.$('.mat-column-fileName span')).getText();
-      const properties = await this.row.$$('.mat-column-property mat-chip');
-      this.properties = [];
-      for (let i = 0; i < properties.length; i++) {
-        const text = await properties[i].getText();
-        this.properties.push(text.toString());
-      }
-      // if (properties.length > 0) {
-      //   properties[properties.length - 1] = properties[properties.length - 1].replace('edit', ''); // delete button
-      //   this.properties = properties
-      //     .filter(x => x) // delete empty strings
-      //     .map(x => x.replaceAll('\n', '')); // delete enters
-      // }
-      const tags = await this.row.$$('.mat-column-tags mat-chip');
-      this.tags = [];
-      for (let i = 0; i < tags.length; i++) {
-        const text = await tags[i].getText();
-        this.tags.push(text.toString());
-      }
-      // if (tags.length > 0) {
-      // //   tags[tags.length - 1] = tags[tags.length - 1].replace('edit', ''); // delete button
-      //    this.tags = tags
-      //      //.filter(x => x.te) // delete empty strings
-      //      .map(x => (await x.getText()).replaceAll('\n', '')); // delete enters
-      // }
-      this.editTagsBtn = await this.row.$('.mat-column-tags button');
-      this.viewPDFBtn = await this.row.$$('.mat-column-actions button')[0];
-      this.editFileNameBtn = await this.row.$$('.mat-column-actions button')[1];
-      this.deleteFileBtn = await this.row.$$('.mat-column-actions button')[2];
+    this.id = +await (await $('#fileId-'+rowNum)).getText();
+    this.createDate = await (await $('#fileCreateDate-'+rowNum)).getText();
+    this.fileName = await (await $('#fileName-'+rowNum)).getText();
+    // Get properties from mat-chip elements - need to use row context since it's dynamic
+    const row = (await $$('tbody > tr'))[rowNum];
+    const properties = await row.$$('.mat-column-property mat-chip');
+    this.properties = [];
+    for (let i = 0; i < properties.length; i++) {
+      const text = await properties[i].getText();
+      this.properties.push(text.toString());
     }
+    const tags = await row.$$('.mat-column-tags mat-chip');
+    this.tags = [];
+    for (let i = 0; i < tags.length; i++) {
+      const text = await tags[i].getText();
+      this.tags.push(text.toString());
+    }
+    this.editTagsBtn = await $('#editTagsBtn-'+rowNum);
+    this.viewPDFBtn = await $('#viewPdfBtn-'+rowNum);
+    this.editFileNameBtn = await $('#editFilenameBtn-'+rowNum);
+    this.deleteFileBtn = await $('#deleteFileBtn-'+rowNum);
     return this;
   }
 
   public async delete(clickCancel = false) {
+    await this.clickActionsMenu();
     await this.openDeleteModal();
     await this.closeDeleteModal(clickCancel);
   }
@@ -348,13 +333,20 @@ export class FileRowObject {
   }
 
   public async editFile(fileEdit: BackendFileEdit, clickCancel = false) {
+    await this.clickActionsMenu();
     await this.openEditModal(fileEdit);
     await this.closeEditModal(clickCancel);
     if (fileEdit.tags && fileEdit.tags.length > 0) {
       await this.editTags(fileEdit.tags);
     }
   }
 
+  private async clickActionsMenu() {
+    await browser.pause(1000);
+    await $$('#actionMenu')[0].click();
+    await browser.pause(1000);
+  }
+
   public async openEditModal(fileEdit: BackendFileEdit) {
     await this.editFileNameBtn.click();
     await (