Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2

packages/asc-web-components/campaigns-banner/styled-campaigns-banner.js

@@ -37,7 +37,6 @@ const BannerWrapper = styled.div`
 
   .banner-btn:active {
     color: ${(props) => props.theme.campaignsBanner.btnColor};
-    background: ${(props) => props.theme.campaignsBanner.btnBackgroundActive};
     border: none;
   }
 `;

packages/asc-web-components/themes/base.js

@@ -1919,7 +1919,7 @@ const Base = {
 
   menuContainer: {
     background: "linear-gradient(200.71deg, #2274aa 0%, #0f4071 100%)",
-    arrowTop: "#0f4071",
+    arrowTop: "#206FA4",
     color: white,
   },
 
@@ -2500,6 +2500,7 @@ const Base = {
     about: {
       linkColor: blueMain,
       border: "1px solid lightgray",
+      logoColor: black,
     },
 
     comingSoon: {
@@ -2600,7 +2601,7 @@ const Base = {
   },
 
   campaignsBanner: {
-    border: "border: 1px solid #d1d1d1",
+    border: "1px solid #d1d1d1",
     color: darkBlack,
 
     btnColor: white,

packages/asc-web-components/themes/dark.js

@@ -1922,7 +1922,7 @@ const Dark = {
   menuContainer: {
     background:
       "linear-gradient(226.22deg, #EBB67A 0.24%, #E9AC6B 11.61%, #E8A25D 22.98%, #E69850 34.34%, #E58D42 45.71%, #E38235 57.08%, #E27628 68.44%, #E06A1B 79.81%)",
-    arrowTop: "#E06A1B",
+    arrowTop: "#EAB274",
     color: "#22221f",
   },
 
@@ -2513,6 +2513,7 @@ const Dark = {
     about: {
       linkColor: "#E06A1B",
       border: "1px solid #474747",
+      logoColor: white,
     },
 
     comingSoon: {
@@ -2613,10 +2614,10 @@ const Dark = {
   },
 
   campaignsBanner: {
-    border: "border: 1px solid #d1d1d1",
+    border: "1px solid #CCCCCC",
     color: darkBlack,
 
-    btnColor: white,
+    btnColor: black,
     btnBackgroundActive: blueMain,
   },
 

products/ASC.Files/Client/src/components/Article/Body/index.js

@@ -33,10 +33,14 @@ const ArticleBodyContent = (props) => {
     isDesktopClient,
     enableThirdParty,
     isVisitor,
-    campaigns,
     FirebaseHelper,
     isArticleLoading,
   } = props;
+
+  const campaigns = (localStorage.getItem("campaigns") || "")
+    .split(",")
+    .filter((campaign) => campaign.length > 0);
+
   const onClick = React.useCallback((data) => {
     const {
       toggleArticleOpen,

products/ASC.Files/Client/src/store/UploadDataStore.js

@@ -869,6 +869,8 @@ class UploadDataStore {
   };
 
   finishUploadFiles = () => {
+    const { fetchFiles, filter } = this.filesStore;
+
     const totalErrorsCount = sumBy(this.files, (f) => (f.error ? 1 : 0));
 
     if (totalErrorsCount > 0) console.log("Errors: ", totalErrorsCount);
@@ -885,6 +887,8 @@ class UploadDataStore {
 
     if (this.files.length > 0) {
       const toFolderId = this.files[0]?.toFolderId;
+      fetchFiles(toFolderId, filter);
+
       if (toFolderId) {
         const { socketHelper } = this.filesStore.settingsStore;
 

web/ASC.Web.Client/src/components/pages/About/AboutContent.js

@@ -34,6 +34,16 @@ const StyledAboutBody = styled.div`
   .select-el {
     ${isMobile && `user-select: text`};
   }
+
+  .logo-theme {
+    #svg_4-4 {
+      fill: ${(props) => props.theme.studio.about.logoColor};
+    }
+
+    #svg_5-5 {
+      fill: ${(props) => props.theme.studio.about.logoColor};
+    }
+  }
 `;
 
 const AboutContent = ({ personal, buildVersionInfo, theme }) => {
@@ -52,7 +62,7 @@ const AboutContent = ({ personal, buildVersionInfo, theme }) => {
         {personal ? (
           <ReactSVG
             src="/images/logo_personal_about.svg"
-            className="no-select"
+            className="logo-theme no-select"
           />
         ) : (
           <img