diff --git a/packages/client/src/components/dialogs/ConflictResolveDialog/index.tsx b/packages/client/src/components/dialogs/ConflictResolveDialog/index.tsx
index 2014f089d1..100b58461e 100644
--- a/packages/client/src/components/dialogs/ConflictResolveDialog/index.tsx
+++ b/packages/client/src/components/dialogs/ConflictResolveDialog/index.tsx
@@ -37,6 +37,7 @@ import {
ConflictResolveDialogProps,
TActiveItem,
} from "./ConflictResolveDialog.types";
+import { Text } from "@docspace/shared/components/text";
const ConflictResolveDialog = (props: ConflictResolveDialogProps) => {
const {
@@ -217,7 +218,7 @@ const ConflictResolveDialog = (props: ConflictResolveDialogProps) => {
ns="Common"
i18nKey="FileActionRequired"
values={{ fileName: items[0].title }}
- components={{ 1: }}
+ components={{ 1: }}
/>
);
diff --git a/packages/client/src/pages/Confirm/sub-components/auth.js b/packages/client/src/pages/Confirm/sub-components/auth.js
index 8c50e80aff..4a97cae98b 100644
--- a/packages/client/src/pages/Confirm/sub-components/auth.js
+++ b/packages/client/src/pages/Confirm/sub-components/auth.js
@@ -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 } from "react";
+import React, { useEffect, useState } from "react";
import { useTranslation } from "react-i18next";
import { Loader } from "@docspace/shared/components/loader";
import Section from "@docspace/shared/components/section";
@@ -42,6 +42,8 @@ const Auth = (props) => {
let [searchParams, setSearchParams] = useSearchParams();
const { t } = useTranslation(["Common"]);
+ const [authorized, setAuthorized] = useState(false);
+
const referenceUrl = searchParams.get("referenceUrl");
const isFileHandler =
referenceUrl && referenceUrl.indexOf("filehandler.ashx") !== -1;
@@ -63,6 +65,7 @@ const Auth = (props) => {
try {
new URL(referenceUrl);
if (isFileHandler && isExternalDownloading) {
+ setAuthorized(true);
return;
} else {
return window.location.replace(referenceUrl);
@@ -86,6 +89,7 @@ const Auth = (props) => {
return isFileHandler && isExternalDownloading ? (
diff --git a/packages/client/src/pages/PortalSettings/categories/integration/SingleSignOn/styled-containers/StyledCertificatesTable.js b/packages/client/src/pages/PortalSettings/categories/integration/SingleSignOn/styled-containers/StyledCertificatesTable.js
index cb47992bf0..b5393cf5c2 100644
--- a/packages/client/src/pages/PortalSettings/categories/integration/SingleSignOn/styled-containers/StyledCertificatesTable.js
+++ b/packages/client/src/pages/PortalSettings/categories/integration/SingleSignOn/styled-containers/StyledCertificatesTable.js
@@ -67,6 +67,15 @@ const StyledCertificatesTable = styled.div`
.column-row {
display: flex;
+
+ .description {
+ color: ${(props) =>
+ props.theme.client.settings.integration.sso.textColor};
+ }
+ .error-description {
+ color: ${(props) =>
+ props.theme.client.settings.integration.sso.errorColor};
+ }
}
}
diff --git a/packages/client/src/pages/PortalSettings/categories/integration/SingleSignOn/sub-components/CertificatesTable.js b/packages/client/src/pages/PortalSettings/categories/integration/SingleSignOn/sub-components/CertificatesTable.js
index 16b1ed9f8b..712a0faf3d 100644
--- a/packages/client/src/pages/PortalSettings/categories/integration/SingleSignOn/sub-components/CertificatesTable.js
+++ b/packages/client/src/pages/PortalSettings/categories/integration/SingleSignOn/sub-components/CertificatesTable.js
@@ -30,12 +30,13 @@ import FileSvgUrl from "PUBLIC_DIR/images/icons/32/file.svg?url";
import React from "react";
import { inject, observer } from "mobx-react";
import { useTranslation } from "react-i18next";
+import moment from "moment-timezone";
+import { ReactSVG } from "react-svg";
import { Text } from "@docspace/shared/components/text";
import { ContextMenuButton } from "@docspace/shared/components/context-menu-button";
import StyledCertificatesTable from "../styled-containers/StyledCertificatesTable";
-import { ReactSVG } from "react-svg";
const CertificatesTable = (props) => {
const { t } = useTranslation(["SingleSignOn", "Common"]);
@@ -50,7 +51,6 @@ const CertificatesTable = (props) => {
} = props;
const renderRow = (certificate, index) => {
- console.log(prefix, index);
const onEdit = () => {
prefix === "sp"
? setSpCertificate(certificate, index, true)
@@ -86,6 +86,8 @@ const CertificatesTable = (props) => {
return `${new Date(date).toLocaleDateString()}`;
};
+ const isExpired = moment().isAfter(moment(certificate.expiredDate));
+
return (
@@ -97,7 +99,7 @@ const CertificatesTable = (props) => {
{
- const { url, title, description } = props;
+ const { url, authorized, title, description } = props;
const theme = useTheme();
@@ -46,8 +46,8 @@ const OperationContainer = (props: IOperationContainer) => {
);
useEffect(() => {
- if (url) window.location.replace(url);
- }, [url]);
+ if (url && authorized) window.location.replace(url);
+ }, [url, authorized]);
return (
diff --git a/packages/shared/dialogs/conflict-resolve/ConflictResolve.styled.ts b/packages/shared/dialogs/conflict-resolve/ConflictResolve.styled.ts
index 91500886ac..85ac10f832 100644
--- a/packages/shared/dialogs/conflict-resolve/ConflictResolve.styled.ts
+++ b/packages/shared/dialogs/conflict-resolve/ConflictResolve.styled.ts
@@ -39,6 +39,12 @@ const StyledModalDialog = styled(ModalDialog)`
.bold {
font-weight: 600;
}
+
+ .truncate {
+ overflow: hidden;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ }
}
.select-action {
@@ -76,6 +82,10 @@ const StyledModalDialog = styled(ModalDialog)`
color: #a3a9ae;
}
}
+
+ .conflict-resolve_file-name {
+ display: flex;
+ }
`;
export default StyledModalDialog;
diff --git a/packages/shared/dialogs/conflict-resolve/ConflictResolve.tsx b/packages/shared/dialogs/conflict-resolve/ConflictResolve.tsx
index 776a895509..6eec9233fb 100644
--- a/packages/shared/dialogs/conflict-resolve/ConflictResolve.tsx
+++ b/packages/shared/dialogs/conflict-resolve/ConflictResolve.tsx
@@ -115,7 +115,9 @@ const ConflictResolve = (props: ConflictResolveProps) => {
>
{headerLabel}
- {messageText}
+
+ {messageText}
+
{selectActionText}
{
linkColor: link,
sso: {
+ textColor: gray,
+ errorColor: lightErrorStatus,
toggleContentBackground: grayLight,
iconButton: black,
iconButtonDisabled: gray,
diff --git a/packages/shared/themes/dark.ts b/packages/shared/themes/dark.ts
index 5deec3296f..13b426ded2 100644
--- a/packages/shared/themes/dark.ts
+++ b/packages/shared/themes/dark.ts
@@ -3043,6 +3043,8 @@ const Dark: TTheme = {
linkColor: "#E06A1B",
sso: {
+ textColor: grayDark,
+ errorColor: darkErrorStatus,
toggleContentBackground: "#474747",
iconButton: white,
iconButtonDisabled: "#333",