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
The following commit(s) were added to refs/heads/master by this push:
new 22c9e14e1 [OPENMEETINGS-2806] Some Sonar issues are addressed
22c9e14e1 is described below
commit 22c9e14e1737b426b14cc1fc7fb0a63cab8c0e6e
Author: Maxim Solodovnik <[email protected]>
AuthorDate: Wed Jan 21 11:28:06 2026 +0700
[OPENMEETINGS-2806] Some Sonar issues are addressed
---
.../core/util/StrongPasswordValidator.java | 2 +-
openmeetings-web/src/main/front/src/wb/wb-zoom.js | 4 ++--
.../openmeetings/web/admin/backup/BackupPanel.java | 4 ++--
.../web/admin/configurations/admin-config.js | 2 +-
.../web/admin/groups/GroupUsersPanel.java | 4 ++--
.../openmeetings/web/admin/labels/LangPanel.java | 4 ++--
.../openmeetings/web/admin/oauth/OAuthForm.java | 4 ++--
.../openmeetings/web/admin/rooms/RoomForm.java | 8 ++++----
.../org/apache/openmeetings/web/common/Captcha.java | 4 ++--
.../web/common/UploadableImagePanel.java | 4 ++--
.../common/datetime/AbstractOmDateTimePicker.java | 20 ++++++++++----------
.../openmeetings/web/common/tree/FileTreePanel.java | 4 ++--
.../apache/openmeetings/web/common/upload/upload.js | 2 +-
.../org/apache/openmeetings/web/pages/BasePage.java | 4 ++--
.../java/org/apache/openmeetings/web/pages/om-ga.js | 12 ++++++------
.../apache/openmeetings/web/room/IconTextModal.java | 8 ++++----
.../openmeetings/web/room/menu/RoomMenuPanel.java | 4 ++--
.../web/room/poll/PollResultsDialog.java | 6 +++---
.../org/apache/openmeetings/web/room/raw-nettest.js | 4 ++--
.../web/user/profile/EditProfileForm.java | 4 ++--
.../web/user/profile/MessagesContactsPanel.java | 6 +++---
.../openmeetings/web/user/rooms/RoomListPanel.java | 4 ++--
.../calendar/TestDatabaseStructureAppointment.java | 2 +-
23 files changed, 60 insertions(+), 60 deletions(-)
diff --git
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/util/StrongPasswordValidator.java
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/util/StrongPasswordValidator.java
index c06ba830a..292c19800 100644
---
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/util/StrongPasswordValidator.java
+++
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/util/StrongPasswordValidator.java
@@ -79,7 +79,7 @@ public class StrongPasswordValidator implements
IValidator<String> {
for (int i = 0; i < lword.length() - 3; ++i) {
String substr = lword.substring(i, i + 3);
if (lpwd.indexOf(substr) > -1) {
- log.trace("Part '{}' of '{}' [{}] found in pwd
'{}' []", substr, lword, word, lpwd, password);
+ log.trace("Part '{}' of '{}' [{}] found in pwd
'{}' []", substr, lword, word, lpwd);
return true;
}
}
diff --git a/openmeetings-web/src/main/front/src/wb/wb-zoom.js
b/openmeetings-web/src/main/front/src/wb/wb-zoom.js
index a48cb8e9b..190e32bac 100644
--- a/openmeetings-web/src/main/front/src/wb/wb-zoom.js
+++ b/openmeetings-web/src/main/front/src/wb/wb-zoom.js
@@ -72,7 +72,7 @@ module.exports = class WbZoom {
, wbsw =
wbs.find('.wbs-width').val(wbObj.width)
, wbsh =
wbs.find('.wbs-height').val(wbObj.height);
function isNumeric(n) {
- return
!isNaN(parseInt(n)) && isFinite(n);
+ return
!Number.isNaN(parseInt(n)) && isFinite(n);
}
wbs.modal('show');
wbs.find('.btn-ok').off().click(function() {
@@ -104,7 +104,7 @@ module.exports = class WbZoom {
zoomBar.find('.zoom').change(function()
{
const zzz = $(this).val();
self.zoomMode = 'ZOOM';
- if (isNaN(zzz)) {
+ if (Number.isNaN(zzz)) {
switch (zzz) {
case 'FULL_FIT':
case
'PAGE_WIDTH':
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupPanel.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupPanel.java
index 634ec85ea..9d1a40110 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupPanel.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupPanel.java
@@ -55,7 +55,7 @@ import
de.agilecoders.wicket.core.markup.html.bootstrap.button.Buttons;
import
de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
import
de.agilecoders.wicket.core.markup.html.bootstrap.components.progress.UpdatableProgressBar;
import
de.agilecoders.wicket.core.markup.html.bootstrap.utilities.BackgroundColorBehavior;
-import
de.agilecoders.wicket.extensions.markup.html.bootstrap.icon.FontAwesome6IconType;
+import
de.agilecoders.wicket.extensions.markup.html.bootstrap.icon.FontAwesome7IconType;
import jakarta.inject.Inject;
/**
* Panel component to manage Backup Import/Export
@@ -183,7 +183,7 @@ public class BackupPanel extends AdminBasePanel {
target.add(feedback);
}
};
-
download.setIconType(FontAwesome6IconType.file_arrow_down_s);
+
download.setIconType(FontAwesome7IconType.file_arrow_down_s);
progressBar = new UpdatableProgressBar("progress", new
Model<>(0), BackgroundColorBehavior.Color.Info, true) {
private static final long serialVersionUID = 1L;
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/admin-config.js
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/admin-config.js
index 2c2586910..944eb4ad9 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/admin-config.js
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/admin-config.js
@@ -16,7 +16,7 @@ function addOmAdminConfigHandlers() {
val += 'Shift+';
}
const code = evt.code;
- if (typeof(code) === 'undefined') {
+ if (code === undefined) {
return;
}
val += code;
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupUsersPanel.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupUsersPanel.java
index f4044ca6c..02d2e1b29 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupUsersPanel.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupUsersPanel.java
@@ -43,7 +43,7 @@ import
de.agilecoders.wicket.core.markup.html.bootstrap.badge.BootstrapBadge;
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.utilities.BackgroundColorBehavior;
-import
de.agilecoders.wicket.extensions.markup.html.bootstrap.icon.FontAwesome6IconType;
+import
de.agilecoders.wicket.extensions.markup.html.bootstrap.icon.FontAwesome7IconType;
import jakarta.inject.Inject;
public class GroupUsersPanel extends Panel {
@@ -93,7 +93,7 @@ public class GroupUsersPanel extends Panel {
target.add(GroupUsersPanel.this);
}
};
- del.setIconType(FontAwesome6IconType.xmark_s)
+ del.setIconType(FontAwesome7IconType.xmark_s)
.add(newOkCancelDangerConfirm(this, getString("833")));
item.add(del);
item.add(new BootstrapBadge("new", new
ResourceModel("lbl.new"),
BackgroundColorBehavior.Color.Warning).setVisible((grpUser.getId() == null)));
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.java
index f3367e400..fd3bf2318 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.java
@@ -65,7 +65,7 @@ import
de.agilecoders.wicket.core.markup.html.bootstrap.button.BootstrapAjaxButt
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.common.NotificationPanel;
-import
de.agilecoders.wicket.extensions.markup.html.bootstrap.icon.FontAwesome6IconType;
+import
de.agilecoders.wicket.extensions.markup.html.bootstrap.icon.FontAwesome7IconType;
/**
* Language Editor, add/insert/update Label and add/delete language contains
several Forms and one list
@@ -242,7 +242,7 @@ public class LangPanel extends AdminBasePanel {
target.add(listContainer);
}
};
- langForm.add(delLngBtn.setIconType(FontAwesome6IconType.xmark_s)
+ langForm.add(delLngBtn.setIconType(FontAwesome7IconType.xmark_s)
.add(newOkCancelDangerConfirm(this,
getString("833"))));
super.onInitialize();
}
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthForm.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthForm.java
index d4689c12f..2827eecf2 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthForm.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthForm.java
@@ -54,7 +54,7 @@ import org.apache.wicket.util.string.Strings;
import
de.agilecoders.wicket.core.markup.html.bootstrap.button.BootstrapAjaxButton;
import
de.agilecoders.wicket.core.markup.html.bootstrap.button.BootstrapAjaxLink;
import de.agilecoders.wicket.core.markup.html.bootstrap.button.Buttons;
-import
de.agilecoders.wicket.extensions.markup.html.bootstrap.icon.FontAwesome6IconType;
+import
de.agilecoders.wicket.extensions.markup.html.bootstrap.icon.FontAwesome7IconType;
import jakarta.inject.Inject;
public class OAuthForm extends AdminBaseForm<OAuthServer> {
@@ -79,7 +79,7 @@ public class OAuthForm extends AdminBaseForm<OAuthServer> {
target.add(attrsContainer);
}
};
- del.setIconType(FontAwesome6IconType.xmark_s)
+ del.setIconType(FontAwesome7IconType.xmark_s)
.add(newOkCancelDangerConfirm(this,
getString("833")));
item.add(new Label("key", Model.of(entry.getKey())))
.add(new Label("value",
Model.of(entry.getValue())))
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java
index f5055cba2..60ce63657 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java
@@ -83,7 +83,7 @@ import
de.agilecoders.wicket.core.markup.html.bootstrap.button.BootstrapAjaxButt
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.utilities.BackgroundColorBehavior;
-import
de.agilecoders.wicket.extensions.markup.html.bootstrap.icon.FontAwesome6IconType;
+import
de.agilecoders.wicket.extensions.markup.html.bootstrap.icon.FontAwesome7IconType;
import jakarta.inject.Inject;
public class RoomForm extends AdminBaseForm<Room> {
@@ -110,7 +110,7 @@ public class RoomForm extends AdminBaseForm<Room> {
updateClients(target);
}
};
- del.setIconType(FontAwesome6IconType.xmark_s)
+ del.setIconType(FontAwesome7IconType.xmark_s)
.add(newOkCancelDangerConfirm(this,
getString("833")));
item.add(new Label("clientId", "" + c.getUserId()))
.add(new Label("clientLogin", "" +
c.getUser().getLogin()))
@@ -306,7 +306,7 @@ public class RoomForm extends AdminBaseForm<Room> {
target.add(moderatorContainer);
}
};
- del.setIconType(FontAwesome6IconType.xmark_s)
+ del.setIconType(FontAwesome7IconType.xmark_s)
.add(newOkCancelDangerConfirm(this, getString("833")));
item.add(new CheckBox("superModerator", new
PropertyModel<>(moderator, "superModerator")))
.add(new Label("userId",
String.valueOf(moderator.getUser().getId())))
@@ -392,7 +392,7 @@ public class RoomForm extends AdminBaseForm<Room> {
target.add(filesContainer);
}
};
- del.setIconType(FontAwesome6IconType.xmark_s)
+ del.setIconType(FontAwesome7IconType.xmark_s)
.add(newOkCancelDangerConfirm(this, getString("833")));
item.add(new Label("name", new
PropertyModel<>(rf.getFile(), "name")))
.add(new Label("wbIdx", new
PropertyModel<>(rf, "wbIdx")))
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/Captcha.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/Captcha.java
index e5a6d3827..ccfa07c7a 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/Captcha.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/Captcha.java
@@ -41,7 +41,7 @@ import org.apache.wicket.validation.ValidationError;
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.image.Icon;
-import
de.agilecoders.wicket.extensions.markup.html.bootstrap.icon.FontAwesome6IconType;
+import
de.agilecoders.wicket.extensions.markup.html.bootstrap.icon.FontAwesome7IconType;
public class Captcha extends Panel {
private static final long serialVersionUID = 1L;
@@ -105,7 +105,7 @@ public class Captcha extends Panel {
@Override
protected Icon newIcon(String markupId) {
- return new Icon(markupId,
FontAwesome6IconType.rotate_s);
+ return new Icon(markupId,
FontAwesome7IconType.rotate_s);
}
});
}
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UploadableImagePanel.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UploadableImagePanel.java
index f6f9e76b1..eee0e3f64 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UploadableImagePanel.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UploadableImagePanel.java
@@ -45,7 +45,7 @@ import org.slf4j.LoggerFactory;
import
de.agilecoders.wicket.core.markup.html.bootstrap.button.BootstrapAjaxLink;
import de.agilecoders.wicket.core.markup.html.bootstrap.button.Buttons;
-import
de.agilecoders.wicket.extensions.markup.html.bootstrap.icon.FontAwesome6IconType;
+import
de.agilecoders.wicket.extensions.markup.html.bootstrap.icon.FontAwesome7IconType;
public abstract class UploadableImagePanel extends ImagePanel {
private static final long serialVersionUID = 1L;
@@ -91,7 +91,7 @@ public abstract class UploadableImagePanel extends ImagePanel
{
}
};
add(remove
-
.setIconType(FontAwesome6IconType.xmark_s)
+
.setIconType(FontAwesome7IconType.xmark_s)
.add(newOkCancelConfirm(this,
getString("833"))));
fileUploadField.add(new AjaxFormSubmitBehavior(form,
"change") {
private static final long serialVersionUID = 1L;
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/datetime/AbstractOmDateTimePicker.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/datetime/AbstractOmDateTimePicker.java
index cd57c82ca..3bbdd8775 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/datetime/AbstractOmDateTimePicker.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/datetime/AbstractOmDateTimePicker.java
@@ -36,7 +36,7 @@ import org.apache.wicket.request.resource.ResourceReference;
import
de.agilecoders.wicket.extensions.markup.html.bootstrap.form.tempusdominus.TempusDominusConfig;
import
de.agilecoders.wicket.extensions.markup.html.bootstrap.form.tempusdominus.AbstractTempusDominusWithIcon;
-import
de.agilecoders.wicket.extensions.markup.html.bootstrap.icon.FontAwesome6IconType;
+import
de.agilecoders.wicket.extensions.markup.html.bootstrap.icon.FontAwesome7IconType;
public abstract class AbstractOmDateTimePicker<T extends Serializable> extends
FormComponentPanel<T> {
private static final long serialVersionUID = 1L;
@@ -58,15 +58,15 @@ public abstract class AbstractOmDateTimePicker<T extends
Serializable> extends F
.withDateFormats(null)
)
.withIcons(cfg -> cfg
-
.withDateIcon(FontAwesome6IconType.calendar_s)
-
.withTimeIcon(FontAwesome6IconType.clock_s)
-
.withUpIcon(FontAwesome6IconType.arrow_up_s)
-
.withDownIcon(FontAwesome6IconType.arrow_down_s)
-
.withPreviousIcon(FontAwesome6IconType.arrow_left_s)
-
.withNextIcon(FontAwesome6IconType.arrow_right_s)
-
.withTodayIcon(FontAwesome6IconType.calendar_check_s)
-
.withClearIcon(FontAwesome6IconType.eraser_s)
-
.withCloseIcon(FontAwesome6IconType.xmark_s));
+
.withDateIcon(FontAwesome7IconType.calendar_s)
+
.withTimeIcon(FontAwesome7IconType.clock_s)
+
.withUpIcon(FontAwesome7IconType.arrow_up_s)
+
.withDownIcon(FontAwesome7IconType.arrow_down_s)
+
.withPreviousIcon(FontAwesome7IconType.arrow_left_s)
+
.withNextIcon(FontAwesome7IconType.arrow_right_s)
+
.withTodayIcon(FontAwesome7IconType.calendar_check_s)
+
.withClearIcon(FontAwesome7IconType.eraser_s)
+
.withCloseIcon(FontAwesome7IconType.xmark_s));
picker = new AbstractTempusDominusWithIcon<>("picker", new
Model<>(), patch(config)) {
private static final long serialVersionUID = 1L;
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 2a597a549..5f9494c3a 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
@@ -84,7 +84,7 @@ 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.FontAwesome6IconType;
+import
de.agilecoders.wicket.extensions.markup.html.bootstrap.icon.FontAwesome7IconType;
import jakarta.inject.Inject;
public abstract class FileTreePanel extends Panel {
@@ -264,7 +264,7 @@ public abstract class FileTreePanel extends Panel {
public void onClick(AjaxRequestTarget
target) {
onDownlownClick(target, ext);
}
- }.setIconType(FontAwesome6IconType.download_s);
+ }.setIconType(FontAwesome7IconType.download_s);
}
@Override
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
index bad18e34a..ddcd1589c 100644
---
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
@@ -14,7 +14,7 @@ const Upload = (function() {
return; //ping
}
const m = JSON.parse(msg);
- if (m && 'omws-upload' === m.type && curUid === m.uuid)
{
+ if ('omws-upload' === m?.type && curUid === m.uuid) {
switch (m.status) {
case 'ERROR':
OmUtil.error(m.message);
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.java
index 2f54cf985..c15ad5f14 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.java
@@ -55,7 +55,7 @@ import org.wicketstuff.urlfragment.AsyncUrlFragmentAwarePage;
import de.agilecoders.wicket.core.Bootstrap;
import
de.agilecoders.wicket.core.markup.html.bootstrap.behavior.BootstrapResourcesBehavior;
-import
de.agilecoders.wicket.extensions.markup.html.bootstrap.icon.FontAwesome6CssReference;
+import
de.agilecoders.wicket.extensions.markup.html.bootstrap.icon.FontAwesome7CssReference;
public abstract class BasePage extends AsyncUrlFragmentAwarePage {
private static final long serialVersionUID = 1L;
@@ -146,7 +146,7 @@ public abstract class BasePage extends
AsyncUrlFragmentAwarePage {
.append(getGaCode()).append("',
").append(isMainPage()).append(");");
response.render(OnDomReadyHeaderItem.forScript(script));
}
-
response.render(CssHeaderItem.forReference(FontAwesome6CssReference.instance()));
+
response.render(CssHeaderItem.forReference(FontAwesome7CssReference.instance()));
BootstrapResourcesBehavior.instance().renderHead(Bootstrap.getSettings(getApplication()),
response);
response.render(new
FilteredHeaderItem(CssHeaderItem.forUrl("css/custom.css"), CUSTOM_CSS_FILTER));
}
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/om-ga.js
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/om-ga.js
index d1bd2412d..34134488c 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/om-ga.js
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/om-ga.js
@@ -1,11 +1,11 @@
/* Licensed under the Apache License, Version 2.0 (the "License")
http://www.apache.org/licenses/LICENSE-2.0 */
function initGA(code, hash) {
- window.dataLayer = window.dataLayer || [];
- function gtag() {
+ const dataLayer = globalThis.dataLayer || [];
+ const gtag = () => {
dataLayer.push(arguments);
}
- function newPage() {
- const page = location.pathname +
(location.search.indexOf('app=') > -1 ? location.search : location.hash);
+ const newPage = () => {
+ const page = location.pathname +
(location.search.includes('app=') ? location.search : location.hash);
gtag('config', code, {'page_path': page});
}
gtag('js', new Date());
@@ -16,8 +16,8 @@ function initGA(code, hash) {
});
newPage();
if (hash) {
- $(window).off('hashchange').on('hashchange', () => {
- if (location.hash.indexOf('/') > -1) {
+ $(globalThis).off('hashchange').on('hashchange', () => {
+ if (location.hash.includes('/')) {
newPage();
}
});
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/IconTextModal.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/IconTextModal.java
index 4103e8ec6..d0a78c618 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/IconTextModal.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/IconTextModal.java
@@ -26,8 +26,8 @@ import
de.agilecoders.wicket.core.markup.html.bootstrap.dialog.Modal;
import de.agilecoders.wicket.core.markup.html.bootstrap.image.Icon;
import de.agilecoders.wicket.core.markup.html.bootstrap.image.IconType;
import
de.agilecoders.wicket.core.markup.html.bootstrap.utilities.ColorBehavior;
-import
de.agilecoders.wicket.extensions.markup.html.bootstrap.icon.FontAwesome6IconTypeBuilder;
-import
de.agilecoders.wicket.extensions.markup.html.bootstrap.icon.FontAwesome6IconTypeBuilder.FontAwesome6Solid;
+import
de.agilecoders.wicket.extensions.markup.html.bootstrap.icon.FontAwesome7IconTypeBuilder;
+import
de.agilecoders.wicket.extensions.markup.html.bootstrap.icon.FontAwesome7IconTypeBuilder.FontAwesome7Solid;
public class IconTextModal extends Modal<String> {
private static final long serialVersionUID = 1L;
@@ -69,8 +69,8 @@ public class IconTextModal extends Modal<String> {
public IconTextModal withErrorIcon(ColorBehavior.Color color) {
add(new ColorBehavior(color));
- return
withIcon(FontAwesome6IconTypeBuilder.on(FontAwesome6Solid.triangle_exclamation)
- .size(FontAwesome6IconTypeBuilder.Size.three)
+ return
withIcon(FontAwesome7IconTypeBuilder.on(FontAwesome7Solid.triangle_exclamation)
+ .size(FontAwesome7IconTypeBuilder.Size.three)
.build());
}
}
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java
index 4569a4aba..b2b96e722 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java
@@ -69,7 +69,7 @@ import org.apache.openmeetings.mediaserver.StreamProcessor;
import com.github.openjson.JSONObject;
import
de.agilecoders.wicket.core.markup.html.bootstrap.navbar.INavbarComponent;
-import
de.agilecoders.wicket.extensions.markup.html.bootstrap.icon.FontAwesome6IconType;
+import
de.agilecoders.wicket.extensions.markup.html.bootstrap.icon.FontAwesome7IconType;
import jakarta.inject.Inject;
public class RoomMenuPanel extends Panel {
@@ -144,7 +144,7 @@ public class RoomMenuPanel extends Panel {
@Override
protected void onInitialize() {
- exitMenuItem = new OmMenuItem(getString("308"),
getString("309"), FontAwesome6IconType.right_from_bracket_s) {
+ exitMenuItem = new OmMenuItem(getString("308"),
getString("309"), FontAwesome7IconType.right_from_bracket_s) {
private static final long serialVersionUID = 1L;
@Override
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.java
index 346eec104..7a3153255 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.java
@@ -64,7 +64,7 @@ import org.wicketstuff.jqplot.lib.elements.RendererOptions;
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.Modal;
-import
de.agilecoders.wicket.extensions.markup.html.bootstrap.icon.FontAwesome6IconType;
+import
de.agilecoders.wicket.extensions.markup.html.bootstrap.icon.FontAwesome7IconType;
import jakarta.inject.Inject;
public class PollResultsDialog extends Modal<RoomPoll> {
@@ -120,7 +120,7 @@ public class PollResultsDialog extends Modal<RoomPoll> {
close(target);
}
});
-
close.setIconType(FontAwesome6IconType.xmark_s).add(newOkCancelDangerConfirm(this,
getString("1419")));
+
close.setIconType(FontAwesome7IconType.xmark_s).add(newOkCancelDangerConfirm(this,
getString("1419")));
close.setOutputMarkupId(true).setOutputMarkupPlaceholderTag(true);
addButton(delete = new BootstrapAjaxLink<>(BUTTON_MARKUP_ID,
null, Buttons.Type.Outline_Danger, new ResourceModel("1420")) {
private static final long serialVersionUID = 1L;
@@ -134,7 +134,7 @@ public class PollResultsDialog extends Modal<RoomPoll> {
close(target);
}
});
-
delete.setIconType(FontAwesome6IconType.trash_s).add(newOkCancelDangerConfirm(this,
getString("1421")));
+
delete.setIconType(FontAwesome7IconType.trash_s).add(newOkCancelDangerConfirm(this,
getString("1421")));
delete.setOutputMarkupId(true).setOutputMarkupPlaceholderTag(true);
addButton(clone = new BootstrapAjaxLink<>(BUTTON_MARKUP_ID,
null, Buttons.Type.Outline_Danger, new ResourceModel("poll.clone")) {
private static final long serialVersionUID = 1L;
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-nettest.js
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-nettest.js
index f5b1d2f0f..67e7c99af 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-nettest.js
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-nettest.js
@@ -23,10 +23,10 @@ const NetTest = (function() {
$('.nettest button[data-start="true"]').click()
}
function __cleanOptions(options) {
- if (isNaN(options.attempts)) {
+ if (Number.isNaN(options.attempts)) {
options.attempts = 0;
}
- if (isNaN(options.step)) {
+ if (Number.isNaN(options.step)) {
options.step = options.measures;
options.astep = options.attempts;
}
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/EditProfileForm.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/EditProfileForm.java
index c4efb0b61..e21ff548a 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/EditProfileForm.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/EditProfileForm.java
@@ -53,7 +53,7 @@ import org.apache.wicket.util.string.Strings;
import
de.agilecoders.wicket.core.markup.html.bootstrap.button.BootstrapAjaxLink;
import de.agilecoders.wicket.core.markup.html.bootstrap.button.Buttons;
import
de.agilecoders.wicket.extensions.markup.html.bootstrap.confirmation.ConfirmationBehavior;
-import
de.agilecoders.wicket.extensions.markup.html.bootstrap.icon.FontAwesome6IconType;
+import
de.agilecoders.wicket.extensions.markup.html.bootstrap.icon.FontAwesome7IconType;
import jakarta.inject.Inject;
public class EditProfileForm extends Form<User> {
@@ -192,7 +192,7 @@ public class EditProfileForm extends Form<User> {
toggleOtp.getBehaviors(ConfirmationBehavior.class).stream().forEach(b ->
toggleOtp.remove(b));
}
toggleOtp.setLabel(new ResourceModel(enabled ? "otp.disable" :
"otp.enable"));
- toggleOtp.setIconType(enabled ?
FontAwesome6IconType.square_check_r : FontAwesome6IconType.square_r);
+ toggleOtp.setIconType(enabled ?
FontAwesome7IconType.square_check_r : FontAwesome7IconType.square_r);
toggleOtp.setType(enabled ? Buttons.Type.Outline_Danger :
Buttons.Type.Primary);
if (handler != null) {
handler.add(toggleOtp);
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java
index d96cd08c8..93d85054e 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java
@@ -80,7 +80,7 @@ import org.apache.wicket.model.util.ListModel;
import
de.agilecoders.wicket.core.markup.html.bootstrap.button.BootstrapAjaxLink;
import de.agilecoders.wicket.core.markup.html.bootstrap.button.Buttons;
-import
de.agilecoders.wicket.extensions.markup.html.bootstrap.icon.FontAwesome6IconType;
+import
de.agilecoders.wicket.extensions.markup.html.bootstrap.icon.FontAwesome7IconType;
import jakarta.inject.Inject;
public class MessagesContactsPanel extends UserBasePanel {
@@ -205,7 +205,7 @@ public class MessagesContactsPanel extends UserBasePanel {
target.add(folders,
moveDropDown);
}
};
- del.setIconType(FontAwesome6IconType.xmark_s)
+ del.setIconType(FontAwesome7IconType.xmark_s)
.add(newOkCancelDangerConfirm(this, getString("833")));
item.add(del);
item.add(AjaxEventBehavior.onEvent(EVT_CLICK,
target -> selectFolder(item, item.getModelObject().getId(), target)));
@@ -449,7 +449,7 @@ public class MessagesContactsPanel extends UserBasePanel {
updateContacts(target);
}
};
- del.setIconType(FontAwesome6IconType.xmark_s)
+ del.setIconType(FontAwesome7IconType.xmark_s)
.add(newOkCancelDangerConfirm(this, getString("833")));
item.add(del.setVisible(!uc.isPending()));
}
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomListPanel.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomListPanel.java
index 59a2efcf2..568389b4d 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomListPanel.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomListPanel.java
@@ -46,7 +46,7 @@ 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.extensions.markup.html.bootstrap.icon.FontAwesome6IconType;
+import
de.agilecoders.wicket.extensions.markup.html.bootstrap.icon.FontAwesome7IconType;
import jakarta.inject.Inject;
public class RoomListPanel extends Panel {
@@ -86,7 +86,7 @@ public class RoomListPanel extends Panel {
private static final long serialVersionUID = 1L;
{
-
setIconType(FontAwesome6IconType.rotate_s);
+
setIconType(FontAwesome7IconType.rotate_s);
}
@Override
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestDatabaseStructureAppointment.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestDatabaseStructureAppointment.java
index ed6cc6df2..e7939962b 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestDatabaseStructureAppointment.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestDatabaseStructureAppointment.java
@@ -37,7 +37,7 @@ class TestDatabaseStructureAppointment extends
AbstractOmServerTest {
}
private static Date getDate(int hour, int minute) {
- return CalendarHelper.getDate(LocalDateTime.of(2008, 8, 17, 12,
28), getTzId());
+ return CalendarHelper.getDate(LocalDateTime.of(2008, 8, 17,
hour, minute), getTzId());
}
private void createAppointment(int startHour, int startMinute, int
endHour, int endMinute) {
