diff --git a/packages/manager/CHANGELOG.md b/packages/manager/CHANGELOG.md index 7b65e1d474e..ae205aae323 100644 --- a/packages/manager/CHANGELOG.md +++ b/packages/manager/CHANGELOG.md @@ -4,6 +4,13 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/). +## [2023-07-28] - v1.98.1 + +### Fixed: + +- Region Select order ([#9466](https://github.com/linode/manager/pull/9466)) +- Backups Drawer missing plans and prices ([#9466](https://github.com/linode/manager/pull/9466)) + ## [2023-07-24] - v1.98.0 ### Added: diff --git a/packages/manager/package.json b/packages/manager/package.json index d8fe5c868fa..e5b691796c7 100644 --- a/packages/manager/package.json +++ b/packages/manager/package.json @@ -2,7 +2,7 @@ "name": "linode-manager", "author": "Linode", "description": "The Linode Manager website", - "version": "1.98.0", + "version": "1.98.1", "private": true, "bugs": { "url": "https://github.com/Linode/manager/issues" diff --git a/packages/manager/src/components/EnhancedSelect/variants/RegionSelect/RegionSelect.test.tsx b/packages/manager/src/components/EnhancedSelect/variants/RegionSelect/RegionSelect.test.tsx index 1896a17c878..c06f841388a 100644 --- a/packages/manager/src/components/EnhancedSelect/variants/RegionSelect/RegionSelect.test.tsx +++ b/packages/manager/src/components/EnhancedSelect/variants/RegionSelect/RegionSelect.test.tsx @@ -10,11 +10,11 @@ describe('Region Select helper functions', () => { const groupedRegions = getRegionOptions(regions); const [r1, r2, r3, r4, r5] = groupedRegions; expect(groupedRegions).toHaveLength(8); - expect(r1.options).toHaveLength(0); - expect(r2.options).toHaveLength(0); + expect(r1.options).toHaveLength(5); + expect(r2.options).toHaveLength(2); expect(r3.options).toHaveLength(3); - expect(r4.options).toHaveLength(2); - expect(r5.options).toHaveLength(5); + expect(r4.options).toHaveLength(0); + expect(r5.options).toHaveLength(1); }); it('should group unrecognized regions as Other', () => { diff --git a/packages/manager/src/components/EnhancedSelect/variants/RegionSelect/RegionSelect.tsx b/packages/manager/src/components/EnhancedSelect/variants/RegionSelect/RegionSelect.tsx index 7d307670cdd..c8f6ad0de9a 100644 --- a/packages/manager/src/components/EnhancedSelect/variants/RegionSelect/RegionSelect.tsx +++ b/packages/manager/src/components/EnhancedSelect/variants/RegionSelect/RegionSelect.tsx @@ -34,15 +34,16 @@ export const selectStyles = { type RegionGroup = 'Other' | ContinentNames; export const getRegionOptions = (regions: Region[]) => { + // Note: Do not re-order this list even though ESLint is complaining. const groups: Record = { - Africa: [], - Antartica: [], - Asia: [], - Europe: [], 'North America': [], + Europe: [], + Asia: [], + 'South America': [], Oceania: [], + Africa: [], + Antartica: [], Other: [], - 'South America': [], }; for (const region of regions) {