Merge 126278f into 4f53f25

Author: adameat

ydb/core/viewer/json_wb_req.h

@@ -38,7 +38,23 @@ class TJsonWhiteboardRequest : public TWhiteboardRequest<TRequestEventType, TRes
 
     void Bootstrap() override {
         const auto& params(Event->Get()->Request.GetParams());
-        SplitIds(params.Get("node_id"), ',', TBase::RequestSettings.FilterNodeIds);
+        std::vector<TNodeId> nodeIds;
+        SplitIds(params.Get("node_id"), ',', nodeIds);
+        if (!nodeIds.empty()) {
+            if (TBase::RequestSettings.FilterNodeIds.empty()) {
+                TBase::RequestSettings.FilterNodeIds = nodeIds;
+            } else {
+                std::sort(nodeIds.begin(), nodeIds.end());
+                std::sort(TBase::RequestSettings.FilterNodeIds.begin(), TBase::RequestSettings.FilterNodeIds.end());
+                std::vector<TNodeId> intersection;
+                std::set_intersection(nodeIds.begin(), nodeIds.end(), TBase::RequestSettings.FilterNodeIds.begin(), TBase::RequestSettings.FilterNodeIds.end(), std::back_inserter(intersection));
+                if (intersection.empty()) {
+                    TBase::RequestSettings.FilterNodeIds = {0};
+                } else {
+                    TBase::RequestSettings.FilterNodeIds = intersection;
+                }
+            }
+        }
         {
             TString merge = params.Get("merge");
             if (merge.empty() || merge == "1" || merge == "true") {

ydb/core/viewer/viewer_tabletinfo.h

@@ -82,12 +82,13 @@ class TJsonTabletInfo : public TJsonWhiteboardRequest<TEvWhiteboard::TEvTabletSt
     }
 
     void Bootstrap() override {
-        BLOG_TRACE("Bootstrap()");
+        if (NeedToRedirect()) {
+            return;
+        }
         const auto& params(Event->Get()->Request.GetParams());
         TBase::RequestSettings.Timeout = FromStringWithDefault<ui32>(params.Get("timeout"), 10000);
-        TString database = params.Get("database");
-        if (database) {
-            RegisterWithSameMailbox(CreateBoardLookupActor(MakeEndpointsBoardPath(database), TBase::SelfId(), EBoardLookupMode::Second));
+        if (Database) {
+            RegisterWithSameMailbox(CreateBoardLookupActor(MakeEndpointsBoardPath(Database), TBase::SelfId(), EBoardLookupMode::Second));
             Become(&TThis::StateRequestedLookup, TDuration::MilliSeconds(TBase::RequestSettings.Timeout), new TEvents::TEvWakeup());
             return;
         }