Skip to content

Commit

Permalink
MID-7963 role catalog tile/table view configuration
Browse files Browse the repository at this point in the history
  • Loading branch information
@1azyman
1azyman committed Jun 14, 2022
1 parent df480f9 commit 23a32c8
Show file tree
Hide file tree
Showing 8 changed files with 193 additions and 207 deletions.
31 changes: 20 additions & 11 deletions ...admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/tile/TileTablePanel.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,8 @@

package com.evolveum.midpoint.gui.impl.component.tile;

import com.evolveum.midpoint.gui.api.component.BasePanel;
import com.evolveum.midpoint.gui.impl.component.search.Search;
import com.evolveum.midpoint.gui.impl.component.search.SearchPanel;
import com.evolveum.midpoint.gui.impl.page.self.requestAccess.PageableListView;
import com.evolveum.midpoint.gui.impl.page.self.requestAccess.ViewToggle;
import com.evolveum.midpoint.web.component.data.BoxedTablePanel;
import com.evolveum.midpoint.web.component.data.paging.NavigatorPanel;
import com.evolveum.midpoint.web.component.util.VisibleBehaviour;
import java.io.Serializable;
import java.util.List;

import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
Expand All @@ -24,9 +18,15 @@
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.io.Serializable;
import java.util.List;
import com.evolveum.midpoint.gui.api.component.BasePanel;
import com.evolveum.midpoint.gui.impl.component.search.Search;
import com.evolveum.midpoint.gui.impl.component.search.SearchPanel;
import com.evolveum.midpoint.gui.impl.page.self.requestAccess.PageableListView;
import com.evolveum.midpoint.web.component.data.BoxedTablePanel;
import com.evolveum.midpoint.web.component.data.paging.NavigatorPanel;
import com.evolveum.midpoint.web.component.util.VisibleBehaviour;

/**
* Created by Viliam Repan (lazyman).
Expand All @@ -42,13 +42,22 @@ public class TileTablePanel<T extends Tile, O extends Serializable> extends Base

private static final String ID_TILES_PAGING = "tilesPaging";

private IModel<ViewToggle> viewToggleModel = Model.of(ViewToggle.TILE);
private IModel<ViewToggle> viewToggleModel;

private IModel<Search> searchModel;

public TileTablePanel(String id, ISortableDataProvider provider, List<IColumn> columns) {
this(id, provider, columns, null);
}

public TileTablePanel(String id, ISortableDataProvider provider, List<IColumn> columns, IModel<ViewToggle> viewToggle) {
super(id);

if (viewToggle == null) {
viewToggle = Model.of(ViewToggle.TILE);
}
this.viewToggleModel = viewToggle;

initModels();
initLayout(provider, columns);
}
Expand Down
2 changes: 1 addition & 1 deletion ...l/page/self/requestAccess/ViewToggle.java → ...t/gui/impl/component/tile/ViewToggle.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* and European Union Public License. See LICENSE file for details.
*/

package com.evolveum.midpoint.gui.impl.page.self.requestAccess;
package com.evolveum.midpoint.gui.impl.component.tile;

/**
* Created by Viliam Repan (lazyman).
Expand Down
0 ...e/self/requestAccess/ViewTogglePanel.html → .../impl/component/tile/ViewTogglePanel.html
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...e/self/requestAccess/ViewTogglePanel.java → .../impl/component/tile/ViewTogglePanel.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* and European Union Public License. See LICENSE file for details.
*/

package com.evolveum.midpoint.gui.impl.page.self.requestAccess;
package com.evolveum.midpoint.gui.impl.component.tile;

import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.AjaxLink;
Expand Down
118 changes: 0 additions & 118 deletions gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/self/PageRequestAccess.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,124 +98,6 @@
</li>
</ul>

<hr class="m-5"/>

<div class="details-menu-panel list-unstyled list-group">
<a href="#" class="list-group-item list-group-item-action d-flex align-items-center">
<i class="fa fa-fw fa-puzzle-piece mr-3"></i>
<span class="flex-grow-1">Some badge</span>
<span class="badge badge-primary badge-pill">14</span>
</a>
<a href="#" class="list-group-item list-group-item-action active d-flex align-items-center">
<i class="fa fa-fw fa-puzzle-piece mr-3"></i>
<span class="flex-grow-1">Applications</span>
<i class="fa fa-chevron-left"></i>
</a>
<li class="">
<a href="#" class="list-group-item list-group-item-action d-flex align-items-center">
<i class="fa fa-fw fa-puzzle-piece mr-3"></i>
<span class="flex-grow-1">Applications</span>
<i class="fa fa-chevron-down"></i>
</a>
<ul class="ml-3 list-unstyled list-group-flush">
<li class="list-group-item">
<a class="">
<i class="far fa-fw fa-circle mr-2"></i>
<span>Microsoft</span>
</a>
</li>
<li class="list-group-item">
<a class="">
<i class="far fa-fw fa-circle mr-2"></i>
<span>Google</span>
</a>
</li>
<li class="list-group-item">
<a class="">
<i class="far fa-fw fa-circle mr-2"></i>
<span>SAP</span>
</a>
</li>
<li class="list-group-item">
<a class="">
<i class="far fa-fw fa-circle mr-2"></i>
<span>Uncategorized</span>
</a>
</li>
</ul>
</li>
</div>

