From 1725a04d747991a850021096936239e69498c6bc Mon Sep 17 00:00:00 2001
From: Nasrullo Nurullaev <61620246+nasrullonurullaev@users.noreply.github.com>
Date: Mon, 10 Jul 2023 15:40:04 +0500
Subject: [PATCH 1/6] Add timestamp for DocSpace EE (#1523)
---
build/install/win/DocSpace.Enterprise.aip | 3 +++
1 file changed, 3 insertions(+)
diff --git a/build/install/win/DocSpace.Enterprise.aip b/build/install/win/DocSpace.Enterprise.aip
index 333bdc8a37..b914c9e2f7 100644
--- a/build/install/win/DocSpace.Enterprise.aip
+++ b/build/install/win/DocSpace.Enterprise.aip
@@ -104,6 +104,9 @@
+
+
+
From 74757c6da00354afbb60c0d8f4a215b23c76fa67 Mon Sep 17 00:00:00 2001
From: Evgeniy Antonyuk
Date: Mon, 10 Jul 2023 16:17:08 +0500
Subject: [PATCH 2/6] Fix adding rabbitmq repository for RHEL 9
---
.../install/OneClickInstall/install-RedHat/install-preq.sh | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/build/install/OneClickInstall/install-RedHat/install-preq.sh b/build/install/OneClickInstall/install-RedHat/install-preq.sh
index 3ef483caf6..96d2219424 100644
--- a/build/install/OneClickInstall/install-RedHat/install-preq.sh
+++ b/build/install/OneClickInstall/install-RedHat/install-preq.sh
@@ -47,9 +47,7 @@ rpm -ivh https://dl.fedoraproject.org/pub/epel/epel-release-latest-$REV.noarch.r
rpm -ivh https://rpms.remirepo.net/enterprise/remi-release-$REV.rpm || true
yum localinstall -y --nogpgcheck https://download1.rpmfusion.org/free/el/rpmfusion-free-release-$REV.noarch.rpm
-MONOREV=$REV
if [ "$REV" = "9" ]; then
- MONOREV="8"
[ $DIST != "redhat" ] && TESTING_REPO="--enablerepo=crb" || /usr/bin/crb enable
update-crypto-policies --set DEFAULT:SHA1
elif [ "$REV" = "8" ]; then
@@ -57,8 +55,8 @@ elif [ "$REV" = "8" ]; then
fi
#add rabbitmq & erlang repo
-curl -s https://packagecloud.io/install/repositories/rabbitmq/rabbitmq-server/script.rpm.sh | os=centos dist=$MONOREV bash
-curl -s https://packagecloud.io/install/repositories/rabbitmq/erlang/script.rpm.sh | os=centos dist=$MONOREV bash
+curl -s https://packagecloud.io/install/repositories/rabbitmq/rabbitmq-server/script.rpm.sh | os=centos dist=$REV bash
+curl -s https://packagecloud.io/install/repositories/rabbitmq/erlang/script.rpm.sh | os=centos dist=$REV bash
#add nodejs repo
curl -sL https://rpm.nodesource.com/setup_16.x | sed 's/centos|/'$DIST'|/g' | sudo bash - || true
From 1df512ef73320bcbddab15832655503f414f7282 Mon Sep 17 00:00:00 2001
From: Tatiana Lopaeva
Date: Mon, 10 Jul 2023 16:54:18 +0300
Subject: [PATCH 3/6] Web: InfoPanel: Removed list re-rendering after ComboBox
action.
---
.../src/pages/Home/InfoPanel/Body/views/Members/User.js | 7 +++----
.../src/pages/Home/InfoPanel/Body/views/Members/index.js | 8 +++-----
2 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/packages/client/src/pages/Home/InfoPanel/Body/views/Members/User.js b/packages/client/src/pages/Home/InfoPanel/Body/views/Members/User.js
index 8974301d8e..64ad4c354e 100644
--- a/packages/client/src/pages/Home/InfoPanel/Body/views/Members/User.js
+++ b/packages/client/src/pages/Home/InfoPanel/Body/views/Members/User.js
@@ -2,7 +2,7 @@ import React, { useState } from "react";
import AtReactSvgUrl from "PUBLIC_DIR/images/@.react.svg?url";
import { StyledUser } from "../../styles/members";
import Avatar from "@docspace/components/avatar";
-import { ComboBox } from "@docspace/components";
+import ComboBox from "@docspace/components/combobox";
import DefaultUserPhotoUrl from "PUBLIC_DIR/images/default_user_photo_size_82-82.png";
import toastr from "@docspace/components/toast/toastr";
import { isMobileOnly } from "react-device-detect";
@@ -20,7 +20,6 @@ const User = ({
selectionParentRoom,
setSelectionParentRoom,
changeUserType,
- isScrollLocked,
setIsScrollLocked,
}) => {
if (!selectionParentRoom) return null;
@@ -113,8 +112,8 @@ const User = ({
}
};
- const onToggle = () => {
- setIsScrollLocked(!isScrollLocked);
+ const onToggle = (e, isOpen) => {
+ setIsScrollLocked(isOpen);
};
const userAvatar = user.hasAvatar ? user.avatar : DefaultUserPhotoUrl;
diff --git a/packages/client/src/pages/Home/InfoPanel/Body/views/Members/index.js b/packages/client/src/pages/Home/InfoPanel/Body/views/Members/index.js
index 592d6a5dc8..62cbb168a2 100644
--- a/packages/client/src/pages/Home/InfoPanel/Body/views/Members/index.js
+++ b/packages/client/src/pages/Home/InfoPanel/Body/views/Members/index.js
@@ -28,7 +28,7 @@ const Members = ({
selectionParentRoom,
setSelectionParentRoom,
- isScrollLocked,
+
setIsScrollLocked,
getRoomMembers,
@@ -184,7 +184,6 @@ const Members = ({
selectionParentRoom={selectionParentRoom}
setSelectionParentRoom={setSelectionParentRoom}
changeUserType={changeUserType}
- isScrollLocked={isScrollLocked}
setIsScrollLocked={setIsScrollLocked}
/>
))}
@@ -222,7 +221,6 @@ const Members = ({
selectionParentRoom={selectionParentRoom}
setSelectionParentRoom={setSelectionParentRoom}
changeUserType={changeUserType}
- isScrollLocked={isScrollLocked}
setIsScrollLocked={setIsScrollLocked}
/>
))}
@@ -250,7 +248,7 @@ export default inject(
updateRoomMembers,
setUpdateRoomMembers,
- isScrollLocked,
+
setIsScrollLocked,
} = auth.infoPanelStore;
const {
@@ -273,7 +271,7 @@ export default inject(
setIsMobileHidden,
selectionParentRoom,
setSelectionParentRoom,
- isScrollLocked,
+
setIsScrollLocked,
getRoomMembers,
From d6d873e34abaedec77eb75a6316a3cbe45b1ce8f Mon Sep 17 00:00:00 2001
From: Ilya Oleshko
Date: Mon, 10 Jul 2023 18:07:24 +0300
Subject: [PATCH 4/6] Web: Client: Components: SelectDialogs: Added rooms only
filter
---
.../panels/SelectFileDialog/AsideView.js | 1 +
.../components/panels/SelectFileDialog/index.js | 1 +
.../components/panels/SelectFolderDialog/index.js | 8 +++++---
.../components/panels/SelectFolderInput/index.js | 1 +
.../SelectionPanel/ExceptionFoldersConstants.js | 9 +++++++++
.../panels/SelectionPanel/SelectionPanelBody.js | 14 +++++++++++---
6 files changed, 28 insertions(+), 6 deletions(-)
diff --git a/packages/client/src/components/panels/SelectFileDialog/AsideView.js b/packages/client/src/components/panels/SelectFileDialog/AsideView.js
index 72542a946f..62472fc629 100644
--- a/packages/client/src/components/panels/SelectFileDialog/AsideView.js
+++ b/packages/client/src/components/panels/SelectFileDialog/AsideView.js
@@ -74,6 +74,7 @@ const SelectFileDialogAsideView = ({
isFolderTreeLoading={!!!resultingFolderTree}
withFileSelectDialog
maxInputWidth={maxInputWidth ? maxInputWidth : "446px"}
+ embedded={embedded}
/>
diff --git a/packages/client/src/components/panels/SelectFileDialog/index.js b/packages/client/src/components/panels/SelectFileDialog/index.js
index 08c9eb881a..193e57c71f 100644
--- a/packages/client/src/components/panels/SelectFileDialog/index.js
+++ b/packages/client/src/components/panels/SelectFileDialog/index.js
@@ -308,6 +308,7 @@ SelectFileDialog.propTypes = {
filteredType: PropTypes.oneOf([
"exceptSortedByTags",
"exceptPrivacyTrashArchiveFolders",
+ "roomsOnly",
]),
id: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
withoutProvider: PropTypes.bool,
diff --git a/packages/client/src/components/panels/SelectFolderDialog/index.js b/packages/client/src/components/panels/SelectFolderDialog/index.js
index 9b9df84f88..671206d629 100644
--- a/packages/client/src/components/panels/SelectFolderDialog/index.js
+++ b/packages/client/src/components/panels/SelectFolderDialog/index.js
@@ -43,6 +43,7 @@ class SelectFolderDialog extends React.Component {
storeFolderId,
withoutBasicSelection,
setResultingFoldersTree,
+ embedded,
} = this.props;
!displayType && window.addEventListener("resize", this.throttledResize);
@@ -51,7 +52,7 @@ class SelectFolderDialog extends React.Component {
let resultingFolderTree, resultingId;
- if (!withFileSelectDialog) {
+ if (!withFileSelectDialog || embedded) {
treeFolders = await this.props.fetchTreeFolders();
const roomsFolder = treeFolders.find(
@@ -68,7 +69,7 @@ class SelectFolderDialog extends React.Component {
] = await SelectionPanel.getBasicFolderInfo(
treeFolders,
filteredType,
- initialFolderId,
+ embedded ? null : initialFolderId,
passedFoldersTree,
hasSharedFolder
);
@@ -91,7 +92,7 @@ class SelectFolderDialog extends React.Component {
const resId = withFileSelectDialog ? id : resultingId;
- if (!withoutBasicSelection) {
+ if (!withoutBasicSelection || embedded) {
onSelectFolder && onSelectFolder(resId);
onSetBaseFolderPath && onSetBaseFolderPath(resId);
}
@@ -294,6 +295,7 @@ SelectFolderDialog.propTypes = {
filteredType: PropTypes.oneOf([
"exceptSortedByTags",
"exceptPrivacyTrashArchiveFolders",
+ "roomsOnly",
"",
]),
displayType: PropTypes.oneOf(["aside", "modal"]),
diff --git a/packages/client/src/components/panels/SelectFolderInput/index.js b/packages/client/src/components/panels/SelectFolderInput/index.js
index e2075b32ed..7eaa15b91a 100644
--- a/packages/client/src/components/panels/SelectFolderInput/index.js
+++ b/packages/client/src/components/panels/SelectFolderInput/index.js
@@ -185,6 +185,7 @@ SelectFolderInput.propTypes = {
filteredType: PropTypes.oneOf([
"exceptSortedByTags",
"exceptPrivacyTrashArchiveFolders",
+ "roomsOnly",
"",
]),
};
diff --git a/packages/client/src/components/panels/SelectionPanel/ExceptionFoldersConstants.js b/packages/client/src/components/panels/SelectionPanel/ExceptionFoldersConstants.js
index b3edd7b7b0..d4a9b167f6 100644
--- a/packages/client/src/components/panels/SelectionPanel/ExceptionFoldersConstants.js
+++ b/packages/client/src/components/panels/SelectionPanel/ExceptionFoldersConstants.js
@@ -13,3 +13,12 @@ export const exceptPrivacyTrashArchiveFolders = [
FolderType.TRASH,
FolderType.Archive,
];
+
+export const roomsOnly = [
+ FolderType.USER,
+ FolderType.Recent,
+ FolderType.TRASH,
+ FolderType.Favorites,
+ FolderType.Privacy,
+ FolderType.Archive,
+];
diff --git a/packages/client/src/components/panels/SelectionPanel/SelectionPanelBody.js b/packages/client/src/components/panels/SelectionPanel/SelectionPanelBody.js
index 9b6532b217..077c47696c 100644
--- a/packages/client/src/components/panels/SelectionPanel/SelectionPanelBody.js
+++ b/packages/client/src/components/panels/SelectionPanel/SelectionPanelBody.js
@@ -14,6 +14,7 @@ import toastr from "@docspace/components/toast/toastr";
import {
exceptSortedByTagsFolders,
exceptPrivacyTrashArchiveFolders,
+ roomsOnly,
} from "./ExceptionFoldersConstants";
import { StyledBody, StyledModalDialog } from "./StyledSelectionPanel";
import Text from "@docspace/components/text";
@@ -198,6 +199,8 @@ class SelectionPanel extends React.Component {
treeFolders,
exceptPrivacyTrashArchiveFolders
);
+ case "roomsOnly":
+ return filterFoldersTree(treeFolders, roomsOnly);
}
};
@@ -206,15 +209,20 @@ class SelectionPanel extends React.Component {
const foldersTree =
passedFoldersTree.length > 0 ? passedFoldersTree : treeFolders;
- const passedId = id ? id : foldersTree[0].id;
-
if (
filteredType === "exceptSortedByTags" ||
- filteredType === "exceptPrivacyTrashArchiveFolders"
+ filteredType === "exceptPrivacyTrashArchiveFolders" ||
+ filteredType === "roomsOnly"
) {
filteredTreeFolders = getExceptionsFolders(foldersTree);
}
+ const passedId = id
+ ? id
+ : filteredTreeFolders
+ ? filteredTreeFolders[0].id
+ : foldersTree[0].id;
+
return [filteredTreeFolders || foldersTree, passedId];
};
render() {
From f5e27161212192d2c8cad1e970c6c964b4f94fb3 Mon Sep 17 00:00:00 2001
From: Ilya Oleshko
Date: Mon, 10 Jul 2023 18:08:19 +0300
Subject: [PATCH 5/6] Web: Client: Sdk: Fixed displaying for file selector,
added filter usage
---
packages/client/src/pages/Sdk/index.js | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/packages/client/src/pages/Sdk/index.js b/packages/client/src/pages/Sdk/index.js
index d7059dd366..681426dfb9 100644
--- a/packages/client/src/pages/Sdk/index.js
+++ b/packages/client/src/pages/Sdk/index.js
@@ -145,10 +145,12 @@ const Sdk = ({
isPanelVisible={true}
onSelectFile={onSelectFile}
onClose={onClose}
- filteredType="exceptPrivacyTrashArchiveFolders"
+ filteredType="roomsOnly"
withSubfolders={false}
displayType="aside"
embedded={true}
+ searchParam={frameConfig?.filter.search}
+ ByExtension
/>
);
break;
From 9385177d0d04460d66973683eb6514803dc5b734 Mon Sep 17 00:00:00 2001
From: Ilya Oleshko
Date: Mon, 10 Jul 2023 18:16:09 +0300
Subject: [PATCH 6/6] Web: Client: Sdk: Fixed setting user theme and locale
---
packages/client/src/pages/Sdk/index.js | 2 +-
packages/common/store/SettingsStore.js | 7 +++++--
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/packages/client/src/pages/Sdk/index.js b/packages/client/src/pages/Sdk/index.js
index 681426dfb9..6983730327 100644
--- a/packages/client/src/pages/Sdk/index.js
+++ b/packages/client/src/pages/Sdk/index.js
@@ -64,7 +64,7 @@ const Sdk = ({
{
const requests = await Promise.all([
setFrameConfig(data),
- updateProfileCulture(user?.id, data.locale),
+ user && updateProfileCulture(user.id, data.locale),
]);
res = requests[0];
}
diff --git a/packages/common/store/SettingsStore.js b/packages/common/store/SettingsStore.js
index e3e0e1f1a1..e42ada82c5 100644
--- a/packages/common/store/SettingsStore.js
+++ b/packages/common/store/SettingsStore.js
@@ -798,11 +798,14 @@ class SettingsStore {
setFrameConfig = async (frameConfig) => {
runInAction(() => {
this.frameConfig = frameConfig;
- this.setTheme(frameConfig?.theme);
});
if (!!frameConfig) {
- frameCallEvent({ event: "onAppReady" });
+ this.setTheme(frameConfig?.theme);
+ frameCallEvent({
+ event: "onAppReady",
+ data: { frameId: frameConfig.frameId },
+ });
}
return frameConfig;
};