Merge pull request #118 from ONLYOFFICE/bugfix/header-menu
Bugfix/header menu
This commit is contained in:
commit
4336588119
@ -10,7 +10,7 @@ const Error401 = ({}) => {
|
||||
return <ErrorContainer headerText={t("Error401Text")} />;
|
||||
};
|
||||
|
||||
export default (
|
||||
export default () => (
|
||||
<I18nextProvider i18n={i18n}>
|
||||
<Error401 />
|
||||
</I18nextProvider>
|
||||
|
@ -91,6 +91,12 @@ class AccessRightsStore {
|
||||
(userIsVisitor || userIsCollaborator)
|
||||
);
|
||||
};
|
||||
canMakePowerUser = (user) => {
|
||||
const { isVisitor: userIsVisitor, isCollaborator: userIsCollaborator } =
|
||||
user;
|
||||
|
||||
return userIsVisitor || userIsCollaborator;
|
||||
};
|
||||
|
||||
canActivateUser = (user) => {
|
||||
const { id, isOwner, isAdmin } = this.authStore.userStore.user;
|
||||
|
@ -183,6 +183,7 @@ class PeopleStore {
|
||||
hasUsersToInvite,
|
||||
hasUsersToRemove,
|
||||
hasOnlyOneUserToRemove,
|
||||
hasUsersToMakePowerUser,
|
||||
hasFreeUsers,
|
||||
userSelectionRole,
|
||||
selection,
|
||||
@ -218,22 +219,30 @@ class PeopleStore {
|
||||
key: "manager",
|
||||
isActive: userSelectionRole === "manager",
|
||||
};
|
||||
const userOption = {
|
||||
id: "menu_change-user_user",
|
||||
className: "group-menu_drop-down",
|
||||
label: t("Common:User"),
|
||||
title: t("Common:User"),
|
||||
// const userOption = {
|
||||
// id: "menu_change-user_user",
|
||||
// className: "group-menu_drop-down",
|
||||
// label: t("Common:User"),
|
||||
// title: t("Common:User"),
|
||||
// onClick: (e) => this.onChangeType(e),
|
||||
// "data-action": "user",
|
||||
// key: "user",
|
||||
// isActive: userSelectionRole === "user",
|
||||
// };
|
||||
const collaboratorOption = {
|
||||
id: "menu_change-collaborator",
|
||||
key: "collaborator",
|
||||
title: t("Common:PowerUser"),
|
||||
label: t("Common:PowerUser"),
|
||||
"data-action": "collaborator",
|
||||
onClick: (e) => this.onChangeType(e),
|
||||
"data-action": "user",
|
||||
key: "user",
|
||||
isActive: userSelectionRole === "user",
|
||||
isActive: userSelectionRole === "collaborator",
|
||||
};
|
||||
|
||||
isOwner && options.push(adminOption);
|
||||
|
||||
options.push(managerOption);
|
||||
|
||||
hasFreeUsers && options.push(userOption);
|
||||
hasUsersToMakePowerUser && options.push(collaboratorOption);
|
||||
|
||||
const headerMenu = [
|
||||
{
|
||||
|
@ -170,7 +170,12 @@ class SelectionStore {
|
||||
|
||||
return users.length > 0;
|
||||
}
|
||||
get hasUsersToMakePowerUser() {
|
||||
const { canMakePowerUser } = this.peopleStore.accessRightsStore;
|
||||
const users = this.selection.filter((x) => canMakePowerUser(x));
|
||||
|
||||
return users.length > 0;
|
||||
}
|
||||
get getUsersToMakeEmployees() {
|
||||
const { canMakeEmployeeUser } = this.peopleStore.accessRightsStore;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user