Merge pull request #14284 from cctechwiz/bug/inconsistent-casing-of-entity-type-14059
Removing forced capitalization for Entity types in the sidebar.
This commit is contained in:
@@ -0,0 +1,5 @@
|
||||
---
|
||||
'@backstage/plugin-catalog-react': patch
|
||||
---
|
||||
|
||||
Removed forced capitalization for Entity types in the catalog sidebar.
|
||||
@@ -16,7 +16,6 @@
|
||||
|
||||
import React from 'react';
|
||||
import { fireEvent, waitFor } from '@testing-library/react';
|
||||
import { capitalize } from 'lodash';
|
||||
import { Entity } from '@backstage/catalog-model';
|
||||
import { EntityTypePicker } from './EntityTypePicker';
|
||||
import { MockEntityListContextProvider } from '../../testUtils/providers';
|
||||
@@ -99,11 +98,11 @@ describe('<EntityTypePicker/>', () => {
|
||||
const input = rendered.getByTestId('select');
|
||||
fireEvent.click(input);
|
||||
|
||||
await waitFor(() => rendered.getByText('Service'));
|
||||
await waitFor(() => rendered.getByText('service'));
|
||||
|
||||
entities.forEach(entity => {
|
||||
expect(
|
||||
rendered.getByText(capitalize(entity.spec!.type as string)),
|
||||
rendered.getByText(entity.spec!.type as string),
|
||||
).toBeInTheDocument();
|
||||
});
|
||||
});
|
||||
@@ -125,15 +124,15 @@ describe('<EntityTypePicker/>', () => {
|
||||
const input = rendered.getByTestId('select');
|
||||
fireEvent.click(input);
|
||||
|
||||
await waitFor(() => rendered.getByText('Service'));
|
||||
fireEvent.click(rendered.getByText('Service'));
|
||||
await waitFor(() => rendered.getByText('service'));
|
||||
fireEvent.click(rendered.getByText('service'));
|
||||
|
||||
expect(updateFilters).toHaveBeenLastCalledWith({
|
||||
type: new EntityTypeFilter(['service']),
|
||||
});
|
||||
|
||||
fireEvent.click(input);
|
||||
fireEvent.click(rendered.getByText('All'));
|
||||
fireEvent.click(rendered.getByText('all'));
|
||||
|
||||
expect(updateFilters).toHaveBeenLastCalledWith({ type: undefined });
|
||||
});
|
||||
|
||||
@@ -15,7 +15,6 @@
|
||||
*/
|
||||
|
||||
import React, { useEffect } from 'react';
|
||||
import capitalize from 'lodash/capitalize';
|
||||
import { Box } from '@material-ui/core';
|
||||
import { useEntityTypeFilter } from '../../hooks/useEntityTypeFilter';
|
||||
|
||||
@@ -54,10 +53,10 @@ export const EntityTypePicker = (props: EntityTypePickerProps) => {
|
||||
if (availableTypes.length === 0 || error) return null;
|
||||
|
||||
const items = [
|
||||
{ value: 'all', label: 'All' },
|
||||
{ value: 'all', label: 'all' },
|
||||
...availableTypes.map((type: string) => ({
|
||||
value: type,
|
||||
label: capitalize(type),
|
||||
label: type,
|
||||
})),
|
||||
];
|
||||
|
||||
|
||||
Reference in New Issue
Block a user