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:
Timofey Boyko 2024-07-15 17:52:20 +03:00
commit 660e5ba013
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packages/client/src/components/panels/EmbeddingPanel/index.tsx
View File

@ -462,6 +462,7 @@ const EmbeddingPanelComponent = (props: EmbeddingPanelProps) => {
selectedOption={selectedLink as TOption} selectedOption={selectedLink as TOption}
displaySelectedOption displaySelectedOption
directionY="bottom" directionY="bottom"
withLabel={false}
/> />
</> </>
)} )}

7
packages/client/src/pages/Confirm/sub-components/removePortal.js
View File

@ -50,17 +50,18 @@ import { PRODUCT_NAME } from "@docspace/shared/constants";
const RemovePortal = (props) => { const RemovePortal = (props) => {
const { t, greetingTitle, linkData, companyInfoSettingsData } = props; const { t, greetingTitle, linkData, companyInfoSettingsData } = props;
const [isRemoved, setIsRemoved] = useState(false); const [isRemoved, setIsRemoved] = useState(false);
const navigate = useNavigate();
const url = companyInfoSettingsData?.site const url = companyInfoSettingsData?.site
? companyInfoSettingsData.site ? companyInfoSettingsData.site
: "https://onlyoffice.com"; : "https://onlyoffice.com";
const navigate = useNavigate();
const onDeleteClick = async () => { const onDeleteClick = async () => {
try { try {
await deletePortal(linkData.confirmHeader); const res = await deletePortal(linkData.confirmHeader);
setIsRemoved(true); setIsRemoved(true);
setTimeout(() => (location.href = url), 10000); setTimeout(() => (location.href = res ? res : url), 10000);
} catch (e) { } catch (e) {
toastr.error(e); toastr.error(e);
} }