code not compilable, webpack config moved outside sources, package.js…

…on (empty created)
Evolveum · Apr 11, 2022 · b7ad64b · b7ad64b
1 parent c253a8a
commit b7ad64b
Show file tree

Hide file tree

Showing 8 changed files with 90 additions and 96 deletions.
diff --git a/gui/admin-gui/package.json b/gui/admin-gui/package.json
@@ -0,0 +1,11 @@
+{
+  "name": "admin-gui",
+  "version": "4.6.0",
+  "description": "Evolveum midPoint admin-gui module npm project for css/javascript code",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "author": "",
+  "license": "ISC"
+}
diff --git a/gui/admin-gui/pom.xml b/gui/admin-gui/pom.xml
@@ -833,19 +833,19 @@
                 </configuration>
             </plugin>
 
-            <plugin>
+            <!--<plugin>
                 <groupId>com.github.eirslett</groupId>
                 <artifactId>frontend-maven-plugin</artifactId>
                 <version>1.12.0</version>
 
                 <executions>
                     <execution>
-                        <!-- optional: you don't really need execution ids, but it looks nice in your build log. -->
+                        &lt;!&ndash; optional: you don't really need execution ids, but it looks nice in your build log. &ndash;&gt;
                         <id>install node and npm</id>
                         <goals>
                             <goal>install-node-and-npm</goal>
                         </goals>
-                        <!-- optional: default phase is "generate-resources" -->
+                        &lt;!&ndash; optional: default phase is "generate-resources" &ndash;&gt;
                         <phase>generate-resources</phase>
                     </execution>
                     <execution>
@@ -854,15 +854,15 @@
                             <goal>npm</goal>
                         </goals>
 
-                        <!-- optional: default phase is "generate-resources" -->
+                        &lt;!&ndash; optional: default phase is "generate-resources" &ndash;&gt;
                         <phase>generate-resources</phase>
 
                         <configuration>
-                            <!-- optional: The default argument is actually
+                            &lt;!&ndash; optional: The default argument is actually
                             "install", so unless you need to run some other npm command,
                             you can remove this whole <configuration> section.
-                            -->
-                            <arguments>install ace-builds babel-loader sass-loader sass css-loader style-loader postcss-loader webpack webpack-cli expose-loader css-minimizer-webpack-plugin mini-css-extract-plugin admin-lte@^3.1 --save-dev</arguments>
+                            &ndash;&gt;
+                            <arguments>install ace-builds babel-loader sass-loader sass css-loader style-loader postcss-loader webpack webpack-cli expose-loader css-minimizer-webpack-plugin mini-css-extract-plugin admin-lte@^3.1 &#45;&#45;save-dev</arguments>
                             <workingDirectory>target</workingDirectory>
                         </configuration>
                     </execution>
@@ -872,7 +872,7 @@
                             <goal>webpack</goal>
                         </goals>
 
-                        <!-- optional: the default phase is "generate-resources" -->
+                        &lt;!&ndash; optional: the default phase is "generate-resources" &ndash;&gt;
                         <phase>generate-resources</phase>
 
                         <configuration>
@@ -885,7 +885,7 @@
                     <installDirectory>target</installDirectory>
                 </configuration>
 
-            </plugin>
+            </plugin>-->
 
         </plugins>
     </build>

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,44 +6,10 @@
  */
 package com.evolveum.midpoint.gui.api.page;
 
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-import java.util.*;
-import javax.xml.namespace.QName;
-
-import com.evolveum.midpoint.prism.delta.ObjectDelta;
-import com.evolveum.midpoint.security.api.AuthorizationConstants;
-import com.evolveum.midpoint.security.api.OwnerResolver;
-import com.evolveum.midpoint.security.enforcer.api.AuthorizationParameters;
-import com.evolveum.midpoint.util.exception.*;
-
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.Validate;
-import org.apache.wicket.*;
-import org.apache.wicket.behavior.AttributeAppender;
-import org.apache.wicket.extensions.ajax.markup.html.modal.ModalDialog;
-import org.apache.wicket.feedback.FeedbackMessage;
-import org.apache.wicket.feedback.FeedbackMessages;
-import org.apache.wicket.injection.Injector;
-import org.apache.wicket.markup.html.TransparentWebMarkupContainer;
-import org.apache.wicket.markup.html.WebMarkupContainer;
-import org.apache.wicket.markup.html.WebPage;
-import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.panel.Panel;
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.Model;
-import org.apache.wicket.model.StringResourceModel;
-import org.apache.wicket.protocol.http.WebSession;
-import org.apache.wicket.request.mapper.parameter.PageParameters;
-import org.apache.wicket.spring.injection.annot.SpringBean;
-import org.jetbrains.annotations.Contract;
-import org.jetbrains.annotations.NotNull;
-
 import com.evolveum.midpoint.common.Clock;
 import com.evolveum.midpoint.common.LocalizationService;
 import com.evolveum.midpoint.common.configuration.api.MidpointConfiguration;
 import com.evolveum.midpoint.gui.api.DefaultGuiConfigurationCompiler;
