Merge branch 'release/v2.6.0' of github.com:ONLYOFFICE/DocSpace-client into release/v2.6.0

packages/client/src/pages/PortalSettings/Layout/Section/Header/index.js

@@ -375,31 +375,29 @@ const SectionHeaderContent = (props) => {
             />
           )}
           <Headline type="content" truncate={true}>
-            <div className="settings-section_header">
-              <div className="header">
-                {isMobile() && isServicePage && (
-                  <IconButton
-                    iconName={ArrowPathReactSvgUrl}
-                    size="17"
-                    isFill={true}
-                    onClick={onBackToParent}
-                    className="arrow-button"
-                  />
-                )}
-                {t(header, { organizationName: t("Common:OrganizationName") })}
-              </div>
-              {isNeedPaidIcon ? (
-                <Badge
-                  backgroundColor={theme.isBase ? "#EDC409" : "#A38A1A"}
-                  label={t("Common:Paid")}
-                  fontWeight="700"
-                  className="settings-section_badge"
-                  isPaidBadge={true}
-                />
-              ) : (
-                ""
-              )}
-            </div>
+            {isMobile() && isServicePage && (
+              <IconButton
+                iconName={ArrowPathReactSvgUrl}
+                size="17"
+                isFill={true}
+                onClick={onBackToParent}
+                className="arrow-button"
+              />
+            )}
+            {t(header, {
+              organizationName: t("Common:OrganizationName"),
+            })}
+            {isNeedPaidIcon ? (
+              <Badge
+                backgroundColor={theme.isBase ? "#EDC409" : "#A38A1A"}
+                label={t("Common:Paid")}
+                fontWeight="700"
+                className="settings-section_badge"
+                isPaidBadge={true}
+              />
+            ) : (
+              ""
+            )}
           </Headline>
           <div className="tariff-bar">
             <TariffBar />

packages/client/src/pages/PortalSettings/categories/common/appearance.js

@@ -183,7 +183,7 @@ const Appearance = (props) => {
 
   useEffect(() => {
     getSettings();
-    setDocumentTitle(t("Appearance"));
+    setDocumentTitle(t("Common:Appearance"));
   }, []);
 
   useEffect(() => {

packages/client/src/pages/PortalSettings/categories/common/customization.js

@@ -110,7 +110,7 @@ const Customization = (props) => {
   const isLoadedSetting = isLoaded && tReady;
 
   useEffect(() => {
-    setDocumentTitle(t("Customization"));
+    setDocumentTitle(t("Settings:Customization"));
 
     return () => {
       resetIsInit();

packages/client/src/pages/PortalSettings/categories/developer-tools/PluginSDK/index.js

@@ -34,6 +34,7 @@ import { RectangleSkeleton } from "@docspace/shared/skeletons";
 
 import GithubLight from "PUBLIC_DIR/images/github.light.react.svg";
 import GithubDark from "PUBLIC_DIR/images/github.dark.react.svg";
+import { setDocumentTitle } from "SRC_DIR/helpers/utils";
 
 import { StyledContainer } from "./StyledPluginSDK";
 
@@ -48,6 +49,10 @@ const PluginSDK = ({
 }) => {
   const { t } = useTranslation(["WebPlugins", "VersionHistory", "Common"]);
 
+  React.useEffect(() => {
+    setDocumentTitle(t("WebPlugins:PluginSDK"));
+  }, []);
+
   const isMobile = currentDeviceType === "mobile";
 
   const icon = !theme.isBase ? <GithubLight /> : <GithubDark />;

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

@@ -38,6 +38,7 @@ import { toastr } from "@docspace/shared/components/toast";
 import { SettingsDSConnectSkeleton } from "@docspace/shared/skeletons/settings";
 import { DeviceType } from "@docspace/shared/enums";
 import { SaveCancelButtons } from "@docspace/shared/components/save-cancel-buttons";
+import { setDocumentTitle } from "SRC_DIR/helpers/utils";
 
 const URL_REGEX = /^https?:\/\/[-a-zA-Z0-9@:%._\+~#=]{1,256}\/?$/;
 const DNS_PLACEHOLDER = `${window.location.protocol}//<docspace-dns-name>/`;
@@ -69,6 +70,7 @@ const DocumentService = ({
   const [initInternalUrl, setInitInternalUrl] = useState("");
 
   useEffect(() => {
+    setDocumentTitle(t("DocumentService"));
     setIsLoading(true);
     getDocumentServiceLocation()
       .then((result) => {

packages/shared/components/filter/sub-components/FilterBlock.tsx

@@ -479,6 +479,8 @@ const FilterBlock = ({
   };
 
   const showFooter = isLoading ? false : isEqualFilter();
+  const showClearFilterBtn =
+    !isLoading && (selectedFilterValue.length > 0 || filterValues.length > 0);
 
   const filterBlockComponent = (
     <>
@@ -535,7 +537,7 @@ const FilterBlock = ({
             <Heading size={HeadingSize.medium} level={HeadingLevel.h1}>
               {filterHeader}
             </Heading>
-            {showFooter && (
+            {showClearFilterBtn && (
               <IconButton
                 id="filter_search-options-clear"
                 iconName={ClearReactSvgUrl}