Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	src/app/(main)/websites/[id]/reports/WebsiteReports.js

next.config.js

@@ -60,7 +60,7 @@ const redirects = [
   {
     source: '/settings',
     destination: process.env.CLOUD_MODE
-      ? `${process.env.CLOUD_URL}/websites`
+      ? `${process.env.CLOUD_URL}/settings/websites`
       : '/settings/websites',
     permanent: true,
   },

package.json

@@ -140,7 +140,7 @@
     "extract-react-intl-messages": "^4.1.1",
     "husky": "^8.0.3",
     "lint-staged": "^14.0.1",
-    "postcss": "^8.4.21",
+    "postcss": "^8.4.31",
     "postcss-flexbugs-fixes": "^5.0.2",
     "postcss-import": "^15.1.0",
     "postcss-preset-env": "7.8.3",

src/app/(main)/settings/users/UserWebsites.js

@@ -22,7 +22,7 @@ export function UserWebsites({ userId }) {
     <Page loading={isLoading} error={error}>
       {hasData && (
         <WebsitesTable
-          data={data}
+          data={data.data}
           onFilterChange={handleFilterChange}
           onPageChange={handlePageChange}
           onPageSizeChange={handlePageSizeChange}

src/lang/mn-MN.json

@@ -2,35 +2,35 @@
   "label.access-code": "Хандалтын код",
   "label.actions": "Үйлдлүүд",
   "label.activity-log": "Үйл ажиллагааны бүртгэл",
-  "label.add": "Add",
+  "label.add": "Нэмэх",
-  "label.add-description": "Add description",
+  "label.add-description": "Тайлбар нэмэх",
   "label.add-website": "Веб нэмэх",
   "label.admin": "Админ",
-  "label.after": "After",
+  "label.after": "Хойно",
   "label.all": "Бүх",
   "label.all-time": "Бүх цаг үеийн",
   "label.analytics": "Analytics",
-  "label.average": "Average",
+  "label.average": "Дундаж",
   "label.average-visit-time": "Зочилсон дундаж хугацаа",
   "label.back": "Буцах",
-  "label.before": "Before",
+  "label.before": "Өмнө",
   "label.bounce-rate": "Нэг хуудас үзээд гарсан",
-  "label.breakdown": "Breakdown",
+  "label.breakdown": "Задаргаа",
-  "label.browser": "Browser",
+  "label.browser": "Хөтөч",
   "label.browsers": "Хөтөч",
   "label.cancel": "Цуцлах",
   "label.change-password": "Нууц үг солих",
   "label.cities": "Хотууд",
-  "label.city": "City",
+  "label.city": "Хот",
   "label.clear-all": "Бүгдийг арилгах",
   "label.confirm": "Батлах",
   "label.confirm-password": "Шинэ нууц үгээ давтах",
-  "label.contains": "Contains",
+  "label.contains": "Агуулах",
   "label.continue": "Үргэлжлүүлэх",
   "label.countries": "Улс",
-  "label.country": "Country",
+  "label.country": "Улс",
-  "label.create": "Create",
+  "label.create": "Үүсгэх",
-  "label.create-report": "Create report",
+  "label.create-report": "Тайлан үүсгэх",
   "label.create-team": "Баг үүсгэх",
   "label.create-user": "Хэрэглэгч үүсгэх",
   "label.created": "Үүсгэсэн",
@@ -38,46 +38,46 @@
   "label.custom-range": "Дурын хугацаа",
   "label.dashboard": "Хянах самбар",
   "label.data": "Өгөгдөл",
-  "label.date": "Date",
+  "label.date": "Огноо",
   "label.date-range": "Хугацааны муж",
-  "label.day": "Day",
+  "label.day": "Өдөр",
   "label.default-date-range": "Өгөгдмөл хугацааны муж",
   "label.delete": "Устгах",
   "label.delete-team": "Баг устгах",
   "label.delete-user": "Хэрэглэгч устгах",
   "label.delete-website": "Веб устгах",
-  "label.description": "Description",
+  "label.description": "Тайлбар",
   "label.desktop": "Суурин компьютер",
   "label.details": "Мэдээлэл",
-  "label.device": "Device",
+  "label.device": "Төхөөрөмж",
   "label.devices": "Төхөөрөмж",
   "label.dismiss": "Үл хэргэсэх",
-  "label.does-not-contain": "Does not contain",
+  "label.does-not-contain": "Агуулахгүй",
   "label.domain": "Домэйн",
-  "label.dropoff": "Dropoff",
+  "label.dropoff": "Уналт",
   "label.edit": "Засах",
   "label.edit-dashboard": "Хянах самбар засах",
   "label.enable-share-url": "Хуваалцах холбоос идэвхжүүлэх",
-  "label.event": "Event",
+  "label.event": "Үйлдэл",
-  "label.event-data": "Event data",
+  "label.event-data": "Үйлдлийн өгөгдөл",
   "label.events": "Үйлдэл",
-  "label.false": "False",
+  "label.false": "Худал",
-  "label.field": "Field",
+  "label.field": "Талбар",
-  "label.fields": "Fields",
+  "label.fields": "Талбар",
-  "label.filter": "Filter",
+  "label.filter": "Шүүлтүүр",
   "label.filter-combined": "Нэгтгэсэн",
   "label.filter-raw": "Түүхий",
-  "label.filters": "Filters",
+  "label.filters": "Шүүлтүүр",
-  "label.funnel": "Funnel",
+  "label.funnel": "Цутгал",
-  "label.funnel-description": "Understand the conversion and drop-off rate of users.",
+  "label.funnel-description": "Хэрэглэгчдийн шилжилт, уналтын хэмжээг шижнлэх.",
-  "label.greater-than": "Greater than",
+  "label.greater-than": "Их",
-  "label.greater-than-equals": "Greater than or equals",
+  "label.greater-than-equals": "Их буюу тэнцүү",
-  "label.insights": "Insights",
+  "label.insights": "Шинжлэх",
-  "label.insights-description": "Dive deeper into your data by using segments and filters.",
+  "label.insights-description": "Өгөгдлөө хэсэгчлэн хуваах, шүүх байдлаар задлах шинжлэх.",
-  "label.is": "Is",
+  "label.is": "Бол",
-  "label.is-not": "Is not",
+  "label.is-not": "Биш",
-  "label.is-not-set": "Is not set",
+  "label.is-not-set": "Утга оноогоогүй",
-  "label.is-set": "Is set",
+  "label.is-set": "Утга оноосон",
   "label.join": "Нэгдэх",
   "label.join-team": "Багт нэгдэх",
   "label.language": "Хэл",
@@ -87,8 +87,8 @@
   "label.last-hours": "Сүүлийн {x} цаг",
   "label.leave": "Гарах",
   "label.leave-team": "Багаас гарах",
-  "label.less-than": "Less than",
+  "label.less-than": "Бага",
-  "label.less-than-equals": "Less than or equals",
+  "label.less-than-equals": "Бага буюу тэнцүү",
   "label.login": "Нэвтрэх",
   "label.logout": "Гарах",
   "label.max": "Max",
@@ -96,16 +96,16 @@
   "label.min": "Min",
   "label.mobile": "Утас",
   "label.more": "Цааш",
-  "label.my-websites": "My websites",
+  "label.my-websites": "Миний вебүүд",
   "label.name": "Нэр",
   "label.new-password": "Шинэ нууц үг",
   "label.none": "Байхгүй",
   "label.os": "OS",
-  "label.overview": "Overview",
+  "label.overview": "Тойм",
   "label.owner": "Эзэмшигч",
-  "label.page-of": "Page {current} of {total}",
+  "label.page-of": "Хуудас {total}-с {current}",
   "label.page-views": "Хуудас үзсэн",
-  "label.pageTitle": "Page title",
+  "label.pageTitle": "Хуудасны гарчиг",
   "label.pages": "Хуудас",
   "label.password": "Нууц үг",
   "label.powered-by": "{name} дээр суурилсан",
@@ -114,39 +114,39 @@
   "label.query": "Query",
   "label.query-parameters": "Query параметр",
   "label.realtime": "Яг одоо",
-  "label.referrer": "Referrer",
+  "label.referrer": "Чиглүүлэгч",
   "label.referrers": "Чиглүүлэгч",
   "label.refresh": "Сэргээх",
   "label.regenerate": "Дахин үүсгэх",
-  "label.region": "Region",
+  "label.region": "Бүс",
   "label.regions": "Бүсүүд",
   "label.remove": "Устгах",
-  "label.reports": "Reports",
+  "label.reports": "Тайлан",
   "label.required": "Шаардлагатай",
   "label.reset": "Дахин эхлүүлэх",
   "label.reset-website": "Тоон үзүүлэлтийг дахин эхлүүлэх",
-  "label.retention": "Retention",
+  "label.retention": "Барилт",
-  "label.retention-description": "Measure your website stickiness by tracking how often users return.",
+  "label.retention-description": "Хэрэглэгчид таны веб рүү дахин хандах буюу хэрэглэгчидээ хэр тогтоож буйг хэмжих.",
   "label.role": "Эрх",
-  "label.run-query": "Run query",
+  "label.run-query": "Query ажиллуулах",
   "label.save": "Хадгалах",
   "label.screens": "Дэлгэц",
-  "label.search": "Search",
+  "label.search": "Хайх",
-  "label.select-date": "Select date",
+  "label.select-date": "Огноо сонгох",
   "label.select-website": "Веб сонгох",
   "label.sessions": "Sessions",
   "label.settings": "Тохиргоо",
   "label.share-url": "Хуваалцах холбоос",
   "label.single-day": "Нэг өдөр",
-  "label.sum": "Sum",
+  "label.sum": "Нийлбэр",
   "label.tablet": "Таблет",
   "label.team": "Баг",
   "label.team-guest": "Багийн зочин",
   "label.team-id": "Багийн ID",
   "label.team-member": "Багийн гишүүн",
-  "label.team-name": "Team name",
+  "label.team-name": "Багийн нэр",
   "label.team-owner": "Багийн эзэмшигч",
-  "label.team-websites": "Team websites",
+  "label.team-websites": "Багийн вебүүд",
   "label.teams": "Багууд",
   "label.theme": "Загвар",
   "label.this-month": "Энэ сар",
@@ -156,37 +156,37 @@
   "label.title": "Гарчиг",
   "label.today": "Өнөөдөр",
   "label.toggle-charts": "Графикийг харуулах/нуух",
-  "label.total": "Total",
+  "label.total": "Нийт",
-  "label.total-records": "Total records",
+  "label.total-records": "Нийт мөриийн тоо",
   "label.tracking-code": "Мөрдөх код",
-  "label.true": "True",
+  "label.true": "Үнэн",
-  "label.type": "Type",
+  "label.type": "Төрөл",
   "label.unique": "Unique",
   "label.unique-visitors": "Зочин",
   "label.unknown": "Тодорхойгүй",
-  "label.untitled": "Untitled",
+  "label.untitled": "Гарчиггүй",
   "label.url": "URL",
   "label.urls": "URLs",
   "label.user": "Хэрэглэгч",
   "label.username": "Хэрэглэгчийн нэр",
   "label.users": "Хэрэглэгчид",
-  "label.value": "Value",
+  "label.value": "Утга",
   "label.view": "Харах",
   "label.view-details": "Дэлгэрүүлж харах",
-  "label.view-only": "View only",
+  "label.view-only": "Зөвхөн үзэх",
   "label.views": "Үзсэн",
   "label.visitors": "Зочин",
-  "label.website": "Website",
+  "label.website": "Веб",
   "label.website-id": "Вебийн ID",
   "label.websites": "Вебүүд",
-  "label.window": "Window",
+  "label.window": "Цонх",
   "label.yesterday": "Өчигдөр",
   "message.active-users": "одоо {x} {x, plural, one {зочин} other {зочин}} байна",
   "message.confirm-delete": "Та {target}-г устгахдаа итгэлтэй байна уу?",
   "message.confirm-leave": "Та {target}-с гарахдаа итгэлтэй байна уу?",
   "message.confirm-reset": "Та {target}-н тоон үзүүлэлтүүдийг устгахдаа итгэлтэй байна уу?",
-  "message.delete-account": "To delete this account, type {confirmation} in the box below to confirm.",
+  "message.delete-account": "Энэ бүртгэлийг устгахын тулд доорх хэсэгт {confirmation} гэж бичиж баталгаажуулна уу.",
-  "message.delete-website": "To delete this website, type {confirmation} in the box below to confirm.",
+  "message.delete-website": "Энэ вебийг устгахын тулд доорх хэсэгт {confirmation} гэж бичиж баталгаажуулна уу.",
   "message.delete-website-warning": "Энэ вебтэй холбоотой бүх өгөгдөл устах болно.",
   "message.error": "Ямар нэг зүйл буруу боллоо.",
   "message.event-log": "{url}-д {event}",
@@ -194,11 +194,11 @@
   "message.incorrect-username-password": "Буруу хэрэглэгчийн нэр/нууц үг.",
   "message.invalid-domain": "Буруу домэйн",
   "message.min-password-length": "Хамгийн багадаа {n} тэмдэгт",
-  "message.new-version-available": "A new version of Umami {version} is available!",
+  "message.new-version-available": "Umami-н шинэ хувилбар {version} гарсан байна!",
   "message.no-data-available": "Өгөгдөл алга.",
-  "message.no-event-data": "No event data is available.",
+  "message.no-event-data": "Үйлдлийн өгөгдөл алга.",
   "message.no-match-password": "Нууц үг тохирохгүй байна.",
-  "message.no-results-found": "No results were found.",
+  "message.no-results-found": "Ямар ч үр дүн олдсонгүй.",
   "message.no-team-websites": "Энэ багт ямар ч веб алга.",
   "message.no-teams": "Та ямар ч баг үүсгээгүй байна.",
   "message.no-users": "Хэрэглэгч байхгүй байна.",

src/lang/zh-CN.json

@@ -29,7 +29,7 @@
   "label.continue": "继续",
   "label.countries": "国家/地区",
   "label.country": "国家/地区",
-  "label.create": "Create",
+  "label.create": "创建",
   "label.create-report": "创建报告",
   "label.create-team": "创建团队",
   "label.create-user": "创建用户",
@@ -62,18 +62,18 @@
   "label.event-data": "事件数据",
   "label.events": "行为类别",
   "label.false": "否",
-  "label.field": "Field",
+  "label.field": "字段",
-  "label.fields": "Fields",
+  "label.fields": "字段",
-  "label.filter": "Filter",
+  "label.filter": "筛选器",
   "label.filter-combined": "合并",
   "label.filter-raw": "原始",
   "label.filters": "筛选",
   "label.funnel": "分析",
-  "label.funnel-description": "Understand the conversion and drop-off rate of users.",
+  "label.funnel-description": "了解用户的转换率和退出率。",
-  "label.greater-than": "Greater than",
+  "label.greater-than": "大于",
-  "label.greater-than-equals": "Greater than or equals",
+  "label.greater-than-equals": "大于或等于",
   "label.insights": "见解",
-  "label.insights-description": "Dive deeper into your data by using segments and filters.",
+  "label.insights-description": "通过使用筛选器和划分时间段来更深入地研究数据。",
   "label.is": "等于",
   "label.is-not": "不等于",
   "label.is-not-set": "未设置",
@@ -126,12 +126,12 @@
   "label.reset": "重置",
   "label.reset-website": "重置统计数据",
   "label.retention": "保留",
-  "label.retention-description": "Measure your website stickiness by tracking how often users return.",
+  "label.retention-description": "通过跟踪用户返回的频率来衡量网站的用户粘性。",
   "label.role": "角色",
   "label.run-query": "查询",
   "label.save": "保存",
   "label.screens": "屏幕尺寸",
-  "label.search": "Search",
+  "label.search": "搜索",
   "label.select-date": "选择数据",
   "label.select-website": "选择网站",
   "label.sessions": "会话",

src/lang/zh-TW.json

@@ -29,7 +29,7 @@
   "label.continue": "繼續",
   "label.countries": "國家",
   "label.country": "國家",
-  "label.create": "Create",
+  "label.create": "建立",
   "label.create-report": "建立報告",
   "label.create-team": "建立團隊",
   "label.create-user": "建立使用者",
@@ -64,16 +64,16 @@
   "label.false": "否",
   "label.field": "欄位",
   "label.fields": "欄位",
-  "label.filter": "Filter",
+  "label.filter": "篩選器",
   "label.filter-combined": "組合",
   "label.filter-raw": "原始",
   "label.filters": "篩選器",
   "label.funnel": "漏斗",
-  "label.funnel-description": "Understand the conversion and drop-off rate of users.",
+  "label.funnel-description": "瞭解使用者的轉換率和退出率",
   "label.greater-than": "大於",
   "label.greater-than-equals": "大於或等於",
   "label.insights": "洞察",
-  "label.insights-description": "Dive deeper into your data by using segments and filters.",
+  "label.insights-description": "透過使用區段和篩選器來深入探索你的數據",
   "label.is": "是",
   "label.is-not": "不是",
   "label.is-not-set": "未設定",
@@ -126,7 +126,7 @@
   "label.reset": "重設",
   "label.reset-website": "重設網站",
   "label.retention": "保留",
-  "label.retention-description": "Measure your website stickiness by tracking how often users return.",
+  "label.retention-description": "透過追蹤使用者回訪的頻率來衡量您的網站黏著度。",
   "label.role": "角色",
   "label.run-query": "執行查詢",
   "label.save": "儲存",

src/lib/date.ts

@@ -238,7 +238,7 @@ export function incrementDateRange(value, increment) {
 export function getAllowedUnits(startDate, endDate) {
   const units = ['minute', 'hour', 'day', 'month', 'year'];
   const minUnit = getMinimumUnit(startDate, endDate);
-  const index = units.indexOf(minUnit);
+  const index = units.indexOf(minUnit === 'year' ? 'month' : minUnit);
 
   return index >= 0 ? units.splice(index) : [];
 }

src/lib/yup.ts

@@ -2,11 +2,14 @@ import moment from 'moment';
 import * as yup from 'yup';
 import { UNIT_TYPES } from './constants';
 
-export const TimezoneTest = yup.string().test(
+export const TimezoneTest = yup
-  'timezone',
+  .string()
-  () => `Invalid timezone`,
+  .default('UTC')
-  value => moment.tz.zone(value) !== null,
+  .test(
-);
+    'timezone',
+    () => `Invalid timezone`,
+    value => moment.tz.zone(value) !== null,
+  );
 
 export const UnitTypeTest = yup.string().test(
   'unit',

yarn.lock

@@ -7409,19 +7409,10 @@ postcss@8.4.14:
     picocolors "^1.0.0"
     source-map-js "^1.0.2"
 
-postcss@^8.1.10:
+postcss@^8.1.10, postcss@^8.4.21, postcss@^8.4.27, postcss@^8.4.31:
-  version "8.4.24"
+  version "8.4.31"
-  resolved "https://registry.npmjs.org/postcss/-/postcss-8.4.24.tgz"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.31.tgz#92b451050a9f914da6755af352bdc0192508656d"
-  integrity sha512-M0RzbcI0sO/XJNucsGjvWU9ERWxb/ytp1w6dKtxTKgixdtQDq4rmx/g8W1hnaheq9jgwL/oyEdH5Bc4WwJKMqg==
+  integrity sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==
-  dependencies:
-    nanoid "^3.3.6"
-    picocolors "^1.0.0"
-    source-map-js "^1.0.2"
-
-postcss@^8.4.21, postcss@^8.4.27:
-  version "8.4.30"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.30.tgz#0e0648d551a606ef2192a26da4cabafcc09c1aa7"
-  integrity sha512-7ZEao1g4kd68l97aWG/etQKPKq07us0ieSZ2TnFDk11i0ZfDW2AwKHYU8qv4MZKqN2fdBfg+7q0ES06UA73C1g==
   dependencies:
     nanoid "^3.3.6"
     picocolors "^1.0.0"