Merge branch 'feature/files' into feature/loading-acceleration

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

@@ -30,6 +30,10 @@ const StyledTreeMenu = styled(TreeMenu)`
   .rc-tree-treenode-disabled > a span {
     cursor: wait;
   }
+/*
+  span.rc-tree-iconEle {
+    margin-left: 4px;
+  }*/
 `;
 
 class TreeFolders extends React.Component {
@@ -395,6 +399,9 @@ class TreeFolders extends React.Component {
         onDragLeave={this.onDragLeave}
         onDrop={this.onDrop}
         dragging={dragging}
+        gapBetweenNodes="22"
+        gapBetweenNodesTablet="26"
+        isFullFillSelection={false}
       >
         {this.getItems(treeData)}
       </StyledTreeMenu>

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

@@ -28,18 +28,19 @@ const StyledTreeMenu = styled(TreeMenu)`
     background: #dfe2e3 !important;
   }
 
-  .settings-node > .rc-tree-node-content-wrapper > .rc-tree-title {
-    padding-left: 4px !important;
-    width: 100%;
-  }
   .rc-tree-treenode-disabled > span:not(.rc-tree-switcher),
   .rc-tree-treenode-disabled > a,
   .rc-tree-treenode-disabled > a span {
     cursor: wait;
   }
+  
+  .rc-tree-child-tree .rc-tree-node-content-wrapper > .rc-tree-title {
+    width: 99% !important;
+    padding-left: 4px !important;
+  }
 
   .rc-tree-child-tree {
-    margin-left: 31px;
+    margin-left: 24px;
   }
 `;
 
@@ -147,6 +148,9 @@ const PureTreeSettings = ({
       onSelect={onSelect}
       showIcon={true}
       onExpand={onExpand}
+      isFullFillSelection={false}
+      gapBetweenNodes="22"
+      gapBetweenNodesTablet="26"
     >
       {nodes}
     </StyledTreeMenu>

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

@@ -19,15 +19,18 @@ const EmptyFolderWrapper = styled.div`
     }
 
     .empty-folder_container_up-image {
-      margin-right: 8px;
+      margin: 1px 8px 0 0;
       cursor: pointer;
     }
 
     .empty-folder_container_plus-image {
       margin: -8px 8px 0 0;
+      line-height: unset;
     }
 
     .empty-folder_container-icon {
+      height: 20px;
+      width: 12px;
       margin-right: 4px;
     }
   }

products/ASC.People/Client/src/App.js

@@ -23,7 +23,6 @@ import {
   Main,
 } from "asc-web-common";
 import { getFilterByLocation } from "./helpers/converters";
-import { getPortalInviteLinks } from "./store/portal/actions";
 import { fetchGroups, fetchPeople } from "./store/people/actions";
 import config from "../package.json";
 
@@ -157,8 +156,7 @@ const mapStateToProps = (state) => {
 
 const mapDispatchToProps = (dispatch) => {
   return {
-    getUser: () =>
-      getUser(dispatch).then(() => dispatch(getPortalInviteLinks())), //TODO: Try simplify
+    getUser: () => getUser(dispatch),
     getPortalSettings: () => getPortalSettings(dispatch),
     getModules: () => getModules(dispatch),
     getPortalPasswordSettings: () => getPortalPasswordSettings(dispatch),

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

@@ -15,7 +15,7 @@ const i18n = createI18N({
 });
 
 const { changeLanguage } = commonUtils;
-const { getCurrentModule, isAdmin } = initStore.auth.selectors;
+const { isAdmin } = initStore.auth.selectors;
 
 const StyledTreeMenu = styled(TreeMenu)`
   ${props => props.isAdmin && css`margin-top: 19px;`}
@@ -73,10 +73,8 @@ class ArticleBodyContent extends React.Component {
 
   changeTitleDocument(data = null) {
     const {
-      organizationName,
       groups,
-      selectedKeys,
-      currentModuleName
+      selectedKeys
     } = this.props;
 
     const currentGroup = getSelectedGroup(groups, data ? data[0] : selectedKeys[0]);
@@ -213,13 +211,8 @@ const BodyContent = props => {
 };
 
 function mapStateToProps(state) {
-  const currentModule = getCurrentModule(
-    state.auth.modules,
-    state.auth.settings.currentProductId
-  );
-
   const groups = state.people.groups;
-  const { customNames, organizationName } = state.auth.settings;
+  const { customNames } = state.auth.settings;
   const { groupsCaption } = customNames;
 
   return {
@@ -228,8 +221,6 @@ function mapStateToProps(state) {
       ? [state.people.selectedGroup]
       : ["root"],
     groups,
-    organizationName,
-    currentModuleName: (currentModule && currentModule.title) || "",
     isAdmin: isAdmin(state.auth.user)
   };
 }

products/ASC.People/Client/src/components/dialogs/InviteDialog/index.js

@@ -15,6 +15,7 @@ import ModalDialogContainer from "../ModalDialogContainer";
 import copy from "copy-to-clipboard";
 import { api, utils } from "asc-web-common";
 import { createI18N } from "../../../helpers/i18n";
+import { getPortalInviteLinks } from "../../../store/portal/actions";
 const i18n = createI18N({
   page: "InviteDialog",
   localesPath: "dialogs/InviteDialog"
@@ -78,10 +79,22 @@ class InviteDialogComponent extends React.Component {
   };
 
   componentDidMount() {
-    const { t } = this.props;
+    const { getPortalInviteLinks, userInvitationLink, guestInvitationLink } = this.props;
 
-    changeLanguage(i18n)
-      .then(() => this.setState({ visible: true }))
+    changeLanguage(i18n).then(() => {
+      if(!userInvitationLink || !guestInvitationLink){
+        getPortalInviteLinks()
+        .then(() => {
+          this.setState({ 
+            visible: true,
+            userInvitationLink: this.props.userInvitationLink,
+            guestInvitationLink: this.props.guestInvitationLink
+          })
+        })
+      } else {
+        this.setState({ visible: true })
+      }
+    })
   }
 
   onClickToCloseButton = () =>
@@ -171,6 +184,12 @@ const mapStateToProps = state => {
   };
 };
 
+const mapDispatchToProps = dispatch => {
+  return {
+    getPortalInviteLinks: () => dispatch(getPortalInviteLinks())
+  }
+}
+
 const InviteDialogTranslated = withTranslation()(InviteDialogComponent);
 
 const InviteDialog = props => <InviteDialogTranslated i18n={i18n} {...props} />;
@@ -181,4 +200,7 @@ InviteDialog.propTypes = {
   onCloseButton: PropTypes.func.isRequired
 };
 
-export default connect(mapStateToProps)(InviteDialog);
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(InviteDialog);

web/ASC.Web.Components/package.json

@@ -1,6 +1,6 @@
 {
   "name": "asc-web-components",
-  "version": "1.0.452",
+  "version": "1.0.453",
   "description": "Ascensio System SIA component library",
   "license": "AGPL-3.0",
   "main": "dist/asc-web-components.js",

web/ASC.Web.Components/src/components/tree-menu/index.js

@@ -10,15 +10,19 @@ const StyledTreeMenu = styled(Tree)`
     width: 93%;
     -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
     
-  
+    .rc-tree-switcher {
+        margin-left: 0 !important;
+    }
+
+    & li span.rc-tree-iconEle {
+        margin-left: 4px;
+    }
+
     ${props => props.isEmptyRootNode &&
         css`
             & > li > span.rc-tree-switcher-noop {
                 display: none;
             }
-            & li span.rc-tree-iconEle {
-                margin-left: 4px;
-            }
         `
     }
     .rc-tree-node-content-wrapper {