Merge branch 'release/v0.17.0-beta' into khairul-syazwan/fix-button-ibm-plex-font-release-0.17

Author: khairul-syazwan

plugins/functions/analytics-svc/src/mri/endpoint/InclusionReportEndpoint.ts

@@ -551,22 +551,18 @@ export class InclusionReportEndpoint extends BaseQueryEngineEndpoint {
             return [];
         }
 
-        let basicDataInclusionReportFilters;
-        if (basicDataFilters.length === 1) {
-            basicDataInclusionReportFilters = [
-                structuredClone(basicDataFiltercard),
+        // Split Basic Data into distinct filtercards, one per constrained attribute.
+        // This must also happen for a single constrained attribute
+        const basicDataInclusionReportFilters = basicDataFilters.map((e) => {
+            // Clone overall structure of Basic Data filter card and replace attributes.content with individual Basic Data attributes.content
+            const basicDataFiltercardClone =
+                structuredClone(basicDataFiltercard);
+            basicDataFiltercardClone.content[0].attributes.content = [
+                structuredClone(e),
             ];
-        } else {
-            // Split Basic Data into distinct filtercards
-            basicDataInclusionReportFilters = basicDataFilters.map((e) => {
-                // Clone overall structure of Basic Data filter card and replace attributes.content with individual Basic Data attributes.content
-                const basicDataFiltercardClone =
-                    structuredClone(basicDataFiltercard);
-                basicDataFiltercardClone.content[0].attributes.content = [e];
-
-                return basicDataFiltercardClone;
-            });
-        }
+
+            return basicDataFiltercardClone;
+        });
 
         // Update basic data to use dynamically generated interactions.basicdata in cdm config
         basicDataInclusionReportFilters.forEach((e, idx) => {

plugins/ui/apps/portal/src/components/Charts/Common/Drilldown/DrilldownPrevalenceByMonthChart/DrilldownPrevalenceByMonthChart.tsx

@@ -28,16 +28,21 @@ const DrilldownPrevalenceByMonthChart: FC<DrilldownPrevalenceByMonthChartProps>
     );
   }
 
+  // Sort data by XCALENDARMONTH
+  const sortedData = [...data].sort((a: any, b: any) => {
+    return Number(a["XCALENDARMONTH"]) - Number(b["XCALENDARMONTH"]);
+  });
+
   // Parse and format line chart data
   // Parse XCALENDARMONTH from e.g 200910 -> 10/2009
-  const lineChartXAxisData = data.map(
+  const lineChartXAxisData = sortedData.map(
     (obj: any) => obj["XCALENDARMONTH"].toString().slice(-2) + "/" + obj["XCALENDARMONTH"].toString().slice(0, 4)
   );
 
   const series = [
     {
       type: "line",
-      data: data.map((obj: any) => Number(obj["YPREVALENCE1000PP"]).toFixed()),
+      data: sortedData.map((obj: any) => Number(obj["YPREVALENCE1000PP"]).toFixed()),
     },
   ];
 

plugins/ui/apps/portal/src/components/Charts/Common/Drilldown/DrilldownTrellisChart/DrilldownTrellisChart.tsx

@@ -56,8 +56,9 @@ const DrilldownTrellisChart: FC<DrilldownTrellisChartProps> = ({
   const TITLE_OFFSET = 6 / numRows; // Dynamic offset for grid titles
   const ROW_LABEL_OFFSET = 9 / numRows; // Dynamic offset for row labels
 
-  // Get keys from trellisData sorted
-  const sortedTrellisNames = Object.keys(trellisData).sort();
+  // Get keys from trellisData sorted naturally, so numeric ranges are ordered by value
+  // instead of lexicographically
+  const sortedTrellisNames = Object.keys(trellisData).sort((a, b) => a.localeCompare(b, undefined, { numeric: true }));
 
   // Calculate global y-axis range for harmonization across all plots
   const allYValues = data.map((obj: any) => Number(obj[trellisXAxisKey])).filter((v: number) => !isNaN(v));

plugins/ui/apps/vue-mri-ui-lib/src/components/ShinyViewer/CompleteRequiredFiltersModal.vue

@@ -154,7 +154,7 @@ import MessageBox from '../MessageBox.vue'
 import appButton from '@/lib/ui/app-button.vue'
 import ConceptSetTypeaheadField from './ConceptSetTypeaheadField.vue'
 import type { WizardFieldDefinition } from '@/utils/dashboardFlowUtils'
-import { isConditionField } from '@/utils/dashboardFlowUtils'
+import { isConditionField, normalizeWizardFieldValueForComparison } from '@/utils/dashboardFlowUtils'
 import InputParser from '@/lib/utils/InputParser'
 import RangeConstraintTokenDefinition from '@/lib/utils/RangeConstraintTokenDefinition'
 import RangeConstraintPatternDefinition from '@/lib/utils/RangeConstraintPatternDefinition'
@@ -460,7 +460,8 @@ function markFieldDirty(fieldId: string) {
   }
 
   // For regular fields
-  const hasChanged = currentValue !== initialValue
+  const hasChanged =
+    normalizeWizardFieldValueForComparison(currentValue) !== normalizeWizardFieldValueForComparison(initialValue)
 
   if (hasChanged) {
     dirtyFields.add(fieldId)

plugins/ui/apps/vue-mri-ui-lib/src/composables/useDashboardFlow.ts

@@ -998,6 +998,12 @@ export function useDashboardFlow(
     }
     const rawValue = rawInput?.value ?? rawInput
     if (rawValue === null || typeof rawValue === 'undefined' || String(rawValue).trim() === '') {
+      if (constraintType === 'text' || constraintType === 'conceptSet') {
+        return dispatch('updateConstraintValue', {
+          constraintId: constraint.id,
+          value: [],
+        })
+      }
       return Promise.reject(new Error(`Missing value for ${constraint.props.name || constraint.id}`))
     }
     const finalDisplayValue = displayValue || rawInput?.displayName || String(rawValue)

plugins/ui/apps/vue-mri-ui-lib/src/utils/__tests__/dashboardFlowUtils.test.ts

@@ -1,5 +1,11 @@
 import { describe, expect, it } from 'vitest'
-import { getWizardFlow, isWizardVisibleOnSurface, parseNumericInput, validateRequiredFields } from '../dashboardFlowUtils'
+import {
+  getWizardFlow,
+  isWizardVisibleOnSurface,
+  normalizeWizardFieldValueForComparison,
+  parseNumericInput,
+  validateRequiredFields,
+} from '../dashboardFlowUtils'
 
 const createExpression = (operator: string, value: string | number) => ({
   type: 'Expression' as const,
@@ -214,3 +220,15 @@ describe('wizard metadata helpers', () => {
     expect(getWizardFlow({ flow: 'table1-config' })).toBe('table1-config')
   })
 })
+
+describe('wizard field value helpers', () => {
+  it('treats null, undefined, and an empty string as the same empty form value', () => {
+    expect(normalizeWizardFieldValueForComparison(null)).toBe('')
+    expect(normalizeWizardFieldValueForComparison(undefined)).toBe('')
+    expect(normalizeWizardFieldValueForComparison('')).toBe('')
+  })
+
+  it('preserves non-empty field values', () => {
+    expect(normalizeWizardFieldValueForComparison('FEMALE')).toBe('FEMALE')
+  })
+})

plugins/ui/apps/vue-mri-ui-lib/src/utils/dashboardFlowUtils.ts

@@ -100,6 +100,10 @@ export interface RequiredFieldValidationResult {
   breakdown: FieldComparisonBreakdown[]
 }
 
+export function normalizeWizardFieldValueForComparison(value: unknown): unknown {
+  return value === null || typeof value === 'undefined' ? '' : value
+}
+
 function getLastPathSegment(path: string): string {
   const tokens = path.split('.')
   return tokens[tokens.length - 1] || path