chore: assets and utilities clean up

packages/manager/cypress/e2e/firewalls/migrate-linode-with-firewall.spec.ts

@@ -167,7 +167,7 @@ describe('Migrate Linode With Firewall', () => {
     cy.wait('@getRegions');
     cy.findByText('Dallas, TX').should('be.visible');
     getClick('[data-qa-checked="false"]');
-    cy.findByText(`United States: Dallas, TX`).should('be.visible');
+    cy.findByText(`North America: Dallas, TX`).should('be.visible');
     containsClick(selectRegionString);
 
     ui.regionSelect.findItemByRegionName('Singapore, SG').click();

packages/manager/src/components/EnhancedSelect/variants/RegionSelect/RegionSelect.tsx

@@ -8,11 +8,8 @@ import SingleValue from 'src/components/EnhancedSelect/components/SingleValue';
 import { Region } from '@linode/api-v4/lib/regions';
 import RegionOption, { RegionItem } from './RegionOption';
 import { Flag } from 'src/components/Flag';
-import {
-  CONTINENT_CODE_TO_CONTINENT,
-  COUNTRY_CODE_TO_CONTINENT_CODE,
-  ContinentNames,
-} from './utils';
+import { ContinentNames } from './utils';
+import { getRegionCountryGroup } from 'src/utilities/formatRegion';
 
 interface Props<IsClearable extends boolean>
   extends Omit<
@@ -47,16 +44,7 @@ export const getRegionOptions = (regions: Region[]) => {
   };
 
   for (const region of regions) {
-    const country = region.country.toUpperCase();
-
-    const continentCode =
-      COUNTRY_CODE_TO_CONTINENT_CODE[
-        country as keyof typeof COUNTRY_CODE_TO_CONTINENT_CODE
-      ];
-
-    const group = continentCode
-      ? CONTINENT_CODE_TO_CONTINENT[continentCode] ?? 'Other'
-      : 'Other';
+    const group = getRegionCountryGroup(region);
 
     groups[group].push({
       label: `${region.label} (${region.id})`,

packages/manager/src/features/Account/Maintenance/MaintenanceTableRow.tsx

@@ -4,8 +4,8 @@ import Tooltip from 'src/components/core/Tooltip';
 import Link from 'src/components/Link';
 import TableCell from 'src/components/TableCell';
 import TableRow from 'src/components/TableRow';
-import capitalize from 'src/utilities/capitalize';
 import HighlightedMarkdown from 'src/components/HighlightedMarkdown';
+import { capitalize } from 'src/utilities/capitalize';
 import { StatusIcon, Status } from 'src/components/StatusIcon/StatusIcon';
 import { AccountMaintenance } from '@linode/api-v4/lib/account/types';
 import { parseAPIDate } from 'src/utilities/date';

packages/manager/src/features/EntityTransfers/RenderTransferRow.tsx

@@ -7,7 +7,7 @@ import { Theme } from '@mui/material/styles';
 import { DateTimeDisplay } from 'src/components/DateTimeDisplay';
 import TableCell from 'src/components/TableCell';
 import TableRow from 'src/components/TableRow';
-import capitalize from 'src/utilities/capitalize';
+import { capitalize } from 'src/utilities/capitalize';
 import { pluralize } from 'src/utilities/pluralize';
 import ActionMenu from './TransfersPendingActionMenu';
 

packages/manager/src/features/EntityTransfers/TransfersTable.tsx

@@ -15,7 +15,7 @@ import Table from 'src/components/Table';
 import TableCell from 'src/components/TableCell';
 import TableContentWrapper from 'src/components/TableContentWrapper';
 import TableRow from 'src/components/TableRow';
-import capitalize from 'src/utilities/capitalize';
+import { capitalize } from 'src/utilities/capitalize';
 import ConfirmTransferCancelDialog from './EntityTransfersLanding/ConfirmTransferCancelDialog';
 import TransferDetailsDialog from './EntityTransfersLanding/TransferDetailsDialog';
 import RenderTransferRow from './RenderTransferRow';

packages/manager/src/features/EntityTransfers/utilities.ts

@@ -1,5 +1,5 @@
 import { TransferEntities } from '@linode/api-v4/lib/entity-transfers';
-import capitalize from 'src/utilities/capitalize';
+import { capitalize } from 'src/utilities/capitalize';
 
 // Return the count of each transferred entity by type, for reporting to GA.
 // E.g. { linodes: [ 1234 ], domains: [ 2345, 3456 ]} -> "Linodes: 1, Domains: 2"

packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleDrawer.tsx

@@ -38,7 +38,7 @@ import {
   predefinedFirewallFromRule,
   protocolOptions,
 } from 'src/features/Firewalls/shared';
-import capitalize from 'src/utilities/capitalize';
+import { capitalize } from 'src/utilities/capitalize';
 import {
   ExtendedIP,
   stringToExtendedIP,

packages/manager/src/features/Firewalls/FirewallDetail/Rules/FirewallRuleTable.tsx

@@ -23,7 +23,7 @@ import {
   generateRuleLabel,
   predefinedFirewallFromRule as ruleToPredefinedFirewall,
 } from 'src/features/Firewalls/shared';
-import capitalize from 'src/utilities/capitalize';
+import { capitalize } from 'src/utilities/capitalize';
 import FirewallRuleActionMenu from './FirewallRuleActionMenu';
 import { Mode } from './FirewallRuleDrawer';
 import { ExtendedFirewallRule, RuleStatus } from './firewallRuleEditor';

packages/manager/src/features/Firewalls/FirewallLanding/FirewallRow.tsx

@@ -9,7 +9,7 @@ import { StatusIcon } from 'src/components/StatusIcon/StatusIcon';
 import TableCell from 'src/components/TableCell';
 import TableRow from 'src/components/TableRow';
 import { useAllFirewallDevicesQuery } from 'src/queries/firewalls';
-import capitalize from 'src/utilities/capitalize';
+import { capitalize } from 'src/utilities/capitalize';
 import ActionMenu, { ActionHandlers } from './FirewallActionMenu';
 
 const useStyles = makeStyles((theme: Theme) => ({

packages/manager/src/features/NodeBalancers/utils.ts

@@ -5,8 +5,7 @@ import {
   NodeBalancerConfigNodeFields,
   NodeBalancerConfigFields,
 } from './types';
-
-import defaultNumeric from 'src/utilities/defaultNumeric';
+import { defaultNumeric } from 'src/utilities/defaultNumeric';
 
 export interface NodeBalancerConfigFieldsWithStatus
   extends NodeBalancerConfigFields {

packages/manager/src/features/ObjectStorage/BucketDetail/AccessSelect.tsx

@@ -12,7 +12,7 @@ import ExternalLink from 'src/components/ExternalLink';
 import Notice from 'src/components/Notice';
 import { Toggle } from 'src/components/Toggle';
 import useOpenClose from 'src/hooks/useOpenClose';
-import capitalize from 'src/utilities/capitalize';
+import { capitalize } from 'src/utilities/capitalize';
 import { getErrorStringOrDefault } from 'src/utilities/errorUtils';
 import { bucketACLOptions, objectACLOptions } from '../utilities';
 

packages/manager/src/features/Search/ResultGroup.tsx

@@ -13,7 +13,7 @@ import Grid from '@mui/material/Unstable_Grid2';
 import Table from 'src/components/Table';
 import TableCell from 'src/components/TableCell';
 import TableRow from 'src/components/TableRow';
-import capitalize from 'src/utilities/capitalize';
+import { capitalize } from 'src/utilities/capitalize';
 import ResultRow from './ResultRow';
 
 const useStyles = makeStyles((theme: Theme) => ({

packages/manager/src/features/Search/SearchLanding.tsx

@@ -30,7 +30,7 @@ import { ApplicationState } from 'src/store';
 import { ErrorObject } from 'src/store/selectors/entitiesErrors';
 import { formatLinode } from 'src/store/selectors/getSearchEntities';
 import { getAPIErrorOrDefault } from 'src/utilities/errorUtils';
-import isNilOrEmpty from 'src/utilities/isNilOrEmpty';
+import { isNilOrEmpty } from 'src/utilities/isNilOrEmpty';
 import { getQueryParam } from 'src/utilities/queryParams';
 import { debounce } from 'throttle-debounce';
 import ResultGroup from './ResultGroup';

packages/manager/src/features/StackScripts/StackScriptForm/StackScriptForm.tsx

@@ -14,7 +14,7 @@ import Notice from 'src/components/Notice';
 import TextField from 'src/components/TextField';
 import ImageSelect from 'src/features/Images/ImageSelect';
 import getAPIErrorsFor from 'src/utilities/getAPIErrorFor';
-import imageToItem from 'src/utilities/imageToItem';
+import { imageToItem } from 'src/utilities/imageToItem';
 
 const useStyles = makeStyles((theme: Theme) => ({
   root: {

packages/manager/src/features/TopMenu/SearchBar/SearchBar.tsx

@@ -22,7 +22,7 @@ import {
 } from 'src/queries/objectStorage';
 import { useAllVolumesQuery } from 'src/queries/volumes';
 import { getAPIErrorOrDefault } from 'src/utilities/errorUtils';
-import isNilOrEmpty from 'src/utilities/isNilOrEmpty';
+import { isNilOrEmpty } from 'src/utilities/isNilOrEmpty';
 import { debounce } from 'throttle-debounce';
 import styled, { StyleProps } from './SearchBar.styles';
 import SearchSuggestion from './SearchSuggestion';

packages/manager/src/features/Volumes/VolumeCreate/CreateVolumeForm.tsx

@@ -36,8 +36,8 @@ import {
   handleGeneralErrors,
 } from 'src/utilities/formikErrorUtils';
 import { sendCreateVolumeEvent } from 'src/utilities/ga';
-import isNilOrEmpty from 'src/utilities/isNilOrEmpty';
-import maybeCastToNumber from 'src/utilities/maybeCastToNumber';
+import { isNilOrEmpty } from 'src/utilities/isNilOrEmpty';
+import { maybeCastToNumber } from 'src/utilities/maybeCastToNumber';
 import ConfigSelect, {
   initialValueDefaultId,
 } from '../VolumeDrawer/ConfigSelect';

packages/manager/src/features/Volumes/VolumeDrawer/CreateVolumeForLinodeForm.tsx

@@ -27,7 +27,7 @@ import {
   handleGeneralErrors,
 } from 'src/utilities/formikErrorUtils';
 import { sendCreateVolumeEvent } from 'src/utilities/ga';
-import maybeCastToNumber from 'src/utilities/maybeCastToNumber';
+import { maybeCastToNumber } from 'src/utilities/maybeCastToNumber';
 import { array, object, string } from 'yup';
 import ConfigSelect from './ConfigSelect';
 import LabelField from './LabelField';

packages/manager/src/features/linodes/MigrateLinode/ConfigureForm.tsx

@@ -5,7 +5,7 @@ import { Theme } from '@mui/material/styles';
 import Typography from 'src/components/core/Typography';
 import { RegionSelect } from 'src/components/EnhancedSelect/variants/RegionSelect';
 import { useRegionsQuery } from 'src/queries/regions';
-import { getHumanReadableCountry } from 'src/utilities/formatRegion';
+import { getRegionCountryGroup } from 'src/utilities/formatRegion';
 import { Flag } from 'src/components/Flag';
 
 const useStyles = makeStyles((theme: Theme) => ({
@@ -54,7 +54,7 @@ const ConfigureForm = (props: Props) => {
       <Typography>Current Region</Typography>
       <div className={classes.currentRegion}>
         <Flag country={country} />
-        <Typography>{`${getHumanReadableCountry(props.currentRegion)}: ${
+        <Typography>{`${getRegionCountryGroup(currentActualRegion)}: ${
           currentActualRegion?.label ?? currentRegion
         }`}</Typography>
       </div>

packages/manager/src/requestableContext.tsx

@@ -1,7 +1,6 @@
-import { APIError } from '@linode/api-v4/lib/types';
 import * as React from 'react';
-
-import { getDisplayName } from 'src/utilities';
+import { APIError } from '@linode/api-v4/lib/types';
+import { getDisplayName } from 'src/utilities/getDisplayName';
 
 export interface Requestable<T> {
   lastUpdated: number;

packages/manager/src/utilities/capitalize.test.ts

@@ -1,4 +1,4 @@
-import capitalize, { capitalizeAllWords } from './capitalize';
+import { capitalize, capitalizeAllWords } from './capitalize';
 
 describe('capitalize', () => {
   it('should return capitalized string', () => {

packages/manager/src/utilities/capitalize.ts

@@ -2,8 +2,6 @@ export const capitalize = (s: string) => {
   return s.charAt(0).toUpperCase() + s.slice(1);
 };
 
-export default capitalize;
-
 export const capitalizeAllWords = (s: string) => {
   return s.split(' ').map(capitalize).join(' ');
 };

packages/manager/src/utilities/defaultNumeric.ts

@@ -1,30 +1,8 @@
-// import { compose, curry, defaultTo, isEmpty, not, when } from 'ramda';
-
-/**
- * LEGACY IMPLEMENTATION.
- *
- * Leaving just in case something breaks later down the line
- * but I'm 99% sure the function below is doing the same thing as
- * this
- */
-// export default curry((defaultValue: number, v?: null | string | number) =>
-//   compose(
-//     defaultTo(defaultValue),
-//     when(
-//       compose(
-//         not,
-//         isEmpty
-//       ),
-//       (value: string) => +value
-//     )
-//   )(v)
-// );
-
 /**
  * function useful for parsing user input and defaulting to a specified value
  * when the user input is blank
  */
-const defaultNumeric = (
+export const defaultNumeric = (
   defaultValue: number,
   value?: null | string | number
 ) => {
@@ -36,5 +14,3 @@ const defaultNumeric = (
     ? valueToNumber
     : defaultValue;
 };
-
-export default defaultNumeric;

packages/manager/src/utilities/escapeStringForCLI.ts

@@ -1,5 +1,3 @@
-const escapeStringForCLI = (value: string) => {
+export const escapeStringForCLI = (value: string) => {
   return value.replace(/(["'$`\\])/g, '\\$1');
 };
-
-export default escapeStringForCLI;

packages/manager/src/utilities/formatRegion.ts

@@ -1,17 +1,22 @@
-export const getHumanReadableCountry = (regionSlug: string) => {
-  if (regionSlug.match(/(us)/gim)) {
-    return 'United States';
-  }
-  if (regionSlug.match(/(ca)/gim)) {
-    return 'Canada';
-  }
-  if (regionSlug.match(/(de|uk|eu)/gim)) {
-    return 'Europe';
-  }
-  if (regionSlug.match(/(jp|sg|in|ap)/gim)) {
-    return 'Asia';
+import { Region } from '@linode/api-v4';
+import {
+  COUNTRY_CODE_TO_CONTINENT_CODE,
+  CONTINENT_CODE_TO_CONTINENT,
+} from 'src/components/EnhancedSelect/variants/RegionSelect/utils';
+
+export const getRegionCountryGroup = (region: Region | undefined) => {
+  if (!region) {
+    return 'Other';
   }
-  return 'Other';
+
+  const continentCode =
+    COUNTRY_CODE_TO_CONTINENT_CODE[
+      region.country.toUpperCase() as keyof typeof COUNTRY_CODE_TO_CONTINENT_CODE
+    ];
+
+  return continentCode
+    ? CONTINENT_CODE_TO_CONTINENT[continentCode] ?? 'Other'
+    : 'Other';
 };
 
 export const isEURegion = (region: string | null | undefined) =>

packages/manager/src/utilities/formikErrorUtils.ts

@@ -1,7 +1,7 @@
 import { APIError } from '@linode/api-v4/lib/types';
 import { reverse } from 'ramda';
 import { getAPIErrorOrDefault } from './errorUtils';
-import isNilOrEmpty from './isNilOrEmpty';
+import { isNilOrEmpty } from './isNilOrEmpty';
 
 export const handleFieldErrors = (
   callback: (error: unknown) => void,

packages/manager/src/utilities/generate-cURL.ts

@@ -1,5 +1,5 @@
 // type HTTPMethod = 'GET' | 'POST' | 'PUT' | 'DELETE';
-import escapeStringForCLI from './escapeStringForCLI';
+import { escapeStringForCLI } from './escapeStringForCLI';
 
 const headers = [
   '-H "Content-Type: application/json" \\',