pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] web_editor: fix upload progress toast visibility

Browse Source 
Before this commit, when uploading multiple files and clicking on the
cross button, the toast was reappearing every time a new file was
succesfully uploaded.

This commit changes its state so that it is only visible when one or
multiple files are added to the uploading queue. The user can still hide
it with the cross.

task-2687506

Part-of: odoo/odoo#95955
This commit is contained in:
Younn Olivier
2022-07-18 18:41:28 +02:00
parent 8ecb1e3083
commit 2e6b59a8e4
2 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/web_editor/static/src/components/upload_progress_toast/upload_progress_toast.js
+10 -10
View File
@@ -11,21 +11,21 @@ ProgressBar.template = 'web_editor.ProgressBar';
export class UploadProgressToast extends Component {
setup() {
this.state = useState({ hide: false });
this.state = useState({
isVisible: false,
numberOfFiles: 0,
});
useEffect((numberOfFiles) => {
if (numberOfFiles) {
this.state.hide = false;
if (numberOfFiles === 0) {
this.state.isVisible = false;
}
if (numberOfFiles > this.state.numberOfFiles) {
this.state.isVisible = true;
}
this.state.numberOfFiles = numberOfFiles;
}, () => [Object.keys(this.props.files).length]);
}
get show() {
if (!this.props.files || !Object.keys(this.props.files).length) {
return false;
}
return !this.state.hide;
}
}
UploadProgressToast.defaultProps = {
files: {},
addons/web_editor/static/src/components/upload_progress_toast/upload_progress_toast.xml
+2 -4
View File
@@ -18,10 +18,8 @@
<t t-name="web_editor.UploadProgressToast" owl="1">
<div class="o_notification_manager o_upload_progress_toast">
<div t-if="show" class="o_notification position-relative show fade mb-2 border border-info bg-white" role="alert" aria-live="assertive" aria-atomic="true">
<button type="button" class="close o_notification_close" aria-label="Close" t-on-click="() => this.state.hide = true">
<i class="oi oi-close"/>
</button>
<div t-if="state.isVisible" class="o_notification position-relative show fade mb-2 border border-info bg-white" role="alert" aria-live="assertive" aria-atomic="true">
<button type="button" class="btn btn-close o_notification_close p-2" aria-label="Close" t-on-click="() => state.isVisible = false"/>
<div class="o_notification_body ps-2 pe-4 py-2">
<div class="me-auto o_notification_content">
<div t-foreach="props.files" t-as="file" t-key="file" class="o_we_progressbar">