-
- {editorsHeaderLabel}
-
-
- {isCanvasProcessing &&
- !logoUrlsChange.some((obj) => obj.id === "4") ? (
- <>
-
-
-
- >
- ) : (
- <>
-
obj.id === "4")
- ? logoUrlsChange.find((obj) => obj.id === "4").src
- : logoUrlsWhiteLabel[3]
- }
- alt={t("LogoDocsEditor")}
- />
-
obj.id === "4")
- ? logoUrlsChange.find((obj) => obj.id === "4").src
- : logoUrlsWhiteLabel[3]
- }
- alt={t("LogoDocsEditor")}
- />
-
obj.id === "4")
- ? logoUrlsChange.find((obj) => obj.id === "4").src
- : logoUrlsWhiteLabel[3]
- }
- alt={t("LogoDocsEditor")}
- />
- >
- )}
-
-
-
-
-
- {logoEditorsEmbeddedLabel}
-
-
- {isCanvasProcessing &&
- !logoUrlsChange.some((obj) => obj.id === "5") ? (
-
- ) : (
-
obj.id === "5")
- ? logoUrlsChange.find((obj) => obj.id === "5").src
- : logoUrlsWhiteLabel[4]
- }
- alt={t("LogoDocsEditorEmbedded")}
- />
- )}
-
-
-
+
+
+
+ {t("LogoLightSmall")}
+
+
+
+
-
+
+
+ {t("LogoCompact")}
+
+
+
+
+
+
+
+
+
+ {t("LogoLogin")}
+
+
+
+
+
+
+
+
+
+ {t("LogoAbout")}
+
+
+
+
+
+
+
+
+
+ {t("LogoFavicon")}
+
+
+
+
+
+
+ {t("LogoDocsEditor")}
+
+
+
+
+
+
+ {t("LogoDocsEditorEmbedded")}
+
+
+
-
+
+
+
);
};
@@ -923,4 +328,4 @@ export default inject(({ setup, auth, common }) => {
setWhiteLabelSettings,
restoreWhiteLabelSettings,
};
-})(withTranslation(["Settings", "Common"])(observer(WhiteLabel)));
+})(withTranslation(["Settings", "Profile", "Common"])(observer(WhiteLabel)));
diff --git a/packages/client/src/pages/PortalSettings/categories/integration/SingleSignOn/sub-components/ToggleSSO.js b/packages/client/src/pages/PortalSettings/categories/integration/SingleSignOn/sub-components/ToggleSSO.js
index 1ec6c75fc0..ded49ddd21 100644
--- a/packages/client/src/pages/PortalSettings/categories/integration/SingleSignOn/sub-components/ToggleSSO.js
+++ b/packages/client/src/pages/PortalSettings/categories/integration/SingleSignOn/sub-components/ToggleSSO.js
@@ -1,18 +1,16 @@
import React from "react";
import { inject, observer } from "mobx-react";
-import { useTranslation } from "react-i18next";
-
+import { withTranslation } from "react-i18next";
import Box from "@docspace/components/box";
//import FormStore from "@docspace/studio/src/store/SsoFormStore";
import Text from "@docspace/components/text";
import ToggleButton from "@docspace/components/toggle-button";
import Badge from "@docspace/components/badge";
import DisableSsoConfirmationModal from "./DisableSsoConfirmationModal";
-
+import SSOLoader from "../../sub-components/ssoLoader";
const borderProp = { radius: "6px" };
const ToggleSSO = (props) => {
- const { t } = useTranslation("SingleSignOn");
const {
theme,
enableSso,
@@ -21,8 +19,14 @@ const ToggleSSO = (props) => {
ssoToggle,
confirmationDisableModal,
isSSOAvailable,
+ tReady,
+ t,
} = props;
+ if (!tReady) {
+ return
;
+ }
+
return (
<>
{
ssoToggle,
confirmationDisableModal,
};
-})(observer(ToggleSSO));
+})(withTranslation(["SingleSignOn"])(observer(ToggleSSO)));
diff --git a/packages/client/src/pages/PortalSettings/categories/integration/sub-components/ssoLoader.js b/packages/client/src/pages/PortalSettings/categories/integration/sub-components/ssoLoader.js
index 426522c3b8..600b6c45b4 100644
--- a/packages/client/src/pages/PortalSettings/categories/integration/sub-components/ssoLoader.js
+++ b/packages/client/src/pages/PortalSettings/categories/integration/sub-components/ssoLoader.js
@@ -24,13 +24,16 @@ const StyledLoader = styled.div`
}
`;
-const SSOLoader = () => {
+const SSOLoader = (props) => {
+ const { isToggleSSO } = props;
return (
-
-
-
-
+ {!isToggleSSO && (
+
+
+
+
+ )}
diff --git a/packages/client/src/pages/PortalSettings/utils/generateLogo.js b/packages/client/src/pages/PortalSettings/utils/generateLogo.js
new file mode 100644
index 0000000000..ae7109e653
--- /dev/null
+++ b/packages/client/src/pages/PortalSettings/utils/generateLogo.js
@@ -0,0 +1,35 @@
+export const generateLogo = (width, height, text, fontSize = 18) => {
+ const canvas = document.createElement("canvas");
+ canvas.width = width;
+ canvas.height = height;
+ const ctx = canvas.getContext("2d");
+ ctx.fillStyle = "transparent";
+ ctx.clearRect(0, 0, width, height);
+ ctx.fillStyle = "#000";
+ ctx.textAlign = "start";
+ ctx.textBaseline = "top";
+ ctx.font = `${fontSize}px Arial`;
+ ctx.fillText(text, 0, 0);
+ return canvas.toDataURL();
+};
+
+export const getLogoOptions = (index, text) => {
+ switch (index) {
+ case 0:
+ return { fontSize: 18, text: text };
+ case 1:
+ return { fontSize: 30, text: text };
+ case 2:
+ return { fontSize: 16, text: text.trim().charAt(0) };
+ case 3:
+ return { fontSize: 12, text: text };
+ case 4:
+ return { fontSize: 12, text: text };
+ case 5:
+ return { fontSize: 30, text: text.trim().charAt(0) };
+ case 6:
+ return { fontSize: 30, text: text };
+ default:
+ return { fontSize: 18, text: text };
+ }
+};
diff --git a/packages/client/src/pages/Settings/Section/Body/CommonSettings.js b/packages/client/src/pages/Settings/Section/Body/CommonSettings.js
index 75fe204ebe..94f8da287c 100644
--- a/packages/client/src/pages/Settings/Section/Body/CommonSettings.js
+++ b/packages/client/src/pages/Settings/Section/Body/CommonSettings.js
@@ -90,7 +90,7 @@ const CommonSettings = ({
/>
-
+ {/*
{t("AdditionalSections")}
@@ -109,14 +109,14 @@ const CommonSettings = ({
onChange={onChangeFavorites}
isChecked={favoritesSection}
/>
- {/* console.log(e)}
- isChecked={false}
- /> */}
-
+ console.log(e)}
+ isChecked={false}
+ />
+ */}
diff --git a/packages/client/src/store/FilesStore.js b/packages/client/src/store/FilesStore.js
index 16d7730087..588a60253d 100644
--- a/packages/client/src/store/FilesStore.js
+++ b/packages/client/src/store/FilesStore.js
@@ -1079,7 +1079,7 @@ class FilesStore {
"separator1",
"open-location",
"mark-read",
- "mark-as-favorite",
+ // "mark-as-favorite",
"remove-from-favorites",
"download",
"download-as",
diff --git a/packages/client/src/store/ProfileActionsStore.js b/packages/client/src/store/ProfileActionsStore.js
index cf7638f304..9ef1e3f197 100644
--- a/packages/client/src/store/ProfileActionsStore.js
+++ b/packages/client/src/store/ProfileActionsStore.js
@@ -252,21 +252,23 @@ class ProfileActionsStore {
if (!feedbackAndSupportEnabled) {
const index = actionsArray.findIndex(
- (item) => item?.key === "SupportBtn"
+ (item) => item?.key === "user-menu-support"
);
actionsArray.splice(index, 1);
}
if (!videoGuidesEnabled) {
- const index = actionsArray.findIndex((item) => item?.key === "VideoBtn");
+ const index = actionsArray.findIndex(
+ (item) => item?.key === "user-menu-video"
+ );
actionsArray.splice(index, 1);
}
if (!helpCenterEnabled) {
const index = actionsArray.findIndex(
- (item) => item?.key === "HelpCenterBtn"
+ (item) => item?.key === "user-menu-help-center"
);
actionsArray.splice(index, 1);
diff --git a/packages/client/src/store/TreeFoldersStore.js b/packages/client/src/store/TreeFoldersStore.js
index f59c73933c..23f6e2066d 100644
--- a/packages/client/src/store/TreeFoldersStore.js
+++ b/packages/client/src/store/TreeFoldersStore.js
@@ -35,7 +35,12 @@ class TreeFoldersStore {
getFoldersTree = () => getFoldersTree();
setTreeFolders = (treeFolders) => {
- this.treeFolders = treeFolders;
+ // this.treeFolders = treeFolders;
+
+ //TODO: remove after api fix
+ this.treeFolders = treeFolders
+ .filter((f) => f.rootFolderType !== FolderType.Recent)
+ .filter((f) => f.rootFolderType !== FolderType.Favorites);
};
setIsLoadingNodes = (isLoadingNodes) => {
diff --git a/packages/common/components/FilterInput/index.js b/packages/common/components/FilterInput/index.js
index bd306bdd29..68ca20cf9c 100644
--- a/packages/common/components/FilterInput/index.js
+++ b/packages/common/components/FilterInput/index.js
@@ -123,9 +123,11 @@ const FilterInput = React.memo(
value={inputValue}
onChange={onSearch}
onClearSearch={onClearSearch}
+ id="filter_search-input"
/>
{filterHeader}
{showFooter && (
{
const [isOpen, setIsOpen] = React.useState(false);
@@ -269,6 +269,7 @@ const SortButton = ({
)}
{sortData?.map((item) => (
{
return (
@@ -22,23 +23,29 @@ const ArticleFolderLoader = ({
style={style}
showText={showText}
>
-
-
-
-
-
-
- {!personal && (
+ {isVisitor ? (
<>
+
+ >
+ ) : (
+ <>
+
+
+
+
+
+
+
+
>
)}
@@ -62,6 +69,6 @@ ArticleFolderLoader.defaultProps = {
export default inject(({ auth }) => {
return {
showText: auth.settingsStore.showText,
- personal: auth.settingsStore.personal,
+ isVisitor: auth.userStore.user.isVisitor,
};
})(observer(ArticleFolderLoader));
diff --git a/packages/common/components/Loaders/DialogAsideLoader/DialogAsideLoader.js b/packages/common/components/Loaders/DialogAsideLoader/DialogAsideLoader.js
index 4dc735cc0f..74ae6e6ecb 100644
--- a/packages/common/components/Loaders/DialogAsideLoader/DialogAsideLoader.js
+++ b/packages/common/components/Loaders/DialogAsideLoader/DialogAsideLoader.js
@@ -13,7 +13,11 @@ const DialogAsideLoader = ({
const renderClearDialogAsideLoader = () => {
return (
-
+
@@ -23,6 +27,7 @@ const DialogAsideLoader = ({
+
);
@@ -32,7 +37,7 @@ const DialogAsideLoader = ({
renderClearDialogAsideLoader()
) : (
<>
-
+