NPE fixes for creating search

Evolveum · Jan 25, 2023 · f416b99 · f416b99
1 parent e2dda98
commit f416b99
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/...in-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/ContainerableListPanel.java b/...in-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/ContainerableListPanel.java
@@ -205,7 +205,7 @@ private Search<C> createSearch() {
     }
 
     protected SearchContext createAdditionalSearchContext() {
-        return new SearchContext();
+        return null;
     }
 
     private void initLayout() {

diff --git a/...n/java/com/evolveum/midpoint/gui/impl/component/search/SearchBoxConfigurationBuilder.java b/...n/java/com/evolveum/midpoint/gui/impl/component/search/SearchBoxConfigurationBuilder.java
@@ -132,8 +132,8 @@ private SearchItemsType createSearchItemsForType() {
     private List<SearchItemType> createSearchItemList() {
         List<SearchItemType> searchItems = new ArrayList<>();
 
-        if (additionalSearchContext.getReportCollection() != null) {
-            return createReportSearchItems(additionalSearchContext.getReportCollection());
+        if (getReportCollection() != null) {
+            return createReportSearchItems(getReportCollection());
         }
 
         for (ItemPath path : availableDefinitions.keySet()) {
@@ -148,6 +148,13 @@ private List<SearchItemType> createSearchItemList() {
         return searchItems;
     }
 
+    private ObjectCollectionReportEngineConfigurationType getReportCollection(){
+        if (additionalSearchContext == null) {
+            return null;
+        }
+        return additionalSearchContext.getReportCollection();
+    }
+
     private boolean isDeadItemForProjections(ItemPath path) {
         if (CollectionPanelType.PROJECTION_SHADOW != collectionPanelType) {
             return false;

diff --git a/...dmin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/search/SearchBuilder.java b/...dmin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/search/SearchBuilder.java
@@ -164,6 +164,9 @@ private void initTimestampForAudit(Search<C> search) {
     }
 
     private void initAssociationWrapperIfNeeded(Search<C> search) {
+        if (additionalSearchContext == null) {
+            return;
+        }
         if (CollectionPanelType.ASSOCIABLE_SHADOW.equals(additionalSearchContext.getPanelType())) {
             AssociationSearchItemWrapper wrapper = new AssociationSearchItemWrapper(additionalSearchContext.getResourceObjectDefinition());
             search.getItems().add(0, wrapper);