Merge remote-tracking branch 'origin/master'

Evolveum · Apr 26, 2023 · 721830a · 721830a
2 parents 8eccdbd + 811d743
commit 721830a
Show file tree

Hide file tree

Showing 8 changed files with 46 additions and 17 deletions.
diff --git a/gui/admin-gui/src/frontend/js/passwords.js → ...-gui/src/frontend/js/vendors-passwords.js b/gui/admin-gui/src/frontend/js/passwords.js → ...-gui/src/frontend/js/vendors-passwords.js
diff --git a/gui/admin-gui/src/frontend/js/vendors.js b/gui/admin-gui/src/frontend/js/vendors.js
@@ -20,8 +20,6 @@ import '../../../node_modules/select2/dist/js/select2';
 
 import '../../../node_modules/sparklines';
 
-import './passwords';
-
 import '../../../node_modules/ace-builds/src-noconflict/ace';
 
 ace.config.setModuleUrl('ace/theme/eclipse',

diff --git a/gui/admin-gui/src/frontend/scss/vendors-fonts.scss b/gui/admin-gui/src/frontend/scss/vendors-fonts.scss
@@ -0,0 +1,13 @@
+/*!
+ * Copyright (C) 2010-2023 Evolveum and contributors
+ *
+ * This work is dual-licensed under the Apache License 2.0
+ * and European Union Public License. See LICENSE file for details.
+ */
+
+@import "../../../node_modules/@fontsource/source-sans-pro/300.css";
+@import "../../../node_modules/@fontsource/source-sans-pro/400.css";
+@import "../../../node_modules/@fontsource/source-sans-pro/400-italic.css";
+@import "../../../node_modules/@fontsource/source-sans-pro/700.css";
+
+@import "../../../node_modules/@fortawesome/fontawesome-free/css/all.css";
diff --git a/gui/admin-gui/src/frontend/scss/vendors.scss b/gui/admin-gui/src/frontend/scss/vendors.scss
@@ -6,16 +6,10 @@
  */
 @import "../../../node_modules/flag-icons/css/flag-icons.css";
 
-@import "../../../node_modules/@fontsource/source-sans-pro/300.css";
-@import "../../../node_modules/@fontsource/source-sans-pro/400.css";
-@import "../../../node_modules/@fontsource/source-sans-pro/400-italic.css";
-@import "../../../node_modules/@fontsource/source-sans-pro/700.css";
-
 @import "midpoint-variables";
 
 @import "../../../node_modules/admin-lte/build/scss/adminlte";
 @import "../../../node_modules/overlayscrollbars/css/OverlayScrollbars.css";
-@import "../../../node_modules/@fortawesome/fontawesome-free/css/all.css";
 @import "../../../node_modules/datatables.net-bs4/css/dataTables.bootstrap4";
 
 @import "../../../node_modules/bootstrap-select/dist/css/bootstrap-select.css";

diff --git a/...min-gui/src/main/java/com/evolveum/midpoint/gui/api/component/password/PasswordPanel.java b/...min-gui/src/main/java/com/evolveum/midpoint/gui/api/component/password/PasswordPanel.java
@@ -11,12 +11,6 @@
 import java.util.List;
 import java.util.Objects;
 
-import com.evolveum.midpoint.gui.api.page.PageAdminLTE;
-import com.evolveum.midpoint.gui.api.util.WebComponentUtil;
-import com.evolveum.midpoint.web.component.util.VisibleBehaviour;
-
-import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
-
 import org.apache.commons.lang3.StringUtils;
 import org.apache.wicket.ajax.AjaxChannel;
 import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -26,18 +20,26 @@
 import org.apache.wicket.behavior.AttributeAppender;
 import org.apache.wicket.feedback.FeedbackMessage;
 import org.apache.wicket.markup.ComponentTag;
+import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.head.JavaScriptHeaderItem;
 import org.apache.wicket.markup.html.WebMarkupContainer;
 import org.apache.wicket.markup.html.basic.Label;
 import org.apache.wicket.markup.html.form.FormComponent;
 import org.apache.wicket.markup.html.form.PasswordTextField;
-import org.apache.wicket.model.*;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.LoadableDetachableModel;
+import org.apache.wicket.model.Model;
+import org.apache.wicket.request.Url;
+import org.apache.wicket.request.resource.UrlResourceReference;
 import org.apache.wicket.validation.IValidatable;
 import org.apache.wicket.validation.IValidator;
 import org.apache.wicket.validation.ValidationError;
 import org.jetbrains.annotations.NotNull;
 
 import com.evolveum.midpoint.authentication.api.util.AuthUtil;
+import com.evolveum.midpoint.gui.api.page.PageAdminLTE;
 import com.evolveum.midpoint.gui.api.page.PageBase;
+import com.evolveum.midpoint.gui.api.util.WebComponentUtil;
 import com.evolveum.midpoint.model.api.validator.StringLimitationResult;
 import com.evolveum.midpoint.prism.PrismObject;
 import com.evolveum.midpoint.security.api.MidPointPrincipal;
@@ -46,6 +48,11 @@
 import com.evolveum.midpoint.util.logging.TraceManager;
 import com.evolveum.midpoint.web.component.prism.InputPanel;
 import com.evolveum.midpoint.web.component.util.EnableBehaviour;
+import com.evolveum.midpoint.web.component.util.VisibleBehaviour;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.CredentialsPolicyType;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.FocusType;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.ResourceType;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.ValuePolicyType;
 import com.evolveum.prism.xml.ns._public.types_3.ProtectedStringType;
 
 /**
@@ -87,6 +94,13 @@ public <F extends FocusType> PasswordPanel(String id, IModel<ProtectedStringType
         initLayout();
     }
 
+    @Override
+    public void renderHead(IHeaderResponse response) {
+        super.renderHead(response);
+
+        response.render(JavaScriptHeaderItem.forReference(new UrlResourceReference(Url.parse("static/vendors-passwords.js")).setContextRelative(true)));
+    }
+
     @Override
     protected void onInitialize() {
         super.onInitialize();
@@ -217,7 +231,6 @@ private String getPasswordMatched(String password1, String password2) {
         return "";
     }
 
-
     protected boolean canEditPassword() {
         return true;
     }

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageAdminLTE.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageAdminLTE.html
@@ -18,6 +18,7 @@
 
     <link href="css/font-evosome.css" type="text/css" rel="stylesheet"/>
 
+    <link type="text/css" rel="stylesheet" href="static/vendors-fonts.css"/>
     <link type="text/css" rel="stylesheet" href="static/vendors.css"/>
     <link type="text/css" rel="stylesheet" href="static/midpoint.css"/>
     <link type="text/css" rel="stylesheet" href="css/overlay.css"/>

diff --git a/...i/src/main/java/com/evolveum/midpoint/web/security/StaticSpringResourcesMarkupFilter.java b/...i/src/main/java/com/evolveum/midpoint/web/security/StaticSpringResourcesMarkupFilter.java
@@ -87,7 +87,11 @@ public void onComponentTag(ComponentTag tag, ResourceUrlProvider resourceUrlProv
             }
 
             String newUrl = resourceUrlProvider.getForLookupPath("/" + url);
-            newUrl = newUrl.substring(1);
+            if (newUrl != null) {
+                newUrl = newUrl.substring(1);
+            } else {
+                newUrl = url;
+            }
 
             tag.put(attributeName, newUrl);
             tag.setModified(true);

diff --git a/gui/admin-gui/webpack.common.js b/gui/admin-gui/webpack.common.js
@@ -16,6 +16,12 @@ module.exports = {
             './src/frontend/js/vendors.js',
             './src/frontend/scss/vendors.scss',
         ],
+        "vendors-passwords": [
+            './src/frontend/js/vendors-passwords.js',
+        ],
+        "vendors-fonts": [
+            './src/frontend/scss/vendors-fonts.scss',
+        ],
         midpoint: [
             './src/frontend/js/midpoint.js',
             './src/frontend/scss/midpoint.scss',