Removed unrelated code

Signed-off-by: Bogdan Nechyporenko <bnechyporenko@bol.com>
This commit is contained in:
Bogdan Nechyporenko
2023-10-04 16:25:21 +02:00
parent c7c9e9f198
commit 811ae9f478
8 changed files with 4 additions and 96 deletions
-6
View File
@@ -1,6 +0,0 @@
---
'@backstage/core-components': patch
'@backstage/plugin-scaffolder': patch
---
Add a possibility to use a formatter for on a warning panel. Applied it for a scaffolder template
+2 -2
View File
@@ -28,8 +28,8 @@
"new": "backstage-cli new --scope backstage --baseVersion 0.0.0 --no-private",
"create-plugin": "echo \"use 'yarn new' instead\"",
"release": "node scripts/prepare-release.js && changeset version && yarn prettier --write '{packages,plugins}/*/{package.json,CHANGELOG.md}' '.changeset/*.json' && yarn install --no-immutable",
"prettier:check": "prettier --check .",
"prettier:fix": "prettier --write .",
"prettier:check": "prettier --check ./.changeset",
"prettier:fix": "prettier --write ./.changeset",
"storybook": "yarn ./storybook run start",
"snyk:test": "npx snyk test --yarn-workspaces --strict-out-of-sync=false",
"snyk:test:package": "yarn snyk:test --include",
-1
View File
@@ -384,7 +384,6 @@ export type ErrorPanelClassKey = 'text' | 'divider';
export type ErrorPanelProps = {
error: Error;
defaultExpanded?: boolean;
formatTitle?: string;
title?: string;
};
@@ -1,47 +0,0 @@
/*
* Copyright 2020 The Backstage Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import { WarningPanel } from '../WarningPanel';
import { screen } from '@testing-library/react';
import React from 'react';
import { renderInTestApp } from '@backstage/test-utils';
import { WarningProps } from '../WarningPanel/WarningPanel';
describe('<ErrorPanel />', () => {
const propsErrorMessage: WarningProps = {
severity: 'error',
title: 'Mock title',
message: 'Some more info',
};
it('renders a title formatted by markdown', async () => {
await renderInTestApp(
<WarningPanel
{...propsErrorMessage}
formatTitle="markdown"
title="Step has been failed. [Help](https://commonmark.org/help)"
/>,
);
expect(
screen.getByText('Error: Step has been failed.'),
).toBeInTheDocument();
expect(screen.getByText('Help')).toHaveAttribute(
'href',
'https://commonmark.org/help',
);
});
});
@@ -96,7 +96,6 @@ const ErrorList = ({
export type ErrorPanelProps = {
error: Error;
defaultExpanded?: boolean;
formatTitle?: string;
title?: string;
};
@@ -106,13 +105,12 @@ export type ErrorPanelProps = {
* @public
*/
export function ErrorPanel(props: PropsWithChildren<ErrorPanelProps>) {
const { title, error, defaultExpanded, formatTitle, children } = props;
const { title, error, defaultExpanded, children } = props;
return (
<WarningPanel
severity="error"
title={title ?? error.message}
defaultExpanded={defaultExpanded}
formatTitle={formatTitle}
>
<ErrorList
error={error.name}
@@ -75,21 +75,4 @@ describe('<WarningPanel />', () => {
await renderInTestApp(<WarningPanel {...propsErrorMessage} />);
expect(screen.getByText('Error: Mock title')).toBeInTheDocument();
});
it('renders a title formatted by markdown', async () => {
await renderInTestApp(
<WarningPanel
{...propsErrorMessage}
formatTitle="markdown"
title="Step has been failed. [Help](https://commonmark.org/help)"
/>,
);
expect(
screen.getByText('Error: Step has been failed.'),
).toBeInTheDocument();
expect(screen.getByText('Help')).toHaveAttribute(
'href',
'https://commonmark.org/help',
);
});
});
@@ -23,7 +23,6 @@ import Typography from '@material-ui/core/Typography';
import ErrorOutline from '@material-ui/icons/ErrorOutline';
import ExpandMoreIcon from '@material-ui/icons/ExpandMore';
import React from 'react';
import { MarkdownContent } from '../MarkdownContent';
const getWarningTextColor = (
severity: NonNullable<WarningProps['severity']>,
@@ -70,9 +69,6 @@ export type WarningPanelClassKey =
const useStyles = makeStyles<BackstageTheme>(
theme => ({
content: {
lineBreak: 'anywhere',
},
panel: {
backgroundColor: ({ severity }: WarningProps) =>
getWarningBackgroundColor(
@@ -98,11 +94,6 @@ const useStyles = makeStyles<BackstageTheme>(
),
fontWeight: theme.typography.fontWeightBold,
},
markdownContent: {
'& p': {
display: 'inline',
},
},
message: {
width: '100%',
display: 'block',
@@ -133,7 +124,6 @@ const useStyles = makeStyles<BackstageTheme>(
export type WarningProps = {
title?: string;
severity?: 'warning' | 'error' | 'info';
formatTitle?: string;
message?: React.ReactNode;
defaultExpanded?: boolean;
children?: React.ReactNode;
@@ -161,7 +151,6 @@ export function WarningPanel(props: WarningProps) {
const {
severity = 'warning',
title,
formatTitle,
message,
children,
defaultExpanded,
@@ -184,14 +173,7 @@ export function WarningPanel(props: WarningProps) {
>
<ErrorOutlineStyled severity={severity} />
<Typography className={classes.summaryText} variant="subtitle1">
{formatTitle === 'markdown' ? (
<MarkdownContent
content={subTitle}
className={classes.markdownContent}
/>
) : (
subTitle
)}
{subTitle}
</Typography>
</AccordionSummary>
{(message || children) && (
@@ -162,7 +162,6 @@ export const OngoingTask = (props: {
<Box paddingBottom={2}>
<ErrorPanel
error={taskStream.error}
formatTitle="markdown"
title={taskStream.error.message}
/>
</Box>