Browse Source

Fix/app logs today filter (#689)

zxhlyh 1 year ago
parent
commit
a0bd15245a
3 changed files with 1278 additions and 327 deletions
  1. 1 1
      web/app/components/app/log/index.tsx
  2. 1274 0
      web/utils/timezone.json
  3. 3 326
      web/utils/timezone.ts

+ 1 - 1
web/app/components/app/log/index.tsx

@@ -63,7 +63,7 @@ const Logs: FC<ILogsProps> = ({ appId }) => {
     limit,
     ...(queryParams.period !== 'all'
       ? {
-        start: dayjs().subtract(queryParams.period as number, 'day').format('YYYY-MM-DD HH:mm'),
+        start: dayjs().subtract(queryParams.period as number, 'day').startOf('day').format('YYYY-MM-DD HH:mm'),
         end: dayjs().format('YYYY-MM-DD HH:mm'),
       }
       : {}),

File diff suppressed because it is too large
+ 1274 - 0
web/utils/timezone.json


+ 3 - 326
web/utils/timezone.ts

@@ -1,330 +1,7 @@
+import tz from './timezone.json'
+
 type Item = {
   value: number | string
   name: string
 }
-export const timezones: Item[] = [
-  {
-    value: 'Pacific/Midway',
-    name: '(GMT-11:00) Midway Island, Samoa',
-  },
-  {
-    value: 'Pacific/Honolulu',
-    name: '(GMT-10:00) Hawaii',
-  },
-  {
-    value: 'America/Juneau',
-    name: '(GMT-8:00) Alaska',
-  },
-  {
-    value: 'America/Dawson',
-    name: '(GMT-7:00) Dawson, Yukon',
-  },
-  {
-    value: 'America/Chihuahua',
-    name: '(GMT-7:00) Chihuahua, La Paz, Mazatlan',
-  },
-  {
-    value: 'America/Phoenix',
-    name: '(GMT-7:00) Arizona',
-  },
-  {
-    value: 'America/Tijuana',
-    name: '(GMT-7:00) Tijuana',
-  },
-  {
-    value: 'America/Los_Angeles',
-    name: '(GMT-7:00) Pacific Time',
-  },
-  {
-    value: 'America/Boise',
-    name: '(GMT-6:00) Mountain Time',
-  },
-  {
-    value: 'America/Regina',
-    name: '(GMT-6:00) Saskatchewan',
-  },
-  {
-    value: 'America/Mexico_City',
-    name: '(GMT-6:00) Guadalajara, Mexico City, Monterrey',
-  },
-  {
-    value: 'America/Belize',
-    name: '(GMT-6:00) Central America',
-  },
-  {
-    value: 'America/Chicago',
-    name: '(GMT-5:00) Central Time',
-  },
-  {
-    value: 'America/Bogota',
-    name: '(GMT-5:00) Bogota, Lima, Quito',
-  },
-  {
-    value: 'America/Lima',
-    name: '(GMT-5:00) Pittsburgh',
-  },
-  {
-    value: 'America/Detroit',
-    name: '(GMT-4:00) Eastern Time',
-  },
-  {
-    value: 'America/Caracas',
-    name: '(GMT-4:00) Caracas, La Paz',
-  },
-  {
-    value: 'America/Santiago',
-    name: '(GMT-3:00) Santiago',
-  },
-  {
-    value: 'America/Sao_Paulo',
-    name: '(GMT-3:00) Brasilia',
-  },
-  {
-    value: 'America/Montevideo',
-    name: '(GMT-3:00) Montevideo',
-  },
-  {
-    value: 'America/Argentina/Buenos_Aires',
-    name: '(GMT-3:00) Buenos Aires, Georgetown',
-  },
-  {
-    value: 'America/St_Johns',
-    name: '(GMT-2:30) Newfoundland and Labrador',
-  },
-  {
-    value: 'America/Godthab',
-    name: '(GMT-2:00) Greenland',
-  },
-  {
-    value: 'Atlantic/Cape_Verde',
-    name: '(GMT-1:00) Cape Verde Islands',
-  },
-  {
-    value: 'Atlantic/Azores',
-    name: '(GMT+0:00) Azores',
-  },
-  {
-    value: 'Etc/GMT',
-    name: '(GMT+0:00) UTC',
-  },
-  {
-    value: 'Africa/Casablanca',
-    name: '(GMT+0:00) Casablanca, Monrovia',
-  },
-  {
-    value: 'Europe/London',
-    name: '(GMT+1:00) Edinburgh, London',
-  },
-  {
-    value: 'Europe/Dublin',
-    name: '(GMT+1:00) Dublin',
-  },
-  {
-    value: 'Europe/Lisbon',
-    name: '(GMT+1:00) Lisbon',
-  },
-  {
-    value: 'Atlantic/Canary',
-    name: '(GMT+1:00) Canary Islands',
-  },
-  {
-    value: 'Africa/Algiers',
-    name: '(GMT+1:00) West Central Africa',
-  },
-  {
-    value: 'Europe/Belgrade',
-    name: '(GMT+2:00) Belgrade, Bratislava, Budapest, Ljubljana, Prague',
-  },
-  {
-    value: 'Europe/Sarajevo',
-    name: '(GMT+2:00) Sarajevo, Skopje, Warsaw, Zagreb',
-  },
-  {
-    value: 'Europe/Brussels',
-    name: '(GMT+2:00) Brussels, Copenhagen, Madrid, Paris',
-  },
-  {
-    value: 'Europe/Amsterdam',
-    name: '(GMT+2:00) Amsterdam, Berlin, Bern, Rome, Stockholm, Vienna',
-  },
-  {
-    value: 'Africa/Cairo',
-    name: '(GMT+2:00) Cairo',
-  },
-  {
-    value: 'Africa/Harare',
-    name: '(GMT+2:00) Harare, Pretoria',
-  },
-  {
-    value: 'Europe/Berlin',
-    name: '(GMT+2:00) Frankfurt',
-  },
-  {
-    value: 'Europe/Bucharest',
-    name: '(GMT+3:00) Bucharest',
-  },
-  {
-    value: 'Europe/Helsinki',
-    name: '(GMT+3:00) Helsinki, Kyiv, Riga, Sofia, Tallinn, Vilnius',
-  },
-  {
-    value: 'Europe/Athens',
-    name: '(GMT+3:00) Athens, Minsk',
-  },
-  {
-    value: 'Asia/Jerusalem',
-    name: '(GMT+3:00) Jerusalem',
-  },
-  {
-    value: 'Europe/Moscow',
-    name: '(GMT+3:00) Istanbul, Moscow, St. Petersburg, Volgograd',
-  },
-  {
-    value: 'Asia/Kuwait',
-    name: '(GMT+3:00) Kuwait, Riyadh',
-  },
-  {
-    value: 'Africa/Nairobi',
-    name: '(GMT+3:00) Nairobi',
-  },
-  {
-    value: 'Asia/Baghdad',
-    name: '(GMT+3:00) Baghdad',
-  },
-  {
-    value: 'Asia/Dubai',
-    name: '(GMT+4:00) Abu Dhabi, Muscat',
-  },
-  {
-    value: 'Asia/Tehran',
-    name: '(GMT+4:30) Tehran',
-  },
-  {
-    value: 'Asia/Kabul',
-    name: '(GMT+4:30) Kabul',
-  },
-  {
-    value: 'Asia/Baku',
-    name: '(GMT+5:00) Baku, Tbilisi, Yerevan',
-  },
-  {
-    value: 'Asia/Yekaterinburg',
-    name: '(GMT+5:00) Ekaterinburg',
-  },
-  {
-    value: 'Asia/Karachi',
-    name: '(GMT+5:00) Islamabad, Karachi, Tashkent',
-  },
-  {
-    value: 'Asia/Kolkata',
-    name: '(GMT+5:30) Chennai, Kolkata, Mumbai, New Delhi',
-  },
-  {
-    value: 'Asia/Colombo',
-    name: '(GMT+5:30) Sri Jayawardenepura',
-  },
-  {
-    value: 'Asia/Kathmandu',
-    name: '(GMT+5:45) Kathmandu',
-  },
-  {
-    value: 'Asia/Dhaka',
-    name: '(GMT+6:00) Astana, Dhaka',
-  },
-  {
-    value: 'Asia/Almaty',
-    name: '(GMT+6:00) Almaty, Novosibirsk',
-  },
-  {
-    value: 'Asia/Rangoon',
-    name: '(GMT+6:30) Yangon Rangoon',
-  },
-  {
-    value: 'Asia/Bangkok',
-    name: '(GMT+7:00) Bangkok, Hanoi, Jakarta',
-  },
-  {
-    value: 'Asia/Krasnoyarsk',
-    name: '(GMT+7:00) Krasnoyarsk',
-  },
-  {
-    value: 'Asia/Shanghai',
-    name: '(GMT+8:00) Beijing, Chongqing, Hong Kong SAR, Urumqi',
-  },
-  {
-    value: 'Asia/Kuala_Lumpur',
-    name: '(GMT+8:00) Kuala Lumpur, Singapore',
-  },
-  {
-    value: 'Asia/Taipei',
-    name: '(GMT+8:00) Taipei',
-  },
-  {
-    value: 'Australia/Perth',
-    name: '(GMT+8:00) Perth',
-  },
-  {
-    value: 'Asia/Irkutsk',
-    name: '(GMT+8:00) Irkutsk, Ulaanbaatar',
-  },
-  {
-    value: 'Asia/Seoul',
-    name: '(GMT+9:00) Seoul',
-  },
-  {
-    value: 'Asia/Tokyo',
-    name: '(GMT+9:00) Osaka, Sapporo, Tokyo',
-  },
-  {
-    value: 'Australia/Darwin',
-    name: '(GMT+9:30) Darwin',
-  },
-  {
-    value: 'Asia/Yakutsk',
-    name: '(GMT+10:00) Yakutsk',
-  },
-  {
-    value: 'Australia/Brisbane',
-    name: '(GMT+10:00) Brisbane',
-  },
-  {
-    value: 'Asia/Vladivostok',
-    name: '(GMT+10:00) Vladivostok',
-  },
-  {
-    value: 'Pacific/Guam',
-    name: '(GMT+10:00) Guam, Port Moresby',
-  },
-  {
-    value: 'Australia/Adelaide',
-    name: '(GMT+10:30) Adelaide',
-  },
-  {
-    value: 'Australia/Sydney',
-    name: '(GMT+11:00) Canberra, Melbourne, Sydney',
-  },
-  {
-    value: 'Australia/Hobart',
-    name: '(GMT+11:00) Hobart',
-  },
-  {
-    value: 'Asia/Magadan',
-    name: '(GMT+11:00) Magadan, Solomon Islands, New Caledonia',
-  },
-  {
-    value: 'Asia/Kamchatka',
-    name: '(GMT+12:00) Kamchatka, Marshall Islands',
-  },
-  {
-    value: 'Pacific/Fiji',
-    name: '(GMT+12:00) Fiji Islands',
-  },
-  {
-    value: 'Pacific/Auckland',
-    name: '(GMT+13:00) Auckland, Wellington',
-  },
-  {
-    value: 'Pacific/Tongatapu',
-    name: '(GMT+13:00) Nuku\'alofa',
-  },
-]
+export const timezones: Item[] = tz