Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
@mederly
mederly committed Oct 17, 2022
2 parents f3be65f + a07b6ba commit 2655be0
Show file tree
Hide file tree
Showing 2 changed files with 44 additions and 10 deletions.
29 changes: 20 additions & 9 deletions ...ain/java/com/evolveum/midpoint/gui/impl/component/search/ObjectTypeSearchItemWrapper.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectTypeSearchItemConfigurationType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.SearchBoxModeType;

import org.apache.commons.lang3.StringUtils;

import javax.xml.namespace.QName;
import java.util.ArrayList;
import java.util.List;
Expand All @@ -28,6 +30,9 @@ public class ObjectTypeSearchItemWrapper<C extends Containerable> extends Abstra
private boolean allowAllTypesSearch;

private List<Class<C>> supportedTypeList = new ArrayList<>();
private String name;
private String help;
private boolean visible = true;

private QName defaultObjectType;
public ObjectTypeSearchItemWrapper(ObjectTypeSearchItemConfigurationType config) {
Expand Down Expand Up @@ -88,18 +93,20 @@ public void setDefaultObjectType(QName defaultObjectType) {

@Override
public String getName() {
// if (config != null && config.getDisplay() != null && config.getDisplay().getLabel() != null){
// return WebComponentUtil.getTranslatedPolyString(config.getDisplay().getLabel());
// }
return PageBase.createStringResourceStatic("ContainerTypeSearchItem.name").getString();
return StringUtils.isNotEmpty(name) ? name : PageBase.createStringResourceStatic("ContainerTypeSearchItem.name").getString();
}

public void setName(String name) {
this.name = name;
}

@Override
public String getHelp() {
// if (config != null && config.getDisplay() != null && config.getDisplay().getHelp() != null){
// return WebComponentUtil.getTranslatedPolyString(config.getDisplay().getHelp());
// }
return "";
return StringUtils.isNotEmpty(help) ? help : "";
}

public void setHelp(String help) {
this.help = help;
}

@Override
Expand All @@ -119,7 +126,11 @@ public boolean isApplyFilter(SearchBoxModeType searchBoxMode) {

@Override
public boolean isVisible() {
return true;
return visible;
}

public void setVisible(boolean visible) {
this.visible = visible;
}

@Override
Expand Down
25 changes: 24 additions & 1 deletion ...dmin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/search/SearchFactory.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -630,14 +630,25 @@ private static boolean objectTypeSearchItemWrapperExists(List<AbstractSearchItem
}
public static void createAbstractRoleSearchItemWrapperList(SearchConfigurationWrapper searchConfigWrapper, SearchBoxConfigurationType config) {
if (config.getObjectTypeConfiguration() != null) {
searchConfigWrapper.getItemsList().add(new ObjectTypeSearchItemWrapper(config.getObjectTypeConfiguration()));
ObjectTypeSearchItemWrapper objectTypeSearchItemWrapper = new ObjectTypeSearchItemWrapper(config.getObjectTypeConfiguration());
if (config.getObjectTypeConfiguration().getDisplay() != null) {
objectTypeSearchItemWrapper.setName(WebComponentUtil.getTranslatedPolyString(config.getObjectTypeConfiguration().getDisplay().getLabel()));
objectTypeSearchItemWrapper.setHelp(WebComponentUtil.getTranslatedPolyString(config.getObjectTypeConfiguration().getDisplay().getHelp()));
}
if (config.getObjectTypeConfiguration().getVisibility() != null) {
objectTypeSearchItemWrapper.setVisible(WebComponentUtil.getElementVisibility(config.getObjectTypeConfiguration().getVisibility()));
}
searchConfigWrapper.getItemsList().add(objectTypeSearchItemWrapper);
}
if (config.getRelationConfiguration() != null) {
RelationSearchItemWrapper relation = new RelationSearchItemWrapper(searchConfigWrapper);
if (config.getRelationConfiguration().getDisplay() != null) {
relation.setName(WebComponentUtil.getTranslatedPolyString(config.getRelationConfiguration().getDisplay().getLabel()));
relation.setHelp(WebComponentUtil.getTranslatedPolyString(config.getRelationConfiguration().getDisplay().getHelp()));
}
if (config.getRelationConfiguration().getVisibility() != null) {
relation.setVisible(WebComponentUtil.getElementVisibility(config.getRelationConfiguration().getVisibility()));
}
searchConfigWrapper.getItemsList().add(relation);
}

Expand All @@ -647,6 +658,9 @@ public static void createAbstractRoleSearchItemWrapperList(SearchConfigurationWr
indirect.setName(WebComponentUtil.getTranslatedPolyString(config.getIndirectConfiguration().getDisplay().getLabel()));
indirect.setHelp(WebComponentUtil.getTranslatedPolyString(config.getIndirectConfiguration().getDisplay().getHelp()));
}
if (config.getIndirectConfiguration().getVisibility() != null) {
indirect.setVisible(WebComponentUtil.getElementVisibility(config.getIndirectConfiguration().getVisibility()));
}
searchConfigWrapper.getItemsList().add(indirect);
}

Expand All @@ -656,6 +670,9 @@ public static void createAbstractRoleSearchItemWrapperList(SearchConfigurationWr
scope.setName(WebComponentUtil.getTranslatedPolyString(config.getScopeConfiguration().getDisplay().getLabel()));
scope.setHelp(WebComponentUtil.getTranslatedPolyString(config.getScopeConfiguration().getDisplay().getHelp()));
}
if (config.getScopeConfiguration().getVisibility() != null) {
scope.setVisible(WebComponentUtil.getElementVisibility(config.getScopeConfiguration().getVisibility()));
}
searchConfigWrapper.getItemsList().add(scope);
}
if (config.getProjectConfiguration() != null) {
Expand All @@ -664,6 +681,9 @@ public static void createAbstractRoleSearchItemWrapperList(SearchConfigurationWr
project.setName(WebComponentUtil.getTranslatedPolyString(config.getProjectConfiguration().getDisplay().getLabel()));
project.setHelp(WebComponentUtil.getTranslatedPolyString(config.getProjectConfiguration().getDisplay().getHelp()));
}
if (config.getProjectConfiguration().getVisibility() != null) {
project.setVisible(WebComponentUtil.getElementVisibility(config.getProjectConfiguration().getVisibility()));
}
searchConfigWrapper.getItemsList().add(project);
}
if (config.getTenantConfiguration() != null) {
Expand All @@ -672,6 +692,9 @@ public static void createAbstractRoleSearchItemWrapperList(SearchConfigurationWr
tenant.setName(WebComponentUtil.getTranslatedPolyString(config.getTenantConfiguration().getDisplay().getLabel()));
tenant.setHelp(WebComponentUtil.getTranslatedPolyString(config.getTenantConfiguration().getDisplay().getHelp()));
}
if (config.getTenantConfiguration().getVisibility() != null) {
tenant.setVisible(WebComponentUtil.getElementVisibility(config.getTenantConfiguration().getVisibility()));
}
searchConfigWrapper.getItemsList().add(tenant);
}
}
Expand Down

0 comments on commit 2655be0

Please sign in to comment.