4nk/lecoffre-front
4
0
Fork 0
Code Issues 1 Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' into staging

Browse Source
This commit is contained in:
Maxime Lalo 2024-04-29 15:24:44 +02:00
commit 5e90da556d
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/front/Components/DesignSystem/DepositDocument/index.tsx
View File

@ -340,11 +340,11 @@ export default class DepositDocument extends React.Component<IProps, IState> {
private async addFile(file: File) { private async addFile(file: File) {
const fileAccepted = filesAccepted[file.type]; const fileAccepted = filesAccepted[file.type];
if (!fileAccepted) { if (!fileAccepted) {
alert("Ce type de fichier n'est pas accepté"); alert("Le fichier déposé doit être au format .jpg .pdf .jpeg ou .png");
return false; return false;
} }
if (file.size > fileAccepted.size) { if (file.size > fileAccepted.size) {
alert("Ce fichier est trop volumineux"); alert("Le fichier est trop volumineux et ne doit pas dépasser 32mo");
return false; return false;
} }
this.setState({ this.setState({

10
src/front/Components/Layouts/Folder/ViewDocuments/index.tsx
View File

@ -34,6 +34,7 @@ type IState = {
validatedPercentage: number; validatedPercentage: number;
document: Document | null; document: Document | null;
fileBlob: Blob | null; fileBlob: Blob | null;
isLoading: boolean;
}; };
class ViewDocumentsClass extends BasePage<IPropsClass, IState> { class ViewDocumentsClass extends BasePage<IPropsClass, IState> {
@ -49,6 +50,7 @@ class ViewDocumentsClass extends BasePage<IPropsClass, IState> {
validatedPercentage: this.getRandomPercentageForOcr(), validatedPercentage: this.getRandomPercentageForOcr(),
document: null, document: null,
fileBlob: null, fileBlob: null,
isLoading: true,
}; };
this.closeModals = this.closeModals.bind(this); this.closeModals = this.closeModals.bind(this);
@ -68,7 +70,7 @@ class ViewDocumentsClass extends BasePage<IPropsClass, IState> {
public override render(): JSX.Element | null { public override render(): JSX.Element | null {
return ( return (
<DefaultNotaryDashboard title={"Demander des documents"} hasBackArrow mobileBackText="Retour aux documents"> <DefaultNotaryDashboard title={"Demander des documents"} hasBackArrow mobileBackText="Retour aux documents">
{this.state.document && this.state.document.files && this.state.selectedFile && ( {this.state.document && this.state.document.files && this.state.selectedFile && !this.state.isLoading && (
<div className={classes["root"]}> <div className={classes["root"]}>
<Typography typo={ITypo.H1} color={ITypoColor.BLACK} className={classes["title"]}> <Typography typo={ITypo.H1} color={ITypoColor.BLACK} className={classes["title"]}>
{this.state.document.folder?.name} {this.state.document.folder?.name}
@ -156,7 +158,7 @@ class ViewDocumentsClass extends BasePage<IPropsClass, IState> {
</Confirm> </Confirm>
</div> </div>
)} )}
{(!this.state.selectedFile || !this.state.document) && ( {(!this.state.selectedFile || !this.state.document) && !this.state.isLoading && (
<div className={classes["root"]}> <div className={classes["root"]}>
<Typography typo={ITypo.P_16} color={ITypoColor.BLACK} className={classes["refuse-text"]}> <Typography typo={ITypo.P_16} color={ITypoColor.BLACK} className={classes["refuse-text"]}>
Document non trouvé Document non trouvé
@ -182,12 +184,16 @@ class ViewDocumentsClass extends BasePage<IPropsClass, IState> {
document, document,
selectedFileIndex: 0, selectedFileIndex: 0,
selectedFile: document.files![0]!, selectedFile: document.files![0]!,
isLoading: false,
}, },
() => { () => {
this.getFilePreview(); this.getFilePreview();
}, },
); );
} catch (e) { } catch (e) {
this.setState({
isLoading: false,
});
console.error(e); console.error(e);
} }
} }