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

Web: Client: first step was refactored in data import

Browse Source
This commit is contained in:
Vladimir Khvan 2023-11-27 15:06:01 +05:00
parent a98e181e2f
commit 359896bf71
2 changed files with 11 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -29,8 +29,7 @@ const Wrapper = styled.div`
.icon-button_svg {
svg {
path {
fill: ${(props) =>
props.theme.client.settings.migration.fileInputIconColor};
fill: ${(props) => props.theme.client.settings.migration.fileInputIconColor};
}
}
}
@ -73,7 +72,6 @@ const SelectFileStep = ({
singleFileUploading,
getMigrationStatus,
setUsers,
setData,
isFileLoading,
setIsFileLoading,
cancelMigration,
@ -90,7 +88,7 @@ const SelectFileStep = ({
(res) =>
new Blob([res.parseResult.failedArchives], {
type: "text/csv;charset=utf-8",
})
}),
)
.then((blob) => {
let a = document.createElement("a");
@ -122,8 +120,7 @@ const SelectFileStep = ({
} else if (res.isCompleted) {
setIsFileLoading(false);
clearInterval(interval);
setData(res);
setUsers(res);
setUsers(res.parseResult);
setShowReminder(true);
}
}, 1000);
@ -148,9 +145,7 @@ const SelectFileStep = ({
return (
<>
<Wrapper>
<Text className="select-file-title">
{t("Settings:ChooseBackupFile")}
</Text>
<Text className="select-file-title">{t("Settings:ChooseBackupFile")}</Text>
<FileInput
scale
onInput={onSelectFile}
@ -168,11 +163,7 @@ const SelectFileStep = ({
className="select-file-progress-bar"
label={t("Settings:BackupFileUploading")}
/>
<Button
size="small"
label={t("Common:CancelButton")}
onClick={onCancel}
/>
<Button size="small" label={t("Common:CancelButton")} onClick={onCancel} />
</Wrapper>
) : (
<ErrorBlock>
@ -183,15 +174,8 @@ const SelectFileStep = ({
className="complete-progress-bar"
label={t("Common:LoadingIsComplete")}
/>
<Text className="error-text">
{t("Settings:UnsupportedArchivesDescription")}
</Text>
<Link
type="action"
isHovered
fontWeight={600}
onClick={onDownloadArchives}
>
<Text className="error-text">{t("Settings:UnsupportedArchivesDescription")}</Text>
<Link type="action" isHovered fontWeight={600} onClick={onDownloadArchives}>
{t("Settings:DownloadUnsupportedArchives")}
</Link>
</Box>
@ -228,13 +212,11 @@ export default inject(({ dialogsStore, importAccountsStore }) => {
multipleFileUploading,
getMigrationStatus,
setUsers,
setData,
isFileLoading,
setIsFileLoading,
cancelMigration,
} = importAccountsStore;
const { cancelUploadDialogVisible, setCancelUploadDialogVisible } =
dialogsStore;
const { cancelUploadDialogVisible, setCancelUploadDialogVisible } = dialogsStore;
return {
initMigrationName,
@ -242,7 +224,6 @@ export default inject(({ dialogsStore, importAccountsStore }) => {
multipleFileUploading,
getMigrationStatus,
setUsers,
setData,
isFileLoading,
setIsFileLoading,
cancelMigration,

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

@ -84,6 +84,8 @@ const FirstStep = ({
const uploadInterval = useRef(null);
const navigate = useNavigate();
const goBack = () => navigate(-1);
const onUploadFile = async (file) => {
await singleFileUploading(file, setProgress);
await initMigrationName(searchParams.get("service"));
@ -190,7 +192,7 @@ const FirstStep = ({
<SaveCancelButtons
className="upload-back-buttons"
onSaveClick={incrementStep}
onCancelClick={() => navigate(-1)}
onCancelClick={goBack}
saveButtonLabel={t("Settings:UploadToServer")}
cancelButtonLabel={t("Common:Back")}
displaySettings