-import com.evolveum.midpoint.gui.api.SubscriptionType;
 import com.evolveum.midpoint.gui.api.component.result.OpResult;
 import com.evolveum.midpoint.gui.api.factory.wrapper.ItemWrapperFactory;
 import com.evolveum.midpoint.gui.api.factory.wrapper.PrismContainerWrapperFactory;
@@ -68,6 +34,7 @@
 import com.evolveum.midpoint.model.api.interaction.DashboardService;
 import com.evolveum.midpoint.model.api.validator.ResourceValidator;
 import com.evolveum.midpoint.prism.*;
+import com.evolveum.midpoint.prism.delta.ObjectDelta;
 import com.evolveum.midpoint.prism.delta.PrismValueDeltaSetTriple;
 import com.evolveum.midpoint.prism.match.MatchingRuleRegistry;
 import com.evolveum.midpoint.prism.polystring.PolyString;
@@ -88,38 +55,64 @@
 import com.evolveum.midpoint.schema.internals.InternalsConfig;
 import com.evolveum.midpoint.schema.result.OperationResult;
 import com.evolveum.midpoint.schema.util.MiscSchemaUtil;
+import com.evolveum.midpoint.security.api.AuthorizationConstants;
 import com.evolveum.midpoint.security.api.MidPointPrincipal;
+import com.evolveum.midpoint.security.api.OwnerResolver;
 import com.evolveum.midpoint.security.api.SecurityContextManager;
+import com.evolveum.midpoint.security.enforcer.api.AuthorizationParameters;
 import com.evolveum.midpoint.security.enforcer.api.SecurityEnforcer;
 import com.evolveum.midpoint.task.api.ClusterExecutionHelper;
 import com.evolveum.midpoint.task.api.Task;
 import com.evolveum.midpoint.task.api.TaskManager;
 import com.evolveum.midpoint.util.CheckedProducer;
 import com.evolveum.midpoint.util.Producer;
+import com.evolveum.midpoint.util.exception.*;
 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.AsyncWebProcessManager;
 import com.evolveum.midpoint.web.application.SimpleCounter;
-import com.evolveum.midpoint.web.component.breadcrumbs.Breadcrumb;
-import com.evolveum.midpoint.web.component.breadcrumbs.BreadcrumbPageClass;
-import com.evolveum.midpoint.web.component.breadcrumbs.BreadcrumbPageInstance;
-import com.evolveum.midpoint.web.component.dialog.MainPopupDialog;
 import com.evolveum.midpoint.web.component.message.FeedbackAlerts;
 import com.evolveum.midpoint.web.component.prism.ValueStatus;
 import com.evolveum.midpoint.web.component.util.VisibleBehaviour;
-import com.evolveum.midpoint.web.component.util.VisibleEnableBehaviour;
 import com.evolveum.midpoint.web.security.MidPointApplication;
 import com.evolveum.midpoint.web.security.MidPointAuthWebSession;
 import com.evolveum.midpoint.web.security.util.SecurityUtils;
 import com.evolveum.midpoint.web.session.SessionStorage;
 import com.evolveum.midpoint.web.session.UserProfileStorage;
 import com.evolveum.midpoint.web.util.NewWindowNotifyingBehavior;
 import com.evolveum.midpoint.web.util.validation.MidpointFormValidatorRegistry;
