From dedef6ba20a317b22d7181c10de4b02ab881cb2b Mon Sep 17 00:00:00 2001 From: natalie beatty Date: Thu, 3 Sep 2026 15:14:06 -0400 Subject: [PATCH 1/4] update DataOperationFailure query to reflect table changes --- .../SystemCenterNotification/Controllers/EmailTypeController.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Applications/SystemCenterNotification/Controllers/EmailTypeController.cs b/Source/Applications/SystemCenterNotification/Controllers/EmailTypeController.cs index 69a729bcd..720a08589 100644 --- a/Source/Applications/SystemCenterNotification/Controllers/EmailTypeController.cs +++ b/Source/Applications/SystemCenterNotification/Controllers/EmailTypeController.cs @@ -520,7 +520,7 @@ private List GetEmailTimeline(PostData postData, int SentEmailID) id++; } - DataOperationFailure[] dataOperationFailureRecords = new TableOperations(connection).QueryRecordsWhere("FileGroupID = {0}", fileGroupRecord.ID).ToArray(); + DataOperationFailure[] dataOperationFailureRecords = new TableOperations(connection).QueryRecordsWhere("FileGroupAnalysisJobID = {0}", fileGroupRecord.ID).ToArray(); foreach (DataOperationFailure dataOperationFailure in dataOperationFailureRecords) { From d8974d50f605db5e365f0390c9a3cb2596d8b136 Mon Sep 17 00:00:00 2001 From: natalie beatty Date: Thu, 3 Sep 2026 16:44:21 -0400 Subject: [PATCH 2/4] use FileGroupAnalysisJob for Processing Start and End times --- .../Controllers/EmailTypeController.cs | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Source/Applications/SystemCenterNotification/Controllers/EmailTypeController.cs b/Source/Applications/SystemCenterNotification/Controllers/EmailTypeController.cs index 720a08589..18549314d 100644 --- a/Source/Applications/SystemCenterNotification/Controllers/EmailTypeController.cs +++ b/Source/Applications/SystemCenterNotification/Controllers/EmailTypeController.cs @@ -493,11 +493,13 @@ private List GetEmailTimeline(PostData postData, int SentEmailID) id++; + FileGroupAnalysisJob fileGroupAnalysisJobRecord = new TableOperations(connection).QueryRecordWhere("FileGroupID = {0}", fileGroupRecord.ID); + timeline.Add(new TimelineItem() { Description = "File Group Processing", - Start = fileGroupRecord.ProcessingStartTime, - End = fileGroupRecord.ProcessingEndTime, + Start = fileGroupAnalysisJobRecord.ProcessingStartTime, + End = fileGroupAnalysisJobRecord.ProcessingEndTime, ID = id }); @@ -520,7 +522,7 @@ private List GetEmailTimeline(PostData postData, int SentEmailID) id++; } - DataOperationFailure[] dataOperationFailureRecords = new TableOperations(connection).QueryRecordsWhere("FileGroupAnalysisJobID = {0}", fileGroupRecord.ID).ToArray(); + DataOperationFailure[] dataOperationFailureRecords = new TableOperations(connection).QueryRecordsWhere("FileGroupAnalysisJobID = {0}", fileGroupAnalysisJobRecord.ID).ToArray(); foreach (DataOperationFailure dataOperationFailure in dataOperationFailureRecords) { From 50a2a73b6ea08aa32e1a6e513b8a5a5c8ababf53 Mon Sep 17 00:00:00 2001 From: natalie beatty Date: Thu, 3 Sep 2026 16:44:40 -0400 Subject: [PATCH 3/4] fix navigation on delete Email Category --- .../Scripts/TSX/EmailCategory/EmailCategoryPage.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Applications/SystemCenterNotification/Scripts/TSX/EmailCategory/EmailCategoryPage.tsx b/Source/Applications/SystemCenterNotification/Scripts/TSX/EmailCategory/EmailCategoryPage.tsx index ae2f3674e..5b8de2bd1 100644 --- a/Source/Applications/SystemCenterNotification/Scripts/TSX/EmailCategory/EmailCategoryPage.tsx +++ b/Source/Applications/SystemCenterNotification/Scripts/TSX/EmailCategory/EmailCategoryPage.tsx @@ -105,7 +105,7 @@ const EmailCategoryPage = (props: IProps) => { CallBack={(conf) => { if (conf) { dispatch(EmailCategorySlice.DBAction({ verb: 'DELETE', record: category })); - window.location.href = `${homePath}/Categories`; + window.location.href = `${homePath}Categories`; } setShowDelete(false); }} /> From 0f0a1d3c7630cfe99b900f35df5e57557650791b Mon Sep 17 00:00:00 2001 From: natalie beatty Date: Fri, 4 Sep 2026 10:03:17 -0400 Subject: [PATCH 4/4] get FileGroupAnalysisJob with highest Processing Version --- .../SystemCenterNotification/Controllers/EmailTypeController.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Applications/SystemCenterNotification/Controllers/EmailTypeController.cs b/Source/Applications/SystemCenterNotification/Controllers/EmailTypeController.cs index 18549314d..8f71f225f 100644 --- a/Source/Applications/SystemCenterNotification/Controllers/EmailTypeController.cs +++ b/Source/Applications/SystemCenterNotification/Controllers/EmailTypeController.cs @@ -493,7 +493,7 @@ private List GetEmailTimeline(PostData postData, int SentEmailID) id++; - FileGroupAnalysisJob fileGroupAnalysisJobRecord = new TableOperations(connection).QueryRecordWhere("FileGroupID = {0}", fileGroupRecord.ID); + FileGroupAnalysisJob fileGroupAnalysisJobRecord = new TableOperations(connection).QueryRecord("ProcessingVersion DESC", new RecordRestriction("FileGroupID = {0}", fileGroupRecord.ID)); timeline.Add(new TimelineItem() {