update expected files and fix for week dimension values

matomo-org · May 9, 2024 · c3fcf28 · c3fcf28
1 parent cd97196
commit c3fcf28
Show file tree

Hide file tree

Showing 103 changed files with 2,873 additions and 1 deletion.
diff --git a/src/data.ts b/src/data.ts
@@ -576,7 +576,8 @@ export function getData(request: GoogleAppsScript.Data_Studio.Request<ConnectorP
               value = value.toString().split('-').slice(0, 2).join('');
             } else if (matomoType === 'date_week') {
               // value is in YYYY-MM-DD, but must be converted to YYYYww
-              value = value.toString().split('-').shift() + dayjs(value).week();
+              const start = value.split(',')[0];
+              value = start.toString().split('-').shift() + dayjs(start).week();
             } else if (matomoType === 'date_year') {
               value = value.toString().split('-').shift();
             } else if (matomoType === 'datetime') {

diff --git a/...ata_Events.getName_withDateDimension.json → ...vents.getName_withDateDimension_date.json b/...ata_Events.getName_withDateDimension.json → ...vents.getName_withDateDimension_date.json
diff --git a/tests/appscript/expected/data_Events.getName_withDateDimension_date_month.json b/tests/appscript/expected/data_Events.getName_withDateDimension_date_month.json
@@ -0,0 +1,99 @@
+{
+  "filtersApplied": false,
+  "rows": [
+    {
+      "values": [
+        "202302",
+        "1220",
+        "Cart change",
+        "added - Diving Tank",
+        "2"
+      ]
+    },
+    {
+      "values": [
+        "202302",
+        "1087",
+        "Cart change",
+        "added - Basic Wetsuit",
+        "2"
+      ]
+    },
+    {
+      "values": [
+        "202302",
+        "986",
+        "Cart change",
+        "added - Scuba Fins",
+        "2"
+      ]
+    },
+    {
+      "values": [
+        "202302",
+        "495",
+        "Cart change",
+        "added - Diving Knife",
+        "3"
+      ]
+    },
+    {
+      "values": [
+        "202302",
+        "6492",
+        "Others",
+        "Others",
+        "11852"
+      ]
+    }
+  ],
+  "schema": [
+    {
+      "dataType": "STRING",
+      "label": "Month",
+      "name": "date_month",
+      "semantics": {
+        "conceptType": "DIMENSION",
+        "semanticType": "YEAR_MONTH"
+      }
+    },
+    {
+      "dataType": "NUMBER",
+      "label": "Events",
+      "name": "nb_events",
+      "semantics": {
+        "conceptType": "METRIC",
+        "isReaggregatable": false,
+        "semanticType": "NUMBER"
+      }
+    },
+    {
+      "dataType": "STRING",
+      "label": "Event Action",
+      "name": "Events_EventAction",
+      "semantics": {
+        "conceptType": "DIMENSION",
+        "semanticType": "TEXT"
+      }
+    },
+    {
+      "dataType": "STRING",
+      "label": "Event Name",
+      "name": "Events_EventName",
+      "semantics": {
+        "conceptType": "DIMENSION",
+        "semanticType": "TEXT"
+      }
+    },
+    {
+      "dataType": "NUMBER",
+      "label": "Maximum Event value",
+      "name": "max_event_value",
+      "semantics": {
+        "conceptType": "METRIC",
+        "isReaggregatable": false,
+        "semanticType": "NUMBER"
+      }
+    }
+  ]
+}
diff --git a/tests/appscript/expected/data_Events.getName_withDateDimension_date_year.json b/tests/appscript/expected/data_Events.getName_withDateDimension_date_year.json
@@ -0,0 +1,99 @@
+{
+  "filtersApplied": false,
+  "rows": [
+    {
+      "values": [
+        "2023",
+        "85046",
+        "Cart change",
+        "added - Diving Tank",
+        "4"
+      ]
+    },
+    {
+      "values": [
+        "2023",
+        "80792",
+        "Cart change",
+        "added - Basic Wetsuit",
+        "4"
+      ]
+    },
+    {
+      "values": [
+        "2023",
+        "51448",
+        "Cart change",
+        "added - Scuba Fins",
+        "4"
+      ]
+    },
+    {
+      "values": [
+        "2023",
+        "31860",
+        "Cart change",
+        "added - Diving Boots",
+        "2"
+      ]
+    },
+    {
+      "values": [
+        "2023",
+        "358771",
+        "Others",
+        "Others",
+        "26069"
+      ]
+    }
+  ],
+  "schema": [
+    {
+      "dataType": "STRING",
+      "label": "Year",
+      "name": "date_year",
+      "semantics": {
+        "conceptType": "DIMENSION",
+        "semanticType": "YEAR"
+      }
+    },
+    {
+      "dataType": "NUMBER",
+      "label": "Events",
+      "name": "nb_events",
+      "semantics": {
+        "conceptType": "METRIC",
+        "isReaggregatable": false,
+        "semanticType": "NUMBER"
+      }
+    },
+    {
+      "dataType": "STRING",
+      "label": "Event Action",
+      "name": "Events_EventAction",
+      "semantics": {
+        "conceptType": "DIMENSION",
+        "semanticType": "TEXT"
+      }
+    },
+    {
+      "dataType": "STRING",
+      "label": "Event Name",
+      "name": "Events_EventName",
+      "semantics": {
+        "conceptType": "DIMENSION",
+        "semanticType": "TEXT"
+      }
+    },
+    {
+      "dataType": "NUMBER",
+      "label": "Maximum Event value",
+      "name": "max_event_value",
+      "semantics": {
+        "conceptType": "METRIC",
+        "isReaggregatable": false,
+        "semanticType": "NUMBER"
+      }
+    }
+  ]
+}
diff --git a/tests/appscript/expected/schema_Actions.get.json b/tests/appscript/expected/schema_Actions.get.json
@@ -98,6 +98,33 @@
         "conceptType": "DIMENSION",
         "semanticType": "YEAR_MONTH_DAY"
       }
