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

✨ Restore legacy select #1101

Merged
merged 1 commit into from
Jul 11, 2023
Merged

✨ Restore legacy select #1101

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
130 changes: 64 additions & 66 deletions client/src/app/layout/SidebarApp/SidebarApp.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,8 @@ import {
PageSidebar,
NavList,
NavExpandable,
MenuToggle,
MenuToggleElement,
Select,
SelectOption,
SelectList,
} from "@patternfly/react-core";
import "./SidebarApp.css";
import { SelectOption, SelectVariant } from "@patternfly/react-core/deprecated";

import { Paths } from "@app/Paths";
import { LayoutTheme } from "../LayoutUtils";
Expand All @@ -23,11 +18,9 @@ import keycloak from "@app/keycloak";
import { useLocalStorage } from "@migtools/lib-ui";
import { LocalStorageKey } from "@app/Constants";
import { FEATURES_ENABLED } from "@app/FeatureFlags";

enum PersonaKey {
ADMINISTRATION = "Administration",
MIGRATION = "Migration",
}
import { OptionWithValue, SimpleSelect } from "@app/shared/components";
import { toOptionLike } from "@app/utils/model-utils";
import "./SidebarApp.css";

export const SidebarApp: React.FC = () => {
const token = keycloak.tokenParsed || undefined;
Expand All @@ -37,6 +30,46 @@ export const SidebarApp: React.FC = () => {
const { t } = useTranslation();
const { search } = useLocation();
const history = useHistory();
enum PersonaKey {
ADMINISTRATION = "Administration",
MIGRATION = "Migration",
}

const options = [
<SelectOption
key="dev"
component="button"
value={PersonaKey.MIGRATION}
isPlaceholder
>
{PersonaKey.MIGRATION}
</SelectOption>,
...(adminAccess
? [
<SelectOption
key="admin"
component="button"
value={PersonaKey.ADMINISTRATION}
>
{PersonaKey.ADMINISTRATION}
</SelectOption>,
]
: []),
];

const personaOptions: OptionWithValue<string>[] = [
{
value: PersonaKey.MIGRATION,
toString: () => PersonaKey.MIGRATION,
},
{
value: PersonaKey.ADMINISTRATION,
toString: () => PersonaKey.ADMINISTRATION,
},
];

const [selectedPersona, setSelectedPersona] =
useLocalStorage<PersonaKey | null>(LocalStorageKey.selectedPersona, null);

useEffect(() => {
if (!selectedPersona) {
Expand All @@ -45,66 +78,31 @@ export const SidebarApp: React.FC = () => {
}
}, []);

const [isOpen, setIsOpen] = React.useState(false);
const [selectedPersona, setSelectedPersona] = useLocalStorage<string | null>(
LocalStorageKey.selectedPersona,
null
);

const onToggleClick = () => {
setIsOpen(!isOpen);
};

const onSelect = (
_event: React.MouseEvent<Element, MouseEvent> | undefined,
itemId: string | number | undefined
) => {
setSelectedPersona(itemId as string);
if (itemId === PersonaKey.ADMINISTRATION) {
history.push(Paths.general);
} else {
history.push(Paths.applications);
}
setIsOpen(false);
};

const toggle = (toggleRef: React.Ref<MenuToggleElement>) => (
<MenuToggle
ref={toggleRef}
onClick={onToggleClick}
isExpanded={isOpen}
style={
{
width: "200px",
} as React.CSSProperties
}
>
{selectedPersona}
</MenuToggle>
);

return (
<PageSidebar theme={LayoutTheme}>
<Nav id="nav-primary" aria-label="Nav" theme={LayoutTheme}>
<div className="perspective">
<Select
id="sidebar-perspective"
<SimpleSelect
toggleId="sidebar-perspective-toggle"
variant={SelectVariant.single}
aria-label="Select user perspective"
isOpen={isOpen}
selected={selectedPersona}
onSelect={onSelect}
onOpenChange={(isOpen) => setIsOpen(isOpen)}
toggle={toggle}
>
<SelectList>
<SelectOption itemId={PersonaKey.MIGRATION}>
{PersonaKey.MIGRATION}
</SelectOption>
<SelectOption itemId={PersonaKey.ADMINISTRATION}>
{PersonaKey.ADMINISTRATION}
</SelectOption>
</SelectList>
</Select>
id="sidebar-perspective"
value={
selectedPersona
? toOptionLike(selectedPersona, personaOptions)
: undefined
}
options={personaOptions}
onChange={(selection) => {
const selectionValue = selection as OptionWithValue<PersonaKey>;
setSelectedPersona(selectionValue.value);
if (selectionValue.value === PersonaKey.ADMINISTRATION) {
history.push(Paths.general);
} else {
history.push(Paths.applications);
}
}}
/>
</div>
{selectedPersona === PersonaKey.MIGRATION ? (
<NavList title="Global">
Expand Down