-import com.evolveum.midpoint.wf.api.WorkflowManager;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
 import com.evolveum.prism.xml.ns._public.types_3.PolyStringType;
 
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Validate;
+import org.apache.wicket.*;
+import org.apache.wicket.behavior.AttributeAppender;
+import org.apache.wicket.feedback.FeedbackMessage;
+import org.apache.wicket.feedback.FeedbackMessages;
+import org.apache.wicket.injection.Injector;
+import org.apache.wicket.markup.html.TransparentWebMarkupContainer;
+import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.markup.html.WebPage;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.panel.Panel;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.Model;
+import org.apache.wicket.model.StringResourceModel;
+import org.apache.wicket.protocol.http.WebSession;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+import org.apache.wicket.spring.injection.annot.SpringBean;
+import org.jetbrains.annotations.Contract;
+import org.jetbrains.annotations.NotNull;
+
+import javax.xml.namespace.QName;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+import java.util.Collection;
+import java.util.Locale;
+import java.util.TimeZone;
+
 /**
  * @author lazyman
  * @author semancik
@@ -156,7 +149,7 @@ public abstract class PageCommon extends WebPage implements ModelServiceLocator
 
     @SpringBean(name = "modelController")
     private ScriptingService scriptingService;
-//
+    //
 //    @SpringBean(name = "modelController")
 //    private ModelService modelService;
 //
@@ -165,13 +158,13 @@ public abstract class PageCommon extends WebPage implements ModelServiceLocator
 //
     @SpringBean(name = "dashboardService")
     private DashboardService dashboardService;
-//
+    //
 //    @SpringBean(name = "modelController")
 //    private TaskService taskService;
 //
     @SpringBean(name = "modelDiagController")
     private ModelDiagnosticService modelDiagnosticService;
-//
+    //
 //    @SpringBean(name = "taskManager")
 //    private TaskManager taskManager;
 //
@@ -192,7 +185,7 @@ public abstract class PageCommon extends WebPage implements ModelServiceLocator
 
     @SpringBean(name = "resourceValidator")
     private ResourceValidator resourceValidator;
-//
+    //
 //    @SpringBean(name = "modelController")
 //    private AccessCertificationService certificationService;
 //
@@ -201,7 +194,7 @@ public abstract class PageCommon extends WebPage implements ModelServiceLocator
 //
     @SpringBean(name = "clock")
     private Clock clock;
-//
+    //
 //    @SpringBean
 //    private SecurityContextManager securityContextManager;
 //
@@ -210,7 +203,7 @@ public abstract class PageCommon extends WebPage implements ModelServiceLocator
 
     @SpringBean(name = "modelObjectResolver")
     private ObjectResolver modelObjectResolver;
-//
+    //
 //    @SpringBean
 //    private LocalizationService localizationService;
 //
@@ -712,7 +705,6 @@ public <O extends ObjectType, T extends ObjectType> void authorize(String operat
         getSecurityEnforcer().authorize(operationUrl, phase, params, ownerResolver, getPageTask(), result);
     }
 
-
     private OperationResult executeResultScriptHook(OperationResult result) {
         CompiledGuiProfile adminGuiConfiguration = getCompiledGuiProfile();
         if (adminGuiConfiguration.getFeedbackMessagesHook() == null) {

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/login/PageLoginOld.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/login/PageLoginOld.java
@@ -7,8 +7,6 @@
 
 package com.evolveum.midpoint.gui.impl.page.login;
 
-import com.evolveum.midpoint.model.api.authentication.MidpointAuthentication;
-import com.evolveum.midpoint.model.api.authentication.ModuleAuthentication;
 import com.evolveum.midpoint.authentication.api.ModuleWebSecurityConfiguration;
 import com.evolveum.midpoint.authentication.api.authorization.PageDescriptor;
 import com.evolveum.midpoint.authentication.api.authorization.Url;
@@ -23,16 +21,12 @@
 import com.evolveum.midpoint.util.exception.CommonException;
 import com.evolveum.midpoint.util.logging.Trace;
 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.web.component.form.MidpointForm;
 import com.evolveum.midpoint.web.component.util.VisibleBehaviour;
 import com.evolveum.midpoint.web.component.util.VisibleEnableBehaviour;
 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.web.security.util.SecurityUtils;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
 
@@ -67,18 +61,9 @@ public class PageLoginOld extends AbstractPageLogin {
     protected static final String OPERATION_LOAD_RESET_PASSWORD_POLICY = DOT_CLASS + "loadPasswordResetPolicy";
     private static final String OPERATION_LOAD_REGISTRATION_POLICY = DOT_CLASS + "loadRegistrationPolicy";
 
-    @Override
-    protected IModel<String> getBodyCssClass() {
-        return null;
-    }
-
-    @Override
-    protected IModel<String> createPageTitleModel() {
-        return null;
-    }
     private final LoadableDetachableModel<SecurityPolicyType> securityPolicyModel;
 
-    public PageLogin() {
+    public PageLoginOld() {
 
         securityPolicyModel = new LoadableDetachableModel<>() {
             @Override
@@ -95,6 +80,16 @@ protected SecurityPolicyType load() {
         };
     }
 
+    @Override
+    protected IModel<String> getBodyCssClass() {
+        return null;
+    }
+
+    @Override
+    protected IModel<String> createPageTitleModel() {
+        return null;
+    }
+
     private SecurityPolicyType getSecurityPolicy() {
         return securityPolicyModel.getObject();
     }

diff --git a/...ain/java/com/evolveum/midpoint/web/page/login/AbstractPageRemoteAuthenticationSelect.java b/...ain/java/com/evolveum/midpoint/web/page/login/AbstractPageRemoteAuthenticationSelect.java
@@ -13,6 +13,7 @@
 import com.evolveum.midpoint.authentication.api.config.RemoteModuleAuthentication;
 import com.evolveum.midpoint.authentication.api.util.AuthUtil;
 import com.evolveum.midpoint.authentication.api.util.AuthenticationModuleNameConstants;
+import com.evolveum.midpoint.model.api.correlator.CorrelationService;
 import com.evolveum.midpoint.web.component.form.MidpointForm;
 import com.evolveum.midpoint.web.component.util.VisibleBehaviour;
 import com.evolveum.midpoint.web.security.util.SecurityUtils;
@@ -74,6 +75,21 @@ protected void populateItem(ListItem<IdentityProvider> item) {
         form.add(csrfField);
     }
 
+    @Override
+    protected IModel<String> getBodyCssClass() {
+        return null;
+    }
+
+    @Override
+    protected IModel<String> createPageTitleModel() {
+        return null;
+    }
+
+    @Override
+    public CorrelationService getCorrelationService() {
+        return null;
+    }
+
     abstract protected Class<? extends Authentication> getSupportedAuthToken();
 
     private boolean existRemoteAuthentication(Authentication actualAuth, String actualModuleName) {

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageSamlSelect.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageSamlSelect.java
@@ -6,38 +6,29 @@
  */
 package com.evolveum.midpoint.web.page.login;
 
