MID-8267 fix for type displaying.

Evolveum · Oct 27, 2022 · 991a6fe · 991a6fe
1 parent 10070ab
commit 991a6fe
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 14 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/search/SearchPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/search/SearchPanel.java
@@ -63,7 +63,6 @@
 
 import com.evolveum.midpoint.gui.api.GuiStyleConstants;
 import com.evolveum.midpoint.gui.api.component.BasePanel;
-import com.evolveum.midpoint.gui.api.model.LoadableModel;
 import com.evolveum.midpoint.gui.api.util.WebComponentUtil;
 import com.evolveum.midpoint.gui.impl.component.icon.CompositedIcon;
 import com.evolveum.midpoint.gui.impl.component.icon.CompositedIconBuilder;

diff --git a/...evolveum/midpoint/gui/impl/page/admin/abstractrole/component/AbstractRoleMemberPanel.java b/...evolveum/midpoint/gui/impl/page/admin/abstractrole/component/AbstractRoleMemberPanel.java
@@ -431,15 +431,15 @@ private SearchConfigurationWrapper createSearchConfigWrapper(Class<? extends Obj
         if (searchConfig.getTenantConfiguration() == null && !isNotRole()) {
             searchConfig.setTenantConfiguration(searchBoxConfig.getDefaultTenantConfiguration());
         }
-        SearchConfigurationWrapper searchConfigWrapper = new SearchConfigurationWrapper(defaultObjectType, searchConfig, getPageBase());
+        SearchConfigurationWrapper<?> searchConfigWrapper = new SearchConfigurationWrapper<>(defaultObjectType, searchConfig, getPageBase());
         SearchFactory.createAbstractRoleSearchItemWrapperList(searchConfigWrapper, searchConfig);
         if (additionalPanelConfig != null) {
             searchConfigWrapper.setAllowToConfigureSearchItems(!Boolean.FALSE.equals(additionalPanelConfig.isAllowToConfigureSearchItems()));
         }
         searchConfigWrapper.getItemsList().forEach(item -> {
             if (item instanceof ObjectTypeSearchItemWrapper) {
-                ((ObjectTypeSearchItemWrapper) item).setAllowAllTypesSearch(true);
-                ((ObjectTypeSearchItemWrapper) item).setValueForNull(
+                ((ObjectTypeSearchItemWrapper<?>) item).setAllowAllTypesSearch(true);
+                ((ObjectTypeSearchItemWrapper<?>) item).setValueForNull(
                         WebComponentUtil.classToQName(getPageBase().getPrismContext(), getChoiceForAllTypes()));
             }
         });
@@ -1427,7 +1427,7 @@ private boolean checkRelationNotSelected(Collection<QName> relations, String mes
         return getSearchBoxConfiguration().getSupportedRelations();
     }
 
-    protected ObjectQuery getActionQuery(IModel rowModel, QueryScope scope, @NotNull Collection<QName> relations) {
+    protected ObjectQuery getActionQuery(IModel<?> rowModel, QueryScope scope, @NotNull Collection<QName> relations) {
         AssignmentHolderType assignmentHolder = getAssignmetHolderFromRow(rowModel);
         if (assignmentHolder == null) {
             return getActionQuery(scope, relations);
@@ -1575,17 +1575,9 @@ protected SearchBoxConfigurationHelper getSearchBoxConfiguration() {
         }
         searchBoxConfiguration = new SearchBoxConfigurationHelper(additionalPanelConfig);
         searchBoxConfiguration.setDefaultSupportedRelations(getSupportedRelations());
-        searchBoxConfiguration.setDefaultSupportedObjectTypes(getDefaultSupportedObjectTypes(false));
+        searchBoxConfiguration.setDefaultSupportedObjectTypes(getDefaultSupportedObjectTypes(true));
         searchBoxConfiguration.setDefaultObjectType(WebComponentUtil.classToQName(getPrismContext(), getDefaultObjectType()));
 
-//        MemberPanelStorage storage = (MemberPanelStorage) pageStorage;
-//
-//        storage.setIndirectSearchItem(searchBoxCofig.getDefaultIndirectConfiguration());
-//        storage.setRelationSearchItem(searchBoxCofig.getDefaultRelationConfiguration());
-//        storage.setScopeSearchItem(searchBoxCofig.getDefaultSearchScopeConfiguration());
-//        storage.setObjectTypeSearchItem(searchBoxCofig.getDefaultObjectTypeConfiguration());
-//        storage.setTenantSearchItem(searchBoxCofig.getDefaultTenantConfiguration());
-//        storage.setProjectSearchItem(searchBoxCofig.getDefaultProjectConfiguration());
         return searchBoxConfiguration;
     }