You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2021/11/26 14:31:10 UTC

[openmeetings] branch master updated (96aad9d -> 6f36145)

This is an automated email from the ASF dual-hosted git repository.

solomax pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git.


    from 96aad9d  [OPENMEETINGS-2690] there is more room for Enter button
     new 5cee9a5  [OPENMEETINGS-2488] bootstrap-confirmation used instead of dialog
     new 6f36145  [OPENMEETINGS-2687] upload is blocked on start, progress is improved

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../common/confirmation/ConfirmableAjaxBorder.html |  26 -----
 .../common/confirmation/ConfirmableAjaxBorder.java |  74 -------------
 .../common/confirmation/ConfirmationDialog.java    |  77 -------------
 .../common/confirmation/ConfirmationHelper.java    |  12 +--
 .../web/common/tree/FileTreePanel.html             |  23 +---
 .../web/common/tree/FileTreePanel.java             |  57 +++++-----
 .../openmeetings/web/common/tree/filetree.js       |  13 +--
 .../UploadForm.html}                               |  25 +++--
 .../openmeetings/web/common/upload/UploadForm.java |  75 +++++++++++++
 .../openmeetings/web/common/upload/upload.js       | 119 +++++++++++++++++++++
 .../sidebar/RoomFileUploadResourceReference.java   |   8 +-
 .../openmeetings/web/room/sidebar/RoomSidebar.java |   2 +-
 .../RoomUploadForm.html}                           |  30 ++----
 .../{UploadDialog.java => RoomUploadForm.java}     |  47 ++------
 .../web/room/sidebar/UploadDialog.html             |  27 +----
 .../web/room/sidebar/UploadDialog.java             |  57 +---------
 .../openmeetings/web/room/sidebar/room-upload.js   |  11 ++
 .../apache/openmeetings/web/room/sidebar/upload.js | 112 -------------------
 .../openmeetings/web/user/chat/ChatToolbar.java    |   6 +-
 19 files changed, 293 insertions(+), 508 deletions(-)
 delete mode 100644 openmeetings-web/src/main/java/org/apache/openmeetings/web/common/confirmation/ConfirmableAjaxBorder.html
 delete mode 100644 openmeetings-web/src/main/java/org/apache/openmeetings/web/common/confirmation/ConfirmableAjaxBorder.java
 delete mode 100644 openmeetings-web/src/main/java/org/apache/openmeetings/web/common/confirmation/ConfirmationDialog.java
 copy openmeetings-web/src/main/java/org/apache/openmeetings/web/common/{FormActionsPanel.html => upload/UploadForm.html} (51%)
 create mode 100644 openmeetings-web/src/main/java/org/apache/openmeetings/web/common/upload/UploadForm.java
 create mode 100644 openmeetings-web/src/main/java/org/apache/openmeetings/web/common/upload/upload.js
 copy openmeetings-web/src/main/java/org/apache/openmeetings/web/room/{poll/PollResultsDialog.html => sidebar/RoomUploadForm.html} (55%)
 copy openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/{UploadDialog.java => RoomUploadForm.java} (64%)
 create mode 100644 openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/room-upload.js
 delete mode 100644 openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/upload.js

[openmeetings] 02/02: [OPENMEETINGS-2687] upload is blocked on start, progress is improved

Posted by so...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git

commit 6f361458665a7ccfa53201a98c25acb5331f57d8
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Fri Nov 26 21:30:56 2021 +0700

    [OPENMEETINGS-2687] upload is blocked on start, progress is improved
---
 .../upload/UploadForm.html}                        |  30 +++---
 .../openmeetings/web/common/upload/UploadForm.java |  75 +++++++++++++
 .../openmeetings/web/common/upload/upload.js       | 119 +++++++++++++++++++++
 .../sidebar/RoomFileUploadResourceReference.java   |   8 +-
 .../openmeetings/web/room/sidebar/RoomSidebar.java |   2 +-
 .../web/room/sidebar/RoomUploadForm.html           |  35 ++++++
 .../{UploadDialog.java => RoomUploadForm.java}     |  47 ++------
 .../web/room/sidebar/UploadDialog.html             |  27 +----
 .../web/room/sidebar/UploadDialog.java             |  57 +---------
 .../openmeetings/web/room/sidebar/room-upload.js   | 119 ++-------------------
 10 files changed, 270 insertions(+), 249 deletions(-)

diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/UploadDialog.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/upload/UploadForm.html
similarity index 50%
copy from openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/UploadDialog.html
copy to openmeetings-web/src/main/java/org/apache/openmeetings/web/common/upload/UploadForm.html
index 2333d66..1ceb323 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/UploadDialog.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/upload/UploadForm.html
@@ -20,32 +20,26 @@
 -->
 <!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-9.xsd">
-<wicket:extend>
-	<form wicket:id="form" id="room-upload-form" method="post" enctype="multipart/form-data">
+<wicket:panel>
+	<form wicket:id="form" id="omws-upload-form" method="post" enctype="multipart/form-data"
+			wicket:message="data-upload-lbl:593, data-max-upload-lbl:1491">
 		<div class="mb-4"><wicket:message key="594"/></div>
 		<div class="fileinput fileinput-new d-inline m-0" data-provides="fileinput">
 			<div class="fileinput-filename d-block"></div>
 			<span class="btn btn-file btn-outline-primary">
 				<span><wicket:message key="596"/></span>
-				<input type="file" multiple="multiple" id="room-upload-file" name="room-upload-file"/>
+				<input type="file" multiple="multiple" id="omws-upload-file" name="omws-upload-file"/>
 			</span>
 		</div>
+		<input wicket:id="sid" id="omws-upload-sid" name="omws-upload-sid" type="hidden"/>
 		<div class="error"></div>
-		<div class="mt-3">
-			<input id="room-upload-to-wb" name="room-upload-to-wb" type="checkbox" value="true"/>&nbsp;<label for="room-upload-to-wb"><wicket:message key="1312"/></label>
-			<div class="me-3 d-none" id="room-upload-clean-block">
-				<input id="room-upload-clean" name="room-upload-clean" type="checkbox" value="true"/>&nbsp;<label for="room-upload-clean"><wicket:message key="62"/></label>
-			</div>
-		</div>
-		<input wicket:id="sid" name="room-upload-sid" type="hidden"/>
-		<input wicket:id="lastSelectedId" name="room-upload-last-selected-id" type="hidden" value=""/>
-		<input wicket:id="lastSelectedRoom" name="room-upload-last-selected-room" type="hidden" value=""/>
-		<input wicket:id="lastSelectedOwner" name="room-upload-last-selected-owner" type="hidden" value=""/>
-		<input wicket:id="lastSelectedGroup" name="room-upload-last-selected-group" type="hidden" value=""/>
+		<wicket:child/>
 	</form>
