Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

CONSOLE-2361: Conversion of bootstrap table column and visibility classes to similar PF4 classes #9440

Merged
merged 1 commit into from
Jul 14, 2021
Merged

CONSOLE-2361: Conversion of bootstrap table column and visibility classes to similar PF4 classes #9440

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 5 additions & 5 deletions frontend/public/components/RBAC/role.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ const menuActions = [
Kebab.factory.Delete,
];

const roleColumnClasses = [classNames('col-xs-6'), classNames('col-xs-6'), Kebab.columnClass];
const roleColumnClasses = ['', '', Kebab.columnClass];

const RolesTableRow = ({ obj: role, index, key, style }) => {
return (
Expand Down Expand Up @@ -154,10 +154,10 @@ class Details extends React.Component {
const DetailsWithTranslation = withTranslation()(Details);

const bindingsColumnClasses = [
classNames('col-xs-4'),
classNames('col-xs-2'),
classNames('col-xs-4'),
classNames('col-xs-2'),
'pf-u-w-33-on-sm',
'pf-u-w-16-on-sm',
'pf-u-w-33-on-sm',
'pf-u-w-16-on-sm',
];

const BindingsTableRow = ({ obj: binding, index, key, style }) => {
Expand Down
10 changes: 5 additions & 5 deletions frontend/public/components/api-explorer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,11 +116,11 @@ const Group: React.FC<{ value: string }> = ({ value }) => {
};

const tableClasses = [
'col-lg-3 col-md-3 col-sm-5 col-xs-4',
'col-lg-2 col-md-2 col-sm-4 col-xs-4',
'col-lg-2 col-md-2 col-sm-3 col-xs-4',
'col-lg-2 hidden-md hidden-sm hidden-xs',
'col-lg-3 col-md-5 hidden-sm hidden-xs',
'pf-u-w-25-on-2xl',
'pf-u-w-16-on-2xl',
'pf-u-w-16-on-lg pf-u-w-10-on-2xl',
'pf-m-hidden pf-m-visible-on-xl pf-u-w-16-on-lg',
'pf-m-hidden pf-m-visible-on-lg',
];

const APIResourceRows = ({ componentProps: { data } }) =>
Expand Down
9 changes: 4 additions & 5 deletions frontend/public/components/chargeback.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import * as React from 'react';
import * as _ from 'lodash-es';
import * as classNames from 'classnames';
import { sortable } from '@patternfly/react-table';
import { match as RMatch } from 'react-router-dom';

Expand Down Expand Up @@ -450,10 +449,10 @@ export const ReportsDetailsPage: React.SFC<ReportsDetailsPageProps> = (props) =>
};

const reportsGenerationColumnClasses = [
classNames('col-md-3', 'col-sm-4'),
classNames('col-md-3', 'col-sm-4'),
classNames('col-md-3', 'hidden-sm', 'hidden-xs'),
classNames('col-md-3', 'col-sm-4'),
'',
'',
'pf-m-hidden pf-visible-on-lg',
'',
Kebab.columnClass,
];

Expand Down
6 changes: 3 additions & 3 deletions frontend/public/components/cluster-settings/cluster-operator.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,9 @@ const OperatorStatusIconAndLabel: React.FC<OperatorStatusIconAndLabelProps> = ({

const tableColumnClasses = [
'',
'',
'pf-m-hidden pf-m-visible-on-md',
'pf-m-hidden pf-m-visible-on-md',
'pf-u-w-16-on-xl',
'pf-m-hidden pf-m-visible-on-md pf-u-w-33-on-2xl',
'pf-m-hidden pf-m-visible-on-md pf-u-w-33-on-2xl',
Kebab.columnClass,
];

Expand Down
10 changes: 5 additions & 5 deletions frontend/public/components/job.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,11 @@ export const menuActions: KebabAction[] = [
const kind = 'Job';

const tableColumnClasses = [
'',
'',
'pf-m-hidden pf-m-visible-on-md pf-u-w-33-on-md',
'pf-m-hidden pf-m-visible-on-lg pf-u-w-16-on-lg',
'pf-m-hidden pf-m-visible-on-xl pf-u-w-16-on-xl',
'pf-u-w-25-on-2xl',
'pf-u-w-25-on-2xl',
'pf-m-hidden pf-m-visible-on-md pf-u-w-25-on-2xl',
'pf-m-hidden pf-m-visible-on-lg',
'pf-m-hidden pf-m-visible-on-xl',
Kebab.columnClass,
];

Expand Down
8 changes: 4 additions & 4 deletions frontend/public/components/machine-autoscaler.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,11 @@ const MachineAutoscalerTargetLink: React.FC<MachineAutoscalerTargetLinkProps> =
};

const tableColumnClasses = [
'pf-u-w-33-on-lg',
'',
'pf-m-hidden pf-m-visible-on-md',
'pf-m-hidden pf-m-visible-on-lg pf-u-w-16-on-lg',
'pf-m-hidden pf-m-visible-on-lg pf-u-w-16-on-lg',
'',
'pf-m-hidden pf-m-visible-on-sm pf-u-w-25-on-xl',
'pf-m-hidden pf-m-visible-on-lg pf-u-w-16-on-xl pf-u-w-10-on-2xl',
'pf-m-hidden pf-m-visible-on-lg pf-u-w-16-on-xl pf-u-w-10-on-2xl',
Kebab.columnClass,
];

Expand Down
12 changes: 6 additions & 6 deletions frontend/public/components/machine-config-pool.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,12 +246,12 @@ export const MachineConfigPoolDetailsPage: React.SFC<any> = (props) => (
);

const tableColumnClasses = [
'pf-u-w-25-on-lg pf-u-w-33-on-md pf-u-w-50-on-sm',
'pf-m-hidden pf-m-visible-on-xl pf-u-w-50-on-xl',
'pf-u-w-25-on-sm pf-u-w-16-on-md pf-u-w-8-on-lg',
'pf-m-hidden pf-m-visible-on-md pf-u-w-16-on-md pf-u-w-8-on-lg',
'pf-m-hidden pf-m-visible-on-lg pf-u-w-8-on-lg',
'pf-u-w-25-on-lg pf-u-w-33-on-sm pf-u-w-8-on-lg',
'pf-u-w-33-on-md pf-u-w-25-on-lg',
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It seems like other instances the sizes descend from largest to smallest. Would be good to be consistent.

Copy link
Member Author

@sg00dwin sg00dwin Jul 9, 2021 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I updated the sizes to consistent. Going from sm > md > lg > xl >2xl since PF rules apply to *-on-{size} and larger.
And pf-u-w-{width} rule precedes pf-u-w-{width}-on-{size}

'pf-m-hidden pf-m-visible-on-lg pf-u-w-25-on-lg pf-u-w-33-on-xl',
'pf-u-w-10-on-xl',
'pf-m-hidden pf-m-visible-on-sm pf-u-w-10-on-xl',
'pf-m-hidden pf-m-visible-on-lg pf-u-w-10-on-xl',
'pf-u-w-10-on-xl',
Kebab.columnClass,
];

Expand Down
24 changes: 12 additions & 12 deletions frontend/public/components/monitoring/alerting.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -478,10 +478,10 @@ const Graph: React.FC<GraphProps> = ({
};

const tableSilenceClasses = [
classNames('col-sm-5', 'col-xs-8'),
classNames('col-md-2', 'col-sm-3', 'hidden-xs'),
classNames('col-md-3', 'col-sm-4'),
classNames('col-md-2', 'hidden-sm'),
'pf-u-w-50 pf-u-w-33-on-sm',
'pf-m-hidden pf-m-visible-on-sm pf-m-hidden-on-md pf-m-visible-on-lg',
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It seems like other instances the sizes descend from largest to smallest. Would be good to be consistent.

Copy link
Member Author

@sg00dwin sg00dwin Jul 9, 2021 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I updated the sizes to consistent. Going from sm > md > lg > xl >2xl since PF rules apply to *-on-{size} and larger. And pf-u-w-{width} rule precedes pf-u-w-{width}-on-{size}

'',
'pf-m-hidden pf-m-visible-on-sm',
Kebab.columnClass,
];

Expand Down Expand Up @@ -1218,10 +1218,10 @@ const SilencesDetailsPage = withFallback(
);

const tableAlertClasses = [
classNames('col-sm-6', 'col-xs-8'),
classNames('col-sm-2', 'hidden-xs'),
classNames('col-sm-2', 'col-xs-3'),
classNames('col-sm-2', 'col-xs-3'),
'pf-u-w-50 pf-u-w-33-on-sm',
'pf-m-hidden pf-m-visible-on-sm',
'',
'pf-m-hidden pf-m-visible-on-sm',
Kebab.columnClass,
];

Expand Down Expand Up @@ -1460,10 +1460,10 @@ export const alertStateFilter = (): RowFilter => ({
});

const tableRuleClasses = [
classNames('col-sm-4', 'col-xs-6'),
classNames('col-sm-2', 'hidden-xs'),
classNames('col-sm-3', 'col-xs-4'),
classNames('col-sm-2', 'col-xs-2'),
'pf-u-w-50 pf-u-w-33-on-sm',
'pf-m-hidden pf-m-visible-on-sm',
'',
'pf-m-hidden pf-m-visible-on-sm',
];

const RuleTableRow: RowFunction<Rule> = ({ index, key, obj, style }) => (
Expand Down
13 changes: 6 additions & 7 deletions frontend/public/components/volumes-table.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import * as React from 'react';
import { Link } from 'react-router-dom';
import * as _ from 'lodash-es';
import * as classNames from 'classnames';
import { useTranslation } from 'react-i18next';
import i18next from 'i18next';
import {
Expand Down Expand Up @@ -91,12 +90,12 @@ const ContainerLink: React.FC<ContainerLinkProps> = ({ name, pod }) => (
ContainerLink.displayName = 'ContainerLink';

const volumeRowColumnClasses = [
classNames('col-lg-2', 'col-md-3', 'col-sm-4', 'col-xs-5'),
classNames('col-lg-2', 'col-md-3', 'col-sm-4', 'col-xs-7'),
classNames('col-lg-2', 'col-md-2', 'col-sm-4', 'hidden-xs'),
classNames('col-lg-2', 'col-md-2', 'hidden-sm', 'hidden-xs'),
classNames('col-lg-2', 'col-md-2', 'hidden-sm', 'hidden-xs'),
classNames('col-lg-2', 'hidden-md', 'hidden-sm', 'hidden-xs'),
'pf-u-w-25-on-2xl',
'pf-u-w-25-on-2xl',
'pf-m-hidden pf-m-visible-on-md',
'pf-m-hidden pf-m-visible-on-lg',
'pf-m-hidden pf-m-visible-on-lg',
'pf-m-hidden pf-m-visible-on-xl',
Kebab.columnClass,
];

Expand Down
1 change: 1 addition & 0 deletions frontend/public/style/_overrides.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -446,6 +446,7 @@ h6 {
}
}

// required because our tables use table-layout:fixed
.pf-c-table__action {
max-width: 44px !important;
padding: 8px 0 !important;
Expand Down