MID-6271 not compilable, it's a mess

Evolveum · Apr 11, 2022 · 83c22db · 83c22db
1 parent 75a9665
commit 83c22db
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 52 deletions.
diff --git a/gui/admin-gui/pom.xml b/gui/admin-gui/pom.xml
@@ -876,7 +876,7 @@
                         <phase>generate-resources</phase>
 
                         <configuration>
-                            <arguments>-c ./src/main/resources/static/webpack.config.js</arguments>
+                            <arguments>-c ./webpack.config.js</arguments>
                         </configuration>
                     </execution>
                 </executions>

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java
@@ -16,6 +16,8 @@
 import javax.management.ObjectName;
 import javax.xml.namespace.QName;
 
+import com.evolveum.midpoint.gui.impl.page.login.PageLogin;
+
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.Validate;
@@ -125,7 +127,6 @@
 import com.evolveum.midpoint.util.logging.TraceManager;
 import com.evolveum.midpoint.web.application.AsyncWebProcessManager;
 import com.evolveum.midpoint.web.application.SimpleCounter;
-import com.evolveum.midpoint.web.boot.Wro4jConfig;
 import com.evolveum.midpoint.web.component.AjaxButton;
 import com.evolveum.midpoint.web.component.breadcrumbs.Breadcrumb;
 import com.evolveum.midpoint.web.component.dialog.MainPopupDialog;
@@ -139,7 +140,6 @@
 import com.evolveum.midpoint.web.component.util.VisibleBehaviour;
 import com.evolveum.midpoint.web.component.util.VisibleEnableBehaviour;
 import com.evolveum.midpoint.web.page.error.PageError404;
-import com.evolveum.midpoint.web.page.login.PageLogin;
 import com.evolveum.midpoint.web.page.self.PageAssignmentsList;
 import com.evolveum.midpoint.web.page.self.PageSelf;
 import com.evolveum.midpoint.web.security.MidPointApplication;
@@ -157,7 +157,7 @@
  * @author lazyman
  * @author semancik
  */
