Skip to content

Commit 9be97bc

Browse files
committed
CONSOLE-4492: Clean up unused CSS
1 parent 1968c5b commit 9be97bc

File tree

19 files changed

+31
-64
lines changed

19 files changed

+31
-64
lines changed

Diff for: frontend/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@
140140
"@patternfly/react-catalog-view-extension": "^6.1.0",
141141
"@patternfly/react-charts": "^8.2.1",
142142
"@patternfly/react-code-editor": "^6.2.1",
143-
"@patternfly/react-component-groups": "6.2.1",
143+
"@patternfly/react-component-groups": "^6.2.1",
144144
"@patternfly/react-console": "^6.0.0",
145145
"@patternfly/react-core": "^6.2.1",
146146
"@patternfly/react-icons": "^6.2.1",

Diff for: frontend/packages/console-app/src/components/volume-snapshot/create-volume-snapshot/create-volume-snapshot.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ const CreateSnapshotForm = withHandlePromise<SnapshotResourceProps>((props) => {
252252
<div className="co-m-pane__form">
253253
<DocumentTitle>{title}</DocumentTitle>
254254
<PageHeading
255-
title={<div className="co-m-pane__name">{title}</div>}
255+
title={title}
256256
linkProps={{
257257
component: LinkTo(
258258
`/k8s/ns/${namespace || 'default'}/${referenceForModel(VolumeSnapshotModel)}/~new`,

Diff for: frontend/packages/console-shared/src/components/multi-tab-list/MultiTabListPage.tsx

+4-4
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,8 @@ const MultiTabListPage: React.FC<MultiTabListPageProps> = ({
8787
</Button>
8888
</ActionListItem>
8989
)}
90-
<ActionListItem>
91-
{items && (
90+
{items && (
91+
<ActionListItem>
9292
<Dropdown
9393
buttonClassName="pf-m-primary"
9494
menuClassName="prevent-overflow"
@@ -97,8 +97,8 @@ const MultiTabListPage: React.FC<MultiTabListPageProps> = ({
9797
items={items}
9898
onChange={onSelectCreateAction}
9999
/>
100-
)}
101-
</ActionListItem>
100+
</ActionListItem>
101+
)}
102102
</>
103103
}
104104
/>

Diff for: frontend/packages/dev-console/src/components/add/AddPageLayout.tsx

+3-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { useTranslation } from 'react-i18next';
55
import { AddActionGroup, isAddActionGroup } from '@console/dynamic-plugin-sdk';
66
import { GettingStartedSection } from '@console/internal/components/dashboard/project-dashboard/getting-started/GettingStartedSection';
77
import { getQueryArgument, BasePageHeading } from '@console/internal/components/utils';
8-
import { useExtensions } from '@console/plugin-sdk/src';
8+
import { useExtensions } from '@console/plugin-sdk/src/api/useExtensions';
99
import { useActiveNamespace } from '@console/shared';
1010
import TopologyQuickSearch from '@console/topology/src/components/quick-search/TopologyQuickSearch';
1111
import TopologyQuickSearchButton from '@console/topology/src/components/quick-search/TopologyQuickSearchButton';
@@ -103,8 +103,9 @@ const AddPageLayout: React.FC<AddPageLayoutProps> = ({ title }) => {
103103

104104
return (
105105
<div className="odc-add-page-layout ocs-quick-search-modal__no-backdrop" data-test="add-page">
106-
<BasePageHeading title={title} helpText={<HelpText />} />
106+
<BasePageHeading title={title} />
107107
<PageSection>
108+
<HelpText />
108109
<GettingStartedSection userSettingKey="devconsole.addPage.gettingStarted" />
109110
<AddCardSection
110111
addActionExtensions={filteredAddActionExtensions}

Diff for: frontend/packages/dev-console/src/components/add/__tests__/AddPageLayout.spec.tsx

+1-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@ import { useShowAddCardItemDetails } from '../hooks/useShowAddCardItemDetails';
99
import { addActionExtensions } from './add-page-test-data';
1010

1111
jest.mock('@console/plugin-sdk/src/api/useExtensions', () => {
12-
const addActionGroupExtensions = jest.requireActual('./add-page-test-data');
13-
return { useExtensions: () => addActionGroupExtensions };
12+
return { useExtensions: () => [] };
1413
});
1514

1615
jest.mock('../hooks/useShowAddCardItemDetails', () => ({

Diff for: frontend/packages/gitops-plugin/src/components/details/GitOpsDetailsPageHeading.scss

-18
This file was deleted.

Diff for: frontend/packages/gitops-plugin/src/components/details/GitOpsDetailsPageHeading.tsx

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import * as React from 'react';
22
import { useTranslation } from 'react-i18next';
33
import { routeDecoratorIcon } from '@console/dev-console/src/components/import/render-utils';
44
import { BasePageHeading } from '@console/internal/components/utils/headings';
5-
import './GitOpsDetailsPageHeading.scss';
65

76
interface GitOpsDetailsPageHeadingProps {
87
url: string;

Diff for: frontend/packages/integration-tests-cypress/views/overview.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@ export const overviewPage = {
1818
cy.get('.resource-overview').should(exist ? 'exist' : 'not.exist');
1919
},
2020
detailsSidebarHeadingContains: (name) => {
21-
cy.get('.resource-overview__heading .co-m-pane__name').contains(name);
21+
cy.get('.resource-overview__heading .co-m-pane__heading').contains(name);
2222
},
2323
};

Diff for: frontend/packages/knative-plugin/integration-tests/support/pageObjects/global-po.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ export const eventingPO = {
226226
noApp: '[id="#UNASSIGNED_APP#-link"]',
227227
appName: '[data-test-id="application-form-app-name"]',
228228
eventSourceLink: '[data-type="event-source-link"]',
229-
headingTitle: '.resource-overview__heading',
229+
headingTitle: '.resource-overview [data-test-id="resource-title"]',
230230
listItem: '.list-group-item',
231231
},
232232
eventSource: {

Diff for: frontend/packages/pipelines-plugin/src/components/ListPage.tsx

+11-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* eslint-disable @typescript-eslint/no-use-before-define */
22
import * as React from 'react';
3-
import { Button, TextInput, TextInputProps } from '@patternfly/react-core';
3+
import { Button, PageSection, TextInput, TextInputProps } from '@patternfly/react-core';
44
import classNames from 'classnames';
55
// eslint-disable-next-line no-restricted-imports
66
import * as _ from 'lodash-es';
@@ -315,7 +315,16 @@ export const FireMan: React.FC<FireManProps & { filterList?: typeof filterList }
315315

316316
return (
317317
<>
318-
<PageHeading title={title} badge={badge} helpText={helpText} primaryAction={createLink} />
318+
{/* Badge rendered from PageHeading only when title is present */}
319+
{title && (
320+
<PageHeading title={title} badge={badge} helpText={helpText} primaryAction={createLink} />
321+
)}
322+
{!title && (
323+
<PageSection>
324+
{createLink}
325+
{badge && <div>{badge}</div>}
326+
</PageSection>
327+
)}
319328
<PaneBody>
320329
{inject(props.children, {
321330
resources,

Diff for: frontend/packages/pipelines-plugin/src/components/pipelines/pipeline-builder/PipelineBuilderHeader.scss

-5
This file was deleted.

Diff for: frontend/packages/pipelines-plugin/src/components/pipelines/pipeline-builder/PipelineBuilderHeader.tsx

+1-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ import { BasePageHeading } from '@console/internal/components/utils/headings';
44
import { TechPreviewBadge } from '@console/shared';
55
import { usePipelineTechPreviewBadge } from '../../../utils/hooks';
66

7-
import './PipelineBuilderHeader.scss';
8-
97
const PipelineBuilderHeader: React.FC<{ namespace: string }> = ({ namespace }) => {
108
const { t } = useTranslation();
119
const badge = usePipelineTechPreviewBadge(namespace);
@@ -14,6 +12,7 @@ const PipelineBuilderHeader: React.FC<{ namespace: string }> = ({ namespace }) =
1412
<BasePageHeading
1513
title={t('pipelines-plugin~Pipeline builder')}
1614
badge={badge && <TechPreviewBadge />}
15+
hideFavoriteButton
1716
/>
1817
);
1918
};

Diff for: frontend/packages/pipelines-plugin/src/components/pipelines/pipeline-builder/task-sidebar/TaskSidebarHeader.scss

-17
This file was deleted.

Diff for: frontend/packages/pipelines-plugin/src/components/pipelines/pipeline-builder/task-sidebar/TaskSidebarHeader.tsx

-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ import { TaskKind } from '../../../../types';
66
import PipelineResourceRef from '../../../shared/common/PipelineResourceRef';
77
import TaskSidebarShortcuts from './TaskSidebarShortcuts';
88

9-
import './TaskSidebarHeader.scss';
10-
119
type TaskSidebarHeaderProps = {
1210
removeThisTask: () => void;
1311
taskResource: TaskKind;

Diff for: frontend/packages/topology/integration-tests/support/page-objects/topology-po.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ export const topologyPO = {
9090
podScaleUP: '[aria-label="Increase the Pod count"]',
9191
podScaleDown: '[aria-label="Decrease the Pod count"]',
9292
podText: 'text.pod-ring__center-text',
93-
applicationGroupingsTitle: '.overview__sidebar-pane-head.resource-overview__heading',
93+
applicationGroupingsTitle: '.overview__sidebar-pane-head data-test-id="resource-title"]',
9494
applicationGroupingsSidepane: 'overview__sidebar-pane resource-overview',
9595
resourcesTabApplicationGroupings: '.pf-v6-c-tabs__item',
9696
pipelineRunsDetails: '.sidebar__section-heading',
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
.odc-topology-sidebar-alert,
22
.dc-deprecation-sidebar-alert {
3-
margin: 0 20px var(--pf-t--global--spacer--md);
3+
&:empty {
4+
display: none;
5+
}
46
}

Diff for: frontend/public/components/utils/headings.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ export const PageHeading = connectToModel((props: PageHeadingProps) => {
178178
<OverrideTitle obj={data} />
179179
) : (
180180
(kind || resourceTitle || resourceStatus) && (
181-
<div className="co-m-pane__heading co-m-pane__name co-resource-item">
181+
<div className="co-m-pane__heading co-resource-item">
182182
{kind && <ResourceIcon kind={kind} className="co-m-resource-icon--lg" />}{' '}
183183
<span data-test-id="resource-title" className="co-resource-item__resource-name">
184184
{resourceTitle}

Diff for: frontend/public/locales/en/public.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1452,7 +1452,7 @@
14521452
"(use all containers)": "(use all containers)",
14531453
"Select which containers to mount volume into.": "Select which containers to mount volume into.",
14541454
"Add Storage": "Add Storage",
1455-
"<0>Add Storage</0><1> to <3></3></1>": "<0>Add Storage</0><1> to <3></3></1>",
1455+
"<0> to <3></3></0>": "<0> to <3></3></0>",
14561456
"Storage type": "Storage type",
14571457
"Access mode is set by StorageClass and cannot be changed": "Access mode is set by StorageClass and cannot be changed",
14581458
"Permissions to the mounted drive": "Permissions to the mounted drive",

Diff for: frontend/yarn.lock

+1-1
Original file line numberDiff line numberDiff line change
@@ -1773,7 +1773,7 @@
17731773
react-dropzone "14.3.5"
17741774
tslib "^2.8.1"
17751775

1776-
"@patternfly/[email protected]":
1776+
"@patternfly/react-component-groups@^6.2.1":
17771777
version "6.2.1"
17781778
resolved "https://registry.yarnpkg.com/@patternfly/react-component-groups/-/react-component-groups-6.2.1.tgz#2b4d184d128426c9b72366c0da4fa5c488febd06"
17791779
integrity sha512-bPiPoVOR+mS3xdMpAv/xkbT9+PVvNhfE22JdUG2pfmWXXTP7BsmFgRo4mouSDqqDTdXz+ZDYKRkxGR5FpKMJyQ==

0 commit comments

Comments
 (0)