Merge branch 'feature/data-migration' of https://github.com/ONLYOFFICE/DocSpace-client into feature/data-migration
This commit is contained in:
commit
264fd22018
@ -275,9 +275,7 @@ const ArticleBodyContent = (props) => {
|
||||
onClick={() => onSelect(item.key)}
|
||||
folderId={item.id}
|
||||
style={{
|
||||
marginTop: `${
|
||||
item.key.includes(7) || item.key.includes(8) ? "16px" : "0"
|
||||
}`,
|
||||
marginTop: `${item.key.includes(9) ? "16px" : "0"}`,
|
||||
}}
|
||||
/>,
|
||||
);
|
||||
|
@ -118,8 +118,8 @@ const RowView = (props) => {
|
||||
<EmptyScreenContainer
|
||||
imageSrc={EmptyScreenUserReactSvgUrl}
|
||||
imageAlt="Empty Screen user image"
|
||||
headerText={t("People:NotFoundUsers")}
|
||||
descriptionText={t("People:NotFoundUsersDescription")}
|
||||
headerText={t("Common:NotFoundUsers")}
|
||||
descriptionText={t("Common:NotFoundUsersDescription")}
|
||||
buttons={
|
||||
<Box displayProp="flex" alignItems="center">
|
||||
<IconButton
|
||||
|
@ -168,8 +168,8 @@ const TableView = (props) => {
|
||||
<EmptyScreenContainer
|
||||
imageSrc={EmptyScreenUserReactSvgUrl}
|
||||
imageAlt="Empty Screen user image"
|
||||
headerText={t("People:NotFoundUsers")}
|
||||
descriptionText={t("People:NotFoundUsersDescription")}
|
||||
headerText={t("Common:NotFoundUsers")}
|
||||
descriptionText={t("Common:NotFoundUsersDescription")}
|
||||
buttons={
|
||||
<Box displayProp="flex" alignItems="center">
|
||||
<IconButton
|
||||
|
@ -164,8 +164,8 @@ const RowView = ({
|
||||
<EmptyScreenContainer
|
||||
imageSrc={EmptyScreenUserReactSvgUrl}
|
||||
imageAlt="Empty Screen user image"
|
||||
headerText={t("People:NotFoundUsers")}
|
||||
descriptionText={t("People:NotFoundUsersDescription")}
|
||||
headerText={t("Common:NotFoundUsers")}
|
||||
descriptionText={t("Common:NotFoundUsersDescription")}
|
||||
buttons={
|
||||
<Box displayProp="flex" alignItems="center">
|
||||
<IconButton
|
||||
|
@ -222,8 +222,8 @@ const TableView = ({
|
||||
<EmptyScreenContainer
|
||||
imageSrc={EmptyScreenUserReactSvgUrl}
|
||||
imageAlt="Empty Screen user image"
|
||||
headerText={t("People:NotFoundUsers")}
|
||||
descriptionText={t("People:NotFoundUsersDescription")}
|
||||
headerText={t("Common:NotFoundUsers")}
|
||||
descriptionText={t("Common:NotFoundUsersDescription")}
|
||||
buttons={
|
||||
<Box displayProp="flex" alignItems="center">
|
||||
<IconButton
|
||||
|
@ -117,8 +117,8 @@ const RowView = (props) => {
|
||||
<EmptyScreenContainer
|
||||
imageSrc={EmptyScreenUserReactSvgUrl}
|
||||
imageAlt="Empty Screen user image"
|
||||
headerText={t("People:NotFoundUsers")}
|
||||
descriptionText={t("People:NotFoundUsersDescription")}
|
||||
headerText={t("Common:NotFoundUsers")}
|
||||
descriptionText={t("Common:NotFoundUsersDescription")}
|
||||
buttons={
|
||||
<Box displayProp="flex" alignItems="center">
|
||||
<IconButton
|
||||
|
@ -98,8 +98,8 @@ const TableView = (props) => {
|
||||
<EmptyScreenContainer
|
||||
imageSrc={EmptyScreenUserReactSvgUrl}
|
||||
imageAlt="Empty Screen user image"
|
||||
headerText={t("People:NotFoundUsers")}
|
||||
descriptionText={t("People:NotFoundUsersDescription")}
|
||||
headerText={t("Common:NotFoundUsers")}
|
||||
descriptionText={t("Common:NotFoundUsersDescription")}
|
||||
buttons={
|
||||
<Box displayProp="flex" alignItems="center">
|
||||
<IconButton
|
||||
|
@ -167,8 +167,8 @@ const RowView = (props) => {
|
||||
<EmptyScreenContainer
|
||||
imageSrc={EmptyScreenUserReactSvgUrl}
|
||||
imageAlt="Empty Screen user image"
|
||||
headerText={t("People:NotFoundUsers")}
|
||||
descriptionText={t("People:NotFoundUsersDescription")}
|
||||
headerText={t("Common:NotFoundUsers")}
|
||||
descriptionText={t("Common:NotFoundUsersDescription")}
|
||||
buttons={
|
||||
<Box displayProp="flex" alignItems="center">
|
||||
<IconButton
|
||||
|
@ -164,8 +164,8 @@ const TableView = (props) => {
|
||||
<EmptyScreenContainer
|
||||
imageSrc={EmptyScreenUserReactSvgUrl}
|
||||
imageAlt="Empty Screen user image"
|
||||
headerText={t("People:NotFoundUsers")}
|
||||
descriptionText={t("People:NotFoundUsersDescription")}
|
||||
headerText={t("Common:NotFoundUsers")}
|
||||
descriptionText={t("Common:NotFoundUsersDescription")}
|
||||
buttons={
|
||||
<Box displayProp="flex" alignItems="center">
|
||||
<IconButton
|
||||
|
@ -139,9 +139,10 @@ const SelectFileStep = ({
|
||||
uploadInterval.current = setInterval(async () => {
|
||||
const res = await getMigrationStatus();
|
||||
|
||||
if (!res || res.parseResult.failedArchives.length > 0) {
|
||||
if (!res || res.parseResult.failedArchives.length > 0 || res.error) {
|
||||
setIsFileError(true);
|
||||
setIsFileLoading(false);
|
||||
toastr.error(res.error);
|
||||
clearInterval(uploadInterval.current);
|
||||
} else if (res.isCompleted || res.parseResult.progress === 100) {
|
||||
setIsFileLoading(false);
|
||||
|
@ -121,8 +121,8 @@ const RowView = ({
|
||||
<EmptyScreenContainer
|
||||
imageSrc={EmptyScreenUserReactSvgUrl}
|
||||
imageAlt="Empty Screen user image"
|
||||
headerText={t("People:NotFoundUsers")}
|
||||
descriptionText={t("People:NotFoundUsersDescription")}
|
||||
headerText={t("Common:NotFoundUsers")}
|
||||
descriptionText={t("Common:NotFoundUsersDescription")}
|
||||
buttons={
|
||||
<Box displayProp="flex" alignItems="center">
|
||||
<IconButton
|
||||
|
@ -170,8 +170,8 @@ const TableView = ({
|
||||
<EmptyScreenContainer
|
||||
imageSrc={EmptyScreenUserReactSvgUrl}
|
||||
imageAlt="Empty Screen user image"
|
||||
headerText={t("People:NotFoundUsers")}
|
||||
descriptionText={t("People:NotFoundUsersDescription")}
|
||||
headerText={t("Common:NotFoundUsers")}
|
||||
descriptionText={t("Common:NotFoundUsersDescription")}
|
||||
buttons={
|
||||
<Box displayProp="flex" alignItems="center">
|
||||
<IconButton
|
||||
|
@ -169,8 +169,8 @@ const RowView = ({
|
||||
<EmptyScreenContainer
|
||||
imageSrc={EmptyScreenUserReactSvgUrl}
|
||||
imageAlt="Empty Screen user image"
|
||||
headerText={t("People:NotFoundUsers")}
|
||||
descriptionText={t("People:NotFoundUsersDescription")}
|
||||
headerText={t("Common:NotFoundUsers")}
|
||||
descriptionText={t("Common:NotFoundUsersDescription")}
|
||||
buttons={
|
||||
<Box displayProp="flex" alignItems="center">
|
||||
<IconButton
|
||||
|
@ -220,8 +220,8 @@ const TableView = ({
|
||||
<EmptyScreenContainer
|
||||
imageSrc={EmptyScreenUserReactSvgUrl}
|
||||
imageAlt="Empty Screen user image"
|
||||
headerText={t("People:NotFoundUsers")}
|
||||
descriptionText={t("People:NotFoundUsersDescription")}
|
||||
headerText={t("Common:NotFoundUsers")}
|
||||
descriptionText={t("Common:NotFoundUsersDescription")}
|
||||
buttons={
|
||||
<Box displayProp="flex" alignItems="center">
|
||||
<IconButton
|
||||
|
Loading…
Reference in New Issue
Block a user