-public abstract class PageBase extends WebPage implements ModelServiceLocator {
+public abstract class PageBase extends PageCommon implements ModelServiceLocator {
 
     private static final long serialVersionUID = 1L;
 
@@ -174,7 +174,6 @@ public abstract class PageBase extends WebPage implements ModelServiceLocator {
     public static final String ID_FEEDBACK_CONTAINER = "feedbackContainer";
     private static final String ID_FEEDBACK = "feedback";
     private static final String ID_DEBUG_BAR = "debugBar";
-    private static final String ID_CLEAR_CACHE = "clearCssCache";
     private static final String ID_DUMP_PAGE_TREE = "dumpPageTree";
     private static final String ID_CART_BUTTON = "cartButton";
     private static final String ID_CART_ITEMS_COUNT = "itemsCount";
@@ -1075,16 +1074,6 @@ public boolean isVisible() {
         });
         add(debugBar);
 
-        AjaxButton clearCache = new AjaxButton(ID_CLEAR_CACHE, createStringResource("PageBase.clearCssCache")) {
-            private static final long serialVersionUID = 1L;
-
-            @Override
-            public void onClick(AjaxRequestTarget target) {
-                clearLessJsCache(target);
-            }
-        };
-        debugBar.add(clearCache);
-
         AjaxButton dumpPageTree = new AjaxButton(ID_DUMP_PAGE_TREE, createStringResource("PageBase.dumpPageTree")) {
             private static final long serialVersionUID = 1L;
 
@@ -1104,31 +1093,6 @@ private void dumpPageTree(AjaxRequestTarget target) {
         }
     }
 
-    protected void clearLessJsCache(AjaxRequestTarget target) {
-        try {
-            ArrayList<MBeanServer> servers = MBeanServerFactory.findMBeanServer(null);
-            if (servers.size() > 1) {
-                LOGGER.info("Too many mbean servers, cache won't be cleared.");
-                for (MBeanServer server : servers) {
-                    LOGGER.info(server.getDefaultDomain());
-                }
-                return;
-            }
-            MBeanServer server = servers.get(0);
-            ObjectName objectName = ObjectName.getInstance(Wro4jConfig.WRO_MBEAN_NAME + ":type=WroConfiguration");
-            server.invoke(objectName, "reloadCache", new Object[] {}, new String[] {});
-            if (target != null) {
-                target.add(PageBase.this);
-            }
-        } catch (Exception ex) {
-            LoggingUtils.logUnexpectedException(LOGGER, "Couldn't clear less/js cache", ex);
-            error("Error occurred, reason: " + ex.getMessage());
-            if (target != null) {
-                target.add(getFeedbackPanel());
-            }
-        }
-    }
-
     public WebMarkupContainer getFeedbackPanel() {
         return (WebMarkupContainer) get(ID_FEEDBACK_CONTAINER);
     }

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageCommon.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageCommon.java
@@ -6,6 +6,7 @@
  */
 package com.evolveum.midpoint.gui.api.page;
 
+import com.evolveum.midpoint.cases.api.CaseManager;
 import com.evolveum.midpoint.common.Clock;
 import com.evolveum.midpoint.common.LocalizationService;
 import com.evolveum.midpoint.common.configuration.api.MidpointConfiguration;
@@ -299,11 +300,11 @@ public TaskManager getTaskManager() {
         return getMidpointApplication().getTaskManager();
     }
 
-    public WorkflowService getWorkflowService() {
+    public CaseService getWorkflowService() {
         return getMidpointApplication().getWorkflowService();
     }
 
-    public WorkflowManager getWorkflowManager() {
+    public CaseManager getWorkflowManager() {
         return getMidpointApplication().getWorkflowManager();
     }
 

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/component/SidebarPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/component/SidebarPanel.java
@@ -6,6 +6,8 @@
  */
 package com.evolveum.midpoint.gui.api.page.component;
 
+import com.evolveum.midpoint.authentication.api.authorization.DescriptorLoader;
+import com.evolveum.midpoint.cases.api.util.QueryUtils;
 import com.evolveum.midpoint.gui.api.GuiStyleConstants;
 import com.evolveum.midpoint.gui.api.component.BasePanel;
 import com.evolveum.midpoint.gui.api.model.LoadableModel;
@@ -27,7 +29,7 @@
 import com.evolveum.midpoint.util.logging.LoggingUtils;
 import com.evolveum.midpoint.util.logging.Trace;
 import com.evolveum.midpoint.util.logging.TraceManager;
-import com.evolveum.midpoint.web.application.DescriptorLoader;
+import com.evolveum.midpoint.web.application.PageMounter;
 import com.evolveum.midpoint.web.component.menu.*;
 import com.evolveum.midpoint.web.component.util.VisibleBehaviour;
 import com.evolveum.midpoint.web.component.util.VisibleEnableBehaviour;
@@ -56,7 +58,6 @@
 import com.evolveum.midpoint.web.security.MidPointApplication;
 import com.evolveum.midpoint.web.util.OnePageParameterEncoder;
 import com.evolveum.midpoint.web.util.PageParameterConstants;
-import com.evolveum.midpoint.wf.util.QueryUtils;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
 import com.evolveum.prism.xml.ns._public.types_3.PolyStringType;
 
@@ -75,6 +76,7 @@
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.request.mapper.parameter.PageParameters;
 import org.apache.wicket.util.string.StringValue;
+import org.springframework.beans.factory.annotation.Autowired;
 
 import javax.xml.namespace.QName;
 import java.util.ArrayList;
@@ -528,7 +530,7 @@ private SideBarMenuItem createAdditionalMenu(boolean experimentalFeaturesEnabled
             return menu;
         }
 
-        Map<String, Class> urlClassMap = DescriptorLoader.getUrlClassMap();
+        Map<String, Class> urlClassMap = PageMounter.getUrlClassMap();
         if (MapUtils.isEmpty(urlClassMap)) {
             return menu;
         }

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebModelServiceUtils.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebModelServiceUtils.java
@@ -9,6 +9,7 @@
 import com.evolveum.midpoint.authentication.api.util.AuthUtil;
 import com.evolveum.midpoint.common.LocalizationService;
 import com.evolveum.midpoint.gui.api.page.PageBase;
+import com.evolveum.midpoint.gui.api.page.PageCommon;
 import com.evolveum.midpoint.model.api.ModelExecuteOptions;
 import com.evolveum.midpoint.model.api.ModelInteractionService;
 import com.evolveum.midpoint.model.api.authentication.CompiledGuiProfile;

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/login/PageLogin.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/login/PageLogin.java
@@ -7,7 +7,12 @@
 
 package com.evolveum.midpoint.gui.impl.page.login;
 
+import com.evolveum.midpoint.authentication.api.authorization.PageDescriptor;
+import com.evolveum.midpoint.authentication.api.authorization.Url;
+import com.evolveum.midpoint.authentication.api.config.MidpointAuthentication;
 import com.evolveum.midpoint.gui.api.model.ReadOnlyModel;
+import com.evolveum.midpoint.model.api.authentication.MidpointAuthentication;
+import com.evolveum.midpoint.model.api.authentication.ModuleAuthentication;
 import com.evolveum.midpoint.model.api.authentication.ModuleWebSecurityConfiguration;
 import com.evolveum.midpoint.prism.PrismObject;
 import com.evolveum.midpoint.schema.result.OperationResult;
@@ -18,15 +23,13 @@
 import com.evolveum.midpoint.util.logging.TraceManager;
 import com.evolveum.midpoint.web.application.PageDescriptor;
 import com.evolveum.midpoint.web.application.Url;
-import com.evolveum.midpoint.model.api.authentication.MidpointAuthentication;
+import com.evolveum.midpoint.web.component.form.MidpointForm;
 import com.evolveum.midpoint.web.component.util.VisibleBehaviour;
+import com.evolveum.midpoint.web.page.forgetpassword.PageForgotPassword;
 import com.evolveum.midpoint.web.page.login.AbstractPageLogin;
 import com.evolveum.midpoint.web.page.login.PageSelfRegistration;
 import com.evolveum.midpoint.web.security.module.authentication.LdapModuleAuthentication;
 import com.evolveum.midpoint.web.security.module.authentication.LoginFormModuleAuthentication;
-import com.evolveum.midpoint.model.api.authentication.ModuleAuthentication;
-import com.evolveum.midpoint.web.component.form.MidpointForm;
-import com.evolveum.midpoint.web.page.forgetpassword.PageForgotPassword;
 import com.evolveum.midpoint.web.security.util.SecurityUtils;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
 
@@ -202,7 +205,7 @@ private String getUrlProcessingLogin() {
 
         MidpointAuthentication mpAuthentication = (MidpointAuthentication) authentication;
         ModuleAuthentication moduleAuthentication = mpAuthentication.getProcessingModuleAuthentication();
-        if (isModuleApplicable(moduleAuthentication)){
+        if (isModuleApplicable(moduleAuthentication)) {
             String prefix = moduleAuthentication.getPrefix();
             return SecurityUtils.stripSlashes(prefix) + "/spring_security_login";
         }
@@ -215,6 +218,4 @@ private boolean isModuleApplicable(ModuleAuthentication moduleAuthentication) {
                 || moduleAuthentication instanceof LdapModuleAuthentication);
     }
 
-
-
 }