Skip to content

Refactor preferences #726

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

Merged
merged 2 commits into from
Feb 16, 2023
Merged

Refactor preferences #726

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ff7cca3
.
Feb 16, 2023
e2cc4d5
preferences menu update
Feb 16, 2023
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
42 changes: 31 additions & 11 deletions ui_src/src/components/sideBar/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ function SideBar() {
const history = useHistory();
const [avatarUrl, SetAvatarUrl] = useState(require('../../assets/images/bots/avatar1.svg'));
const [systemVersion, setSystemVersion] = useState('');
const [popoverOpen, setPopoverOpen] = useState(false);

const getCompanyLogo = useCallback(async () => {
try {
Expand Down Expand Up @@ -101,7 +102,13 @@ function SideBar() {
};
const content = (
<div>
<div className="item-wrap" onClick={() => history.push(pathDomains.profile)}>
<div
className="item-wrap"
onClick={() => {
history.push(pathDomains.profile);
setPopoverOpen(false);
}}
>
<div className="item">
<span className="icons">
<img
Expand All @@ -123,7 +130,13 @@ function SideBar() {
</div>
<ChevronRightRoundedIcon />
</div>
<div className="item-wrap" onClick={() => history.push(`${pathDomains.preferences}/integrations`)}>
<div
className="item-wrap"
onClick={() => {
history.push(`${pathDomains.preferences}/integrations`);
setPopoverOpen(false);
}}
>
<div className="item">
<span className="icons">
<SettingOutlined className="icons-sidebar" />
Expand All @@ -134,7 +147,7 @@ function SideBar() {
</div>

<Link to={{ pathname: DOC_URL }} target="_blank">
<div className="item-wrap">
<div className="item-wrap" onClick={() => setPopoverOpen(false)}>
<div className="item">
<span className="icons">
<LiveHelpOutlinedIcon className="icons-sidebar" />
Expand All @@ -145,7 +158,7 @@ function SideBar() {
</div>
</Link>
<div className="item-wrap">
<div className="item">
<div className="item" onClick={async () => await AuthService.logout()}>
<span className="icons">
<ExitToAppOutlined className="icons-sidebar" />
</span>
Expand Down Expand Up @@ -224,16 +237,23 @@ function SideBar() {
</div>
<div className="bottom-icons">
<Link to={`${pathDomains.preferences}/integrations`}>
<div className="integration-icon-wrapper">
<TooltipComponent text="Integrations" placement="right">
<TooltipComponent text="Integrations" placement="right">
<div className="integration-icon-wrapper" onClick={() => setPopoverOpen(false)}>
<img src={integrationNavIcon} />
</TooltipComponent>
</div>
</div>
</TooltipComponent>
</Link>
<Popover overlayInnerStyle={overlayStyles} placement="rightBottom" content={content} trigger="click">
<div className="sub-icon-wrapper">
<Popover
overlayInnerStyle={overlayStyles}
placement="rightBottom"
content={content}
trigger="click"
onOpenChange={() => setPopoverOpen(!popoverOpen)}
visible={popoverOpen}
>
<div className="sub-icon-wrapper" onClick={() => setPopoverOpen(true)}>
<img
className={`sandboxUserImg ${state.route === 'profile' && 'sandboxUserImgSelected'}`}
className={`sandboxUserImg ${(state.route === 'profile' || state.route === 'preferences') && 'sandboxUserImgSelected'}`}
src={localStorage.getItem('profile_pic') || avatarUrl} // profile_pic is available only in sandbox env
referrerPolicy="no-referrer"
width={localStorage.getItem('profile_pic') ? 35 : 25}
Expand Down