Fix disaggregated download bugs

Author: ccxzhang

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "dhis2-downloader",
-  "version": "0.5.1",
+  "version": "0.5.2",
   "description": "DHIS2 Downloader",
   "main": "./out/main/index.js",
   "author": "globalfinancingfacility.org",

package.json

@@ -5,7 +5,8 @@ export const generateDownloadingUrl = (
   pe,
   co,
   format = 'json',
-  layout = { rows: ['ou', 'pe', 'dx'], columns: [] }) => {
+  layout = null
+) => {
   // Base dimension URL parts
   let parameters = `api/analytics.${format}?dimension=ou:${ou}&dimension=pe:${pe}&dimension=dx:${dx}`
 
@@ -18,15 +19,28 @@ export const generateDownloadingUrl = (
   let layoutParams =
     '&displayProperty=NAME&ignoreLimit=TRUE&hierarchyMeta=TRUE&hideEmptyRows=TRUE&showHierarchy=TRUE'
 
-  const rows = layout?.rows || ['ou', 'pe', 'dx']
-  const columns = layout?.columns || []
+  let rows = ['ou', 'pe', 'dx']
+  let columns = []
+
+  if (layout && typeof layout === 'object') {
+    rows = layout.rows || rows
+    columns = layout.columns || columns
+  }
+
+  // If co is present, add it to rows if not already included
+  if (co && co.length > 0) {
+    for (const cat of co) {
+      if (!rows.includes(cat) && !columns.includes(cat)) {
+        rows.push(cat) // You may customize this to push to `columns` instead if preferred
+      }
+    }
+  }
 
   if (rows.length > 0) layoutParams += `&rows=${rows.join(';')}`
   if (columns.length > 0) layoutParams += `&columns=${columns.join(';')}`
 
   return `${dhis2Url}/${parameters}${layoutParams}`
 }
-
 export const createDataChunks = (dxs, pe, ou, chunkSize, layout) => {
   const chunks = []