Web: Files: Fixed IsAdmin issues

products/ASC.Files/Client/src/components/Article/Body/index.js

@@ -18,7 +18,7 @@ import {
 import { NewFilesPanel } from "../../panels";
 import { setDocumentTitle } from "../../../helpers/utils";
 
-const { getCurrentModule } = initStore.auth.selectors;
+const { getCurrentModule, isAdmin } = initStore.auth.selectors;
 
 class ArticleBodyContent extends React.Component {
   constructor(props) {
@@ -237,7 +237,7 @@ function mapStateToProps(state) {
     myId,
     commonId,
     currentId: selectedFolder.id,
-    isAdmin: state.auth.user.isAdmin,
+    isAdmin: isAdmin(state),
     selection,
     dragging,
     updateTreeNew,

products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js

@@ -20,7 +20,14 @@ import FilesTileContent from "./FilesTileContent";
 import TileContainer from "./TileContainer";
 import Tile from "./Tile";
 
-import { api, constants, MediaViewer, toastr, Loaders } from "asc-web-common";
+import {
+  api,
+  constants,
+  MediaViewer,
+  toastr,
+  Loaders,
+  store,
+} from "asc-web-common";
 import {
   clearProgressData,
   deselectFile,
@@ -35,7 +42,7 @@ import {
   setProgressBarData,
   setSelected,
   setSelection,
-  setTreeFolders
+  setTreeFolders,
 } from "../../../../../store/files/actions";
 import {
   getCurrentFolderCount,
@@ -49,7 +56,6 @@ import {
   getFolderIcon,
   getSelectedFolderId,
   getFolders,
-  getIsAdmin,
   getIsLoading,
   getMediaViewerId,
   getMediaViewerVisibility,
@@ -67,9 +73,10 @@ import {
   isImage,
   isSound,
   isVideo,
-  loopTreeFolders
+  loopTreeFolders,
 } from "../../../../../store/files/selectors";
 import { SharingPanel, OperationsPanel } from "../../../../panels";
+const { isAdmin } = store.auth.selectors;
 //import { getFilterByLocation } from "../../../../../helpers/converters";
 //import config from "../../../../../../package.json";
 
@@ -262,7 +269,7 @@ class SectionBodyContent extends React.Component {
       treeFolders,
       setTreeFolders,
       setIsLoading,
-      fetchFiles
+      fetchFiles,
     } = this.props;
     const items = [...folders, ...files];
     const itemId = e && e.currentTarget.dataset.itemid;
@@ -308,7 +315,8 @@ class SectionBodyContent extends React.Component {
       percent: 0,
       label: t("DeleteOperation"),
     });
-    api.files.deleteFile(fileId)
+    api.files
+      .deleteFile(fileId)
       .then((res) => {
         const id = res[0] && res[0].id ? res[0].id : null;
         this.loopDeleteProgress(id, currentFolderId, false);
@@ -327,7 +335,7 @@ class SectionBodyContent extends React.Component {
       currentFolderType,
       t,
       setProgressBarData,
-      fetchFiles
+      fetchFiles,
     } = this.props;
     api.files.getProgress().then((res) => {
       const deleteProgress = res.find((x) => x.id === id);
@@ -374,7 +382,8 @@ class SectionBodyContent extends React.Component {
     const { t, setProgressBarData, clearProgressData } = this.props;
     const progressLabel = t("DeleteOperation");
     setProgressBarData({ visible: true, percent: 0, label: progressLabel });
-    api.files.deleteFolder(folderId, currentFolderId)
+    api.files
+      .deleteFolder(folderId, currentFolderId)
       .then((res) => {
         const id = res[0] && res[0].id ? res[0].id : null;
         this.loopDeleteProgress(id, currentFolderId, true);
@@ -397,10 +406,12 @@ class SectionBodyContent extends React.Component {
     copy(
       isFile
         ? this.isMediaOrImage(item.fileExst)
-          ? `${window.location.origin + settings.homepage}/filter?folder=${item.folderId
+          ? `${window.location.origin + settings.homepage}/filter?folder=${
+              item.folderId
             }&preview=${item.id}`
           : item.webUrl
-        : `${window.location.origin + settings.homepage}/filter?folder=${item.id
+        : `${window.location.origin + settings.homepage}/filter?folder=${
+            item.id
           }`
     );
 
@@ -429,7 +440,7 @@ class SectionBodyContent extends React.Component {
       /*files,*/ selectedFolderId,
       filter,
       setIsLoading,
-      fetchFiles
+      fetchFiles,
     } = this.props;
     const file = selection[0];
 
@@ -456,10 +467,9 @@ class SectionBodyContent extends React.Component {
       .finalizeVersion(fileId, 0, false)
       .then((data) => {
         //console.log("api.files.finalizeVersion", data);
-        return fetchFiles(
-          selectedFolderId,
-          filter
-        ).catch((err) => toastr.error(err));
+        return fetchFiles(selectedFolderId, filter).catch((err) =>
+          toastr.error(err)
+        );
       })
       .finally(() => setIsLoading(false));
   };
@@ -716,18 +726,14 @@ class SectionBodyContent extends React.Component {
     const { filter, myDocumentsId, setIsLoading, fetchFiles } = this.props;
     const newFilter = filter.clone();
     setIsLoading(true);
-    fetchFiles(myDocumentsId, newFilter).finally(() =>
-      setIsLoading(false)
-    );
+    fetchFiles(myDocumentsId, newFilter).finally(() => setIsLoading(false));
   };
 
   onBackToParentFolder = () => {
     const { filter, parentId, setIsLoading, fetchFiles } = this.props;
     const newFilter = filter.clone();
     setIsLoading(true);
-    fetchFiles(parentId, newFilter).finally(() =>
-      setIsLoading(false)
-    );
+    fetchFiles(parentId, newFilter).finally(() => setIsLoading(false));
   };
 
   renderEmptyRootFolderContainer = () => {
@@ -1211,7 +1217,8 @@ class SectionBodyContent extends React.Component {
   ) => {
     const { loopFilesOperations, clearProgressData } = this.props;
 
-    api.files.copyToFolder(
+    api.files
+      .copyToFolder(
         destFolderId,
         folderIds,
         fileIds,
@@ -1237,7 +1244,8 @@ class SectionBodyContent extends React.Component {
   ) => {
     const { loopFilesOperations, clearProgressData } = this.props;
 
-    api.files.moveToFolder(
+    api.files
+      .moveToFolder(
         destFolderId,
         folderIds,
         fileIds,
@@ -1616,7 +1624,7 @@ const mapStateToProps = (state) => {
     firstLoad: getFirstLoad(state),
     folderId: getSelectedFolderId(state),
     folders: getFolders(state),
-    isAdmin: getIsAdmin(state),
+    isAdmin: isAdmin(state),
     isCommon,
     isLoading: getIsLoading(state),
     isShare,
@@ -1630,7 +1638,7 @@ const mapStateToProps = (state) => {
     title: getSelectedFolderTitle(state),
     treeFolders,
     viewAs: getViewAs(state),
-    viewer: getViewer(state)
+    viewer: getViewer(state),
   };
 };
 
@@ -1648,5 +1656,5 @@ export default connect(mapStateToProps, {
   setSelected,
   setNewTreeFilesBadge,
   setIsLoading,
-  clearProgressData
+  clearProgressData,
 })(withRouter(withTranslation()(SectionBodyContent)));

products/ASC.Files/Client/src/components/pages/Settings/Section/Body/index.js

@@ -188,7 +188,6 @@ function mapStateToProps(state) {
     forceSave,
     storeForceSave,
     enableThirdParty,
-    isErrorSettings,
   } = settingsTree;
 
   return {

products/ASC.Files/Client/src/store/files/selectors.js

@@ -594,7 +594,7 @@ export const checkFolderType = (id, index, treeFolders) => {
   return treeFolders.length && treeFolders[index].id === id;
 };
 
-export const getSelectedFolderType = state => {
+export const getSelectedFolderType = (state) => {
   const { selectedFolder, treeFolders } = state.files;
   const id = selectedFolder.id;
 
@@ -614,103 +614,99 @@ export const getSelectedFolderType = state => {
   }
 };
 
-export const getFileAction = state => {
+export const getFileAction = (state) => {
   return state.files.fileAction;
-}
+};
 
-export const getFiles = state => {
+export const getFiles = (state) => {
   return state.files.files;
-}
+};
 
-export const getFolders = state => {
+export const getFolders = (state) => {
   return state.files.folders;
-}
+};
 
-export const getFilter = state => {
+export const getFilter = (state) => {
   return state.files.filter;
-}
+};
 
-export const getSelectedFolder = state => {
+export const getSelectedFolder = (state) => {
   return state.files.selectedFolder;
-}
+};
 
-export const getNewRowItems = state => {
+export const getNewRowItems = (state) => {
   return state.files.newRowItems;
-}
+};
 
-export const getSelectedFolderId = state => {
+export const getSelectedFolderId = (state) => {
   return state.files.selectedFolder.id;
-}
+};
 
-export const getSelectedFolderParentId = state => {
+export const getSelectedFolderParentId = (state) => {
   return state.files.selectedFolder.parentId;
-}
+};
 
-export const getSelectedFolderNew = state => {
+export const getSelectedFolderNew = (state) => {
   return state.files.selectedFolder.new;
-}
+};
 
-export const getSelected = state => {
+export const getSelected = (state) => {
   return state.files.selected;
-}
+};
 
-export const getSelection = state => {
+export const getSelection = (state) => {
   return state.files.selection;
-}
+};
 
-export const getSettings = state => {
+export const getSettings = (state) => {
   return state.auth.settings;
-}
+};
 
-export const getViewer = state => {
+export const getViewer = (state) => {
   return state.auth.user;
-}
+};
 
-export const getViewAs = state => {
+export const getViewAs = (state) => {
   return state.files.viewAs;
-}
+};
 
-export const getTreeFolders = state => {
+export const getTreeFolders = (state) => {
   return state.files.treeFolders;
-}
+};
 
-export const getSelectedFolderTitle = state => {
+export const getSelectedFolderTitle = (state) => {
   return state.files.selectedFolder.title;
-}
+};
 
-export const getCurrentFolderCount = state => {
+export const getCurrentFolderCount = (state) => {
   const { filesCount, foldersCount } = state.files.selectedFolder;
   return filesCount + foldersCount;
-}
+};
 
-export const getDragItem = state => {
+export const getDragItem = (state) => {
   return state.files.dragItem;
-}
+};
 
-export const getIsAdmin = state => {
-  return state.auth.user.isAdmin;
-}
-
-export const getMediaViewerVisibility = state => {
+export const getMediaViewerVisibility = (state) => {
   return state.files.mediaViewerData.visible;
-}
+};
 
-export const getMediaViewerId = state => {
+export const getMediaViewerId = (state) => {
   return state.files.mediaViewerData.id;
-}
+};
 
-export const getDragging = state => {
+export const getDragging = (state) => {
   return state.files.dragging;
-}
+};
 
-export const getIsLoading = state => {
+export const getIsLoading = (state) => {
   return state.files.isLoading;
-}
+};
 
-export const getFirstLoad = state => {
+export const getFirstLoad = (state) => {
   return state.files.firstLoad;
-}
+};
 
-export const getPathParts = state => {
+export const getPathParts = (state) => {
   return state.files.selectedFolder.pathParts;
-}
+};