From 5c3082f410a1f9faddd0ccab9f6f1ec0c04b5f26 Mon Sep 17 00:00:00 2001 From: Mushka Nikita Date: Thu, 16 Mar 2023 13:22:32 +0300 Subject: [PATCH 01/19] basic vscode tasks (start, build only for win) --- .vscode/tasks-scripts/start.bat | 37 +++++++++++++++++++++ .vscode/tasks-scripts/start.sh | 12 +++++++ .vscode/tasks.json | 57 +++++++++++++++++++++++++++++++++ 3 files changed, 106 insertions(+) create mode 100644 .vscode/tasks-scripts/start.bat create mode 100644 .vscode/tasks-scripts/start.sh create mode 100644 .vscode/tasks.json diff --git a/.vscode/tasks-scripts/start.bat b/.vscode/tasks-scripts/start.bat new file mode 100644 index 0000000000..4e03b0abe1 --- /dev/null +++ b/.vscode/tasks-scripts/start.bat @@ -0,0 +1,37 @@ +@echo off + +set root=%~dp0..\.. + +@REM if "%2%"=="Local" goto onLocal +@REM if "%2%"=="Docker" goto onDocker + + +@REM :onLocal +if "%1%"=="Start" goto onStartLocal +if "%1%"=="Restart" goto onRestartLocal +if "%1%"=="Stop" goto onStopLocal + +:onStartLocal +"%root%\\build\\start\start.bat" start + +:onRestartLocal +"%root%\\build\\start\\restart.bat" start + +:onStopLocal +"%root%\\build\\start\\stop.bat" start + + +@REM :onDocker +@REM if "%1%"=="Start" goto onStartDocker +@REM if "%1%"=="Restart" goto onRestartDocker +@REM if "%1%"=="Stop" goto onStopDocker + +@REM :onStartDocker +@REM echo "Start docker" +@REM "%root%\\build\\start\start.backend.docker.bat" start + +@REM :onRestartDocker +@REM "%root%\\build\\start\\restart.backend.docker.bat" start + +@REM :onStopDocker +@REM "%root%\\build\\start\\stop.backend.docker.bat" start \ No newline at end of file diff --git a/.vscode/tasks-scripts/start.sh b/.vscode/tasks-scripts/start.sh new file mode 100644 index 0000000000..fcadc9c808 --- /dev/null +++ b/.vscode/tasks-scripts/start.sh @@ -0,0 +1,12 @@ +#!/bin/bash + +scriptLocation=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) +root=$(builtin cd $scriptLocation/../../; pwd) + +if [ "$1" = "Start" ] + then (cd $root/build/start && sh ./start.backend.docker.sh) +elif [ "$1" = "Restart" ] + then (cd $root/build/start && sh ./restart.backend.docker.sh) +elif [ "$1" = "Stop" ] + then (cd $root/build/start && sh ./stop.backend.docker.sh) +fi \ No newline at end of file diff --git a/.vscode/tasks.json b/.vscode/tasks.json new file mode 100644 index 0000000000..d3c1506180 --- /dev/null +++ b/.vscode/tasks.json @@ -0,0 +1,57 @@ +{ + "version": "2.0.0", + "problemMatcher": [], + "presentation": { + "focus": true, + "close": true + }, + "tasks": [ + { + "label": "Start", + "type": "shell", + "command": "tasks-scripts\\start.sh ${input:start-param}", + "windows": { + "command": "${workspaceFolder}\\.vscode\\tasks-scripts\\start.bat ${input:start-param}" + // "command": "${workspaceFolder}\\.vscode\\tasks-scripts\\start.bat ${input:start-param} ${input:local-docker}" + } + }, + { + "label": "Build", + "type": "shell", + "command": "${workspaceFolder}\\build\\build.sh", + "windows": { + "command": "${workspaceFolder}\\build\\build.bat" + } + }, + { + "label": "Frontend", + "type": "shell", + "command": "yarn start" + } + + // { + // "label": "Migrate", + // "type": "shell", + // "command": "${workspaceFolder}\\build\\runMigrations.sh", + // "windows": { + // "command": "${workspaceFolder}\\build\\runMigrations.bat" + // } + // } + ], + "inputs": [ + { + "id": "start-param", + "description": "Command", + "default": "Start", + "type": "pickString", + "options": ["Start", "Restart", "Stop"] + }, + { + "id": "local-docker", + "description": "Manipulation", + "default": "Local", + "type": "pickString", + "options": ["Local", "Docker"] + } + ] +} From c15165ba82786d1f0720ab06ad0eba7808739b8f Mon Sep 17 00:00:00 2001 From: Mushka Nikita Date: Thu, 16 Mar 2023 13:48:13 +0300 Subject: [PATCH 02/19] Revert "infoPanel styling refactor" This reverts commit 5a1bfb575b679d59c2e6565ba7eaeac8fe878613. --- .../sub-components/SetRoomParams.js | 4 ++-- .../src/pages/Home/InfoPanel/Body/styles/accounts.js | 4 +++- .../src/pages/Home/InfoPanel/Body/styles/common.js | 10 ++++++++-- .../src/pages/Home/InfoPanel/Body/styles/members.js | 8 ++++++-- 4 files changed, 19 insertions(+), 7 deletions(-) diff --git a/packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/SetRoomParams.js b/packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/SetRoomParams.js index d228b2528c..6b7b7d3ca5 100644 --- a/packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/SetRoomParams.js +++ b/packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/SetRoomParams.js @@ -3,13 +3,13 @@ import styled from "styled-components"; import { withTranslation } from "react-i18next"; import RoomTypeDropdown from "./RoomTypeDropdown"; +import ThirdPartyStorage from "./ThirdPartyStorage"; import TagInput from "./TagInput"; import RoomType from "./RoomType"; import PermanentSettings from "./PermanentSettings"; import InputParam from "./Params/InputParam"; -// import ThirdPartyStorage from "./ThirdPartyStorage"; -// import IsPrivateParam from "./IsPrivateParam"; +import IsPrivateParam from "./IsPrivateParam"; import withLoader from "@docspace/client/src/HOCs/withLoader"; import Loaders from "@docspace/common/components/Loaders"; diff --git a/packages/client/src/pages/Home/InfoPanel/Body/styles/accounts.js b/packages/client/src/pages/Home/InfoPanel/Body/styles/accounts.js index c1f880c1fb..cc5b022cc3 100644 --- a/packages/client/src/pages/Home/InfoPanel/Body/styles/accounts.js +++ b/packages/client/src/pages/Home/InfoPanel/Body/styles/accounts.js @@ -1,4 +1,4 @@ -import styled from "styled-components"; +import styled, { css } from "styled-components"; import { Base } from "@docspace/components/themes"; import { hugeMobile, tablet } from "@docspace/components/utils/device"; @@ -6,10 +6,12 @@ const StyledAccountsItemTitle = styled.div` min-height: 80px; height: 80px; max-height: 104px; + display: flex; align-items: center; justify-content: start; gap: 16px; + position: fixed; margin-top: -80px; margin-left: -20px; diff --git a/packages/client/src/pages/Home/InfoPanel/Body/styles/common.js b/packages/client/src/pages/Home/InfoPanel/Body/styles/common.js index f1969e4daa..251a0227b1 100644 --- a/packages/client/src/pages/Home/InfoPanel/Body/styles/common.js +++ b/packages/client/src/pages/Home/InfoPanel/Body/styles/common.js @@ -1,7 +1,7 @@ import styled, { css } from "styled-components"; import { Base } from "@docspace/components/themes"; -import { hugeMobile, tablet } from "@docspace/components/utils/device"; +import { hugeMobile, mobile, tablet } from "@docspace/components/utils/device"; const StyledInfoPanelBody = styled.div` height: auto; @@ -83,6 +83,10 @@ const StyledTitle = styled.div` padding: 24px 20px 24px 20px; } + /* @media (max-width: 549px) { + width: calc(100vw - 69px - 40px); + } */ + @media ${hugeMobile} { width: calc(100vw - 32px); padding: 24px 0 24px 16px; @@ -124,8 +128,10 @@ const StyledProperties = styled.div` .property-content { max-width: 100%; margin: auto 0; + font-weight: 600; font-size: 13px; + white-space: nowrap; overflow: hidden; text-overflow: ellipsis; @@ -148,7 +154,6 @@ const StyledProperties = styled.div` } } } - .property-comment_editor { &-display { display: flex; @@ -182,6 +187,7 @@ const StyledProperties = styled.div` display: flex; flex-direction: column; gap: 8px; + &-buttons { display: flex; flex-direction: row; diff --git a/packages/client/src/pages/Home/InfoPanel/Body/styles/members.js b/packages/client/src/pages/Home/InfoPanel/Body/styles/members.js index 03af8b11dd..a3d4db6797 100644 --- a/packages/client/src/pages/Home/InfoPanel/Body/styles/members.js +++ b/packages/client/src/pages/Home/InfoPanel/Body/styles/members.js @@ -50,14 +50,16 @@ const StyledUser = styled.div` } .name { + ${(props) => + props.isExpect && `color: ${props.theme.infoPanel.members.isExpectName}`}; + font-weight: 600; font-size: 14px; line-height: 16px; + white-space: nowrap; overflow: hidden; text-overflow: ellipsis; - ${(props) => - props.isExpect && `color: ${props.theme.infoPanel.members.isExpectName}`}; } .me-label { @@ -71,6 +73,7 @@ const StyledUser = styled.div` .role-wrapper { padding-left: 8px; margin-left: auto; + font-weight: 600; font-size: 13px; line-height: 20px; @@ -101,4 +104,5 @@ const StyledUser = styled.div` `; StyledUserTypeHeader.defaultProps = { theme: Base }; + export { StyledUserTypeHeader, StyledUserList, StyledUser }; From a8a57a8548152d495b800c1160bece1c521d937a Mon Sep 17 00:00:00 2001 From: Mushka Nikita Date: Thu, 16 Mar 2023 13:57:31 +0300 Subject: [PATCH 03/19] cleaned up start.sh --- .vscode/tasks-scripts/start.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.vscode/tasks-scripts/start.sh b/.vscode/tasks-scripts/start.sh index fcadc9c808..e9c39cfc43 100644 --- a/.vscode/tasks-scripts/start.sh +++ b/.vscode/tasks-scripts/start.sh @@ -4,9 +4,9 @@ scriptLocation=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pw root=$(builtin cd $scriptLocation/../../; pwd) if [ "$1" = "Start" ] - then (cd $root/build/start && sh ./start.backend.docker.sh) + then (sh $root/build/start/start.backend.docker.sh) elif [ "$1" = "Restart" ] - then (cd $root/build/start && sh ./restart.backend.docker.sh) + then (sh $root/build/start/restart.backend.docker.sh) elif [ "$1" = "Stop" ] - then (cd $root/build/start && sh ./stop.backend.docker.sh) + then (sh $root/build/start/stop.backend.docker.sh) fi \ No newline at end of file From 6cc8ef171fba062b49cf2a367940eaacc5027e09 Mon Sep 17 00:00:00 2001 From: Mushka Nikita Date: Thu, 16 Mar 2023 15:43:02 +0300 Subject: [PATCH 04/19] fixed osx build task --- .vscode/tasks.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.vscode/tasks.json b/.vscode/tasks.json index d3c1506180..f93140567c 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -18,7 +18,7 @@ { "label": "Build", "type": "shell", - "command": "${workspaceFolder}\\build\\build.sh", + "command": "${workspaceFolder}\\build\\build.backend.docker.sh", "windows": { "command": "${workspaceFolder}\\build\\build.bat" } From 3df1f271566cff0b18595672b892b76f56499746 Mon Sep 17 00:00:00 2001 From: Mushka Nikita Date: Thu, 16 Mar 2023 15:45:00 +0300 Subject: [PATCH 05/19] reversed slashes on bash commands --- .vscode/tasks.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.vscode/tasks.json b/.vscode/tasks.json index f93140567c..bf4055254c 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -9,7 +9,7 @@ { "label": "Start", "type": "shell", - "command": "tasks-scripts\\start.sh ${input:start-param}", + "command": "tasks-scripts/start.sh ${input:start-param}", "windows": { "command": "${workspaceFolder}\\.vscode\\tasks-scripts\\start.bat ${input:start-param}" // "command": "${workspaceFolder}\\.vscode\\tasks-scripts\\start.bat ${input:start-param} ${input:local-docker}" @@ -18,7 +18,7 @@ { "label": "Build", "type": "shell", - "command": "${workspaceFolder}\\build\\build.backend.docker.sh", + "command": "${workspaceFolder}/build/build.backend.docker.sh", "windows": { "command": "${workspaceFolder}\\build\\build.bat" } From 29526628625d4c0a2b2b8754570c75e2285003c6 Mon Sep 17 00:00:00 2001 From: Mushka Nikita Date: Thu, 16 Mar 2023 15:55:32 +0300 Subject: [PATCH 06/19] changed task names --- .vscode/tasks.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.vscode/tasks.json b/.vscode/tasks.json index bf4055254c..26bd5d909e 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -7,7 +7,7 @@ }, "tasks": [ { - "label": "Start", + "label": "Backend | Start", "type": "shell", "command": "tasks-scripts/start.sh ${input:start-param}", "windows": { @@ -16,7 +16,7 @@ } }, { - "label": "Build", + "label": "Backend | Build", "type": "shell", "command": "${workspaceFolder}/build/build.backend.docker.sh", "windows": { @@ -24,7 +24,7 @@ } }, { - "label": "Frontend", + "label": "Frontend | Start", "type": "shell", "command": "yarn start" } From fc241bde9a3718c6020ae8c95c48c6c11c52e8ce Mon Sep 17 00:00:00 2001 From: Mushka Nikita Date: Thu, 16 Mar 2023 16:03:23 +0300 Subject: [PATCH 07/19] fixed start.sh --- build/start/start.backend.docker.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/build/start/start.backend.docker.sh b/build/start/start.backend.docker.sh index a3a02b6be7..867c990850 100755 --- a/build/start/start.backend.docker.sh +++ b/build/start/start.backend.docker.sh @@ -1,5 +1,6 @@ #!/bin/bash + rd="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" echo "Run script directory:" $dir From 32438e567079292e49e88b7adec4aa98338f3244 Mon Sep 17 00:00:00 2001 From: Mushka Nikita Date: Thu, 16 Mar 2023 16:09:43 +0300 Subject: [PATCH 08/19] completed if statement in start.sh --- .vscode/tasks-scripts/start.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.vscode/tasks-scripts/start.sh b/.vscode/tasks-scripts/start.sh index e9c39cfc43..3d9441d308 100644 --- a/.vscode/tasks-scripts/start.sh +++ b/.vscode/tasks-scripts/start.sh @@ -9,4 +9,6 @@ elif [ "$1" = "Restart" ] then (sh $root/build/start/restart.backend.docker.sh) elif [ "$1" = "Stop" ] then (sh $root/build/start/stop.backend.docker.sh) +else + echo "Unknown command" fi \ No newline at end of file From fe77e0f6b171d97de26ee93847f6011020fa6fc2 Mon Sep 17 00:00:00 2001 From: Mushka Nikita Date: Thu, 16 Mar 2023 16:22:37 +0300 Subject: [PATCH 09/19] changed path in Backend/Start/Osx task --- .vscode/tasks.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 26bd5d909e..c669bf5b2c 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -9,7 +9,7 @@ { "label": "Backend | Start", "type": "shell", - "command": "tasks-scripts/start.sh ${input:start-param}", + "command": "${workspaceFolder}/.vscode/tasks-scripts/start.sh ${input:start-param}", "windows": { "command": "${workspaceFolder}\\.vscode\\tasks-scripts\\start.bat ${input:start-param}" // "command": "${workspaceFolder}\\.vscode\\tasks-scripts\\start.bat ${input:start-param} ${input:local-docker}" From 2edd5f28863f93b42310bc8d6ff93cf29a481c54 Mon Sep 17 00:00:00 2001 From: Mushka Nikita Date: Thu, 16 Mar 2023 16:24:39 +0300 Subject: [PATCH 10/19] changed path in Fronend/Start --- .vscode/tasks.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.vscode/tasks.json b/.vscode/tasks.json index c669bf5b2c..bbfd750b2a 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -26,7 +26,7 @@ { "label": "Frontend | Start", "type": "shell", - "command": "yarn start" + "command": "cd ${workspaceFolder} && yarn start" } // { From 6472a0d71f7ed3103e84c809c718b940055d1095 Mon Sep 17 00:00:00 2001 From: Mushka Nikita Date: Thu, 16 Mar 2023 16:30:37 +0300 Subject: [PATCH 11/19] added workspace folder test --- .vscode/tasks.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.vscode/tasks.json b/.vscode/tasks.json index bbfd750b2a..704b619403 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -6,6 +6,11 @@ "close": true }, "tasks": [ + { + "label": "Workspace folder test", + "type": "shell", + "command": "echo ${workspaceFolder}" + }, { "label": "Backend | Start", "type": "shell", From b38be13fe8de122c834f8cd8f0d52c391647f1c4 Mon Sep 17 00:00:00 2001 From: Mushka Nikita Date: Thu, 16 Mar 2023 16:41:54 +0300 Subject: [PATCH 12/19] fixed Workspace folder test on osx --- .vscode/tasks.json | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 704b619403..4a5027b0d8 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -9,16 +9,19 @@ { "label": "Workspace folder test", "type": "shell", - "command": "echo ${workspaceFolder}" + "command": "echo ${workspaceFolder} && pause", + "osx": { + "command": "echo ${workspaceFolder} && read -p 'Press any key ...'" + } }, { "label": "Backend | Start", "type": "shell", - "command": "${workspaceFolder}/.vscode/tasks-scripts/start.sh ${input:start-param}", - "windows": { - "command": "${workspaceFolder}\\.vscode\\tasks-scripts\\start.bat ${input:start-param}" - // "command": "${workspaceFolder}\\.vscode\\tasks-scripts\\start.bat ${input:start-param} ${input:local-docker}" - } + "command": "${workspaceFolder}/.vscode/tasks-scripts/start.sh ${input:start-param} " + // "windows": { + // "command": "${workspaceFolder}\\.vscode\\tasks-scripts\\start.bat ${input:start-param}" + // "command": "${workspaceFolder}\\.vscode\\tasks-scripts\\start.bat ${input:start-param} ${input:local-docker}" + // } }, { "label": "Backend | Build", @@ -31,7 +34,7 @@ { "label": "Frontend | Start", "type": "shell", - "command": "cd ${workspaceFolder} && yarn start" + "command": "cd ${workspaceFolder} ; yarn start" } // { From 8e6ae01f4f1116d5ffd7ac8069ef63be57e12fa3 Mon Sep 17 00:00:00 2001 From: Mushka Nikita Date: Wed, 22 Mar 2023 15:11:10 +0300 Subject: [PATCH 13/19] removed scripts, now only local for win & only docker for mac --- .vscode/tasks-scripts/start.bat | 37 ------------------------- .vscode/tasks-scripts/start.sh | 14 ---------- .vscode/tasks.json | 48 ++++++++++++++++----------------- 3 files changed, 23 insertions(+), 76 deletions(-) delete mode 100644 .vscode/tasks-scripts/start.bat delete mode 100644 .vscode/tasks-scripts/start.sh diff --git a/.vscode/tasks-scripts/start.bat b/.vscode/tasks-scripts/start.bat deleted file mode 100644 index 4e03b0abe1..0000000000 --- a/.vscode/tasks-scripts/start.bat +++ /dev/null @@ -1,37 +0,0 @@ -@echo off - -set root=%~dp0..\.. - -@REM if "%2%"=="Local" goto onLocal -@REM if "%2%"=="Docker" goto onDocker - - -@REM :onLocal -if "%1%"=="Start" goto onStartLocal -if "%1%"=="Restart" goto onRestartLocal -if "%1%"=="Stop" goto onStopLocal - -:onStartLocal -"%root%\\build\\start\start.bat" start - -:onRestartLocal -"%root%\\build\\start\\restart.bat" start - -:onStopLocal -"%root%\\build\\start\\stop.bat" start - - -@REM :onDocker -@REM if "%1%"=="Start" goto onStartDocker -@REM if "%1%"=="Restart" goto onRestartDocker -@REM if "%1%"=="Stop" goto onStopDocker - -@REM :onStartDocker -@REM echo "Start docker" -@REM "%root%\\build\\start\start.backend.docker.bat" start - -@REM :onRestartDocker -@REM "%root%\\build\\start\\restart.backend.docker.bat" start - -@REM :onStopDocker -@REM "%root%\\build\\start\\stop.backend.docker.bat" start \ No newline at end of file diff --git a/.vscode/tasks-scripts/start.sh b/.vscode/tasks-scripts/start.sh deleted file mode 100644 index 3d9441d308..0000000000 --- a/.vscode/tasks-scripts/start.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash - -scriptLocation=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) -root=$(builtin cd $scriptLocation/../../; pwd) - -if [ "$1" = "Start" ] - then (sh $root/build/start/start.backend.docker.sh) -elif [ "$1" = "Restart" ] - then (sh $root/build/start/restart.backend.docker.sh) -elif [ "$1" = "Stop" ] - then (sh $root/build/start/stop.backend.docker.sh) -else - echo "Unknown command" -fi \ No newline at end of file diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 4a5027b0d8..de469f2e5f 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -7,21 +7,9 @@ }, "tasks": [ { - "label": "Workspace folder test", + "label": "Frontend | Start", "type": "shell", - "command": "echo ${workspaceFolder} && pause", - "osx": { - "command": "echo ${workspaceFolder} && read -p 'Press any key ...'" - } - }, - { - "label": "Backend | Start", - "type": "shell", - "command": "${workspaceFolder}/.vscode/tasks-scripts/start.sh ${input:start-param} " - // "windows": { - // "command": "${workspaceFolder}\\.vscode\\tasks-scripts\\start.bat ${input:start-param}" - // "command": "${workspaceFolder}\\.vscode\\tasks-scripts\\start.bat ${input:start-param} ${input:local-docker}" - // } + "command": "cd ${workspaceFolder} ; yarn start" }, { "label": "Backend | Build", @@ -32,19 +20,29 @@ } }, { - "label": "Frontend | Start", + "label": "Backend | Start", "type": "shell", - "command": "cd ${workspaceFolder} ; yarn start" + "command": "${workspaceFolder}/build/start/start.backend.docker.sh", + "windows": { + "command": "${workspaceFolder}\\build\\start\\start.bat" + } + }, + { + "label": "Backend | Restart", + "type": "shell", + "command": "${workspaceFolder}/build/start/restart.backend.docker.sh", + "windows": { + "command": "${workspaceFolder}\\build\\start\\restart.bat" + } + }, + { + "label": "Backend | Stop", + "type": "shell", + "command": "${workspaceFolder}/build/start/stop.backend.docker.sh", + "windows": { + "command": "${workspaceFolder}\\build\\start\\stop.bat" + } } - - // { - // "label": "Migrate", - // "type": "shell", - // "command": "${workspaceFolder}\\build\\runMigrations.sh", - // "windows": { - // "command": "${workspaceFolder}\\build\\runMigrations.bat" - // } - // } ], "inputs": [ { From d210a968aed68637ecd95a6e38556fcf1a838f7c Mon Sep 17 00:00:00 2001 From: Mushka Nikita Date: Thu, 20 Apr 2023 11:47:39 +0300 Subject: [PATCH 14/19] unlock thirdparty --- .../CreateEditRoomDialog/sub-components/SetRoomParams.js | 8 ++++---- packages/common/constants/index.js | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/SetRoomParams.js b/packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/SetRoomParams.js index 5392b84913..54be05c389 100644 --- a/packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/SetRoomParams.js +++ b/packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/SetRoomParams.js @@ -8,7 +8,7 @@ import RoomType from "./RoomType"; import PermanentSettings from "./PermanentSettings"; import InputParam from "./Params/InputParam"; -// import ThirdPartyStorage from "./ThirdPartyStorage"; +import ThirdPartyStorage from "./ThirdPartyStorage"; // import IsPrivateParam from "./IsPrivateParam"; import withLoader from "@docspace/client/src/HOCs/withLoader"; @@ -117,8 +117,8 @@ const SetRoomParams = ({ /> )} */} - {/* //TODO: Uncomment when third-party storages will be stable - {!isEdit && enableThirdParty && ( + {/* //TODO: Uncomment when third-party storages will be stable */} + {!isEdit && enableThirdParty && ( - )} */} + )}
{t("Icon")} diff --git a/packages/common/constants/index.js b/packages/common/constants/index.js index 2ec2f0d049..c99a73aedf 100644 --- a/packages/common/constants/index.js +++ b/packages/common/constants/index.js @@ -99,10 +99,10 @@ export const FileType = Object.freeze({ * @readonly */ export const RoomsType = Object.freeze({ - //FillingFormsRoom: 1, //TODO: Restore when certs will be done + // FillingFormsRoom: 1, //TODO: Restore when certs will be done EditingRoom: 2, - //ReviewRoom: 3, //TODO: Restore when certs will be done - //ReadOnlyRoom: 4, //TODO: Restore when certs will be done + // ReviewRoom: 3, //TODO: Restore when certs will be done + // ReadOnlyRoom: 4, //TODO: Restore when certs will be done CustomRoom: 5, }); From d9fa1c91d8e9ce1fdc77cc1c640095f1e9f4a0ce Mon Sep 17 00:00:00 2001 From: Mushka Nikita Date: Thu, 20 Apr 2023 11:47:46 +0300 Subject: [PATCH 15/19] fix crash --- packages/common/components/Tags/index.js | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/packages/common/components/Tags/index.js b/packages/common/components/Tags/index.js index 3474a1396f..92013205de 100644 --- a/packages/common/components/Tags/index.js +++ b/packages/common/components/Tags/index.js @@ -20,11 +20,12 @@ const Tags = ({ id, className, style, tags, columnCount, onSelectTag }) => { if (tags.length === 1) { if (tags[0]?.isDefault || tags[0]?.isThirdParty) { const tag = { ...tags[0], maxWidth: `100%` }; - + newTags.push(tag); + } else if (tags[0].isThirdParty) { + const tag = { ...tags[0], maxWidth: `36px` }; newTags.push(tag); } else { - const tag = { label: tags[0], maxWidth: `100%` }; - + const tag = { label: tags[0].label || tags[0], maxWidth: `100%` }; newTags.push(tag); } @@ -50,7 +51,6 @@ const Tags = ({ id, className, style, tags, columnCount, onSelectTag }) => { for (let i = 0; i < tags.length; i++) { if (tags[i]?.isThirdParty) { const tag = { ...tags[i], maxWidth: `36px` }; - newTags.push(tag); } else if (tags[i].isDefault) { const tag = { ...tags[i], maxWidth: `${maxWidthPercent}%` }; @@ -58,7 +58,6 @@ const Tags = ({ id, className, style, tags, columnCount, onSelectTag }) => { newTags.push(tag); } else { const tag = { label: tags[i], maxWidth: `${maxWidthPercent}%` }; - newTags.push(tag); } } @@ -87,7 +86,6 @@ const Tags = ({ id, className, style, tags, columnCount, onSelectTag }) => { newTags.push(tag); } else { const tag = { label: tags[i], maxWidth: `${maxWidthPercent}%` }; - newTags.push(tag); } } From 1cf5423a078fbaa301feb965aeff394872346d8f Mon Sep 17 00:00:00 2001 From: nasrullonurullaev <61620246+nasrullonurullaev@users.noreply.github.com> Date: Thu, 27 Apr 2023 11:41:10 +0500 Subject: [PATCH 16/19] Passed the eventBus arguments to services (#1392) --- build/install/win/DocSpace.aip | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build/install/win/DocSpace.aip b/build/install/win/DocSpace.aip index cbe27a8e9e..617cb63919 100644 --- a/build/install/win/DocSpace.aip +++ b/build/install/win/DocSpace.aip @@ -1403,14 +1403,14 @@ - + - + - + From c590e5774fe46f9673a26f27209c0d9f9e1d48bf Mon Sep 17 00:00:00 2001 From: Mushka Nikita Date: Thu, 27 Apr 2023 15:06:55 +0300 Subject: [PATCH 17/19] fixed thirdpart tag update logic --- packages/common/components/Tags/index.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/packages/common/components/Tags/index.js b/packages/common/components/Tags/index.js index 92013205de..203ed24532 100644 --- a/packages/common/components/Tags/index.js +++ b/packages/common/components/Tags/index.js @@ -14,11 +14,10 @@ const Tags = ({ id, className, style, tags, columnCount, onSelectTag }) => { if (!columnCount) return; const newTags = []; - const containerWidth = tagsRef.current.offsetWidth; if (tags.length === 1) { - if (tags[0]?.isDefault || tags[0]?.isThirdParty) { + if (tags[0]?.isDefault) { const tag = { ...tags[0], maxWidth: `100%` }; newTags.push(tag); } else if (tags[0].isThirdParty) { @@ -54,7 +53,6 @@ const Tags = ({ id, className, style, tags, columnCount, onSelectTag }) => { newTags.push(tag); } else if (tags[i].isDefault) { const tag = { ...tags[i], maxWidth: `${maxWidthPercent}%` }; - newTags.push(tag); } else { const tag = { label: tags[i], maxWidth: `${maxWidthPercent}%` }; From 359f77e4ca65ac395afe17da534d38f85e4d40a8 Mon Sep 17 00:00:00 2001 From: Mushka Nikita Date: Thu, 27 Apr 2023 15:54:18 +0300 Subject: [PATCH 18/19] removed unused todo comment --- .../dialogs/CreateEditRoomDialog/sub-components/SetRoomParams.js | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/SetRoomParams.js b/packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/SetRoomParams.js index 54be05c389..7f8278a701 100644 --- a/packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/SetRoomParams.js +++ b/packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/SetRoomParams.js @@ -117,7 +117,6 @@ const SetRoomParams = ({ /> )} */} - {/* //TODO: Uncomment when third-party storages will be stable */} {!isEdit && enableThirdParty && ( Date: Thu, 27 Apr 2023 15:55:31 +0300 Subject: [PATCH 19/19] added and returned optional chaining to some bool expressions in tags --- packages/common/components/Tags/index.js | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/packages/common/components/Tags/index.js b/packages/common/components/Tags/index.js index 203ed24532..db4df98222 100644 --- a/packages/common/components/Tags/index.js +++ b/packages/common/components/Tags/index.js @@ -20,7 +20,7 @@ const Tags = ({ id, className, style, tags, columnCount, onSelectTag }) => { if (tags[0]?.isDefault) { const tag = { ...tags[0], maxWidth: `100%` }; newTags.push(tag); - } else if (tags[0].isThirdParty) { + } else if (tags[0]?.isThirdParty) { const tag = { ...tags[0], maxWidth: `36px` }; newTags.push(tag); } else { @@ -51,7 +51,7 @@ const Tags = ({ id, className, style, tags, columnCount, onSelectTag }) => { if (tags[i]?.isThirdParty) { const tag = { ...tags[i], maxWidth: `36px` }; newTags.push(tag); - } else if (tags[i].isDefault) { + } else if (tags[i]?.isDefault) { const tag = { ...tags[i], maxWidth: `${maxWidthPercent}%` }; newTags.push(tag); } else { @@ -76,11 +76,9 @@ const Tags = ({ id, className, style, tags, columnCount, onSelectTag }) => { for (let i = 0; i < columnCount; i++) { if (tags[i]?.isThirdParty) { const tag = { ...tags[i], maxWidth: `36px` }; - newTags.push(tag); } else if (tags[i]?.isDefault) { const tag = { ...tags[i], maxWidth: `${maxWidthPercent}%` }; - newTags.push(tag); } else { const tag = { label: tags[i], maxWidth: `${maxWidthPercent}%` };