IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Tatiana Lopaeva 2024-07-09 14:22:29 +03:00
commit 8bd6a09a43
2 changed files with 3 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
packages/client/src/pages/PortalSettings/categories/developer-tools/index.js
View File

@ -24,8 +24,7 @@
// content are licensed under the terms of the Creative Commons Attribution-ShareAlike 4.0
// International. See the License terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
import React, { useEffect, useState, useTransition, Suspense } from "react";
import styled, { css } from "styled-components";
import { useEffect, useState, useTransition } from "react";
import { Tabs } from "@docspace/shared/components/tabs";
import { Box } from "@docspace/shared/components/box";
@ -40,16 +39,12 @@ import Webhooks from "./Webhooks";
import Api from "./Api";
import { useTranslation } from "react-i18next";
import { isMobile, isMobileOnly } from "react-device-detect";
import AppLoader from "@docspace/shared/components/app-loader";
import SSOLoader from "./sub-components/ssoLoader";
import { WebhookConfigsLoader } from "./Webhooks/sub-components/Loaders";
import PluginSDK from "./PluginSDK";
import { Badge } from "@docspace/shared/components/badge";
import { SECTION_HEADER_HEIGHT } from "@docspace/shared/components/section/Section.constants";
const DeveloperToolsWrapper = (props) => {
const { loadBaseInfo, currentDeviceType } = props;
const { currentDeviceType } = props;
const navigate = useNavigate();
const location = useLocation();
@ -74,15 +69,6 @@ const DeveloperToolsWrapper = (props) => {
const pluginLabel = (
<Box displayProp="flex" style={{ gap: "8px" }}>
{t("WebPlugins:PluginSDK")}
<Badge
label={t("Common:BetaLabel")}
backgroundColor="#533ED1"
fontSize="9px"
borderRadius="50px"
noHover={true}
isHovered={false}
/>
</Box>
);

12
packages/client/src/pages/PortalSettings/categories/integration/index.js
View File

@ -24,7 +24,7 @@
// content are licensed under the terms of the Creative Commons Attribution-ShareAlike 4.0
// International. See the License terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
import React, { useEffect, useState } from "react";
import { useEffect } from "react";
import { Tabs } from "@docspace/shared/components/tabs";
import { useNavigate } from "react-router-dom";
import { withTranslation } from "react-i18next";
@ -39,7 +39,6 @@ import ThirdParty from "./ThirdPartyServicesSettings";
import SMTPSettings from "./SMTPSettings";
import DocumentService from "./DocumentService";
import PluginPage from "./Plugins";
import { Badge } from "@docspace/shared/components/badge";
import { Box } from "@docspace/shared/components/box";
import { SECTION_HEADER_HEIGHT } from "@docspace/shared/components/section/Section.constants";
@ -100,15 +99,6 @@ const IntegrationWrapper = (props) => {
const pluginLabel = (
<Box displayProp="flex" style={{ gap: "8px" }}>
{t("Common:Plugins")}
<Badge
label={t("Common:BetaLabel")}
backgroundColor="#533ED1"
fontSize="9px"
borderRadius="50px"
noHover={true}
isHovered={false}
/>
</Box>
);