From afe0985fee3891962c455d9b4706c5d188adb963 Mon Sep 17 00:00:00 2001 From: Timofey Boyko Date: Tue, 2 Jul 2024 14:26:43 +0300 Subject: [PATCH 1/7] Login:Actions: fix SSO url --- packages/login/src/utils/actions.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/login/src/utils/actions.ts b/packages/login/src/utils/actions.ts index 9127ebd241..ac9d2de522 100644 --- a/packages/login/src/utils/actions.ts +++ b/packages/login/src/utils/actions.ts @@ -134,7 +134,7 @@ export async function getCapabilities() { } export async function getSSO() { - const [getSSO] = createRequest([`/capabilities`], [["", ""]], "GET"); + const [getSSO] = createRequest([`/settings/ssov2`], [["", ""]], "GET"); const res = await fetch(getSSO); From c69e321daa92e763d706b0b51841f616547294a8 Mon Sep 17 00:00:00 2001 From: Tatiana Lopaeva Date: Tue, 2 Jul 2024 16:01:27 +0300 Subject: [PATCH 2/7] Fix bug 68262 - Add hint text above the new password input. --- .../client/src/pages/Confirm/sub-components/activateUser.js | 5 ++--- .../src/pages/Confirm/sub-components/changePassword.js | 6 +++--- .../client/src/pages/Confirm/sub-components/createUser.js | 6 +++--- packages/shared/components/password-input/PasswordInput.tsx | 3 ++- packages/shared/constants/index.ts | 3 +++ public/locales/en/Common.json | 1 + 6 files changed, 14 insertions(+), 10 deletions(-) diff --git a/packages/client/src/pages/Confirm/sub-components/activateUser.js b/packages/client/src/pages/Confirm/sub-components/activateUser.js index dcc4307cdd..f8b49b56f3 100644 --- a/packages/client/src/pages/Confirm/sub-components/activateUser.js +++ b/packages/client/src/pages/Confirm/sub-components/activateUser.js @@ -225,9 +225,7 @@ const ActivateUserForm = (props) => { isVertical={true} labelVisible={false} hasError={isPasswordErrorShow && !passwordValid} - errorMessage={`${t( - "Common:PasswordLimitMessage", - )}: ${getPasswordErrorMessage(t, settings)}`} + errorMessage={t("Common:IncorrectPassword")} > { "Common:PasswordLimitSpecialSymbols", )}`} generatePasswordTitle={t("Wizard:GeneratePassword")} + tooltipAdditional={`${t("AllowedCharacters")}: ${ALLOWED_PASSWORD_CHARACTERS}`} // If need copy credentials use t("EmailAndPasswordCopiedToClipboard") /> diff --git a/packages/client/src/pages/Confirm/sub-components/changePassword.js b/packages/client/src/pages/Confirm/sub-components/changePassword.js index f810ed6a70..d6b458acd4 100644 --- a/packages/client/src/pages/Confirm/sub-components/changePassword.js +++ b/packages/client/src/pages/Confirm/sub-components/changePassword.js @@ -42,6 +42,7 @@ import { getPasswordErrorMessage } from "@docspace/shared/utils/getPasswordError import PortalLogo from "@docspace/shared/components/portal-logo/PortalLogo"; import withLoader from "../withLoader"; import { StyledPage, StyledBody, StyledContent } from "./StyledConfirm"; +import { ALLOWED_PASSWORD_CHARACTERS } from "@docspace/shared/constants"; const ChangePasswordForm = (props) => { const { @@ -154,9 +155,7 @@ const ChangePasswordForm = (props) => { isVertical={true} labelVisible={false} hasError={isPasswordErrorShow && !passwordValid} - errorMessage={`${t( - "Common:PasswordLimitMessage", - )}: ${getPasswordErrorMessage(t, settings)}`} + errorMessage={t("Common:IncorrectPassword")} > { "Common:PasswordLimitSpecialSymbols", )}`} generatePasswordTitle={t("Wizard:GeneratePassword")} + tooltipAdditional={`${t("AllowedCharacters")}: ${ALLOWED_PASSWORD_CHARACTERS}`} /> diff --git a/packages/client/src/pages/Confirm/sub-components/createUser.js b/packages/client/src/pages/Confirm/sub-components/createUser.js index 00e31268e7..e84d6d2f93 100644 --- a/packages/client/src/pages/Confirm/sub-components/createUser.js +++ b/packages/client/src/pages/Confirm/sub-components/createUser.js @@ -52,6 +52,7 @@ import { } from "@docspace/shared/utils/common"; import { login } from "@docspace/shared/utils/loginUtils"; import { + ALLOWED_PASSWORD_CHARACTERS, COOKIE_EXPIRATION_YEAR, LANGUAGE, PRODUCT_NAME, @@ -633,9 +634,7 @@ const CreateUserForm = (props) => { isVertical={true} labelVisible={false} hasError={isPasswordErrorShow && !passwordValid} - errorMessage={`${t( - "Common:PasswordLimitMessage", - )}: ${getPasswordErrorMessage(t, settings)}`} + errorMessage={t("Common:IncorrectPassword")} > { "Common:PasswordLimitSpecialSymbols", )}`} generatePasswordTitle={t("Wizard:GeneratePassword")} + tooltipAdditional={`${t("AllowedCharacters")}: ${ALLOWED_PASSWORD_CHARACTERS}`} /> diff --git a/packages/shared/components/password-input/PasswordInput.tsx b/packages/shared/components/password-input/PasswordInput.tsx index badf4d7a4a..c5ee87a6f3 100644 --- a/packages/shared/components/password-input/PasswordInput.tsx +++ b/packages/shared/components/password-input/PasswordInput.tsx @@ -102,6 +102,7 @@ const PasswordInput = React.forwardRef( tooltipOffsetLeft, tooltipOffsetTop, isAutoFocussed, + tooltipAdditional, }: PasswordInputProps, ref, ) => { @@ -472,7 +473,7 @@ const PasswordInput = React.forwardRef( {tooltipPasswordSpecial} )} - + {tooltipAdditional} {generatePasswordTitle && (
?@[]^_`{|}"; diff --git a/public/locales/en/Common.json b/public/locales/en/Common.json index c288bdc45d..c9c882bc24 100644 --- a/public/locales/en/Common.json +++ b/public/locales/en/Common.json @@ -14,6 +14,7 @@ "AddUsers": "Add users", "AdvancedFilter": "Search options", "Alert": "Alert", + "AllowedCharacters": "Allowed characters", "Anonymous": "Anonymous", "AnyoneWithLink": "Anyone with the link", "ApplyButton": "Apply", From e79622e55159bca05954f51611264f60e6347d80 Mon Sep 17 00:00:00 2001 From: Tatiana Lopaeva Date: Tue, 2 Jul 2024 16:23:07 +0300 Subject: [PATCH 3/7] Refactoring. --- .../client/src/pages/Confirm/sub-components/activateUser.js | 2 +- .../src/pages/Confirm/sub-components/changePassword.js | 2 +- .../client/src/pages/Confirm/sub-components/createUser.js | 2 +- packages/shared/components/password-input/PasswordInput.tsx | 6 ++++-- .../shared/components/password-input/PasswordInput.types.ts | 2 ++ 5 files changed, 9 insertions(+), 5 deletions(-) diff --git a/packages/client/src/pages/Confirm/sub-components/activateUser.js b/packages/client/src/pages/Confirm/sub-components/activateUser.js index f8b49b56f3..1cba594cec 100644 --- a/packages/client/src/pages/Confirm/sub-components/activateUser.js +++ b/packages/client/src/pages/Confirm/sub-components/activateUser.js @@ -255,7 +255,7 @@ const ActivateUserForm = (props) => { "Common:PasswordLimitSpecialSymbols", )}`} generatePasswordTitle={t("Wizard:GeneratePassword")} - tooltipAdditional={`${t("AllowedCharacters")}: ${ALLOWED_PASSWORD_CHARACTERS}`} + tooltipAllowedCharacters={`${t("Common:AllowedCharacters")}: ${ALLOWED_PASSWORD_CHARACTERS}`} // If need copy credentials use t("EmailAndPasswordCopiedToClipboard") /> diff --git a/packages/client/src/pages/Confirm/sub-components/changePassword.js b/packages/client/src/pages/Confirm/sub-components/changePassword.js index d6b458acd4..e5f83cfa1a 100644 --- a/packages/client/src/pages/Confirm/sub-components/changePassword.js +++ b/packages/client/src/pages/Confirm/sub-components/changePassword.js @@ -186,7 +186,7 @@ const ChangePasswordForm = (props) => { "Common:PasswordLimitSpecialSymbols", )}`} generatePasswordTitle={t("Wizard:GeneratePassword")} - tooltipAdditional={`${t("AllowedCharacters")}: ${ALLOWED_PASSWORD_CHARACTERS}`} + tooltipAllowedCharacters={`${t("Common:AllowedCharacters")}: ${ALLOWED_PASSWORD_CHARACTERS}`} />
diff --git a/packages/client/src/pages/Confirm/sub-components/createUser.js b/packages/client/src/pages/Confirm/sub-components/createUser.js index e84d6d2f93..8cf725283e 100644 --- a/packages/client/src/pages/Confirm/sub-components/createUser.js +++ b/packages/client/src/pages/Confirm/sub-components/createUser.js @@ -672,7 +672,7 @@ const CreateUserForm = (props) => { "Common:PasswordLimitSpecialSymbols", )}`} generatePasswordTitle={t("Wizard:GeneratePassword")} - tooltipAdditional={`${t("AllowedCharacters")}: ${ALLOWED_PASSWORD_CHARACTERS}`} + tooltipAllowedCharacters={`${t("Common:AllowedCharacters")}: ${ALLOWED_PASSWORD_CHARACTERS}`} /> diff --git a/packages/shared/components/password-input/PasswordInput.tsx b/packages/shared/components/password-input/PasswordInput.tsx index c5ee87a6f3..f2b040dee8 100644 --- a/packages/shared/components/password-input/PasswordInput.tsx +++ b/packages/shared/components/password-input/PasswordInput.tsx @@ -102,7 +102,7 @@ const PasswordInput = React.forwardRef( tooltipOffsetLeft, tooltipOffsetTop, isAutoFocussed, - tooltipAdditional, + tooltipAllowedCharacters, }: PasswordInputProps, ref, ) => { @@ -473,7 +473,9 @@ const PasswordInput = React.forwardRef( {tooltipPasswordSpecial} )} - {tooltipAdditional} + + {tooltipAllowedCharacters} + {generatePasswordTitle && (
Date: Tue, 2 Jul 2024 17:16:55 +0300 Subject: [PATCH 4/7] =?UTF-8?q?Fixed=20Bug=2067816=20-=20Rooms.=20There=20?= =?UTF-8?q?is=20no=20message=20=E2=80=98The=20content=20of=20third=20party?= =?UTF-8?q?=20folder=20are=20not=20available...=E2=80=99=20if=20the=20Move?= =?UTF-8?q?=20to/Copy/Save=20sidebar=20is=20open.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/shared/selectors/Files/hooks/useFilesHelper.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/shared/selectors/Files/hooks/useFilesHelper.ts b/packages/shared/selectors/Files/hooks/useFilesHelper.ts index 0214849fac..74445dc9e7 100644 --- a/packages/shared/selectors/Files/hooks/useFilesHelper.ts +++ b/packages/shared/selectors/Files/hooks/useFilesHelper.ts @@ -402,9 +402,9 @@ const useFilesHelper = ({ if (onSetBaseFolderPath) { onSetBaseFolderPath([]); - toastr.error(e as TData); } setIsFirstLoad(false); + toastr.error(e as TData); } }, [ From 806f81d2f9fed037bbd292b26e3baaef943a0d07 Mon Sep 17 00:00:00 2001 From: Viktor Fomin Date: Tue, 2 Jul 2024 17:44:35 +0300 Subject: [PATCH 5/7] Fix Bug 68949 Before opening Wizard, Login page opens --- packages/login/src/app/layout.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/login/src/app/layout.tsx b/packages/login/src/app/layout.tsx index a30a1f8aa8..f4204c04c8 100644 --- a/packages/login/src/app/layout.tsx +++ b/packages/login/src/app/layout.tsx @@ -25,7 +25,7 @@ // International. See the License terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode import { cookies, headers } from "next/headers"; - +import { redirect } from "next/navigation"; import { Toast } from "@docspace/shared/components/toast"; import { getBaseUrl } from "@docspace/shared/utils/next-ssr-helper"; import { TenantStatus, ThemeKeys } from "@docspace/shared/enums"; @@ -83,7 +83,7 @@ export default async function RootLayout({ } if (typeof settings !== "string" && settings?.wizardToken) { - redirectUrl = `wizard`; + redirect(`wizard`); } if ( From b5431a653e244948dd578f03fe768f91929339ca Mon Sep 17 00:00:00 2001 From: Akmal Isomadinov Date: Wed, 3 Jul 2024 16:11:32 +0500 Subject: [PATCH 6/7] Client:Components:Dialogs:CreateRoomDialog Fixed change room type and back button --- .../dialogs/CreateEditRoomDialog/CreateRoomDialog.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/client/src/components/dialogs/CreateEditRoomDialog/CreateRoomDialog.js b/packages/client/src/components/dialogs/CreateEditRoomDialog/CreateRoomDialog.js index becefa22a3..2fadca655d 100644 --- a/packages/client/src/components/dialogs/CreateEditRoomDialog/CreateRoomDialog.js +++ b/packages/client/src/components/dialogs/CreateEditRoomDialog/CreateRoomDialog.js @@ -173,7 +173,7 @@ const CreateRoomDialog = ({ > @@ -185,7 +185,7 @@ const CreateRoomDialog = ({ ) : ( Date: Wed, 3 Jul 2024 13:20:59 +0200 Subject: [PATCH 7/7] Fix Bug 68956: Wrong documents icon on tablet/mobile --- packages/shared/utils/catalogIconHelper.ts | 4 ++-- public/images/icons/20/catalog.documents.react.svg | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 public/images/icons/20/catalog.documents.react.svg diff --git a/packages/shared/utils/catalogIconHelper.ts b/packages/shared/utils/catalogIconHelper.ts index 200938cc44..73f662169d 100644 --- a/packages/shared/utils/catalogIconHelper.ts +++ b/packages/shared/utils/catalogIconHelper.ts @@ -49,7 +49,7 @@ import CatalogSettingsGiftReactSvgUrl from "PUBLIC_DIR/images/gift.react.svg?url import CatalogSettingsStorageManagementReactSvgUrl from "PUBLIC_DIR/images/icons/16/catalog-settings-storage-management.svg?url"; import CatalogFolder20ReactSvgUrl from "PUBLIC_DIR/images/icons/20/catalog.folder.react.svg?url"; -import CatalogUser20ReactSvgUrl from "PUBLIC_DIR/images/icons/20/catalog.user.react.svg?url"; +import CatalogDocuments20ReactSvgUrl from "PUBLIC_DIR/images/icons/20/catalog.documents.react.svg?url"; import CatalogRooms20ReactSvgUrl from "PUBLIC_DIR/images/icons/20/catalog.rooms.react.svg?url"; import CatalogArchive20ReactSvgUrl from "PUBLIC_DIR/images/icons/20/catalog.archive.react.svg?url"; import CatalogShared20ReactSvgUrl from "PUBLIC_DIR/images/icons/20/catalog.shared.react.svg?url"; @@ -114,7 +114,7 @@ const icons: Record>> = { [PageType.storageManagement]: CatalogSettingsStorageManagementReactSvgUrl, }, 20: { - [FolderType.USER]: CatalogUser20ReactSvgUrl, + [FolderType.USER]: CatalogDocuments20ReactSvgUrl, [FolderType.Rooms]: CatalogRooms20ReactSvgUrl, [FolderType.Archive]: CatalogArchive20ReactSvgUrl, [FolderType.SHARE]: CatalogShared20ReactSvgUrl, diff --git a/public/images/icons/20/catalog.documents.react.svg b/public/images/icons/20/catalog.documents.react.svg new file mode 100644 index 0000000000..0fd0994864 --- /dev/null +++ b/public/images/icons/20/catalog.documents.react.svg @@ -0,0 +1,3 @@ + + +