-import java.io.Serializable;
 import com.evolveum.midpoint.authentication.api.authorization.PageDescriptor;
 import com.evolveum.midpoint.authentication.api.authorization.Url;
-import com.evolveum.midpoint.authentication.api.config.ModuleAuthentication;
 import com.evolveum.midpoint.authentication.api.util.AuthenticationModuleNameConstants;
 
-import org.springframework.security.authentication.AnonymousAuthenticationToken;
+import org.apache.wicket.model.IModel;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.saml2.provider.service.authentication.Saml2AuthenticationToken;
 
+import java.io.Serializable;
+
 /**
  * @author skublik
  */
 @PageDescriptor(urls = {
         @Url(mountUrl = "/saml2/select", matchUrlForSecurity = "/saml2/select")
 }, permitAll = true, loginPage = true, authModule = AuthenticationModuleNameConstants.SAML_2)
 public class PageSamlSelect extends AbstractPageRemoteAuthenticationSelect implements Serializable {
+
     private static final long serialVersionUID = 1L;
 
     public PageSamlSelect() {
     }
 
-    @Override
-    protected IModel<String> getBodyCssClass() {
-        return null;
-    }
-
-    @Override
-    protected IModel<String> createPageTitleModel() {
-        return null;
-    }
-
     @Override
     protected Class<? extends Authentication> getSupportedAuthToken() {
         return Saml2AuthenticationToken.class;