+    },
+    {
+      "dataType": "STRING",
+      "label": "Month",
+      "name": "date_month",
+      "semantics": {
+        "conceptType": "DIMENSION",
+        "semanticType": "YEAR_MONTH"
+      }
+    },
+    {
+      "dataType": "STRING",
+      "label": "Week (Mon - Sun)",
+      "name": "date_week",
+      "semantics": {
+        "conceptType": "DIMENSION",
+        "semanticType": "YEAR_WEEK"
+      }
+    },
+    {
+      "dataType": "STRING",
+      "label": "Year",
+      "name": "date_year",
+      "semantics": {
+        "conceptType": "DIMENSION",
+        "semanticType": "YEAR"
+      }
     }
   ]
 }
diff --git a/tests/appscript/expected/schema_Actions.getDownloads.json b/tests/appscript/expected/schema_Actions.getDownloads.json
@@ -37,6 +37,33 @@
         "conceptType": "DIMENSION",
         "semanticType": "YEAR_MONTH_DAY"
       }
+    },
+    {
+      "dataType": "STRING",
+      "label": "Month",
+      "name": "date_month",
+      "semantics": {
+        "conceptType": "DIMENSION",
+        "semanticType": "YEAR_MONTH"
+      }
+    },
+    {
+      "dataType": "STRING",
+      "label": "Week (Mon - Sun)",
+      "name": "date_week",
+      "semantics": {
+        "conceptType": "DIMENSION",
+        "semanticType": "YEAR_WEEK"
+      }
+    },
+    {
+      "dataType": "STRING",
+      "label": "Year",
+      "name": "date_year",
+      "semantics": {
+        "conceptType": "DIMENSION",
+        "semanticType": "YEAR"
+      }
     }
   ]
 }
diff --git a/tests/appscript/expected/schema_Actions.getEntryPageTitles.json b/tests/appscript/expected/schema_Actions.getEntryPageTitles.json
@@ -547,6 +547,33 @@
         "conceptType": "DIMENSION",
         "semanticType": "YEAR_MONTH_DAY"
       }
+    },
+    {
+      "dataType": "STRING",
+      "label": "Month",
+      "name": "date_month",
+      "semantics": {
+        "conceptType": "DIMENSION",
+        "semanticType": "YEAR_MONTH"
+      }
+    },
+    {
+      "dataType": "STRING",
+      "label": "Week (Mon - Sun)",
+      "name": "date_week",
+      "semantics": {
+        "conceptType": "DIMENSION",
+        "semanticType": "YEAR_WEEK"
+      }
+    },
+    {
+      "dataType": "STRING",
+      "label": "Year",
+      "name": "date_year",
+      "semantics": {
+        "conceptType": "DIMENSION",
+        "semanticType": "YEAR"
+      }
     }
   ]
 }
diff --git a/tests/appscript/expected/schema_Actions.getEntryPageUrls.json b/tests/appscript/expected/schema_Actions.getEntryPageUrls.json
@@ -547,6 +547,33 @@
         "conceptType": "DIMENSION",
         "semanticType": "YEAR_MONTH_DAY"
       }
+    },
+    {
+      "dataType": "STRING",
+      "label": "Month",
+      "name": "date_month",
+      "semantics": {
+        "conceptType": "DIMENSION",
+        "semanticType": "YEAR_MONTH"
+      }
+    },
+    {
+      "dataType": "STRING",
+      "label": "Week (Mon - Sun)",
+      "name": "date_week",
+      "semantics": {
+        "conceptType": "DIMENSION",
+        "semanticType": "YEAR_WEEK"
+      }
+    },
+    {
+      "dataType": "STRING",
+      "label": "Year",
+      "name": "date_year",
+      "semantics": {
+        "conceptType": "DIMENSION",
+        "semanticType": "YEAR"
+      }
     }
   ]
 }
diff --git a/tests/appscript/expected/schema_Actions.getExitPageTitles.json b/tests/appscript/expected/schema_Actions.getExitPageTitles.json
@@ -57,6 +57,33 @@
         "conceptType": "DIMENSION",
         "semanticType": "YEAR_MONTH_DAY"
       }
+    },
+    {
+      "dataType": "STRING",
+      "label": "Month",
+      "name": "date_month",
+      "semantics": {
+        "conceptType": "DIMENSION",
+        "semanticType": "YEAR_MONTH"
+      }
+    },
+    {
+      "dataType": "STRING",
+      "label": "Week (Mon - Sun)",
+      "name": "date_week",
+      "semantics": {
+        "conceptType": "DIMENSION",
+        "semanticType": "YEAR_WEEK"
+      }
+    },
+    {
+      "dataType": "STRING",
+      "label": "Year",
+      "name": "date_year",
+      "semantics": {
+        "conceptType": "DIMENSION",
+        "semanticType": "YEAR"
+      }
     }
   ]
 }