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

Regression: Avatar now open account related options #9843

Merged
merged 2 commits into from
Feb 22, 2018
Merged

Regression: Avatar now open account related options #9843

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
88bea8d
Avatar now open account related options
karlprieb Feb 22, 2018
5d41a67
fix tests
karlprieb Feb 22, 2018
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
4 changes: 4 additions & 0 deletions packages/rocketchat-theme/client/imports/components/sidebar/sidebar-header.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@
width: var(--sidebar-account-thumb-size);
height: var(--sidebar-account-thumb-size);
margin: 0 10px;

& .avatar {
cursor: pointer;
}
}

&-status-bullet {
Expand Down
170 changes: 96 additions & 74 deletions packages/rocketchat-ui-sidenav/client/sidebarHeader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* globals popover isRtl menu */
/* globals popover menu */
const setStatus = status => {
AccountBox.setStatus(status);
RocketChat.callbacks.run('userStatusManuallySet', status);
Expand Down Expand Up @@ -153,10 +153,10 @@ const toolbarButtons = (user) => {
{
name: t('Options'),
icon: 'menu',
condition: () => !(Meteor.userId() == null && RocketChat.settings.get('Accounts_AllowAnonymousRead')),
action: () => {
condition: () => AccountBox.getItems().length || RocketChat.authz.hasAtLeastOnePermission(['view-statistics', 'view-room-administration', 'view-user-administration', 'view-privileged-setting' ]),
action: (e) => {
let adminOption;
if (RocketChat.authz.hasAtLeastOnePermission(['view-statistics', 'view-room-administration', 'view-user-administration', 'view-privileged-setting' ]) || (RocketChat.AdminBox.getOptions().length > 0)) {
if (RocketChat.authz.hasAtLeastOnePermission(['view-statistics', 'view-room-administration', 'view-user-administration', 'view-privileged-setting' ])) {
adminOption = {
icon: 'customize',
name: t('Administration'),
Expand All @@ -171,44 +171,11 @@ const toolbarButtons = (user) => {
};
}

const sidebarHeader = document.querySelector('.sidebar__header');
const sidebarHeaderPadding = parseInt(getComputedStyle(sidebarHeader)['padding-left'].replace('px', '')) * 2;
const sidebarHeaderMargin = parseInt(getComputedStyle(sidebarHeader)['margin-left'].replace('px', '')) * 2;

const config = {
popoverClass: 'sidebar-header',
columns: [
{
groups: [
{
title: t('User'),
items: [
{
icon: 'circle',
name: t('Online'),
modifier: 'online',
action: () => setStatus('online')
},
{
icon: 'circle',
name: t('Away'),
modifier: 'away',
action: () => setStatus('away')
},
{
icon: 'circle',
name: t('Busy'),
modifier: 'busy',
action: () => setStatus('busy')
},
{
icon: 'circle',
name: t('Invisible'),
modifier: 'offline',
action: () => setStatus('offline')
}
]
},
{
items: AccountBox.getItems().map(item => {
let action;
Expand Down Expand Up @@ -237,47 +204,19 @@ const toolbarButtons = (user) => {
sideNav: item.sideNav,
action
};
}).concat([
adminOption,
{
icon: 'user',
name: t('My_Account'),
type: 'open',
id: 'account',
action: () => {
SideNav.setFlex('accountFlex');
SideNav.openFlex();
FlowRouter.go('account');
popover.close();
}
},
{
icon: 'sign-out',
name: t('Logout'),
type: 'open',
id: 'logout',
action: () => {
Meteor.logout(() => {
RocketChat.callbacks.run('afterLogoutCleanUp', user);
Meteor.call('logoutCleanUp', user);
FlowRouter.go('home');
popover.close();
});
}
}
])
}).concat([adminOption])
}
]
}
],
position: {
top: sidebarHeader.offsetHeight
},
customCSSProperties: {
width: `${ sidebarHeader.offsetWidth - sidebarHeaderPadding + sidebarHeaderMargin }px`,
left: isRtl() ? 'auto' : getComputedStyle(sidebarHeader)['padding-left'],
right: isRtl() ? getComputedStyle(sidebarHeader)['padding-left'] : 'auto'
}
mousePosition: () => ({
x: e.currentTarget.getBoundingClientRect().left,
y: e.currentTarget.getBoundingClientRect().bottom + 50
}),
customCSSProperties: () => ({
top: `${ e.currentTarget.getBoundingClientRect().bottom + 10 }px`,
left: `${ e.currentTarget.getBoundingClientRect().left - 10 }px`
})
};

popover.open(config);
Expand Down Expand Up @@ -313,5 +252,88 @@ Template.sidebarHeader.events({
e.currentTarget.blur();
}
return this.action && this.action.apply(this, [e]);
},
'click .sidebar__header .avatar'(e) {
if (!(Meteor.userId() == null && RocketChat.settings.get('Accounts_AllowAnonymousRead'))) {
const user = Meteor.user();
const config = {
popoverClass: 'sidebar-header',
columns: [
{
groups: [
{
title: t('User'),
items: [
{
icon: 'circle',
name: t('Online'),
modifier: 'online',
action: () => setStatus('online')
},
{
icon: 'circle',
name: t('Away'),
modifier: 'away',
action: () => setStatus('away')
},
{
icon: 'circle',
name: t('Busy'),
modifier: 'busy',
action: () => setStatus('busy')
},
{
icon: 'circle',
name: t('Invisible'),
modifier: 'offline',
action: () => setStatus('offline')
}
]
},
{
items: [
{
icon: 'user',
name: t('My_Account'),
type: 'open',
id: 'account',
action: () => {
SideNav.setFlex('accountFlex');
SideNav.openFlex();
FlowRouter.go('account');
popover.close();
}
},
{
icon: 'sign-out',
name: t('Logout'),
type: 'open',
id: 'logout',
action: () => {
Meteor.logout(() => {
RocketChat.callbacks.run('afterLogoutCleanUp', user);
Meteor.call('logoutCleanUp', user);
FlowRouter.go('home');
popover.close();
});
}
}
]
}
]
}
],
mousePosition: () => ({
x: e.currentTarget.getBoundingClientRect().left,
y: e.currentTarget.getBoundingClientRect().bottom + 50
}),
customCSSProperties: () => ({
top: `${ e.currentTarget.getBoundingClientRect().bottom + 10 }px`,
left: `${ e.currentTarget.getBoundingClientRect().left - 10 }px`
})
};

popover.open(config);
}
}
});
2 changes: 1 addition & 1 deletion tests/end-to-end/ui/11-admin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ describe('[Administration]', () => {

describe('[Admin View]', () => {
before(() => {
sideNav.sidebarUserMenu.click();
sideNav.sidebarMenu.click();
sideNav.admin.waitForVisible(5000);
});

Expand Down
2 changes: 1 addition & 1 deletion tests/end-to-end/ui/12-settings.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -474,7 +474,7 @@ describe('[Api Settings Change]', () => {

it('login as admin and go to users', () => {
checkIfUserIsAdmin(adminUsername, adminEmail, adminPassword);
sideNav.sidebarUserMenu.click();
sideNav.sidebarMenu.click();
sideNav.admin.waitForVisible(5000);
sideNav.admin.click();
admin.usersLink.waitForVisible(5000);
Expand Down
3 changes: 2 additions & 1 deletion tests/pageobjects/side-nav.page.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ class SideNav extends Page {
get accountBoxUserAvatar() { return browser.element('.sidebar__account .avatar-image'); }
get accountMenu() { return browser.element('.sidebar__account'); }
get sidebarHeader() { return browser.element('.sidebar__header'); }
get sidebarUserMenu() { return browser.element('.sidebar__toolbar-button-icon--menu'); }
get sidebarUserMenu() { return browser.element('.sidebar__header .avatar'); }
get sidebarMenu() { return browser.element('.sidebar__toolbar-button-icon--menu'); }
get popOverContent() { return browser.element('.rc-popover__content'); }
get statusOnline() { return browser.element('.rc-popover__item--online'); }
get statusAway() { return browser.element('.rc-popover__item--away'); }
Expand Down