Merge branch 'stable'

Author: renemadsen

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/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/src/app/plugins/modules/backend-configuration-pn/models/task-tracker/task.model.ts

@@ -23,6 +23,7 @@ export interface TaskModel {
   weeks: WeekListModel[];
   sdkFolderName: string;
   createdInWizard: boolean;
+  movedToExpiredFolder: boolean
 }
 
 export interface WeekListModel {

eform-client/src/app/plugins/modules/backend-configuration-pn/modules/task-tracker/components/task-tracker-table/task-tracker-table.component.ts

@@ -48,9 +48,6 @@ export class TaskTrackerTableComponent implements OnInit, OnChanges {
   enabledHeadersNumber: number = 7;
   propertyHeaderEnabled: boolean = false;
   currentDate: Date = this.setDate(new Date());
-  // changedate is "2025-10-30 00:00:00"
-  parsedDate = Date.parse('2025-11-15 00:00:00');
-  changeDate: Date = new Date(this.parsedDate);
 
   tableHeaders: MtxGridColumn[] = [
     {header: this.translateService.stream('Id'), field: 'complianceId', sortProp: {id: 'Id'}, sortable: false},
@@ -77,15 +74,15 @@ export class TaskTrackerTableComponent implements OnInit, OnChanges {
       buttons: [  // action buttons for each row
         {
           // eslint-disable-next-line max-len
-          iif: (record: TaskModel) => (record.createdInWizard && !record.taskIsExpired) || (record.taskIsExpired && record.createdInWizard && record.deadlineTask < this.changeDate),
+          iif: (record: TaskModel) => (record.createdInWizard && !record.taskIsExpired) || (record.taskIsExpired && record.createdInWizard && !record.movedToExpiredFolder),
           type: 'icon',
           icon: 'edit',
           tooltip: this.translateService.stream('Edit'),
           click: (record: TaskModel) => this.redirectToCompliance(record),
         },
         {
           // eslint-disable-next-line max-len
-          iif: (record: TaskModel) => record.createdInWizard && record.deadlineTask < this.changeDate,
+          iif: (record: TaskModel) => record.createdInWizard && !record.movedToExpiredFolder,
           type: 'icon',
           tooltip:  this.translateService.stream('Delete Case'),
           icon: 'delete',