Skip to content

Commit

Permalink
adding of Factory default button
Browse files Browse the repository at this point in the history 
adding of factory default button

adding of Factory default button

removing task for delete all operation
  • Loading branch information
@skublik
skublik committed Jul 6, 2018
1 parent 94af203 commit ce24c72
Show file tree
Hide file tree
Showing 6 changed files with 204 additions and 41 deletions.
10 changes: 10 additions & 0 deletions gui/admin-gui/src/main/java/com/evolveum/midpoint/init/InitialDataImport.java
View file
Expand Up @@ -91,11 +91,21 @@ public void setModel(ModelService model) {
Validate.notNull(model, "Model service must not be null.");
this.model = model;
}

public void setPrismContext(PrismContext prismContext) {
Validate.notNull(prismContext, "Prism context must not be null.");
this.prismContext = prismContext;
}

public void setTaskManager(TaskManager taskManager) {
Validate.notNull(taskManager, "Task manager must not be null.");
this.taskManager = taskManager;
}

public void setConfiguration(MidpointConfiguration configuration) {
Validate.notNull(configuration, "Midpoint configuration must not be null.");
this.configuration = configuration;
}

public void init() throws SchemaException {
LOGGER.info("Starting initial object import (if necessary).");
Expand Down
1 change: 1 addition & 0 deletions ...admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageAbout.html
View file
Expand Up @@ -146,6 +146,7 @@ <h3 class="box-title"><wicket:message key="PageAbout.title.jvmProperties"/></h3>
<a class="btn btn-default" wicket:id="testProvisioning"/>
<a class="btn btn-default" wicket:id="cleanupActivitiProcesses" />
<a class="btn btn-default" wicket:id="clearCssJsCache" />
<a class="btn btn-danger" wicket:id="factoryDefault" />
</div>

</wicket:extend>
Expand Down
134 changes: 133 additions & 1 deletion ...admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageAbout.java
View file
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2010-2013 Evolveum
* Copyright (c) 2010-2018 Evolveum
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -18,8 +18,20 @@

import com.evolveum.midpoint.gui.api.model.LoadableModel;
import com.evolveum.midpoint.gui.api.util.WebComponentUtil;
import com.evolveum.midpoint.gui.api.util.WebModelServiceUtils;
import com.evolveum.midpoint.init.InitialDataImport;
import com.evolveum.midpoint.model.api.ModelPublicConstants;
import com.evolveum.midpoint.model.api.WorkflowService;
import com.evolveum.midpoint.prism.PrismObject;
import com.evolveum.midpoint.prism.delta.ObjectDelta;
import com.evolveum.midpoint.prism.query.AllFilter;
import com.evolveum.midpoint.prism.query.AndFilter;
import com.evolveum.midpoint.prism.query.InOidFilter;
import com.evolveum.midpoint.prism.query.NotFilter;
import com.evolveum.midpoint.prism.query.ObjectFilter;
import com.evolveum.midpoint.prism.query.ObjectQuery;
import com.evolveum.midpoint.prism.query.TypeFilter;
import com.evolveum.midpoint.prism.query.builder.QueryBuilder;
import com.evolveum.midpoint.schema.LabeledString;
import com.evolveum.midpoint.schema.ProvisioningDiag;
import com.evolveum.midpoint.schema.RepositoryDiag;
Expand All @@ -29,9 +41,11 @@
import com.evolveum.midpoint.security.api.MidPointPrincipal;
import com.evolveum.midpoint.task.api.Task;
import com.evolveum.midpoint.task.api.TaskManager;
import com.evolveum.midpoint.util.Producer;
import com.evolveum.midpoint.util.exception.CommunicationException;
import com.evolveum.midpoint.util.exception.ConfigurationException;
import com.evolveum.midpoint.util.exception.ExpressionEvaluationException;
import com.evolveum.midpoint.util.exception.ObjectAlreadyExistsException;
import com.evolveum.midpoint.util.exception.ObjectNotFoundException;
import com.evolveum.midpoint.util.exception.SchemaException;
import com.evolveum.midpoint.util.exception.SecurityViolationException;
Expand All @@ -41,11 +55,20 @@
import com.evolveum.midpoint.web.application.AuthorizationAction;
import com.evolveum.midpoint.web.application.PageDescriptor;
import com.evolveum.midpoint.web.component.AjaxButton;
import com.evolveum.midpoint.web.component.dialog.ConfirmationPanel;
import com.evolveum.midpoint.web.component.dialog.Popupable;
import com.evolveum.midpoint.web.page.login.PageLogin;
import com.evolveum.midpoint.web.page.login.PageSelfRegistration;
import com.evolveum.midpoint.web.security.SecurityUtils;
import com.evolveum.midpoint.xml.ns._public.common.common_3.NodeType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.TaskType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.UserType;

import org.apache.commons.lang.StringUtils;
import org.apache.wicket.RestartResponseException;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.extensions.ajax.markup.html.modal.ModalWindow;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.list.ListItem;
import org.apache.wicket.markup.html.list.ListView;
Expand All @@ -56,8 +79,11 @@
import java.lang.management.ManagementFactory;
import java.lang.management.RuntimeMXBean;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;

import javax.xml.namespace.QName;

/**
* @author lazyman
*/
Expand All @@ -77,6 +103,9 @@ public class PageAbout extends PageAdminConfiguration {
private static final String OPERATION_SUBMIT_REINDEX = DOT_CLASS + "submitReindex";
private static final String OPERATION_CLEANUP_ACTIVITI_PROCESSES = DOT_CLASS + "cleanupActivitiProcesses";
private static final String OPERATION_GET_PROVISIONING_DIAG = DOT_CLASS + "getProvisioningDiag";
private static final String OPERATION_DELETE_ALL_OBJECTS = DOT_CLASS + "deleteAllObjects";
private static final String OPERATION_DELETE_TASK = DOT_CLASS + "deleteTask";
private static final String POST_INIT = DOT_CLASS + "postInit";

private static final String ID_BUILD = "build";
private static final String ID_REVISION = "revision";
Expand All @@ -102,6 +131,7 @@ public class PageAbout extends PageAdminConfiguration {
private static final String ID_PROVISIONING_DETAIL_VALUE = "provisioningDetailValue";
private static final String ID_JVM_PROPERTIES = "jvmProperties";
private static final String ID_CLEAR_CSS_JS_CACHE = "clearCssJsCache";
private static final String ID_FACTORY_DEFAULT = "factoryDefault";

private static final String[] PROPERTIES = new String[]{"file.separator", "java.class.path",
"java.home", "java.vendor", "java.vendor.url", "java.version", "line.separator", "os.arch",
Expand Down Expand Up @@ -283,6 +313,16 @@ public void onClick(AjaxRequestTarget target) {
}
};
add(clearCssJsCache);

AjaxButton factoryDefault = new AjaxButton(ID_FACTORY_DEFAULT,
createStringResource("PageAbout.button.factoryDefault")) {

@Override
public void onClick(AjaxRequestTarget target) {
showMainPopup(getDeleteAllObjectsConfirmationPanel(), target);
}
};
add(factoryDefault);
}

private RepositoryDiag loadRepoDiagModel() {
Expand Down Expand Up @@ -399,6 +439,98 @@ private void testProvisioningPerformed(AjaxRequestTarget target) {

target.add(getFeedbackPanel());
}

private Popupable getDeleteAllObjectsConfirmationPanel() {
return new ConfirmationPanel(getMainPopupBodyId(), createStringResource("PageAbout.message.deleteAllObjects")) {
private static final long serialVersionUID = 1L;

@Override
public void yesPerformed(AjaxRequestTarget target) {
ModalWindow modalWindow = findParent(ModalWindow.class);
if (modalWindow != null) {
modalWindow.close(target);
resetStateToInitialConfig(target);
}
}

@Override
public boolean getLabelEscapeModelStrings() {
return false;
}
};
}

private void resetStateToInitialConfig(AjaxRequestTarget target) {
OperationResult result = new OperationResult(OPERATION_DELETE_ALL_OBJECTS);
String taskOid = null;
String taskName = "Delete all objects";

TypeFilter nodeFilter = TypeFilter.createType(NodeType.COMPLEX_TYPE, new AllFilter());
final ObjectFilter taskFilter = QueryBuilder.queryFor(TaskType.class, getPrismContext())
.item(TaskType.F_NAME).eq(taskName).buildFilter();
NotFilter notNodeFilter = new NotFilter(nodeFilter);
NotFilter notTaskFilter = new NotFilter(taskFilter);

try {
QName type = ObjectType.COMPLEX_TYPE;
taskOid = deleteObjectsAsync(type, ObjectQuery.createObjectQuery(AndFilter.createAnd(notTaskFilter, notNodeFilter)), true,
taskName, result);

} catch (Exception ex) {
result.recomputeStatus();
result.recordFatalError("Couldn't delete all objects.", ex);

LoggingUtils.logUnexpectedException(LOGGER, "Couldn't delete all objects", ex);
}

final String taskOidToRemoving = taskOid;

try {
while(!getTaskManager().getTask(taskOid, result).isClosed()) {}
InitialDataImport initialDataImport = new InitialDataImport();
initialDataImport.setModel(getModelService());
initialDataImport.setTaskManager(getTaskManager());
initialDataImport.setPrismContext(getPrismContext());
initialDataImport.setConfiguration(getMidpointConfiguration());
initialDataImport.init();

getModelService().postInit(result);

} catch (Exception ex) {
result.recomputeStatus();
result.recordFatalError("Couldn't import initial objects.", ex);

LoggingUtils.logUnexpectedException(LOGGER, "Couldn't import initial objects", ex);
}

runPrivileged(new Producer<Object>() {

private static final long serialVersionUID = 1L;

@Override
public Object run() {
Task task = createAnonymousTask(OPERATION_DELETE_TASK);
OperationResult result = new OperationResult(OPERATION_DELETE_TASK);
ObjectDelta<TaskType> delta = ObjectDelta.createDeleteDelta(TaskType.class, taskOidToRemoving, getPrismContext());
Collection<ObjectDelta<? extends ObjectType>> deltaCollection = new ArrayList<ObjectDelta<? extends ObjectType>>() {{add(delta);}};
try {
getModelService().executeChanges(deltaCollection, null, task, result);
} catch (Exception ex) {
result.recomputeStatus();
result.recordFatalError("Couldn't delete task.", ex);

LoggingUtils.logUnexpectedException(LOGGER, "Couldn't delete task", ex);
}
result.computeStatus();
return null;
}

});

showResult(result);
target.add(getFeedbackPanel());
}


private void cleanupActivitiProcessesPerformed(AjaxRequestTarget target) {
Task task = getTaskManager().createTaskInstance(OPERATION_CLEANUP_ACTIVITI_PROCESSES);
Expand Down
58 changes: 58 additions & 0 deletions .../main/java/com/evolveum/midpoint/web/page/admin/configuration/PageAdminConfiguration.java
View file
Expand Up @@ -16,8 +16,26 @@

package com.evolveum.midpoint.web.page.admin.configuration;

import com.evolveum.midpoint.model.api.ModelPublicConstants;
import com.evolveum.midpoint.prism.PrismProperty;
import com.evolveum.midpoint.prism.PrismPropertyDefinition;
import com.evolveum.midpoint.prism.PrismPropertyDefinitionImpl;
import com.evolveum.midpoint.prism.query.ObjectQuery;
import com.evolveum.midpoint.prism.query.QueryJaxbConvertor;
import com.evolveum.midpoint.schema.constants.SchemaConstants;
import com.evolveum.midpoint.schema.result.OperationResult;
import com.evolveum.midpoint.security.api.AuthorizationConstants;
import com.evolveum.midpoint.task.api.Task;
import com.evolveum.midpoint.task.api.TaskManager;
import com.evolveum.midpoint.util.DOMUtil;
import com.evolveum.midpoint.util.exception.ObjectAlreadyExistsException;
import com.evolveum.midpoint.util.exception.ObjectNotFoundException;
import com.evolveum.midpoint.util.exception.SchemaException;
import com.evolveum.midpoint.web.page.admin.PageAdmin;
import com.evolveum.prism.xml.ns._public.query_3.QueryType;

import javax.xml.namespace.QName;

import org.apache.wicket.request.mapper.parameter.PageParameters;

/**
Expand All @@ -35,4 +53,44 @@ public PageAdminConfiguration() {
public PageAdminConfiguration(PageParameters parameters) {
super(parameters);
}

protected String deleteObjectsAsync(QName type, ObjectQuery objectQuery, boolean raw, String taskName,
OperationResult result)
throws SchemaException, ObjectAlreadyExistsException, ObjectNotFoundException {

Task task = createSimpleTask(result.getOperation());
task.setHandlerUri(ModelPublicConstants.DELETE_TASK_HANDLER_URI);

if (objectQuery == null) {
objectQuery = new ObjectQuery();
}

QueryType query = QueryJaxbConvertor.createQueryType(objectQuery, getPrismContext());

PrismPropertyDefinition queryDef = new PrismPropertyDefinitionImpl(
SchemaConstants.MODEL_EXTENSION_OBJECT_QUERY, QueryType.COMPLEX_TYPE, getPrismContext());
PrismProperty<QueryType> queryProp = queryDef.instantiate();
queryProp.setRealValue(query);
task.setExtensionProperty(queryProp);

PrismPropertyDefinition typeDef = new PrismPropertyDefinitionImpl(
SchemaConstants.MODEL_EXTENSION_OBJECT_TYPE, DOMUtil.XSD_QNAME, getPrismContext());
PrismProperty<QName> typeProp = typeDef.instantiate();
typeProp.setRealValue(type);
task.setExtensionProperty(typeProp);

PrismPropertyDefinition rawDef = new PrismPropertyDefinitionImpl(
SchemaConstants.MODEL_EXTENSION_OPTION_RAW, DOMUtil.XSD_BOOLEAN, getPrismContext());
PrismProperty<Boolean> rawProp = rawDef.instantiate();
rawProp.setRealValue(raw);
task.setExtensionProperty(rawProp);

task.setName(taskName);
task.savePendingModifications(result);

TaskManager taskManager = getTaskManager();
taskManager.switchToBackground(task, result);
result.setBackgroundTaskOid(task.getOid());
return task.getOid();
}
}
40 changes: 0 additions & 40 deletions ...n-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugList.java
View file
Expand Up @@ -898,46 +898,6 @@ private void deleteAllShadowsOnResourceConfirmed(AjaxRequestTarget target) {
target.add(getFeedbackPanel());
}

private String deleteObjectsAsync(QName type, ObjectQuery objectQuery, boolean raw, String taskName,
OperationResult result)
throws SchemaException, ObjectAlreadyExistsException, ObjectNotFoundException {

Task task = createSimpleTask(result.getOperation());
task.setHandlerUri(ModelPublicConstants.DELETE_TASK_HANDLER_URI);

if (objectQuery == null) {
objectQuery = new ObjectQuery();
}

QueryType query = QueryJaxbConvertor.createQueryType(objectQuery, getPrismContext());

PrismPropertyDefinition queryDef = new PrismPropertyDefinitionImpl(
SchemaConstants.MODEL_EXTENSION_OBJECT_QUERY, QueryType.COMPLEX_TYPE, getPrismContext());
PrismProperty<QueryType> queryProp = queryDef.instantiate();
queryProp.setRealValue(query);
task.setExtensionProperty(queryProp);

PrismPropertyDefinition typeDef = new PrismPropertyDefinitionImpl(
SchemaConstants.MODEL_EXTENSION_OBJECT_TYPE, DOMUtil.XSD_QNAME, getPrismContext());
PrismProperty<QName> typeProp = typeDef.instantiate();
typeProp.setRealValue(type);
task.setExtensionProperty(typeProp);

PrismPropertyDefinition rawDef = new PrismPropertyDefinitionImpl(
SchemaConstants.MODEL_EXTENSION_OPTION_RAW, DOMUtil.XSD_BOOLEAN, getPrismContext());
PrismProperty<Boolean> rawProp = rawDef.instantiate();
rawProp.setRealValue(raw);
task.setExtensionProperty(rawProp);

task.setName(taskName);
task.savePendingModifications(result);

TaskManager taskManager = getTaskManager();
taskManager.switchToBackground(task, result);
result.setBackgroundTaskOid(task.getOid());
return task.getOid();
}

private static class SearchFragment extends Fragment {

public SearchFragment(String id, String markupId, MarkupContainer markupProvider,
Expand Down
2 changes: 2 additions & 0 deletions gui/admin-gui/src/main/resources/localization/Midpoint.properties
View file
Expand Up @@ -986,6 +986,8 @@ PageAbout.button.testRepositoryCheckOrgClosure=Check and repair org closure cons
PageAbout.button.reindexRepositoryObjects=Reindex repository objects
PageAbout.button.testRepository=Repository self test
PageAbout.button.clearCssJsCache=Clear CSS/JS cache
PageAbout.button.factoryDefault=Switch to factory default
PageAbout.message.deleteAllObjects=Do you really want to delete all objects? It may take several minutes.
PageAbout.message.couldntObtainJvmParams=Couldn't obtain JVM parameters from JMX.
PageAbout.midPointRevision=${git.describe}
PageAbout.builtAt=Build at
Expand Down

0 comments on commit ce24c72

Please sign in to comment.