Skip to content

Commit

Permalink
MID-6271 more report pages fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@1azyman
1azyman committed May 12, 2022
1 parent 2075bb1 commit d161e71
Show file tree
Hide file tree
Showing 12 changed files with 48 additions and 49 deletions.
16 changes: 8 additions & 8 deletions gui/admin-gui/src/frontend/scss/midpoint-theme.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1709,7 +1709,7 @@ fieldset.objectButtons {
padding-right: 2rem;
width: max-content;
min-width: revert;
margin-right: 2rem;
margin-right: 1rem;

> legend {
font-size: 13px;
Expand Down Expand Up @@ -1768,13 +1768,13 @@ fieldset.objectButtons {
}


.card-body.p-0 & {
thead > tr > th,
thead > tr > td,
tfoot > tr > th,
tfoot > tr > td,
tbody > tr > th,
tbody > tr > td {
.card-body.p-0 .table {
& > thead > tr > th,
& > thead > tr > td,
& > tfoot > tr > th,
& > tfoot > tr > td,
& > tbody > tr > th,
& > tbody > tr > td {
&.icon:first-of-type,
&.composited-icon:first-of-type,
&.icon:last-of-type,
Expand Down
2 changes: 2 additions & 0 deletions gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/GuiStyleConstants.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ public class GuiStyleConstants {

public static final String ICON_FAR_COPY="far fa-copy";

public static final String ICON_FAR_ADDRESS_CARD = "far fa-address-card";

public static final String CLASS_BOX = "box";
public static final String CLASS_BOX_DEFAULT = "box-default";

Expand Down
4 changes: 2 additions & 2 deletions ...ain/java/com/evolveum/midpoint/gui/impl/page/admin/component/OperationalButtonsPanel.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
<wicket:panel>
<div class="card">
<div class="card-body">
<div class="d-flex flex-wrap">
<fieldset class="objectButtons d-flex flex-wrap gap-1">
<div class="d-flex flex-wrap gap-3">
<fieldset class="objectButtons d-flex flex-wrap gap-1 align-items-start">
<legend><wicket:message key="OperationalButtonsPanel.buttons.main"/></legend>
<a class="btn" wicket:id="buttons"/>
</fieldset>
Expand Down
2 changes: 1 addition & 1 deletion ...ui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/component/OperationsPanel.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<html xmlns:wicket="http://wicket.apache.org">
<wicket:border>
<div class="card-body">
<div class="d-flex">
<div class="d-flex gap-3">
<wicket:body/>
</div>
</div>
Expand Down
1 change: 0 additions & 1 deletion ...volveum/midpoint/gui/impl/page/admin/report/component/ReportCollectionParameterPanel.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
<!DOCTYPE html>
<html xmlns:wicket="http://wicket.apache.org">
<wicket:panel>

<div wicket:id="parametersTable"/>
</wicket:panel>
</html>
38 changes: 19 additions & 19 deletions ...volveum/midpoint/gui/impl/page/admin/report/component/ReportCollectionParameterPanel.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,19 @@
*/
package com.evolveum.midpoint.gui.impl.page.admin.report.component;

import java.util.ArrayList;
import java.util.List;

import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
import org.apache.wicket.extensions.markup.html.tabs.ITab;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.list.ListItem;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.jetbrains.annotations.NotNull;

import com.evolveum.midpoint.gui.api.component.DisplayNamePanel;
import com.evolveum.midpoint.gui.api.component.tabs.PanelTab;
import com.evolveum.midpoint.gui.api.prism.ItemStatus;
import com.evolveum.midpoint.gui.api.prism.wrapper.ItemWrapper;
import com.evolveum.midpoint.gui.api.prism.wrapper.PrismContainerValueWrapper;
import com.evolveum.midpoint.gui.api.prism.wrapper.PrismContainerWrapper;
Expand All @@ -33,17 +43,6 @@
import com.evolveum.midpoint.web.model.PrismPropertyWrapperModel;
import com.evolveum.midpoint.xml.ns._public.common.common_3.*;

import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
import org.apache.wicket.extensions.markup.html.tabs.ITab;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.list.ListItem;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.jetbrains.annotations.NotNull;

import java.util.ArrayList;
import java.util.List;

@PanelType(name = "reportCollectionParameter")
@PanelInstance(identifier = "reportCollectionParameter", applicableForOperation = OperationTypeType.MODIFY,
display = @PanelDisplay(label = "ObjectCollectionReportEngineConfigurationType.parameter", order = 90))
Expand All @@ -70,7 +69,7 @@ protected MultivalueContainerDetailsPanel<SearchFilterParameterType> getMultival

@Override
protected String getContainerNameForNewButton() {
return getPageBase().createStringResource("ObjectCollectionReportEngineConfigurationType.parameter").getString();
return getString("ObjectCollectionReportEngineConfigurationType.parameter");
}

@Override
Expand Down Expand Up @@ -128,10 +127,11 @@ public WebMarkupContainer createPanel(String panelId) {
PrismContainerWrapperModel.fromContainerValueWrapper(getModel(), SearchFilterParameterType.F_DISPLAY), DisplayType.COMPLEX_TYPE) {

@Override
protected ItemVisibility getVisibility(ItemWrapper itemWrapper) {
if (ItemPath.create(itemWrapper.getParent().getPath(), DisplayType.F_LABEL).equivalent(itemWrapper.getPath())
|| ItemPath.create(itemWrapper.getParent().getPath(), DisplayType.F_HELP).equivalent(itemWrapper.getPath())) {
return super.getVisibility(itemWrapper);
protected ItemVisibility getVisibility(ItemWrapper wrapper) {
ItemPath parentPath = wrapper.getParent().getPath();
if (ItemPath.create(parentPath, DisplayType.F_LABEL).equivalent(wrapper.getPath())
|| ItemPath.create(parentPath, DisplayType.F_HELP).equivalent(wrapper.getPath())) {
return super.getVisibility(wrapper);
}
return ItemVisibility.HIDDEN;
}
Expand All @@ -152,15 +152,15 @@ private List<IColumn<PrismContainerValueWrapper<SearchFilterParameterType>, Stri
containerModel, SearchFilterParameterType.F_NAME, AbstractItemWrapperColumn.ColumnType.VALUE, getPageBase()) {
@Override
public String getCssClass() {
return "col-sm-3 col-md-2";
return "mp-w-sm-3 mp-w-md-2";
}
});

columns.add(new PrismPropertyWrapperColumn<SearchFilterParameterType, String>(
containerModel, SearchFilterParameterType.F_TYPE, AbstractItemWrapperColumn.ColumnType.VALUE, getPageBase()) {
@Override
public String getCssClass() {
return "col-md-3";
return "mp-w-md-3";
}
});

Expand Down
1 change: 0 additions & 1 deletion ...volveum/midpoint/gui/impl/page/admin/report/component/ReportCollectionSubreportPanel.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
<!DOCTYPE html>
<html xmlns:wicket="http://wicket.apache.org">
<wicket:panel>

<div wicket:id="subreportsTable"/>
</wicket:panel>
</html>
6 changes: 3 additions & 3 deletions ...volveum/midpoint/gui/impl/page/admin/report/component/ReportCollectionSubreportPanel.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,23 +103,23 @@ private List<IColumn<PrismContainerValueWrapper<SubreportParameterType>, String>
containerModel, SubreportParameterType.F_NAME, AbstractItemWrapperColumn.ColumnType.VALUE, getPageBase()) {
@Override
public String getCssClass() {
return "col-sm-3 col-md-2";
return "mp-w-sm-3 mp-w-md-2";
}
});

columns.add(new PrismPropertyWrapperColumn<SubreportParameterType, String>(
containerModel, SubreportParameterType.F_TYPE, AbstractItemWrapperColumn.ColumnType.VALUE, getPageBase()) {
@Override
public String getCssClass() {
return "col-md-3";
return "mp-w-md-3";
}
});

columns.add(new PrismPropertyWrapperColumn<SubreportParameterType, String>(
containerModel, SubreportParameterType.F_EXPRESSION, AbstractItemWrapperColumn.ColumnType.EXISTENCE_OF_VALUE, getPageBase()) {
@Override
public String getCssClass() {
return "col-sm-3 col-md-2";
return "mp-w-sm-3 mp-w-md-2";
}
});

Expand Down
3 changes: 1 addition & 2 deletions ...com/evolveum/midpoint/gui/impl/page/admin/report/component/ReportCollectionViewPanel.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@
<!DOCTYPE html>
<html xmlns:wicket="http://wicket.apache.org">
<wicket:panel>

<div wicket:id="type"/>
<div class="form-group row" wicket:id="type"/>
<div wicket:id="columnsTable"/>
</wicket:panel>
</html>
4 changes: 2 additions & 2 deletions ...com/evolveum/midpoint/gui/impl/page/admin/report/component/ReportCollectionViewPanel.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -146,15 +146,15 @@ private List<IColumn<PrismContainerValueWrapper<GuiObjectColumnType>, String>> c
containerModel, GuiObjectColumnType.F_NAME, AbstractItemWrapperColumn.ColumnType.VALUE, getPageBase()) {
@Override
public String getCssClass() {
return "col-sm-3 col-md-2";
return "mp-w-sm-3 mp-w-md-2";
}
});

columns.add(new PrismPropertyWrapperColumn<GuiObjectColumnType, String>(
containerModel, GuiObjectColumnType.F_PATH, AbstractItemWrapperColumn.ColumnType.VALUE, getPageBase()) {
@Override
public String getCssClass() {
return "col-md-3";
return "mp-w-md-3";
}
});

Expand Down
4 changes: 2 additions & 2 deletions ...evolveum/midpoint/gui/impl/page/admin/report/component/ReportOperationalButtonsPanel.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
<html xmlns:wicket="http://wicket.apache.org">
<wicket:panel>
<wicket:extend>
<fieldset class="objectButtons">
<fieldset class="objectButtons d-flex flex-wrap align-items-start gap-1">
<legend><wicket:message key="ReportOperationalButtonsPanel.buttons.report"/></legend>
<a class="mr-2 btnbtn-primary btn-sm" wicket:id="reportButtons"/>
<a class="btn btn-sm" wicket:id="reportButtons"/>
</fieldset>
</wicket:extend>
</wicket:panel>
Expand Down
16 changes: 8 additions & 8 deletions ...evolveum/midpoint/gui/impl/page/admin/report/component/ReportOperationalButtonsPanel.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ private void initOperationalButtons(RepeatingView repeatingView) {
String showPreviewInPopupId = repeatingView.newChildId();

IconType iconType = new IconType();
iconType.setCssClass("fa fa-address-card-o");
iconType.setCssClass(GuiStyleConstants.ICON_FAR_ADDRESS_CARD);
CompositedIconBuilder iconBuilder = new CompositedIconBuilder()
.setBasicIcon("fa fa-sync-alt", IconCssStyle.IN_ROW_STYLE)
.appendLayerIcon(iconType, IconCssStyle.BOTTOM_RIGHT_STYLE);
Expand All @@ -127,12 +127,12 @@ public void onClick(AjaxRequestTarget target) {
}
};
refresh.add(new VisibleBehaviour(isShowingPreview::getObject));
refresh.add(AttributeAppender.append("class", "btn-default btn-sm"));
refresh.add(AttributeAppender.append("class", "btn-default"));
refresh.setOutputMarkupId(true);
repeatingView.add(refresh);

iconBuilder = new CompositedIconBuilder()
.setBasicIcon("fa fa-address-card-o", IconCssStyle.IN_ROW_STYLE);
.setBasicIcon(GuiStyleConstants.ICON_FAR_ADDRESS_CARD, IconCssStyle.IN_ROW_STYLE);
AjaxCompositedIconButton showPreview = new AjaxCompositedIconButton(showPreviewId, iconBuilder.build(),
createStringResource("pageCreateCollectionReport.button.showPreview.${}", isShowingPreview)) {

Expand Down Expand Up @@ -161,14 +161,14 @@ public void onClick(AjaxRequestTarget target) {
};
showPreview.titleAsLabel(true);
showPreview.add(new VisibleBehaviour(this::isCollectionReport));
showPreview.add(AttributeAppender.append("class", "btn-default btn-sm"));
showPreview.add(AttributeAppender.append("class", "btn-default"));
showPreview.setOutputMarkupId(true);
repeatingView.add(showPreview);

iconType = new IconType();
iconType.setCssClass("fa fa-window-maximize");
iconBuilder = new CompositedIconBuilder()
.setBasicIcon("fa fa-address-card-o", IconCssStyle.IN_ROW_STYLE);
.setBasicIcon(GuiStyleConstants.ICON_FAR_ADDRESS_CARD, IconCssStyle.IN_ROW_STYLE);
// .appendLayerIcon(iconType, IconCssStyle.BOTTOM_RIGHT_STYLE);
AjaxCompositedIconButton showPreviewInPopup = new AjaxCompositedIconButton(showPreviewInPopupId, iconBuilder.build(),
createStringResource("pageCreateCollectionReport.button.showPreviewInPopup")) {
Expand All @@ -187,7 +187,7 @@ public StringResourceModel getTitle() {
};
showPreviewInPopup.titleAsLabel(true);
showPreviewInPopup.add(new VisibleBehaviour(() -> isCollectionReport() && !isShowingPreview.getObject()));
showPreviewInPopup.add(AttributeAppender.append("class", "btn-default btn-sm"));
showPreviewInPopup.add(AttributeAppender.append("class", "btn-default"));
showPreviewInPopup.setOutputMarkupId(true);
repeatingView.add(showPreviewInPopup);

Expand All @@ -203,7 +203,7 @@ public void onClick(AjaxRequestTarget target) {
};
runReport.titleAsLabel(true);
runReport.add(new VisibleBehaviour(() -> isEditObject() && !WebComponentUtil.isImportReport(getOriginalReport().asObjectable())));
runReport.add(AttributeAppender.append("class", "btn-default btn-sm"));
runReport.add(AttributeAppender.append("class", "btn-default"));
runReport.setOutputMarkupId(true);
repeatingView.add(runReport);

Expand All @@ -219,7 +219,7 @@ public void onClick(AjaxRequestTarget target) {
}
};
importReport.add(new VisibleBehaviour(() -> isEditObject() && WebComponentUtil.isImportReport(getOriginalReport().asObjectable())));
importReport.add(AttributeAppender.append("class", "btn-default btn-sm"));
importReport.add(AttributeAppender.append("class", "btn-default"));
importReport.setOutputMarkupId(true);
repeatingView.add(importReport);
}
Expand Down

0 comments on commit d161e71

Please sign in to comment.