Merge pull request #4603 from bcgov/4600-sort-methodologies-chronologically-in-review-changes-page

4600 sort methodologies chronologically in review changes page

Author: Sepehr-Sobhani

bciers/apps/reporting/src/app/components/changeReview/utils/activityViewHelpers.tsx

@@ -1,4 +1,5 @@
 import {
+  compareMethodologyKeys,
   formatKey,
   singularizeLabel,
 } from "@reporting/src/app/components/shared/activityRenderUtils";
@@ -331,6 +332,14 @@ export const renderDiffTree = (items: SegmentedChange[]): React.ReactNode => {
     }
   }
 
+  // Sort methodology period (months/quarters) chronologically
+  const methodologyGroup = grouped.get("methodology");
+  if (methodologyGroup) {
+    methodologyGroup.children.sort((a, b) =>
+      compareMethodologyKeys(a.segs[0] ?? "", b.segs[0] ?? ""),
+    );
+  }
+
   return (
     <>
       {Array.from(grouped.entries()).map(([key, { label, children }]) => {

bciers/apps/reporting/src/app/components/shared/activityRenderUtils.ts

@@ -28,17 +28,19 @@ export const MONTH_QUARTER_ORDER: string[] = [
   "quarter4",
 ];
 
+export const compareMethodologyKeys = (a: string, b: string): number => {
+  const aIdx = MONTH_QUARTER_ORDER.indexOf(a);
+  const bIdx = MONTH_QUARTER_ORDER.indexOf(b);
+  if (aIdx === -1 && bIdx === -1) return 0;
+  if (aIdx === -1) return -1;
+  if (bIdx === -1) return 1;
+  return aIdx - bIdx;
+};
+
 export const sortMethodologyEntries = (
   entries: [string, unknown][],
 ): [string, unknown][] =>
-  [...entries].sort(([a], [b]) => {
-    const aIdx = MONTH_QUARTER_ORDER.indexOf(a);
-    const bIdx = MONTH_QUARTER_ORDER.indexOf(b);
-    if (aIdx === -1 && bIdx === -1) return 0; // both non-period: preserve order
-    if (aIdx === -1) return -1; // a is non-period: float to front
-    if (bIdx === -1) return 1; // b is non-period: float to front
-    return aIdx - bIdx; // both periods: sort chronologically
-  });
+  [...entries].sort(([a], [b]) => compareMethodologyKeys(a, b));
 
 /**
  * Explicit plural → singular label map for common array keys.