Merge branch 'develop' into refactoring/global-colors

packages/client/src/HOCs/withBadges.js

@@ -131,8 +131,8 @@ export default function withBadges(WrappedComponent) {
 
       const file = {
         ...options,
-        ExtraLocationTitle: draftLocation.folderTitle,
-        ExtraLocation: draftLocation.folderId,
+        parentId: draftLocation.folderId,
+        parentTitle: draftLocation.folderTitle,
         id: draftLocation.fileId,
         title: draftLocation.fileTitle,
       };

packages/client/src/pages/PortalSettings/categories/integration/LDAP/index.js

@@ -74,7 +74,7 @@ const LDAP = ({
     }
   };
 
-  if (!isLoaded) return <LdapLoader />;
+  if (!isLoaded && isLdapAvailable) return <LdapLoader />;
   return (
     <StyledLdapPage
       isSmallWindow={isSmallWindow}

packages/shared/constants/index.ts

@@ -184,4 +184,7 @@ export const PRODUCT_NAME = "DocSpace";
 export const BRAND_NAME = "ONLYOFFICE";
 
 const SDK_VERSION = "1.0.0";
-export const SDK_SCRIPT_URL = `${window.location.origin}/static/scripts/sdk/${SDK_VERSION}/api.js`;
+export const SDK_SCRIPT_URL =
+  typeof window !== "undefined"
+    ? `${window.location.origin}/static/scripts/sdk/${SDK_VERSION}/api.js`
+    : "";