Merge branch 'develop' into feature/selection-area

.github/workflows/4testing-multi-build.yml

@@ -2,7 +2,7 @@ name: 4testing multiarch-build
 
 on:
   push:
-    branches: [ "develop" ]
+    branches: ["develop"]
 
 jobs:
   build:
@@ -11,29 +11,24 @@ jobs:
       matrix:
         platform: [linux/amd64]
     steps:
-      - 
-        name: Checkout
+      - name: Checkout
         uses: actions/checkout@v2
-      -
-        name: Set up QEMU
+      - name: Set up QEMU
         uses: docker/setup-qemu-action@v2
-      - 
-        name: Set up Docker Buildx
+      - name: Set up Docker Buildx
         id: buildx
         uses: docker/setup-buildx-action@v1
-      -
-        name: Login to DockerHub
+      - name: Login to DockerHub
         uses: docker/login-action@v2
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - 
-        name: Build 4testing
+      - name: Build 4testing
         run: |
           cd ./build/install/docker
           REPO="onlyoffice" \
           DOCKER_IMAGE_PREFIX="4testing-docspace" \
-          DOCKER_TAG="rc-v1.2.0" \
+          DOCKER_TAG="develop" \
           DOCKERFILE="Dockerfile.app" \
           docker buildx bake -f build.yml \
           --set *.args.GIT_BRANCH="develop" \

packages/client/src/components/panels/InvitePanel/StyledInvitePanel.js

@@ -128,7 +128,7 @@ const StyledInviteInputContainer = styled.div`
   position: relative;
   display: flex;
   align-items: center;
-  ${fillAvailableWidth}
+  width: 100%;
   margin-bottom: 20px;
 
   .header_aside-panel {

packages/client/src/components/panels/InvitePanel/sub-components/ExternalLinks.js

@@ -39,10 +39,10 @@ const ExternalLinks = ({
   const inputsRef = useRef();
 
   useEffect(() => {
-    if (shareLinks[0]?.expirationDate) toggleLinks();
+    if (shareLinks[0]?.expirationDate) toggleLinks(false);
   }, [shareLinks]);
 
-  const toggleLinks = (e) => {
+  const toggleLinks = (withCopy = true) => {
     let link = null;
     if (!shareLinks.length) return;
 
@@ -58,7 +58,7 @@ const ExternalLinks = ({
 
     setLinksVisible(!linksVisible);
 
-    if (!linksVisible) copyLink(link?.shareLink);
+    if (!linksVisible && withCopy) copyLink(link?.shareLink);
   };
 
   const disableLink = () => {

packages/client/src/helpers/utils.js

@@ -121,11 +121,11 @@ export const getCategoryType = (location) => {
     } else if (pathname.indexOf("archive") > -1) {
       categoryType = CategoryType.Archive;
     }
-  } else if (pathname.startsWith("/favorite") > -1) {
+  } else if (pathname.startsWith("/favorite")) {
     categoryType = CategoryType.Favorite;
-  } else if (pathname.startsWith("/recent") > -1) {
+  } else if (pathname.startsWith("/recent")) {
     categoryType = CategoryType.Recent;
-  } else if (pathname.startsWith("/trash") > -1) {
+  } else if (pathname.startsWith("/trash")) {
     categoryType = CategoryType.Trash;
   }