Merge pull request #4941 from erdoganoksuz/bug-fix/locale-case

use local version of all case conversion methods
backstage · Mar 17, 2021 · a0098ba · a0098ba
2 parents b5fc764 + 12d5dd4
commit a0098ba
Show file tree

Hide file tree

Showing 31 changed files with 85 additions and 45 deletions.
diff --git a/.changeset/pink-knives-obey.md b/.changeset/pink-knives-obey.md
@@ -0,0 +1,21 @@
+---
+'@backstage/core': patch
+'@backstage/create-app': patch
+'@backstage/plugin-api-docs': patch
+'@backstage/plugin-bitrise': patch
+'@backstage/plugin-catalog': patch
+'@backstage/plugin-catalog-import': patch
+'@backstage/plugin-catalog-react': patch
+'@backstage/plugin-circleci': patch
+'@backstage/plugin-cloudbuild': patch
+'@backstage/plugin-explore': patch
+'@backstage/plugin-github-actions': patch
+'@backstage/plugin-jenkins': patch
+'@backstage/plugin-kubernetes': patch
+'@backstage/plugin-lighthouse': patch
+'@backstage/plugin-org': patch
+'@backstage/plugin-scaffolder': patch
+'@backstage/plugin-search': patch
+---
+
+use local version of lowerCase and upperCase methods
diff --git a/packages/app/src/components/catalog/EntityPage.tsx b/packages/app/src/components/catalog/EntityPage.tsx
@@ -500,7 +500,7 @@ const DomainEntityPage = ({ entity }: { entity: Entity }) => (
 export const EntityPage = () => {
   const { entity } = useEntity();
 
-  switch (entity?.kind?.toLowerCase()) {
+  switch (entity?.kind?.toLocaleLowerCase('en-US')) {
     case 'component':
       return <ComponentEntityPage entity={entity} />;
     case 'api':

diff --git a/packages/core/src/api-wrappers/createApp.tsx b/packages/core/src/api-wrappers/createApp.tsx
@@ -58,7 +58,10 @@ export const defaultConfigLoader: AppConfigLoader = async (
   const configs = (appConfig.slice() as unknown) as AppConfig[];
 
   // Avoiding this string also being replaced at runtime
-  if (runtimeConfigJson !== '__app_injected_runtime_config__'.toUpperCase()) {
+  if (
+    runtimeConfigJson !==
+    '__app_injected_runtime_config__'.toLocaleUpperCase('en-US')
+  ) {
     try {
       const data = JSON.parse(runtimeConfigJson) as JsonObject;
       if (Array.isArray(data)) {

diff --git a/packages/core/src/components/Table/Table.stories.tsx b/packages/core/src/components/Table/Table.stories.tsx
@@ -213,8 +213,8 @@ export const SubvalueTable = () => {
         row: any, // Only needed if you want subvalue searchable
       ) =>
         `${row.col1} ${row.subvalue}`
-          .toUpperCase()
-          .includes(query.toUpperCase()),
+          .toLocaleUpperCase('en-US')
+          .includes(query.toLocaleUpperCase('en-US')),
       field: 'col1',
       highlight: true,
       render: (row: any): React.ReactNode => (

diff --git a/packages/core/src/components/WarningPanel/WarningPanel.tsx b/packages/core/src/components/WarningPanel/WarningPanel.tsx
@@ -81,7 +81,7 @@ type Props = {
 };
 
 const capitalize = (s: string) => {
-  return s.charAt(0).toUpperCase() + s.slice(1);
+  return s.charAt(0).toLocaleUpperCase('en-US') + s.slice(1);
 };
 
 /**

diff --git a/packages/create-app/templates/default-app/packages/app/src/components/catalog/EntityPage.tsx b/packages/create-app/templates/default-app/packages/app/src/components/catalog/EntityPage.tsx
@@ -184,7 +184,7 @@ const ApiEntityPage = ({ entity }: { entity: Entity }) => (
 export const EntityPage = () => {
   const { entity } = useEntity();
 
-  switch (entity?.kind?.toLowerCase()) {
+  switch (entity?.kind?.toLocaleLowerCase('en-US')) {
     case 'component':
       return <ComponentEntityPage entity={entity} />;
     case 'api':

diff --git a/plugins/api-docs/src/components/ApisCards/ConsumedApisCard.tsx b/plugins/api-docs/src/components/ApisCards/ConsumedApisCard.tsx
@@ -74,7 +74,8 @@ export const ConsumedApisCard = ({ variant = 'gridItem' }: Props) => {
       emptyContent={
         <div style={{ textAlign: 'center' }}>
           <Typography variant="body1">
-            This {entity.kind.toLowerCase()} does not consume any APIs.
+            This {entity.kind.toLocaleLowerCase('en-US')} does not consume any
+            APIs.
           </Typography>
           <Typography variant="body2">
             <Link to="https://backstage.io/docs/features/software-catalog/descriptor-format#specconsumesapis-optional">

diff --git a/plugins/api-docs/src/components/ApisCards/HasApisCard.tsx b/plugins/api-docs/src/components/ApisCards/HasApisCard.tsx
@@ -78,7 +78,8 @@ export const HasApisCard = ({ variant = 'gridItem' }: Props) => {
       emptyContent={
         <div style={{ textAlign: 'center' }}>
           <Typography variant="body1">
-            This {entity.kind.toLowerCase()} does not contain any APIs.
+            This {entity.kind.toLocaleLowerCase('en-US')} does not contain any
+            APIs.
           </Typography>
           <Typography variant="body2">
             <Link to="https://backstage.io/docs/features/software-catalog/descriptor-format#kind-api">

diff --git a/plugins/api-docs/src/components/ApisCards/ProvidedApisCard.tsx b/plugins/api-docs/src/components/ApisCards/ProvidedApisCard.tsx
@@ -74,7 +74,8 @@ export const ProvidedApisCard = ({ variant = 'gridItem' }: Props) => {
       emptyContent={
         <div style={{ textAlign: 'center' }}>
           <Typography variant="body1">
-            This {entity.kind.toLowerCase()} does not provide any APIs.
+            This {entity.kind.toLocaleLowerCase('en-US')} does not provide any
+            APIs.
           </Typography>
           <Typography variant="body2">
             <Link to="https://backstage.io/docs/features/software-catalog/descriptor-format#specprovidesapis-optional">

diff --git a/plugins/bitrise/src/components/BitriseBuildsTableComponent/BitriseBuildsTableComponent.tsx b/plugins/bitrise/src/components/BitriseBuildsTableComponent/BitriseBuildsTableComponent.tsx
@@ -162,8 +162,8 @@ export const BitriseBuildsTable = ({
       title: 'Branch',
       customFilterAndSearch: (query, row: any) =>
         `${row.message} ${row.workflow}`
-          .toUpperCase()
-          .includes(query.toUpperCase()),
+          .toLocaleUpperCase('en-US')
+          .includes(query.toLocaleUpperCase('en-US')),
       field: 'message',
       width: 'auto',
       highlight: true,

diff --git a/plugins/catalog-import/src/components/EntityListComponent/EntityListComponent.tsx b/plugins/catalog-import/src/components/EntityListComponent/EntityListComponent.tsx
@@ -54,7 +54,7 @@ function sortEntities(entities: Array<EntityName | Entity>) {
 }
 
 function getEntityIcon(entity: { kind: string }): React.ReactElement {
-  switch (entity.kind.toLowerCase()) {
+  switch (entity.kind.toLocaleLowerCase('en-US')) {
     case 'api':
       return <ExtensionIcon />;
 

diff --git a/plugins/catalog-react/src/components/EntityRefLink/EntityRefLink.tsx b/plugins/catalog-react/src/components/EntityRefLink/EntityRefLink.tsx
@@ -48,11 +48,12 @@ export const EntityRefLink = forwardRef<any, EntityRefLinkProps>(
       name = entityRef.name;
     }
 
-    kind = kind.toLowerCase();
+    kind = kind.toLocaleLowerCase('en-US');
 
     const routeParams = {
       kind,
-      namespace: namespace?.toLowerCase() ?? ENTITY_DEFAULT_NAMESPACE,
+      namespace:
+        namespace?.toLocaleLowerCase('en-US') ?? ENTITY_DEFAULT_NAMESPACE,
       name,
     };
 

diff --git a/plugins/catalog/src/components/AboutCard/AboutContent.tsx b/plugins/catalog/src/components/AboutCard/AboutContent.tsx
@@ -39,10 +39,10 @@ type Props = {
 
 export const AboutContent = ({ entity }: Props) => {
   const classes = useStyles();
-  const isSystem = entity.kind.toLowerCase() === 'system';
-  const isDomain = entity.kind.toLowerCase() === 'domain';
-  const isResource = entity.kind.toLowerCase() === 'resource';
-  const isComponent = entity.kind.toLowerCase() === 'component';
+  const isSystem = entity.kind.toLocaleLowerCase('en-US') === 'system';
+  const isDomain = entity.kind.toLocaleLowerCase('en-US') === 'domain';
+  const isResource = entity.kind.toLocaleLowerCase('en-US') === 'resource';
+  const isComponent = entity.kind.toLocaleLowerCase('en-US') === 'component';
   const partOfSystemRelations = getEntityRelations(entity, RELATION_PART_OF, {
     kind: 'system',
   });

diff --git a/plugins/catalog/src/components/EntityLayout/EntityLayout.tsx b/plugins/catalog/src/components/EntityLayout/EntityLayout.tsx
@@ -69,10 +69,10 @@ const headerProps = (
         : ''
     }`,
     headerType: (() => {
-      let t = kind.toLowerCase();
+      let t = kind.toLocaleLowerCase('en-US');
       if (entity && entity.spec && 'type' in entity.spec) {
         t += ' — ';
-        t += (entity.spec as { type: string }).type.toLowerCase();
+        t += (entity.spec as { type: string }).type.toLocaleLowerCase('en-US');
       }
       return t;
     })(),

diff --git a/plugins/catalog/src/components/EntityPageLayout/EntityPageLayout.tsx b/plugins/catalog/src/components/EntityPageLayout/EntityPageLayout.tsx
@@ -88,10 +88,10 @@ const headerProps = (
         : ''
     }`,
     headerType: (() => {
-      let t = kind.toLowerCase();
+      let t = kind.toLocaleLowerCase('en-US');
       if (entity && entity.spec && 'type' in entity.spec) {
         t += ' — ';
-        t += (entity.spec as { type: string }).type.toLowerCase();
+        t += (entity.spec as { type: string }).type.toLocaleLowerCase('en-US');
       }
       return t;
     })(),

diff --git a/plugins/catalog/src/components/Router.tsx b/plugins/catalog/src/components/Router.tsx
@@ -63,7 +63,8 @@ const EntityPageSwitch = ({ EntityPage }: { EntityPage: ComponentType }) => {
 const OldEntityRouteRedirect = () => {
   const { optionalNamespaceAndName, '*': rest } = useParams() as any;
   const [name, namespace] = optionalNamespaceAndName.split(':').reverse();
-  const namespaceLower = namespace?.toLowerCase() ?? ENTITY_DEFAULT_NAMESPACE;
+  const namespaceLower =
+    namespace?.toLocaleLowerCase('en-US') ?? ENTITY_DEFAULT_NAMESPACE;
   const restWithSlash = rest ? `/${rest}` : '';
   return (
     <Navigate

diff --git a/plugins/circleci/src/components/BuildsPage/lib/CITable/CITable.tsx b/plugins/circleci/src/components/BuildsPage/lib/CITable/CITable.tsx
@@ -79,7 +79,7 @@ export type CITableBuildInfo = {
 
 // retried, canceled, infrastructure_fail, timedout, not_run, running, failed, queued, scheduled, not_running, no_tests, fixed, success
 const getStatusComponent = (status: string | undefined = '') => {
-  switch (status.toLowerCase()) {
+  switch (status.toLocaleLowerCase('en-US')) {
     case 'queued':
     case 'scheduled':
       return <StatusPending />;

diff --git a/plugins/cloudbuild/src/components/WorkflowRunStatus/WorkflowRunStatus.tsx b/plugins/cloudbuild/src/components/WorkflowRunStatus/WorkflowRunStatus.tsx
@@ -29,7 +29,7 @@ export const WorkflowRunStatus = ({
   status: string | undefined;
 }) => {
   if (status === undefined) return null;
-  switch (status.toLowerCase()) {
+  switch (status.toLocaleLowerCase('en-US')) {
     case 'queued':
       return (
         <>

diff --git a/plugins/explore/src/components/ToolCard/ToolCard.tsx b/plugins/explore/src/components/ToolCard/ToolCard.tsx
@@ -76,13 +76,13 @@ export const ToolCard = ({ card, objectFit }: Props) => {
       <CardContent>
         <Typography paragraph variant="h5">
           {title}{' '}
-          {lifecycle && lifecycle.toLowerCase() !== 'ga' && (
+          {lifecycle && lifecycle.toLocaleLowerCase('en-US') !== 'ga' && (
             <Chip
               size="small"
               label={lifecycle}
               className={classNames(
                 classes.lifecycle,
-                classes[lifecycle.toLowerCase()],
+                classes[lifecycle.toLocaleLowerCase('en-US')],
               )}
             />
           )}

diff --git a/plugins/github-actions/src/components/WorkflowRunDetails/WorkflowRunDetails.tsx b/plugins/github-actions/src/components/WorkflowRunDetails/WorkflowRunDetails.tsx
@@ -88,8 +88,8 @@ const StepView = ({ step }: { step: Step }) => {
       </TableCell>
       <TableCell>
         <WorkflowRunStatus
-          status={step.status.toUpperCase()}
-          conclusion={step.conclusion?.toUpperCase()}
+          status={step.status.toLocaleUpperCase('en-US')}
+          conclusion={step.conclusion?.toLocaleUpperCase('en-US')}
         />
       </TableCell>
     </TableRow>

diff --git a/plugins/github-actions/src/components/WorkflowRunStatus/WorkflowRunStatus.tsx b/plugins/github-actions/src/components/WorkflowRunStatus/WorkflowRunStatus.tsx
@@ -32,7 +32,7 @@ export const WorkflowRunStatus = ({
   conclusion: string | undefined;
 }) => {
   if (status === undefined) return null;
-  switch (status.toLowerCase()) {
+  switch (status.toLocaleLowerCase('en-US')) {
     case 'queued':
       return (
         <>
@@ -46,7 +46,7 @@ export const WorkflowRunStatus = ({
         </>
       );
     case 'completed':
-      switch (conclusion?.toLowerCase()) {
+      switch (conclusion?.toLocaleLowerCase('en-US')) {
         case 'skipped' || 'canceled':
           return (
             <>

diff --git a/plugins/jenkins/src/components/BuildsPage/lib/Status/JenkinsRunStatus.tsx b/plugins/jenkins/src/components/BuildsPage/lib/Status/JenkinsRunStatus.tsx
@@ -30,7 +30,7 @@ export const JenkinsRunStatus = ({
   status: string | undefined;
 }) => {
   if (status === undefined) return null;
-  switch (status.toLowerCase()) {
+  switch (status.toLocaleLowerCase('en-US')) {
     case 'queued':
     case 'scheduled':
       return (

diff --git a/plugins/kubernetes/src/components/CustomResources/DefaultCustomResourceDrawer.tsx b/plugins/kubernetes/src/components/CustomResources/DefaultCustomResourceDrawer.tsx
@@ -18,7 +18,8 @@ import React from 'react';
 import { KubernetesDrawer } from '../KubernetesDrawer/KubernetesDrawer';
 import { Typography, Grid } from '@material-ui/core';
 
-const capitalize = (str: string) => str.charAt(0).toUpperCase() + str.slice(1);
+const capitalize = (str: string) =>
+  str.charAt(0).toLocaleUpperCase('en-US') + str.slice(1);
 
 export const DefaultCustomResourceDrawer = ({
   customResource,

diff --git a/plugins/lighthouse/src/components/AuditList/AuditListTable.tsx b/plugins/lighthouse/src/components/AuditList/AuditListTable.tsx
@@ -106,7 +106,7 @@ export const AuditListTable = ({ items }: { items: Website[] }) => {
       lastReport: (
         <>
           <AuditStatusIcon audit={website.lastAudit} />{' '}
-          <span>{website.lastAudit.status.toUpperCase()}</span>
+          <span>{website.lastAudit.status.toLocaleUpperCase('en-US')}</span>
         </>
       ),
       lastAuditTriggered: formatTime(website.lastAudit.timeCreated),

diff --git a/plugins/lighthouse/src/components/Cards/LastLighthouseAuditCard.tsx b/plugins/lighthouse/src/components/Cards/LastLighthouseAuditCard.tsx
@@ -59,7 +59,7 @@ const LighthouseCategoryScoreStatus = ({ score }: { score: number }) => {
 const LighthouseAuditStatus = ({ audit }: { audit: Audit }) => (
   <>
     <AuditStatusIcon audit={audit} />
-    {audit.status.toUpperCase()}
+    {audit.status.toLocaleUpperCase('en-US')}
   </>
 );
 

diff --git a/plugins/org/src/components/Cards/Group/MembersList/MembersListCard.tsx b/plugins/org/src/components/Cards/Group/MembersList/MembersListCard.tsx
@@ -130,7 +130,8 @@ export const MembersListCard = (_props: {
         member?.relations?.some(
           r =>
             r.type === RELATION_MEMBER_OF &&
-            r.target.name.toLowerCase() === groupName.toLowerCase(),
+            r.target.name.toLocaleLowerCase('en-US') ===
+              groupName.toLocaleLowerCase('en-US'),
         ),
     );
     return groupMembersList;

diff --git a/plugins/scaffolder/src/components/ResultsFilter/ResultsFilter.test.tsx b/plugins/scaffolder/src/components/ResultsFilter/ResultsFilter.test.tsx
@@ -100,7 +100,9 @@ describe('Results Filter', () => {
     );
     for (const category of categories) {
       expect(
-        await findByText(category.charAt(0).toUpperCase() + category.slice(1)),
+        await findByText(
+          category.charAt(0).toLocaleUpperCase('en-US') + category.slice(1),
+        ),
       ).toBeInTheDocument();
     }
   });

diff --git a/plugins/scaffolder/src/components/ResultsFilter/ResultsFilter.tsx b/plugins/scaffolder/src/components/ResultsFilter/ResultsFilter.tsx
@@ -107,7 +107,10 @@ export const ResultsFilter = ({ availableCategories }: Props) => {
               />
               <ListItemText
                 id={labelId}
-                primary={category.charAt(0).toUpperCase() + category.slice(1)}
+                primary={
+                  category.charAt(0).toLocaleUpperCase('en-US') +
+                  category.slice(1)
+                }
               />
             </ListItem>
           );

diff --git a/plugins/scaffolder/src/components/ScaffolderPage/ScaffolderPage.tsx b/plugins/scaffolder/src/components/ScaffolderPage/ScaffolderPage.tsx
@@ -105,16 +105,16 @@ export const ScaffolderPageContents = () => {
   );
 
   const matchesQuery = (metadata: EntityMeta, query: string) =>
-    `${metadata.title}`.toUpperCase().includes(query) ||
-    metadata.tags?.join('').toUpperCase().indexOf(query) !== -1;
+    `${metadata.title}`.toLocaleUpperCase('en-US').includes(query) ||
+    metadata.tags?.join('').toLocaleUpperCase('en-US').indexOf(query) !== -1;
 
   useEffect(() => {
     if (search.length === 0) {
       return setMatchingEntities(filteredEntities);
     }
     return setMatchingEntities(
       filteredEntities.filter(template =>
-        matchesQuery(template.metadata, search.toUpperCase()),
+        matchesQuery(template.metadata, search.toLocaleUpperCase('en-US')),
       ),
     );
   }, [search, filteredEntities]);

diff --git a/plugins/search/src/components/SearchPage/SearchPage.tsx b/plugins/search/src/components/SearchPage/SearchPage.tsx
@@ -56,7 +56,9 @@ export const SearchPage = () => {
             />
           </Grid>
           <Grid item xs={12}>
-            <SearchResult searchQuery={(queryString ?? '').toLowerCase()} />
+            <SearchResult
+              searchQuery={(queryString ?? '').toLocaleLowerCase('en-US')}
+            />
           </Grid>
         </Grid>
       </Content>

diff --git a/plugins/search/src/components/SearchResult/SearchResult.tsx b/plugins/search/src/components/SearchResult/SearchResult.tsx
@@ -158,11 +158,13 @@ export const SearchResult = ({ searchQuery }: SearchResultProps) => {
       if (searchQuery) {
         withFilters = withFilters.filter(
           (result: Result) =>
-            result.name?.toLowerCase().includes(searchQuery) ||
+            result.name?.toLocaleLowerCase('en-US').includes(searchQuery) ||
             result.name
-              ?.toLowerCase()
+              ?.toLocaleLowerCase('en-US')
               .includes(searchQuery.split(' ').join('-')) ||
-            result.description?.toLowerCase().includes(searchQuery),
+            result.description
+              ?.toLocaleLowerCase('en-US')
+              .includes(searchQuery),
         );
       }