Merge branch 'develop' into feature/public-room
This commit is contained in:
commit
1706f4549b
63
.vscode/tasks.json
vendored
Normal file
63
.vscode/tasks.json
vendored
Normal file
@ -0,0 +1,63 @@
|
||||
{
|
||||
"version": "2.0.0",
|
||||
"problemMatcher": [],
|
||||
"presentation": {
|
||||
"focus": true,
|
||||
"close": true
|
||||
},
|
||||
"tasks": [
|
||||
{
|
||||
"label": "Frontend | Start",
|
||||
"type": "shell",
|
||||
"command": "cd ${workspaceFolder} ; yarn start"
|
||||
},
|
||||
{
|
||||
"label": "Backend | Build",
|
||||
"type": "shell",
|
||||
"command": "${workspaceFolder}/build/build.backend.docker.sh",
|
||||
"windows": {
|
||||
"command": "${workspaceFolder}\\build\\build.bat"
|
||||
}
|
||||
},
|
||||
{
|
||||
"label": "Backend | Start",
|
||||
"type": "shell",
|
||||
"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"
|
||||
}
|
||||
}
|
||||
],
|
||||
"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"]
|
||||
}
|
||||
]
|
||||
}
|
@ -1403,14 +1403,14 @@
|
||||
<COMPONENT cid="caphyon.advinst.msicomp.MsiServInstComponent">
|
||||
<ROW ServiceInstall="ServiceName_WebHealthChecksUI" Name="[ServiceName_WebHealthChecksUI]" DisplayName="[ServiceName_WebHealthChecksUI]" ServiceType="16" StartType="2" ErrorControl="1" Arguments="--urls=[APP_URLS]:5033" Component_="ASC.Web.HealthChecks.UI.exe"/>
|
||||
<ROW ServiceInstall="ServiceName_ApiSystemService" Name="[ServiceName_ApiSystemService]" DisplayName="[ServiceName_ApiSystemService]" ServiceType="16" StartType="2" ErrorControl="1" Arguments="--urls=[APP_URLS]:5010 --ENVIRONMENT=[ENVIRONMENT] --pathToConf="[APPDIR]config" --$STORAGE_ROOT="[APPDIR]Data" --log:dir="[APPDIR]Logs" --log:name=[ServiceName_ApiSystemService]" Component_="ASC.ApiSystem.exe"/>
|
||||
<ROW ServiceInstall="ServiceName_BackgroundTasks" Name="[ServiceName_BackgroundTasks]" DisplayName="[ServiceName_BackgroundTasks]" ServiceType="16" StartType="2" ErrorControl="1" Arguments="--urls=[APP_URLS]:5032 --ENVIRONMENT=[ENVIRONMENT] --pathToConf="[APPDIR]config" --$STORAGE_ROOT="[APPDIR]Data" --log:dir="[APPDIR]Logs" --log:name=[ServiceName_BackupService] --core:products:folder="[APPDIR]products" [SUBFOLDER_SERVER]" Component_="ASC.Data.Backup.BackgroundTasks.exe"/>
|
||||
<ROW ServiceInstall="ServiceName_BackgroundTasks" Name="[ServiceName_BackgroundTasks]" DisplayName="[ServiceName_BackgroundTasks]" ServiceType="16" StartType="2" ErrorControl="1" Arguments="--urls=[APP_URLS]:5032 --ENVIRONMENT=[ENVIRONMENT] --pathToConf="[APPDIR]config" --$STORAGE_ROOT="[APPDIR]Data" --log:dir="[APPDIR]Logs" --log:name=[ServiceName_BackupService] --core:products:folder="[APPDIR]products" [SUBFOLDER_SERVER] --core:eventBus:subscriptionClientName=asc_event_bus_backup_queue" Component_="ASC.Data.Backup.BackgroundTasks.exe"/>
|
||||
<ROW ServiceInstall="ServiceName_BackupService" Name="[ServiceName_BackupService]" DisplayName="[ServiceName_BackupService]" ServiceType="16" StartType="2" ErrorControl="1" Arguments="--urls=[APP_URLS]:5012 --ENVIRONMENT=[ENVIRONMENT] --pathToConf="[APPDIR]config" --$STORAGE_ROOT="[APPDIR]Data" --log:dir="[APPDIR]Logs" --log:name=[ServiceName_BackupService] --core:products:folder="[APPDIR]products" [SUBFOLDER_SERVER]" Component_="ASC.Data.Backup.exe"/>
|
||||
<ROW ServiceInstall="ServiceName_ClearEvents" Name="[ServiceName_ClearEvents]" DisplayName="[ServiceName_ClearEvents]" ServiceType="16" StartType="2" ErrorControl="1" Arguments="--urls=[APP_URLS]:5027 --ENVIRONMENT=[ENVIRONMENT] --pathToConf="[APPDIR]config" --$STORAGE_ROOT="[APPDIR]Data" --log:dir="[APPDIR]Logs" --log:name=[ServiceName_BackupService] --core:products:folder="[APPDIR]products" [SUBFOLDER_SERVER]" Component_="ASC.ClearEvents.exe"/>
|
||||
<ROW ServiceInstall="ServiceName_DocEditor" Name="[ServiceName_DocEditor]" DisplayName="[ServiceName_DocEditor]" ServiceType="16" StartType="2" ErrorControl="1" Component_="DocEditor.exe"/>
|
||||
<ROW ServiceInstall="ServiceName_FileServer" Name="[ServiceName_FileServer]" DisplayName="[ServiceName_FileServer]" ServiceType="16" StartType="2" ErrorControl="1" Arguments="--urls=[APP_URLS]:5007 --ENVIRONMENT=[ENVIRONMENT] --pathToConf="[APPDIR]config" --$STORAGE_ROOT="[APPDIR]Data" --log:dir="[APPDIR]Logs" --log:name=[ServiceName_FileServer] [SUBFOLDER_SERVER]" Component_="ASC.Files.exe"/>
|
||||
<ROW ServiceInstall="ServiceName_FileService" Name="[ServiceName_FileService]" DisplayName="[ServiceName_FileService]" ServiceType="16" StartType="2" ErrorControl="1" Arguments="--urls=[APP_URLS]:5009 --ENVIRONMENT=[ENVIRONMENT] --pathToConf="[APPDIR]config" --$STORAGE_ROOT="[APPDIR]Data" --log:dir="[APPDIR]Logs" --log:name=[ServiceName_FileService] --core:products:folder="[APPDIR]products" [SUBFOLDER_SERVER]" Component_="ASC.Files.Service.exe"/>
|
||||
<ROW ServiceInstall="ServiceName_FileService" Name="[ServiceName_FileService]" DisplayName="[ServiceName_FileService]" ServiceType="16" StartType="2" ErrorControl="1" Arguments="--urls=[APP_URLS]:5009 --ENVIRONMENT=[ENVIRONMENT] --pathToConf="[APPDIR]config" --$STORAGE_ROOT="[APPDIR]Data" --log:dir="[APPDIR]Logs" --log:name=[ServiceName_FileService] --core:products:folder="[APPDIR]products" [SUBFOLDER_SERVER] --core:eventBus:subscriptionClientName=asc_event_bus_files_service_queue" Component_="ASC.Files.Service.exe"/>
|
||||
<ROW ServiceInstall="ServiceName_Login" Name="[ServiceName_Login]" DisplayName="[ServiceName_Login]" ServiceType="16" StartType="2" ErrorControl="1" Component_="Login.exe"/>
|
||||
<ROW ServiceInstall="ServiceName_NotifyService" Name="[ServiceName_NotifyService]" DisplayName="[ServiceName_NotifyService]" ServiceType="16" StartType="2" ErrorControl="1" Arguments="--urls=[APP_URLS]:5005 --ENVIRONMENT=[ENVIRONMENT] --pathToConf="[APPDIR]config" --$STORAGE_ROOT="[APPDIR]Data" --log:dir="[APPDIR]Logs" --log:name=[ServiceName_NotifyService] --core:products:folder="[APPDIR]products" [SUBFOLDER_SERVER]" Component_="ASC.Notify.exe"/>
|
||||
<ROW ServiceInstall="ServiceName_NotifyService" Name="[ServiceName_NotifyService]" DisplayName="[ServiceName_NotifyService]" ServiceType="16" StartType="2" ErrorControl="1" Arguments="--urls=[APP_URLS]:5005 --ENVIRONMENT=[ENVIRONMENT] --pathToConf="[APPDIR]config" --$STORAGE_ROOT="[APPDIR]Data" --log:dir="[APPDIR]Logs" --log:name=[ServiceName_NotifyService] --core:products:folder="[APPDIR]products" [SUBFOLDER_SERVER] --core:eventBus:subscriptionClientName=asc_event_bus_notify_queue" Component_="ASC.Notify.exe"/>
|
||||
<ROW ServiceInstall="ServiceName_PeopleServer" Name="[ServiceName_PeopleServer]" DisplayName="[ServiceName_PeopleServer]" ServiceType="16" StartType="2" ErrorControl="1" Arguments="--urls=[APP_URLS]:5004 --ENVIRONMENT=[ENVIRONMENT] --pathToConf="[APPDIR]config" --$STORAGE_ROOT="[APPDIR]Data" --log:dir="[APPDIR]Logs" --log:name=[ServiceName_PeopleServer] [SUBFOLDER_SERVER]" Component_="ASC.People.exe"/>
|
||||
<ROW ServiceInstall="ServiceName_Proxy" Name="[ServiceName_Proxy]" DisplayName="[ServiceName_Proxy]" ServiceType="16" StartType="2" ErrorControl="1" Component_="Proxy.exe"/>
|
||||
<ROW ServiceInstall="ServiceName_Socket.IO" Name="[ServiceName_Socket.IO]" DisplayName="[ServiceName_Socket.IO]" ServiceType="16" StartType="2" ErrorControl="1" Component_="Socket.IO.exe"/>
|
||||
|
@ -1,5 +1,6 @@
|
||||
#!/bin/bash
|
||||
|
||||
|
||||
rd="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
|
||||
echo "Run script directory:" $dir
|
||||
|
||||
|
@ -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,7 +117,6 @@ const SetRoomParams = ({
|
||||
/>
|
||||
)} */}
|
||||
|
||||
{/* //TODO: Uncomment when third-party storages will be stable
|
||||
{!isEdit && enableThirdParty && (
|
||||
<ThirdPartyStorage
|
||||
t={t}
|
||||
@ -128,7 +127,7 @@ const SetRoomParams = ({
|
||||
setIsOauthWindowOpen={setIsOauthWindowOpen}
|
||||
isDisabled={isDisabled}
|
||||
/>
|
||||
)} */}
|
||||
)}
|
||||
<div>
|
||||
<Text fontWeight={600} className="icon-editor_text">
|
||||
{t("Icon")}
|
||||
|
@ -14,17 +14,17 @@ 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) {
|
||||
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,15 +50,12 @@ 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) {
|
||||
} else if (tags[i]?.isDefault) {
|
||||
const tag = { ...tags[i], maxWidth: `${maxWidthPercent}%` };
|
||||
|
||||
newTags.push(tag);
|
||||
} else {
|
||||
const tag = { label: tags[i], maxWidth: `${maxWidthPercent}%` };
|
||||
|
||||
newTags.push(tag);
|
||||
}
|
||||
}
|
||||
@ -79,15 +76,12 @@ 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}%` };
|
||||
|
||||
newTags.push(tag);
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user