diff --git a/Gemfile b/Gemfile index a5a11444f8..b2bb42d9ea 100755 --- a/Gemfile +++ b/Gemfile @@ -2,7 +2,6 @@ source "https://rubygems.org" ruby "~> 4.0.1" gem "rails", "~> 8" -gem "sprockets-rails" gem "active_model_serializers" gem "bunny" gem "delayed_job_active_record" @@ -34,7 +33,6 @@ gem "bigdecimal" gem "mutex_m" gem "tsort" gem "irb" -gem "image_processing", "~> 1.2" group :development, :test do gem "climate_control" diff --git a/Gemfile.lock b/Gemfile.lock index bc6535c70e..32515384a5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -146,8 +146,6 @@ GEM faraday (>= 1, < 3) faraday-net_http (3.4.2) net-http (~> 0.5) - ffi (1.17.3-aarch64-linux-gnu) - ffi (1.17.3-x86_64-linux-gnu) globalid (1.3.0) activesupport (>= 6.1) google-apis-core (1.0.2) @@ -192,9 +190,6 @@ GEM logger i18n (1.14.8) concurrent-ruby (~> 1.0) - image_processing (1.14.0) - mini_magick (>= 4.9.5, < 6) - ruby-vips (>= 2.0.17, < 3) io-console (0.8.2) irb (1.17.0) pp (>= 0.6.0) @@ -234,8 +229,6 @@ GEM net-smtp marcel (1.1.0) method_source (1.1.0) - mini_magick (5.3.1) - logger mini_mime (1.1.5) minitest (6.0.2) drb (~> 2.0) @@ -378,9 +371,6 @@ GEM rspec-support (3.13.7) rspec_junit_formatter (0.6.0) rspec-core (>= 2, < 4, != 2.12.0) - ruby-vips (2.3.0) - ffi (~> 1.12) - logger scenic (1.9.0) activerecord (>= 4.0.0) railties (>= 4.0.0) @@ -403,14 +393,6 @@ GEM simplecov_json_formatter (0.1.4) sorted_set (1.1.0) rbtree - sprockets (4.2.2) - concurrent-ruby (~> 1.0) - logger - rack (>= 2.2.4, < 4) - sprockets-rails (3.5.2) - actionpack (>= 6.1) - activesupport (>= 6.1) - sprockets (>= 3.0.0) stringio (3.2.0) thor (1.5.0) thwait (0.2.0) @@ -457,7 +439,6 @@ DEPENDENCIES faker google-cloud-storage (~> 1.11) hashdiff - image_processing (~> 1.2) irb jwt kaminari @@ -484,7 +465,6 @@ DEPENDENCIES secure_headers simplecov simplecov-cobertura - sprockets-rails thwait tsort tzinfo diff --git a/app/assets/config/manifest.js b/app/assets/config/manifest.js deleted file mode 100644 index 31696f6221..0000000000 --- a/app/assets/config/manifest.js +++ /dev/null @@ -1 +0,0 @@ -// `rake assets:precompile` will break if you delete this file. diff --git a/app/config/manifest.js b/app/config/manifest.js deleted file mode 100644 index 31696f6221..0000000000 --- a/app/config/manifest.js +++ /dev/null @@ -1 +0,0 @@ -// `rake assets:precompile` will break if you delete this file. diff --git a/app/controllers/api/abstract_controller.rb b/app/controllers/api/abstract_controller.rb index 4e8ac83318..e53f2666c4 100644 --- a/app/controllers/api/abstract_controller.rb +++ b/app/controllers/api/abstract_controller.rb @@ -1,5 +1,3 @@ -require "./app/lib/celery_script/checker" - module Api # A controller that contains all of the helper methods and shared logic for # all API endpoints. diff --git a/app/controllers/api/points_controller.rb b/app/controllers/api/points_controller.rb index dc08813ea1..13fb85aaf4 100644 --- a/app/controllers/api/points_controller.rb +++ b/app/controllers/api/points_controller.rb @@ -1,5 +1,3 @@ -require_relative "../../lib/mutations/hstore_filter" - module Api class PointsController < Api::AbstractController # NOTE: Soft deleted points will be destroyed diff --git a/app/lib/celery_script/checker.rb b/app/lib/celery_script/checker.rb index 4cf40356ea..a835a11831 100644 --- a/app/lib/celery_script/checker.rb +++ b/app/lib/celery_script/checker.rb @@ -4,8 +4,6 @@ module CeleryScript UNBOUND_VAR = "Unbound variable: %s" - class TypeCheckError < StandardError; end - class Checker MISSING_ARG = "Expected node '%s' to have a '%s', but got: %s." EXTRA_ARGS = "'%s' has unexpected arguments: %s. Allowed arguments: %s" diff --git a/app/lib/celery_script/first_pass.rb b/app/lib/celery_script/first_pass.rb index 05dcc54df9..ad0c454ca6 100644 --- a/app/lib/celery_script/first_pass.rb +++ b/app/lib/celery_script/first_pass.rb @@ -1,5 +1,3 @@ -require_relative "./cs_heap" - # ABOUT THIS CLASS: # CsHeap creates an in memory representation of a Flat IR tree using array # indexes (HeapAddress instances, really). This class takes a flat IR tree diff --git a/app/lib/celery_script/slicer.rb b/app/lib/celery_script/slicer.rb index 380a92ba0b..9817386311 100644 --- a/app/lib/celery_script/slicer.rb +++ b/app/lib/celery_script/slicer.rb @@ -1,4 +1,3 @@ -require_relative "./cs_heap.rb" # ORIGINAL IMPLEMENTATION HERE: https://github.com/FarmBot-Labs/Celery-Slicer # Take a nested ("canonical") representation of a CeleryScript sequence and # transforms it to a flat/homogenous intermediate representation which is better diff --git a/app/lib/celery_script/type_check_error.rb b/app/lib/celery_script/type_check_error.rb new file mode 100644 index 0000000000..b5be7c4fa5 --- /dev/null +++ b/app/lib/celery_script/type_check_error.rb @@ -0,0 +1,3 @@ +module CeleryScript + class TypeCheckError < StandardError; end +end diff --git a/app/mutations/points/create.rb b/app/mutations/points/create.rb index 9e99995076..ae4cd205bc 100644 --- a/app/mutations/points/create.rb +++ b/app/mutations/points/create.rb @@ -1,5 +1,3 @@ -require_relative "../../lib/mutations/hstore_filter.rb" - module Points class Create < Mutations::Command include Points::Helpers diff --git a/app/mutations/points/query.rb b/app/mutations/points/query.rb index 7d1b552f59..d5f01a5e45 100644 --- a/app/mutations/points/query.rb +++ b/app/mutations/points/query.rb @@ -1,5 +1,3 @@ -require_relative "../../lib/mutations/hstore_filter" - module Points class Query < Mutations::Command H_QUERY = "meta -> :key = :value" diff --git a/app/mutations/points/update.rb b/app/mutations/points/update.rb index 6d7bbf130b..2ca2b889b1 100644 --- a/app/mutations/points/update.rb +++ b/app/mutations/points/update.rb @@ -1,5 +1,3 @@ -require_relative "../../lib/mutations/hstore_filter" - module Points class Update < Mutations::Command include Points::Helpers diff --git a/app/mutations/sequences/show.rb b/app/mutations/sequences/show.rb index be8c22c5b7..e0b4a571d1 100644 --- a/app/mutations/sequences/show.rb +++ b/app/mutations/sequences/show.rb @@ -1,5 +1,3 @@ -require_relative "../../lib/celery_script/cs_heap" - # Service object that: # 1. Pulls out all PrimaryNodes and EdgeNodes for a sequence node (AST Flat IR form) # 2. Stitches the nodes back together in their "canonical" (nested) AST @@ -65,8 +63,8 @@ def copyright def sequence_publication # Cache the association if it's already loaded return @sequence_publication if defined?(@sequence_publication) - @sequence_publication = sequence.association(:sequence_publication).loaded? ? - sequence.sequence_publication : + @sequence_publication = sequence.association(:sequence_publication).loaded? ? + sequence.sequence_publication : SequencePublication.find_by(author_sequence_id: sequence.id) end @@ -77,7 +75,7 @@ def description def sequence_version # Cache the association if it's already loaded return @sequence_version if defined?(@sequence_version) - @sequence_version = sequence.association(:sequence_version).loaded? ? + @sequence_version = sequence.association(:sequence_version).loaded? ? sequence.sequence_version : SequenceVersion.find_by(id: sequence_version_id) end diff --git a/config/application.rb b/config/application.rb index e998f1a257..d966d5f8da 100755 --- a/config/application.rb +++ b/config/application.rb @@ -1,7 +1,13 @@ -require_relative "../app/models/transport.rb" require_relative "boot" -require_relative "../app/lib/celery_script/cs_heap" -require "rails/all" +require "active_model/railtie" +require "active_job/railtie" +require "active_record/railtie" +require "active_storage/engine" +require "action_controller/railtie" +require "action_mailer/railtie" +require "action_view/railtie" +require "action_dispatch/railtie" +require "rails/test_unit/railtie" require_relative "./config_helpers/active_storage" # Require the gems listed in Gemfile, including any gems @@ -21,8 +27,8 @@ class Application < Rails::Application "Api::RmqUtilsController#topic_action", ] config.load_defaults 8.1 - config.add_autoload_paths_to_load_path = true config.active_storage.service = ConfigHelpers::ActiveStorage.service + config.active_storage.variant_processor = :disabled config.cache_store = :redis_cache_store, { url: REDIS_URL, ssl_params: { verify_mode: OpenSSL::SSL::VERIFY_NONE }, pool: false } config.middleware.use Rack::Attack config.active_record.schema_format = :sql @@ -45,8 +51,6 @@ class Application < Rails::Application g.helper_specs false g.fixture_replacement :factory_bot, :dir => "spec/factories" end - config.autoload_paths << Rails.root.join("lib") - config.autoload_paths << Rails.root.join("lib/sequence_migrations") config.middleware.insert_before 0, Rack::Cors do allow do origins "*" diff --git a/config/environments/development.rb b/config/environments/development.rb index c40b584d02..1014fa5906 100755 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -12,9 +12,6 @@ port: 1025, } config.active_support.deprecation = :log - # config.assets.debug = true - # config.assets.digest = true - # config.assets.raise_runtime_errors = true config.enable_reloading = true config.consider_all_requests_local = true config.eager_load = false diff --git a/config/environments/production.rb b/config/environments/production.rb index f63b9aa07e..337b2cceba 100755 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -15,7 +15,6 @@ config.log_level = :info config.action_controller.perform_caching = false config.public_file_server.enabled = false - config.assets.compile = false config.active_record.dump_schema_after_migration = false # HACK AHEAD! Here's why: # 1. FarmBot Inc. Uses Sendgrid for email. diff --git a/config/environments/test.rb b/config/environments/test.rb index 09fefb7999..1d918d8628 100755 --- a/config/environments/test.rb +++ b/config/environments/test.rb @@ -7,7 +7,6 @@ config.action_mailer.delivery_method = :test config.active_job.queue_adapter = :inline config.active_support.deprecation = :stderr - # config.assets.debug = true config.enable_reloading = false config.active_support.disallowed_deprecation = :raise config.active_support.disallowed_deprecation_warnings = [] diff --git a/frontend/devices/timezones/__tests__/tz_list_test.ts b/frontend/devices/timezones/__tests__/tz_list_test.ts index ffab91d2ea..2db6032162 100644 --- a/frontend/devices/timezones/__tests__/tz_list_test.ts +++ b/frontend/devices/timezones/__tests__/tz_list_test.ts @@ -1,6 +1,6 @@ -import { list } from "../tz_list"; +import list from "../tz_list.json"; test("TZ List presence", () => { // Not the most useful test. Might catch accidental erasure, though. - expect(list.length).toBe(588); + expect(list.length).toBe(137); }); diff --git a/frontend/devices/timezones/timezone_selector.tsx b/frontend/devices/timezones/timezone_selector.tsx index e2a5006a3e..e137b126b5 100644 --- a/frontend/devices/timezones/timezone_selector.tsx +++ b/frontend/devices/timezones/timezone_selector.tsx @@ -1,6 +1,6 @@ import React from "react"; import { FBSelect, DropDownItem } from "../../ui"; -import { list } from "./tz_list"; +import list from "./tz_list.json"; import { inferTimezone } from "./guess_timezone"; import { isString } from "lodash"; import { getModifiedClassNameDefaultFalse } from "../../settings/default_values"; diff --git a/frontend/devices/timezones/tz_list.json b/frontend/devices/timezones/tz_list.json new file mode 100644 index 0000000000..7624460b3c --- /dev/null +++ b/frontend/devices/timezones/tz_list.json @@ -0,0 +1,139 @@ +[ + "Africa/Algiers", + "Africa/Cairo", + "Africa/Casablanca", + "Africa/Harare", + "Africa/Johannesburg", + "Africa/Monrovia", + "Africa/Nairobi", + "America/Argentina/Buenos_Aires", + "America/Asuncion", + "America/Bogota", + "America/Caracas", + "America/Chicago", + "America/Chihuahua", + "America/Denver", + "America/Guatemala", + "America/Guyana", + "America/Halifax", + "America/Indiana/Indianapolis", + "America/Juneau", + "America/La_Paz", + "America/Lima", + "America/Los_Angeles", + "America/Mazatlan", + "America/Mexico_City", + "America/Monterrey", + "America/Montevideo", + "America/New_York", + "America/Nuuk", + "America/Phoenix", + "America/Puerto_Rico", + "America/Regina", + "America/Santiago", + "America/Sao_Paulo", + "America/St_Johns", + "America/Tijuana", + "Asia/Almaty", + "Asia/Baghdad", + "Asia/Baku", + "Asia/Bangkok", + "Asia/Chongqing", + "Asia/Colombo", + "Asia/Dhaka", + "Asia/Hong_Kong", + "Asia/Irkutsk", + "Asia/Jakarta", + "Asia/Jerusalem", + "Asia/Kabul", + "Asia/Kamchatka", + "Asia/Karachi", + "Asia/Kathmandu", + "Asia/Kolkata", + "Asia/Krasnoyarsk", + "Asia/Kuala_Lumpur", + "Asia/Kuwait", + "Asia/Magadan", + "Asia/Muscat", + "Asia/Novosibirsk", + "Asia/Rangoon", + "Asia/Riyadh", + "Asia/Seoul", + "Asia/Shanghai", + "Asia/Singapore", + "Asia/Srednekolymsk", + "Asia/Taipei", + "Asia/Tashkent", + "Asia/Tbilisi", + "Asia/Tehran", + "Asia/Tokyo", + "Asia/Ulaanbaatar", + "Asia/Urumqi", + "Asia/Vladivostok", + "Asia/Yakutsk", + "Asia/Yekaterinburg", + "Asia/Yerevan", + "Atlantic/Azores", + "Atlantic/Cape_Verde", + "Atlantic/South_Georgia", + "Australia/Adelaide", + "Australia/Brisbane", + "Australia/Canberra", + "Australia/Darwin", + "Australia/Hobart", + "Australia/Melbourne", + "Australia/Perth", + "Australia/Sydney", + "Etc/GMT+12", + "Etc/UTC", + "Europe/Amsterdam", + "Europe/Athens", + "Europe/Belgrade", + "Europe/Berlin", + "Europe/Bratislava", + "Europe/Brussels", + "Europe/Bucharest", + "Europe/Budapest", + "Europe/Copenhagen", + "Europe/Dublin", + "Europe/Helsinki", + "Europe/Istanbul", + "Europe/Kaliningrad", + "Europe/Kiev", + "Europe/Lisbon", + "Europe/Ljubljana", + "Europe/London", + "Europe/Madrid", + "Europe/Minsk", + "Europe/Moscow", + "Europe/Paris", + "Europe/Prague", + "Europe/Riga", + "Europe/Rome", + "Europe/Samara", + "Europe/Sarajevo", + "Europe/Skopje", + "Europe/Sofia", + "Europe/Stockholm", + "Europe/Tallinn", + "Europe/Vienna", + "Europe/Vilnius", + "Europe/Volgograd", + "Europe/Warsaw", + "Europe/Zagreb", + "Europe/Zurich", + "Pacific/Apia", + "Pacific/Auckland", + "Pacific/Chatham", + "Pacific/Fakaofo", + "Pacific/Fiji", + "Pacific/Guadalcanal", + "Pacific/Guam", + "Pacific/Honolulu", + "Pacific/Majuro", + "Pacific/Midway", + "Pacific/Noumea", + "Pacific/Pago_Pago", + "Pacific/Port_Moresby", + "Pacific/Tongatapu" +] diff --git a/frontend/devices/timezones/tz_list.ts b/frontend/devices/timezones/tz_list.ts deleted file mode 100644 index f2a359eb5c..0000000000 --- a/frontend/devices/timezones/tz_list.ts +++ /dev/null @@ -1,588 +0,0 @@ -export const list = ["Africa/Abidjan", - "Africa/Accra", - "Africa/Addis_Ababa", - "Africa/Algiers", - "Africa/Asmara", - "Africa/Asmera", - "Africa/Bamako", - "Africa/Bangui", - "Africa/Banjul", - "Africa/Bissau", - "Africa/Blantyre", - "Africa/Brazzaville", - "Africa/Bujumbura", - "Africa/Cairo", - "Africa/Casablanca", - "Africa/Ceuta", - "Africa/Conakry", - "Africa/Dakar", - "Africa/Dar_es_Salaam", - "Africa/Djibouti", - "Africa/Douala", - "Africa/El_Aaiun", - "Africa/Freetown", - "Africa/Gaborone", - "Africa/Harare", - "Africa/Johannesburg", - "Africa/Juba", - "Africa/Kampala", - "Africa/Khartoum", - "Africa/Kigali", - "Africa/Kinshasa", - "Africa/Lagos", - "Africa/Libreville", - "Africa/Lome", - "Africa/Luanda", - "Africa/Lubumbashi", - "Africa/Lusaka", - "Africa/Malabo", - "Africa/Maputo", - "Africa/Maseru", - "Africa/Mbabane", - "Africa/Mogadishu", - "Africa/Monrovia", - "Africa/Nairobi", - "Africa/Ndjamena", - "Africa/Niamey", - "Africa/Nouakchott", - "Africa/Ouagadougou", - "Africa/Porto-Novo", - "Africa/Sao_Tome", - "Africa/Timbuktu", - "Africa/Tripoli", - "Africa/Tunis", - "Africa/Windhoek", - "America/Adak", - "America/Anchorage", - "America/Anguilla", - "America/Antigua", - "America/Araguaina", - "America/Argentina/Buenos_Aires", - "America/Argentina/Catamarca", - "America/Argentina/ComodRivadavia", - "America/Argentina/Cordoba", - "America/Argentina/Jujuy", - "America/Argentina/La_Rioja", - "America/Argentina/Mendoza", - "America/Argentina/Rio_Gallegos", - "America/Argentina/Salta", - "America/Argentina/San_Juan", - "America/Argentina/San_Luis", - "America/Argentina/Tucuman", - "America/Argentina/Ushuaia", - "America/Aruba", - "America/Asuncion", - "America/Atikokan", - "America/Atka", - "America/Bahia", - "America/Bahia_Banderas", - "America/Barbados", - "America/Belem", - "America/Belize", - "America/Blanc-Sablon", - "America/Boa_Vista", - "America/Bogota", - "America/Boise", - "America/Buenos_Aires", - "America/Cambridge_Bay", - "America/Campo_Grande", - "America/Cancun", - "America/Caracas", - "America/Catamarca", - "America/Cayenne", - "America/Cayman", - "America/Chicago", - "America/Chihuahua", - "America/Coral_Harbour", - "America/Cordoba", - "America/Costa_Rica", - "America/Creston", - "America/Cuiaba", - "America/Curacao", - "America/Danmarkshavn", - "America/Dawson", - "America/Dawson_Creek", - "America/Denver", - "America/Detroit", - "America/Dominica", - "America/Edmonton", - "America/Eirunepe", - "America/El_Salvador", - "America/Ensenada", - "America/Fort_Nelson", - "America/Fort_Wayne", - "America/Fortaleza", - "America/Glace_Bay", - "America/Godthab", - "America/Goose_Bay", - "America/Grand_Turk", - "America/Grenada", - "America/Guadeloupe", - "America/Guatemala", - "America/Guayaquil", - "America/Guyana", - "America/Halifax", - "America/Havana", - "America/Hermosillo", - "America/Indiana/Indianapolis", - "America/Indiana/Knox", - "America/Indiana/Marengo", - "America/Indiana/Petersburg", - "America/Indiana/Tell_City", - "America/Indiana/Vevay", - "America/Indiana/Vincennes", - "America/Indiana/Winamac", - "America/Indianapolis", - "America/Inuvik", - "America/Iqaluit", - "America/Jamaica", - "America/Jujuy", - "America/Juneau", - "America/Kentucky/Louisville", - "America/Kentucky/Monticello", - "America/Knox_IN", - "America/Kralendijk", - "America/La_Paz", - "America/Lima", - "America/Los_Angeles", - "America/Louisville", - "America/Lower_Princes", - "America/Maceio", - "America/Managua", - "America/Manaus", - "America/Marigot", - "America/Martinique", - "America/Matamoros", - "America/Mazatlan", - "America/Mendoza", - "America/Menominee", - "America/Merida", - "America/Metlakatla", - "America/Mexico_City", - "America/Miquelon", - "America/Moncton", - "America/Monterrey", - "America/Montevideo", - "America/Montreal", - "America/Montserrat", - "America/Nassau", - "America/New_York", - "America/Nipigon", - "America/Nome", - "America/Noronha", - "America/North_Dakota/Beulah", - "America/North_Dakota/Center", - "America/North_Dakota/New_Salem", - "America/Ojinaga", - "America/Panama", - "America/Pangnirtung", - "America/Paramaribo", - "America/Phoenix", - "America/Port-au-Prince", - "America/Port_of_Spain", - "America/Porto_Acre", - "America/Porto_Velho", - "America/Puerto_Rico", - "America/Rainy_River", - "America/Rankin_Inlet", - "America/Recife", - "America/Regina", - "America/Resolute", - "America/Rio_Branco", - "America/Rosario", - "America/Santa_Isabel", - "America/Santarem", - "America/Santiago", - "America/Santo_Domingo", - "America/Sao_Paulo", - "America/Scoresbysund", - "America/Shiprock", - "America/Sitka", - "America/St_Barthelemy", - "America/St_Johns", - "America/St_Kitts", - "America/St_Lucia", - "America/St_Thomas", - "America/St_Vincent", - "America/Swift_Current", - "America/Tegucigalpa", - "America/Thule", - "America/Thunder_Bay", - "America/Tijuana", - "America/Toronto", - "America/Tortola", - "America/Vancouver", - "America/Virgin", - "America/Whitehorse", - "America/Winnipeg", - "America/Yakutat", - "America/Yellowknife", - "Antarctica/Casey", - "Antarctica/Davis", - "Antarctica/DumontDUrville", - "Antarctica/Macquarie", - "Antarctica/Mawson", - "Antarctica/McMurdo", - "Antarctica/Palmer", - "Antarctica/Rothera", - "Antarctica/South_Pole", - "Antarctica/Syowa", - "Antarctica/Troll", - "Antarctica/Vostok", - "Arctic/Longyearbyen", - "Asia/Aden", - "Asia/Almaty", - "Asia/Amman", - "Asia/Anadyr", - "Asia/Aqtau", - "Asia/Aqtobe", - "Asia/Ashgabat", - "Asia/Ashkhabad", - "Asia/Baghdad", - "Asia/Bahrain", - "Asia/Baku", - "Asia/Bangkok", - "Asia/Barnaul", - "Asia/Beirut", - "Asia/Bishkek", - "Asia/Brunei", - "Asia/Calcutta", - "Asia/Chita", - "Asia/Choibalsan", - "Asia/Chongqing", - "Asia/Chungking", - "Asia/Colombo", - "Asia/Dacca", - "Asia/Damascus", - "Asia/Dhaka", - "Asia/Dili", - "Asia/Dubai", - "Asia/Dushanbe", - "Asia/Gaza", - "Asia/Harbin", - "Asia/Hebron", - "Asia/Ho_Chi_Minh", - "Asia/Hong_Kong", - "Asia/Hovd", - "Asia/Irkutsk", - "Asia/Istanbul", - "Asia/Jakarta", - "Asia/Jayapura", - "Asia/Jerusalem", - "Asia/Kabul", - "Asia/Kamchatka", - "Asia/Karachi", - "Asia/Kashgar", - "Asia/Kathmandu", - "Asia/Katmandu", - "Asia/Khandyga", - "Asia/Kolkata", - "Asia/Krasnoyarsk", - "Asia/Kuala_Lumpur", - "Asia/Kuching", - "Asia/Kuwait", - "Asia/Macao", - "Asia/Macau", - "Asia/Magadan", - "Asia/Makassar", - "Asia/Manila", - "Asia/Muscat", - "Asia/Nicosia", - "Asia/Novokuznetsk", - "Asia/Novosibirsk", - "Asia/Omsk", - "Asia/Oral", - "Asia/Phnom_Penh", - "Asia/Pontianak", - "Asia/Pyongyang", - "Asia/Qatar", - "Asia/Qyzylorda", - "Asia/Rangoon", - "Asia/Riyadh", - "Asia/Saigon", - "Asia/Sakhalin", - "Asia/Samarkand", - "Asia/Seoul", - "Asia/Shanghai", - "Asia/Singapore", - "Asia/Srednekolymsk", - "Asia/Taipei", - "Asia/Tashkent", - "Asia/Tbilisi", - "Asia/Tehran", - "Asia/Tel_Aviv", - "Asia/Thimbu", - "Asia/Thimphu", - "Asia/Tokyo", - "Asia/Tomsk", - "Asia/Ujung_Pandang", - "Asia/Ulaanbaatar", - "Asia/Ulan_Bator", - "Asia/Urumqi", - "Asia/Ust-Nera", - "Asia/Vientiane", - "Asia/Vladivostok", - "Asia/Yakutsk", - "Asia/Yekaterinburg", - "Asia/Yerevan", - "Atlantic/Azores", - "Atlantic/Bermuda", - "Atlantic/Canary", - "Atlantic/Cape_Verde", - "Atlantic/Faeroe", - "Atlantic/Faroe", - "Atlantic/Jan_Mayen", - "Atlantic/Madeira", - "Atlantic/Reykjavik", - "Atlantic/South_Georgia", - "Atlantic/St_Helena", - "Atlantic/Stanley", - "Australia/ACT", - "Australia/Adelaide", - "Australia/Brisbane", - "Australia/Broken_Hill", - "Australia/Canberra", - "Australia/Currie", - "Australia/Darwin", - "Australia/Eucla", - "Australia/Hobart", - "Australia/LHI", - "Australia/Lindeman", - "Australia/Lord_Howe", - "Australia/Melbourne", - "Australia/NSW", - "Australia/North", - "Australia/Perth", - "Australia/Queensland", - "Australia/South", - "Australia/Sydney", - "Australia/Tasmania", - "Australia/Victoria", - "Australia/West", - "Australia/Yancowinna", - "Brazil/Acre", - "Brazil/DeNoronha", - "Brazil/East", - "Brazil/West", - "CET", - "CST6CDT", - "Canada/Atlantic", - "Canada/Central", - "Canada/East-Saskatchewan", - "Canada/Eastern", - "Canada/Mountain", - "Canada/Newfoundland", - "Canada/Pacific", - "Canada/Saskatchewan", - "Canada/Yukon", - "Chile/Continental", - "Chile/EasterIsland", - "Cuba", - "EET", - "EST", - "EST5EDT", - "Egypt", - "Eire", - "Etc/GMT", - "Etc/GMT+0", - "Etc/GMT+1", - "Etc/GMT+10", - "Etc/GMT+11", - "Etc/GMT+12", - "Etc/GMT+2", - "Etc/GMT+3", - "Etc/GMT+4", - "Etc/GMT+5", - "Etc/GMT+6", - "Etc/GMT+7", - "Etc/GMT+8", - "Etc/GMT+9", - "Etc/GMT-0", - "Etc/GMT-1", - "Etc/GMT-10", - "Etc/GMT-11", - "Etc/GMT-12", - "Etc/GMT-13", - "Etc/GMT-14", - "Etc/GMT-2", - "Etc/GMT-3", - "Etc/GMT-4", - "Etc/GMT-5", - "Etc/GMT-6", - "Etc/GMT-7", - "Etc/GMT-8", - "Etc/GMT-9", - "Etc/GMT0", - "Etc/Greenwich", - "Etc/UCT", - "Etc/UTC", - "Etc/Universal", - "Etc/Zulu", - "Europe/Amsterdam", - "Europe/Andorra", - "Europe/Astrakhan", - "Europe/Athens", - "Europe/Belfast", - "Europe/Belgrade", - "Europe/Berlin", - "Europe/Bratislava", - "Europe/Brussels", - "Europe/Bucharest", - "Europe/Budapest", - "Europe/Busingen", - "Europe/Chisinau", - "Europe/Copenhagen", - "Europe/Dublin", - "Europe/Gibraltar", - "Europe/Guernsey", - "Europe/Helsinki", - "Europe/Isle_of_Man", - "Europe/Istanbul", - "Europe/Jersey", - "Europe/Kaliningrad", - "Europe/Kiev", - "Europe/Kirov", - "Europe/Lisbon", - "Europe/Ljubljana", - "Europe/London", - "Europe/Luxembourg", - "Europe/Madrid", - "Europe/Malta", - "Europe/Mariehamn", - "Europe/Minsk", - "Europe/Monaco", - "Europe/Moscow", - "Europe/Nicosia", - "Europe/Oslo", - "Europe/Paris", - "Europe/Podgorica", - "Europe/Prague", - "Europe/Riga", - "Europe/Rome", - "Europe/Samara", - "Europe/San_Marino", - "Europe/Sarajevo", - "Europe/Simferopol", - "Europe/Skopje", - "Europe/Sofia", - "Europe/Stockholm", - "Europe/Tallinn", - "Europe/Tirane", - "Europe/Tiraspol", - "Europe/Ulyanovsk", - "Europe/Uzhgorod", - "Europe/Vaduz", - "Europe/Vatican", - "Europe/Vienna", - "Europe/Vilnius", - "Europe/Volgograd", - "Europe/Warsaw", - "Europe/Zagreb", - "Europe/Zaporozhye", - "Europe/Zurich", - "GB", - "GB-Eire", - "GMT", - "GMT+0", - "GMT-0", - "GMT0", - "Greenwich", - "HST", - "Hongkong", - "Iceland", - "Indian/Antananarivo", - "Indian/Chagos", - "Indian/Christmas", - "Indian/Cocos", - "Indian/Comoro", - "Indian/Kerguelen", - "Indian/Mahe", - "Indian/Maldives", - "Indian/Mauritius", - "Indian/Mayotte", - "Indian/Reunion", - "Iran", - "Israel", - "Jamaica", - "Japan", - "Kwajalein", - "Libya", - "MET", - "MST", - "MST7MDT", - "Mexico/BajaNorte", - "Mexico/BajaSur", - "Mexico/General", - "NZ", - "NZ-CHAT", - "Navajo", - "PRC", - "PST8PDT", - "Pacific/Apia", - "Pacific/Auckland", - "Pacific/Bougainville", - "Pacific/Chatham", - "Pacific/Chuuk", - "Pacific/Easter", - "Pacific/Efate", - "Pacific/Enderbury", - "Pacific/Fakaofo", - "Pacific/Fiji", - "Pacific/Funafuti", - "Pacific/Galapagos", - "Pacific/Gambier", - "Pacific/Guadalcanal", - "Pacific/Guam", - "Pacific/Honolulu", - "Pacific/Johnston", - "Pacific/Kiritimati", - "Pacific/Kosrae", - "Pacific/Kwajalein", - "Pacific/Majuro", - "Pacific/Marquesas", - "Pacific/Midway", - "Pacific/Nauru", - "Pacific/Niue", - "Pacific/Norfolk", - "Pacific/Noumea", - "Pacific/Pago_Pago", - "Pacific/Palau", - "Pacific/Pitcairn", - "Pacific/Pohnpei", - "Pacific/Ponape", - "Pacific/Port_Moresby", - "Pacific/Rarotonga", - "Pacific/Saipan", - "Pacific/Samoa", - "Pacific/Tahiti", - "Pacific/Tarawa", - "Pacific/Tongatapu", - "Pacific/Truk", - "Pacific/Wake", - "Pacific/Wallis", - "Pacific/Yap", - "Poland", - "Portugal", - "ROC", - "ROK", - "Singapore", - "Turkey", - "UCT", - "US/Alaska", - "US/Aleutian", - "US/Arizona", - "US/Central", - "US/East-Indiana", - "US/Eastern", - "US/Hawaii", - "US/Indiana-Starke", - "US/Michigan", - "US/Mountain", - "US/Pacific", - "US/Pacific-New", - "US/Samoa", - "UTC", - "Universal", - "W-SU", - "WET", - "Zulu"]; diff --git a/frontend/logs/components/__tests__/settings_menu_test.tsx b/frontend/logs/components/__tests__/settings_menu_test.tsx index b7d9e8bc71..d7b9424f8d 100644 --- a/frontend/logs/components/__tests__/settings_menu_test.tsx +++ b/frontend/logs/components/__tests__/settings_menu_test.tsx @@ -92,7 +92,7 @@ describe("", () => { value: jest.fn(), }); const p = fakeProps(); - p.dispatch = jest.fn(() => Promise.resolve()); + p.dispatch = jest.fn(); const { container } = render(); const buttons = container.querySelectorAll("button"); fireEvent.click(buttons[buttons.length - 1] as Element); @@ -100,6 +100,7 @@ describe("", () => { await Promise.resolve(); expect(crud.destroyAll).toHaveBeenCalledWith( "Log", false, Content.DELETE_ALL_LOGS_CONFIRMATION); + expect(p.dispatch).not.toHaveBeenCalled(); expect(window.location.assign).toHaveBeenCalled(); }); diff --git a/frontend/logs/components/settings_menu.tsx b/frontend/logs/components/settings_menu.tsx index 249232b248..d733c78467 100644 --- a/frontend/logs/components/settings_menu.tsx +++ b/frontend/logs/components/settings_menu.tsx @@ -130,8 +130,7 @@ export class LogsSettingsMenu extends React.Component {