IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/selection-area

Browse Source
This commit is contained in:
Alexey Safronov 2023-02-09 13:28:24 +03:00
commit 780a90f0c0
4 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
.github/workflows/4testing-multi-build.yml vendored
View File

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

2
packages/client/src/components/panels/InvitePanel/StyledInvitePanel.js
View File

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

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

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

6
packages/client/src/helpers/utils.js
View File

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