<hr class="m-5"/>

<ul class="details-menu-panel d-flex flex-column rounded bg-white align-self-stretch align-self-md-start" style="width: 100%; margin: 0; padding: 0; list-style: none;">
<li class="border-bottom rounded-top">
<a href="#" style="color: inherit;" class="p-2 px-3 w-100 d-flex flex-wrap align-items-center bg-lightblue text-white rounded-top">
<i class="fa fa-fw fa-border-all mr-3"></i>
<span class="flex-grow-1">All roles</span>
</a>
</li>
<li class="border-bottom">
<a href="#" style="color: #495057;" class="p-2 px-3 w-100 d-flex flex-wrap align-items-center">
<i class="fa fa-fw fa-users mr-3"></i>
<span class="flex-grow-1">Roles of team mate</span>
<i class="fa fa-chevron-left"></i>
</a>
</li>
<li class="border-bottom">
<a href="#" style="color: inherit;" class="p-2 px-3 w-100 d-flex flex-wrap align-items-center bg-lightblue text-white">
<i class="fa fa-fw fa-users mr-3"></i>
<span class="flex-grow-1">Roles of team mate</span>
<i class="fa fa-chevron-down"></i>
</a>
<select class="form-control m-3 w-auto">
<option>Option 1</option>
</select>
</li>
<li class="border-bottom">
<a href="#" style="color: #495057;" class="p-2 px-3 w-100 d-flex flex-wrap align-items-center">
<i class="fa fa-fw fa-puzzle-piece mr-3"></i>
<span class="flex-grow-1">Applications</span>
<i class="fa fa-chevron-left"></i>
</a>
</li>
<li class="border-bottom rounded-bottom">
<a href="#" style="color: inherit;" class="p-2 px-3 w-100 d-flex flex-wrap align-items-center bg-lightblue text-white">
<i class="fa fa-fw fa-puzzle-piece mr-3"></i>
<span class="flex-grow-1">Applications</span>
<i class="fa fa-chevron-down"></i>
</a>
<ul class="ml-3" style="width: 100%; margin: 0; padding: 0; list-style: none;">
<li class="d-flex flex-column">
<a style="color: #495057;" class="p-2 px-3 w-100 d-flex flex-wrap align-items-center">
<i class="far fa-fw fa-circle mr-3"></i>
<span>Microsoft</span>
</a>
</li>
<li class="d-flex flex-column">
<a style="color: #495057;" class="p-2 px-3 w-100 d-flex flex-wrap align-items-center">
<i class="far fa-fw fa-circle mr-3"></i>
<span>Google</span>
</a>
</li>
<li class="d-flex flex-column">
<a style="color: #495057;" class="p-2 px-3 w-100 d-flex flex-wrap align-items-center">
<i class="far fa-fw fa-circle mr-3"></i>
<span>SAP</span>
</a>
</li>
<li class="d-flex flex-column">
<a style="color: #495057;" class="p-2 px-3 w-100 d-flex flex-wrap align-items-center">
<i class="far fa-fw fa-circle mr-3"></i>
<span>Uncategorized</span>
</a>
</li>
</ul>
</li>
</ul>

<hr class="m-5"/>

</div>

<form wicket:id="mainForm" class="d-flex justify-content-center">
Expand Down
19 changes: 14 additions & 5 deletions ...c/main/java/com/evolveum/midpoint/gui/impl/page/self/requestAccess/ListGroupMenuItem.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@

package com.evolveum.midpoint.gui.impl.page.self.requestAccess;

import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.jetbrains.annotations.NotNull;

import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
Expand All @@ -28,7 +32,7 @@ public class ListGroupMenuItem implements Serializable {

private boolean disabled;

private List<ListGroupMenuItem> items;
private IModel<List<ListGroupMenuItem>> items = Model.ofList(new ArrayList<>());

public ListGroupMenuItem() {
}
Expand Down Expand Up @@ -91,13 +95,18 @@ public void setDisabled(boolean disabled) {
}

public List<ListGroupMenuItem> getItems() {
if (items == null) {
items = new ArrayList<>();
}
return items;
return items.getObject();
}

public void setItems(List<ListGroupMenuItem> items) {
this.items.setObject(items);
}

public IModel<List<ListGroupMenuItem>> getItemsModel() {
return this.items;
}

public void setItemsModel(@NotNull IModel<List<ListGroupMenuItem>> items) {
this.items = items;
}
}
2 changes: 1 addition & 1 deletion ...i/src/main/java/com/evolveum/midpoint/gui/impl/page/self/requestAccess/RelationPanel.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ private Tile<QName> createTileForRelation(QName name) {
icon = it.getCssClass();
}

label = WebComponentUtil.getOrigStringFromPoly(display.getLabel());
label = WebComponentUtil.getTranslatedPolyString(display.getLabel());

break;
}
Expand Down

0 comments on commit 23a32c8

Please sign in to comment.