Merge pull request #4782 from gchq/gh-4781

#4781 Fix NPE

Author: stroomdev66

stroom-core-client/src/main/java/stroom/dashboard/client/DashboardPlugin.java

@@ -167,25 +167,26 @@ private void reopen(final ResultStoreInfo resultStoreInfo) {
         final SearchRequestSource source = resultStoreInfo.getSearchRequestSource();
         if (source != null && SourceType.DASHBOARD_UI.equals(source.getSourceType())) {
             final DocRef docRef = source.getOwnerDocRef();
-
-            // If the item isn't already open but we are forcing it open then,
-            // create a new presenter and register it as open.
-            final DashboardSuperPresenter presenter = dashboardSuperPresenterProvider.get();
-            presenter.setResultStoreInfo(resultStoreInfo);
-
-            // Load the document and show the tab.
-            final CloseContentEvent.Handler closeHandler = event -> {
-                // Tell the presenter we are closing.
-                presenter.onClose();
-                // Actually close the tab.
-                event.getCallback().closeTab(true);
-            };
-            showDocument(docRef,
-                    presenter,
-                    closeHandler,
-                    presenter,
-                    false,
-                    new DefaultTaskMonitorFactory(this));
+            if (docRef != null) {
+                // If the item isn't already open but we are forcing it open then,
+                // create a new presenter and register it as open.
+                final DashboardSuperPresenter presenter = dashboardSuperPresenterProvider.get();
+                presenter.setResultStoreInfo(resultStoreInfo);
+
+                // Load the document and show the tab.
+                final CloseContentEvent.Handler closeHandler = event -> {
+                    // Tell the presenter we are closing.
+                    presenter.onClose();
+                    // Actually close the tab.
+                    event.getCallback().closeTab(true);
+                };
+                showDocument(docRef,
+                        presenter,
+                        closeHandler,
+                        presenter,
+                        false,
+                        new DefaultTaskMonitorFactory(this));
+            }
         }
     }
 

stroom-dashboard/stroom-dashboard-impl/src/main/java/stroom/dashboard/impl/DashboardServiceImpl.java

@@ -365,13 +365,18 @@ private String getResultsFilename(final DownloadSearchResultsRequest request) {
 
     private String getQueryFileName(final DashboardSearchRequest request) {
         final SearchRequestSource searchRequestSource = request.getSearchRequestSource();
-        final DocRefInfo dashDocRefInfo = dashboardStore.info(searchRequestSource.getOwnerDocRef());
-        final String dashboardName = NullSafe.getOrElse(
-                dashDocRefInfo,
-                DocRefInfo::getDocRef,
-                DocRef::getName,
-                searchRequestSource.getOwnerDocRef().getName());
-        final String basename = dashboardName + "__" + searchRequestSource.getComponentId();
+        String basename = searchRequestSource.getComponentId();
+        if (searchRequestSource.getOwnerDocRef() != null) {
+            final DocRefInfo dashDocRefInfo = dashboardStore.info(searchRequestSource.getOwnerDocRef());
+            final String dashboardName = NullSafe.getOrElse(
+                    dashDocRefInfo,
+                    DocRefInfo::getDocRef,
+                    DocRef::getName,
+                    searchRequestSource.getOwnerDocRef().getName());
+            if (dashboardName != null) {
+                basename = dashboardName + "__" + searchRequestSource.getComponentId();
+            }
+        }
         return getFileName(basename, "json");
     }
 
@@ -504,7 +509,8 @@ private void storeSearchHistory(final DashboardSearchRequest request) {
                 final SearchRequestSource searchRequestSource = request.getSearchRequestSource();
                 final StoredQuery storedQuery = new StoredQuery();
                 storedQuery.setName("History");
-                storedQuery.setDashboardUuid(searchRequestSource.getOwnerDocRef().getUuid());
+                storedQuery.setDashboardUuid(NullSafe
+                        .get(searchRequestSource, SearchRequestSource::getOwnerDocRef, DocRef::getUuid));
                 storedQuery.setComponentId(searchRequestSource.getComponentId());
                 storedQuery.setQuery(query);
                 queryService.create(storedQuery);

unreleased_changes/20250213_162524_718__4781.md

@@ -0,0 +1,24 @@
+* Issue **#4781** : Fix NPE.
+
+
+```sh
+# ********************************************************************************
+# Issue title: Broken API compatability
+# Issue link:  https://github.com/gchq/stroom/issues/4781
+# ********************************************************************************
+
+# ONLY the top line will be included as a change entry in the CHANGELOG.
+# The entry should be in GitHub flavour markdown and should be written on a SINGLE
+# line with no hard breaks. You can have multiple change files for a single GitHub issue.
+# The  entry should be written in the imperative mood, i.e. 'Fix nasty bug' rather than
+# 'Fixed nasty bug'.
+#
+# Examples of acceptable entries are:
+#
+#
+# * Issue **123** : Fix bug with an associated GitHub issue in this repository
+#
+# * Issue **namespace/other-repo#456** : Fix bug with an associated GitHub issue in another repository
+#
+# * Fix bug with no associated GitHub issue.
+```