-	<div class="progress d-none">
-		<div class="progress-bar" role="progressbar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100">0%</div>
+	<div class="progress-block d-none">
+		<h5 class="progress-title" wicket:message="data-converting-lbl:upload.dlg.convert.title, data-upload-lbl:702"></h5>
+		<div class="progress">
+			<div class="progress-bar" role="progressbar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100">0%</div>
+		</div>
 	</div>
-	<div id="progress"></div>
-</wicket:extend>
+</wicket:panel>
 </html>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/upload/UploadForm.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/upload/UploadForm.java
new file mode 100644
index 0000000..7982a7d
--- /dev/null
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/upload/UploadForm.java
@@ -0,0 +1,75 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License") +  you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.openmeetings.web.common.upload;
+
+import static org.apache.openmeetings.util.OpenmeetingsVariables.getMaxUploadSize;
+
+import org.apache.openmeetings.web.app.WebSession;
+import org.apache.openmeetings.web.common.MainPanel;
+import org.apache.wicket.AttributeModifier;
+import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
+import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.head.JavaScriptHeaderItem;
+import org.apache.wicket.markup.head.PriorityHeaderItem;
+import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.markup.html.panel.Panel;
+import org.apache.wicket.request.resource.JavaScriptResourceReference;
+import org.apache.wicket.util.lang.Bytes;
+
+public class UploadForm extends Panel {
+	private static final long serialVersionUID = 1L;
+	private final String action;
+	protected final WebMarkupContainer form = new WebMarkupContainer("form");
+
+	public UploadForm(String id, String action) {
+		super(id);
+		this.action = action;
+		setRenderBodyOnly(true);
+	}
+
+	@Override
+	protected void onInitialize() {
+		final MainPanel mainPanel = findParent(MainPanel.class);
+
+		add(form.add(AttributeModifier.append("data-max-size", getMaxUploadSize()))
+				.add(AttributeModifier.append("data-max-size-lbl", Bytes.bytes(getMaxUploadSize()).toString(WebSession.get().getLocale())))
+				.add(AttributeModifier.append("action", action))
+				.setOutputMarkupId(true)
+				.setOutputMarkupPlaceholderTag(true));
+		form.add(new WebMarkupContainer("sid")
+				.add(AttributeModifier.append("value", mainPanel.getClient().getSid()))
+				.setOutputMarkupId(true));
+		super.onInitialize();
+	}
+
+	public void show(IPartialPageRequestHandler handler) {
+		show(handler, "null");
+	}
+
+	public void show(IPartialPageRequestHandler handler, String extraFunc) {
+		handler.add(form.setVisible(true));
+		handler.appendJavaScript("Upload.bindUpload(" + extraFunc +");");
+	}
+
+	@Override
+	public void renderHead(IHeaderResponse response) {
+		super.renderHead(response);
+		response.render(new PriorityHeaderItem(JavaScriptHeaderItem.forReference(new JavaScriptResourceReference(UploadForm.class, "upload.js"))));
+	}
+}
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/upload/upload.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/upload/upload.js
new file mode 100644
index 0000000..1bdd7de
--- /dev/null
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/upload/upload.js
@@ -0,0 +1,119 @@
+/* Licensed under the Apache License, Version 2.0 (the "License") http://www.apache.org/licenses/LICENSE-2.0 */
+var Upload = (function() {
+	let progress, progressBar, progressTitle, curUid;
+
+	function _setProgress(prg) {
+		const progressP = prg + '%';
+		progressBar.css('width', progressP)
+			.attr('aria-valuenow', prg)
+			.text(progressP);
+	}
+	function _onWsMessage(_, msg) {
+		try {
+			if (msg instanceof Blob) {
+				return; //ping
+			}
+			const m = JSON.parse(msg);
+			if (m && 'omws-upload' === m.type && curUid === m.uuid) {
+				switch (m.status) {
+					case 'ERROR':
+						OmUtil.error(m.message);
+						break;
+					case 'PROGRESS':
+						_setProgress(m.progress)
+						if (m.progress === 100) {
+							$('#omws-upload-form').parents('.modal').modal('hide');
+							_cleanup();
+						}
+						break;
+					default:
+						//no-op
+				}
+			}
+		} catch (err) {
+			OmUtil.error(err);
+		}
+	}
+	function _cleanup() {
+		Wicket.Event.unsubscribe('/websocket/message', _onWsMessage);
+	}
+	function _bindUpload(extaBindFunc) {
+		const form = $('#omws-upload-form')
+				, fi = form.find('.fileinput')
+		progress = form.parent().find('.progress-block');
+		progressTitle = progress.find('.progress-title');
+		progressBar = progress.find('.progress-bar');
+		_cleanup();
+		form.show();
+		progress.addClass('d-none');
+		let uploadBtn = $('#omws-upload-btn');
+		if (uploadBtn.length === 0) {
+			uploadBtn = $('<button id="omws-upload-btn" class="btn btn-outline-primary"></button>')
+				.text(form.data('upload-lbl'));
+			form.parents('.modal-content').find('.modal-footer').prepend(uploadBtn);
+			uploadBtn.click(function() {
+				const cform = $('#omws-upload-form');
+				$.ajax({
+					url: cform.attr('action')
+					, type: 'POST'
+					, data: new FormData($('#omws-upload-form')[0])
+					, processData: false
+					, contentType: false
+					, xhr: function () {
+						const xhr = new XMLHttpRequest();
+						xhr.upload.addEventListener('progress', evt => _setProgress((100 * evt.loaded / evt.total).toFixed(2)), false);
+						xhr.upload.addEventListener('loadstart', () => {
+							uploadBtn.attr('disabled', 'disabled');
+							cform.hide();
+							progressTitle.text(progressTitle.data('upload-lbl'));
+							progress.removeClass('d-none');
+						}, false);
+						return xhr;
+					}
+				}).done(function(data) {
+					curUid = data.uuid;
+					progressTitle.text(progressTitle.data('converting-lbl'));
+					_setProgress(0);
+					Wicket.Event.subscribe('/websocket/message', _onWsMessage);
+				}).fail(function(e) {
+					OmUtil.error(e.message);
+				});
+			});
+		}
+		uploadBtn.attr('disabled', 'disabled');
+		fi.off().on('change.bs.fileinput', function(event) {
+			event.stopPropagation();
+			const th = $(this)
+				, fInput = th.find('input[type=file]')
+				, fn = th.find('.fileinput-filename')
+				, files = fInput[0].files
+				, errors = form.find('.error');
+			errors.html('');
+			let	valid = files !== undefined && files.length > 0;
+			if (valid) {
+				const size = Array.from(files).map(f => f.size).reduce((a, b) => a + b, 0);
+				valid = size < +form.data('max-size');
+				if (!valid) {
+					errors.html($('<div class="alert alert-danger" role="alert"></div>').text(form.data('max-upload-lbl') + ' ' + form.data('max-size-lbl')));
+				}
+			}
+			if (valid) {
+				fn.text(Array.from(files).map(f => f.name).join(', '));
+				uploadBtn.removeAttr('disabled');
+			} else {
+				fn.text('');
+				uploadBtn.attr('disabled', 'disabled');
+				$('#omws-upload-file').val('');
+			}
+			fInput.attr('title', fn.text());
+			return false;
+		});
+		if ('function' === typeof(extaBindFunc)) {
+			extaBindFunc();
+		}
+	}
+
+	return {
+		bindUpload: _bindUpload
+	};
+})();
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomFileUploadResourceReference.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomFileUploadResourceReference.java
index 3a8af9f..21e7305 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomFileUploadResourceReference.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomFileUploadResourceReference.java
@@ -67,13 +67,13 @@ import com.github.openjson.JSONObject;
 public class RoomFileUploadResourceReference extends ResourceReference {
 	private static final long serialVersionUID = 1L;
 	private static final Logger log = LoggerFactory.getLogger(RoomFileUploadResourceReference.class);
-	private static final String PARAM_FILE_NAME = "room-upload-file";
+	private static final String PARAM_FILE_NAME = "omws-upload-file";
+	private static final String PARAM_SID_NAME = "omws-upload-sid";
 	private static final String PARAM_TO_WB_NAME = "room-upload-to-wb";
 	private static final String PARAM_CLEAN_NAME = "room-upload-clean";
-	private static final String PARAM_SID_NAME = "room-upload-sid";
 	public static final String PARAM_LAST_SELECTED_ID = "room-upload-last-selected-id";
 	public static final String PARAM_LAST_SELECTED_ROOM = "room-upload-last-selected-room";
-	public static final String PARAM_LAST_SELECTED_OWNER = "room-upload-last-selected-pwner";
+	public static final String PARAM_LAST_SELECTED_OWNER = "room-upload-last-selected-owner";
 	public static final String PARAM_LAST_SELECTED_GROUP = "room-upload-last-selected-group";
 	private enum Status {
 		SUCCESS
@@ -225,7 +225,7 @@ public class RoomFileUploadResourceReference extends ResourceReference {
 	private JSONObject getBaseMessage(String uuid) {
 		return new JSONObject()
 				.put("uuid", uuid)
-				.put("type", "room-upload");
+				.put("type", "omws-upload");
 	}
 	private void sendError(Client c, String uuid, String msg) {
 		WebSocketHelper.sendClient(c, getBaseMessage(uuid)
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java
index b9cc76d..79101d4 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java
@@ -87,7 +87,7 @@ public class RoomSidebar extends Panel {
 		add(fileTab.setVisible(!room.isInterview()), roomFiles.setVisible(!room.isInterview()));
 
 		add(addFolder, settings);
-		add(upload = new UploadDialog("upload", room, roomFiles));
+		add(upload = new UploadDialog("upload", roomFiles));
 		updateShowFiles(null);
 		add(activities = new ActivitiesPanel("activities", room));
 	}
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomUploadForm.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomUploadForm.html
new file mode 100644
index 0000000..3eaa6e5
--- /dev/null
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomUploadForm.html
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+
+-->
+<!DOCTYPE html>
+<html xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-9.xsd">
+<wicket:extend>
+	<div class="mt-3">
+		<input id="room-upload-to-wb" name="room-upload-to-wb" type="checkbox" value="true"/>&nbsp;<label for="room-upload-to-wb"><wicket:message key="1312"/></label>
+		<div class="me-3 d-none" id="room-upload-clean-block">
+			<input id="room-upload-clean" name="room-upload-clean" type="checkbox" value="true"/>&nbsp;<label for="room-upload-clean"><wicket:message key="62"/></label>
+		</div>
+	</div>
+	<input wicket:id="lastSelectedId" name="room-upload-last-selected-id" type="hidden" value=""/>
+	<input wicket:id="lastSelectedRoom" name="room-upload-last-selected-room" type="hidden" value=""/>
+	<input wicket:id="lastSelectedOwner" name="room-upload-last-selected-owner" type="hidden" value=""/>
+	<input wicket:id="lastSelectedGroup" name="room-upload-last-selected-group" type="hidden" value=""/>
+</wicket:extend>
+</html>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/UploadDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomUploadForm.java
similarity index 64%
copy from openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/UploadDialog.java
copy to openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomUploadForm.java
index c1b6510..18dfae8 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/UploadDialog.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomUploadForm.java
@@ -18,72 +18,47 @@
  */
 package org.apache.openmeetings.web.room.sidebar;
 
-import static org.apache.openmeetings.util.OpenmeetingsVariables.getMaxUploadSize;
 import static org.apache.openmeetings.web.room.sidebar.RoomFileUploadResourceReference.PARAM_LAST_SELECTED_GROUP;
 import static org.apache.openmeetings.web.room.sidebar.RoomFileUploadResourceReference.PARAM_LAST_SELECTED_ID;
 import static org.apache.openmeetings.web.room.sidebar.RoomFileUploadResourceReference.PARAM_LAST_SELECTED_OWNER;
 import static org.apache.openmeetings.web.room.sidebar.RoomFileUploadResourceReference.PARAM_LAST_SELECTED_ROOM;
 
 import org.apache.openmeetings.db.entity.file.BaseFileItem;
-import org.apache.openmeetings.web.app.WebSession;
-import org.apache.openmeetings.web.common.OmModalCloseButton;
-import org.apache.openmeetings.web.room.RoomPanel;
-import org.apache.openmeetings.web.util.upload.BootstrapFileUploadBehavior;
+import org.apache.openmeetings.web.common.upload.UploadForm;
 import org.apache.wicket.AttributeModifier;
 import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
 import org.apache.wicket.markup.head.IHeaderResponse;
 import org.apache.wicket.markup.head.JavaScriptHeaderItem;
 import org.apache.wicket.markup.head.PriorityHeaderItem;
 import org.apache.wicket.markup.html.WebMarkupContainer;
-import org.apache.wicket.model.ResourceModel;
+import org.apache.wicket.request.cycle.RequestCycle;
 import org.apache.wicket.request.mapper.parameter.PageParameters;
 import org.apache.wicket.request.resource.JavaScriptResourceReference;
-import org.apache.wicket.util.lang.Bytes;
 
-import de.agilecoders.wicket.core.markup.html.bootstrap.dialog.Modal;
-
-public class UploadDialog extends Modal<String> {
+public class RoomUploadForm extends UploadForm {
 	private static final long serialVersionUID = 1L;
-	private final WebMarkupContainer form = new WebMarkupContainer("form");
-	private final RoomFilePanel roomFiles;
-	private final RoomPanel room;
 	private final WebMarkupContainer lastSelectedId = new WebMarkupContainer("lastSelectedId");
 	private final WebMarkupContainer lastSelectedRoom = new WebMarkupContainer("lastSelectedRoom"); // required for "fake" root
 	private final WebMarkupContainer lastSelectedOwner = new WebMarkupContainer("lastSelectedOwner"); // required for "fake" root
 	private final WebMarkupContainer lastSelectedGroup = new WebMarkupContainer("lastSelectedGroup"); // required for "fake" root
+	private final RoomFilePanel roomFiles;
 
-	public UploadDialog(String id, RoomPanel room, RoomFilePanel roomFiles) {
-		super(id);
+	public RoomUploadForm(String id, RoomFilePanel roomFiles) {
+		super(id, "" + RequestCycle.get().urlFor(new RoomFileUploadResourceReference(), new PageParameters()));
 		this.roomFiles = roomFiles;
-		this.room = room;
 	}
 
 	@Override
 	protected void onInitialize() {
-		header(new ResourceModel("upload.dlg.choose.title"));
-		setCloseOnEscapeKey(false);
-		setBackdrop(Backdrop.STATIC);
-
-		add(form.add(AttributeModifier.append("data-max-size", getMaxUploadSize()))
-				.add(AttributeModifier.append("data-max-size-lbl", Bytes.bytes(getMaxUploadSize()).toString(WebSession.get().getLocale())))
-				.add(AttributeModifier.append("data-upload-lbl", getString("593")))
-				.add(AttributeModifier.append("data-max-upload-lbl", getString("1491")))
-				.add(AttributeModifier.append("action", "" + urlFor(new RoomFileUploadResourceReference(), new PageParameters())))
-				.setOutputMarkupId(true)
-				.setOutputMarkupPlaceholderTag(true));
-		form.add(new WebMarkupContainer("sid").add(AttributeModifier.append("value", room.getClient().getSid())).setMarkupId("room-upload-sid").setOutputMarkupId(true));
+		super.onInitialize();
 		form.add(lastSelectedId.setMarkupId(PARAM_LAST_SELECTED_ID).setOutputMarkupId(true));
 		form.add(lastSelectedRoom.setMarkupId(PARAM_LAST_SELECTED_ROOM).setOutputMarkupId(true));
 		form.add(lastSelectedOwner.setMarkupId(PARAM_LAST_SELECTED_OWNER).setOutputMarkupId(true));
 		form.add(lastSelectedGroup.setMarkupId(PARAM_LAST_SELECTED_GROUP).setOutputMarkupId(true));
-		add(BootstrapFileUploadBehavior.INSTANCE);
-		addButton(OmModalCloseButton.of("85"));
-
-		super.onInitialize();
 	}
 
 	@Override
-	public Modal<String> show(IPartialPageRequestHandler handler) {
+	public void show(IPartialPageRequestHandler handler) {
 		BaseFileItem last = roomFiles.getLastSelected();
 		if (last.getId() == null) {
 			lastSelectedRoom.add(AttributeModifier.replace("value", last.getRoomId()));
@@ -92,14 +67,12 @@ public class UploadDialog extends Modal<String> {
 		} else {
 			lastSelectedId.add(AttributeModifier.replace("value", last.getId()));
 		}
-		handler.add(form.setVisible(true));
-		handler.appendJavaScript("Upload.bindUpload();");
-		return super.show(handler);
+		super.show(handler, "roomUploadExtaBindFunc");
 	}
 
 	@Override
 	public void renderHead(IHeaderResponse response) {
 		super.renderHead(response);
-		response.render(new PriorityHeaderItem(JavaScriptHeaderItem.forReference(new JavaScriptResourceReference(UploadDialog.class, "upload.js"))));
+		response.render(new PriorityHeaderItem(JavaScriptHeaderItem.forReference(new JavaScriptResourceReference(RoomUploadForm.class, "room-upload.js"))));
 	}
 }
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/UploadDialog.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/UploadDialog.html
index 2333d66..3ed94d4 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/UploadDialog.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/UploadDialog.html
@@ -21,31 +21,6 @@
 <!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-9.xsd">
 <wicket:extend>
-	<form wicket:id="form" id="room-upload-form" method="post" enctype="multipart/form-data">
-		<div class="mb-4"><wicket:message key="594"/></div>
-		<div class="fileinput fileinput-new d-inline m-0" data-provides="fileinput">
-			<div class="fileinput-filename d-block"></div>
-			<span class="btn btn-file btn-outline-primary">
-				<span><wicket:message key="596"/></span>
-				<input type="file" multiple="multiple" id="room-upload-file" name="room-upload-file"/>
-			</span>
-		</div>
-		<div class="error"></div>
-		<div class="mt-3">
-			<input id="room-upload-to-wb" name="room-upload-to-wb" type="checkbox" value="true"/>&nbsp;<label for="room-upload-to-wb"><wicket:message key="1312"/></label>
-			<div class="me-3 d-none" id="room-upload-clean-block">
-				<input id="room-upload-clean" name="room-upload-clean" type="checkbox" value="true"/>&nbsp;<label for="room-upload-clean"><wicket:message key="62"/></label>
-			</div>
-		</div>
-		<input wicket:id="sid" name="room-upload-sid" type="hidden"/>
-		<input wicket:id="lastSelectedId" name="room-upload-last-selected-id" type="hidden" value=""/>
-		<input wicket:id="lastSelectedRoom" name="room-upload-last-selected-room" type="hidden" value=""/>
-		<input wicket:id="lastSelectedOwner" name="room-upload-last-selected-owner" type="hidden" value=""/>
-		<input wicket:id="lastSelectedGroup" name="room-upload-last-selected-group" type="hidden" value=""/>
-	</form>
-	<div class="progress d-none">
-		<div class="progress-bar" role="progressbar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100">0%</div>
-	</div>
-	<div id="progress"></div>
+	<div wicket:id="wsupload"></div>
 </wicket:extend>
 </html>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/UploadDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/UploadDialog.java
index c1b6510..2024e8d 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/UploadDialog.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/UploadDialog.java
@@ -18,44 +18,21 @@
  */
 package org.apache.openmeetings.web.room.sidebar;
 
-import static org.apache.openmeetings.util.OpenmeetingsVariables.getMaxUploadSize;
-import static org.apache.openmeetings.web.room.sidebar.RoomFileUploadResourceReference.PARAM_LAST_SELECTED_GROUP;
-import static org.apache.openmeetings.web.room.sidebar.RoomFileUploadResourceReference.PARAM_LAST_SELECTED_ID;
-import static org.apache.openmeetings.web.room.sidebar.RoomFileUploadResourceReference.PARAM_LAST_SELECTED_OWNER;
-import static org.apache.openmeetings.web.room.sidebar.RoomFileUploadResourceReference.PARAM_LAST_SELECTED_ROOM;
-
-import org.apache.openmeetings.db.entity.file.BaseFileItem;
-import org.apache.openmeetings.web.app.WebSession;
 import org.apache.openmeetings.web.common.OmModalCloseButton;
-import org.apache.openmeetings.web.room.RoomPanel;
 import org.apache.openmeetings.web.util.upload.BootstrapFileUploadBehavior;
-import org.apache.wicket.AttributeModifier;
 import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
-import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.head.JavaScriptHeaderItem;
-import org.apache.wicket.markup.head.PriorityHeaderItem;
-import org.apache.wicket.markup.html.WebMarkupContainer;
 import org.apache.wicket.model.ResourceModel;
-import org.apache.wicket.request.mapper.parameter.PageParameters;
-import org.apache.wicket.request.resource.JavaScriptResourceReference;
-import org.apache.wicket.util.lang.Bytes;
 
 import de.agilecoders.wicket.core.markup.html.bootstrap.dialog.Modal;
 
 public class UploadDialog extends Modal<String> {
 	private static final long serialVersionUID = 1L;
-	private final WebMarkupContainer form = new WebMarkupContainer("form");
+	private RoomUploadForm wsUpload;
 	private final RoomFilePanel roomFiles;
-	private final RoomPanel room;
-	private final WebMarkupContainer lastSelectedId = new WebMarkupContainer("lastSelectedId");
-	private final WebMarkupContainer lastSelectedRoom = new WebMarkupContainer("lastSelectedRoom"); // required for "fake" root
-	private final WebMarkupContainer lastSelectedOwner = new WebMarkupContainer("lastSelectedOwner"); // required for "fake" root
-	private final WebMarkupContainer lastSelectedGroup = new WebMarkupContainer("lastSelectedGroup"); // required for "fake" root
 
-	public UploadDialog(String id, RoomPanel room, RoomFilePanel roomFiles) {
+	public UploadDialog(String id, RoomFilePanel roomFiles) {
 		super(id);
 		this.roomFiles = roomFiles;
-		this.room = room;
 	}
 
 	@Override
@@ -64,18 +41,7 @@ public class UploadDialog extends Modal<String> {
 		setCloseOnEscapeKey(false);
 		setBackdrop(Backdrop.STATIC);
 
-		add(form.add(AttributeModifier.append("data-max-size", getMaxUploadSize()))
-				.add(AttributeModifier.append("data-max-size-lbl", Bytes.bytes(getMaxUploadSize()).toString(WebSession.get().getLocale())))
-				.add(AttributeModifier.append("data-upload-lbl", getString("593")))
-				.add(AttributeModifier.append("data-max-upload-lbl", getString("1491")))
-				.add(AttributeModifier.append("action", "" + urlFor(new RoomFileUploadResourceReference(), new PageParameters())))
-				.setOutputMarkupId(true)
-				.setOutputMarkupPlaceholderTag(true));
-		form.add(new WebMarkupContainer("sid").add(AttributeModifier.append("value", room.getClient().getSid())).setMarkupId("room-upload-sid").setOutputMarkupId(true));
-		form.add(lastSelectedId.setMarkupId(PARAM_LAST_SELECTED_ID).setOutputMarkupId(true));
-		form.add(lastSelectedRoom.setMarkupId(PARAM_LAST_SELECTED_ROOM).setOutputMarkupId(true));
-		form.add(lastSelectedOwner.setMarkupId(PARAM_LAST_SELECTED_OWNER).setOutputMarkupId(true));
-		form.add(lastSelectedGroup.setMarkupId(PARAM_LAST_SELECTED_GROUP).setOutputMarkupId(true));
+		add(wsUpload = new RoomUploadForm("wsupload", roomFiles));
 		add(BootstrapFileUploadBehavior.INSTANCE);
 		addButton(OmModalCloseButton.of("85"));
 
@@ -84,22 +50,7 @@ public class UploadDialog extends Modal<String> {
 
 	@Override
 	public Modal<String> show(IPartialPageRequestHandler handler) {
-		BaseFileItem last = roomFiles.getLastSelected();
-		if (last.getId() == null) {
-			lastSelectedRoom.add(AttributeModifier.replace("value", last.getRoomId()));
-			lastSelectedOwner.add(AttributeModifier.replace("value", last.getOwnerId()));
-			lastSelectedGroup.add(AttributeModifier.replace("value", last.getGroupId()));
-		} else {
-			lastSelectedId.add(AttributeModifier.replace("value", last.getId()));
-		}
-		handler.add(form.setVisible(true));
-		handler.appendJavaScript("Upload.bindUpload();");
+		wsUpload.show(handler);
 		return super.show(handler);
 	}
-
-	@Override
-	public void renderHead(IHeaderResponse response) {
-		super.renderHead(response);
-		response.render(new PriorityHeaderItem(JavaScriptHeaderItem.forReference(new JavaScriptResourceReference(UploadDialog.class, "upload.js"))));
-	}
 }
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/room-upload.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/room-upload.js
index 5c40961..e108410 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/room-upload.js
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/room-upload.js
@@ -1,112 +1,11 @@
 /* Licensed under the Apache License, Version 2.0 (the "License") http://www.apache.org/licenses/LICENSE-2.0 */
-var Upload = (function() {
-	let progress, progressBar, curUid;
-
-	function _onWsMessage(jqEvent, msg) {
-		try {
-			if (msg instanceof Blob) {
-				return; //ping
-			}
-			const m = JSON.parse(msg);
-			if (m && 'room-upload' === m.type && curUid === m.uuid) {
-				switch (m.status) {
-					case 'ERROR':
-						OmUtil.error(m.message);
-						break;
-					case 'PROGRESS': {
-							const progressP = m.progress + '%';
-							progressBar.css('width', progressP).attr('aria-valuenow', m.progress).text(progressP);
-							if (m.progress === 100) {
-								$('#room-upload-form').parents('.modal').modal('hide');
-								_cleanup();
-							}
-						}
-						break;
-					default:
-						//no-op
-				}
-			}
-		} catch (err) {
-			OmUtil.error(err);
+function roomUploadExtaBindFunc() {
+	$('#room-upload-to-wb').off().click(function() {
+		const clnBlock = $('#room-upload-clean-block');
+		if ($(this).prop('checked')) {
+			clnBlock.removeClass('d-none');
+		} else {
+			clnBlock.addClass('d-none');
 		}
-	}
-	function _cleanup() {
-		Wicket.Event.unsubscribe('/websocket/message', _onWsMessage);
-	}
-	function _bindUpload() {
-		const form = $('#room-upload-form')
-				, fi = form.find('.fileinput')
-		progress = form.parent().find('.progress');
-		progressBar = form.parent().find('.progress-bar');
-		_cleanup();
-		form.show();
-		progress.addClass('d-none');
-		let uploadBtn = $('#room-upload-btn');
-		if (uploadBtn.length === 0) {
-			uploadBtn = $('<button id="room-upload-btn" class="btn btn-outline-primary"></button>')
-				.text(form.data('upload-lbl'));
-			form.parents('.modal-content').find('.modal-footer').prepend(uploadBtn);
-			uploadBtn.click(function() {
-				const cform = $('#room-upload-form');
-				$.ajax({
-					url: cform.attr('action')
-					, type: 'POST'
-					, data: new FormData($('#room-upload-form')[0])
-					, processData: false
-					, contentType: false
-				}).done(function(data) {
-					curUid = data.uuid;
-					uploadBtn.attr('disabled', 'disabled');
-					cform.hide();
-					progress.removeClass('d-none');
-					Wicket.Event.subscribe('/websocket/message', _onWsMessage);
-				}).fail(function(e) {
-					OmUtil.error(e.message);
-				});
-			});
-		}
-		uploadBtn.attr('disabled', 'disabled');
-		if (!fi.eventAdded) {
-			fi.on('change.bs.fileinput', function(event) {
-				event.stopPropagation();
-				const th = $(this)
-					, fInput = th.find('input[type=file]')
-					, fn = th.find('.fileinput-filename')
-					, files = fInput[0].files
-					, errors = form.find('.error');
-				errors.html('');
-				let	valid = files !== undefined && files.length > 0;
-				if (valid) {
-					const size = Array.from(files).map(f => f.size).reduce((a, b) => a + b, 0);
-					valid = size < +form.data('max-size');
-					if (!valid) {
-						errors.html($('<div class="alert alert-danger" role="alert"></div>').text(form.data('max-upload-lbl') + ' ' + form.data('max-size-lbl')));
-					}
-				}
-				if (valid) {
-					fn.text(Array.from(files).map(f => f.name).join(', '));
-					uploadBtn.removeAttr('disabled');
-				} else {
-					fn.text('');
-					uploadBtn.attr('disabled', 'disabled');
-					$('#room-upload-file').val('');
-				}
-				fInput.attr('title', fn.text());
-				return false;
-			});
-			$('#room-upload-to-wb').click(function() {
-				const clnBlock = $('#room-upload-clean-block');
-				if ($(this).prop('checked')) {
-					clnBlock.removeClass('d-none');
-				} else {
-					clnBlock.addClass('d-none');
-				}
-			});
-			fi.eventAdded = true;
-		}
-	}
-
-	return {
-		bindUpload: _bindUpload
-	};
-})();
+	});
+}

[openmeetings] 01/02: [OPENMEETINGS-2488] bootstrap-confirmation used instead of dialog

Posted by so...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git

commit 5cee9a554b36cafcb35bef26e69361810aa1c4ec
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Fri Nov 26 21:27:45 2021 +0700

    [OPENMEETINGS-2488] bootstrap-confirmation used instead of dialog
---
 .../common/confirmation/ConfirmableAjaxBorder.html | 26 --------
 .../common/confirmation/ConfirmableAjaxBorder.java | 74 ---------------------
 .../common/confirmation/ConfirmationDialog.java    | 77 ----------------------
 .../common/confirmation/ConfirmationHelper.java    | 12 +---
 .../web/common/tree/FileTreePanel.html             | 23 ++-----
 .../web/common/tree/FileTreePanel.java             | 57 ++++++++--------
 .../openmeetings/web/common/tree/filetree.js       | 13 ++--
 .../web/room/sidebar/{upload.js => room-upload.js} |  0
 .../openmeetings/web/user/chat/ChatToolbar.java    |  6 +-
 9 files changed, 44 insertions(+), 244 deletions(-)

diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/confirmation/ConfirmableAjaxBorder.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/confirmation/ConfirmableAjaxBorder.html
deleted file mode 100644
index 590405b..0000000
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/confirmation/ConfirmableAjaxBorder.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
-
--->
-<!DOCTYPE html>
-<html xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-9.xsd">
-<wicket:border>
-	<wicket:body/>
-</wicket:border>
-</html>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/confirmation/ConfirmableAjaxBorder.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/confirmation/ConfirmableAjaxBorder.java
deleted file mode 100644
index a344fc5..0000000
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/confirmation/ConfirmableAjaxBorder.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License") +  you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.openmeetings.web.common.confirmation;
-
-import static org.apache.openmeetings.web.common.BasePanel.EVT_CLICK;
-
-import org.apache.wicket.ajax.AjaxEventBehavior;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
-import org.apache.wicket.markup.html.border.Border;
-
-public abstract class ConfirmableAjaxBorder extends Border {
-	private static final long serialVersionUID = 1L;
-	private final ConfirmationDialog dialog;
-
-	protected ConfirmableAjaxBorder(String id, ConfirmationDialog dialog) {
-		super(id);
-		this.dialog = dialog;
-		setOutputMarkupId(true);
-	}
-
-	@Override
-	protected void onInitialize() {
-		super.onInitialize();
-		add(new AjaxEventBehavior(EVT_CLICK) {
-			private static final long serialVersionUID = 1L;
-
-			@Override
-			protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
-				super.updateAjaxAttributes(attributes);
-				ConfirmableAjaxBorder.this.updateAjaxAttributes(attributes);
-			}
-
-			@Override
-			protected void onEvent(AjaxRequestTarget target) {
-				if (isClickable()) {
-					dialog.show(target);
-				}
-			}
-		});
-	}
-
-	protected boolean isClickable() {
-		return true;
-	}
-
-	/**
-	 * Gives a chance to the specializations to modify the attributes.
-	 *
-	 * @param attributes - attributes
-	 */
-	protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
-	}
-
-	protected void onEvent(AjaxRequestTarget target) {
-		dialog.show(target);
-	}
-}
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/confirmation/ConfirmationDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/confirmation/ConfirmationDialog.java
deleted file mode 100644
index 7ded64f..0000000
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/confirmation/ConfirmationDialog.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License") +  you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.openmeetings.web.common.confirmation;
-
-import org.apache.openmeetings.web.common.OmModalCloseButton;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.ResourceModel;
-
-import de.agilecoders.wicket.core.markup.html.bootstrap.behavior.CssClassNameAppender;
-import de.agilecoders.wicket.core.markup.html.bootstrap.button.BootstrapAjaxLink;
-import de.agilecoders.wicket.core.markup.html.bootstrap.button.Buttons;
-import de.agilecoders.wicket.core.markup.html.bootstrap.dialog.TextContentModal;
-import de.agilecoders.wicket.core.markup.html.bootstrap.image.IconType;
-import de.agilecoders.wicket.extensions.markup.html.bootstrap.icon.FontAwesome5IconType;
-
-public abstract class ConfirmationDialog extends TextContentModal {
-	private static final long serialVersionUID = 1L;
-	private BootstrapAjaxLink<String> okButton;
-
-	protected ConfirmationDialog(String id, IModel<String> title, IModel<String> model) {
-		super(id, model);
-		header(title);
-	}
-
-	private BootstrapAjaxLink<String> getOkButton() {
-		if (okButton == null) {
-			okButton = new BootstrapAjaxLink<>(BUTTON_MARKUP_ID, null, Buttons.Type.Outline_Danger, new ResourceModel("54")) {
-				private static final long serialVersionUID = 1L;
-
-				@Override
-				public void onClick(AjaxRequestTarget target) {
-					close(target);
-					onConfirm(target);
-				}
-			};
-			okButton.setIconType(FontAwesome5IconType.exclamation_triangle_s);
-		}
-		return okButton;
-	}
-
-	public ConfirmationDialog withOkType(Buttons.Type type) {
-		getOkButton().setType(type);
-		return this;
-	}
-
-	public ConfirmationDialog withOkIcon(IconType icon) {
-		getOkButton().setIconType(icon);
-		return this;
-	}
-
-	@Override
-	protected void onInitialize() {
-		super.onInitialize();
-		add(new CssClassNameAppender("om-confirm-dialog"));
-		addButton(getOkButton());
-		addButton(OmModalCloseButton.of());
-	}
-
-	protected abstract void onConfirm(AjaxRequestTarget target);
-}
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/confirmation/ConfirmationHelper.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/confirmation/ConfirmationHelper.java
index 444452e..1cf1644 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/confirmation/ConfirmationHelper.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/confirmation/ConfirmationHelper.java
@@ -18,8 +18,6 @@
  */
 package org.apache.openmeetings.web.common.confirmation;
 
-import java.util.function.Consumer;
-
 import org.apache.wicket.Component;
 
 import de.agilecoders.wicket.extensions.markup.html.bootstrap.confirmation.ConfirmationBehavior;
@@ -31,17 +29,13 @@ public class ConfirmationHelper {
 	}
 
 	public static ConfirmationBehavior newOkCancelDangerConfirm(Component c, String title) {
-		return newOkCancelDangerConfirm(c, title, null);
+		return new ConfirmationBehavior(newOkCancelDangerConfirmCfg(c, title));
 	}
 
-	public static ConfirmationBehavior newOkCancelDangerConfirm(Component c, String title, Consumer<ConfirmationConfig> cfgCustomizer) {
-		ConfirmationConfig cfg = newOkCancelConfirmCfg(c, title)
+	public static ConfirmationConfig newOkCancelDangerConfirmCfg(Component c, String title) {
+		return newOkCancelConfirmCfg(c, title)
 				.withBtnOkClass("btn btn-sm btn-danger")
 				.withBtnOkIconClass("fas fa-exclamation-triangle");
-		if (cfgCustomizer != null) {
-			cfgCustomizer.accept(cfg);
-		}
-		return new ConfirmationBehavior(cfg);
 	}
 
 	private static ConfirmationConfig newOkCancelConfirmCfg(Component c, String title) {
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.html
index 5bfa3c0..9bdb387 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.html
@@ -23,29 +23,15 @@
 <wicket:panel>
 	<form wicket:id="form" class="h-100">
 	<div class="file-tree item drop area">
-		<div class="icons clear trash-toolbar" wicket:id="trash-toolbar" wicket:message="title:705">
+		<div class="icons clear trash-toolbar" wicket:id="trash-toolbar"
+				data-btn-ok-class="btn btn-sm btn-danger"
+				data-btn-ok-icon-class="fas fa-exclamation-triangle"
+				wicket:message="title:705, data-btn-ok-label:54, data-btn-cancel-label:lbl.cancel, data-title:80, data-bs-content:713">
 			<span wicket:id="upload" wicket:message="title:702"></span>
 			<span wicket:id="create" wicket:message="title:703"></span>
 			<span wicket:id="refresh" class="refresh om-icon big align-left clickable" wicket:message="title:lbl.refresh"></span>
 			<span wicket:id="trash"></span>
 			<div class="clear"></div>
-			<div id="om-js-trash-confirm" class="modal om-confirm-dialog" tabindex="-1" data-bs-backdrop="static" role="dialog" aria-labelledby="om-js-trash-confirm-header" aria-modal="true" aria-hidden="true">
-				<div class="modal-dialog">
-					<div class="modal-content">
-						<div class="modal-header">
-							<h4 class="modal-title" id="om-js-trash-confirm-header"><wicket:message key="80"/></h4>
-							<button type="button" class="btn-close" data-bs-dismiss="modal" aria-hidden="true"></button>
-						</div>
-						<div class="modal-body"><wicket:message key="713"/></div>
-						<div class="modal-footer">
-							<button type="button" class="btn btn-outline-danger ok-btn">
-								<i class="fas fa-exclamation-triangle"></i>&nbsp;<wicket:message key="54"/>
-							</button>
-							<button type="button" data-bs-dismiss="modal" class="btn btn-outline-secondary"><wicket:message key="lbl.cancel"/></button>
-						</div>
-					</div>
-				</div>
-			</div>
 		</div>
 		<div wicket:id="tree-container" class="trees">
 			<div id="tree-anchor"></div>
@@ -67,6 +53,5 @@
 		<div wicket:id="errors"></div>
 	</div>
 	</form>
-	<div wicket:id="trash-confirm-dialog"></div>
 </wicket:panel>
 </html>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java
index 8ea79c8..21aea80 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java
@@ -28,6 +28,7 @@ import static org.apache.openmeetings.util.OpenmeetingsVariables.ATTR_CLASS;
 import static org.apache.openmeetings.util.OpenmeetingsVariables.ATTR_TITLE;
 import static org.apache.openmeetings.web.app.WebSession.getUserId;
 import static org.apache.openmeetings.web.common.BasePanel.EVT_CLICK;
+import static org.apache.openmeetings.web.common.confirmation.ConfirmationHelper.newOkCancelDangerConfirmCfg;
 import static org.apache.openmeetings.web.pages.BasePage.ALIGN_LEFT;
 import static org.apache.openmeetings.web.pages.BasePage.ALIGN_RIGHT;
 
@@ -46,8 +47,6 @@ import org.apache.openmeetings.db.entity.file.FileItem;
 import org.apache.openmeetings.db.entity.record.Recording;
 import org.apache.openmeetings.util.OmFileHelper;
 import org.apache.openmeetings.web.common.NameDialog;
-import org.apache.openmeetings.web.common.confirmation.ConfirmableAjaxBorder;
-import org.apache.openmeetings.web.common.confirmation.ConfirmationDialog;
 import org.apache.wicket.AttributeModifier;
 import org.apache.wicket.Component;
 import org.apache.wicket.ajax.AjaxEventBehavior;
@@ -85,6 +84,7 @@ import de.agilecoders.wicket.core.markup.html.bootstrap.button.ButtonBehavior;
 import de.agilecoders.wicket.core.markup.html.bootstrap.button.Buttons;
 import de.agilecoders.wicket.core.markup.html.bootstrap.button.dropdown.SplitButton;
 import de.agilecoders.wicket.core.markup.html.bootstrap.image.IconType;
+import de.agilecoders.wicket.extensions.markup.html.bootstrap.confirmation.ConfirmationBehavior;
 import de.agilecoders.wicket.extensions.markup.html.bootstrap.icon.FontAwesome5IconType;
 
 public abstract class FileTreePanel extends Panel {
@@ -125,7 +125,8 @@ public abstract class FileTreePanel extends Panel {
 	private final WebMarkupContainer buttons = new WebMarkupContainer("buttons");
 	private final Form<Void> form = new Form<>("form");
 	private final NameDialog addFolder;
-	private ConfirmableAjaxBorder trashBorder;
+	private final WebMarkupContainer trash = new WebMarkupContainer("trash");
+	private ConfirmationBehavior trashConfirm;
 	private final Long roomId;
 	private boolean readOnly = true;
 	private final Component createDir = new WebMarkupContainer("create").add(new AjaxEventBehavior(EVT_CLICK) {
@@ -137,7 +138,6 @@ public abstract class FileTreePanel extends Panel {
 		}
 	});
 	private final Component upload = new WebMarkupContainer("upload");
-	private ConfirmationDialog confirmTrashDialog;
 
 	@SpringBean
 	private RecordingDao recDao;
@@ -212,8 +212,25 @@ public abstract class FileTreePanel extends Panel {
 				update(target);
 			}
 		}));
-		trashToolbar.add(getTrashBorder());
-		add(confirmTrashDialog);
+		trashToolbar.add(trash.setOutputMarkupId(true));
+		trash.add(new AjaxEventBehavior("confirmed.bs.confirmation") {
+			private static final long serialVersionUID = 1L;
+
+			@Override
+			protected void onEvent(AjaxRequestTarget target) {
+				deleteAll(target);
+			}
+		});
+
+		trashConfirm = new ConfirmationBehavior(newOkCancelDangerConfirmCfg(trashToolbar, getString("80")).withContent(getString("713"))) {
+			private static final long serialVersionUID = 1L;
+
+			@Override
+			public boolean isEnabled(Component component) {
+				return !readOnly && !selected.isEmpty();
+			}
+		};
+		trash.add(trashConfirm);
 
 		form.add(trees.add(tree).setOutputMarkupId(true));
 		updateSizes();
@@ -313,28 +330,6 @@ public abstract class FileTreePanel extends Panel {
 		}));
 	}
 
-	private ConfirmableAjaxBorder getTrashBorder() {
-		if (trashBorder == null) {
-			confirmTrashDialog = new ConfirmationDialog("trash-confirm-dialog", new ResourceModel("80"), new ResourceModel("713")) {
-				private static final long serialVersionUID = 1L;
-
-				@Override
-				protected void onConfirm(AjaxRequestTarget target) {
-					deleteAll(target);
-				}
-			};
-			trashBorder = new ConfirmableAjaxBorder("trash", confirmTrashDialog) {
-				private static final long serialVersionUID = 1L;
-
-				@Override
-				protected boolean isClickable() {
-					return !readOnly && !selected.isEmpty();
-				}
-			};
-		}
-		return trashBorder;
-	}
-
 	@Override
 	public void renderHead(IHeaderResponse response) {
 		super.renderHead(response);
@@ -384,9 +379,9 @@ public abstract class FileTreePanel extends Panel {
 			createDir.add(AttributeModifier.replace(ATTR_CLASS, CREATE_DIR_CLASS + (readOnly ? DISABLED_CLASS : "")));
 			upload.setEnabled(!readOnly);
 			upload.add(AttributeModifier.replace(ATTR_CLASS, UPLOAD_CLASS + (readOnly ? DISABLED_CLASS : "")));
-			trashBorder.add(AttributeModifier.replace(ATTR_CLASS, TRASH_CLASS + (readOnly ? DISABLED_CLASS : "")));
+			trash.add(AttributeModifier.replace(ATTR_CLASS, TRASH_CLASS + (readOnly ? DISABLED_CLASS : "")));
 			if (handler != null) {
-				handler.add(createDir, upload, trashBorder);
+				handler.add(createDir, upload, trash);
 				update(handler);
 			}
 		}
@@ -509,7 +504,7 @@ public abstract class FileTreePanel extends Panel {
 		}
 		updateSelected(target); //all finally selected are in the update list
 		if (target != null) {
-			target.add(trashBorder, buttons);
+			target.add(trash, buttons);
 		}
 	}
 
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/filetree.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/filetree.js
index 1d8584e..dbb426d 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/filetree.js
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/filetree.js
@@ -15,13 +15,14 @@ var OmFileTree = (function() {
 			return !dropped || (!!dropped.context && $(dropped.context).hasClass('wb', 'room'));
 		}
 		, confirmTrash: function(drop, ui, callback) {
-			const dlg = $('#om-js-trash-confirm');
-			dlg.find('.ok-btn').off().click(function() {
-				drop.append(ui.draggable);
-				dlg.modal('hide');
-				callback();
+			$('.trash-toolbar').confirmation({
+				trigger: 'manual'
+				, onConfirm: () => {
+					drop.append(ui.draggable);
+					callback();
+				}
 			});
-			dlg.modal('show');
+			$('.trash-toolbar').confirmation('show');
 		}
 	}
 })();
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/upload.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/room-upload.js
similarity index 100%
rename from openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/upload.js
rename to openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/room-upload.js
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatToolbar.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatToolbar.java
index 1273f7c..15501b5 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatToolbar.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatToolbar.java
@@ -26,7 +26,7 @@ import static org.apache.openmeetings.web.app.WebSession.getDateFormat;
 import static org.apache.openmeetings.web.app.WebSession.getRights;
 import static org.apache.openmeetings.web.app.WebSession.getUserId;
 import static org.apache.openmeetings.web.common.BasePanel.EVT_CLICK;
-import static org.apache.openmeetings.web.common.confirmation.ConfirmationHelper.newOkCancelDangerConfirm;
+import static org.apache.openmeetings.web.common.confirmation.ConfirmationHelper.newOkCancelDangerConfirmCfg;
 import static org.apache.openmeetings.web.room.RoomPanel.isModerator;
 
 import java.util.List;
@@ -56,6 +56,8 @@ import com.github.openjson.JSONObject;
 import com.googlecode.wicket.jquery.core.IJQueryWidget.JQueryWidget;
 import com.googlecode.wicket.jquery.ui.plugins.wysiwyg.toolbar.IWysiwygToolbar;
 
+import de.agilecoders.wicket.extensions.markup.html.bootstrap.confirmation.ConfirmationBehavior;
+
 /**
  * Provides a custom implementation for com.googlecode.wicket.jquery.ui.plugins.wysiwyg.toolbar.IWysiwygToolbar suitable
  * for chat}
@@ -209,7 +211,7 @@ public class ChatToolbar extends Panel implements IWysiwygToolbar {
 					});
 			}
 		};
-		delBtn.add(newOkCancelDangerConfirm(this, getString("832"), cfg -> cfg.withCustomClass("chat-delete")));
+		delBtn.add(new ConfirmationBehavior(newOkCancelDangerConfirmCfg(this, getString("832")).withCustomClass("chat-delete")));
 		toolbar.add(delBtn.setVisible(hasAdminLevel(getRights())).setOutputMarkupId(true)
 				.setOutputMarkupPlaceholderTag(true));
 		toolbar.add(save.setVisible(hasAdminLevel(getRights())).setOutputMarkupId(true)