Skip to content

armgit / umami

Public Imported from GitHub
0

Umami is a privacy-first web and product analytics platform. Traffic, campaigns, behavior, conversions, and revenue in one place. No cookies, no surveillance, self-hosted or in the cloud.

Fix another date range bug.

Mike Caod57da4c04eae
diff --git a/hooks/useDateRange.js b/hooks/useDateRange.js
index 9a88a5a18..a507d59c5 100644
--- a/hooks/useDateRange.js
+++ b/hooks/useDateRange.js
@@ -9,7 +9,7 @@ export default function useDateRange(websiteId, defaultDateRange = '24hour') {
if (typeof globalDefault === 'string') {
globalDateRange = getDateRange(globalDefault);
- } else {
+ } else if (typeof globalDateRange === 'object') {
globalDateRange = {
...globalDefault,
startDate: parseISO(globalDefault.startDate),
diff --git a/package.json b/package.json
index bf34bf448..c0c74c962 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "umami",
- "version": "0.39.0",
+ "version": "0.40.0",
"description": "A simple, fast, website analytics alternative to Google Analytics. ",
"author": "Mike Cao <[email protected]>",
"license": "MIT",
@@ -11,10 +11,12 @@
},
"scripts": {
"dev": "next dev",
- "build": "npm-run-all build-tracker build-lang copy-db-schema build-db-client build-app",
+ "build": "npm-run-all build-tracker build-lang build-db build-app",
"start": "next start",
"build-app": "next build",
"build-tracker": "rollup -c rollup.tracker.config.js",
+ "build-db": "npm-run-all copy-db-schema build-db-client",
+ "build-lang": "npm-run-all format-lang compile-lang",
"copy-db-schema": "node scripts/copy-db-schema.js",
"build-db-schema": "dotenv prisma introspect",
"build-db-client": "dotenv prisma generate",
@@ -23,7 +25,6 @@
"build-postgresql-schema": "dotenv prisma introspect -- --schema=./prisma/schema.postgresql.prisma",
"build-postgresql-client": "dotenv prisma generate -- --schema=./prisma/schema.postgresql.prisma",
"generate-lang": "npm-run-all extract-lang merge-lang",
- "build-lang": "npm-run-all format-lang compile-lang",
"extract-lang": "formatjs extract {pages,components}/**/*.js --out-file build/messages.json",
"merge-lang": "node scripts/merge-lang.js",
"format-lang": "node scripts/format-lang.js",