Web: Renamed functions.

packages/client/src/pages/Home/InfoPanel/Body/sub-components/CommentEditor.js

@@ -13,13 +13,13 @@ const CommentEditor = ({
   setSelection,
   fetchFileVersions,
   updateCommentVersion,
-  canChangeVersionHistory,
+  canChangeVersionFileHistory,
   setVerHistoryFileId,
   setVerHistoryFileAccess,
 }) => {
   const { id, comment, version, access, folderType } = item;
 
-  const changeVersionHistoryAbility = canChangeVersionHistory({
+  const changeVersionHistoryAbility = canChangeVersionFileHistory({
     access,
     folderType,
     editing,
@@ -129,14 +129,14 @@ export default inject(({ auth, versionHistoryStore, accessRightsStore }) => {
     setVerHistoryFileAccess,
   } = versionHistoryStore;
 
-  const { canChangeVersionHistory } = accessRightsStore;
+  const { canChangeVersionFileHistory } = accessRightsStore;
   const editing = isEditingVersion || isEditing;
 
   return {
     setSelection,
     fetchFileVersions,
     updateCommentVersion,
-    canChangeVersionHistory,
+    canChangeVersionFileHistory,
     editing,
     setVerHistoryFileId,
     setVerHistoryFileAccess,

packages/client/src/pages/Home/InfoPanel/Body/views/Members/User.js

@@ -14,7 +14,7 @@ const User = ({
   currCanEditUsers,
   selectionParentRoom,
   setSelectionParentRoom,
-  canChangeUserRole,
+  canChangeUserRoleInRoom,
   rootFolderType,
   access,
 }) => {
@@ -69,7 +69,7 @@ const User = ({
 
   const isCanChangeUserRole =
     user &&
-    canChangeUserRole({
+    canChangeUserRoleInRoom({
       access,
       rootFolderType,
       currentUserInList: { id: user.id, access: user.access },

packages/client/src/pages/Home/InfoPanel/Body/views/Members/index.js

@@ -32,7 +32,7 @@ const Members = ({
 
   changeUserType,
   canInviteUserInRoom,
-  canChangeUserRole,
+  canChangeUserRoleInRoom,
 }) => {
   const membersHelper = new MembersHelper({ t });
 
@@ -155,7 +155,7 @@ const Members = ({
             roomType={selectionParentRoom.roomType}
             selectionParentRoom={selectionParentRoom}
             setSelectionParentRoom={setSelectionParentRoom}
-            canChangeUserRole={canChangeUserRole}
+            canChangeUserRoleInRoom={canChangeUserRoleInRoom}
           />
         ))}
       </StyledUserList>
@@ -210,7 +210,7 @@ export default inject(
     const { isOwner, isAdmin, id: selfId } = auth.userStore.user;
     const { setInvitePanelOptions } = dialogsStore;
     const { changeType: changeUserType } = peopleStore;
-    const { canInviteUserInRoom, canChangeUserRole } = accessRightsStore;
+    const { canInviteUserInRoom, canChangeUserRoleInRoom } = accessRightsStore;
 
     return {
       selectionParentRoom,
@@ -228,7 +228,7 @@ export default inject(
 
       changeUserType,
       canInviteUserInRoom,
-      canChangeUserRole,
+      canChangeUserRoleInRoom,
     };
   }
 )(

packages/client/src/pages/VersionHistory/Section/Body/VersionRow.js

@@ -41,7 +41,7 @@ const VersionRow = (props) => {
     versionsListLength,
     isEditing,
     theme,
-    canChangeVersionHistory,
+    canChangeVersionFileHistory,
   } = props;
   const [showEditPanel, setShowEditPanel] = useState(false);
   const [commentValue, setCommentValue] = useState(info.comment);
@@ -91,12 +91,12 @@ const VersionRow = (props) => {
   };
 
   const contextOptions = [
-    canChangeVersionHistory && {
+    canChangeVersionFileHistory && {
       key: "edit",
       label: t("EditComment"),
       onClick: onEditComment,
     },
-    canChangeVersionHistory && {
+    canChangeVersionFileHistory && {
       key: "restore",
       label: t("Common:Restore"),
       onClick: onRestoreClick,
@@ -108,7 +108,7 @@ const VersionRow = (props) => {
     },
   ];
 
-  const onClickProp = canChangeVersionHistory
+  const onClickProp = canChangeVersionFileHistory
     ? { onClick: onVersionClick }
     : {};
 
@@ -124,7 +124,7 @@ const VersionRow = (props) => {
     <StyledVersionRow
       showEditPanel={showEditPanel}
       contextOptions={contextOptions}
-      canEdit={canChangeVersionHistory}
+      canEdit={canChangeVersionFileHistory}
       isTabletView={isTabletView}
       isSavingComment={isSavingComment}
       isEditing={isEditing}
@@ -238,11 +238,13 @@ export default inject(
     const { rootFolderType } = selectedFolderStore;
 
     const isEdit = isEditingVersion || isEditing;
-    const canChangeVersionHistory = accessRightsStore.canChangeVersionHistory({
-      access: fileAccess,
-      rootFolderType,
-      editing: isEdit,
-    });
+    const canChangeVersionFileHistory = accessRightsStore.canChangeVersionFileHistory(
+      {
+        access: fileAccess,
+        rootFolderType,
+        editing: isEdit,
+      }
+    );
 
     return {
       theme: auth.settingsStore.theme,
@@ -252,7 +254,7 @@ export default inject(
       restoreVersion,
       updateCommentVersion,
       isEditing: isEdit,
-      canChangeVersionHistory,
+      canChangeVersionFileHistory,
     };
   }
 )(

packages/client/src/store/AccessRightsStore.js

@@ -33,7 +33,7 @@ class AccessRightsStore {
     return getRoomRoleActions(access).inviteUsers;
   }
 
-  canChangeUserRole = (room) => {
+  canChangeUserRoleInRoom = (room) => {
     const { access, rootFolderType, currentUserInList } = room;
     const { userStore } = this.authStore;
     const { user } = userStore;
@@ -61,7 +61,7 @@ class AccessRightsStore {
     return getFileRoleActions(access).block;
   };
 
-  canChangeVersionHistory = (file) => {
+  canChangeVersionFileHistory = (file) => {
     const { rootFolderType, editing, providerKey, access } = file;
 
     if (rootFolderType === FolderType.Archive)
@@ -77,7 +77,7 @@ class AccessRightsStore {
 
     return getFileRoleActions(access).changeVersionHistory;
   };
-  canViewVersionHistory = (file) => {
+  canViewVersionFileHistory = (file) => {
     const { rootFolderType, access, providerKey } = file;
 
     if (rootFolderType === FolderType.Archive)
@@ -108,7 +108,7 @@ class AccessRightsStore {
     return getFileRoleActions(access).edit;
   };
 
-  canRename = (item = {}) => {
+  canRenameItem = (item = {}) => {
     const { rootFolderType, access, isFile } = item;
     const { isDesktopClient } = this.authStore.settingsStore;
 

packages/client/src/store/FilesStore.js

@@ -1046,7 +1046,10 @@ class FilesStore {
     const pluginAllKeys =
       enablePlugins && getContextMenuKeysByType(PluginContextMenuItemType.All);
 
-    const canRename = this.accessRightsStore.canRename({ ...item, ...isFile });
+    const canRenameItem = this.accessRightsStore.canRenameItem({
+      ...item,
+      ...isFile,
+    });
 
     const canMove = this.accessRightsStore.canMoveItems({
       ...item,
@@ -1064,11 +1067,11 @@ class FilesStore {
     if (isFile) {
       const shouldFillForm = canFormFillingDocs(item.fileExst);
       const canLockFile = this.accessRightsStore.canLockFile(item);
-      const canChangeVersionHistory = this.accessRightsStore.canChangeVersionHistory(
+      const canChangeVersionFileHistory = this.accessRightsStore.canChangeVersionFileHistory(
         { ...item, ...{ editing: isEditing } }
       );
 
-      const canViewVersionHistory = this.accessRightsStore.canViewVersionHistory(
+      const canViewVersionFileHistory = this.accessRightsStore.canViewVersionFileHistory(
         item
       );
       const canFillForm = this.accessRightsStore.canFillForm(item);
@@ -1122,22 +1125,22 @@ class FilesStore {
         ]);
       }
 
-      if (!canChangeVersionHistory) {
+      if (!canChangeVersionFileHistory) {
         fileOptions = this.removeOptions(fileOptions, ["finalize-version"]);
       }
 
-      if (!canViewVersionHistory) {
+      if (!canViewVersionFileHistory) {
         fileOptions = this.removeOptions(fileOptions, ["show-version-history"]);
       }
 
-      if (!canChangeVersionHistory && !canViewVersionHistory) {
+      if (!canChangeVersionFileHistory && !canViewVersionFileHistory) {
         fileOptions = this.removeOptions(fileOptions, ["version"]);
         if (item.rootFolderType === FolderType.Archive) {
           fileOptions = this.removeOptions(fileOptions, ["separator0"]);
         }
       }
 
-      if (!canRename) {
+      if (!canRenameItem) {
         fileOptions = this.removeOptions(fileOptions, ["rename"]);
       }
 
@@ -1419,7 +1422,7 @@ class FilesStore {
         "delete",
       ];
 
-      if (!canRename) {
+      if (!canRenameItem) {
         fileOptions = this.removeOptions(fileOptions, ["rename"]);
       }