From c6dd338bb79774dc35b10f858149e6b125028f6b Mon Sep 17 00:00:00 2001
From: Vlada Gazizova <94864088+gazizova-vlada@users.noreply.github.com>
Date: Thu, 8 Aug 2024 10:37:19 +0300
Subject: [PATCH 12/45] Client:TableRow:Refactoring.
---
.../TableView/sub-components/RoomsRowData.js | 56 ++++---------------
.../Body/TableView/sub-components/RowData.js | 53 ++++--------------
2 files changed, 22 insertions(+), 87 deletions(-)
diff --git a/packages/client/src/pages/Home/Section/Body/TableView/sub-components/RoomsRowData.js b/packages/client/src/pages/Home/Section/Body/TableView/sub-components/RoomsRowData.js
index 6bd34d2727..c9ad73fa71 100644
--- a/packages/client/src/pages/Home/Section/Body/TableView/sub-components/RoomsRowData.js
+++ b/packages/client/src/pages/Home/Section/Body/TableView/sub-components/RoomsRowData.js
@@ -41,7 +41,6 @@ const RoomsRowDataComponent = (props) => {
const {
roomColumnTypeIsEnabled,
roomColumnOwnerIsEnabled,
- roomColumnQuickButtonsIsEnabled,
roomColumnTagsIsEnabled,
roomColumnActivityIsEnabled,
roomQuotaColumnIsEnable,
@@ -63,6 +62,11 @@ const RoomsRowDataComponent = (props) => {
} = props;
const lastColumn = getLastColumn(tableStorageName);
+ const quickButtonsComponentNode = (
+
+ {quickButtonsComponent}
+
+ );
return (
<>
@@ -85,13 +89,7 @@ const RoomsRowDataComponent = (props) => {
{badgesComponent}
- {lastColumn === "Name" ? (
-
- {quickButtonsComponent}
-
- ) : (
- <>
- )}
+ {lastColumn === "Name" ? quickButtonsComponentNode : <>}
{roomColumnTypeIsEnabled ? (
@@ -111,13 +109,7 @@ const RoomsRowDataComponent = (props) => {
sideColor={theme.filesSection.tableView.row.sideColor}
{...props}
/>
- {lastColumn === "Type" ? (
-
- {quickButtonsComponent}
-
- ) : (
- <>
- )}
+ {lastColumn === "Type" ? quickButtonsComponentNode : <>}
) : (
@@ -136,13 +128,7 @@ const RoomsRowDataComponent = (props) => {
sideColor={theme.filesSection.tableView.row.sideColor}
{...props}
/>
- {lastColumn === "Tags" ? (
-
- {quickButtonsComponent}
-
- ) : (
- <>
- )}
+ {lastColumn === "Tags" ? quickButtonsComponentNode : <>}
) : (
@@ -165,13 +151,7 @@ const RoomsRowDataComponent = (props) => {
sideColor={theme.filesSection.tableView.row.sideColor}
{...props}
/>
- {lastColumn === "Owner" ? (
-
- {quickButtonsComponent}
-
- ) : (
- <>
- )}
+ {lastColumn === "Owner" ? quickButtonsComponentNode : <>}
) : (
@@ -194,13 +174,7 @@ const RoomsRowDataComponent = (props) => {
sideColor={theme.filesSection.tableView.row.sideColor}
{...props}
/>
- {lastColumn === "Activity" ? (
-
- {quickButtonsComponent}
-
- ) : (
- <>
- )}
+ {lastColumn === "Activity" ? quickButtonsComponentNode : <>}
) : (
@@ -213,13 +187,7 @@ const RoomsRowDataComponent = (props) => {
type="room"
isReadOnly={!item?.security?.EditRoom}
/>
- {lastColumn === "Storage" ? (
-
- {quickButtonsComponent}
-
- ) : (
- <>
- )}
+ {lastColumn === "Storage" ? quickButtonsComponentNode : <>}
) : (
@@ -232,7 +200,6 @@ export default inject(({ currentQuotaStore, tableStore }) => {
const {
roomColumnTypeIsEnabled,
roomColumnOwnerIsEnabled,
- roomColumnQuickButtonsIsEnabled,
roomColumnTagsIsEnabled,
roomColumnActivityIsEnabled,
roomQuotaColumnIsEnable,
@@ -244,7 +211,6 @@ export default inject(({ currentQuotaStore, tableStore }) => {
roomQuotaColumnIsEnable,
roomColumnTypeIsEnabled,
roomColumnOwnerIsEnabled,
- roomColumnQuickButtonsIsEnabled,
roomColumnTagsIsEnabled,
roomColumnActivityIsEnabled,
showStorageInfo,
diff --git a/packages/client/src/pages/Home/Section/Body/TableView/sub-components/RowData.js b/packages/client/src/pages/Home/Section/Body/TableView/sub-components/RowData.js
index 7862870d54..75cbfe1cee 100644
--- a/packages/client/src/pages/Home/Section/Body/TableView/sub-components/RowData.js
+++ b/packages/client/src/pages/Home/Section/Body/TableView/sub-components/RowData.js
@@ -60,6 +60,11 @@ const RowDataComponent = (props) => {
} = props;
const lastColumn = getLastColumn(tableStorageName);
+ const quickButtonsComponentNode = (
+
+ {quickButtonsComponent}
+
+ );
return (
<>
@@ -82,13 +87,7 @@ const RowDataComponent = (props) => {
{badgesComponent}
- {lastColumn === "Name" ? (
-
- {quickButtonsComponent}
-
- ) : (
- <>
- )}
+ {lastColumn === "Name" ? quickButtonsComponentNode : <>}
{authorColumnIsEnabled ? (
@@ -106,13 +105,7 @@ const RowDataComponent = (props) => {
sideColor={theme.filesSection.tableView.row.sideColor}
{...props}
/>
- {lastColumn === "Author" ? (
-
- {quickButtonsComponent}
-
- ) : (
- <>
- )}
+ {lastColumn === "Author" ? quickButtonsComponentNode : <>}
) : (
@@ -136,13 +129,7 @@ const RowDataComponent = (props) => {
sideColor={theme.filesSection.tableView.row.sideColor}
{...props}
/>
- {lastColumn === "Created" ? (
-
- {quickButtonsComponent}
-
- ) : (
- <>
- )}
+ {lastColumn === "Created" ? quickButtonsComponentNode : <>}
) : (
@@ -163,13 +150,7 @@ const RowDataComponent = (props) => {
sideColor={theme.filesSection.tableView.row.sideColor}
{...props}
/>
- {lastColumn === "Modified" ? (
-
- {quickButtonsComponent}
-
- ) : (
- <>
- )}
+ {lastColumn === "Modified" ? quickButtonsComponentNode : <>}
) : (
@@ -190,13 +171,7 @@ const RowDataComponent = (props) => {
sideColor={theme.filesSection.tableView.row.sideColor}
{...props}
/>
- {lastColumn === "Size" ? (
-
- {quickButtonsComponent}
-
- ) : (
- <>
- )}
+ {lastColumn === "Size" ? quickButtonsComponentNode : <>}
) : (
@@ -219,13 +194,7 @@ const RowDataComponent = (props) => {
sideColor={theme.filesSection.tableView.row.sideColor}
{...props}
/>
- {lastColumn === "Type" ? (
-
- {quickButtonsComponent}
-
- ) : (
- <>
- )}
+ {lastColumn === "Type" ? quickButtonsComponentNode : <>}
) : (
From fdc06cf61c2bc7feb61c209a29dd3ae32c5dd56d Mon Sep 17 00:00:00 2001
From: Aleksandr Lushkin
Date: Wed, 24 Jul 2024 13:14:34 +0200
Subject: [PATCH 13/45] Client: InfoPanel Groups: Fix getting all members in
one request. Add infinite loader
---
.../CreateEditGroupDialog/EditGroupDialog.tsx | 2 +-
.../Body/views/Groups/GroupMember.js | 2 +-
.../GroupMembersList/GroupMembersList.tsx | 155 ++++++++++++++++++
.../Home/InfoPanel/Body/views/Groups/index.js | 95 +++++++++--
.../Body/views/Groups/useFetchGroup.js | 2 +-
packages/shared/api/groups/index.ts | 10 +-
packages/shared/api/groups/types.ts | 1 +
7 files changed, 246 insertions(+), 21 deletions(-)
create mode 100644 packages/client/src/pages/Home/InfoPanel/Body/views/Groups/GroupMembersList/GroupMembersList.tsx
diff --git a/packages/client/src/components/dialogs/CreateEditGroupDialog/EditGroupDialog.tsx b/packages/client/src/components/dialogs/CreateEditGroupDialog/EditGroupDialog.tsx
index c0027e0286..9f706cbc83 100644
--- a/packages/client/src/components/dialogs/CreateEditGroupDialog/EditGroupDialog.tsx
+++ b/packages/client/src/components/dialogs/CreateEditGroupDialog/EditGroupDialog.tsx
@@ -143,7 +143,7 @@ const EditGroupDialog = ({
if (groupParams.groupMembers) return;
setFetchMembersIsLoading(true);
- getGroupById(group.id)!
+ getGroupById(group.id, true)!
.then((data: any) => {
prevGroupParams.current.groupMembers = data.members;
setInitialMembersIds(data.members.map((gm) => gm.id));
diff --git a/packages/client/src/pages/Home/InfoPanel/Body/views/Groups/GroupMember.js b/packages/client/src/pages/Home/InfoPanel/Body/views/Groups/GroupMember.js
index 4b2487f9a2..f0d4ad9672 100644
--- a/packages/client/src/pages/Home/InfoPanel/Body/views/Groups/GroupMember.js
+++ b/packages/client/src/pages/Home/InfoPanel/Body/views/Groups/GroupMember.js
@@ -84,7 +84,7 @@ const GroupMember = ({
className="avatar"
role={groupMember.role || "user"}
size={"min"}
- source={groupMember.avatarSmall}
+ source={groupMember.avatarSmall || groupMember.avatar}
/>
diff --git a/packages/client/src/pages/Home/InfoPanel/Body/views/Groups/GroupMembersList/GroupMembersList.tsx b/packages/client/src/pages/Home/InfoPanel/Body/views/Groups/GroupMembersList/GroupMembersList.tsx
new file mode 100644
index 0000000000..08800bb675
--- /dev/null
+++ b/packages/client/src/pages/Home/InfoPanel/Body/views/Groups/GroupMembersList/GroupMembersList.tsx
@@ -0,0 +1,155 @@
+// (c) Copyright Ascensio System SIA 2009-2024
+//
+// This program is a free software product.
+// You can redistribute it and/or modify it under the terms
+// of the GNU Affero General Public License (AGPL) version 3 as published by the Free Software
+// Foundation. In accordance with Section 7(a) of the GNU AGPL its Section 15 shall be amended
+// to the effect that Ascensio System SIA expressly excludes the warranty of non-infringement of
+// any third-party rights.
+//
+// This program is distributed WITHOUT ANY WARRANTY, without even the implied warranty
+// of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For details, see
+// the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
+//
+// You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, EU, LV-1021.
+//
+// The interactive user interfaces in modified source and object code versions of the Program must
+// display Appropriate Legal Notices, as required under Section 5 of the GNU AGPL version 3.
+//
+// Pursuant to Section 7(b) of the License you must retain the original Product logo when
+// distributing the program. Pursuant to Section 7(e) we decline to grant you any rights under
+// trademark law for use of our trademarks.
+//
+// All the Product's GUI elements, including illustrations and icon sets, as well as technical writing
+// 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, { useCallback, useEffect, useState } from "react";
+import {
+ ListRowProps,
+ Index,
+ IndexRange,
+ InfiniteLoader,
+ List,
+ WindowScroller,
+} from "react-virtualized";
+import styled from "styled-components";
+
+import { TUser } from "@docspace/shared/api/people/types";
+import { RowLoader } from "@docspace/shared/skeletons/selector";
+
+import GroupMember from "../GroupMember";
+
+const ROW_HEIGHT = 50;
+
+export const StyledList = styled(List)`
+ width: ${({ width }) => `${width - 40}px`} !important;
+
+ .group-member-row-loader {
+ padding: 0;
+ }
+`;
+
+interface GroupMembersListProps {
+ members: TUser[];
+ loadNextPage: (startIndex: number) => Promise;
+ hasNextPage: boolean;
+ total: number;
+}
+
+export const GroupMembersList = ({
+ members,
+ loadNextPage,
+ hasNextPage,
+ total,
+}: GroupMembersListProps) => {
+ const [scrollElement, setScrollElement] = useState(
+ null,
+ );
+ const [isNextPageLoading, setIsNextPageLoading] = useState(false);
+
+ const itemsCount = hasNextPage ? members.length + 1 : members.length;
+
+ const isItemLoaded = useCallback(
+ ({ index }: Index) => {
+ return !hasNextPage || index < itemsCount;
+ },
+ [hasNextPage, itemsCount],
+ );
+
+ const loadMoreItems = useCallback(
+ async ({ startIndex }: IndexRange) => {
+ setIsNextPageLoading(true);
+ if (!isNextPageLoading) {
+ await loadNextPage(startIndex - 1);
+ }
+ setIsNextPageLoading(false);
+ },
+ [isNextPageLoading, loadNextPage],
+ );
+
+ const renderRow = ({ key, index, style }: ListRowProps) => {
+ const item = members[index];
+
+ return (
+
+ {({ onRowsRendered, registerChild }) => (
+
+ {({ height, isScrolling, scrollTop }) => {
+ const scrollRect = scrollElement.getBoundingClientRect();
+
+ return (
+
+ )}
+
+ );
+};
diff --git a/packages/client/src/pages/Home/InfoPanel/Body/views/Groups/index.js b/packages/client/src/pages/Home/InfoPanel/Body/views/Groups/index.js
index ac9bebf5b7..f250e63b2b 100644
--- a/packages/client/src/pages/Home/InfoPanel/Body/views/Groups/index.js
+++ b/packages/client/src/pages/Home/InfoPanel/Body/views/Groups/index.js
@@ -26,14 +26,20 @@
import { inject, observer } from "mobx-react";
import { withTranslation } from "react-i18next";
-import * as Styled from "../../styles/groups.styled";
-import withLoader from "@docspace/client/src/HOCs/withLoader";
-import InfoPanelViewLoader from "@docspace/shared/skeletons/info-panel/body";
-import GroupMember from "./GroupMember";
-import useFetchGroup from "./useFetchGroup";
import { useParams } from "react-router-dom";
import { useState, useEffect } from "react";
+import withLoader from "@docspace/client/src/HOCs/withLoader";
+import InfoPanelViewLoader from "@docspace/shared/skeletons/info-panel/body";
+import api from "@docspace/shared/api";
+import AccountsFilter from "@docspace/shared/api/people/filter";
+import { MIN_LOADER_TIMER } from "@docspace/shared/selectors/Files/FilesSelector.constants";
+
+import GroupMember from "./GroupMember";
+import * as Styled from "../../styles/groups.styled";
+import useFetchGroup from "./useFetchGroup";
+import { GroupMembersList } from "./GroupMembersList/GroupMembersList";
+
const Groups = ({
infoPanelSelection,
currentGroup,
@@ -42,6 +48,9 @@ const Groups = ({
setInfoPanelSelectedGroup,
}) => {
const [isShowLoader, setIsShowLoader] = useState(false);
+ const [areMembersLoading, setAreMembersLoading] = useState(false);
+ const [groupMembers, setGroupMembers] = useState(null);
+ const [total, setTotal] = useState(0);
const { groupId: paramsGroupId } = useParams();
const isInsideGroup = !!paramsGroupId;
@@ -51,32 +60,88 @@ const Groups = ({
const groupId = isInsideGroup ? paramsGroupId : infoPanelSelection?.id;
const setGroup = isInsideGroup ? setCurrentGroup : setInfoPanelSelectedGroup;
+ const groupManager = group?.manager;
+
+ const loadNextPage = async (startIndex) => {
+ const startLoadingTime = new Date();
+
+ try {
+ if (startIndex === 0) {
+ setAreMembersLoading(true);
+ }
+
+ const pageCount = 100;
+ const filter = AccountsFilter.getDefault();
+ filter.group = groupId;
+ filter.page = startIndex / pageCount;
+ filter.pageCount = pageCount;
+
+ const res = await api.people.getUserList(filter);
+
+ const membersWithoutManager = groupManager
+ ? res.items.filter((item) => item.id !== groupManager.id)
+ : res.items;
+
+ setTotal(res.total);
+ if (startIndex === 0 || !groupMembers) {
+ setGroupMembers(membersWithoutManager);
+ } else {
+ setGroupMembers([...groupMembers, ...membersWithoutManager]);
+ }
+ } catch (e) {
+ console.log(e);
+ } finally {
+ const nowDate = new Date();
+ const diff = Math.abs(nowDate.getTime() - startLoadingTime.getTime());
+
+ if (diff < MIN_LOADER_TIMER) {
+ setTimeout(() => {
+ setAreMembersLoading(false);
+ }, MIN_LOADER_TIMER - diff);
+ } else {
+ setAreMembersLoading(false);
+ }
+ }
+ };
+
useFetchGroup(groupId, group?.id, setGroup);
+ useEffect(() => {
+ if (group) {
+ loadNextPage(0);
+ }
+ }, [group]);
+
useEffect(() => {
const showLoaderTimer = setTimeout(() => setIsShowLoader(true), 500);
return () => clearTimeout(showLoaderTimer);
}, []);
- const groupManager = group?.manager;
- const groupMembers = group?.members?.filter(
- (user) => user.id !== groupManager?.id,
- );
-
if (!group) {
- if (isShowLoader) return
+
+ );
return null;
}
+ const totalWithoutManager = groupManager ? total - 1 : total;
+
return (
{groupManager &&
);
diff --git a/packages/client/src/pages/Home/InfoPanel/Body/views/Groups/useFetchGroup.js b/packages/client/src/pages/Home/InfoPanel/Body/views/Groups/useFetchGroup.js
index c65aff8872..cb2b08f351 100644
--- a/packages/client/src/pages/Home/InfoPanel/Body/views/Groups/useFetchGroup.js
+++ b/packages/client/src/pages/Home/InfoPanel/Body/views/Groups/useFetchGroup.js
@@ -45,7 +45,7 @@ const useFetchGroup = (groupId, fetchedGroupId, setGroup) => {
setIsLoading(true);
}
- getGroupById(groupId, abortControllerRef.current?.signal)
+ getGroupById(groupId, false, abortControllerRef.current?.signal)
.then((data) => {
if (isMount.current) startTransition(() => setGroup(data));
})
diff --git a/packages/shared/api/groups/index.ts b/packages/shared/api/groups/index.ts
index e9f642f9cf..25f72dc909 100644
--- a/packages/shared/api/groups/index.ts
+++ b/packages/shared/api/groups/index.ts
@@ -69,12 +69,16 @@ export const getGroups = (filter = Filter.getDefault()) => {
});
};
-export const getGroupById = (groupId: string, signal: AbortSignal) => {
+export const getGroupById = (
+ groupId: string,
+ includeMembers: boolean = false,
+ signal?: AbortSignal,
+) => {
return request({
method: "get",
- url: `/group/${groupId}`,
+ url: `/group/${groupId}?includeMembers=${includeMembers}`,
signal,
- });
+ }) as Promise;
};
export const getGroupsByName = async (
diff --git a/packages/shared/api/groups/types.ts b/packages/shared/api/groups/types.ts
index 1669911d06..e8d103736e 100644
--- a/packages/shared/api/groups/types.ts
+++ b/packages/shared/api/groups/types.ts
@@ -34,6 +34,7 @@ export type TGroup = {
name: string;
parent: string;
isGroup?: boolean;
+ members?: TUser[];
membersCount: number;
shared?: boolean;
isLDAP: boolean;
From a8e5a244f72aa631092eab4ea2585c287bbc0a4c Mon Sep 17 00:00:00 2001
From: Aleksandr Lushkin
Date: Mon, 29 Jul 2024 14:48:36 +0200
Subject: [PATCH 14/45] Client: EditGroupDialog: Rewrite dialog to work with
infinite loader
---
.../CreateEditGroupDialog.styled.ts | 32 ++
.../CreateGroupDialog.tsx | 4 +-
.../CreateEditGroupDialog/EditGroupDialog.tsx | 287 ++++++++++--------
.../sub-components/BodyLoader/BodyLoader.tsx | 43 +++
.../sub-components/GroupMemberRow/index.tsx | 19 +-
.../GroupMembersList/GroupMembersList.tsx | 152 ++++++++++
.../SelectGroupManagerPanel.tsx | 7 +-
.../sub-components/HeadOfGroupParam/index.tsx | 27 +-
.../sub-components/MembersParam/index.tsx | 78 +++--
.../MembersSelector.tsx} | 63 ++--
.../create-components/SelectMembersPanel.tsx} | 66 ++--
.../edit-components/SelectMembersPanel.tsx | 62 ++++
.../components/panels/AddUsersPanel/index.tsx | 19 +-
packages/client/src/store/EditGroupStore.ts | 248 +++++++++++++++
packages/client/src/store/GroupsStore.ts | 2 +-
packages/client/src/store/index.js | 4 +
packages/shared/api/groups/index.ts | 2 +-
packages/shared/api/groups/types.ts | 2 +-
.../components/selector/Selector.types.ts | 3 +
19 files changed, 849 insertions(+), 271 deletions(-)
create mode 100644 packages/client/src/components/dialogs/CreateEditGroupDialog/sub-components/BodyLoader/BodyLoader.tsx
create mode 100644 packages/client/src/components/dialogs/CreateEditGroupDialog/sub-components/GroupMembersList/GroupMembersList.tsx
rename packages/client/src/components/dialogs/CreateEditGroupDialog/sub-components/{MembersParam/SelectGroupMembersPanel.tsx => MembersSelector/MembersSelector.tsx} (67%)
rename packages/client/src/components/dialogs/CreateEditGroupDialog/{utils/index.ts => sub-components/create-components/SelectMembersPanel.tsx} (54%)
create mode 100644 packages/client/src/components/dialogs/CreateEditGroupDialog/sub-components/edit-components/SelectMembersPanel.tsx
create mode 100644 packages/client/src/store/EditGroupStore.ts
diff --git a/packages/client/src/components/dialogs/CreateEditGroupDialog/CreateEditGroupDialog.styled.ts b/packages/client/src/components/dialogs/CreateEditGroupDialog/CreateEditGroupDialog.styled.ts
index 795b0eaac0..e0d9b7ae7c 100644
--- a/packages/client/src/components/dialogs/CreateEditGroupDialog/CreateEditGroupDialog.styled.ts
+++ b/packages/client/src/components/dialogs/CreateEditGroupDialog/CreateEditGroupDialog.styled.ts
@@ -34,3 +34,35 @@ export const StyledModal = styled(ModalDialog)`
padding-top: 20px;
}
`;
+
+export const StyledBodyLoader = styled.div`
+ box-sizing: border-box;
+ display: flex;
+ flex-direction: column;
+
+ .title-section {
+ margin-bottom: 14px;
+ }
+
+ .group-title {
+ margin-bottom: 4px;
+ height: 16px;
+ padding-top: 4px;
+ }
+
+ .manager-title,
+ .members-title {
+ padding-block: 8px;
+ }
+
+ .add-member-container {
+ display: flex;
+ align-items: center;
+ gap: 8px;
+ margin-block: 8px;
+ }
+
+ .member-row {
+ padding-inline: 0;
+ }
+`;
diff --git a/packages/client/src/components/dialogs/CreateEditGroupDialog/CreateGroupDialog.tsx b/packages/client/src/components/dialogs/CreateEditGroupDialog/CreateGroupDialog.tsx
index 71cf29c8ba..3c0d2bfdaf 100644
--- a/packages/client/src/components/dialogs/CreateEditGroupDialog/CreateGroupDialog.tsx
+++ b/packages/client/src/components/dialogs/CreateEditGroupDialog/CreateGroupDialog.tsx
@@ -42,7 +42,7 @@ import GroupNameParam from "./sub-components/GroupNameParam";
import HeadOfGroup from "./sub-components/HeadOfGroupParam";
import MembersParam from "./sub-components/MembersParam";
import SelectGroupManagerPanel from "./sub-components/HeadOfGroupParam/SelectGroupManagerPanel";
-import SelectGroupMembersPanel from "./sub-components/MembersParam/SelectGroupMembersPanel";
+import { SelectMembersPanel } from "./sub-components/create-components/SelectMembersPanel";
interface CreateGroupDialogProps {
visible: boolean;
@@ -177,7 +177,7 @@ const CreateGroupDialog = ({
)}
{selectMembersPanelIsVisible && (
- ;
+
+type EditGroupDialogProps = {
+ group: TGroup;
visible: boolean;
onClose: () => void;
- updateGroup: (
- groupId: string,
- groupName: string,
- groupManager: string,
- membersToAdd: string[],
- membersToRemove: string[],
- ) => Promise;
-}
+ injectedProps?: InjectedProps;
+};
const EditGroupDialog = ({
group,
visible,
onClose,
- updateGroup,
- setInfoPanelSelectedGroup,
+
+ injectedProps,
}: EditGroupDialogProps) => {
+ const {
+ initGroupData,
+ resetGroupData,
+ isInit,
+ loadMembers,
+ manager,
+ addManager,
+ removeManager,
+ members,
+ addMembers,
+ removeMember,
+ currentTotal,
+ submitChanges,
+ title,
+ setTitle,
+ hasChanges,
+ } = injectedProps!;
+
const { t } = useTranslation(["PeopleTranslations", "Common"]);
-
- const [initialMembersIds, setInitialMembersIds] = useState([]);
-
- const [isCreateGroupLoading, setCreateGroupIsLoading] =
- useState(false);
-
- const [isFetchMembersLoading, setFetchMembersIsLoading] =
- useState(false);
-
- const [groupParams, setGroupParams] = useState({
- groupName: group.name,
- groupManager: group.manager,
- groupMembers: null,
- });
-
- const prevGroupParams = useRef({ ...groupParams });
-
- const onChangeGroupName = (e: ChangeEvent) =>
- setGroupParams((prev) => ({ ...prev, groupName: e.target.value }));
-
- const setGroupManager = (groupManager: object | null) =>
- setGroupParams((prev) => ({ ...prev, groupManager }));
-
- const setGroupMembers = (groupMembers: object[]) =>
- setGroupParams((prev) => ({ ...prev, groupMembers }));
-
+ const [isSubmitting, setIsSubmitting] = useState(false);
const [selectGroupMangerPanelIsVisible, setSelectGroupMangerPanelIsVisible] =
useState(false);
+ const [selectMembersPanelIsVisible, setSelectMembersPanelIsVisible] =
+ useState(false);
+
+ const onChangeGroupName = (e: ChangeEvent) => {
+ setTitle(e.target.value);
+ };
+
+ const closeModal = () => {
+ resetGroupData();
+ onClose();
+ };
const onShowSelectGroupManagerPanel = () =>
setSelectGroupMangerPanelIsVisible(true);
const onHideSelectGroupManagerPanel = () =>
setSelectGroupMangerPanelIsVisible(false);
- const [selectMembersPanelIsVisible, setSelectMembersPanelIsVisible] =
- useState(false);
-
const onShowSelectMembersPanel = () => setSelectMembersPanelIsVisible(true);
const onHideSelectMembersPanel = () => setSelectMembersPanelIsVisible(false);
const onEditGroup = async () => {
- setCreateGroupIsLoading(true);
+ setIsSubmitting(true);
- const groupManagerId = groupParams.groupManager?.id || undefined;
+ await submitChanges();
- const newMembersIds =
- groupParams.groupMembers?.map((gm: any) => gm.id) || [];
- const membersToAdd = newMembersIds.filter(
- (gm) => !initialMembersIds.includes(gm),
- );
- const membersToDelete = initialMembersIds.filter(
- (gm) => !newMembersIds.includes(gm),
- );
-
- await updateGroup(
- group.id,
- groupParams.groupName,
- groupManagerId,
- membersToAdd,
- membersToDelete,
- );
-
- setCreateGroupIsLoading(false);
- onClose();
+ setIsSubmitting(false);
+ closeModal();
};
- const notEnoughGroupParamsToEdit =
- !groupParams.groupName ||
- (!groupParams.groupManager && !groupParams.groupMembers?.length);
-
- const groupParamsNotChanged = compareGroupParams(
- groupParams,
- prevGroupParams.current,
- );
-
useEffect(() => {
- if (groupParams.groupMembers) return;
- setFetchMembersIsLoading(true);
+ initGroupData(group);
- getGroupById(group.id, true)!
- .then((data: any) => {
- prevGroupParams.current.groupMembers = data.members;
- setInitialMembersIds(data.members.map((gm) => gm.id));
- setGroupMembers(data.members);
- })
- .then((data) => {
- setInfoPanelSelectedGroup(data);
- })
- .catch((err) => console.error(err))
- .finally(() => setFetchMembersIsLoading(false));
- }, [group.id]);
+ return () => {
+ resetGroupData();
+ };
+ }, []);
+
+ const notEnoughParamsToEdit = !title || (!manager && !members?.length);
return (
<>
{t("PeopleTranslations:EditGroup")}
-
@@ -198,21 +186,21 @@ const EditGroupDialog = ({
id="edit-group-modal_submit"
tabIndex={5}
label={t("Common:SaveButton")}
- size="normal"
+ size={ButtonSize.normal}
primary
scale
onClick={onEditGroup}
- isDisabled={notEnoughGroupParamsToEdit || groupParamsNotChanged}
- isLoading={isCreateGroupLoading}
+ isDisabled={!hasChanges || notEnoughParamsToEdit}
+ isLoading={isSubmitting}
/>
@@ -222,25 +210,60 @@ const EditGroupDialog = ({
isVisible={selectGroupMangerPanelIsVisible}
onClose={onHideSelectGroupManagerPanel}
onParentPanelClose={onClose}
- setGroupManager={setGroupManager}
+ setGroupManager={addManager}
/>
)}
{selectMembersPanelIsVisible && (
-
+
+ );
+};
diff --git a/packages/client/src/components/dialogs/CreateEditGroupDialog/sub-components/GroupMemberRow/index.tsx b/packages/client/src/components/dialogs/CreateEditGroupDialog/sub-components/GroupMemberRow/index.tsx
index a5d2ee61ac..e0854106e3 100644
--- a/packages/client/src/components/dialogs/CreateEditGroupDialog/sub-components/GroupMemberRow/index.tsx
+++ b/packages/client/src/components/dialogs/CreateEditGroupDialog/sub-components/GroupMemberRow/index.tsx
@@ -24,11 +24,10 @@
// 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 { memo } from "react";
import { ReactSVG } from "react-svg";
import { useTranslation } from "react-i18next";
-import RemoveReactSvgUrl from "PUBLIC_DIR/images/remove.react.svg?url";
-
import {
Avatar,
AvatarRole,
@@ -36,18 +35,16 @@ import {
} from "@docspace/shared/components/avatar";
import { getUserRole, getUserTypeLabel } from "@docspace/shared/utils/common";
import { TUser } from "@docspace/shared/api/people/types";
+import RemoveReactSvgUrl from "PUBLIC_DIR/images/remove.react.svg?url";
import * as Styled from "./index.styled";
interface GroupMemberRowProps {
groupMember: TUser;
- onClickRemove: () => void;
+ removeMember: (member: TUser) => void;
}
-const GroupMemberRow = ({
- groupMember,
- onClickRemove,
-}: GroupMemberRowProps) => {
+const GroupMemberRow = ({ groupMember, removeMember }: GroupMemberRowProps) => {
const { t } = useTranslation(["Common"]);
const role = getUserRole(groupMember);
@@ -68,6 +65,10 @@ const GroupMemberRow = ({
default:
}
+ const onRemove = () => {
+ removeMember(groupMember);
+ };
+
return (
);
};
-export default GroupMemberRow;
+export default memo(GroupMemberRow);
diff --git a/packages/client/src/components/dialogs/CreateEditGroupDialog/sub-components/GroupMembersList/GroupMembersList.tsx b/packages/client/src/components/dialogs/CreateEditGroupDialog/sub-components/GroupMembersList/GroupMembersList.tsx
new file mode 100644
index 0000000000..6d319fb4f6
--- /dev/null
+++ b/packages/client/src/components/dialogs/CreateEditGroupDialog/sub-components/GroupMembersList/GroupMembersList.tsx
@@ -0,0 +1,152 @@
+// (c) Copyright Ascensio System SIA 2009-2024
+//
+// This program is a free software product.
+// You can redistribute it and/or modify it under the terms
+// of the GNU Affero General Public License (AGPL) version 3 as published by the Free Software
+// Foundation. In accordance with Section 7(a) of the GNU AGPL its Section 15 shall be amended
+// to the effect that Ascensio System SIA expressly excludes the warranty of non-infringement of
+// any third-party rights.
+//
+// This program is distributed WITHOUT ANY WARRANTY, without even the implied warranty
+// of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For details, see
+// the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
+//
+// You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, EU, LV-1021.
+//
+// The interactive user interfaces in modified source and object code versions of the Program must
+// display Appropriate Legal Notices, as required under Section 5 of the GNU AGPL version 3.
+//
+// Pursuant to Section 7(b) of the License you must retain the original Product logo when
+// distributing the program. Pursuant to Section 7(e) we decline to grant you any rights under
+// trademark law for use of our trademarks.
+//
+// All the Product's GUI elements, including illustrations and icon sets, as well as technical writing
+// 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, { useCallback, useEffect, useState } from "react";
+import {
+ Index,
+ IndexRange,
+ InfiniteLoader,
+ List,
+ ListRowProps,
+ WindowScroller,
+} from "react-virtualized";
+import styled from "styled-components";
+
+import { TUser } from "@docspace/shared/api/people/types";
+import { RowLoader } from "@docspace/shared/skeletons/selector";
+import GroupMemberRow from "SRC_DIR/components/dialogs/CreateEditGroupDialog/sub-components/GroupMemberRow";
+
+const ROW_HEIGHT = 50;
+
+export const StyledList = styled(List)`
+ width: ${({ width }) => `${width - 16}px`} !important;
+
+ .group-member-row-loader {
+ padding: 0;
+ }
+`;
+
+interface GroupMembersListProps {
+ members: TUser[];
+ removeMember: (member: TUser) => void;
+ loadNextPage: (startIndex: number) => Promise;
+ hasNextPage: boolean;
+ total: number;
+}
+
+export const GroupMembersList = (props: GroupMembersListProps) => {
+ const { members, removeMember, loadNextPage, hasNextPage, total } = props;
+
+ const [scrollElement, setScrollElement] = useState(
+ null,
+ );
+ const [isNextPageLoading, setIsNextPageLoading] = useState(false);
+
+ const itemsCount = hasNextPage ? members.length + 1 : members.length;
+
+ const isItemLoaded = useCallback(
+ ({ index }: Index) => {
+ return !hasNextPage || index < itemsCount;
+ },
+ [hasNextPage, itemsCount],
+ );
+
+ const loadMoreItems = isNextPageLoading
+ ? async () => {}
+ : async ({ startIndex }: IndexRange) => {
+ setIsNextPageLoading(true);
+ await loadNextPage(startIndex - 1);
+ setIsNextPageLoading(false);
+ };
+
+ const renderRow = ({ key, index, style }: ListRowProps) => {
+ const item = members[index];
+
+ return (
+
+ {({ onRowsRendered, registerChild }) => (
+
+ {({ height, isScrolling, scrollTop }) => {
+ const scrollBodyRect =
+ scrollElement.children[0].getBoundingClientRect();
+
+ return (
+
+ )}
+
+ );
+};
diff --git a/packages/client/src/components/dialogs/CreateEditGroupDialog/sub-components/HeadOfGroupParam/SelectGroupManagerPanel.tsx b/packages/client/src/components/dialogs/CreateEditGroupDialog/sub-components/HeadOfGroupParam/SelectGroupManagerPanel.tsx
index a7b7b6d8c3..c61e38a9c2 100644
--- a/packages/client/src/components/dialogs/CreateEditGroupDialog/sub-components/HeadOfGroupParam/SelectGroupManagerPanel.tsx
+++ b/packages/client/src/components/dialogs/CreateEditGroupDialog/sub-components/HeadOfGroupParam/SelectGroupManagerPanel.tsx
@@ -25,8 +25,11 @@
// International. See the License terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
import { useTranslation } from "react-i18next";
+
import { ShareAccessRights } from "@docspace/shared/enums";
import { Portal } from "@docspace/shared/components/portal";
+import { TUser } from "@docspace/shared/api/people/types";
+
import AddUsersPanel from "../../../../panels/AddUsersPanel";
import { getAccessOptions } from "../../../../panels/InvitePanel/utils";
@@ -34,7 +37,7 @@ interface SelectGroupManagerPanelProps {
isVisible: boolean;
onClose: () => void;
onParentPanelClose: () => void;
- setGroupManager: (groupManager: object) => void;
+ setGroupManager: (groupManager: TUser) => void;
}
const SelectGroupManagerPanel = ({
@@ -46,7 +49,7 @@ const SelectGroupManagerPanel = ({
const { t } = useTranslation(["InviteDialog"]);
const accessOptions = getAccessOptions(t);
- const onSelectGroupManager = (newGroupManager: object[]) => {
+ const onSelectGroupManager = (newGroupManager: TUser[]) => {
setGroupManager(newGroupManager[0]);
};
diff --git a/packages/client/src/components/dialogs/CreateEditGroupDialog/sub-components/HeadOfGroupParam/index.tsx b/packages/client/src/components/dialogs/CreateEditGroupDialog/sub-components/HeadOfGroupParam/index.tsx
index c265296ef5..e321c94151 100644
--- a/packages/client/src/components/dialogs/CreateEditGroupDialog/sub-components/HeadOfGroupParam/index.tsx
+++ b/packages/client/src/components/dialogs/CreateEditGroupDialog/sub-components/HeadOfGroupParam/index.tsx
@@ -24,37 +24,28 @@
// 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 { useState } from "react";
import { useTranslation } from "react-i18next";
+
import { SelectorAddButton } from "@docspace/shared/components/selector-add-button";
-import * as Styled from "./index.styled";
+import { TUser } from "@docspace/shared/api/people/types";
import PlusSvgUrl from "PUBLIC_DIR/images/icons/16/button.plus.react.svg?url";
-import SelectGroupManagerPanel from "./SelectGroupManagerPanel";
+
+import * as Styled from "./index.styled";
import GroupMemberRow from "../GroupMemberRow";
interface HeadOfGroupProps {
- groupManager: object | null;
- setGroupManager: (groupManager: object | null) => void;
- groupMembers: object[] | null;
- setGroupMembers: (groupMembers: object[]) => void;
+ groupManager: TUser | null;
+ removeManager: () => void;
+ onShowSelectGroupManagerPanel: () => void;
}
const HeadOfGroup = ({
groupManager,
- setGroupManager,
- groupMembers,
- setGroupMembers,
+ removeManager,
onShowSelectGroupManagerPanel,
}: HeadOfGroupProps) => {
const { t } = useTranslation(["Common"]);
- const onRemoveGroupManager = () => {
- setGroupManager(null);
- setGroupMembers(
- groupMembers?.filter((gm) => gm.id !== groupManager!.id) || [],
- );
- };
-
return (
{t("Common:HeadOfGroup")}
@@ -67,7 +58,7 @@ const HeadOfGroup = ({
) : (
;
+ hasNextPage: boolean;
+ total: number;
+ }
+ | Partial<{
+ withInfiniteLoader: undefined;
+ loadNextPage: undefined;
+ hasNextPage: undefined;
+ total: undefined;
+ }>;
-interface MembersParamProps {
- groupManager: GroupMember | null;
- groupMembers: GroupMember[] | null;
- setGroupMembers: (groupMembers: GroupMember[]) => void;
+type MembersParamProps = {
+ groupManager: TUser | null;
+ groupMembers: TUser[] | null;
+ setGroupMembers: (groupMembers: TUser[]) => void;
onShowSelectMembersPanel: () => void;
-}
+ removeMember: (member: TUser) => void;
+} & InfiniteLoaderProps;
+
const MembersParam = ({
groupManager,
groupMembers,
- setGroupMembers,
onShowSelectMembersPanel,
+ withInfiniteLoader,
+ hasNextPage,
+ loadNextPage,
+ total,
+ removeMember,
}: MembersParamProps) => {
const { t } = useTranslation(["Common", "PeopleTranslation"]);
- const onRemoveUserById = useCallback(
- (id: string) => {
- const newGroupMembers = groupMembers?.filter((gm) => gm.id !== id);
- setGroupMembers(newGroupMembers || []);
- },
- [groupMembers, setGroupMembers],
- );
-
return (
{t("Common:Members")}
@@ -67,16 +78,27 @@ const MembersParam = ({
onRemoveUserById(member.id)}
- />
- ))}
+ {groupMembers ? (
+ withInfiniteLoader ? (
+
);
};
diff --git a/packages/client/src/components/dialogs/CreateEditGroupDialog/sub-components/MembersParam/SelectGroupMembersPanel.tsx b/packages/client/src/components/dialogs/CreateEditGroupDialog/sub-components/MembersSelector/MembersSelector.tsx
similarity index 67%
rename from packages/client/src/components/dialogs/CreateEditGroupDialog/sub-components/MembersParam/SelectGroupMembersPanel.tsx
rename to packages/client/src/components/dialogs/CreateEditGroupDialog/sub-components/MembersSelector/MembersSelector.tsx
index 6d09e4510e..8f38acc29b 100644
--- a/packages/client/src/components/dialogs/CreateEditGroupDialog/sub-components/MembersParam/SelectGroupMembersPanel.tsx
+++ b/packages/client/src/components/dialogs/CreateEditGroupDialog/sub-components/MembersSelector/MembersSelector.tsx
@@ -26,59 +26,38 @@
import React from "react";
import { useTranslation } from "react-i18next";
+
import { ShareAccessRights } from "@docspace/shared/enums";
-import { toastr } from "@docspace/shared/components/toast";
import { Portal } from "@docspace/shared/components/portal";
import { TUser } from "@docspace/shared/api/people/types";
-import { TSelectorItem } from "@docspace/shared/components/selector";
+
import AddUsersPanel from "../../../../panels/AddUsersPanel";
import { getAccessOptions } from "../../../../panels/InvitePanel/utils";
-interface SelectGroupMembersPanelProps {
+type MembersSelectorProps = {
isVisible: boolean;
onClose: () => void;
onParentPanelClose: () => void;
- groupManager?: TUser;
- groupMembers: TUser[];
- setGroupMembers: (groupMembers: (TUser | TSelectorItem)[]) => void;
-}
-const SelectGroupMembersPanel = ({
+ addMembers: (members: TUser[]) => void;
+} & (
+ | { checkIfUserInvited: (user: TUser) => boolean; invitedUsers?: undefined }
+ | { invitedUsers: string[]; checkIfUserInvited?: undefined }
+);
+
+export const MembersSelector = ({
isVisible,
- onClose,
+ addMembers,
onParentPanelClose,
- groupManager,
- groupMembers,
- setGroupMembers,
-}: SelectGroupMembersPanelProps) => {
+ onClose,
+ checkIfUserInvited,
+ invitedUsers,
+}: MembersSelectorProps) => {
const { t } = useTranslation(["InviteDialog"]);
const accessOptions = getAccessOptions(t, 5, false, true);
-
- const onAddGroupMembers = (newGroupMembers: TSelectorItem[]) => {
- const resultGroupMembers: (TUser | TSelectorItem)[] = [...groupMembers];
- let showErrorWasSelected = false;
-
- newGroupMembers.forEach((groupMember) => {
- if (groupMembers.findIndex((gm) => gm.id === groupMember.id) !== -1) {
- showErrorWasSelected = true;
- return;
- }
- resultGroupMembers.push(groupMember);
- });
-
- if (showErrorWasSelected) {
- toastr.warning("Some users have already been added");
- }
-
- setGroupMembers(resultGroupMembers);
- };
-
- const invitedUsers = React.useMemo(
- () => [...groupMembers].map((g) => g?.id),
- [groupMembers],
- );
-
- if (groupManager) invitedUsers.push(groupManager.id);
+ const invitedProps = checkIfUserInvited
+ ? { checkIfUserInvited }
+ : { invitedUsers };
return (
= new Map();
+
+ removedMembersMap: Map = new Map();
+
+ initialTotal: number = 0;
+
+ filter = AccountsFilter.getDefault();
+
+ peopleStore: PeopleStore;
+
+ constructor(peopleStore: PeopleStore) {
+ this.peopleStore = peopleStore;
+
+ makeAutoObservable(this);
+ }
+
+ initGroupData = async (group: TGroup) => {
+ try {
+ this.setGroup(group);
+ this.setTitle(group.name);
+
+ if (group.manager) {
+ this.setManager(group.manager);
+ }
+
+ this.filter.group = group.id;
+ this.filter.pageCount = 100;
+
+ await this.loadMembers(0);
+
+ this.setIsInit(true);
+ } catch (e) {
+ console.log(e);
+ }
+ };
+
+ resetGroupData = () => {
+ this.isInit = false;
+ this.group = null;
+ this.title = "";
+ this.manager = null;
+ this.members = null;
+ this.addedMembersMap = new Map();
+ this.removedMembersMap = new Map();
+ this.initialTotal = 0;
+ this.filter = AccountsFilter.getDefault();
+ };
+
+ loadMembers = async (startIndex: number) => {
+ try {
+ if (!this.group?.id) return;
+
+ this.filter.page = !startIndex ? 0 : this.filter.page + 1;
+
+ const res = await api.people.getUserList(this.filter);
+
+ const membersWithoutManager = res.items.filter(
+ (item) =>
+ item.id !== this.manager?.id || item.id !== this.group?.manager?.id,
+ );
+
+ this.setInitialTotal(res.total);
+
+ if (startIndex === 0 || !this.members) {
+ this.setMembers(membersWithoutManager);
+ } else {
+ this.setMembers([...this.members, ...membersWithoutManager]);
+ }
+ } catch (e) {
+ console.log(e);
+ }
+ };
+
+ submitChanges = async () => {
+ try {
+ if (!this.group) return;
+
+ const { updateGroup } = this.peopleStore.groupsStore! as GroupsStore;
+
+ const addedIds = Array.from(this.addedMembersMap.keys());
+ const removedIds = Array.from(this.removedMembersMap.keys());
+
+ await updateGroup(
+ this.group?.id,
+ this.title.trim(),
+ this.manager?.id,
+ addedIds,
+ removedIds,
+ );
+ } catch (e) {
+ console.log(e);
+ }
+ };
+
+ addManager = (manager: TUser) => {
+ this.removedMembersMap.delete(manager.id);
+ const alreadyMember = manager.groups?.find((g) => g.id === this.group?.id);
+
+ if (!alreadyMember) {
+ this.addedMembersMap.set(manager.id, manager);
+ }
+
+ if (this.members?.length) {
+ this.members = this.members.filter((member) => member.id !== manager.id);
+ }
+
+ this.manager = manager;
+ };
+
+ removeManager = () => {
+ if (!this.manager) return;
+
+ const wasAdded = this.addedMembersMap.delete(this.manager.id);
+
+ if (!wasAdded) {
+ this.removedMembersMap.set(this.manager.id, this.manager);
+ }
+
+ this.manager = null;
+ };
+
+ setIsInit = (value: boolean) => {
+ this.isInit = value;
+ };
+
+ setGroup = (group: TGroup) => {
+ this.group = group;
+ };
+
+ setTitle = (title: string) => {
+ this.title = title;
+ };
+
+ setManager = (manager: TUser | null) => {
+ this.manager = manager;
+ };
+
+ setMembers = (members: TUser[] | null) => {
+ this.members = members;
+ };
+
+ addMembers = (members: TUser[]) => {
+ members.forEach((member) => {
+ const wasRemoved = this.removedMembersMap.delete(member.id);
+
+ if (!wasRemoved) {
+ this.addedMembersMap.set(member.id, member);
+ }
+ });
+
+ this.members = this.members ? [...this.members, ...members] : members;
+ };
+
+ removeMember = (member: TUser) => {
+ const wasAdded = this.addedMembersMap.delete(member.id);
+
+ if (!wasAdded) {
+ this.removedMembersMap.set(member.id, member);
+ }
+
+ this.members = this.members?.filter((m) => m.id !== member.id) || null;
+ };
+
+ setInitialTotal = (total: number) => {
+ this.initialTotal = total;
+ };
+
+ get currentTotal() {
+ let total =
+ this.initialTotal +
+ this.addedMembersMap.size -
+ this.removedMembersMap.size;
+
+ const prevManager = this.group?.manager;
+ const newManager = this.manager;
+ const managerWasChanged = prevManager?.id !== newManager?.id;
+
+ if (prevManager && !managerWasChanged) {
+ total -= 1;
+ }
+
+ if (newManager && managerWasChanged) {
+ total -= 1;
+ }
+
+ return total;
+ }
+
+ get hasChanges() {
+ const titleWasChanged = this.title.trim() !== this.group?.name;
+ const managerWasChanged = this.group?.manager?.id !== this.manager?.id;
+
+ return (
+ titleWasChanged ||
+ managerWasChanged ||
+ this.addedMembersMap.size ||
+ this.removedMembersMap.size
+ );
+ }
+}
+
+export default EditGroupStore;
diff --git a/packages/client/src/store/GroupsStore.ts b/packages/client/src/store/GroupsStore.ts
index 398255f934..28a14c28b2 100644
--- a/packages/client/src/store/GroupsStore.ts
+++ b/packages/client/src/store/GroupsStore.ts
@@ -637,7 +637,7 @@ class GroupsStore {
updateGroup = async (
groupId: string,
groupName: string,
- groupManagerId: string,
+ groupManagerId: string | undefined,
membersToAdd: string[],
membersToRemove: string[],
) => {
diff --git a/packages/client/src/store/index.js b/packages/client/src/store/index.js
index 8d2478efe5..7a3f831d8d 100644
--- a/packages/client/src/store/index.js
+++ b/packages/client/src/store/index.js
@@ -80,6 +80,7 @@ import ImportAccountsStore from "./ImportAccountsStore";
import PluginStore from "./PluginStore";
import InfoPanelStore from "./InfoPanelStore";
import CampaignsStore from "./CampaignsStore";
+import EditGroupStore from "./EditGroupStore";
const selectedFolderStore = new SelectedFolderStore(settingsStore);
@@ -300,6 +301,8 @@ const storageManagement = new StorageManagement(
const campaignsStore = new CampaignsStore(settingsStore, userStore);
+const editGroupStore = new EditGroupStore(peopleStore);
+
const store = {
authStore,
userStore,
@@ -354,6 +357,7 @@ const store = {
pluginStore,
storageManagement,
campaignsStore,
+ editGroupStore,
};
export default store;
diff --git a/packages/shared/api/groups/index.ts b/packages/shared/api/groups/index.ts
index 25f72dc909..6d6d25e810 100644
--- a/packages/shared/api/groups/index.ts
+++ b/packages/shared/api/groups/index.ts
@@ -127,7 +127,7 @@ export const getGroupMembersInRoom = (
export const updateGroup = (
groupId: string,
groupName: string,
- groupManager: string,
+ groupManager: string | undefined,
membersToAdd: string[],
membersToRemove: string[],
) => {
diff --git a/packages/shared/api/groups/types.ts b/packages/shared/api/groups/types.ts
index e8d103736e..04ed62ef9c 100644
--- a/packages/shared/api/groups/types.ts
+++ b/packages/shared/api/groups/types.ts
@@ -30,7 +30,7 @@ import { ShareAccessRights } from "../../enums";
export type TGroup = {
category: string;
id: string;
- manager: TUser;
+ manager?: TUser;
name: string;
parent: string;
isGroup?: boolean;
diff --git a/packages/shared/components/selector/Selector.types.ts b/packages/shared/components/selector/Selector.types.ts
index 29bfd0a026..1e3714a6e4 100644
--- a/packages/shared/components/selector/Selector.types.ts
+++ b/packages/shared/components/selector/Selector.types.ts
@@ -30,6 +30,7 @@ import { MergeTypes, Nullable } from "../../types";
import { TFileSecurity, TFolderSecurity } from "../../api/files/types";
import { TRoomSecurity } from "../../api/rooms/types";
+import { TGroup } from "../../api/groups/types";
import { AvatarRole } from "../avatar";
import { TTabItem } from "../tabs";
@@ -394,6 +395,7 @@ type TSelectorItemEmpty = {
iconOriginal?: undefined;
role?: undefined;
email?: undefined;
+ groups?: TGroup[];
isOwner?: undefined;
isAdmin?: undefined;
isVisitor?: undefined;
@@ -438,6 +440,7 @@ export type TSelectorItemUser = MergeTypes<
avatar: string;
hasAvatar: boolean;
role: AvatarRole;
+ groups?: TGroup[];
access?: ShareAccessRights | string | number;
}
From 844daabd2ffea47c078b89bd1b8c8e1d722dd5d0 Mon Sep 17 00:00:00 2001
From: Aleksandr Lushkin
Date: Wed, 7 Aug 2024 17:43:06 +0200
Subject: [PATCH 15/45] Client: CreateGroupDialog: Fix create dialog after
rewriting edit dialog
---
.../CreateGroupDialog.tsx | 72 ++++++++++++++----
.../CreateEditGroupDialog/EditGroupDialog.tsx | 1 -
.../sub-components/CreateGroupDialogBody.tsx | 74 -------------------
.../sub-components/MembersParam/index.tsx | 2 -
.../create-components/SelectMembersPanel.tsx | 2 +-
.../CreateEditGroupDialog/types/index.tsx | 4 +-
packages/shared/api/groups/index.ts | 4 +-
7 files changed, 63 insertions(+), 96 deletions(-)
delete mode 100644 packages/client/src/components/dialogs/CreateEditGroupDialog/sub-components/CreateGroupDialogBody.tsx
diff --git a/packages/client/src/components/dialogs/CreateEditGroupDialog/CreateGroupDialog.tsx b/packages/client/src/components/dialogs/CreateEditGroupDialog/CreateGroupDialog.tsx
index 3c0d2bfdaf..7697abde48 100644
--- a/packages/client/src/components/dialogs/CreateEditGroupDialog/CreateGroupDialog.tsx
+++ b/packages/client/src/components/dialogs/CreateEditGroupDialog/CreateGroupDialog.tsx
@@ -25,17 +25,21 @@
// International. See the License terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
import { useState, ChangeEvent } from "react";
+import { useTranslation } from "react-i18next";
+import { useNavigate } from "react-router-dom";
+import { observer, inject } from "mobx-react";
+
import {
ModalDialog,
ModalDialogType,
} from "@docspace/shared/components/modal-dialog";
import { Button, ButtonSize } from "@docspace/shared/components/button";
import { toastr } from "@docspace/shared/components/toast";
-import { observer, inject } from "mobx-react";
-
-import { useTranslation } from "react-i18next";
-import { useNavigate } from "react-router-dom";
import { createGroup } from "@docspace/shared/api/groups";
+import { TUser } from "@docspace/shared/api/people/types";
+import PeopleStore from "SRC_DIR/store/PeopleStore";
+import GroupsStore from "SRC_DIR/store/GroupsStore";
+
import { StyledModal } from "./CreateEditGroupDialog.styled";
import { GroupParams } from "./types";
import GroupNameParam from "./sub-components/GroupNameParam";
@@ -69,10 +73,10 @@ const CreateGroupDialog = ({
const onChangeGroupName = (e: ChangeEvent) =>
setGroupParams({ ...groupParams, groupName: e.target.value });
- const setGroupManager = (groupManager: object | null) =>
+ const setGroupManager = (groupManager: TUser | null) =>
setGroupParams({ ...groupParams, groupManager });
- const setGroupMembers = (groupMembers: object[]) =>
+ const setGroupMembers = (groupMembers: TUser[]) =>
setGroupParams((prevState) => ({ ...prevState, groupMembers }));
const [selectGroupMangerPanelIsVisible, setSelectGroupMangerPanelIsVisible] =
@@ -89,6 +93,44 @@ const CreateGroupDialog = ({
const onShowSelectMembersPanel = () => setSelectMembersPanelIsVisible(true);
const onHideSelectMembersPanel = () => setSelectMembersPanelIsVisible(false);
+ const removeManager = () => {
+ setGroupManager(null);
+ setGroupMembers(
+ groupParams.groupMembers?.filter(
+ (gm) => gm.id !== groupParams.groupManager!.id,
+ ) || [],
+ );
+ };
+
+ const addMembers = (newGroupMembers: TUser[]) => {
+ const resultGroupMembers: TUser[] = [...groupParams.groupMembers];
+ let showErrorWasSelected = false;
+
+ newGroupMembers.forEach((groupMember) => {
+ if (
+ groupParams.groupMembers.findIndex((gm) => gm.id === groupMember.id) !==
+ -1
+ ) {
+ showErrorWasSelected = true;
+ return;
+ }
+ resultGroupMembers.push(groupMember);
+ });
+
+ if (showErrorWasSelected) {
+ toastr.warning("Some users have already been added");
+ }
+
+ setGroupMembers(resultGroupMembers);
+ };
+
+ const removeMember = (member: TUser) => {
+ const newGroupMembers = groupParams.groupMembers?.filter(
+ (gm) => gm.id !== member.id,
+ );
+ setGroupMembers(newGroupMembers || []);
+ };
+
const onCreateGroup = async () => {
setIsLoading(true);
@@ -127,15 +169,13 @@ const CreateGroupDialog = ({
/>
>;
- onClose: () => void;
-}
-
-const CreateGroupDialogBody = ({
- groupParams,
- setGroupParams,
- onClose,
-}: CreateGroupDialogBodyProps) => {
- const onChangeGroupName = (e: ChangeEvent) =>
- setGroupParams({ ...groupParams, groupName: e.target.value });
-
- const setGroupManager = (groupManager: object) =>
- setGroupParams({ ...groupParams, groupManager });
-
- const setGroupMembers = (groupMembers: object[]) =>
- setGroupParams({ ...groupParams, groupMembers });
-
- return (
- <>
- ;
};
// * Read
From 3be90245558cfe71c6bb17d2bbb78c6a4c8e7048 Mon Sep 17 00:00:00 2001
From: Aleksandr Lushkin
Date: Thu, 8 Aug 2024 15:11:17 +0200
Subject: [PATCH 16/45] Client: Groups: Fix loaders
---
.../CreateEditGroupDialog/EditGroupDialog.tsx | 92 +++++++++++----
.../Home/InfoPanel/Body/views/Groups/index.js | 110 +++++++++++-------
2 files changed, 137 insertions(+), 65 deletions(-)
diff --git a/packages/client/src/components/dialogs/CreateEditGroupDialog/EditGroupDialog.tsx b/packages/client/src/components/dialogs/CreateEditGroupDialog/EditGroupDialog.tsx
index a79cb2d6d5..bfc3b0084d 100644
--- a/packages/client/src/components/dialogs/CreateEditGroupDialog/EditGroupDialog.tsx
+++ b/packages/client/src/components/dialogs/CreateEditGroupDialog/EditGroupDialog.tsx
@@ -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 { ChangeEvent, useEffect, useState } from "react";
+import { ChangeEvent, useEffect, useRef, useState } from "react";
import { inject, observer } from "mobx-react";
import { useTranslation } from "react-i18next";
@@ -34,6 +34,10 @@ import {
ModalDialogType,
} from "@docspace/shared/components/modal-dialog";
import { TGroup } from "@docspace/shared/api/groups/types";
+import {
+ MIN_LOADER_TIMER,
+ SHOW_LOADER_TIMER,
+} from "@docspace/shared/selectors/Files/FilesSelector.constants";
import EditGroupStore from "SRC_DIR/store/EditGroupStore";
import { StyledModal } from "./CreateEditGroupDialog.styled";
@@ -101,6 +105,10 @@ const EditGroupDialog = ({
useState(false);
const [selectMembersPanelIsVisible, setSelectMembersPanelIsVisible] =
useState(false);
+ const [showLoader, setShowLoader] = useState(false);
+
+ const loaderTimeout = useRef(null);
+ const startLoaderTime = useRef(null);
const onChangeGroupName = (e: ChangeEvent) => {
setTitle(e.target.value);
@@ -136,6 +144,38 @@ const EditGroupDialog = ({
};
}, []);
+ useEffect(() => {
+ if (!isInit) {
+ loaderTimeout.current = setTimeout(() => {
+ startLoaderTime.current = new Date();
+ setShowLoader(true);
+ }, SHOW_LOADER_TIMER);
+ } else if (startLoaderTime.current) {
+ const currentDate = new Date();
+
+ const ms = Math.abs(
+ startLoaderTime.current.getTime() - currentDate.getTime(),
+ );
+
+ if (ms >= MIN_LOADER_TIMER) {
+ startLoaderTime.current = null;
+ return setShowLoader(false);
+ }
+
+ setTimeout(() => {
+ if (isInit) {
+ startLoaderTime.current = null;
+ setShowLoader(false);
+ }
+ }, MIN_LOADER_TIMER - ms);
+
+ loaderTimeout.current = null;
+ } else if (loaderTimeout.current) {
+ clearTimeout(loaderTimeout.current);
+ loaderTimeout.current = null;
+ }
+ }, [isInit]);
+
const notEnoughParamsToEdit = !title || (!manager && !members?.length);
return (
@@ -152,31 +192,33 @@ const EditGroupDialog = ({
- {isInit ? (
- <>
-
diff --git a/packages/client/src/pages/Home/InfoPanel/Body/views/Groups/index.js b/packages/client/src/pages/Home/InfoPanel/Body/views/Groups/index.js
index f250e63b2b..ce23ad8fb3 100644
--- a/packages/client/src/pages/Home/InfoPanel/Body/views/Groups/index.js
+++ b/packages/client/src/pages/Home/InfoPanel/Body/views/Groups/index.js
@@ -27,13 +27,16 @@
import { inject, observer } from "mobx-react";
import { withTranslation } from "react-i18next";
import { useParams } from "react-router-dom";
-import { useState, useEffect } from "react";
+import { useState, useEffect, useRef } from "react";
import withLoader from "@docspace/client/src/HOCs/withLoader";
import InfoPanelViewLoader from "@docspace/shared/skeletons/info-panel/body";
import api from "@docspace/shared/api";
import AccountsFilter from "@docspace/shared/api/people/filter";
-import { MIN_LOADER_TIMER } from "@docspace/shared/selectors/Files/FilesSelector.constants";
+import {
+ MIN_LOADER_TIMER,
+ SHOW_LOADER_TIMER,
+} from "@docspace/shared/selectors/Files/FilesSelector.constants";
import GroupMember from "./GroupMember";
import * as Styled from "../../styles/groups.styled";
@@ -47,11 +50,14 @@ const Groups = ({
infoPanelSelectedGroup,
setInfoPanelSelectedGroup,
}) => {
- const [isShowLoader, setIsShowLoader] = useState(false);
- const [areMembersLoading, setAreMembersLoading] = useState(false);
+ const [isFirstLoad, setIsFirstLoad] = useState(true);
+ const [showLoader, setShowLoader] = useState(false);
const [groupMembers, setGroupMembers] = useState(null);
const [total, setTotal] = useState(0);
+ const startLoader = useRef(null);
+ const loaderTimeout = useRef(null);
+
const { groupId: paramsGroupId } = useParams();
const isInsideGroup = !!paramsGroupId;
@@ -63,13 +69,7 @@ const Groups = ({
const groupManager = group?.manager;
const loadNextPage = async (startIndex) => {
- const startLoadingTime = new Date();
-
try {
- if (startIndex === 0) {
- setAreMembersLoading(true);
- }
-
const pageCount = 100;
const filter = AccountsFilter.getDefault();
filter.group = groupId;
@@ -91,21 +91,48 @@ const Groups = ({
} catch (e) {
console.log(e);
} finally {
- const nowDate = new Date();
- const diff = Math.abs(nowDate.getTime() - startLoadingTime.getTime());
-
- if (diff < MIN_LOADER_TIMER) {
- setTimeout(() => {
- setAreMembersLoading(false);
- }, MIN_LOADER_TIMER - diff);
- } else {
- setAreMembersLoading(false);
+ if (startIndex === 0) {
+ setIsFirstLoad(false);
}
}
};
+ const calculateLoader = () => {
+ if (isFirstLoad) {
+ loaderTimeout.current = setTimeout(() => {
+ startLoader.current = new Date();
+ setShowLoader(true);
+ }, SHOW_LOADER_TIMER);
+ } else if (startLoader.current) {
+ const currentDate = new Date();
+
+ const ms = Math.abs(
+ startLoader.current.getTime() - currentDate.getTime(),
+ );
+
+ if (ms >= MIN_LOADER_TIMER) {
+ startLoader.current = null;
+ return setShowLoader(false);
+ }
+
+ setTimeout(() => {
+ startLoader.current = null;
+ setShowLoader(false);
+ }, MIN_LOADER_TIMER - ms);
+
+ loaderTimeout.current = null;
+ } else if (loaderTimeout.current) {
+ clearTimeout(loaderTimeout.current);
+ loaderTimeout.current = null;
+ }
+ };
+
useFetchGroup(groupId, group?.id, setGroup);
+ useEffect(() => {
+ setIsFirstLoad(true);
+ }, [infoPanelSelection.id]);
+
useEffect(() => {
if (group) {
loadNextPage(0);
@@ -113,35 +140,38 @@ const Groups = ({
}, [group]);
useEffect(() => {
- const showLoaderTimer = setTimeout(() => setIsShowLoader(true), 500);
- return () => clearTimeout(showLoaderTimer);
+ calculateLoader();
+ }, [isFirstLoad]);
+
+ useEffect(() => {
+ return () => {
+ loaderTimeout.current = null;
+ };
}, []);
- if (!group) {
- if (isShowLoader)
- return (
-
-
- );
- return null;
+ if (showLoader) {
+ return (
+
+
+ );
}
const totalWithoutManager = groupManager ? total - 1 : total;
return (
- {groupManager &&
);
From b2e08f0c2a1a9e12b80d0542eea5185a4cbbde68 Mon Sep 17 00:00:00 2001
From: Aleksandr Lushkin
Date: Thu, 8 Aug 2024 18:45:38 +0200
Subject: [PATCH 17/45] Client: InfoPanel: Groups: Add request cancelling to
prevent adding members from previous selected group
---
.../pages/Home/InfoPanel/Body/views/Groups/index.js | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/packages/client/src/pages/Home/InfoPanel/Body/views/Groups/index.js b/packages/client/src/pages/Home/InfoPanel/Body/views/Groups/index.js
index ce23ad8fb3..09b3f47a4a 100644
--- a/packages/client/src/pages/Home/InfoPanel/Body/views/Groups/index.js
+++ b/packages/client/src/pages/Home/InfoPanel/Body/views/Groups/index.js
@@ -55,6 +55,7 @@ const Groups = ({
const [groupMembers, setGroupMembers] = useState(null);
const [total, setTotal] = useState(0);
+ const abortControllerRef = useRef(new AbortController());
const startLoader = useRef(null);
const loaderTimeout = useRef(null);
@@ -70,13 +71,18 @@ const Groups = ({
const loadNextPage = async (startIndex) => {
try {
+ abortControllerRef.current = new AbortController();
+
const pageCount = 100;
const filter = AccountsFilter.getDefault();
filter.group = groupId;
filter.page = startIndex / pageCount;
filter.pageCount = pageCount;
- const res = await api.people.getUserList(filter);
+ const res = await api.people.getUserList(
+ filter,
+ abortControllerRef.current.signal,
+ );
const membersWithoutManager = groupManager
? res.items.filter((item) => item.id !== groupManager.id)
@@ -137,6 +143,10 @@ const Groups = ({
if (group) {
loadNextPage(0);
}
+
+ return () => {
+ abortControllerRef.current.abort();
+ };
}, [group]);
useEffect(() => {
From 717d0c86dda0fa869e927cb7c170e3620448d000 Mon Sep 17 00:00:00 2001
From: Akmal Isomadinov
Date: Fri, 9 Aug 2024 17:38:13 +0500
Subject: [PATCH 18/45] Web:EmptyContainer Fixed translation
---
.../EmptyViewContainer/EmptyViewContainer.helpers.tsx | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/packages/client/src/components/EmptyContainer/sub-components/EmptyViewContainer/EmptyViewContainer.helpers.tsx b/packages/client/src/components/EmptyContainer/sub-components/EmptyViewContainer/EmptyViewContainer.helpers.tsx
index a0d86182e1..e9662c368c 100644
--- a/packages/client/src/components/EmptyContainer/sub-components/EmptyViewContainer/EmptyViewContainer.helpers.tsx
+++ b/packages/client/src/components/EmptyContainer/sub-components/EmptyViewContainer/EmptyViewContainer.helpers.tsx
@@ -350,7 +350,9 @@ export const getOptions = (
t("EmptyView:UploadFromPortalTitle", {
productName: t("Common:ProductName"),
}),
- t("EmptyView:UploadPDFFormOptionDescription"),
+ t("EmptyView:UploadPDFFormOptionDescription", {
+ productName: t("Common:ProductName"),
+ }),
FilterType.PDFForm,
);
From 00ee68c59df1d2d83064bddad82f614d3abb6faf Mon Sep 17 00:00:00 2001
From: Aleksandr Lushkin
Date: Fri, 9 Aug 2024 14:49:42 +0200
Subject: [PATCH 19/45] Client: AddUsersPanel: Fix loader padding
---
packages/client/src/components/panels/AddUsersPanel/index.tsx | 1 +
1 file changed, 1 insertion(+)
diff --git a/packages/client/src/components/panels/AddUsersPanel/index.tsx b/packages/client/src/components/panels/AddUsersPanel/index.tsx
index 8ae26aa7b2..d1d1e51fbf 100644
--- a/packages/client/src/components/panels/AddUsersPanel/index.tsx
+++ b/packages/client/src/components/panels/AddUsersPanel/index.tsx
@@ -573,6 +573,7 @@ const AddUsersPanel = ({
isSearchLoading={isInit}
rowLoader={
Date: Fri, 9 Aug 2024 19:03:59 +0500
Subject: [PATCH 20/45] Web:FilesActionStore Fixed closing the media viewer
when deleting the last item
---
packages/client/src/store/FilesActionsStore.js | 10 ----------
1 file changed, 10 deletions(-)
diff --git a/packages/client/src/store/FilesActionsStore.js b/packages/client/src/store/FilesActionsStore.js
index 11fc69fd0c..1349a9ec62 100644
--- a/packages/client/src/store/FilesActionsStore.js
+++ b/packages/client/src/store/FilesActionsStore.js
@@ -155,13 +155,6 @@ class FilesActionStore {
this.isBulkDownload = isBulkDownload;
};
- isMediaOpen = () => {
- const { visible, setMediaViewerData, playlist } = this.mediaViewerDataStore;
- if (visible && playlist.length === 1) {
- setMediaViewerData({ visible: false, id: null });
- }
- };
-
updateCurrentFolder = (fileIds, folderIds, clearSelection, operationId) => {
const { clearSecondaryProgressData } =
this.uploadDataStore.secondaryProgressDataStore;
@@ -390,8 +383,6 @@ class FilesActionStore {
addActiveItems(null, folderIds, destFolderId);
if (folderIds.length || fileIds.length) {
- this.isMediaOpen();
-
try {
this.filesStore.setOperationAction(true);
this.setGroupMenuBlocked(true);
@@ -852,7 +843,6 @@ class FilesActionStore {
if (isFile) {
addActiveItems([itemId], null, destFolderId);
- this.isMediaOpen();
return deleteFile(itemId)
.then(async (res) => {
if (res[0]?.error) return Promise.reject(res[0].error);
From 810b20ca5fc84fe4a8e2c7b38312d20239c35165 Mon Sep 17 00:00:00 2001
From: Timofey Boyko
Date: Fri, 9 Aug 2024 17:11:10 +0300
Subject: [PATCH 21/45] Login: return select language for mobile
---
packages/login/src/components/SimpleNav.tsx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/packages/login/src/components/SimpleNav.tsx b/packages/login/src/components/SimpleNav.tsx
index f780bdb2da..6aa8b78a5a 100644
--- a/packages/login/src/components/SimpleNav.tsx
+++ b/packages/login/src/components/SimpleNav.tsx
@@ -73,7 +73,7 @@ const SimpleNav = ({}: SimpleNavProps) => {
return (
- {/*
);
};
From 4c814ae6222445a2856cbc3c1b07715c6d3c0faf Mon Sep 17 00:00:00 2001
From: gopienkonikita
Date: Fri, 9 Aug 2024 17:20:27 +0300
Subject: [PATCH 22/45] Web: Files: SimulatePassword: fixed crash
---
packages/client/src/components/SimulatePassword/index.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/packages/client/src/components/SimulatePassword/index.js b/packages/client/src/components/SimulatePassword/index.js
index 395e497177..e8ded4a622 100644
--- a/packages/client/src/components/SimulatePassword/index.js
+++ b/packages/client/src/components/SimulatePassword/index.js
@@ -145,7 +145,7 @@ const SimulatePassword = memo(
}, [isDisabled]);
useEffect(() => {
- setPassword(inputValue);
+ if (inputValue) setPassword(inputValue);
}, [inputValue]);
return (
From 656e7dd2801928e3522cbc956a754b20ce63890c Mon Sep 17 00:00:00 2001
From: gopienkonikita
Date: Fri, 9 Aug 2024 17:33:00 +0300
Subject: [PATCH 23/45] Web: Files: InfoPanel: fixed public icon
---
.../Body/sub-components/ItemTitle/Rooms/index.js | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/packages/client/src/pages/Home/InfoPanel/Body/sub-components/ItemTitle/Rooms/index.js b/packages/client/src/pages/Home/InfoPanel/Body/sub-components/ItemTitle/Rooms/index.js
index 6302ffb2b0..d96f23599d 100644
--- a/packages/client/src/pages/Home/InfoPanel/Body/sub-components/ItemTitle/Rooms/index.js
+++ b/packages/client/src/pages/Home/InfoPanel/Body/sub-components/ItemTitle/Rooms/index.js
@@ -52,7 +52,7 @@ const RoomsItemHeader = ({
setSelection,
setBufferSelection,
isArchive,
- hasLinks,
+ isShared,
showSearchBlock,
setShowSearchBlock,
roomType,
@@ -70,7 +70,7 @@ const RoomsItemHeader = ({
(selection.roomType === RoomsType.PublicRoom ||
selection.roomType === RoomsType.FormRoom ||
selection.roomType === RoomsType.CustomRoom) &&
- hasLinks;
+ isShared;
const badgeUrl = showPlanetIcon ? Planet12ReactSvgUrl : null;
const isRoomMembersPanel = selection?.isRoom && roomsView === "info_members";
@@ -161,7 +161,6 @@ export default inject(
selectedFolderStore,
filesStore,
infoPanelStore,
- publicRoomStore,
}) => {
const {
infoPanelSelection,
@@ -170,7 +169,6 @@ export default inject(
showSearchBlock,
setShowSearchBlock,
} = infoPanelStore;
- const { externalLinks } = publicRoomStore;
const selection = infoPanelSelection.length > 1 ? null : infoPanelSelection;
const isArchive = selection?.rootFolderType === FolderType.Archive;
@@ -196,7 +194,7 @@ export default inject(
setSelection: filesStore.setSelection,
setBufferSelection: filesStore.setBufferSelection,
isArchive,
- hasLinks: externalLinks.length,
+ isShared: selection?.shared,
roomType,
};
},
From 21d08cc69194017cb8c4dcdecbbbbdda17b3fcb9 Mon Sep 17 00:00:00 2001
From: Vlada Gazizova <94864088+gazizova-vlada@users.noreply.github.com>
Date: Fri, 9 Aug 2024 17:41:52 +0300
Subject: [PATCH 24/45] Fixed Bug 69577: Srv: Branding. Blank page for
"Feedback & Support" when "Show link to Help Center" is disabled
---
.../common/Branding/additionalResources.js | 12 +++++++-----
packages/shared/api/settings/index.ts | 10 ++--------
2 files changed, 9 insertions(+), 13 deletions(-)
diff --git a/packages/client/src/pages/PortalSettings/categories/common/Branding/additionalResources.js b/packages/client/src/pages/PortalSettings/categories/common/Branding/additionalResources.js
index 3bf68280bf..f7d3cd0e19 100644
--- a/packages/client/src/pages/PortalSettings/categories/common/Branding/additionalResources.js
+++ b/packages/client/src/pages/PortalSettings/categories/common/Branding/additionalResources.js
@@ -187,12 +187,14 @@ const AdditionalResources = (props) => {
const onSave = useCallback(async () => {
setIsLoading(true);
+ const settings = JSON.parse(JSON.stringify(additionalResourcesData));
+
+ settings.feedbackAndSupportEnabled = feedbackAndSupportEnabled;
+ settings.videoGuidesEnabled = videoGuidesEnabled;
+ settings.helpCenterEnabled = helpCenterEnabled;
+
await api.settings
- .setAdditionalResources(
- feedbackAndSupportEnabled,
- videoGuidesEnabled,
- helpCenterEnabled,
- )
+ .setAdditionalResources(settings)
.then(() => {
toastr.success(t("Settings:SuccessfullySaveSettingsMessage"));
})
diff --git a/packages/shared/api/settings/index.ts b/packages/shared/api/settings/index.ts
index 8f3b5919ba..395c38dbad 100644
--- a/packages/shared/api/settings/index.ts
+++ b/packages/shared/api/settings/index.ts
@@ -407,16 +407,10 @@ export async function getCustomSchemaList() {
}
export function setAdditionalResources(
- feedbackAndSupportEnabled,
- videoGuidesEnabled,
- helpCenterEnabled,
+ additionalResources: TAdditionalResources,
) {
const data = {
- settings: {
- helpCenterEnabled,
- feedbackAndSupportEnabled,
- videoGuidesEnabled,
- },
+ settings: additionalResources,
};
return request({
From 4ea0f130b3462c03777314d44c153b1414ce1a17 Mon Sep 17 00:00:00 2001
From: gopienkonikita
Date: Fri, 9 Aug 2024 17:54:50 +0300
Subject: [PATCH 25/45] Fix Bug 69656 - Rooms.AsNew.Media. Fixed opening of
media files
---
.../components/panels/NewFilesPanel/index.js | 47 +++----------------
1 file changed, 6 insertions(+), 41 deletions(-)
diff --git a/packages/client/src/components/panels/NewFilesPanel/index.js b/packages/client/src/components/panels/NewFilesPanel/index.js
index 26965d6bbf..2a65bf707e 100644
--- a/packages/client/src/components/panels/NewFilesPanel/index.js
+++ b/packages/client/src/components/panels/NewFilesPanel/index.js
@@ -52,6 +52,7 @@ import { StyledNewFilesBody, StyledLink } from "../StyledPanels";
import withLoader from "../../../HOCs/withLoader";
import config from "PACKAGE_FILE";
+import { MEDIA_VIEW_URL } from "@docspace/shared/constants";
const NewFilesPanel = (props) => {
const {
@@ -60,8 +61,6 @@ const NewFilesPanel = (props) => {
getFolderIcon,
newFiles,
markAsRead,
- setMediaViewerData,
- currentFolderId,
setIsLoading,
t,
visible,
@@ -203,40 +202,10 @@ const NewFilesPanel = (props) => {
}
if (isMedia) {
- if (currentFolderId !== item.folderId) {
- const categoryType = getCategoryTypeByFolderType(
- rootFolderType,
- item.folderId,
- );
-
- const state = {
- title: "",
- rootFolderType,
-
- isRoot: false,
- };
- setIsLoading(true);
-
- const url = getCategoryUrl(categoryType, item.folderId);
-
- const filter = FilesFilter.getDefault();
- filter.folder = item.folderId;
-
- window.DocSpace.navigate(`${url}?${filter.toUrlParams()}`, { state });
-
- const mediaItem = { visible: true, id };
- setMediaViewerData(mediaItem);
-
- setInProgress(false);
- onClose();
- } else {
- const mediaItem = { visible: true, id };
- setMediaViewerData(mediaItem);
-
- return onClose();
- }
-
- return;
+ return window.open(
+ combineUrl(MEDIA_VIEW_URL, id),
+ openOnNewPage ? "_blank" : "_self",
+ );
}
if (fileItemsList && enablePlugins) {
@@ -335,7 +304,6 @@ export default inject(
filesStore,
mediaViewerDataStore,
filesActionsStore,
- selectedFolderStore,
dialogsStore,
filesSettingsStore,
clientLoadingStore,
@@ -349,10 +317,9 @@ export default inject(
setIsSectionFilterLoading(param);
};
- const { setMediaViewerData, setCurrentItem } = mediaViewerDataStore;
+ const { setCurrentItem } = mediaViewerDataStore;
const { getIcon, getFolderIcon, openOnNewPage } = filesSettingsStore;
const { markAsRead } = filesActionsStore;
- const { id: currentFolderId } = selectedFolderStore;
const {
setNewFilesPanelVisible,
@@ -371,8 +338,6 @@ export default inject(
newFilesIds,
isLoading,
setCurrentItem,
- currentFolderId,
- setMediaViewerData,
getIcon,
getFolderIcon,
markAsRead,
From d61e5aaa8b69709ef847f6f1358d960a26141357 Mon Sep 17 00:00:00 2001
From: gopienkonikita
Date: Sat, 10 Aug 2024 09:02:49 +0300
Subject: [PATCH 26/45] Web: Files: SimulatePassword: fix
---
packages/client/src/components/SimulatePassword/index.js | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/packages/client/src/components/SimulatePassword/index.js b/packages/client/src/components/SimulatePassword/index.js
index e8ded4a622..8529c30515 100644
--- a/packages/client/src/components/SimulatePassword/index.js
+++ b/packages/client/src/components/SimulatePassword/index.js
@@ -145,7 +145,9 @@ const SimulatePassword = memo(
}, [isDisabled]);
useEffect(() => {
- if (inputValue) setPassword(inputValue);
+ if (inputValue !== undefined) {
+ setPassword(inputValue);
+ }
}, [inputValue]);
return (
From 6f53b26ec3a12196c88dbb910b0f5ab3e28526ff Mon Sep 17 00:00:00 2001
From: Timofey Boyko
Date: Mon, 12 Aug 2024 13:15:14 +0300
Subject: [PATCH 27/45] Bug 69629 - Accounts. The language selection window
expands when you change the width of the browser window when the dark theme
is enabled
---
packages/shared/components/drop-down/DropDown.styled.ts | 3 ++-
.../shared/components/language-combobox/LanguageCombobox.tsx | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/packages/shared/components/drop-down/DropDown.styled.ts b/packages/shared/components/drop-down/DropDown.styled.ts
index 69bd55f1c1..4fa68fb4af 100644
--- a/packages/shared/components/drop-down/DropDown.styled.ts
+++ b/packages/shared/components/drop-down/DropDown.styled.ts
@@ -93,6 +93,7 @@ const StyledDropdown = styled.div<{
props.zIndex ? props.zIndex : props.theme.dropDown.zIndex};
display: ${(props) =>
props.open ? (props.columnCount ? "block" : "table") : "none"};
+ table-layout: fixed;
${(props) =>
!props.isDropdownReady &&
@@ -105,7 +106,7 @@ const StyledDropdown = styled.div<{
border: ${(props) => props.theme.dropDown.border};
border-radius: ${(props) => props.theme.dropDown.borderRadius};
-moz-border-radius: ${(props) => props.theme.dropDown.borderRadius};
- -webkit-border-radius: ${(props) => props.theme.dropDown.borderRadius};
+ -webkit-border-radius: ${(props) => props.theme.dropDown.borderRadius};dropDownMaxHeight
box-shadow: ${(props) => props.theme.dropDown.boxShadow};
-moz-box-shadow: ${(props) => props.theme.dropDown.boxShadow};
-webkit-box-shadow: ${(props) => props.theme.dropDown.boxShadow};
diff --git a/packages/shared/components/language-combobox/LanguageCombobox.tsx b/packages/shared/components/language-combobox/LanguageCombobox.tsx
index 27b2a2864a..d28925944c 100644
--- a/packages/shared/components/language-combobox/LanguageCombobox.tsx
+++ b/packages/shared/components/language-combobox/LanguageCombobox.tsx
@@ -74,7 +74,7 @@ const LanguageCombobox = (props: ComboboxProps) => {
dropDownMaxHeight={300}
fillIcon={false}
displaySelectedOption
- manualWidth="41px"
+ manualWidth="42px"
noBorder={false}
type="onlyIcon"
optionStyle={{ padding: "0 8px" }}
From 9ba016ba358c0d732d010b236df47228ca64f0d0 Mon Sep 17 00:00:00 2001
From: Aleksandr Lushkin
Date: Mon, 12 Aug 2024 12:37:23 +0200
Subject: [PATCH 28/45] Client: EditGroupMembersDialog: Add email to member row
---
.../sub-components/GroupMember/index.styled.ts | 15 ++++++++++++++-
.../sub-components/GroupMember/index.tsx | 6 +++++-
2 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/packages/client/src/components/dialogs/EditGroupMembersDialog/sub-components/GroupMember/index.styled.ts b/packages/client/src/components/dialogs/EditGroupMembersDialog/sub-components/GroupMember/index.styled.ts
index f3e0e01173..61a072612b 100644
--- a/packages/client/src/components/dialogs/EditGroupMembersDialog/sub-components/GroupMember/index.styled.ts
+++ b/packages/client/src/components/dialogs/EditGroupMembersDialog/sub-components/GroupMember/index.styled.ts
@@ -42,11 +42,15 @@ export const GroupMember = styled.div<{ isExpect: boolean }>`
overflow: auto;
}
- .name-wrapper,
+ .info,
.role-email {
display: flex;
}
+ .info {
+ flex-direction: column;
+ }
+
.name {
font-weight: 600;
font-size: 14px;
@@ -59,6 +63,15 @@ export const GroupMember = styled.div<{ isExpect: boolean }>`
props.isExpect && `color: ${props.theme.infoPanel.members.isExpectName}`};
}
+ .email {
+ color: ${({ theme }) => theme.sideBarRow.metaDataColor};
+ font-size: 12px;
+ line-height: 16px;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ }
+
.me-label {
font-weight: 600;
font-size: 14px;
diff --git a/packages/client/src/components/dialogs/EditGroupMembersDialog/sub-components/GroupMember/index.tsx b/packages/client/src/components/dialogs/EditGroupMembersDialog/sub-components/GroupMember/index.tsx
index 081701f4ea..7925f15b08 100644
--- a/packages/client/src/components/dialogs/EditGroupMembersDialog/sub-components/GroupMember/index.tsx
+++ b/packages/client/src/components/dialogs/EditGroupMembersDialog/sub-components/GroupMember/index.tsx
@@ -131,13 +131,17 @@ const GroupMember = ({ member, infoPanelSelection }: GroupMemberProps) => {
/>
+ {item ? (
+
+ );
+ };
+
+ useEffect(() => {
+ const scrollEl = document.querySelector(".info-panel-scroll");
+
+ if (scrollEl) {
+ setScrollElement(scrollEl as HTMLDivElement);
+ }
+ }, []);
+
+ if (!scrollElement) {
+ return null;
+ }
+
+ return (
+
+
+
+
+
+
+
+
+
+ {item ? (
+
+ );
+ };
+
+ useEffect(() => {
+ const scrollEl = document.querySelector(
+ "#modal-scroll > .scroll-wrapper > .scroller",
+ );
+
+ if (scrollEl) {
+ setScrollElement(scrollEl as HTMLDivElement);
+ }
+ }, []);
+
+ if (!scrollElement) {
+ return null;
+ }
+
+ return (
+ {t("PeopleTranslations:AddMembers")}
- {groupMembers &&
- groupMembers
- .filter((member) => member.id !== groupManager?.id)
- .map((member) => (
-
-
Date: Mon, 12 Aug 2024 13:04:37 +0200
Subject: [PATCH 29/45] Client: InfoPanel: Groups: Fix wrong filter page
---
.../client/src/pages/Home/InfoPanel/Body/views/Groups/index.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/packages/client/src/pages/Home/InfoPanel/Body/views/Groups/index.js b/packages/client/src/pages/Home/InfoPanel/Body/views/Groups/index.js
index 09b3f47a4a..78361e93e3 100644
--- a/packages/client/src/pages/Home/InfoPanel/Body/views/Groups/index.js
+++ b/packages/client/src/pages/Home/InfoPanel/Body/views/Groups/index.js
@@ -76,7 +76,7 @@ const Groups = ({
const pageCount = 100;
const filter = AccountsFilter.getDefault();
filter.group = groupId;
- filter.page = startIndex / pageCount;
+ filter.page = Math.ceil(startIndex / pageCount);
filter.pageCount = pageCount;
const res = await api.people.getUserList(
From a99de259cf71fa6c132f108fb5f9b2446abddd7f Mon Sep 17 00:00:00 2001
From: Alexey Safronov
Date: Mon, 12 Aug 2024 15:21:29 +0400
Subject: [PATCH 30/45] Fix bug 66831 - Rooms: Invite via link: Request failed
with status code 403
---
.../sub-components/ExternalLinks.js | 32 +++++++++++++------
1 file changed, 22 insertions(+), 10 deletions(-)
diff --git a/packages/client/src/components/panels/InvitePanel/sub-components/ExternalLinks.js b/packages/client/src/components/panels/InvitePanel/sub-components/ExternalLinks.js
index 3157df9554..a247277c03 100644
--- a/packages/client/src/components/panels/InvitePanel/sub-components/ExternalLinks.js
+++ b/packages/client/src/components/panels/InvitePanel/sub-components/ExternalLinks.js
@@ -66,25 +66,36 @@ const ExternalLinks = ({
isMobileView,
getPortalInviteLink,
}) => {
+ const [isLinksToggling, setIsLinksToggling] = useState(false);
+
const [actionLinksVisible, setActionLinksVisible] = useState(false);
const inputsRef = useRef();
const toggleLinks = async (e) => {
- if (roomId === -1) {
- if (e?.target?.checked) {
- const link = shareLinks.find((l) => l.access === defaultAccess);
+ if (isLinksToggling) return;
- link.shareLink = await getPortalInviteLink(defaultAccess);
+ setIsLinksToggling(true);
- setActiveLink(link);
- copyLink(link.shareLink);
+ try {
+ if (roomId === -1) {
+ if (e?.target?.checked) {
+ const link = shareLinks.find((l) => l.access === defaultAccess);
+
+ link.shareLink = await getPortalInviteLink(defaultAccess);
+
+ setActiveLink(link);
+ copyLink(link.shareLink);
+ }
+ } else {
+ !externalLinksVisible ? editLink() : disableLink();
}
- } else {
- !externalLinksVisible ? editLink() : disableLink();
+ onChangeExternalLinksVisible(!externalLinksVisible);
+ } catch (error) {
+ toastr.error(error.message);
+ } finally {
+ setIsLinksToggling(false);
}
-
- onChangeExternalLinksVisible(!externalLinksVisible);
};
const disableLink = () => {
@@ -223,6 +234,7 @@ const ExternalLinks = ({
className="invite-via-link"
isChecked={externalLinksVisible}
onChange={toggleLinks}
+ isDisabled={isLinksToggling}
/>
From 2cfbca7d27a351e49b74d3d97b952df5f2e04a4a Mon Sep 17 00:00:00 2001
From: Alexey Safronov
Date: Mon, 12 Aug 2024 16:38:06 +0400
Subject: [PATCH 31/45] SSO: Moved ResetConfirmationModal to client components
---
.../public/locales/ar-SA/SingleSignOn.json | 5 +-
.../public/locales/az/SingleSignOn.json | 5 +-
.../public/locales/bg/SingleSignOn.json | 5 +-
.../public/locales/cs/SingleSignOn.json | 5 +-
.../public/locales/de/SingleSignOn.json | 5 +-
.../public/locales/el-GR/SingleSignOn.json | 5 +-
.../public/locales/en/SingleSignOn.json | 5 +-
.../public/locales/es/SingleSignOn.json | 5 +-
.../public/locales/fi/SingleSignOn.json | 5 +-
.../public/locales/fr/SingleSignOn.json | 5 +-
.../public/locales/hy-AM/SingleSignOn.json | 5 +-
.../public/locales/it/SingleSignOn.json | 5 +-
.../public/locales/ja-JP/SingleSignOn.json | 5 +-
.../public/locales/ko-KR/SingleSignOn.json | 5 +-
.../public/locales/lo-LA/SingleSignOn.json | 5 +-
.../public/locales/lv/SingleSignOn.json | 5 +-
.../public/locales/nl/SingleSignOn.json | 5 +-
.../public/locales/pl/SingleSignOn.json | 5 +-
.../public/locales/pt-BR/SingleSignOn.json | 5 +-
.../public/locales/pt/SingleSignOn.json | 5 +-
.../public/locales/ro/SingleSignOn.json | 5 +-
.../public/locales/ru/SingleSignOn.json | 5 +-
.../public/locales/si/SingleSignOn.json | 5 +-
.../public/locales/sk/SingleSignOn.json | 5 +-
.../public/locales/sl/SingleSignOn.json | 5 +-
.../locales/sr-Cyrl-RS/SingleSignOn.json | 5 +-
.../locales/sr-Latn-RS/SingleSignOn.json | 5 +-
.../public/locales/tr/SingleSignOn.json | 5 +-
.../public/locales/uk-UA/SingleSignOn.json | 5 +-
.../public/locales/vi/SingleSignOn.json | 5 +-
.../public/locales/zh-CN/SingleSignOn.json | 5 +-
.../ResetConfirmationModal.js | 14 ++--
.../StyledModalDialog.js | 64 +++++++++++++++++++
.../integration/SingleSignOn/SubmitButton.js | 16 ++++-
public/locales/ar-SA/Common.json | 5 +-
public/locales/az/Common.json | 5 +-
public/locales/bg/Common.json | 5 +-
public/locales/cs/Common.json | 5 +-
public/locales/de/Common.json | 5 +-
public/locales/el-GR/Common.json | 5 +-
public/locales/en/Common.json | 5 +-
public/locales/es/Common.json | 5 +-
public/locales/fi/Common.json | 5 +-
public/locales/fr/Common.json | 5 +-
public/locales/hy-AM/Common.json | 5 +-
public/locales/it/Common.json | 5 +-
public/locales/ja-JP/Common.json | 5 +-
public/locales/ko-KR/Common.json | 5 +-
public/locales/lo-LA/Common.json | 5 +-
public/locales/lv/Common.json | 5 +-
public/locales/nl/Common.json | 5 +-
public/locales/pl/Common.json | 5 +-
public/locales/pt-BR/Common.json | 5 +-
public/locales/pt/Common.json | 5 +-
public/locales/ro/Common.json | 5 +-
public/locales/ru/Common.json | 5 +-
public/locales/si/Common.json | 5 +-
public/locales/sk/Common.json | 5 +-
public/locales/sl/Common.json | 5 +-
public/locales/sr-Cyrl-RS/Common.json | 5 +-
public/locales/sr-Latn-RS/Common.json | 5 +-
public/locales/tr/Common.json | 5 +-
public/locales/uk-UA/Common.json | 5 +-
public/locales/vi/Common.json | 5 +-
public/locales/zh-CN/Common.json | 5 +-
65 files changed, 237 insertions(+), 167 deletions(-)
rename packages/client/src/{pages/PortalSettings/categories/integration/SingleSignOn/sub-components => components/dialogs/ResetConfirmationDialog}/ResetConfirmationModal.js (83%)
create mode 100644 packages/client/src/components/dialogs/ResetConfirmationDialog/StyledModalDialog.js
diff --git a/packages/client/public/locales/ar-SA/SingleSignOn.json b/packages/client/public/locales/ar-SA/SingleSignOn.json
index 70ba83a0c2..f29f35594b 100644
--- a/packages/client/public/locales/ar-SA/SingleSignOn.json
+++ b/packages/client/public/locales/ar-SA/SingleSignOn.json
@@ -1,4 +1,4 @@
-{
+{
"AddCertificate": "إضافة شهادة",
"AdvancedSettings": "الإعدادات المتقدمة",
"AdvancedSettingsTooltip": "إخفاء صفحة المصادقة الافتراضية وإعادة التوجيه تلقائيًا إلى خدمة Single Sign-On (SSO).",
@@ -6,7 +6,6 @@
"AttributeMatchingTooltip": "مطابقة سمات Single Sign-On مع إدخالات قسم \"الحسابات\".",
"Binding": "الربط:",
"CertificateExist": "شهادة بنفس نوع الإجراء موجودة بالفعل.",
- "ConfirmationText": "سيتم فقدان جميع البيانات التي أدخلتها. هل أنت متأكد أنك ترغب في المتابعة؟",
"CustomEntryButton": "تخصيص تسمية زر تسجيل الدخول",
"CustomEntryTooltip": "التسمية المستخدمة للزر الذي يُستخدم لتسجيل الدخول إلى المساحة باستخدام خدمة تسجيل الدخول الموحدة",
"DownloadMetadataXML": "تنزيل ملف بيانات المزوّد",
@@ -61,4 +60,4 @@
"UploadXML": "تحميل البيانات من لغة التوصيف الموسعة لملىء الحقول المطلوبة تلقائيًا.",
"UploadXMLPlaceholder": "عنوان رابط للبيانات الوصفية لمزود الهوية بتنسيق لغة التوصيف الموسعة",
"UsedFor": "يسخدم من اجل"
-}
+}
\ No newline at end of file
diff --git a/packages/client/public/locales/az/SingleSignOn.json b/packages/client/public/locales/az/SingleSignOn.json
index 6d35172306..ab28c35734 100644
--- a/packages/client/public/locales/az/SingleSignOn.json
+++ b/packages/client/public/locales/az/SingleSignOn.json
@@ -1,4 +1,4 @@
-{
+{
"AddCertificate": "Sertifikat əlavə edin",
"AdvancedSettings": "Qabaqcıl Parametrlər",
"AdvancedSettingsTooltip": "Defolt doğrulama səhifəsini gizlədin və avtomatik olaraq SSO xidmətinə yönləndirin.",
@@ -6,7 +6,6 @@
"AttributeMatchingTooltip": "Birdəfəlik Giriş Atributları \"Hesablar\" bölməsindəki qeydlərə uyğundur.",
"Binding": "Birləşdirən:",
"CertificateExist": "Eyni fəaliyyət növü olan sertifikat artıq mövcuddur",
- "ConfirmationText": "Daxil etdiyiniz bütün məlumatlar itiriləcək. Davam etmək istədiyinizə əminsiniz?",
"CustomEntryButton": "Fərdi giriş düyməsinin başlığı",
"CustomEntryTooltip": "Birdəfəlik Giriş xidməti ilə domenə daxil olmaq üçün istifadə edilən düymənin adı",
"DownloadMetadataXML": "SP metadata XML-ni endirin",
@@ -61,4 +60,4 @@
"UploadXML": "Tələb olunan sahələri avtomatik doldurmaq üçün XML-dən metadata yükləyin.",
"UploadXMLPlaceholder": "IdP Metadata XML üçün URL",
"UsedFor": "İstifadə etmək üçün"
-}
+}
\ No newline at end of file
diff --git a/packages/client/public/locales/bg/SingleSignOn.json b/packages/client/public/locales/bg/SingleSignOn.json
index 3e9f0b8826..b9e9cacf8c 100644
--- a/packages/client/public/locales/bg/SingleSignOn.json
+++ b/packages/client/public/locales/bg/SingleSignOn.json
@@ -1,4 +1,4 @@
-{
+{
"AddCertificate": "Добавете сертификат",
"AdvancedSettings": "Разширени настройки",
"AdvancedSettingsTooltip": "Скриване на страницата за удостоверяване по подразбиране и автоматично пренасочване към SSO услуга.",
@@ -6,7 +6,6 @@
"AttributeMatchingTooltip": "Съответствието на атрибутите за единично вписване към записите в секцията „Акаунти“.",
"Binding": "Обвързване:",
"CertificateExist": "Вече съществува сертификат със същия тип действие",
- "ConfirmationText": "Всички въведени от вас данни ще бъдат загубени. Сигурни ли сте, че искате да продължите?",
"CustomEntryButton": "Персонализиран надпис на бутона за влизане",
"CustomEntryTooltip": "Надписът за бутона, използван за вписване в пространството с услугата за единично вписване",
"DownloadMetadataXML": "Изтеглете XML с метаданните на доставчика на услуги",
@@ -61,4 +60,4 @@
"UploadXML": "Заредете метаданни от XML, за да попълните автоматично необходимите полета.",
"UploadXMLPlaceholder": "URL към XML с метаданните на доставчика на идентичност",
"UsedFor": "Използвай за"
-}
+}
\ No newline at end of file
diff --git a/packages/client/public/locales/cs/SingleSignOn.json b/packages/client/public/locales/cs/SingleSignOn.json
index c06da93475..1fa96fe5e0 100644
--- a/packages/client/public/locales/cs/SingleSignOn.json
+++ b/packages/client/public/locales/cs/SingleSignOn.json
@@ -1,4 +1,4 @@
-{
+{
"AddCertificate": "Přidat certifikát",
"AdvancedSettings": "Rozšířená nastavení",
"AdvancedSettingsTooltip": "Skrýt výchozí ověřovací stránky a automaticky přesměrovat na službu SSO.",
@@ -6,7 +6,6 @@
"AttributeMatchingTooltip": "Shoda atributů jednotného přihlášení se záznamy v sekci „Účty“.",
"Binding": "Vazba:",
"CertificateExist": "Certifikát se stejným typem akce již existuje.",
- "ConfirmationText": "Všechna zadaná data budou ztracena. Určitě chcete pokračovat?",
"CustomEntryButton": "Vlastní titulek přihlašovacího tlačítka",
"CustomEntryTooltip": "Titulek tlačítka pro přihlášení do prostoru pomocí služby jednotného přihlášení",
"DownloadMetadataXML": "Stáhnout metadata SP XML",
@@ -61,4 +60,4 @@
"UploadXML": "Načtení metadat z XML pro automatické vyplnění požadovaných polí.",
"UploadXMLPlaceholder": "Adresa URL na metadata IdP XML",
"UsedFor": "Použijte pro"
-}
+}
\ No newline at end of file
diff --git a/packages/client/public/locales/de/SingleSignOn.json b/packages/client/public/locales/de/SingleSignOn.json
index 6dd2791967..e28be14b52 100644
--- a/packages/client/public/locales/de/SingleSignOn.json
+++ b/packages/client/public/locales/de/SingleSignOn.json
@@ -1,4 +1,4 @@
-{
+{
"AddCertificate": "Zertifikat hinzufügen",
"AdvancedSettings": "Erweiterte Einstellungen",
"AdvancedSettingsTooltip": "Standard-Authentifizierungsseite und automatische Weiterleitung zum SSO-Dienst ausblenden.",
@@ -6,7 +6,6 @@
"AttributeMatchingTooltip": "Die Entsprechung der Single-Sign-On-Attribute zu den Einträgen des Bereichs «Konten».",
"Binding": "Bindung:",
"CertificateExist": "Es gibt bereits ein Zertifikat mit gleichem Aktionstyp",
- "ConfirmationText": "Alle von Ihnen eingegebenen Daten gehen verloren. Sind Sie sicher, dass Sie fortfahren möchten?",
"CustomEntryButton": "Benutzerdefinierte Beschriftung der Anmeldeschaltfläche",
"CustomEntryTooltip": "Die Beschriftung für die Schaltfläche, die für die Anmeldung im Bereich mit dem Single Sign-On-Dienst verwendet wird",
"DownloadMetadataXML": "XML mit SP-Metadaten herunterladen",
@@ -61,4 +60,4 @@
"UploadXML": "Laden von Metadaten aus XML zum automatischen Ausfüllen der erforderlichen Felder.",
"UploadXMLPlaceholder": "URL zu IdP-Metadaten-XML",
"UsedFor": "Verwenden für"
-}
+}
\ No newline at end of file
diff --git a/packages/client/public/locales/el-GR/SingleSignOn.json b/packages/client/public/locales/el-GR/SingleSignOn.json
index 39d46cf220..0deb74600c 100644
--- a/packages/client/public/locales/el-GR/SingleSignOn.json
+++ b/packages/client/public/locales/el-GR/SingleSignOn.json
@@ -1,4 +1,4 @@
-{
+{
"AddCertificate": "Προσθήκη πιστοποιητικού",
"AdvancedSettings": "Προχωρημένες ρυθμίσεις",
"AdvancedSettingsTooltip": "Απόκρυψη της προεπιλεγμένης σελίδας ελέγχου ταυτότητας και αυτόματη ανακατεύθυνση στην υπηρεσία SSO.",
@@ -6,7 +6,6 @@
"AttributeMatchingTooltip": "Η αντιστοιχία των χαρακτηριστικών της υπηρεσίας ενιαίας σύνδεσης με τις καταχωρήσεις της ενότητας «Λογαριασμοί».",
"Binding": "Δέσμευση:",
"CertificateExist": "Υπάρχει ήδη πιστοποιητικό με τον ίδιο τύπο ενέργειας",
- "ConfirmationText": "Όλα τα δεδομένα που έχετε εισάγει θα χαθούν. Θέλετε σίγουρα να συνεχίσετε;",
"CustomEntryButton": "Προσαρμοσμένη λεζάντα κουμπιού σύνδεσης",
"CustomEntryTooltip": "Η λεζάντα για το κουμπί που χρησιμοποιείται για τη σύνδεση στον χώρο με την υπηρεσία ενιαίας σύνδεσης",
"DownloadMetadataXML": "Λήψη μεταδεδομένων παρόχου υπηρεσιών XML",
@@ -61,4 +60,4 @@
"UploadXML": "Φόρτωση μεταδεδομένων από XML για την αυτόματη συμπλήρωση των απαιτούμενων πεδίων.",
"UploadXMLPlaceholder": "URL για τα μεταδεδομένα XML του παρόχου ταυτότητας",
"UsedFor": "Χρήση για"
-}
+}
\ No newline at end of file
diff --git a/packages/client/public/locales/en/SingleSignOn.json b/packages/client/public/locales/en/SingleSignOn.json
index 0ce4ee2e69..bb79998671 100644
--- a/packages/client/public/locales/en/SingleSignOn.json
+++ b/packages/client/public/locales/en/SingleSignOn.json
@@ -1,4 +1,4 @@
-{
+{
"AddCertificate": "Add certificate",
"AdvancedSettings": "Advanced Settings",
"AdvancedSettingsTooltip": "Hide default authentication page and automatically redirect to SSO service.",
@@ -6,7 +6,6 @@
"AttributeMatchingTooltip": "The correspondence of the Single Sign-On attributes to the entries of the 'Accounts' section.",
"Binding": "Binding:",
"CertificateExist": "Certificate with same action type already exists",
- "ConfirmationText": "All the data you entered will be lost. Are you sure you want to continue?",
"CustomEntryButton": "Custom login button caption",
"CustomEntryTooltip": "The caption for the button used to login into the space with the Single Sign-On service",
"DownloadMetadataXML": "Download SP metadata XML",
@@ -61,4 +60,4 @@
"UploadXML": "Load metadata from XML to fill the required fields automatically.",
"UploadXMLPlaceholder": "URL to IdP Metadata XML",
"UsedFor": "Use for"
-}
+}
\ No newline at end of file
diff --git a/packages/client/public/locales/es/SingleSignOn.json b/packages/client/public/locales/es/SingleSignOn.json
index d76d43bfc9..65435d0a12 100644
--- a/packages/client/public/locales/es/SingleSignOn.json
+++ b/packages/client/public/locales/es/SingleSignOn.json
@@ -1,4 +1,4 @@
-{
+{
"AddCertificate": "Añadir certificado",
"AdvancedSettings": "Configuración avanzada",
"AdvancedSettingsTooltip": "Ocultar la página de autenticación predeterminada y redirigir automáticamente al servicio SSO.",
@@ -6,7 +6,6 @@
"AttributeMatchingTooltip": "correspondencia de los atributos de Inicio de sesión único con las entradas de la sección «Cuentas».",
"Binding": "Enlace:",
"CertificateExist": "Ya existe un certificado con el mismo tipo de acción.",
- "ConfirmationText": "Se perderán todos los datos introducidos. ¿Está seguro de que desea continuar?",
"CustomEntryButton": "Leyenda personalizada del botón de inicio de sesión",
"CustomEntryTooltip": "Leyenda del botón utilizado para iniciar sesión en el espacio con el servicio de inicio de sesión único.",
"DownloadMetadataXML": "Descargar XML de metadatos SP",
@@ -61,4 +60,4 @@
"UploadXML": "Cargar metadatos desde XML para rellenar automáticamente los campos obligatorios.",
"UploadXMLPlaceholder": "URL al XML de metadatos IdP",
"UsedFor": "Se usa para"
-}
+}
\ No newline at end of file
diff --git a/packages/client/public/locales/fi/SingleSignOn.json b/packages/client/public/locales/fi/SingleSignOn.json
index 778cc3c1ab..aa29bf0f46 100644
--- a/packages/client/public/locales/fi/SingleSignOn.json
+++ b/packages/client/public/locales/fi/SingleSignOn.json
@@ -1,4 +1,4 @@
-{
+{
"AddCertificate": "Lisää sertifikaatti",
"AdvancedSettings": "Lisäasetukset",
"AdvancedSettingsTooltip": "Piilota oletustodennussivu ja ohjaa automaattisesti SSO-palveluun.",
@@ -6,7 +6,6 @@
"AttributeMatchingTooltip": "Kertakirjautumisattribuuttien viestintä Tilit-osion merkintöjen kanssa.",
"Binding": "Sitova:",
"CertificateExist": "Saman toimintotyypin sertifikaatti on jo olemassa",
- "ConfirmationText": "Kaikki syöttämäsi tieto menetetään. Haluatko varmasti jatkaa?",
"CustomEntryButton": "Mukautetun sisäänkirjautumispainikkeen teksti",
"CustomEntryTooltip": "Painikkeen kuvateksti, jota käytetään tilaan sisäänkirjautumiseen kertakirjautumispalvelun avulla",
"DownloadMetadataXML": "Lataa SP-metadata XML",
@@ -61,4 +60,4 @@
"UploadXML": "Lataa metadata XML:stä täyttääksesi vaaditut kentät automaattisesti.",
"UploadXMLPlaceholder": "URL:sta IdP:n metadata XML",
"UsedFor": "Käyttää"
-}
+}
\ No newline at end of file
diff --git a/packages/client/public/locales/fr/SingleSignOn.json b/packages/client/public/locales/fr/SingleSignOn.json
index 3df8414cfc..66f9746668 100644
--- a/packages/client/public/locales/fr/SingleSignOn.json
+++ b/packages/client/public/locales/fr/SingleSignOn.json
@@ -1,4 +1,4 @@
-{
+{
"AddCertificate": "Ajouter un certificat",
"AdvancedSettings": "Paramètres avancés",
"AdvancedSettingsTooltip": "Masquer la page d’authentification par défaut et rediriger automatiquement vers le service SSO.",
@@ -6,7 +6,6 @@
"AttributeMatchingTooltip": "La correspondance entre les attributs de l’authentification unique et les entrées de la section \"Comptes\".",
"Binding": "Liaison :",
"CertificateExist": "Le certificat avec le même type d’action existe déjà.",
- "ConfirmationText": "Toutes les données que vous avez saisies seront perdues. Êtes-vous sûr de vouloir continuer ?",
"CustomEntryButton": "Légende du bouton de connexion personnalisée",
"CustomEntryTooltip": "Légende du bouton utilisé pour se connecter à l’espace avec le service d’authentification unique (Single Sign-On)",
"DownloadMetadataXML": "Télécharger le fichier XML des métadonnées SP",
@@ -61,4 +60,4 @@
"UploadXML": "Charger des métadonnées à partir de XML pour remplir automatiquement les champs obligatoires.",
"UploadXMLPlaceholder": "URL vers les métadonnées XML de l’IdP",
"UsedFor": "Utiliser pour"
-}
+}
\ No newline at end of file
diff --git a/packages/client/public/locales/hy-AM/SingleSignOn.json b/packages/client/public/locales/hy-AM/SingleSignOn.json
index ad7c621bf2..052dc2789b 100644
--- a/packages/client/public/locales/hy-AM/SingleSignOn.json
+++ b/packages/client/public/locales/hy-AM/SingleSignOn.json
@@ -1,4 +1,4 @@
-{
+{
"AddCertificate": "Ավելացնել վկայագիր",
"AdvancedSettings": "Լրացուցիչ կարգավորումներ",
"AdvancedSettingsTooltip": "Թաքցնել լռելյայն նույնականացման էջը և ավտոմատ կերպով վերահղել SSO ծառայությանը:",
@@ -6,7 +6,6 @@
"AttributeMatchingTooltip": "Single Sign-On-ի համապատասխանությունը վերագրվում է «Հաշիվներ» բաժնի գրառումներին:",
"Binding": "Կապում․",
"CertificateExist": "Նույն գործողության տեսակով վկայագիրն արդեն գոյություն ունի",
- "ConfirmationText": "Ձեր մուտքագրած բոլոր տվյալները կկորչեն: Վստա՞հ եք, որ ցանկանում եք շարունակել:",
"CustomEntryButton": "Հատուկ մուտքի կոճակի վերնագիր",
"CustomEntryTooltip": "Կոճակի վերնագիր, որն օգտագործվում է Single Sign-On ծառայության միջոցով տարածք մուտք գործելու համար",
"DownloadMetadataXML": "Ներբեռնել SP մետատվյալների XML-ը",
@@ -61,4 +60,4 @@
"UploadXML": "Բեռնեք մետատվյալները XML-ից՝ պահանջվող դաշտերը ավտոմատ կերպով լրացնելու համար:",
"UploadXMLPlaceholder": "URL դեպի IdP Մետատվյալների XML",
"UsedFor": "օգտագործել __ ի համար"
-}
+}
\ No newline at end of file
diff --git a/packages/client/public/locales/it/SingleSignOn.json b/packages/client/public/locales/it/SingleSignOn.json
index a2ee767901..06255e0bdd 100644
--- a/packages/client/public/locales/it/SingleSignOn.json
+++ b/packages/client/public/locales/it/SingleSignOn.json
@@ -1,4 +1,4 @@
-{
+{
"AddCertificate": "Aggiungi certificato",
"AdvancedSettings": "Impostazioni avanzate",
"AdvancedSettingsTooltip": "Nascondi la pagina di autenticazione predefinita e reindirizza automaticamente al servizio SSO.",
@@ -6,7 +6,6 @@
"AttributeMatchingTooltip": "La corrispondenza degli attributi Single Sign-On con le voci della sezione 'Account'.",
"Binding": "Vincolo:",
"CertificateExist": "Il certificato con lo stesso tipo di azione già esiste",
- "ConfirmationText": "Tutti i dati inseriti andranno persi. Sei sicuro di voler continuare?",
"CustomEntryButton": "Didascalia del pulsante di accesso personalizzata",
"CustomEntryTooltip": "Didascalia del pulsante utilizzato per effettuare l’accesso nello spazio con il servizio Single Sign-On",
"DownloadMetadataXML": "Scarica SP file XML per metadati",
@@ -61,4 +60,4 @@
"UploadXML": "Carica i metadati da XML per riempire automaticamente i campi richiesti.",
"UploadXMLPlaceholder": "URL a metadati IdP XML",
"UsedFor": "Utilizza per"
-}
+}
\ No newline at end of file
diff --git a/packages/client/public/locales/ja-JP/SingleSignOn.json b/packages/client/public/locales/ja-JP/SingleSignOn.json
index c6723e8229..31aed9511e 100644
--- a/packages/client/public/locales/ja-JP/SingleSignOn.json
+++ b/packages/client/public/locales/ja-JP/SingleSignOn.json
@@ -1,4 +1,4 @@
-{
+{
"AddCertificate": "証明書の追加",
"AdvancedSettings": "詳細設定",
"AdvancedSettingsTooltip": "デフォルトの認証ページを非表示にし、自動的にSSOサービスにリダイレクトする。",
@@ -6,7 +6,6 @@
"AttributeMatchingTooltip": "シングルサインオンの属性と「アカウント」セクションの項目との対応関係。",
"Binding": "バインド",
"CertificateExist": "同じアクションタイプを持つ証明書が既に存在しています。",
- "ConfirmationText": "入力したデータはすべて失われます。このまま続けますか？",
"CustomEntryButton": "カスタムログインボタンのキャプション",
"CustomEntryTooltip": "シングルサインオンサービスを利用してスペースにログインする際に使用するボタンのキャプション",
"DownloadMetadataXML": "SPメタデータXMLのダウンロード",
@@ -61,4 +60,4 @@
"UploadXML": "XMLからメタデータを読み込み、必要な項目を自動で埋める。",
"UploadXMLPlaceholder": "IdPメタデータXMLへのURL",
"UsedFor": "使用目的"
-}
+}
\ No newline at end of file
diff --git a/packages/client/public/locales/ko-KR/SingleSignOn.json b/packages/client/public/locales/ko-KR/SingleSignOn.json
index b647b2d1d4..1199c072f7 100644
--- a/packages/client/public/locales/ko-KR/SingleSignOn.json
+++ b/packages/client/public/locales/ko-KR/SingleSignOn.json
@@ -1,4 +1,4 @@
-{
+{
"AddCertificate": "인증서 추가",
"AdvancedSettings": "고급 설정",
"AdvancedSettingsTooltip": "기본 인증 페이지 숨기기 및 SSO 서비스로 자동 리디렉션.",
@@ -6,7 +6,6 @@
"AttributeMatchingTooltip": "'계정' 섹션의 항목에 대한싱글 사인온 속성의 대응.",
"Binding": "바인딩:",
"CertificateExist": "동일한 작업 유형의 인증서가 이미 존재합니다",
- "ConfirmationText": "입력한 모든 데이터가 손실됩니다. 정말로 계속하시겠습니까?",
"CustomEntryButton": "사용자 지정 버튼 캡션",
"CustomEntryTooltip": "싱글 사인온 서비스로 공간에 로그인하는 데 사용되는 버튼의 캡션",
"DownloadMetadataXML": "SP 메타데이터 XML 다운로드",
@@ -61,4 +60,4 @@
"UploadXML": "필수 필드를 자동으로 입력하기 위해 XML에서 메타데이터를 로드하세요.",
"UploadXMLPlaceholder": "IdP 메타데이터 XML에 대한 URL",
"UsedFor": "사용"
-}
+}
\ No newline at end of file
diff --git a/packages/client/public/locales/lo-LA/SingleSignOn.json b/packages/client/public/locales/lo-LA/SingleSignOn.json
index e908c68997..3bd705c659 100644
--- a/packages/client/public/locales/lo-LA/SingleSignOn.json
+++ b/packages/client/public/locales/lo-LA/SingleSignOn.json
@@ -1,4 +1,4 @@
-{
+{
"AddCertificate": "ເພີ່ມໃບຢັ້ງຢືນ",
"AdvancedSettings": "ຕັ້ງຄ່າຂັ້ນສູງ",
"AdvancedSettingsTooltip": "ເຊື່ອງໜ້າການພິສູດຢືນຢັນເລີ່ມຕົ້ນ ແລະ ປ່ຽນເສັ້ນທາງໄປຫາ ບໍລິການ SSO ໂດຍອັດຕະໂນມັດ.",
@@ -6,7 +6,6 @@
"AttributeMatchingTooltip": "ການຕອບສະ ໜອງ ຂອງຄຸນລັກສະນະການເຂົ້າສູ່ລະບົບດຽວຕໍ່ກັບລາຍການຂອງພາກສ່ວນ 'ບັນຊີ'.",
"Binding": "ຜູກມັດ:",
"CertificateExist": "ໃບຢັ້ງຢືນທີ່ມີປະເພດການປະຕິບັດດຽວກັນມີຢູ່ແລ້ວ",
- "ConfirmationText": "ຂໍ້ມູນທັງໝົດທີ່ທ່ານປ້ອນເຂົ້າຈະສູນເສຍໄປ. ທ່ານແນ່ໃຈບໍ່ວ່າຕ້ອງການສືບຕໍ່?",
"CustomEntryButton": "ຄຳບັນຍາຍປຸ່ມເຂົ້າສູ່ລະບົບແບບກຳນົດເອງ",
"CustomEntryTooltip": "ຄຳບັນຍາຍສຳລັບປຸ່ມທີ່ໃຊ້ເພື່ອເຂົ້າສູ່ລະບົບຊ່ອງດ້ວຍການບໍລິການເຂົ້າສູ່ລະບົບຄັ້ງດຽວ",
"DownloadMetadataXML": "ດາວໂຫລດ SP metadata XML",
@@ -61,4 +60,4 @@
"UploadXML": "ໂຫຼດ metadata ຈາກ XML ເພື່ອຕື່ມຂໍ້ມູນໃສ່ຊ່ອງຂໍ້ມູນທີ່ຕ້ອງການໂດຍອັດຕະໂນມັດ.",
"UploadXMLPlaceholder": "URL ໄປຫາ IdP Metadata XML",
"UsedFor": "ໃຊ້ສໍາລັບ"
-}
+}
\ No newline at end of file
diff --git a/packages/client/public/locales/lv/SingleSignOn.json b/packages/client/public/locales/lv/SingleSignOn.json
index f8ccb9f2fb..3f98a44c70 100644
--- a/packages/client/public/locales/lv/SingleSignOn.json
+++ b/packages/client/public/locales/lv/SingleSignOn.json
@@ -1,4 +1,4 @@
-{
+{
"AddCertificate": "Pievienot sertifikātu",
"AdvancedSettings": "Papildu iestatījumi",
"AdvancedSettingsTooltip": "Slēpt noklusējuma autentifikācijas lapu un automātiski novirzīt uz SSO pakalpojumu.",
@@ -6,7 +6,6 @@
"AttributeMatchingTooltip": "Vienotās pierakstīšanās atribūtu atbilstība ierakstiem sadaļā Konti (Accounts).",
"Binding": "Saistīšana:",
"CertificateExist": "Sertifikāts ar tādu pašu darbības tipu jau pastāv",
- "ConfirmationText": "Visi ievadītie dati tiks zaudēti. Vai tiešām vēlaties turpināt?",
"CustomEntryButton": "Pielāgots pieteikšanās pogas paraksts",
"CustomEntryTooltip": "Paraksts pogai, ko izmanto, lai pieteiktos telpā, izmantojot vienotās pierakstīšanās pakalpojumu",
"DownloadMetadataXML": "Lejupielādēt SP metadatu XML",
@@ -61,4 +60,4 @@
"UploadXML": "Ielādēt metadatus no XML, lai automātiski aizpildītu nepieciešamos laukus.",
"UploadXMLPlaceholder": "IdP metadatu XML vietrādis URL",
"UsedFor": "Izmantot"
-}
+}
\ No newline at end of file
diff --git a/packages/client/public/locales/nl/SingleSignOn.json b/packages/client/public/locales/nl/SingleSignOn.json
index f593c7af87..ad47b43dca 100644
--- a/packages/client/public/locales/nl/SingleSignOn.json
+++ b/packages/client/public/locales/nl/SingleSignOn.json
@@ -1,4 +1,4 @@
-{
+{
"AddCertificate": "Certificaat toevoegen",
"AdvancedSettings": "Geavanceerde Instellingen",
"AdvancedSettingsTooltip": "Standaard authenticatiepagina verbergen en automatisch doorverwijzen naar SSO-dienst.",
@@ -6,7 +6,6 @@
"AttributeMatchingTooltip": "De correspondentie van de Single Sign-On attributen met de items van de \"Accounts\" sectie.",
"Binding": "Binding:",
"CertificateExist": "Certificaat met hetzelfde actietype bestaat al",
- "ConfirmationText": "Alle ingevoerde gegevens gaan verloren. Weet u zeker dat u door wilt gaan?",
"CustomEntryButton": "Aangepaste aanmeldingsknop bijschrift",
"CustomEntryTooltip": "Het bijschrift voor de knop die wordt gebruikt om in te loggen in de ruimte met de Single Sign-On dienst",
"DownloadMetadataXML": "Download SP metadata XML",
@@ -61,4 +60,4 @@
"UploadXML": "Metagegevens uit XML laden om de vereiste velden automatisch te vullen.",
"UploadXMLPlaceholder": "URL naar IdP Metadata XML",
"UsedFor": "Gebruik voor"
-}
+}
\ No newline at end of file
diff --git a/packages/client/public/locales/pl/SingleSignOn.json b/packages/client/public/locales/pl/SingleSignOn.json
index 89c82a3590..5d0fee46cf 100644
--- a/packages/client/public/locales/pl/SingleSignOn.json
+++ b/packages/client/public/locales/pl/SingleSignOn.json
@@ -1,4 +1,4 @@
-{
+{
"AddCertificate": "Dodaj certyfikat",
"AdvancedSettings": "Ustawienia zaawansowane",
"AdvancedSettingsTooltip": "Ukryj domyślną stronę uwierzytelniania i automatycznie kieruj do usługi pojedynczego logowania.",
@@ -6,7 +6,6 @@
"AttributeMatchingTooltip": "Zgodność atrybutów pojedynczego logowania z wpisami sekcji „Konta”.",
"Binding": "Powiązanie:",
"CertificateExist": "Certyfikat o tym samym rodzaju działania już istnieje",
- "ConfirmationText": "Wszystkie wprowadzone dane zostaną utracone. Czy na pewno chcesz kontynuować?",
"CustomEntryButton": "Niestandardowy podpis przycisku logowania",
"CustomEntryTooltip": "Podpis dla przycisku służącego do logowania się w obszarze roboczym za pomocą usługi pojedynczego logowania",
"DownloadMetadataXML": "Pobierz XML z metadanymi usługodawcy",
@@ -61,4 +60,4 @@
"UploadXML": "Wczytaj metadane z XML, aby automatycznie wypełnić wymagane pola.",
"UploadXMLPlaceholder": "Adres URL do XML z metadanymi IdP",
"UsedFor": "Użyj do"
-}
+}
\ No newline at end of file
diff --git a/packages/client/public/locales/pt-BR/SingleSignOn.json b/packages/client/public/locales/pt-BR/SingleSignOn.json
index fe28f0503b..78b8e26b11 100644
--- a/packages/client/public/locales/pt-BR/SingleSignOn.json
+++ b/packages/client/public/locales/pt-BR/SingleSignOn.json
@@ -1,4 +1,4 @@
-{
+{
"AddCertificate": "Adicionar certificado",
"AdvancedSettings": "Configurações avançadas",
"AdvancedSettingsTooltip": "Oculte a página de autenticação padrão e redirecione automaticamente para o serviço SSO.",
@@ -6,7 +6,6 @@
"AttributeMatchingTooltip": "A correspondência dos atributos do Single Sign-On com as entradas da seção 'Contas'.",
"Binding": "Vinculativo:",
"CertificateExist": "Certificado com o mesmo tipo de ação já existe",
- "ConfirmationText": "Todos os dados inseridos serão perdidos. Você tem certeza que quer continuar?",
"CustomEntryButton": "Legenda do botão de login personalizado",
"CustomEntryTooltip": "A legenda do botão usado para fazer login no espaço com o serviço Single Sign-On",
"DownloadMetadataXML": "Baixe o XML de metadados do SP",
@@ -61,4 +60,4 @@
"UploadXML": "Carregar metadados de XML para preencher automaticamente os campos necessários.",
"UploadXMLPlaceholder": "URL para IdP Metadados XML",
"UsedFor": "Use para"
-}
+}
\ No newline at end of file
diff --git a/packages/client/public/locales/pt/SingleSignOn.json b/packages/client/public/locales/pt/SingleSignOn.json
index a889fa5771..601d46d985 100644
--- a/packages/client/public/locales/pt/SingleSignOn.json
+++ b/packages/client/public/locales/pt/SingleSignOn.json
@@ -1,4 +1,4 @@
-{
+{
"AddCertificate": "Adicionar certificado",
"AdvancedSettings": "Configurações Avançadas",
"AdvancedSettingsTooltip": "Ocultar página de autenticação predefinida e redirecionar automaticamente para o serviço SSO.",
@@ -6,7 +6,6 @@
"AttributeMatchingTooltip": "A correspondência dos atributos do Início de Sessão Único às entradas da secção \"Contas”.",
"Binding": "Vinculativo:",
"CertificateExist": "Já existe um certificado com o mesmo tipo de acção",
- "ConfirmationText": "Todos os dados que introduziu serão perdidos. Tem a certeza que quer proceder?",
"CustomEntryButton": "Legenda dos botões personalizados para iniciar sessão",
"CustomEntryTooltip": "A legenda do botão utilizado para aceder ao espaço com o serviço de Início de Sessão Único",
"DownloadMetadataXML": "Transferir a metadata do SP XML",
@@ -61,4 +60,4 @@
"UploadXML": "Carregue os metadados através de um XML para preencher os campos obrigatórios automaticamente.",
"UploadXMLPlaceholder": "URL para o XML com os metadados do IdP",
"UsedFor": "Utilizar para"
-}
+}
\ No newline at end of file
diff --git a/packages/client/public/locales/ro/SingleSignOn.json b/packages/client/public/locales/ro/SingleSignOn.json
index fa0248b2b0..49cceec7ef 100644
--- a/packages/client/public/locales/ro/SingleSignOn.json
+++ b/packages/client/public/locales/ro/SingleSignOn.json
@@ -1,4 +1,4 @@
-{
+{
"AddCertificate": "Adăugare certificat",
"AdvancedSettings": "Setări avansate",
"AdvancedSettingsTooltip": "Ascundere pagina de autentificare implicită şi redirecționare automată spre serviciu SSO.",
@@ -6,7 +6,6 @@
"AttributeMatchingTooltip": "Corespondenţa atributelor SSO cu intrările din secţiunea Conturi.",
"Binding": "Legătură:",
"CertificateExist": "Es gibt bereits ein Zertifikat mit gleichem Aktionstyp",
- "ConfirmationText": "Toate datele introduse se vor pierde. Sigur doriţi să continuați?",
"CustomEntryButton": "Etichetă de buton de conectare particularizată",
"CustomEntryTooltip": "Eticheta butonului pentru conectarea la spaţiul cu sistem de autentificare unică (SSO)",
"DownloadMetadataXML": "Descărcare fişier de metadate XML a furnizorului de servicii",
@@ -61,4 +60,4 @@
"UploadXML": "Încărcați metadatele din XML pentru a completa automat câmpurile necesare.",
"UploadXMLPlaceholder": "Adresa URL la fişierul de metadate XML al furnizorului ID",
"UsedFor": "Utilizare pentru"
-}
+}
\ No newline at end of file
diff --git a/packages/client/public/locales/ru/SingleSignOn.json b/packages/client/public/locales/ru/SingleSignOn.json
index 26b12802fc..b9a56077fb 100644
--- a/packages/client/public/locales/ru/SingleSignOn.json
+++ b/packages/client/public/locales/ru/SingleSignOn.json
@@ -1,4 +1,4 @@
-{
+{
"AddCertificate": "Добавить сертификат",
"AdvancedSettings": "Дополнительно",
"AdvancedSettingsTooltip": "Скрыть страницу аутентификации по умолчанию и автоматически перенаправлять на сервис SSO.",
@@ -6,7 +6,6 @@
"AttributeMatchingTooltip": "Соответствие атрибутов единого входа записям раздела 'Аккаунты'.",
"Binding": "Привязка:",
"CertificateExist": "Сертификат с таким же типом действия уже существует",
- "ConfirmationText": "Все введенные данные будут потеряны. Вы уверены, что хотите продолжить?",
"CustomEntryButton": "Пользовательская надпись для кнопки входа:",
"CustomEntryTooltip": "Надпись для кнопки, которая используется для входа на портал с помощью сервиса Single Sign-on",
"DownloadMetadataXML": "Скачать XML-файл метаданных поставщика сервиса",
@@ -61,4 +60,4 @@
"UploadXML": "Для автоматического заполнения необходимых полей загрузите метаданные из XML-файла.",
"UploadXMLPlaceholder": "URL адрес XML-файла метаданных",
"UsedFor": "Использовать для"
-}
+}
\ No newline at end of file
diff --git a/packages/client/public/locales/si/SingleSignOn.json b/packages/client/public/locales/si/SingleSignOn.json
index 5b15ff5503..d96ca5a6ea 100644
--- a/packages/client/public/locales/si/SingleSignOn.json
+++ b/packages/client/public/locales/si/SingleSignOn.json
@@ -1,4 +1,4 @@
-{
+{
"AddCertificate": "සහතිකයක් යොදන්න",
"AdvancedSettings": "වැඩිදුර සැකසුම්",
"AdvancedSettingsTooltip": "පෙරනිමි ද්වි සාධක පිටුව සඟවා ස්වයංක්රීයව තනි-පිවිසුම් (SSO) සේවාව වෙත හරවා යවන්න.",
@@ -6,7 +6,6 @@
"AttributeMatchingTooltip": "තනි පිවිසුම් අනුරූපතා 'ගිණුම්' කොටසේ නිවේශිත වලට ආරෝපණය කරයි.",
"Binding": "බැඳීම:",
"CertificateExist": "සමාන ක්රියාමාර්ග වර්ගයක සහතිකයක් දැනටමත් පවතී",
- "ConfirmationText": "ඔබ ඇතුල් කළ සියළුම දත්ත නැති වී යනු ඇත. ඔබට ඉදිරියට යාමට වුවමනා ද?",
"CustomEntryButton": "අභිරුචි පිවිසුම් බොත්තමේ ශ්රීර්ෂය",
"CustomEntryTooltip": "තනි පිවිසුම් සේවාව හරහා අවකාශයට පිවිසීමට භාවිතා කරන බොත්තම සඳහා ශ්රීර්ෂය",
"DownloadMetadataXML": "SP පාරදත්ත XML බාගන්න",
@@ -58,4 +57,4 @@
"UploadXML": "වුවමනා ක්ෂේත්ර ස්වයංක්රීයව පිරවීමට XML වෙතින් පාරදත්ත පූරණය කරන්න.",
"UploadXMLPlaceholder": "IdP පාරදත්ත XML වෙත ඒ.ස.නි.",
"UsedFor": "භාවිතා වන්නේ"
-}
+}
\ No newline at end of file
diff --git a/packages/client/public/locales/sk/SingleSignOn.json b/packages/client/public/locales/sk/SingleSignOn.json
index 961766965a..da61b71a86 100644
--- a/packages/client/public/locales/sk/SingleSignOn.json
+++ b/packages/client/public/locales/sk/SingleSignOn.json
@@ -1,4 +1,4 @@
-{
+{
"AddCertificate": "Pridať certifikát",
"AdvancedSettings": "Rozšírené nastavenia",
"AdvancedSettingsTooltip": "Skryť predvolenú autorizačnú stránku a automaticky presmerovať na službu SSO.",
@@ -6,7 +6,6 @@
"AttributeMatchingTooltip": "Zhoda atribútov jednotného prihlásenia so záznamami v sekcii „Účty“.",
"Binding": "Spojenie:",
"CertificateExist": "Certifikát s rovnakým typom akcie už existuje",
- "ConfirmationText": "Všetky zadané údaje sa stratia. Ste si istý, že chcete pokračovať?",
"CustomEntryButton": "Vlastný popis tlačidla prihlásenia",
"CustomEntryTooltip": "Popis tlačidla, ktoré sa používa na prihlásenie do priestoru so službou jednotného prihlásenia",
"DownloadMetadataXML": "Načítať SP metadáta XML",
@@ -61,4 +60,4 @@
"UploadXML": "Načítajte metadáta z XML a automaticky vyplňte požadované polia.",
"UploadXMLPlaceholder": "URL do IdP Metadáta XML",
"UsedFor": "Použiť pre"
-}
+}
\ No newline at end of file
diff --git a/packages/client/public/locales/sl/SingleSignOn.json b/packages/client/public/locales/sl/SingleSignOn.json
index b40a7e436a..0947772edf 100644
--- a/packages/client/public/locales/sl/SingleSignOn.json
+++ b/packages/client/public/locales/sl/SingleSignOn.json
@@ -1,4 +1,4 @@
-{
+{
"AddCertificate": "Dodaj certifikat",
"AdvancedSettings": "Napredne nastavitve",
"AdvancedSettingsTooltip": "Skrij privzeto stran za avtentikacijo in samodejno preusmeri na storitev SSO.",
@@ -6,7 +6,6 @@
"AttributeMatchingTooltip": "Ujemanje atributov enotne prijave z vnosi v razdelku 'Računi'.",
"Binding": "Vezava:",
"CertificateExist": "Certifikat z isto vrsto akcije že obstaja",
- "ConfirmationText": "Vsi vneseni podatki bodo izgubljeni. Ali ste prepričani, da želite nadaljevati?",
"CustomEntryButton": "Prilagojen naslov gumba za prijavo",
"CustomEntryTooltip": "Napis za gumbu za prijavo v prostor s storitvijo enkratne prijave",
"DownloadMetadataXML": "Prenesi SP metapodatke v XML",
@@ -61,4 +60,4 @@
"UploadXML": "Naloži metapodatke iz XML, da se samodejno izpolnijo zahtevana polja.",
"UploadXMLPlaceholder": "URL do IdP Meta podatkov XML",
"UsedFor": "Uporabi za"
-}
+}
\ No newline at end of file
diff --git a/packages/client/public/locales/sr-Cyrl-RS/SingleSignOn.json b/packages/client/public/locales/sr-Cyrl-RS/SingleSignOn.json
index 6cdfb19a70..4ffc37a248 100644
--- a/packages/client/public/locales/sr-Cyrl-RS/SingleSignOn.json
+++ b/packages/client/public/locales/sr-Cyrl-RS/SingleSignOn.json
@@ -1,4 +1,4 @@
-{
+{
"AddCertificate": "Додај сертификат",
"AdvancedSettings": "Напредна подешавања",
"AdvancedSettingsTooltip": "Сакријте подразумевану страницу за аутентификацију и аутоматски преусмерите на SSO сервис.",
@@ -6,7 +6,6 @@
"AttributeMatchingTooltip": "Одговарајуће Single Sign-On атрибута са уносима одељка 'Налози'.",
"Binding": "Повезивање:",
"CertificateExist": "Сертификат са истим типом акције већ постоји",
- "ConfirmationText": "Сви подаци које сте унели ће бити изгубљени. Да ли сте сигурни да желите да наставите?",
"CustomEntryButton": "Прилагођена ознака дугмета за пријављивање",
"CustomEntryTooltip": "Ознака дугмета за пријављивање у простор помоћу услуге Single Sign-On",
"DownloadMetadataXML": "Преузми SP метаподатке XML",
@@ -61,4 +60,4 @@
"UploadXML": "Учитајте метаподатке из XML-а да бисте аутоматски попунили потребна поља.",
"UploadXMLPlaceholder": "URL за IdP метаподатке XML",
"UsedFor": "Користи за"
-}
+}
\ No newline at end of file
diff --git a/packages/client/public/locales/sr-Latn-RS/SingleSignOn.json b/packages/client/public/locales/sr-Latn-RS/SingleSignOn.json
index 67ca8aed90..1306bdaf77 100644
--- a/packages/client/public/locales/sr-Latn-RS/SingleSignOn.json
+++ b/packages/client/public/locales/sr-Latn-RS/SingleSignOn.json
@@ -1,4 +1,4 @@
-{
+{
"AddCertificate": "Dodaj sertifikat",
"AdvancedSettings": "Napredna podešavanja",
"AdvancedSettingsTooltip": "Sakrijte podrazumevanu stranicu za autentifikaciju i automatski preusmerite na SSO servis.",
@@ -6,7 +6,6 @@
"AttributeMatchingTooltip": "Odgovarajuće Single Sign-On atributa sa unosima odeljka 'Nalozi'.",
"Binding": "Povezivanje:",
"CertificateExist": "Sertifikat sa istim tipom akcije već postoji",
- "ConfirmationText": "Svi podaci koje ste uneli će biti izgubljeni. Da li ste sigurni da želite da nastavite?",
"CustomEntryButton": "Prilagođena oznaka dugmeta za prijavljivanje",
"CustomEntryTooltip": "Oznaka dugmeta za prijavljivanje u prostor pomoću usluge Single Sign-On",
"DownloadMetadataXML": "Preuzmi SP metapodatke XML",
@@ -61,4 +60,4 @@
"UploadXML": "Učitajte metapodatke iz XML-a da biste automatski popunili potrebna polja.",
"UploadXMLPlaceholder": "URL za IdP metapodatke XML",
"UsedFor": "Koristi za"
-}
+}
\ No newline at end of file
diff --git a/packages/client/public/locales/tr/SingleSignOn.json b/packages/client/public/locales/tr/SingleSignOn.json
index ad7b8415ef..a3e12c5274 100644
--- a/packages/client/public/locales/tr/SingleSignOn.json
+++ b/packages/client/public/locales/tr/SingleSignOn.json
@@ -1,4 +1,4 @@
-{
+{
"AddCertificate": "Sertifika ekle",
"AdvancedSettings": "Gelişmiş Ayarlar",
"AdvancedSettingsTooltip": "Varsayılan kimlik doğrulama sayfasını gizle ve otomatik olarak SSO hizmetine yönlendir.",
@@ -6,7 +6,6 @@
"AttributeMatchingTooltip": "Tekli Oturum Açma öznitelikleri 'Hesaplar' bölümündeki girişlere karşılık gelir.",
"Binding": "Bağlayıcı:",
"CertificateExist": "Aynı eylem türüne sahip sertifika zaten var",
- "ConfirmationText": "Girdiğiniz tüm veriler kaybolacak. Devam etmek istediğinize emin misiniz?",
"CustomEntryButton": "Özel oturum açma düğmesi başlığı",
"CustomEntryTooltip": "Tek Oturum Açma hizmetiyle alana giriş yapmak için kullanılan düğmenin başlığı",
"DownloadMetadataXML": "SP meta veri XML'sini indirin",
@@ -61,4 +60,4 @@
"UploadXML": "Gerekli alanları otomatik olarak doldurmak için meta verileri XML'den yükleyin.",
"UploadXMLPlaceholder": "IdP Meta Veri XML URL'si",
"UsedFor": "Şunun için kullan"
-}
+}
\ No newline at end of file
diff --git a/packages/client/public/locales/uk-UA/SingleSignOn.json b/packages/client/public/locales/uk-UA/SingleSignOn.json
index 8260f003a8..01c4ae7b0d 100644
--- a/packages/client/public/locales/uk-UA/SingleSignOn.json
+++ b/packages/client/public/locales/uk-UA/SingleSignOn.json
@@ -1,4 +1,4 @@
-{
+{
"AddCertificate": "Додати сертифікат",
"AdvancedSettings": "Додаткові параметри",
"AdvancedSettingsTooltip": "Приховати сторінку автентифікації за замовчуванням і автоматично переспрямовувати до служби єдиного входу.",
@@ -6,7 +6,6 @@
"AttributeMatchingTooltip": "Відповідність атрибутів єдиного входу записам розділу «Облікові записи».",
"Binding": "Зв’язування:",
"CertificateExist": "Сертифікат із таким типом дії вже існує",
- "ConfirmationText": "Усі введені вами дані буде втрачено. Ви впевнені, що бажаєте продовжити?",
"CustomEntryButton": "Налаштовуваний надпис на кнопці входу",
"CustomEntryTooltip": "Надпис для кнопки, яка використовується для входу до простору за допомогою служби єдиного входу",
"DownloadMetadataXML": "Завантажити XML-файл метаданих постачальника сервісу",
@@ -61,4 +60,4 @@
"UploadXML": "Завантажте метадані з XML-файлу, щоб автоматично заповнити необхідні поля.",
"UploadXMLPlaceholder": "URL-адреса XML-файлу метаданих постачальника посвідчень",
"UsedFor": "Використовувати для"
-}
+}
\ No newline at end of file
diff --git a/packages/client/public/locales/vi/SingleSignOn.json b/packages/client/public/locales/vi/SingleSignOn.json
index 980b565de8..ccc5f12081 100644
--- a/packages/client/public/locales/vi/SingleSignOn.json
+++ b/packages/client/public/locales/vi/SingleSignOn.json
@@ -1,4 +1,4 @@
-{
+{
"AddCertificate": "Thêm chứng chỉ",
"AdvancedSettings": "Cài đặt Nâng cao",
"AdvancedSettingsTooltip": "Ẩn trang xác thực mặc định và tự động chuyển hướng đến dịch vụ SSO.",
@@ -6,7 +6,6 @@
"AttributeMatchingTooltip": "Sự tương ứng của các thuộc tính Đăng nhập một lần với các mục nhập của phần 'Tài khoản.",
"Binding": "Kết hợp:",
"CertificateExist": "Chứng chỉ với cùng loại hành động đã tồn tại",
- "ConfirmationText": "Tất cả dữ liệu bạn đã nhập sẽ bị mất. Bạn có chắc chắn muốn tiếp tục không?",
"CustomEntryButton": "Chú thích nút đăng nhập tùy chỉnh",
"CustomEntryTooltip": "Chú thích cho nút được sử dụng để đăng nhập vào không gian với dịch vụ Đăng nhập một lần",
"DownloadMetadataXML": "Tải siêu dữ liệu SP metadata XML",
@@ -61,4 +60,4 @@
"UploadXML": "Tải siêu dữ liệu từ XML để tự động điền vào các trường bắt buộc.",
"UploadXMLPlaceholder": "URL tới Siêu dữ liệu XML IdP",
"UsedFor": "Sử dụng cho"
-}
+}
\ No newline at end of file
diff --git a/packages/client/public/locales/zh-CN/SingleSignOn.json b/packages/client/public/locales/zh-CN/SingleSignOn.json
index 457e76b313..3f7b429660 100644
--- a/packages/client/public/locales/zh-CN/SingleSignOn.json
+++ b/packages/client/public/locales/zh-CN/SingleSignOn.json
@@ -1,4 +1,4 @@
-{
+{
"AddCertificate": "添加证书",
"AdvancedSettings": "高级设置",
"AdvancedSettingsTooltip": "隐藏默认认证页面并自动重定向至 SSO 服务。",
@@ -6,7 +6,6 @@
"AttributeMatchingTooltip": "单点登录属性与“账户”部分条目的对应关系。",
"Binding": "绑定：",
"CertificateExist": "具有相同操作类型的证书已存在",
- "ConfirmationText": "您所输入的所有数据都将丢失。确定要继续吗？",
"CustomEntryButton": "自定义登录按钮标题",
"CustomEntryTooltip": "用于通过单点登录服务登录空间的按钮文本",
"DownloadMetadataXML": "下载 SP 元数据 XML",
@@ -61,4 +60,4 @@
"UploadXML": "从 XML 中加载元数据以自动填充所需字段。",
"UploadXMLPlaceholder": "IdP 元数据 XML URL",
"UsedFor": "用于"
-}
+}
\ No newline at end of file
diff --git a/packages/client/src/pages/PortalSettings/categories/integration/SingleSignOn/sub-components/ResetConfirmationModal.js b/packages/client/src/components/dialogs/ResetConfirmationDialog/ResetConfirmationModal.js
similarity index 83%
rename from packages/client/src/pages/PortalSettings/categories/integration/SingleSignOn/sub-components/ResetConfirmationModal.js
rename to packages/client/src/components/dialogs/ResetConfirmationDialog/ResetConfirmationModal.js
index 5782288d12..c5780132c0 100644
--- a/packages/client/src/pages/PortalSettings/categories/integration/SingleSignOn/sub-components/ResetConfirmationModal.js
+++ b/packages/client/src/components/dialogs/ResetConfirmationDialog/ResetConfirmationModal.js
@@ -25,18 +25,16 @@
// International. See the License terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
import React from "react";
-import { inject, observer } from "mobx-react";
import { useTranslation } from "react-i18next";
-import { Box } from "@docspace/shared/components/box";
import { Button } from "@docspace/shared/components/button";
import { ModalDialog } from "@docspace/shared/components/modal-dialog";
import { Text } from "@docspace/shared/components/text";
-import StyledModalDialog from "../styled-containers/StyledModalDialog";
+import StyledModalDialog from "./StyledModalDialog";
const ResetConfirmationModal = (props) => {
- const { t } = useTranslation(["SingleSignOn", "Common"]);
+ const { t } = useTranslation(["Common"]);
const { closeResetModal, confirmationResetModal, confirmReset } = props;
return (
@@ -49,7 +47,7 @@ const ResetConfirmationModal = (props) => {
{t("Common:Confirmation")}
- {t("ConfirmationText")}
+ {t("Common:ConfirmationText")}
@@ -73,8 +71,4 @@ const ResetConfirmationModal = (props) => {
);
};
-export default inject(({ ssoStore }) => {
- const { closeResetModal, confirmationResetModal, confirmReset } = ssoStore;
-
- return { closeResetModal, confirmationResetModal, confirmReset };
-})(observer(ResetConfirmationModal));
+export default ResetConfirmationModal;
diff --git a/packages/client/src/components/dialogs/ResetConfirmationDialog/StyledModalDialog.js b/packages/client/src/components/dialogs/ResetConfirmationDialog/StyledModalDialog.js
new file mode 100644
index 0000000000..394792d3a0
--- /dev/null
+++ b/packages/client/src/components/dialogs/ResetConfirmationDialog/StyledModalDialog.js
@@ -0,0 +1,64 @@
+// (c) Copyright Ascensio System SIA 2009-2024
+//
+// This program is a free software product.
+// You can redistribute it and/or modify it under the terms
+// of the GNU Affero General Public License (AGPL) version 3 as published by the Free Software
+// Foundation. In accordance with Section 7(a) of the GNU AGPL its Section 15 shall be amended
+// to the effect that Ascensio System SIA expressly excludes the warranty of non-infringement of
+// any third-party rights.
+//
+// This program is distributed WITHOUT ANY WARRANTY, without even the implied warranty
+// of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For details, see
+// the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
+//
+// You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, EU, LV-1021.
+//
+// The interactive user interfaces in modified source and object code versions of the Program must
+// display Appropriate Legal Notices, as required under Section 5 of the GNU AGPL version 3.
+//
+// Pursuant to Section 7(b) of the License you must retain the original Product logo when
+// distributing the program. Pursuant to Section 7(e) we decline to grant you any rights under
+// trademark law for use of our trademarks.
+//
+// All the Product's GUI elements, including illustrations and icon sets, as well as technical writing
+// 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 styled from "styled-components";
+
+import { ModalDialog } from "@docspace/shared/components/modal-dialog";
+import { mobile } from "@docspace/shared/utils";
+
+const StyledModalDialog = styled(ModalDialog)`
+ .heading {
+ font-size: 21px;
+ }
+
+ .generate {
+ font-weight: 600;
+ }
+
+ .text-area {
+ width: 488px !important;
+ height: 72px !important;
+ margin-top: 4px;
+
+ &-label {
+ font-weight: 600;
+ margin-bottom: 5px;
+ }
+
+ @media ${mobile} {
+ width: 100% !important;
+ }
+ }
+ .text-area-label {
+ margin-top: 16px;
+ }
+
+ .modal-combo {
+ margin: 16px 0 0 0;
+ }
+`;
+
+export default StyledModalDialog;
diff --git a/packages/client/src/pages/PortalSettings/categories/integration/SingleSignOn/SubmitButton.js b/packages/client/src/pages/PortalSettings/categories/integration/SingleSignOn/SubmitButton.js
index 683fbfbbe0..43a66b21c6 100644
--- a/packages/client/src/pages/PortalSettings/categories/integration/SingleSignOn/SubmitButton.js
+++ b/packages/client/src/pages/PortalSettings/categories/integration/SingleSignOn/SubmitButton.js
@@ -30,7 +30,7 @@ import { useTranslation } from "react-i18next";
import { SaveCancelButtons } from "@docspace/shared/components/save-cancel-buttons";
-import ResetConfirmationModal from "./sub-components/ResetConfirmationModal";
+import ResetConfirmationModal from "SRC_DIR/components/dialogs/ResetConfirmationDialog/ResetConfirmationModal";
const SubmitResetButtons = (props) => {
const { t } = useTranslation(["SingleSignOn", "Settings", "Common"]);
@@ -46,6 +46,8 @@ const SubmitResetButtons = (props) => {
isLoadingXml,
enableSso,
isSSOAvailable,
+ closeResetModal,
+ confirmReset,
} = props;
return (
@@ -69,7 +71,13 @@ const SubmitResetButtons = (props) => {
additionalClassSaveButton="save-button"
additionalClassCancelButton="restore-button"
/>
- {confirmationResetModal &&
Date: Mon, 12 Aug 2024 15:40:03 +0300
Subject: [PATCH 32/45] Shared:Utils:Common: pass culture to handler logo url
---
packages/login/src/app/(root)/layout.tsx | 7 ++++++-
packages/login/src/components/GreetingContainer.tsx | 12 ++++++++++--
packages/login/src/components/SimpleNav.tsx | 13 ++++++++++---
packages/login/src/types/index.ts | 1 +
packages/shared/utils/common.ts | 3 ++-
5 files changed, 29 insertions(+), 7 deletions(-)
diff --git a/packages/login/src/app/(root)/layout.tsx b/packages/login/src/app/(root)/layout.tsx
index f3de5d58d0..53d1c7ae01 100644
--- a/packages/login/src/app/(root)/layout.tsx
+++ b/packages/login/src/app/(root)/layout.tsx
@@ -35,6 +35,7 @@ import SimpleNav from "@/components/SimpleNav";
import { LoginContent, LoginFormWrapper } from "@/components/Login";
import GreetingContainer from "@/components/GreetingContainer";
import { getColorTheme, getSettings } from "@/utils/actions";
+import { cookies } from "next/headers";
const LanguageComboboxWrapper = dynamic(
() => import("@/components/LanguageCombobox"),
@@ -59,9 +60,12 @@ export default async function Layout({
const isRegisterContainerVisible = objectSettings?.enabledJoin;
+ const culture =
+ cookies().get("asc_language")?.value ?? objectSettings?.culture;
+
return (
+
{decode(user.displayName)}
+
+ {user.email}
+
From b9c1b95234359ecf68eea4acd98061b6b0486fbc Mon Sep 17 00:00:00 2001
From: Aleksandr Lushkin
-
@@ -73,6 +77,7 @@ export default async function Layout({
>
{children}
diff --git a/packages/login/src/components/GreetingContainer.tsx b/packages/login/src/components/GreetingContainer.tsx
index 1d4e96cf8a..528a97e10e 100644
--- a/packages/login/src/components/GreetingContainer.tsx
+++ b/packages/login/src/components/GreetingContainer.tsx
@@ -40,11 +40,19 @@ import { GreetingContainersProps } from "@/types";
import { DEFAULT_PORTAL_TEXT, DEFAULT_ROOM_TEXT } from "@/utils/constants";
import { getInvitationLinkData } from "@/utils";
-const GreetingContainer = ({ greetingSettings }: GreetingContainersProps) => {
+const GreetingContainer = ({
+ greetingSettings,
+ culture,
+}: GreetingContainersProps) => {
const { t } = useTranslation(["Login"]);
const theme = useTheme();
- const logoUrl = getLogoUrl(WhiteLabelLogoType.LoginPage, !theme.isBase);
+ const logoUrl = getLogoUrl(
+ WhiteLabelLogoType.LoginPage,
+ !theme.isBase,
+ false,
+ culture,
+ );
const searchParams = useSearchParams();
diff --git a/packages/login/src/components/SimpleNav.tsx b/packages/login/src/components/SimpleNav.tsx
index 6aa8b78a5a..4d50449a8a 100644
--- a/packages/login/src/components/SimpleNav.tsx
+++ b/packages/login/src/components/SimpleNav.tsx
@@ -61,14 +61,21 @@ const StyledSimpleNav = styled.div`
StyledSimpleNav.defaultProps = { theme: Base };
-interface SimpleNavProps {}
+interface SimpleNavProps {
+ culture?: string;
+}
-const SimpleNav = ({}: SimpleNavProps) => {
+const SimpleNav = ({ culture }: SimpleNavProps) => {
const theme = useTheme();
const isDark = !theme.isBase;
- const logoUrl = getLogoUrl(WhiteLabelLogoType.LightSmall, isDark);
+ const logoUrl = getLogoUrl(
+ WhiteLabelLogoType.LightSmall,
+ isDark,
+ false,
+ culture,
+ );
return (
diff --git a/packages/login/src/types/index.ts b/packages/login/src/types/index.ts
index bb4e03db09..d804405148 100644
--- a/packages/login/src/types/index.ts
+++ b/packages/login/src/types/index.ts
@@ -43,6 +43,7 @@ export type TDataContext = {
export type GreetingContainersProps = {
greetingSettings?: string;
+ culture?: string;
};
export type LoginProps = {
diff --git a/packages/shared/utils/common.ts b/packages/shared/utils/common.ts
index 2a152dd527..45f76ffc1c 100644
--- a/packages/shared/utils/common.ts
+++ b/packages/shared/utils/common.ts
@@ -1103,8 +1103,9 @@ export function getLogoUrl(
logoType: WhiteLabelLogoType,
dark: boolean = false,
def: boolean = false,
+ culture?: string,
) {
- return `/logo.ashx?logotype=${logoType}&dark=${dark}&default=${def}`;
+ return `/logo.ashx?logotype=${logoType}&dark=${dark}&default=${def}${culture ? `&culture=${culture}` : ""}`;
}
export const getUserTypeName = (
From 2450c14bd15e1644931de859ca5706320079eaa8 Mon Sep 17 00:00:00 2001
From: Alexey Safronov
Date: Mon, 12 Aug 2024 16:56:36 +0400
Subject: [PATCH 33/45] Fix Bug 69624 - [LDAP] Missing confirmation window for
restoring default settings after clicking Default settings button on LDAP
settings page
---
.../LDAP/sub-components/ButtonsContainer.js | 23 ++++++++++++++++++-
packages/client/src/store/LdapFormStore.js | 10 ++++++++
2 files changed, 32 insertions(+), 1 deletion(-)
diff --git a/packages/client/src/pages/PortalSettings/categories/integration/LDAP/sub-components/ButtonsContainer.js b/packages/client/src/pages/PortalSettings/categories/integration/LDAP/sub-components/ButtonsContainer.js
index e2b61b3ce2..750c3fc144 100644
--- a/packages/client/src/pages/PortalSettings/categories/integration/LDAP/sub-components/ButtonsContainer.js
+++ b/packages/client/src/pages/PortalSettings/categories/integration/LDAP/sub-components/ButtonsContainer.js
@@ -36,6 +36,8 @@ import ProgressContainer from "./ProgressContainer";
import { DeviceType, LDAPOperation } from "@docspace/shared/enums";
+import ResetConfirmationModal from "SRC_DIR/components/dialogs/ResetConfirmationDialog/ResetConfirmationModal";
+
const ButtonContainer = ({
saveLdapSettings,
restoreToDefault,
@@ -48,6 +50,10 @@ const ButtonContainer = ({
isMobileView,
hasProgressError,
+
+ confirmationResetModal,
+ closeResetModal,
+ openResetModal,
}) => {
const { t } = useTranslation(["Settings", "Common"]);
@@ -56,6 +62,7 @@ const ButtonContainer = ({
}, [saveLdapSettings, t]);
const onResetClick = React.useCallback(() => {
+ closeResetModal();
restoreToDefault(t).catch((e) => toastr.error(e));
}, [restoreToDefault, t]);
@@ -76,7 +83,7 @@ const ButtonContainer = ({
Date: Mon, 12 Aug 2024 17:03:54 +0400
Subject: [PATCH 34/45] PortalSettings: Integration: Changed reset button
caption
---
.../categories/integration/DocumentService/index.js | 2 +-
.../categories/integration/SingleSignOn/SubmitButton.js | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/packages/client/src/pages/PortalSettings/categories/integration/DocumentService/index.js b/packages/client/src/pages/PortalSettings/categories/integration/DocumentService/index.js
index 2b56be8a0b..5f8c16293e 100644
--- a/packages/client/src/pages/PortalSettings/categories/integration/DocumentService/index.js
+++ b/packages/client/src/pages/PortalSettings/categories/integration/DocumentService/index.js
@@ -273,7 +273,7 @@ const DocumentService = ({
onSaveClick={onSubmit}
onCancelClick={onReset}
saveButtonLabel={t("Common:SaveButton")}
- cancelButtonLabel={t("Common:Restore")}
+ cancelButtonLabel={t("Settings:DefaultSettings")}
reminderText={t("Settings:YouHaveUnsavedChanges")}
saveButtonDisabled={saveButtonDisabled}
disableRestoreToDefault={
diff --git a/packages/client/src/pages/PortalSettings/categories/integration/SingleSignOn/SubmitButton.js b/packages/client/src/pages/PortalSettings/categories/integration/SingleSignOn/SubmitButton.js
index 43a66b21c6..4c12848b89 100644
--- a/packages/client/src/pages/PortalSettings/categories/integration/SingleSignOn/SubmitButton.js
+++ b/packages/client/src/pages/PortalSettings/categories/integration/SingleSignOn/SubmitButton.js
@@ -58,7 +58,7 @@ const SubmitResetButtons = (props) => {
onCancelClick={isSsoEnabled ? openResetModal : resetForm}
showReminder={true}
saveButtonLabel={t("Common:SaveButton")}
- cancelButtonLabel={t("Common:Restore")}
+ cancelButtonLabel={t("Settings:DefaultSettings")}
displaySettings={true}
hasScroll={true}
isSaving={isSubmitLoading}
From d4a547e32a8d9977d8b665648110dede889d06c7 Mon Sep 17 00:00:00 2001
From: Alexey Safronov
Date: Mon, 12 Aug 2024 17:15:12 +0400
Subject: [PATCH 35/45] Fix Bug 69625 - [LDAP] Default port does not change
after enabling Enable SSL option when configuring LDAP server
---
packages/client/src/store/LdapFormStore.js | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/packages/client/src/store/LdapFormStore.js b/packages/client/src/store/LdapFormStore.js
index 27538a068f..c725630f72 100644
--- a/packages/client/src/store/LdapFormStore.js
+++ b/packages/client/src/store/LdapFormStore.js
@@ -14,7 +14,6 @@ import delay from "lodash/delay";
import { toastr } from "@docspace/shared/components/toast";
const constants = {
- NULL_PERCENT: 0,
SSL_LDAP_PORT: 636,
DEFAULT_LDAP_PORT: 389,
GET_STATUS_TIMEOUT: 1000,
@@ -606,6 +605,15 @@ class LdapFormStore {
setIsSslEnabled = (enabled) => {
this.isSslEnabled = enabled;
+
+ if (
+ this.requiredSettings.portNumber == constants.DEFAULT_LDAP_PORT ||
+ this.requiredSettings.portNumber == constants.SSL_LDAP_PORT
+ ) {
+ this.setPortNumber(
+ enabled ? constants.SSL_LDAP_PORT : constants.DEFAULT_LDAP_PORT,
+ );
+ }
};
get isCronEnabled() {
From 23ce60bc4b9d0467c59599b59868bf8d505a6fea Mon Sep 17 00:00:00 2001
From: Alexey Safronov
Date: Mon, 12 Aug 2024 17:27:19 +0400
Subject: [PATCH 36/45] Fix Bug 69594 - [LDAP] User quota field in Attribute
mapping section is not relevant to the configured server and has no units
specified
---
i18next/client.babel | 132 ------------------
.../client/public/locales/ar-SA/Ldap.json | 1 -
.../public/locales/ar-SA/SingleSignOn.json | 4 +-
packages/client/public/locales/az/Ldap.json | 1 -
.../public/locales/az/SingleSignOn.json | 4 +-
packages/client/public/locales/bg/Ldap.json | 1 -
.../public/locales/bg/SingleSignOn.json | 4 +-
packages/client/public/locales/cs/Ldap.json | 1 -
.../public/locales/cs/SingleSignOn.json | 4 +-
packages/client/public/locales/de/Ldap.json | 1 -
.../public/locales/de/SingleSignOn.json | 4 +-
.../client/public/locales/el-GR/Ldap.json | 1 -
.../public/locales/el-GR/SingleSignOn.json | 4 +-
packages/client/public/locales/en/Ldap.json | 2 +-
.../public/locales/en/SingleSignOn.json | 4 +-
packages/client/public/locales/es/Ldap.json | 1 -
.../public/locales/es/SingleSignOn.json | 4 +-
packages/client/public/locales/fi/Ldap.json | 1 -
.../public/locales/fi/SingleSignOn.json | 4 +-
packages/client/public/locales/fr/Ldap.json | 1 -
.../public/locales/fr/SingleSignOn.json | 4 +-
.../client/public/locales/hy-AM/Ldap.json | 1 -
.../public/locales/hy-AM/SingleSignOn.json | 4 +-
packages/client/public/locales/it/Ldap.json | 1 -
.../public/locales/it/SingleSignOn.json | 4 +-
.../client/public/locales/ja-JP/Ldap.json | 1 -
.../public/locales/ja-JP/SingleSignOn.json | 4 +-
.../client/public/locales/ko-KR/Ldap.json | 1 -
.../public/locales/ko-KR/SingleSignOn.json | 4 +-
.../public/locales/lo-LA/SingleSignOn.json | 4 +-
packages/client/public/locales/lv/Ldap.json | 1 -
.../public/locales/lv/SingleSignOn.json | 4 +-
packages/client/public/locales/nl/Ldap.json | 1 -
.../public/locales/nl/SingleSignOn.json | 4 +-
packages/client/public/locales/pl/Ldap.json | 1 -
.../public/locales/pl/SingleSignOn.json | 4 +-
.../client/public/locales/pt-BR/Ldap.json | 1 -
.../public/locales/pt-BR/SingleSignOn.json | 4 +-
packages/client/public/locales/pt/Ldap.json | 1 -
.../public/locales/pt/SingleSignOn.json | 4 +-
packages/client/public/locales/ro/Ldap.json | 1 -
.../public/locales/ro/SingleSignOn.json | 4 +-
packages/client/public/locales/ru/Ldap.json | 1 -
.../public/locales/ru/SingleSignOn.json | 4 +-
.../public/locales/si/SingleSignOn.json | 4 +-
packages/client/public/locales/sk/Ldap.json | 1 -
.../public/locales/sk/SingleSignOn.json | 4 +-
packages/client/public/locales/sl/Ldap.json | 1 -
.../public/locales/sl/SingleSignOn.json | 4 +-
.../public/locales/sr-Cyrl-RS/Ldap.json | 1 -
.../locales/sr-Cyrl-RS/SingleSignOn.json | 4 +-
.../public/locales/sr-Latn-RS/Ldap.json | 1 -
.../locales/sr-Latn-RS/SingleSignOn.json | 4 +-
packages/client/public/locales/tr/Ldap.json | 1 -
.../public/locales/tr/SingleSignOn.json | 4 +-
.../client/public/locales/uk-UA/Ldap.json | 1 -
.../public/locales/uk-UA/SingleSignOn.json | 4 +-
packages/client/public/locales/vi/Ldap.json | 1 -
.../public/locales/vi/SingleSignOn.json | 4 +-
.../client/public/locales/zh-CN/Ldap.json | 1 -
.../public/locales/zh-CN/SingleSignOn.json | 4 +-
.../LDAP/sub-components/AttributeMapping.js | 76 +++++-----
62 files changed, 101 insertions(+), 261 deletions(-)
diff --git a/i18next/client.babel b/i18next/client.babel
index e2ce01c4f3..965782e07d 100644
--- a/i18next/client.babel
+++ b/i18next/client.babel
@@ -168592,138 +168592,6 @@
-
- ConfirmationText
-
-
- ar-SA
- false
-
-
- az-Latn-AZ
- false
-
-
- bg-BG
- false
-
-
- cs-CZ
- false
-
-
- de-DE
- false
-
-
- el-GR
- false
-
-
- en-US
- false
-
-
- es-ES
- false
-
-
- fi-FI
- false
-
-
- fr-FR
- false
-
-
- hy-AM
- false
-
-
- it-IT
- false
-
-
- ja-JP
- false
-
-
- ko-KR
- false
-
-
- lo-LA
- false
-
-
- lv-LV
- false
-
-
- nl-NL
- false
-
-
- pl-PL
- false
-
-
- pt-BR
- false
-
-
- pt-PT
- false
-
-
- ro-RO
- false
-
-
- ru-RU
- false
-
-
- si-SI
- false
-
-
- sk-SK
- false
-
-
- sl-SI
- false
-
-
- sr-Cyrl-RS
- false
-
-
- sr-Latn-RS
- false
-
-
- tr-TR
- false
-
-
- uk-UA
- false
-
-
- vi-VN
- false
-
-
- zh-CN
- false
-
-
-
CustomEntryButton
+
+
{
/>
+
+
+
{
tabIndex={11}
/>
-
-
-
-
-
-
Date: Mon, 12 Aug 2024 16:43:46 +0300
Subject: [PATCH 37/45] Web: Components: TabledHeader: fixed
"clearSize.findLastIndex is not a function", added log
---
packages/shared/components/table/TableHeader.tsx | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/packages/shared/components/table/TableHeader.tsx b/packages/shared/components/table/TableHeader.tsx
index 5bd6bd2cab..64a988c352 100644
--- a/packages/shared/components/table/TableHeader.tsx
+++ b/packages/shared/components/table/TableHeader.tsx
@@ -232,6 +232,12 @@ class TableHeaderComponent extends React.Component<
const maxSize = Math.max.apply(Math, clearSize);
const defaultSize = columns[activeColumnIndex - 1].defaultSize;
+
+ if (!Array.isArray(clearSize)) {
+ console.log("addNewColumns clearSize", clearSize);
+ return true;
+ }
+
const indexOfMaxSize = clearSize.findLastIndex((s) => s === maxSize);
const addedColumn = 1;
From 6eecaaede6a7416b8eb5750c6c5aee6e81b00122 Mon Sep 17 00:00:00 2001
From: Akmal Isomadinov
Date: Mon, 12 Aug 2024 19:03:51 +0500
Subject: [PATCH 38/45] Shared:ImageViewer Added query parameter for thumbnail
URL
---
.../media-viewer/sub-components/ImageViewer/index.tsx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/packages/shared/components/media-viewer/sub-components/ImageViewer/index.tsx b/packages/shared/components/media-viewer/sub-components/ImageViewer/index.tsx
index 388e668fae..1bbd458427 100644
--- a/packages/shared/components/media-viewer/sub-components/ImageViewer/index.tsx
+++ b/packages/shared/components/media-viewer/sub-components/ImageViewer/index.tsx
@@ -988,7 +988,7 @@ export const ImageViewer = ({
window.ClientConfig?.imageThumbnails &&
thumbnailSrc &&
!showOriginSrc
- ? `${thumbnailSrc}&size=3840x2160`
+ ? `${thumbnailSrc}&size=3840x2160&view=true`
: src
}
ref={imgRef}
From 51fa9bc2c5054d96998be0a17a5de5ef5afd7ad5 Mon Sep 17 00:00:00 2001
From: Viktor Fomin
Date: Mon, 12 Aug 2024 17:07:46 +0300
Subject: [PATCH 39/45] Management: fix mobile style
---
.../sub-components/RowView/RoomContent.tsx | 19 +++++++++++++------
1 file changed, 13 insertions(+), 6 deletions(-)
diff --git a/packages/management/src/categories/spaces/sub-components/RowView/RoomContent.tsx b/packages/management/src/categories/spaces/sub-components/RowView/RoomContent.tsx
index 4ec1006a3c..54831deb73 100644
--- a/packages/management/src/categories/spaces/sub-components/RowView/RoomContent.tsx
+++ b/packages/management/src/categories/spaces/sub-components/RowView/RoomContent.tsx
@@ -26,20 +26,17 @@
import React from "react";
import { useTranslation } from "react-i18next";
+import styled from "styled-components";
+
import { RowContent } from "@docspace/shared/components/row-content";
import { Text } from "@docspace/shared/components/text";
-import styled, { css } from "styled-components";
-import { isMobileOnly } from "react-device-detect";
import { getConvertedSize } from "@docspace/shared/utils/common";
+import { mobile } from "@docspace/shared/utils";
import { TPortals } from "SRC_DIR/types/spaces";
const StyledRowContent = styled(RowContent)`
padding-bottom: 10px;
.row-main-container-wrapper {
- ${isMobileOnly &&
- css`
- margin-top: 14px;
- `}
display: flex;
justify-content: flex-start;
}
@@ -47,6 +44,16 @@ const StyledRowContent = styled(RowContent)`
.mainIcons {
height: 20px;
}
+
+ @media ${mobile} {
+ .row-main-container-wrapper {
+ flex-direction: column;
+ }
+
+ .mainIcons {
+ align-self: flex-start;
+ }
+ }
`;
type TRoomContent = {
From b614938b2b46f8654c16fb7332636d9aa2fb3ef6 Mon Sep 17 00:00:00 2001
From: Alexey Safronov
Date: Mon, 12 Aug 2024 18:56:12 +0400
Subject: [PATCH 40/45] Login: Ldap: fix display wrong placeholder on disabled
LDAP settings
---
packages/login/src/app/(root)/page.tsx | 2 +-
packages/login/src/components/LoginForm/index.tsx | 8 +++-----
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/packages/login/src/app/(root)/page.tsx b/packages/login/src/app/(root)/page.tsx
index 1a5de16d06..fe7451e38e 100644
--- a/packages/login/src/app/(root)/page.tsx
+++ b/packages/login/src/app/(root)/page.tsx
@@ -70,7 +70,7 @@ async function Page() {
reCaptchaPublicKey={settings?.recaptchaPublicKey}
reCaptchaType={settings?.recaptchaType}
ldapDomain={capabilities?.ldapDomain}
- ldapEnabled={capabilities?.ldapEnabled}
+ ldapEnabled={capabilities?.ldapEnabled || false}
/>
{
- setIsLdapLoginChecked(!!ldapDomain);
- }, [ldapDomain]);
-
useEffect(() => {
const profile = localStorage.getItem("profile");
if (!profile) return;
From 26824d6df9e6cc6c5fc0667990d6419a3618e2ff Mon Sep 17 00:00:00 2001
From: Elyor Djalilov
Date: Tue, 13 Aug 2024 10:55:26 +0500
Subject: [PATCH 41/45] Fix Bug 67170 - Settings: Data Import. The Upload to
server button is missing when uploading an inappropriate archive
---
.../OnlyofficeWorkspace/Stepper/SelectFileStep/index.js | 1 +
1 file changed, 1 insertion(+)
diff --git a/packages/client/src/pages/PortalSettings/categories/data-import/OnlyofficeWorkspace/Stepper/SelectFileStep/index.js b/packages/client/src/pages/PortalSettings/categories/data-import/OnlyofficeWorkspace/Stepper/SelectFileStep/index.js
index 7829f406c3..58fc02f3dc 100644
--- a/packages/client/src/pages/PortalSettings/categories/data-import/OnlyofficeWorkspace/Stepper/SelectFileStep/index.js
+++ b/packages/client/src/pages/PortalSettings/categories/data-import/OnlyofficeWorkspace/Stepper/SelectFileStep/index.js
@@ -208,6 +208,7 @@ const SelectFileStep = ({
setIsFileError(true);
setIsFileLoading(false);
clearInterval(uploadInterval.current);
+ setShowErrorText(true);
return;
}
From 6d0f5ee5193860c41f781531e16f23e2b7a457c4 Mon Sep 17 00:00:00 2001
From: Ilya Oleshko
Date: Tue, 13 Aug 2024 11:39:54 +0300
Subject: [PATCH 42/45] JS-SDK: SDK bumped to 1.0.1 version. Added
showHeaderBanner option for header info bar configuration
---
public/scripts/sdk/1.0.1/api.js | 1353 +++++++++++++++++++++++++++++++
1 file changed, 1353 insertions(+)
create mode 100644 public/scripts/sdk/1.0.1/api.js
diff --git a/public/scripts/sdk/1.0.1/api.js b/public/scripts/sdk/1.0.1/api.js
new file mode 100644
index 0000000000..ae265191e0
--- /dev/null
+++ b/public/scripts/sdk/1.0.1/api.js
@@ -0,0 +1,1353 @@
+// (c) Copyright Ascensio System SIA 2009-2024
+//
+// This program is a free software product.
+// You can redistribute it and/or modify it under the terms
+// of the GNU Affero General Public License (AGPL) version 3 as published by the Free Software
+// Foundation. In accordance with Section 7(a) of the GNU AGPL its Section 15 shall be amended
+// to the effect that Ascensio System SIA expressly excludes the warranty of non-infringement of
+// any third-party rights.
+//
+// This program is distributed WITHOUT ANY WARRANTY, without even the implied warranty
+// of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For details, see
+// the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
+//
+// You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, EU, LV-1021.
+//
+// The interactive user interfaces in modified source and object code versions of the Program must
+// display Appropriate Legal Notices, as required under Section 5 of the GNU AGPL version 3.
+//
+// Pursuant to Section 7(b) of the License you must retain the original Product logo when
+// distributing the program. Pursuant to Section 7(e) we decline to grant you any rights under
+// trademark law for use of our trademarks.
+//
+// All the Product's GUI elements, including illustrations and icon sets, as well as technical writing
+// 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
+
+(function () {
+ const FRAME_NAME = "frameDocSpace";
+
+ const defaultConfig = {
+ src: new URL(document.currentScript.src).origin,
+ rootPath: "/rooms/shared/",
+ requestToken: null,
+ width: "100%",
+ height: "100%",
+ name: FRAME_NAME,
+ type: "desktop", // TODO: ["desktop", "mobile"]
+ frameId: "ds-frame",
+ mode: "manager", //TODO: ["manager", "editor", "viewer","room-selector", "file-selector", "system"]
+ id: null,
+ locale: null,
+ theme: "System",
+ editorType: "desktop", //TODO: ["desktop", "embedded"]
+ editorGoBack: true,
+ selectorType: "exceptPrivacyTrashArchiveFolders", //TODO: ["roomsOnly", "userFolderOnly", "exceptPrivacyTrashArchiveFolders", "exceptSortedByTagsFolders"]
+ showSelectorCancel: false,
+ showSelectorHeader: false,
+ showHeader: false,
+ showHeaderBanner: "none", //TODO: ["none", "info", "all"]
+ showTitle: true,
+ showMenu: false,
+ showFilter: false,
+ showSignOut: true,
+ destroyText: "",
+ viewAs: "row", //TODO: ["row", "table", "tile"]
+ viewTableColumns: "Name,Type,Tags",
+ checkCSP: true,
+ disableActionButton: false,
+ showSettings: false,
+ waiting: false,
+ withSearch: true,
+ withBreadCrumbs: true,
+ withSubtitle: true,
+ filterParam: "ALL",
+ buttonColor: "#5299E0",
+ infoPanelVisible: true,
+ downloadToEvent: false,
+ filter: {
+ // filterType: 0,
+ // type: 0,
+ count: 100,
+ page: 1,
+ sortorder: "descending", //TODO: ["descending", "ascending"]
+ sortby: "DateAndTime", //TODO: ["DateAndTime", "AZ", "Type", "Size", "DateAndTimeCreation", "Author"]
+ search: "",
+ withSubfolders: false,
+ },
+ editorCustomization: {},
+ keysForReload: [
+ "src",
+ "rootPath",
+ "width",
+ "height",
+ "name",
+ "frameId",
+ "id",
+ "type",
+ "editorType",
+ "mode",
+ ],
+ events: {
+ onSelectCallback: null,
+ onCloseCallback: null,
+ onAppReady: null,
+ onAppError: (e) => console.log("onAppError", e),
+ onEditorCloseCallback: null,
+ onAuthSuccess: null,
+ onSignOut: null,
+ onDownload: null,
+ },
+ };
+
+ const lt = //g;
+ const rgt = "&rt;";
+
+ const cspErrorText =
+ "The current domain is not set in the Content Security Policy (CSP) settings.";
+
+ const validateCSP = async (targetSrc) => {
+ let currentSrc = window.location.origin;
+
+ if (currentSrc.indexOf(targetSrc) !== -1) return; // skip check for the same domain
+
+ const response = await fetch(`${targetSrc}/api/2.0/security/csp`);
+ const res = await response.json();
+
+ currentSrc = window.location.host || new URL(window.location.origin).host; // more flexible way to check
+
+ const domains = [...res.response.domains].map((d) => {
+ try {
+ const domain = new URL(d.toLowerCase());
+ const domainFull =
+ domain.host + (domain.pathname !== "/" ? domain.pathname : "");
+
+ return domainFull;
+ } catch {
+ return d;
+ }
+ });
+
+ const passed = domains.includes(currentSrc.toLowerCase());
+
+ if (!passed) throw new Error(cspErrorText);
+
+ return;
+ };
+
+ const getConfigFromParams = () => {
+ const src = decodeURIComponent(document.currentScript.src);
+
+ if (!src || !src.length) return null;
+
+ const searchUrl = src.split("?")[1];
+ let object = {};
+
+ if (searchUrl && searchUrl.length) {
+ object = JSON.parse(
+ `{"${searchUrl.replace(/&/g, '","').replace(/=/g, '":"')}"}`,
+ (k, v) => (v === "true" ? true : v === "false" ? false : v)
+ );
+
+ object.filter = defaultConfig.filter;
+
+ for (prop in object) {
+ if (prop in defaultConfig.filter) {
+ object.filter[prop] = object[prop];
+ delete object[prop];
+ }
+ }
+ }
+
+ return { ...defaultConfig, ...object };
+ };
+
+ /**
+ * Represents the DocSpace class.
+ * @class
+ */
+ class DocSpace {
+ #isConnected = false;
+ #frameOpacity = 0;
+ #callbacks = [];
+ #tasks = [];
+ #classNames = "";
+
+ constructor(config) {
+ this.config = config;
+ }
+
+ /**
+ * Checks if any of the keys in the given array exist in the provided object.
+ *
+ * @param {Array} array - The array of keys to check.
+ * @param {Object} object - The object to check against.
+ * @returns {boolean} - Returns true if any of the keys exist in the object, otherwise false.
+ */
+ #oneOfExistInObject = (array, object) => {
+ return Object.keys(object).some((k) => array.includes(k));
+ };
+
+ /**
+ * Creates a loader element with the specified configuration.
+ *
+ * @param {Object} config - The configuration object for the loader.
+ * @param {string} config.width - The width of the loader container.
+ * @param {string} config.height - The height of the loader container.
+ * @param {string} config.src - The source path for the loader image.
+ * @param {string} config.theme - The theme of the loader (e.g., "Dark", "System").
+ * @param {string} config.frameId - The ID of the loader frame.
+ * @returns {HTMLElement} The loader container element.
+ */
+ #createLoader = (config) => {
+ const container = document.createElement("div");
+ container.style.width = config.width;
+ container.style.height = config.height;
+ container.style.display = "flex";
+ container.style.justifyContent = "center";
+ container.style.alignItems = "center";
+
+ // const loader = document.createElement("img");
+ // loader.setAttribute("src", `${config.src}/static/images/loader.svg`);
+ // loader.setAttribute("width", `64px`);
+ // loader.setAttribute("height", `64px`);
+
+ // if (
+ // config.theme === "Dark" ||
+ // (config.theme === "System" &&
+ // window.matchMedia("(prefers-color-scheme: dark)"))
+ // ) {
+ // container.style.backgroundColor = "#333333";
+ // loader.style.filter =
+ // "invert(100%) sepia(100%) saturate(0%) hue-rotate(288deg) brightness(102%) contrast(102%)";
+ // }
+
+ const loader = document.createElement("div");
+ const loaderClass = `${config.frameId}-loader__element`;
+ loader.setAttribute("class", loaderClass);
+
+ container.appendChild(loader);
+
+ const style = document.createElement("style");
+ style.innerHTML = `
+ @keyframes rotate {
+ 0%{
+ transform: rotate(-45deg);
+ }
+ 15%{
+ transform: rotate(45deg);
+ }
+ 30%{
+ transform: rotate(135deg);
+ }
+ 45%{
+ transform: rotate(225deg);
+ }
+ 60%, 100%{
+ transform: rotate(315deg);
+ }
+ }
+
+ .${loaderClass} {
+ width: 74px;
+ height: 74px;
+
+ border: 4px solid rgba(51,51,51, 0.1);
+ border-top-color: #333333;
+ border-radius: 50%;
+
+ transform: rotate(-45deg);
+
+ position: relative;
+
+ box-sizing: border-box;
+
+ animation: 1s linear infinite rotate;
+ }
+
+ @media (prefers-color-scheme: dark) {
+ .${loaderClass} {
+ border-color: rgba(204, 204, 204, 0.1);
+ border-top-color: #CCCCCC;
+ }
+ }
+ `;
+
+ container.appendChild(style);
+
+ container.setAttribute("id", config.frameId + "-loader");
+
+ return container;
+ };
+
+ /**
+ * Creates a button view based on the provided configuration.
+ *
+ * @param {Object} config - The configuration object for the button view.
+ * @param {string} config.buttonColor - The background color of the button. Defaults to "#5299E0".
+ * @param {boolean} config.buttonWithLogo - Determines whether the button should include a logo. Defaults to false.
+ * @param {string} config.buttonText - The text to display on the button. Defaults to "Select to DocSpace".
+ * @param {string} config.src - The source URL for the logo image.
+ * @param {string} config.frameId - The ID of the container element for the button.
+ * @param {Object} config.events - The event callbacks for the button.
+ * @param {Function} config.events.onSelectCallback - The callback function to be executed when an item is selected.
+ * @param {Function} config.events.onCloseCallback - The callback function to be executed when the button view is closed.
+ * @param {Function} config.events.onAppReady - The callback function to be executed when the DocSpace app is ready.
+ * @param {Function} config.events.onAppError - The callback function to be executed when an error occurs in the DocSpace app.
+ * @param {Function} config.events.onEditorCloseCallback - The callback function to be executed when the editor is closed.
+ * @param {Function} config.events.onAuthSuccess - The callback function to be executed when authentication is successful.
+ * @param {Function} config.events.onSignOut - The callback function to be executed when the user signs out.
+ * @returns {HTMLButtonElement} The created button element.
+ */
+ #createButtonView = (config) => {
+ const button = document.createElement("button");
+ button.style.backgroundColor = config?.buttonColor || "#5299E0";
+ button.style.color = "#fff";
+ button.style.padding = "0 28px";
+ button.style.borderRadius = "3px";
+ button.style.border = `1px solid #5299E0`;
+ button.style.height = "32px";
+ button.style.fontWeight = "600";
+ button.style.fontFamily = "Open Sans";
+ button.style.cursor = "pointer";
+ button.style.display = "flex";
+ button.style.alignItems = "center";
+ button.style.gap = "10px";
+ button.style.userSelect = "none";
+ button.style.borderColor = config?.buttonColor || "#5299E0";
+
+ const logoSrc = `${config.src}/static/images/light_small_logo.react.svg`;
+
+ button.innerHTML = `${config?.buttonWithLogo ? `
` : ""}${config?.buttonText || "Select to DocSpace"}`;
+ const url = new URL(document.currentScript.src);
+ const scriptUrl = `${url.origin}${url.pathname}`;
+
+ const configStringify = JSON.stringify(config, function (key, val) {
+ return typeof val === "function" ? "" + val : val;
+ })
+ .replace(lt, rlt)
+ .replace(gt, rgt);
+
+ const windowHeight = 778,
+ windowWidth = 610;
+
+ button.addEventListener("click", () => {
+ const winHtml = `
+
+
+
+ DocSpace
+
+
+
+
+
+
+
+ `;
+
+ const winUrl = URL.createObjectURL(
+ new Blob([winHtml], { type: "text/html" })
+ );
+
+ window.open(
+ winUrl,
+ "_blank",
+ `width=${windowWidth},height=${windowHeight}`
+ );
+ });
+
+ button.setAttribute("id", config.frameId + "-container");
+
+ return button;
+ };
+
+ /**
+ * Creates an iframe element based on the provided configuration.
+ *
+ * @param {Object} config - The configuration object for creating the iframe.
+ * @param {string} config.mode - The mode of the iframe.
+ * @param {Object} config.filter - The filter object for the iframe.
+ * @param {string} config.id - The ID of the iframe.
+ * @param {string} config.requestToken - The request token for the iframe.
+ * @param {boolean} config.withSubfolders - Indicates whether to include subfolders in the iframe.
+ * @param {string} config.rootPath - The root path for the iframe.
+ * @param {string} config.editorGoBack - The go back option for the editor iframe.
+ * @param {Object} config.editorCustomization - The customization object for the editor iframe.
+ * @param {string} config.theme - The theme for the editor iframe.
+ * @param {Function} config.events.onEditorCloseCallback - The callback function for the editor close event.
+ * @param {string} config.editorType - The type of the editor iframe.
+ * @param {string} config.action - The action for the viewer iframe.
+ * @param {string} config.src - The source URL for the iframe.
+ * @param {string} config.width - The width of the iframe.
+ * @param {string} config.height - The height of the iframe.
+ * @param {string} config.name - The name of the iframe.
+ * @param {string} config.frameId - The ID of the iframe.
+ * @param {string} config.type - The type of the iframe.
+ * @param {boolean} config.checkCSP - Indicates whether to check the Content Security Policy.
+ * @returns {HTMLIFrameElement} The created iframe element.
+ */
+ #createIframe = (config) => {
+ const iframe = document.createElement("iframe");
+
+ let path = "";
+
+ switch (config.mode) {
+ case "manager": {
+ if (config.filter) {
+ if (config.id) config.filter.folder = config.id;
+
+ const params = config.requestToken
+ ? { key: config.requestToken, ...config.filter }
+ : config.filter;
+
+ if (!params.withSubfolders) {
+ delete params.withSubfolders;
+ }
+
+ const urlParams = new URLSearchParams(params).toString();
+
+ path = `${config.rootPath}${
+ config.requestToken
+ ? `?${urlParams}`
+ : `${config.id ? config.id + "/" : ""}filter?${urlParams}`
+ }`;
+ }
+ break;
+ }
+
+ case "room-selector": {
+ path = `/sdk/room-selector`;
+ break;
+ }
+
+ case "file-selector": {
+ path = `/sdk/file-selector?selectorType=${config.selectorType}`;
+ break;
+ }
+
+ case "system": {
+ path = `/sdk/system`;
+ break;
+ }
+
+ case "editor": {
+ let goBack = config.editorGoBack;
+ config.editorCustomization.uiTheme = config.theme;
+
+ if (!config.id || config.id === "undefined" || config.id === "null") {
+ config.id = -1; //editor default wrong file id error
+ }
+
+ const customization = JSON.stringify(config.editorCustomization);
+
+ if (
+ config.events.onEditorCloseCallback &&
+ typeof config.events.onEditorCloseCallback === "function"
+ ) {
+ goBack = "event";
+ }
+
+ path = `/doceditor/?fileId=${config.id}&editorType=${config.editorType}&editorGoBack=${goBack}&customization=${customization}`;
+
+ if (config.requestToken) {
+ path = `${path}&share=${config.requestToken}`;
+ }
+
+ break;
+ }
+
+ case "viewer": {
+ let goBack = config.editorGoBack;
+ config.editorCustomization.uiTheme = config.theme;
+
+ if (!config.id || config.id === "undefined" || config.id === "null") {
+ config.id = -1; //editor default wrong file id error
+ }
+
+ const customization = JSON.stringify(config.editorCustomization);
+
+ if (
+ config.events.onEditorCloseCallback &&
+ typeof config.events.onEditorCloseCallback === "function"
+ ) {
+ goBack = "event";
+ }
+
+ path = `/doceditor/?fileId=${config.id}&editorType=${config.editorType}&action=view&editorGoBack=${goBack}&customization=${customization}`;
+
+ if (config.requestToken) {
+ path = `${path}&share=${config.requestToken}`;
+ }
+
+ break;
+ }
+
+ default:
+ path = config.rootPath;
+ }
+
+ iframe.src = config.src + path;
+ iframe.style.width = config.width;
+ iframe.style.height = config.height;
+ iframe.name = `${FRAME_NAME}__#${config.frameId}`;
+ iframe.id = config.frameId;
+
+ iframe.frameBorder = 0;
+ iframe.allowFullscreen = true;
+ iframe.setAttribute("allow", "storage-access *");
+
+ if (config.type == "mobile") {
+ iframe.style.position = "fixed";
+ iframe.style.overflow = "hidden";
+ document.body.style.overscrollBehaviorY = "contain";
+ }
+
+ if (this.config.checkCSP) {
+ validateCSP(this.config.src).catch((e) => {
+ const html = `
+
+
+
Date: Tue, 13 Aug 2024 11:40:29 +0300
Subject: [PATCH 43/45] Shared: Fixed JS-SDK version constant
---
packages/shared/constants/index.ts | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/packages/shared/constants/index.ts b/packages/shared/constants/index.ts
index 568f8437bf..bf45a089ea 100644
--- a/packages/shared/constants/index.ts
+++ b/packages/shared/constants/index.ts
@@ -171,7 +171,8 @@ export const HTML_EXST = [".htm", ".mht", ".html"];
export const SYSTEM_THEME_KEY = "system_theme";
-const SDK_VERSION = "1.0.0";
+const SDK_VERSION = "1.0.1";
+
export const SDK_SCRIPT_URL =
typeof window !== "undefined"
? `${window.location.origin}/static/scripts/sdk/${SDK_VERSION}/api.js`
From e5bbb84f048ef8cd81306dd6c5bde072160fd0f3 Mon Sep 17 00:00:00 2001
From: Ilya Oleshko
Date: Tue, 13 Aug 2024 11:42:06 +0300
Subject: [PATCH 44/45] Fixed Bug 66907: Added option for show info bar inside
js-sdk frame
---
packages/client/src/Shell.jsx | 4 +++-
packages/client/src/components/MainBar/index.js | 8 ++++----
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/packages/client/src/Shell.jsx b/packages/client/src/Shell.jsx
index 9523d6901a..bbc0834a4a 100644
--- a/packages/client/src/Shell.jsx
+++ b/packages/client/src/Shell.jsx
@@ -88,6 +88,7 @@ const Shell = ({ items = [], page = "home", ...rest }) => {
version,
pagesWithoutNavMenu,
isFrame,
+ barTypeInFrame,
} = rest;
const theme = useTheme();
@@ -457,7 +458,7 @@ const Shell = ({ items = [], page = "home", ...rest }) => {
- {!isFrame &&
Date: Tue, 13 Aug 2024 13:56:17 +0400
Subject: [PATCH 45/45] Fix imports of lodash functions (imports cost issues)
---
.vscode/extensions.json | 3 ++-
.../DataReassignmentDialog/sub-components/Body/AccountInfo.js | 2 +-
packages/client/src/helpers/people-helpers.js | 3 ++-
packages/client/src/store/PluginStore.ts | 2 +-
packages/shared/components/cron/Cron.utils.ts | 2 +-
.../components/link-with-dropdown/LinkWithDropdown.styled.tsx | 2 --
.../media-viewer/sub-components/ViewerPlayer/index.tsx | 4 ++--
7 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
index ab5da4d838..89167f14bb 100644
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@@ -10,6 +10,7 @@
"formulahendry.auto-complete-tag",
"formulahendry.auto-rename-tag",
"mrmlnc.vscode-duplicate",
- "ms-python.python"
+ "ms-python.python",
+ "wix.vscode-import-cost"
]
}
diff --git a/packages/client/src/components/dialogs/DataReassignmentDialog/sub-components/Body/AccountInfo.js b/packages/client/src/components/dialogs/DataReassignmentDialog/sub-components/Body/AccountInfo.js
index 132b9aa0f8..be18dd934e 100644
--- a/packages/client/src/components/dialogs/DataReassignmentDialog/sub-components/Body/AccountInfo.js
+++ b/packages/client/src/components/dialogs/DataReassignmentDialog/sub-components/Body/AccountInfo.js
@@ -31,7 +31,7 @@ import { Avatar } from "@docspace/shared/components/avatar";
import CatalogSpamIcon from "PUBLIC_DIR/images/catalog.spam.react.svg";
import { commonIconsStyles } from "@docspace/shared/utils";
-import { capitalize } from "lodash";
+import capitalize from "lodash/capitalize";
const StyledCatalogSpamIcon = styled(CatalogSpamIcon)`
${commonIconsStyles}
diff --git a/packages/client/src/helpers/people-helpers.js b/packages/client/src/helpers/people-helpers.js
index 8e0534d72d..cf71235b6d 100644
--- a/packages/client/src/helpers/people-helpers.js
+++ b/packages/client/src/helpers/people-helpers.js
@@ -27,7 +27,8 @@
import React from "react";
import { Trans } from "react-i18next";
import MailReactSvgUrl from "PUBLIC_DIR/images/mail.react.svg?url";
-import { find, cloneDeep } from "lodash";
+import cloneDeep from "lodash/cloneDeep";
+import find from "lodash/find";
import {
EmployeeActivationStatus,
EmployeeStatus,
diff --git a/packages/client/src/store/PluginStore.ts b/packages/client/src/store/PluginStore.ts
index c0f80c2732..b11928051c 100644
--- a/packages/client/src/store/PluginStore.ts
+++ b/packages/client/src/store/PluginStore.ts
@@ -26,7 +26,7 @@
/* eslint-disable no-console */
import { makeAutoObservable, runInAction } from "mobx";
-import { cloneDeep } from "lodash";
+import cloneDeep from "lodash/cloneDeep";
import api from "@docspace/shared/api";
import { SettingsStore } from "@docspace/shared/store/SettingsStore";
diff --git a/packages/shared/components/cron/Cron.utils.ts b/packages/shared/components/cron/Cron.utils.ts
index 08714ec583..d331d45ced 100644
--- a/packages/shared/components/cron/Cron.utils.ts
+++ b/packages/shared/components/cron/Cron.utils.ts
@@ -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 { capitalize } from "lodash";
+import capitalize from "lodash/capitalize";
import { DateTime, Info } from "luxon";
import {
diff --git a/packages/shared/components/link-with-dropdown/LinkWithDropdown.styled.tsx b/packages/shared/components/link-with-dropdown/LinkWithDropdown.styled.tsx
index 186802cb30..adeaf4380f 100644
--- a/packages/shared/components/link-with-dropdown/LinkWithDropdown.styled.tsx
+++ b/packages/shared/components/link-with-dropdown/LinkWithDropdown.styled.tsx
@@ -24,7 +24,6 @@
// 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 from "react";
import styled, { css } from "styled-components";
import ExpanderDownReactSvg from "PUBLIC_DIR/images/expander-down.react.svg";
@@ -32,7 +31,6 @@ import { Base } from "../../themes";
import { Text } from "../text";
import { TextProps } from "../text/Text.types";
-// import { transform } from "lodash";
import {
SimpleLinkWithDropdownProps,
TDropdownType,
diff --git a/packages/shared/components/media-viewer/sub-components/ViewerPlayer/index.tsx b/packages/shared/components/media-viewer/sub-components/ViewerPlayer/index.tsx
index 7fc8eb919f..e908d44628 100644
--- a/packages/shared/components/media-viewer/sub-components/ViewerPlayer/index.tsx
+++ b/packages/shared/components/media-viewer/sub-components/ViewerPlayer/index.tsx
@@ -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 lodash from "lodash";
+import omit from "lodash/omit";
import { useGesture } from "@use-gesture/react";
import { useSpring, animated } from "@react-spring/web";
import {
@@ -640,7 +640,7 @@ export const ViewerPlayer = ({
ref={videoRef}
hidden={isAudio}
preload="metadata"
- style={lodash.omit(style, ["x", "y"])}
+ style={omit(style, ["x", "y"])}
src={thumbnailSrc ? src : `${src}#t=0.001`}
poster={posterUrl}
onError={hadleError}
+
+ `;
+ iframe.srcdoc = html;
+ e.message && config.events.onAppError(e.message);
+
+ this.setIsLoaded();
+ });
+ }
+
+ return iframe;
+ };
+
+ /**
+ * Sends a message to the specified frame.
+ * @param {any} message - The message to be sent.
+ */
+ #sendMessage = (message) => {
+ let mes = {
+ frameId: this.config.frameId,
+ type: "",
+ data: message,
+ };
+
+ const targetFrame = document.getElementById(this.config.frameId);
+
+ if (targetFrame && !!targetFrame.contentWindow) {
+ targetFrame.contentWindow.postMessage(
+ JSON.stringify(mes, (key, value) =>
+ typeof value === "function" ? value.toString() : value
+ ),
+ this.config.src
+ );
+ }
+ };
+
+ /**
+ * Handles incoming messages from the server.
+ *
+ * @param {MessageEvent} e - The message event object.
+ */
+ #onMessage = (e) => {
+ if (typeof e.data == "string") {
+ let data = {};
+
+ try {
+ data = JSON.parse(e.data);
+ } catch (err) {
+ data = {};
+ }
+
+ if (this.config.frameId !== data.frameId) {
+ return;
+ }
+
+ switch (data.type) {
+ case "onMethodReturn": {
+ if (this.#callbacks.length > 0) {
+ const callback = this.#callbacks.shift();
+ callback && callback(data.methodReturnData);
+ }
+
+ if (this.#tasks.length > 0) {
+ this.#sendMessage(this.#tasks.shift());
+ }
+ break;
+ }
+ case "onEventReturn": {
+ if (Object.keys(this.config).length === 0) return;
+ if (
+ data?.eventReturnData?.event in this.config.events &&
+ typeof this.config.events[data?.eventReturnData.event] ===
+ "function"
+ ) {
+ this.config.events[data?.eventReturnData.event](
+ data?.eventReturnData?.data
+ );
+ }
+ break;
+ }
+ case "onCallCommand": {
+ this[data.commandName].call(this, data.commandData);
+ break;
+ }
+ default:
+ break;
+ }
+ }
+ };
+
+ /**
+ * Executes a method on the message bus.
+ *
+ * @param {string} methodName - The name of the method to execute.
+ * @param {any} params - The parameters to pass to the method.
+ * @param {Function} callback - The callback function to be called after the method execution.
+ * @returns {void}
+ */
+ #executeMethod = (methodName, params, callback) => {
+ if (!this.#isConnected) {
+ this.config.events.onAppError(
+ "Message bus is not connected with frame"
+ );
+ return;
+ }
+
+ this.#callbacks.push(callback);
+
+ const message = {
+ type: "method",
+ methodName,
+ data: params,
+ };
+
+ if (this.#callbacks.length !== 1) {
+ this.#tasks.push(message);
+ return;
+ }
+
+ this.#sendMessage(message);
+ };
+
+ /**
+ * Initializes the button with the provided configuration.
+ *
+ * @param {Object} config - The configuration object for the button.
+ * @returns {HTMLElement} - The initialized button element.
+ */
+ initButton(config) {
+ const configFull = { ...defaultConfig, ...config };
+ this.config = {
+ ...this.config,
+ ...configFull,
+ events: { ...defaultConfig.events },
+ };
+
+ const target = document.getElementById(this.config.frameId);
+
+ let button = null;
+
+ if (target) {
+ button = this.#createButtonView(this.config);
+
+ this.#classNames = target.className;
+
+ const isSelfReplace = target.parentNode.isEqualNode(
+ document.getElementById(this.config.frameId + "-container")
+ );
+
+ target && isSelfReplace
+ ? target.parentNode.replaceWith(button)
+ : target.replaceWith(button);
+
+ window.addEventListener("message", this.#onMessage, false);
+
+ this.#isConnected = true;
+ }
+
+ window.DocSpace.SDK.frames = window.DocSpace.SDK.frames || [];
+
+ window.DocSpace.SDK.frames[this.config.frameId] = this;
+
+ return button;
+ }
+
+ /**
+ * Initializes the frame with the provided configuration.
+ *
+ * @param {Object} config - The configuration object for the frame.
+ * @returns {HTMLIFrameElement} - The created iframe element.
+ */
+ initFrame(config) {
+ const configFull = { ...defaultConfig, ...config };
+ Object.entries(configFull).map(([key, value]) => {
+ if (typeof value === "string")
+ configFull[key] = value.replaceAll(rlt, "<").replaceAll(rgt, ">");
+ });
+ this.config = { ...this.config, ...configFull };
+
+ const target = document.getElementById(this.config.frameId);
+
+ let iframe = null;
+
+ if (target) {
+ iframe = this.#createIframe(this.config);
+
+ iframe.style.opacity = this.#frameOpacity;
+ iframe.style.zIndex = 2;
+ iframe.style.position = "absolute";
+ iframe.style.width = "100%";
+ iframe.style.height = "100%";
+ iframe.style.top = 0;
+ iframe.style.left = 0;
+
+ const frameLoader = this.#createLoader(this.config);
+
+ this.#classNames = target.className;
+
+ const renderContainer = document.createElement("div");
+ renderContainer.id = this.config.frameId + "-container";
+ renderContainer.classList = ["frame-container"];
+ renderContainer.style.position = "relative";
+ renderContainer.style.width = "100%";
+ renderContainer.style.height = "100%";
+
+ if (!this.config.waiting || this.config.mode === "system") {
+ renderContainer.appendChild(iframe);
+ }
+
+ renderContainer.appendChild(frameLoader);
+
+ const isSelfReplace = target.parentNode.isEqualNode(
+ document.getElementById(this.config.frameId + "-container")
+ );
+
+ target && isSelfReplace
+ ? target.parentNode.replaceWith(renderContainer)
+ : target.replaceWith(renderContainer);
+
+ window.addEventListener("message", this.#onMessage, false);
+
+ this.#isConnected = true;
+ }
+
+ window.DocSpace.SDK.frames = window.DocSpace.SDK.frames || {};
+
+ window.DocSpace.SDK.frames[this.config.frameId] = this;
+
+ return iframe;
+ }
+
+ /**
+ * Initializes the manager mode.
+ * @param {Object} config - The configuration object.
+ * @returns {Promise} A promise that resolves when the frame is initialized.
+ */
+ initManager(config = {}) {
+ config.mode = "manager";
+
+ return this.initFrame(config);
+ }
+
+ /**
+ * Sets the loaded state of the target frame and removes the loader element.
+ */
+ setIsLoaded() {
+ const targetFrame = document.getElementById(this.config.frameId);
+ const loader = document.getElementById(this.config.frameId + "-loader");
+
+ if (targetFrame) {
+ targetFrame.style.opacity = 1;
+ targetFrame.style.position = "relative";
+ targetFrame.style.width = this.config.width;
+ targetFrame.style.height = this.config.height;
+ targetFrame.parentNode.style.height = "inherit";
+
+ if (loader) loader.remove();
+ }
+ }
+
+ /**
+ * Initializes the editor.
+ * @param {Object} config - The configuration object for the editor.
+ * @returns {Object} - The initialized frame object.
+ */
+ initEditor(config = {}) {
+ config.mode = "editor";
+
+ return this.initFrame(config);
+ }
+
+ /**
+ * Initializes the viewer mode.
+ * @param {Object} config - The configuration object.
+ * @returns {Promise} A promise that resolves when the viewer is initialized.
+ */
+ initViewer(config = {}) {
+ config.mode = "viewer";
+
+ return this.initFrame(config);
+ }
+
+ /**
+ * Initializes the room selector.
+ *
+ * @param {Object} config - The configuration object.
+ * @returns {Object} - The initialized frame.
+ */
+ initRoomSelector(config = {}) {
+ config.mode = "room-selector";
+
+ return this.initFrame(config);
+ }
+
+ /**
+ * Initializes the file selector mode.
+ * @param {Object} config - The configuration object.
+ * @returns {Object} - The initialized frame.
+ */
+ initFileSelector(config = {}) {
+ config.mode = "file-selector";
+
+ return this.initFrame(config);
+ }
+
+ /**
+ * Initializes the system with the given configuration.
+ * @param {Object} config - The configuration object.
+ * @returns {Promise} A promise that resolves when the system is initialized.
+ */
+ initSystem(config = {}) {
+ config.mode = "system";
+
+ return this.initFrame(config);
+ }
+
+ /**
+ * Destroys the frame and cleans up associated resources.
+ */
+ destroyFrame() {
+ const target = document.createElement("div");
+
+ target.setAttribute("id", this.config.frameId);
+ target.innerHTML = this.config.destroyText;
+ target.className = this.#classNames;
+
+ const targetFrame = document.getElementById(
+ this.config.frameId + "-container"
+ );
+
+ window.removeEventListener("message", this.#onMessage, false);
+ this.#isConnected = false;
+
+ delete window.DocSpace.SDK.frames[this.config.frameId];
+
+ targetFrame?.parentNode?.replaceChild(target, targetFrame);
+
+ this.config = {};
+ }
+
+ /**
+ * Retrieves a method promise.
+ *
+ * @param {string} methodName - The name of the method.
+ * @param {Object|null} params - The parameters for the method (optional).
+ * @param {boolean} withReload - Indicates whether to reload the configuration (optional).
+ * @returns {Promise} A promise that resolves with the method data.
+ */
+ #getMethodPromise = (methodName, params = null, withReload = false) => {
+ return new Promise((resolve) => {
+ if (withReload) {
+ this.initFrame(this.config);
+ resolve(this.config);
+ } else {
+ this.#executeMethod(methodName, params, (data) => resolve(data));
+ }
+ });
+ };
+
+ /**
+ * Retrieves folder information.
+ * @returns {Promise} A promise that resolves with the folder information.
+ */
+ getFolderInfo() {
+ return this.#getMethodPromise("getFolderInfo");
+ }
+
+ /**
+ * Retrieves the current selection.
+ * @returns {Promise} A promise that resolves with the current selection.
+ */
+ getSelection() {
+ return this.#getMethodPromise("getSelection");
+ }
+
+ /**
+ * Retrieves the files from the server.
+ * @returns {Promise} A promise that resolves with the files.
+ */
+ getFiles() {
+ return this.#getMethodPromise("getFiles");
+ }
+
+ /**
+ * Retrieves the folders from the server.
+ * @returns {Promise} A promise that resolves with the folders data.
+ */
+ getFolders() {
+ return this.#getMethodPromise("getFolders");
+ }
+
+ /**
+ * Retrieves a list of items.
+ * @returns {Promise} A promise that resolves with the list of items.
+ */
+ getList() {
+ return this.#getMethodPromise("getList");
+ }
+
+ /**
+ * Retrieves rooms based on the provided filter.
+ *
+ * @param {Object} filter - The filter object to apply when retrieving rooms.
+ * @returns {Promise} A promise that resolves with the retrieved rooms.
+ */
+ getRooms(filter) {
+ return this.#getMethodPromise("getRooms", filter);
+ }
+
+ /**
+ * Retrieves user information.
+ * @returns {Promise} A promise that resolves with the user information.
+ */
+ getUserInfo() {
+ return this.#getMethodPromise("getUserInfo");
+ }
+
+ /**
+ * Retrieves the configuration object.
+ * @returns {Object} The configuration object.
+ */
+ getConfig() {
+ return this.config;
+ }
+
+ /**
+ * Retrieves the hash settings.
+ * @returns {Promise} A promise that resolves with the hash settings.
+ */
+ getHashSettings() {
+ return this.#getMethodPromise("getHashSettings");
+ }
+
+ /**
+ * Sets the configuration for the API.
+ *
+ * @param {Object} newConfig - The new configuration object.
+ * @param {boolean} [reload=false] - Indicates whether to reload the API after setting the configuration.
+ * @returns {Promise} A promise that resolves when the configuration is set.
+ */
+ setConfig(newConfig = {}, reload = false) {
+ if (this.#oneOfExistInObject(this.config.keysForReload, newConfig))
+ reload = true;
+
+ this.config = { ...this.config, ...newConfig };
+
+ return this.#getMethodPromise("setConfig", this.config, reload);
+ }
+
+ /**
+ * Opens a modal with the specified type and options.
+ *
+ * @param {string} type - The type of the modal.
+ * @param {object} options - The options for the modal.
+ * @returns {Promise} A promise that resolves when the modal is opened.
+ */
+ openModal(type, options) {
+ return this.#getMethodPromise("openModal", { type, options });
+ }
+
+ /**
+ * Creates a file with the specified parameters.
+ *
+ * @param {string} folderId - The ID of the folder where the file will be created.
+ * @param {string} title - The title of the file.
+ * @param {string} templateId - The ID of the template to be used for the file.
+ * @param {string} formId - The ID of the form associated with the file.
+ * @returns {Promise} A promise that resolves with the created file.
+ */
+ createFile(folderId, title, templateId, formId) {
+ return this.#getMethodPromise("createFile", {
+ folderId,
+ title,
+ templateId,
+ formId,
+ });
+ }
+
+ /**
+ * Creates a new folder with the given parent folder ID and title.
+ *
+ * @param {string} parentFolderId - The ID of the parent folder.
+ * @param {string} title - The title of the new folder.
+ * @returns {Promise} A promise that resolves with the result of the createFolder operation.
+ */
+ createFolder(parentFolderId, title) {
+ return this.#getMethodPromise("createFolder", {
+ parentFolderId,
+ title,
+ });
+ }
+
+ /**
+ * Creates a new room with the specified title and room type.
+ * @param {string} title - The title of the room.
+ * @param {string} roomType - The type of the room.
+ * @returns {Promise} A promise that resolves with the created room.
+ */
+ createRoom(title, roomType) {
+ return this.#getMethodPromise("createRoom", {
+ title,
+ roomType,
+ });
+ }
+
+ /**
+ * Sets the view type for the list of items.
+ *
+ * @param {string} type - The type of view to set.
+ * @returns {Promise} - A promise that resolves when the view type is set.
+ */
+ setListView(type) {
+ return this.#getMethodPromise("setItemsView", type);
+ }
+
+ /**
+ * Creates a hash for the given password using the specified hash settings.
+ *
+ * @param {string} password - The password to be hashed.
+ * @param {object} hashSettings - The settings for the hash algorithm.
+ * @returns {Promise} A promise that resolves to the generated hash.
+ */
+ createHash(password, hashSettings) {
+ return this.#getMethodPromise("createHash", { password, hashSettings });
+ }
+
+ /**
+ * Logs in a user with the provided email and password hash.
+ * @param {string} email - The user's email address.
+ * @param {string} passwordHash - The hashed password.
+ * @returns {Promise} A promise that resolves with the login response.
+ */
+ login(email, passwordHash) {
+ return this.#getMethodPromise("login", { email, passwordHash });
+ }
+
+ /**
+ * Logs out the user.
+ * @returns {Promise} A promise that resolves when the user is logged out.
+ */
+ logout() {
+ return this.#getMethodPromise("logout");
+ }
+
+ /**
+ * Creates a new tag with the given name.
+ *
+ * @param {string} name - The name of the tag.
+ * @returns {Promise} A promise that resolves when the tag is created.
+ */
+ createTag(name) {
+ return this.#getMethodPromise("createTag", name);
+ }
+
+ /**
+ * Adds tags to a room.
+ *
+ * @param {string} roomId - The ID of the room.
+ * @param {string[]} tags - An array of tags to add.
+ * @returns {Promise} A promise that resolves when the tags are added successfully.
+ */
+ addTagsToRoom(roomId, tags) {
+ return this.#getMethodPromise("addTagsToRoom", { roomId, tags });
+ }
+
+ /**
+ * Removes tags from a room.
+ *
+ * @param {string} roomId - The ID of the room.
+ * @param {string[]} tags - An array of tags to be removed.
+ * @returns {Promise} A promise that resolves when the tags are successfully removed.
+ */
+ removeTagsFromRoom(roomId, tags) {
+ return this.#getMethodPromise("removeTagsFromRoom", { roomId, tags });
+ }
+ }
+
+ /**
+ * Represents the DocSpace SDK.
+ * @class
+ */
+ class DocSpaceSDK {
+ frames = {};
+ instances = [];
+
+ /**
+ * Initializes a new instance of the DocSpace class and initializes the frame.
+ * @param {Object} config - The configuration object for initializing the DocSpace instance.
+ * @returns {DocSpace} The initialized DocSpace instance.
+ */
+ initFrame = (config) => {
+ const existInstance = this.instances.find(
+ (i) => i.config.frameId === config.frameId
+ );
+
+ if (existInstance) {
+ existInstance.initFrame(config);
+ return existInstance;
+ }
+
+ const instance = new DocSpace(config);
+
+ instance.initFrame(config);
+
+ this.instances.push(instance);
+
+ return instance;
+ };
+
+ /**
+ * Initializes a button with the provided configuration.
+ * @param {Object} config - The configuration object for the button.
+ * @returns {DocSpace} - An instance of the DocSpace class.
+ */
+ initButton = (config) => {
+ const existInstance = this.instances.find(
+ (i) => i.config.frameId === config.frameId
+ );
+
+ if (existInstance) {
+ existInstance.initButton(config);
+ return existInstance;
+ }
+
+ const instance = new DocSpace(config);
+
+ instance.initButton(config);
+
+ this.instances.push(instance);
+
+ return instance;
+ };
+
+ /**
+ * Initializes the editor.
+ *
+ * @param {Object} config - The configuration object for the editor.
+ * @returns {DocSpace} The initialized DocSpace instance.
+ */
+ initEditor = (config = {}) => {
+ const existInstance = this.instances.find(
+ (i) => i.config.frameId === config.frameId
+ );
+
+ if (existInstance) {
+ existInstance.initEditor(config);
+ return existInstance;
+ }
+
+ const instance = new DocSpace(config);
+
+ instance.initEditor(config);
+
+ this.instances.push(instance);
+
+ return instance;
+ };
+
+ /**
+ * Initializes the viewer.
+ * @param {Object} config - The configuration object for the viewer.
+ * @returns {DocSpace} - The initialized DocSpace instance.
+ */
+ initViewer = (config = {}) => {
+ const existInstance = this.instances.find(
+ (i) => i.config.frameId === config.frameId
+ );
+
+ if (existInstance) {
+ existInstance.initViewer(config);
+ return existInstance;
+ }
+
+ const instance = new DocSpace(config);
+
+ instance.initViewer(config);
+
+ this.instances.push(instance);
+
+ return instance;
+ };
+
+ /**
+ * Initializes the room selector.
+ *
+ * @param {Object} config - The configuration object.
+ * @returns {DocSpace} The instance of the DocSpace class.
+ */
+ initRoomSelector = (config = {}) => {
+ const existInstance = this.instances.find(
+ (i) => i.config.frameId === config.frameId
+ );
+
+ if (existInstance) {
+ existInstance.initRoomSelector(config);
+ return existInstance;
+ }
+
+ const instance = new DocSpace(config);
+
+ instance.initRoomSelector(config);
+
+ this.instances.push(instance);
+
+ return instance;
+ };
+
+ /**
+ * Initializes the file selector.
+ *
+ * @param {Object} config - The configuration object.
+ * @returns {DocSpace} The initialized DocSpace instance.
+ */
+ initFileSelector = (config = {}) => {
+ const existInstance = this.instances.find(
+ (i) => i.config.frameId === config.frameId
+ );
+
+ if (existInstance) {
+ existInstance.initFileSelector(config);
+ return existInstance;
+ }
+
+ const instance = new DocSpace(config);
+
+ instance.initFileSelector(config);
+
+ this.instances.push(instance);
+
+ return instance;
+ };
+
+ /**
+ * Initializes the manager for DocSpace.
+ * @param {Object} config - The configuration object for the manager.
+ * @returns {DocSpace} The initialized DocSpace instance.
+ */
+ initManager = (config = {}) => {
+ const existInstance = this.instances.find(
+ (i) => i.config.frameId === config.frameId
+ );
+
+ if (existInstance) {
+ existInstance.initManager(config);
+ return existInstance;
+ }
+
+ const instance = new DocSpace(config);
+
+ instance.initManager(config);
+
+ this.instances.push(instance);
+
+ return instance;
+ };
+
+ /**
+ * Initializes the DocSpace system.
+ *
+ * @param {Object} config - The configuration object for initializing the system.
+ * @returns {DocSpace} - The initialized DocSpace instance.
+ */
+ initSystem = (config = {}) => {
+ const existInstance = this.instances.find(
+ (i) => i.config.frameId === config.frameId
+ );
+
+ if (existInstance) {
+ existInstance.initSystem(config);
+ return existInstance;
+ }
+
+ const instance = new DocSpace(config);
+
+ instance.initSystem(config);
+
+ this.instances.push(instance);
+
+ return instance;
+ };
+ }
+
+ window.DocSpace = window.DocSpace || {};
+
+ const config = getConfigFromParams();
+
+ window.DocSpace.SDK = window.DocSpace.SDK || new DocSpaceSDK();
+
+ if (config.init) {
+ config?.isButtonMode
+ ? window.DocSpace.SDK.initButton(config)
+ : window.DocSpace.SDK.initFrame(config);
+ }
+})();
From d6c490be535c361eb350a5eb9db4706e485eec56 Mon Sep 17 00:00:00 2001
From: Ilya Oleshko
+ 
+
+
+
+
+
+ 
+
+
+ ${cspErrorText} Please add it via
+
+ the Developer Tools section.
+
+
+