Merge pull request #4409 from dfe-analytical-services/EES-4674

EES-4674 fix table alignment bug
dfe-analytical-services · Nov 22, 2023 · 33f0314 · 33f0314
2 parents 0ff9fa6 + 0ec86e9
commit 33f0314
Show file tree

Hide file tree

Showing 3 changed files with 406 additions and 18 deletions.
diff --git a/...n-statistics-common/src/modules/table-tool/utils/__data__/testTableDataWithMergedCells.ts b/...n-statistics-common/src/modules/table-tool/utils/__data__/testTableDataWithMergedCells.ts
@@ -70,6 +70,22 @@ const category2Group1Filter2 = new CategoryFilter({
   category: 'Category 2',
 });
 
+const category3Group1Filter1 = new CategoryFilter({
+  value: 'category3_group1_filter1',
+  label: 'Category 3 Group 1 Filter 1',
+  group: 'Group 1',
+  isTotal: false,
+  category: 'Category 3',
+});
+
+const category3Group1Filter2 = new CategoryFilter({
+  value: 'category3_group1_filter2',
+  label: 'Category 3 Group 1 Filter 2',
+  group: 'Group 1',
+  isTotal: false,
+  category: 'Category 3',
+});
+
 export const testTableWithOnlyMergedCellsInColumnHeadersConfig: TableHeadersConfig =
   {
     columns: [category1Group1Filter1, category1Group2Filter2],
@@ -734,3 +750,137 @@ export const testTableWithMergedCellsAndMissingData: FullTable = {
     },
   ],
 };
+
+export const testTableWithMergedCellsAndMissingDataColHeadersConfig2: TableHeadersConfig =
+  {
+    columns: [indicator1],
+    columnGroups: [
+      [timePeriod1],
+      [category3Group1Filter1, category3Group1Filter2],
+      [category1Group1Filter1, category1Group2Filter1, category1Group2Filter2],
+    ],
+    rows: [category2Group1Filter1, category2Group1Filter2],
+    rowGroups: [],
+  };
+
+export const testTableWithMergedCellsAndMissingDataRowHeadersConfig2: TableHeadersConfig =
+  {
+    columns: [category2Group1Filter1, category2Group1Filter2],
+    columnGroups: [],
+    rows: [indicator1],
+    rowGroups: [
+      [timePeriod1],
+      [category3Group1Filter1, category3Group1Filter2],
+      [category1Group1Filter1, category1Group2Filter1, category1Group2Filter2],
+    ],
+  };
+
+export const testTableWithMergedCellsAndMissingData2: FullTable = {
+  subjectMeta: {
+    ...testInitialTableSubjectMeta,
+    filters: {
+      Category2: {
+        name: 'category_2',
+        options: [category2Group1Filter1, category2Group1Filter2],
+        order: 2,
+      },
+      Category1: {
+        name: 'category_1',
+        options: [
+          category1Group1Filter1,
+          category1Group2Filter1,
+          category1Group2Filter2,
+        ],
+        order: 5,
+      },
+      Category3: {
+        name: 'category_3',
+        options: [category3Group1Filter1, category3Group1Filter2],
+        order: 6,
+      },
+    },
+    indicators: [indicator1],
+    locations: [location1],
+    timePeriodRange: [timePeriod1],
+  },
+  results: [
+    {
+      filters: [
+        category3Group1Filter1.id,
+        category2Group1Filter1.id,
+        category1Group1Filter1.id,
+      ],
+      geographicLevel: 'country',
+      locationId: location1.value,
+      measures: {
+        [indicator1.id]: '5',
+      },
+      timePeriod: '2012_AY',
+    },
+    {
+      filters: [
+        category3Group1Filter1.id,
+        category2Group1Filter2.id,
+        category1Group1Filter1.id,
+      ],
+      geographicLevel: 'country',
+      locationId: location1.value,
+      measures: {
+        [indicator1.id]: '11',
+      },
+      timePeriod: '2012_AY',
+    },
+    {
+      filters: [
+        category3Group1Filter1.id,
+        category1Group2Filter2.id,
+        category2Group1Filter1.id,
+      ],
+      geographicLevel: 'country',
+      locationId: location1.value,
+      measures: {
+        [indicator1.id]: '37',
+      },
+      timePeriod: '2012_AY',
+    },
+    {
+      filters: [
+        category3Group1Filter1.id,
+        category1Group2Filter2.id,
+        category2Group1Filter2.id,
+      ],
+      geographicLevel: 'country',
+      locationId: location1.value,
+      measures: {
+        [indicator1.id]: '18',
+      },
+      timePeriod: '2012_AY',
+    },
+    {
+      filters: [
+        category2Group1Filter1.id,
+        category3Group1Filter2.id,
+        category1Group2Filter1.id,
+      ],
+      geographicLevel: 'country',
+      locationId: location1.value,
+      measures: {
+        [indicator1.id]: '39',
+      },
+      timePeriod: '2012_AY',
+    },
+    {
+      filters: [
+        category2Group1Filter2.id,
+        category3Group1Filter2.id,
+        category1Group2Filter1.id,
+      ],
+      geographicLevel: 'country',
+      locationId: location1.value,
+      measures: {
+        [indicator1.id]: '32',
+      },
+      timePeriod: '2012_AY',
+    },
+  ],
+};