AMBARI-14623. Timezone select: broken (rzang)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b880a7d5 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b880a7d5 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b880a7d5 Branch: refs/heads/branch-dev-patch-upgrade Commit: b880a7d5a3f9773f34d489b9dab52f9798b379ec Parents: ff0d72d Author: Richard Zang <rz...@apache.org> Authored: Thu Jan 14 17:44:13 2016 -0800 Committer: Richard Zang <rz...@apache.org> Committed: Thu Jan 14 17:44:13 2016 -0800 ---------------------------------------------------------------------- ambari-web/app/utils/date/timezone.js | 3 +- ambari-web/test/utils/date/timezone_test.js | 10 +- .../moment-timezone-with-data-2010-2020.js | 173 +------------------ 3 files changed, 9 insertions(+), 177 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/b880a7d5/ambari-web/app/utils/date/timezone.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/utils/date/timezone.js b/ambari-web/app/utils/date/timezone.js index 2421fca..ff5e06f 100644 --- a/ambari-web/app/utils/date/timezone.js +++ b/ambari-web/app/utils/date/timezone.js @@ -215,9 +215,10 @@ module.exports = Em.Object.create({ var formattedOffset = Em.get(groupedByRegionZones[region], 'firstObject.formattedOffset'); var utcOffset = Em.get(groupedByRegionZones[region], 'firstObject.utcOffset'); var value = Em.get(groupedByRegionZones[region], 'firstObject.groupByKey') + '|' + region; + var abbr = moment.tz(Em.get(groupedByRegionZones[region], 'firstObject.value')).format('z'); newZones.pushObject({ utcOffset: utcOffset, - label: '(UTC' + formattedOffset + ') ' + region + (cities ? ' / ' + cities : ''), + label: '(UTC' + formattedOffset + ' ' + abbr + ') ' + region + (cities ? ' / ' + cities : ''), value: value, zones: groupedByRegionZones[region] }); http://git-wip-us.apache.org/repos/asf/ambari/blob/b880a7d5/ambari-web/test/utils/date/timezone_test.js ---------------------------------------------------------------------- diff --git a/ambari-web/test/utils/date/timezone_test.js b/ambari-web/test/utils/date/timezone_test.js index 837557b..f372fa6 100644 --- a/ambari-web/test/utils/date/timezone_test.js +++ b/ambari-web/test/utils/date/timezone_test.js @@ -48,10 +48,12 @@ describe('timezoneUtils', function () { }); it('should map regions and cities correctly', function () { - var expected = ['(UTC+01:00) a / Aa, Bb', - '(UTC+01:00) b / Ee, Ff', - '(UTC+02:00) a / Cc, Dd', - '(UTC+02:00) b / Gg, Hh']; + var expected = [ + '(UTC+01:00 UTC) a / Aa, Bb', + '(UTC+01:00 UTC) b / Ee, Ff', + '(UTC+02:00 UTC) a / Cc, Dd', + '(UTC+02:00 UTC) b / Gg, Hh' + ]; var values = this.result.mapProperty('label'); expect(values).to.eql(expected); expect(values.join('')).to.not.contain('II'); http://git-wip-us.apache.org/repos/asf/ambari/blob/b880a7d5/ambari-web/vendor/scripts/moment-timezone-with-data-2010-2020.js ---------------------------------------------------------------------- diff --git a/ambari-web/vendor/scripts/moment-timezone-with-data-2010-2020.js b/ambari-web/vendor/scripts/moment-timezone-with-data-2010-2020.js index 1764e78..7ce0fe0 100644 --- a/ambari-web/vendor/scripts/moment-timezone-with-data-2010-2020.js +++ b/ambari-web/vendor/scripts/moment-timezone-with-data-2010-2020.js @@ -804,19 +804,6 @@ "Pacific/Wallis|WFT|-c0|0||94" ], "links": [ - "Africa/Abidjan|Africa/Accra", - "Africa/Abidjan|Africa/Bamako", - "Africa/Abidjan|Africa/Banjul", - "Africa/Abidjan|Africa/Bissau", - "Africa/Abidjan|Africa/Conakry", - "Africa/Abidjan|Africa/Dakar", - "Africa/Abidjan|Africa/Freetown", - "Africa/Abidjan|Africa/Lome", - "Africa/Abidjan|Africa/Monrovia", - "Africa/Abidjan|Africa/Nouakchott", - "Africa/Abidjan|Africa/Ouagadougou", - "Africa/Abidjan|Africa/Sao_Tome", - "Africa/Abidjan|Africa/Timbuktu", "Africa/Abidjan|America/Danmarkshavn", "Africa/Abidjan|Atlantic/Reykjavik", "Africa/Abidjan|Atlantic/St_Helena", @@ -836,35 +823,6 @@ "Africa/Casablanca|Africa/El_Aaiun", "Africa/Johannesburg|Africa/Maseru", "Africa/Johannesburg|Africa/Mbabane", - "Africa/Khartoum|Africa/Addis_Ababa", - "Africa/Khartoum|Africa/Asmara", - "Africa/Khartoum|Africa/Asmera", - "Africa/Khartoum|Africa/Dar_es_Salaam", - "Africa/Khartoum|Africa/Djibouti", - "Africa/Khartoum|Africa/Juba", - "Africa/Khartoum|Africa/Kampala", - "Africa/Khartoum|Africa/Mogadishu", - "Africa/Khartoum|Africa/Nairobi", - "Africa/Khartoum|Indian/Antananarivo", - "Africa/Khartoum|Indian/Comoro", - "Africa/Khartoum|Indian/Mayotte", - "Africa/Lagos|Africa/Bangui", - "Africa/Lagos|Africa/Brazzaville", - "Africa/Lagos|Africa/Douala", - "Africa/Lagos|Africa/Kinshasa", - "Africa/Lagos|Africa/Libreville", - "Africa/Lagos|Africa/Luanda", - "Africa/Lagos|Africa/Malabo", - "Africa/Lagos|Africa/Ndjamena", - "Africa/Lagos|Africa/Niamey", - "Africa/Lagos|Africa/Porto-Novo", - "Africa/Maputo|Africa/Blantyre", - "Africa/Maputo|Africa/Bujumbura", - "Africa/Maputo|Africa/Gaborone", - "Africa/Maputo|Africa/Harare", - "Africa/Maputo|Africa/Kigali", - "Africa/Maputo|Africa/Lubumbashi", - "Africa/Maputo|Africa/Lusaka", "Africa/Tripoli|Libya", "America/Adak|America/Atka", "America/Adak|US/Aleutian", @@ -873,40 +831,13 @@ "America/Anchorage|America/Sitka", "America/Anchorage|America/Yakutat", "America/Anchorage|US/Alaska", - "America/Argentina/Buenos_Aires|America/Argentina/Catamarca", - "America/Argentina/Buenos_Aires|America/Argentina/ComodRivadavia", - "America/Argentina/Buenos_Aires|America/Argentina/Cordoba", - "America/Argentina/Buenos_Aires|America/Argentina/Jujuy", - "America/Argentina/Buenos_Aires|America/Argentina/La_Rioja", - "America/Argentina/Buenos_Aires|America/Argentina/Mendoza", - "America/Argentina/Buenos_Aires|America/Argentina/Rio_Gallegos", - "America/Argentina/Buenos_Aires|America/Argentina/Salta", "America/Argentina/Buenos_Aires|America/Argentina/San_Juan", - "America/Argentina/Buenos_Aires|America/Argentina/San_Luis", - "America/Argentina/Buenos_Aires|America/Argentina/Tucuman", - "America/Argentina/Buenos_Aires|America/Argentina/Ushuaia", "America/Argentina/Buenos_Aires|America/Buenos_Aires", - "America/Argentina/Buenos_Aires|America/Catamarca", - "America/Argentina/Buenos_Aires|America/Cordoba", - "America/Argentina/Buenos_Aires|America/Jujuy", - "America/Argentina/Buenos_Aires|America/Mendoza", - "America/Argentina/Buenos_Aires|America/Rosario", "America/Campo_Grande|America/Cuiaba", - "America/Chicago|America/Indiana/Knox", - "America/Chicago|America/Indiana/Tell_City", - "America/Chicago|America/Knox_IN", - "America/Chicago|America/Matamoros", - "America/Chicago|America/Menominee", - "America/Chicago|America/North_Dakota/Center", - "America/Chicago|America/North_Dakota/New_Salem", - "America/Chicago|America/Rainy_River", - "America/Chicago|America/Rankin_Inlet", - "America/Chicago|America/Resolute", "America/Chicago|America/Winnipeg", "America/Chicago|CST6CDT", "America/Chicago|Canada/Central", "America/Chicago|US/Central", - "America/Chicago|US/Indiana-Starke", "America/Chihuahua|America/Mazatlan", "America/Chihuahua|Mexico/BajaSur", "America/Denver|America/Boise", @@ -915,124 +846,58 @@ "America/Denver|America/Inuvik", "America/Denver|America/Ojinaga", "America/Denver|America/Shiprock", - "America/Denver|America/Yellowknife", "America/Denver|Canada/Mountain", "America/Denver|MST7MDT", "America/Denver|Navajo", "America/Denver|US/Mountain", - "America/Fortaleza|America/Belem", - "America/Fortaleza|America/Maceio", - "America/Fortaleza|America/Recife", - "America/Fortaleza|America/Santarem", - "America/Halifax|America/Glace_Bay", - "America/Halifax|America/Moncton", - "America/Halifax|America/Thule", "America/Halifax|Atlantic/Bermuda", "America/Halifax|Canada/Atlantic", "America/Havana|Cuba", - "America/Los_Angeles|America/Dawson", - "America/Los_Angeles|America/Ensenada", "America/Los_Angeles|America/Tijuana", "America/Los_Angeles|America/Vancouver", - "America/Los_Angeles|America/Whitehorse", "America/Los_Angeles|Canada/Pacific", "America/Los_Angeles|Canada/Yukon", "America/Los_Angeles|Mexico/BajaNorte", "America/Los_Angeles|PST8PDT", "America/Los_Angeles|US/Pacific", - "America/Los_Angeles|US/Pacific-New", "America/Managua|America/Belize", "America/Managua|America/Costa_Rica", "America/Managua|America/El_Salvador", "America/Managua|America/Guatemala", - "America/Managua|America/Regina", - "America/Managua|America/Swift_Current", - "America/Managua|America/Tegucigalpa", "America/Managua|Canada/East-Saskatchewan", "America/Managua|Canada/Saskatchewan", - "America/Manaus|America/Boa_Vista", - "America/Manaus|America/Porto_Velho", "America/Manaus|Brazil/West", "America/Metlakatla|Pacific/Pitcairn", "America/Mexico_City|America/Merida", "America/Mexico_City|America/Monterrey", "America/Mexico_City|Mexico/General", "America/New_York|America/Detroit", - "America/New_York|America/Fort_Wayne", - "America/New_York|America/Indiana/Indianapolis", - "America/New_York|America/Indiana/Marengo", - "America/New_York|America/Indiana/Petersburg", - "America/New_York|America/Indiana/Vevay", - "America/New_York|America/Indiana/Vincennes", - "America/New_York|America/Indiana/Winamac", "America/New_York|America/Indianapolis", - "America/New_York|America/Iqaluit", - "America/New_York|America/Kentucky/Louisville", - "America/New_York|America/Kentucky/Monticello", - "America/New_York|America/Louisville", "America/New_York|America/Montreal", - "America/New_York|America/Nassau", - "America/New_York|America/Nipigon", - "America/New_York|America/Pangnirtung", - "America/New_York|America/Thunder_Bay", "America/New_York|America/Toronto", "America/New_York|Canada/Eastern", "America/New_York|EST5EDT", - "America/New_York|US/East-Indiana", + "America/New_York|East-Indiana", "America/New_York|US/Eastern", - "America/New_York|US/Michigan", - "America/Noronha|Brazil/DeNoronha", - "America/Panama|America/Atikokan", - "America/Panama|America/Coral_Harbour", - "America/Panama|America/Jamaica", "America/Panama|EST", "America/Panama|Jamaica", - "America/Phoenix|America/Creston", - "America/Phoenix|America/Dawson_Creek", - "America/Phoenix|America/Hermosillo", "America/Phoenix|MST", "America/Phoenix|US/Arizona", - "America/Rio_Branco|America/Eirunepe", - "America/Rio_Branco|America/Porto_Acre", "America/Rio_Branco|Brazil/Acre", "America/Santiago|Antarctica/Palmer", "America/Santiago|Chile/Continental", - "America/Santo_Domingo|America/Anguilla", - "America/Santo_Domingo|America/Antigua", - "America/Santo_Domingo|America/Aruba", "America/Santo_Domingo|America/Barbados", - "America/Santo_Domingo|America/Blanc-Sablon", - "America/Santo_Domingo|America/Curacao", - "America/Santo_Domingo|America/Dominica", - "America/Santo_Domingo|America/Grenada", - "America/Santo_Domingo|America/Guadeloupe", - "America/Santo_Domingo|America/Kralendijk", - "America/Santo_Domingo|America/Lower_Princes", - "America/Santo_Domingo|America/Marigot", - "America/Santo_Domingo|America/Martinique", - "America/Santo_Domingo|America/Montserrat", - "America/Santo_Domingo|America/Port_of_Spain", "America/Santo_Domingo|America/Puerto_Rico", - "America/Santo_Domingo|America/St_Barthelemy", - "America/Santo_Domingo|America/St_Kitts", - "America/Santo_Domingo|America/St_Lucia", - "America/Santo_Domingo|America/St_Thomas", - "America/Santo_Domingo|America/St_Vincent", - "America/Santo_Domingo|America/Tortola", - "America/Santo_Domingo|America/Virgin", "America/Sao_Paulo|Brazil/East", "America/St_Johns|Canada/Newfoundland", "Asia/Aqtobe|Asia/Aqtau", "Asia/Ashgabat|Asia/Ashkhabad", - "Asia/Baghdad|Asia/Aden", "Asia/Baghdad|Asia/Bahrain", "Asia/Baghdad|Asia/Kuwait", "Asia/Baghdad|Asia/Qatar", - "Asia/Baghdad|Asia/Riyadh", "Asia/Bangkok|Asia/Ho_Chi_Minh", "Asia/Bangkok|Asia/Phnom_Penh", "Asia/Bangkok|Asia/Saigon", - "Asia/Bangkok|Asia/Vientiane", "Asia/Dhaka|Asia/Dacca", "Asia/Dubai|Asia/Muscat", "Asia/Hong_Kong|Hongkong", @@ -1042,14 +907,7 @@ "Asia/Kathmandu|Asia/Katmandu", "Asia/Kolkata|Asia/Calcutta", "Asia/Kolkata|Asia/Colombo", - "Asia/Kuala_Lumpur|Asia/Kuching", - "Asia/Makassar|Asia/Ujung_Pandang", "Asia/Seoul|ROK", - "Asia/Shanghai|Asia/Chongqing", - "Asia/Shanghai|Asia/Chungking", - "Asia/Shanghai|Asia/Harbin", - "Asia/Shanghai|Asia/Macao", - "Asia/Shanghai|Asia/Macau", "Asia/Shanghai|Asia/Taipei", "Asia/Shanghai|PRC", "Asia/Shanghai|ROC", @@ -1087,14 +945,6 @@ "Europe/Athens|Europe/Bucharest", "Europe/Athens|Europe/Helsinki", "Europe/Athens|Europe/Kiev", - "Europe/Athens|Europe/Mariehamn", - "Europe/Athens|Europe/Nicosia", - "Europe/Athens|Europe/Riga", - "Europe/Athens|Europe/Sofia", - "Europe/Athens|Europe/Tallinn", - "Europe/Athens|Europe/Uzhgorod", - "Europe/Athens|Europe/Vilnius", - "Europe/Athens|Europe/Zaporozhye", "Europe/Chisinau|Europe/Tiraspol", "Europe/Dublin|Eire", "Europe/Istanbul|Asia/Istanbul", @@ -1118,34 +968,14 @@ "Europe/Paris|Atlantic/Jan_Mayen", "Europe/Paris|CET", "Europe/Paris|Europe/Amsterdam", - "Europe/Paris|Europe/Andorra", - "Europe/Paris|Europe/Belgrade", "Europe/Paris|Europe/Berlin", - "Europe/Paris|Europe/Bratislava", "Europe/Paris|Europe/Brussels", "Europe/Paris|Europe/Budapest", - "Europe/Paris|Europe/Busingen", "Europe/Paris|Europe/Copenhagen", - "Europe/Paris|Europe/Gibraltar", - "Europe/Paris|Europe/Ljubljana", - "Europe/Paris|Europe/Luxembourg", "Europe/Paris|Europe/Madrid", - "Europe/Paris|Europe/Malta", - "Europe/Paris|Europe/Monaco", - "Europe/Paris|Europe/Oslo", - "Europe/Paris|Europe/Podgorica", "Europe/Paris|Europe/Prague", "Europe/Paris|Europe/Rome", - "Europe/Paris|Europe/San_Marino", - "Europe/Paris|Europe/Sarajevo", - "Europe/Paris|Europe/Skopje", - "Europe/Paris|Europe/Stockholm", - "Europe/Paris|Europe/Tirane", - "Europe/Paris|Europe/Vaduz", - "Europe/Paris|Europe/Vatican", "Europe/Paris|Europe/Vienna", - "Europe/Paris|Europe/Warsaw", - "Europe/Paris|Europe/Zagreb", "Europe/Paris|Europe/Zurich", "Europe/Paris|Poland", "Pacific/Auckland|Antarctica/McMurdo", @@ -1154,7 +984,6 @@ "Pacific/Chatham|NZ-CHAT", "Pacific/Chuuk|Pacific/Truk", "Pacific/Chuuk|Pacific/Yap", - "Pacific/Easter|Chile/EasterIsland", "Pacific/Guam|Pacific/Saipan", "Pacific/Honolulu|HST", "Pacific/Honolulu|Pacific/Johnston",
