Skip to content

Commit

Permalink
fix(RHINENG-5932): Fix found visual regressions after PF5 migration (#…
Browse files Browse the repository at this point in the history
…2148)

* fix: Align staleness card title with popover

* fix: Fix missing icons color

* fix: Align Create group button with the rest of toolbar

* chore: Add missing OUIA IDs
  • Loading branch information
gkarat authored Feb 28, 2024
1 parent fd3e39e commit 2465ce8
Show file tree
Hide file tree
Showing 10 changed files with 23 additions and 37 deletions.
8 changes: 4 additions & 4 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"@patternfly/react-core": "^5.1.2",
"@patternfly/react-icons": "^5.2.0",
"@patternfly/react-table": "^5.1.2",
"@redhat-cloud-services/frontend-components": "^4.2.3",
"@redhat-cloud-services/frontend-components": "^4.2.4",
"@redhat-cloud-services/frontend-components-notifications": "^4.1.0",
"@redhat-cloud-services/frontend-components-utilities": "^4.0.2",
"@redhat-cloud-services/host-inventory-client": "1.2.13",
Expand Down
2 changes: 1 addition & 1 deletion src/Utilities/DeleteModal.js
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ const DeleteModal = ({
>
<Split hasGutter>
<SplitItem>
<Icon size="xl" className="ins-m-alert">
<Icon size="xl" status="warning">
<ExclamationTriangleIcon />
</Icon>
</SplitItem>
Expand Down
8 changes: 4 additions & 4 deletions src/Utilities/__snapshots__/DeleteModal.test.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -77,10 +77,10 @@ exports[`DeleteModal DOM should render correctly with multiple systems 1`] = `
class="pf-v5-l-split__item"
>
<span
class="pf-v5-c-icon pf-m-xl ins-m-alert"
class="pf-v5-c-icon pf-m-xl"
>
<span
class="pf-v5-c-icon__content"
class="pf-v5-c-icon__content pf-m-warning"
>
<svg
aria-hidden="true"
Expand Down Expand Up @@ -290,10 +290,10 @@ exports[`DeleteModal DOM should render correctly with one system 1`] = `
class="pf-v5-l-split__item"
>
<span
class="pf-v5-c-icon pf-m-xl ins-m-alert"
class="pf-v5-c-icon pf-m-xl"
>
<span
class="pf-v5-c-icon__content"
class="pf-v5-c-icon__content pf-m-warning"
>
<svg
aria-hidden="true"
Expand Down
1 change: 0 additions & 1 deletion src/Utilities/hooks/useBulkSelectConfig.js
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,6 @@ export const useBulkSelectConfig = (
onSelectRows(0, value);
},
toggleProps: {
'data-ouia-component-type': 'bulk-select-toggle-button',
children: isBulkLoading ? (
[
<Fragment key="sd">
Expand Down
25 changes: 9 additions & 16 deletions src/components/GroupsTable/GroupsTable.js
Original file line number Diff line number Diff line change
Expand Up @@ -450,22 +450,15 @@ const GroupsTable = ({ onCreateGroupClick }) => {
}}
actionsConfig={{
actions: [
{
label: (
<ActionButton
requiredPermissions={[GENERAL_GROUPS_WRITE_PERMISSION]}
noAccessTooltip={NO_MODIFY_GROUPS_TOOLTIP_MESSAGE}
onClick={onCreateGroupClick}
>
Create group
</ActionButton>
),
props: {
style: {
backgroundColor: 'transparent',
},
},
},
<ActionButton
key="create-group-btn"
requiredPermissions={[GENERAL_GROUPS_WRITE_PERMISSION]}
noAccessTooltip={NO_MODIFY_GROUPS_TOOLTIP_MESSAGE}
onClick={onCreateGroupClick}
ouiaId="CreateGroupButton"
>
Create group
</ActionButton>,
{
label: (
<ActionDropdownItem
Expand Down
6 changes: 2 additions & 4 deletions src/components/InventoryGroups/Modals/DeleteGroupModal.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ import componentTypes from '@data-driven-forms/react-form-renderer/component-typ
import Modal from './Modal';
import { deleteGroupsById, getGroupsByIds } from '../utils/api';
import { ExclamationTriangleIcon } from '@patternfly/react-icons/dist/esm/icons/exclamation-triangle-icon';
import warningColor from '@patternfly/react-tokens/dist/esm/global_warning_color_100';
import dangerColor from '@patternfly/react-tokens/dist/esm/global_danger_color_100';
import {
Backdrop,
Bullseye,
Expand Down Expand Up @@ -50,7 +48,7 @@ const generateSchema = (groups) => ({
const generateContent = (groups = []) => ({
title: groups.length > 1 ? 'Delete groups?' : 'Delete group?',
titleIconVariant: () => (
<Icon color={warningColor.value}>
<Icon status="warning">
<ExclamationTriangleIcon />
</Icon>
),
Expand Down Expand Up @@ -133,7 +131,7 @@ const DeleteGroupModal = ({
: 'Cannot delete group at this time'
}
titleIconVariant={() => (
<Icon color={dangerColor.value}>
<Icon status="danger">
<ExclamationCircleIcon />
</Icon>
)}
Expand Down
2 changes: 1 addition & 1 deletion src/components/InventoryHostStaleness/HostStalenessCard.js
Original file line number Diff line number Diff line change
Expand Up @@ -195,8 +195,8 @@ const HostStalenessCard = ({ canModifyHostStaleness }) => {
<CardHeader>
<Title headingLevel="h4" size="xl" id="HostTitle">
Organization level system staleness and deletion
<InventoryHostStalenessPopover hasEdgeSystems={hasEdgeSystems} />
</Title>
<InventoryHostStalenessPopover hasEdgeSystems={hasEdgeSystems} />
</CardHeader>
<CardBody>
<p>
Expand Down
2 changes: 1 addition & 1 deletion src/components/InventoryTable/EntityTableToolbar.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ const expectDefaultFiltersVisible = async () => {

await userEvent.click(
screen.getByRole('button', {
name: 'Conditional filter',
name: /conditional filter toggle/i,
})
);
DEFAULT_FILTERS.forEach((filterName) =>
Expand Down
4 changes: 0 additions & 4 deletions src/routes/inventory.scss
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,6 @@
background: var(--pf-v5-global--BackgroundColor--100);
}

svg.ins-m-alert {
fill: var(--pf-v5-global--warning-color--100);
}

.ins-c-inventory__table--remove {
.pf-v5-c-clipboard-copy {
margin: 0 3rem;
Expand Down

0 comments on commit 2465ce8

Please sign in to comment.