IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/data-migration' of https://github.com/ONLYOFFICE/DocSpace-client into feature/data-migration

Browse Source
This commit is contained in:
Vladimir Khvan 2024-02-29 18:00:34 +05:00
commit 264fd22018
14 changed files with 27 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/client/src/pages/PortalSettings/Layout/Article/Body/index.js
View File

@ -275,9 +275,7 @@ const ArticleBodyContent = (props) => {
onClick={() => onSelect(item.key)} onClick={() => onSelect(item.key)}
folderId={item.id} folderId={item.id}
style={{ style={{
marginTop: `${ marginTop: `${item.key.includes(9) ? "16px" : "0"}`,
item.key.includes(7) || item.key.includes(8) ? "16px" : "0"
}`,
}} }}
/>, />,
); );

4
packages/client/src/pages/PortalSettings/categories/data-import/GoogleWorkspace/Stepper/SelectUsersStep/AccountsTable/RowView/index.js
View File

@ -118,8 +118,8 @@ const RowView = (props) => {
<EmptyScreenContainer <EmptyScreenContainer
imageSrc={EmptyScreenUserReactSvgUrl} imageSrc={EmptyScreenUserReactSvgUrl}
imageAlt="Empty Screen user image" imageAlt="Empty Screen user image"
headerText={t("People:NotFoundUsers")} headerText={t("Common:NotFoundUsers")}
descriptionText={t("People:NotFoundUsersDescription")} descriptionText={t("Common:NotFoundUsersDescription")}
buttons={ buttons={
<Box displayProp="flex" alignItems="center"> <Box displayProp="flex" alignItems="center">
<IconButton <IconButton

4
packages/client/src/pages/PortalSettings/categories/data-import/GoogleWorkspace/Stepper/SelectUsersStep/AccountsTable/TableView/index.js
View File

@ -168,8 +168,8 @@ const TableView = (props) => {
<EmptyScreenContainer <EmptyScreenContainer
imageSrc={EmptyScreenUserReactSvgUrl} imageSrc={EmptyScreenUserReactSvgUrl}
imageAlt="Empty Screen user image" imageAlt="Empty Screen user image"
headerText={t("People:NotFoundUsers")} headerText={t("Common:NotFoundUsers")}
descriptionText={t("People:NotFoundUsersDescription")} descriptionText={t("Common:NotFoundUsersDescription")}
buttons={ buttons={
<Box displayProp="flex" alignItems="center"> <Box displayProp="flex" alignItems="center">
<IconButton <IconButton

4
packages/client/src/pages/PortalSettings/categories/data-import/GoogleWorkspace/Stepper/SelectUsersTypeStep/AccountsTable/RowView/index.js
View File

@ -164,8 +164,8 @@ const RowView = ({
<EmptyScreenContainer <EmptyScreenContainer
imageSrc={EmptyScreenUserReactSvgUrl} imageSrc={EmptyScreenUserReactSvgUrl}
imageAlt="Empty Screen user image" imageAlt="Empty Screen user image"
headerText={t("People:NotFoundUsers")} headerText={t("Common:NotFoundUsers")}
descriptionText={t("People:NotFoundUsersDescription")} descriptionText={t("Common:NotFoundUsersDescription")}
buttons={ buttons={
<Box displayProp="flex" alignItems="center"> <Box displayProp="flex" alignItems="center">
<IconButton <IconButton

4
packages/client/src/pages/PortalSettings/categories/data-import/GoogleWorkspace/Stepper/SelectUsersTypeStep/AccountsTable/TableView/index.js
View File

@ -222,8 +222,8 @@ const TableView = ({
<EmptyScreenContainer <EmptyScreenContainer
imageSrc={EmptyScreenUserReactSvgUrl} imageSrc={EmptyScreenUserReactSvgUrl}
imageAlt="Empty Screen user image" imageAlt="Empty Screen user image"
headerText={t("People:NotFoundUsers")} headerText={t("Common:NotFoundUsers")}
descriptionText={t("People:NotFoundUsersDescription")} descriptionText={t("Common:NotFoundUsersDescription")}
buttons={ buttons={
<Box displayProp="flex" alignItems="center"> <Box displayProp="flex" alignItems="center">
<IconButton <IconButton

4
packages/client/src/pages/PortalSettings/categories/data-import/NextCloudWorkspace/Stepper/SelectUsersStep/AccountsTable/RowView/index.js
View File

@ -117,8 +117,8 @@ const RowView = (props) => {
<EmptyScreenContainer <EmptyScreenContainer
imageSrc={EmptyScreenUserReactSvgUrl} imageSrc={EmptyScreenUserReactSvgUrl}
imageAlt="Empty Screen user image" imageAlt="Empty Screen user image"
headerText={t("People:NotFoundUsers")} headerText={t("Common:NotFoundUsers")}
descriptionText={t("People:NotFoundUsersDescription")} descriptionText={t("Common:NotFoundUsersDescription")}
buttons={ buttons={
<Box displayProp="flex" alignItems="center"> <Box displayProp="flex" alignItems="center">
<IconButton <IconButton

4
packages/client/src/pages/PortalSettings/categories/data-import/NextCloudWorkspace/Stepper/SelectUsersStep/AccountsTable/TableView/index.js
View File

@ -98,8 +98,8 @@ const TableView = (props) => {
<EmptyScreenContainer <EmptyScreenContainer
imageSrc={EmptyScreenUserReactSvgUrl} imageSrc={EmptyScreenUserReactSvgUrl}
imageAlt="Empty Screen user image" imageAlt="Empty Screen user image"
headerText={t("People:NotFoundUsers")} headerText={t("Common:NotFoundUsers")}
descriptionText={t("People:NotFoundUsersDescription")} descriptionText={t("Common:NotFoundUsersDescription")}
buttons={ buttons={
<Box displayProp="flex" alignItems="center"> <Box displayProp="flex" alignItems="center">
<IconButton <IconButton

4
packages/client/src/pages/PortalSettings/categories/data-import/NextCloudWorkspace/Stepper/SelectUsersTypeStep/AccountsTable/RowView/index.js
View File

@ -167,8 +167,8 @@ const RowView = (props) => {
<EmptyScreenContainer <EmptyScreenContainer
imageSrc={EmptyScreenUserReactSvgUrl} imageSrc={EmptyScreenUserReactSvgUrl}
imageAlt="Empty Screen user image" imageAlt="Empty Screen user image"
headerText={t("People:NotFoundUsers")} headerText={t("Common:NotFoundUsers")}
descriptionText={t("People:NotFoundUsersDescription")} descriptionText={t("Common:NotFoundUsersDescription")}
buttons={ buttons={
<Box displayProp="flex" alignItems="center"> <Box displayProp="flex" alignItems="center">
<IconButton <IconButton

4
packages/client/src/pages/PortalSettings/categories/data-import/NextCloudWorkspace/Stepper/SelectUsersTypeStep/AccountsTable/TableView/index.js
View File

@ -164,8 +164,8 @@ const TableView = (props) => {
<EmptyScreenContainer <EmptyScreenContainer
imageSrc={EmptyScreenUserReactSvgUrl} imageSrc={EmptyScreenUserReactSvgUrl}
imageAlt="Empty Screen user image" imageAlt="Empty Screen user image"
headerText={t("People:NotFoundUsers")} headerText={t("Common:NotFoundUsers")}
descriptionText={t("People:NotFoundUsersDescription")} descriptionText={t("Common:NotFoundUsersDescription")}
buttons={ buttons={
<Box displayProp="flex" alignItems="center"> <Box displayProp="flex" alignItems="center">
<IconButton <IconButton

3
packages/client/src/pages/PortalSettings/categories/data-import/OnlyofficeWorkspace/Stepper/SelectFileStep/index.js
View File

@ -139,9 +139,10 @@ const SelectFileStep = ({
uploadInterval.current = setInterval(async () => { uploadInterval.current = setInterval(async () => {
const res = await getMigrationStatus(); const res = await getMigrationStatus();
if (!res || res.parseResult.failedArchives.length > 0) { if (!res || res.parseResult.failedArchives.length > 0 || res.error) {
setIsFileError(true); setIsFileError(true);
setIsFileLoading(false); setIsFileLoading(false);
toastr.error(res.error);
clearInterval(uploadInterval.current); clearInterval(uploadInterval.current);
} else if (res.isCompleted || res.parseResult.progress === 100) { } else if (res.isCompleted || res.parseResult.progress === 100) {
setIsFileLoading(false); setIsFileLoading(false);

4
packages/client/src/pages/PortalSettings/categories/data-import/OnlyofficeWorkspace/Stepper/SelectUsersStep/AccountsTable/RowView/index.js
View File

@ -121,8 +121,8 @@ const RowView = ({
<EmptyScreenContainer <EmptyScreenContainer
imageSrc={EmptyScreenUserReactSvgUrl} imageSrc={EmptyScreenUserReactSvgUrl}
imageAlt="Empty Screen user image" imageAlt="Empty Screen user image"
headerText={t("People:NotFoundUsers")} headerText={t("Common:NotFoundUsers")}
descriptionText={t("People:NotFoundUsersDescription")} descriptionText={t("Common:NotFoundUsersDescription")}
buttons={ buttons={
<Box displayProp="flex" alignItems="center"> <Box displayProp="flex" alignItems="center">
<IconButton <IconButton

4
packages/client/src/pages/PortalSettings/categories/data-import/OnlyofficeWorkspace/Stepper/SelectUsersStep/AccountsTable/TableView/index.js
View File

@ -170,8 +170,8 @@ const TableView = ({
<EmptyScreenContainer <EmptyScreenContainer
imageSrc={EmptyScreenUserReactSvgUrl} imageSrc={EmptyScreenUserReactSvgUrl}
imageAlt="Empty Screen user image" imageAlt="Empty Screen user image"
headerText={t("People:NotFoundUsers")} headerText={t("Common:NotFoundUsers")}
descriptionText={t("People:NotFoundUsersDescription")} descriptionText={t("Common:NotFoundUsersDescription")}
buttons={ buttons={
<Box displayProp="flex" alignItems="center"> <Box displayProp="flex" alignItems="center">
<IconButton <IconButton

4
packages/client/src/pages/PortalSettings/categories/data-import/OnlyofficeWorkspace/Stepper/SelectUsersTypeStep/AccountsTable/RowView/index.js
View File

@ -169,8 +169,8 @@ const RowView = ({
<EmptyScreenContainer <EmptyScreenContainer
imageSrc={EmptyScreenUserReactSvgUrl} imageSrc={EmptyScreenUserReactSvgUrl}
imageAlt="Empty Screen user image" imageAlt="Empty Screen user image"
headerText={t("People:NotFoundUsers")} headerText={t("Common:NotFoundUsers")}
descriptionText={t("People:NotFoundUsersDescription")} descriptionText={t("Common:NotFoundUsersDescription")}
buttons={ buttons={
<Box displayProp="flex" alignItems="center"> <Box displayProp="flex" alignItems="center">
<IconButton <IconButton

4
packages/client/src/pages/PortalSettings/categories/data-import/OnlyofficeWorkspace/Stepper/SelectUsersTypeStep/AccountsTable/TableView/index.js
View File

@ -220,8 +220,8 @@ const TableView = ({
<EmptyScreenContainer <EmptyScreenContainer
imageSrc={EmptyScreenUserReactSvgUrl} imageSrc={EmptyScreenUserReactSvgUrl}
imageAlt="Empty Screen user image" imageAlt="Empty Screen user image"
headerText={t("People:NotFoundUsers")} headerText={t("Common:NotFoundUsers")}
descriptionText={t("People:NotFoundUsersDescription")} descriptionText={t("Common:NotFoundUsersDescription")}
buttons={ buttons={
<Box displayProp="flex" alignItems="center"> <Box displayProp="flex" alignItems="center">
<IconButton <IconButton