Skip to content

OCPBUGS-81668: Fix User Preferences responsive breakpoints bug #16279

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

Open
sg00dwin wants to merge 1 commit into
base: main
Choose a base branch
from
Open

OCPBUGS-81668: Fix User Preferences responsive breakpoints bug #16279

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 0 additions & 13 deletions frontend/packages/console-app/src/components/user-preferences/UserPreferenceForm.scss
View file
Open in desktop

This file was deleted.

8 changes: 1 addition & 7 deletions frontend/packages/console-app/src/components/user-preferences/UserPreferenceForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,11 @@ import { Form } from '@patternfly/react-core';
import type { ResolvedUserPreferenceItem } from './types';
import UserPreferenceField from './UserPreferenceField';

import './UserPreferenceForm.scss';

type UserPreferenceFormProps = { items: ResolvedUserPreferenceItem[] };

const UserPreferenceForm: FC<UserPreferenceFormProps> = ({ items }) =>
items && items.length > 0 ? (
<Form
onSubmit={(event) => event.preventDefault()}
className="co-user-preference__form"
role="form"
>
<Form onSubmit={(event) => event.preventDefault()} role="form">
{items.map((item) => (
<UserPreferenceField key={item.id} item={item} />
))}
Expand Down
35 changes: 0 additions & 35 deletions frontend/packages/console-app/src/components/user-preferences/UserPreferencePage.scss
View file
Open in desktop

This file was deleted.

29 changes: 19 additions & 10 deletions frontend/packages/console-app/src/components/user-preferences/UserPreferencePage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,16 @@
import { useMemo, useState, useEffect, createRef } from 'react';
import type { FC, ReactElement, JSXElementConstructor, MouseEvent } from 'react';
import type { TabProps, TabContentProps } from '@patternfly/react-core';
import { Tabs, Tab, TabTitleText, TabContent, PageSection } from '@patternfly/react-core';
import {
Tabs,
Tab,
TabTitleText,
TabContent,
PageSection,
Sidebar,
SidebarContent,
SidebarPanel,
} from '@patternfly/react-core';
import { useTranslation } from 'react-i18next';
import { useParams, useNavigate } from 'react-router';
import {
Expand All @@ -26,7 +35,6 @@ import type {
} from './types';
import UserPreferenceForm from './UserPreferenceForm';
import { getUserPreferenceGroups } from './utils/getUserPreferenceGroups';
import './UserPreferencePage.scss';

const UserPreferencePage: FC = () => {
// resources and calls to hooks
Expand Down Expand Up @@ -78,6 +86,7 @@ const UserPreferencePage: FC = () => {
);
acc[1].push(
<TabContent
className="pf-v6-u-w-75-on-lg pf-v6-u-w-50-on-xl"
key={id}
eventKey={id}
id={id}
Expand Down Expand Up @@ -117,7 +126,7 @@ const UserPreferencePage: FC = () => {
};
const activeTab = sortedUserPreferenceGroups.find((group) => group.id === activeTabId)?.label;
return (
<div className="co-user-preference-page">
<>
<DocumentTitle>
{activeTab
? t('console-app~User Preferences {{activeTab}}', { activeTab })
Expand All @@ -131,8 +140,8 @@ const UserPreferencePage: FC = () => {
/>
<PageSection>
{userPreferenceItemResolved ? (
<div className="co-user-preference-page-content">
<div className="co-user-preference-page-content__tabs">
<Sidebar hasGutter>
<SidebarPanel variant="sticky">
<Tabs
activeKey={activeTabId}
onSelect={handleTabClick}
Expand All @@ -142,17 +151,17 @@ const UserPreferencePage: FC = () => {
>
{userPreferenceTabs}
</Tabs>
</div>
<div className="co-user-preference-page-content__tab-content">
</SidebarPanel>
<SidebarContent>
{userPreferenceTabContents}
{spotlight && spotlightElement && <Spotlight selector={spotlight} interactive />}
</div>
</div>
</SidebarContent>
</Sidebar>
) : (
<LoadingBox />
)}
</PageSection>
</div>
</>
);
};

Expand Down