Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/support-4.4' into support-4.4
Browse files Browse the repository at this point in the history
  • Loading branch information
@mederly
mederly committed Apr 4, 2022
2 parents 945e377 + 7c744d1 commit fbc104b
Show file tree
Hide file tree
Showing 56 changed files with 642 additions and 1,039 deletions.
3 changes: 3 additions & 0 deletions config/sql/generic-old/oracle-4.4-all.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -469,6 +469,8 @@ CREATE TABLE m_task (
taskIdentifier VARCHAR2(255 CHAR),
threadStopAction NUMBER(10, 0),
waitingReason NUMBER(10, 0),
schedulingState NUMBER(10, 0),
autoScalingMode NUMBER(10, 0),
oid VARCHAR2(36 CHAR) NOT NULL,
PRIMARY KEY (oid)
) INITRANS 30;
Expand Down Expand Up @@ -627,6 +629,7 @@ CREATE TABLE m_node (
name_norm VARCHAR2(255 CHAR),
name_orig VARCHAR2(255 CHAR),
nodeIdentifier VARCHAR2(255 CHAR),
operationalState NUMBER(10, 0),
oid VARCHAR2(36 CHAR) NOT NULL,
PRIMARY KEY (oid)
) INITRANS 30;
Expand Down
91 changes: 53 additions & 38 deletions ...dmin-gui/src/main/java/com/evolveum/midpoint/gui/api/DefaultGuiConfigurationCompiler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@
import com.evolveum.midpoint.schema.util.MiscSchemaUtil;
import com.evolveum.midpoint.util.ClassPathUtil;
import com.evolveum.midpoint.util.QNameUtil;
import com.evolveum.midpoint.util.logging.Trace;
import com.evolveum.midpoint.util.logging.TraceManager;
import com.evolveum.midpoint.web.application.*;
import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
import com.evolveum.prism.xml.ns._public.types_3.ItemPathType;
Expand All @@ -45,6 +47,8 @@
@Component
public class DefaultGuiConfigurationCompiler implements GuiProfileCompilable {

private static final Trace LOGGER = TraceManager.getTrace(DefaultGuiConfigurationCompiler.class);

@Autowired private GuiProfileCompilerRegistry registry;
@Autowired private PrismContext prismContext;
@Autowired private AdminGuiConfigurationMergeManager adminGuiConfigurationMergeManager;
Expand Down Expand Up @@ -106,7 +110,7 @@ private static synchronized Collection<Class<?>> getCollectionClasses() {
}

private Collection<Class<?>> getPanelInstanceClasses() {
Collection<Class<?>> result = new ArrayList<>();
Collection<Class<?>> result = new HashSet<>();
result.addAll(getClassesForAnnotation(PanelInstance.class, additionalPackagesToScan));
result.addAll(getClassesForAnnotation(PanelInstances.class, additionalPackagesToScan));

Expand Down Expand Up @@ -205,22 +209,42 @@ private List<CompiledObjectCollectionView> compileDefaultCollectionViews(Collect
return compiledObjectCollectionViews;
}

private List<PanelInstance> getPanelInstancesAnnotations(Class<?> clazz) {
List<PanelInstance> instances = new ArrayList<>();
if (clazz == null) {
return instances;
}

PanelInstance i = clazz.getAnnotation(PanelInstance.class);
if (i != null) {
instances.add(i);
}

PanelInstances pis = clazz.getAnnotation(PanelInstances.class);
if (pis != null) {
instances.addAll(Arrays.asList(pis.value()));
}

return instances;
}

private void processShadowPanels(CompiledGuiProfile compiledGuiProfile) {
List<ContainerPanelConfigurationType> shadowPanels = new ArrayList<>();
for (Class<?> clazz : getPanelInstanceClasses()) {
PanelInstance instance = clazz.getAnnotation(PanelInstance.class);
if (instance == null) {
continue;
}
if (!instance.applicableForType().equals(ShadowType.class)) {
continue;
}
for (PanelInstance instance : getPanelInstancesAnnotations(clazz)) {
if (instance == null) {
continue;
}
if (!instance.applicableForType().equals(ShadowType.class)) {
continue;
}

if (compiledGuiProfile.getObjectDetails() == null) {
compiledGuiProfile.setObjectDetails(new GuiObjectDetailsSetType());
if (compiledGuiProfile.getObjectDetails() == null) {
compiledGuiProfile.setObjectDetails(new GuiObjectDetailsSetType());
}
ContainerPanelConfigurationType shadowPanel = compileContainerPanelConfiguration(clazz, ShadowType.class, instance);
shadowPanels.add(shadowPanel);
}
ContainerPanelConfigurationType shadowPanel = compileContainerPanelConfiguration(clazz, ShadowType.class, instance);
shadowPanels.add(shadowPanel);
}

if (compiledGuiProfile.getObjectDetails() == null) {
Expand Down Expand Up @@ -306,13 +330,8 @@ private Set<Class<? extends Containerable>> findSupportedContainerables() {
Set<Class<? extends Containerable>> containerables = new HashSet<>();

for (Class<?> clazz : getPanelInstanceClasses()) {
PanelInstances pis = clazz.getAnnotation(PanelInstances.class);
if (pis != null) {
Arrays.asList(pis.value()).forEach(pi -> addSupportedContainerable(containerables, pi));
}

PanelInstance pi = clazz.getAnnotation(PanelInstance.class);
addSupportedContainerable(containerables, pi);
List<PanelInstance> pis = getPanelInstancesAnnotations(clazz);
pis.forEach(pi -> addSupportedContainerable(containerables, pi));
}

return containerables;
Expand Down Expand Up @@ -364,13 +383,8 @@ private List<ContainerPanelConfigurationType> getPanelsFor(Class<? extends Conta
List<ContainerPanelConfigurationType> panels = new ArrayList<>();

for (Class<?> clazz : getPanelInstanceClasses()) {
PanelInstances pis = clazz.getAnnotation(PanelInstances.class);
if (pis != null) {
Arrays.asList(pis.value()).forEach(pi -> addPanelsFor(panels, containerable, clazz, pi));
}

PanelInstance pi = clazz.getAnnotation(PanelInstance.class);
addPanelsFor(panels, containerable, clazz, pi);
List<PanelInstance> pis = getPanelInstancesAnnotations(clazz);
pis.forEach(pi -> addPanelsFor(panels, containerable, clazz, pi));
}

MiscSchemaUtil.sortDetailsPanels(panels);
Expand Down Expand Up @@ -493,20 +507,21 @@ private void compileDisplay(PanelInstance panelInstance, ContainerPanelConfigura
private List<ContainerPanelConfigurationType> processChildren(Class<? extends Containerable> containerable, Class<?> parentClass) {
List<ContainerPanelConfigurationType> configs = new ArrayList<>();
for (Class<?> clazz : getPanelInstanceClasses()) {
PanelInstance panelInstance = clazz.getAnnotation(PanelInstance.class);
if (isNotApplicableFor(containerable, panelInstance)) {
continue;
}
if (!isSubPanel(panelInstance)) {
continue;
}
for (PanelInstance panelInstance : getPanelInstancesAnnotations(clazz)) {
if (isNotApplicableFor(containerable, panelInstance)) {
continue;
}
if (!isSubPanel(panelInstance)) {
continue;
}

if (!panelInstance.childOf().equals(parentClass)) {
continue;
}
if (!panelInstance.childOf().equals(parentClass)) {
continue;
}

ContainerPanelConfigurationType config = compileContainerPanelConfiguration(clazz, containerable, panelInstance);
configs.add(config);
ContainerPanelConfigurationType config = compileContainerPanelConfiguration(clazz, containerable, panelInstance);
configs.add(config);
}
}

MiscSchemaUtil.sortDetailsPanels(configs);
Expand Down
4 changes: 2 additions & 2 deletions gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/ChooseMemberPopup.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -457,8 +457,8 @@ private List<CompositedIconButtonDto> getAssignButtonDescription() {
}

private DisplayType getAssignMemberButtonDisplayType() {
return GuiDisplayTypeUtil.createDisplayType(GuiStyleConstants.EVO_ASSIGNMENT_ICON, "green",
ChooseMemberPopup.this.createStringResource("abstractRoleMemberPanel.menu.assignMember", "", "").getString());
String label = ChooseMemberPopup.this.createStringResource("abstractRoleMemberPanel.menu.assignMember", "", "").getString();
return GuiDisplayTypeUtil.createDisplayType(GuiStyleConstants.EVO_ASSIGNMENT_ICON, "green", label, label);
}

private CompositedIconButtonDto createCompositedIconButtonDto(DisplayType buttonDisplayType, AssignmentObjectRelation relation, CompositedIcon icon) {
Expand Down
2 changes: 1 addition & 1 deletion gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/MainObjectListPanel.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -460,7 +460,7 @@ private boolean isRawOrNoFetchOption(Collection<SelectorOptions<GetOperationOpti
}

protected boolean isCreateNewObjectEnabled() {
return true;
return !isCollectionViewPanel() || getObjectCollectionView().isApplicableForOperation(OperationTypeType.ADD);
}

@NotNull
Expand Down
36 changes: 21 additions & 15 deletions gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/result/MessagePanel.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,31 +6,41 @@
*/
package com.evolveum.midpoint.gui.api.component.result;

import java.io.Serializable;

import org.apache.wicket.AttributeModifier;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.PropertyModel;

import com.evolveum.midpoint.gui.api.component.BasePanel;

public class MessagePanel extends BasePanel<String> {

private static final String ID_MESSAGE = "message";

private static final String ID_DETAILS_BOX = "detailsBox";

private static final String ID_ICON_TYPE = "iconType";

private static final String ID_CLOSE = "close";

public enum MessagePanelType {INFO, WARN, SUCCESS, ERROR}

private MessagePanelType type;

private boolean closeVisible;

public MessagePanel(String id, MessagePanelType type, IModel<String> model) {
this(id, type, model, true);
}

public MessagePanel(String id, MessagePanelType type, IModel<String> model, boolean closeVisible) {
super(id, model);
this.type = type;

this.type = type;
this.closeVisible = closeVisible;
}

@Override
Expand All @@ -40,38 +50,34 @@ protected void onInitialize() {
}

public void initLayout() {

WebMarkupContainer detailsBox = new WebMarkupContainer("detailsBox");
WebMarkupContainer detailsBox = new WebMarkupContainer(ID_DETAILS_BOX);
detailsBox.setOutputMarkupId(true);
detailsBox.add(AttributeModifier.append("class", createHeaderCss()));
add(detailsBox);

initHeader(detailsBox);

}

private IModel<String> createHeaderCss() {

return (IModel<String>) () -> {
return () -> {
switch (type) {
case INFO:
return " box-info";
case SUCCESS:
return " box-success";
case ERROR:
return " box-danger";
case WARN: // TODO:
case WARN:
default:
return " box-warning";
}
};
}

private void initHeader(WebMarkupContainer box) {
WebMarkupContainer iconType = new WebMarkupContainer("iconType");
WebMarkupContainer iconType = new WebMarkupContainer(ID_ICON_TYPE);
iconType.setOutputMarkupId(true);
iconType.add(new AttributeAppender("class", (IModel) () -> {

iconType.add(AttributeAppender.append("class", () -> {
switch (type) {
case INFO:
return " fa-info";
Expand All @@ -90,16 +96,16 @@ private void initHeader(WebMarkupContainer box) {
Label message = new Label(ID_MESSAGE, getModel());
box.add(message);

AjaxLink<Void> close = new AjaxLink<Void>("close") {
AjaxLink<Void> close = new AjaxLink<>(ID_CLOSE) {

private static final long serialVersionUID = 1L;

@Override
public void onClick(AjaxRequestTarget target) {
close(target);

}
};
close.setVisible(closeVisible);

box.add(close);
}
Expand Down
36 changes: 24 additions & 12 deletions gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/GuiDisplayTypeUtil.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,31 +43,31 @@ public static DisplayType createDisplayType(OperationResultStatusPresentationPro
return createDisplayType(OperationIcon.getIcon(), "", OperationIcon.getStatusLabelKey());
}

public static DisplayType createDisplayType(String iconCssClass, String iconColor, String title) {
return createDisplayType(iconCssClass, iconColor, WebComponentUtil.createPolyFromOrigString(title));
public static DisplayType createDisplayType(String iconCssClass, String iconColor, String tooltip) {
return createDisplayType(iconCssClass, iconColor, WebComponentUtil.createPolyFromOrigString(tooltip));
}

public static DisplayType createDisplayType(String iconCssClass, String iconColor, String label, String title) {
return createDisplayType(iconCssClass, iconColor, WebComponentUtil.createPolyFromOrigString(label), WebComponentUtil.createPolyFromOrigString(title));
public static DisplayType createDisplayType(String iconCssClass, String iconColor, String label, String tooltip) {
return createDisplayType(iconCssClass, iconColor, WebComponentUtil.createPolyFromOrigString(label), WebComponentUtil.createPolyFromOrigString(tooltip));
}

public static DisplayType createDisplayType(String iconCssClass, PolyStringType title) {
return createDisplayType(iconCssClass, "", title);
public static DisplayType createDisplayType(String iconCssClass, PolyStringType tooltip) {
return createDisplayType(iconCssClass, "", tooltip);
}

public static DisplayType createDisplayType(String iconCssClass, String iconColor, PolyStringType title) {
return createDisplayType(iconCssClass, iconColor, null, title);
public static DisplayType createDisplayType(String iconCssClass, String iconColor, PolyStringType tooltip) {
return createDisplayType(iconCssClass, iconColor, null, tooltip);
}

public static DisplayType createDisplayType(String iconCssClass, String iconColor, PolyStringType label, PolyStringType title) {
public static DisplayType createDisplayType(String iconCssClass, String iconColor, PolyStringType label, PolyStringType tooltip) {
DisplayType displayType = new DisplayType();
IconType icon = new IconType();
icon.setCssClass(iconCssClass != null ? iconCssClass.trim() : iconCssClass);
icon.setColor(iconColor);
displayType.setIcon(icon);
displayType.setLabel(label);

displayType.setTooltip(title);
displayType.setTooltip(tooltip);
return displayType;
}

Expand All @@ -89,10 +89,21 @@ public static <O extends ObjectType> DisplayType getArchetypePolicyDisplayType(P
return null;
}

private static DisplayType createSimpleObjectRelationDisplayType(PageBase page, String key, String type, String relation) {
if (type == null) {
type = "";
}
if (relation == null) {
relation = "";
}
String label = page.createStringResource(key, type, relation).getString();
return createDisplayType("", "", label, label);
}

public static DisplayType getAssignmentObjectRelationDisplayType(PageBase pageBase, AssignmentObjectRelation assignmentTargetRelation,
String defaultTitleKey) {
if (assignmentTargetRelation == null) {
return createDisplayType("", "", pageBase.createStringResource(defaultTitleKey, "", "").getString());
return createSimpleObjectRelationDisplayType(pageBase, defaultTitleKey, null, null);
}

String typeTitle = "";
Expand Down Expand Up @@ -164,7 +175,8 @@ public static DisplayType getAssignmentObjectRelationDisplayType(PageBase pageBa
return displayType;
}
}
return createDisplayType("", "", pageBase.createStringResource(defaultTitleKey, typeTitle, relationTitle).getString());

return createSimpleObjectRelationDisplayType(pageBase, defaultTitleKey, typeTitle, relationTitle);
}

public static DisplayType getNewObjectDisplayTypeFromCollectionView(CompiledObjectCollectionView view, PageBase pageBase) {
Expand Down
4 changes: 2 additions & 2 deletions ...in-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/ContainerableListPanel.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -627,11 +627,11 @@ private boolean pathNotEmpty(ItemPath columnPath) {
return columnPath != null && !columnPath.isEmpty();
}

private IModel<?> getExportableColumnDataModel(IModel<PO> rowModel, GuiObjectColumnType customColumn, ItemPath columnPath, ExpressionType expression) {
protected IModel<?> getExportableColumnDataModel(IModel<PO> rowModel, GuiObjectColumnType customColumn, ItemPath columnPath, ExpressionType expression) {
return new ReadOnlyModel<>(() -> loadExportableColumnDataModel(rowModel, customColumn, columnPath, expression));
}

protected Collection<String> loadExportableColumnDataModel(IModel<PO> rowModel, GuiObjectColumnType customColumn, ItemPath columnPath, ExpressionType expression) {
public Collection<String> loadExportableColumnDataModel(IModel<PO> rowModel, GuiObjectColumnType customColumn, ItemPath columnPath, ExpressionType expression) {
C value = getRowRealValue(rowModel.getObject());
if (value == null) {
return Collections.singletonList("");
Expand Down

0 comments on commit fbc104b

Please sign in to comment.