restore viewer/v2

4 files changed, 42 insertions, 41 deletions

diff --git a/ydb/core/viewer/json_handlers.h b/ydb/core/viewer/json_handlers.h
index cb70522c8da..526c671d013 100644
--- a/ydb/core/viewer/json_handlers.h
+++ b/ydb/core/viewer/json_handlers.h
@@ -52,6 +52,9 @@ struct TJsonHandlers {
     void Handle(IViewer* viewer, NMon::TEvHttpInfo::TPtr &ev, const TActorContext &ctx) {
         NMon::TEvHttpInfo* msg = ev->Get();
         auto itJson = JsonHandlers.find(msg->Request.GetPage()->Path + msg->Request.GetPathInfo());
+        if (itJson == JsonHandlers.end()) {
+            itJson = JsonHandlers.find(msg->Request.GetPathInfo());
+        }
         if (itJson != JsonHandlers.end()) {
             try {
                 ctx.ExecutorThread.RegisterActor(itJson->second->CreateRequestActor(viewer, ev));
@@ -108,8 +111,8 @@ struct TVDiskTagInfo {
     static constexpr auto TagName = "vdisk";
 };
 
-using TViewerJsonHadlers = TJsonHandlers<TViewerTagInfo>;
-using TVDiskJsonHadlers = TJsonHandlers<TVDiskTagInfo>;
+using TViewerJsonHandlers = TJsonHandlers<TViewerTagInfo>;
+using TVDiskJsonHandlers = TJsonHandlers<TVDiskTagInfo>;
 
 
 }
diff --git a/ydb/core/viewer/json_handlers_vdisk.cpp b/ydb/core/viewer/json_handlers_vdisk.cpp
index 762cff0c2c7..4684d8a2ffa 100644
--- a/ydb/core/viewer/json_handlers_vdisk.cpp
+++ b/ydb/core/viewer/json_handlers_vdisk.cpp
@@ -7,7 +7,7 @@
 namespace NKikimr::NViewer {
 
 template <>
-void TVDiskJsonHadlers::Init() {
+void TVDiskJsonHandlers::Init() {
     JsonHandlers["vdisk/json/vdiskstat"] = new TJsonHandler<TJsonVDiskStat>;
     JsonHandlers["vdisk/json/getblob"] = new TJsonHandler<TJsonGetBlob>;
 }
diff --git a/ydb/core/viewer/json_handlers_viewer.cpp b/ydb/core/viewer/json_handlers_viewer.cpp
index e8997f32dc5..a564147bb98 100644
--- a/ydb/core/viewer/json_handlers_viewer.cpp
+++ b/ydb/core/viewer/json_handlers_viewer.cpp
@@ -38,39 +38,37 @@
 namespace NKikimr::NViewer {
 
 template <>
-void TViewerJsonHadlers::Init() {
-    JsonHandlers["viewer/json/nodelist"] = new TJsonHandler<TJsonNodeList>;
-    JsonHandlers["viewer/json/nodeinfo"] = new TJsonHandler<TJsonNodeInfo>;
-    JsonHandlers["viewer/json/vdiskinfo"] = new TJsonHandler<TJsonVDiskInfo>;
-    JsonHandlers["viewer/json/pdiskinfo"] = new TJsonHandler<TJsonPDiskInfo>;
-    JsonHandlers["viewer/json/describe"] = new TJsonHandler<TJsonDescribe>;
-    JsonHandlers["viewer/json/hotkeys"] = new TJsonHandler<TJsonHotkeys>;
-    JsonHandlers["viewer/json/sysinfo"] = new TJsonHandler<TJsonSysInfo>;
-    JsonHandlers["viewer/json/tabletinfo"] = new TJsonHandler<TJsonTabletInfo>;
-    JsonHandlers["viewer/json/hiveinfo"] = new TJsonHandler<TJsonHiveInfo>;
-    JsonHandlers["viewer/json/bsgroupinfo"] = new TJsonHandler<TJsonBSGroupInfo>;
-    JsonHandlers["viewer/json/bscontrollerinfo"] = new TJsonHandler<TJsonBSControllerInfo>;
-    JsonHandlers["viewer/json/config"] = new TJsonHandler<TJsonConfig>;
-    JsonHandlers["viewer/json/counters"] = new TJsonHandler<TJsonCounters>;
-    JsonHandlers["viewer/json/topicinfo"] = new TJsonHandler<TJsonTopicInfo>;
-    JsonHandlers["viewer/json/pqconsumerinfo"] = new TJsonHandler<TJsonPQConsumerInfo>();
-    JsonHandlers["viewer/json/tabletcounters"] = new TJsonHandler<TJsonTabletCounters>;
-    JsonHandlers["viewer/json/storage"] = new TJsonHandler<TJsonStorage>;
-    JsonHandlers["viewer/json/metainfo"] = new TJsonHandler<TJsonMetaInfo>;
-    JsonHandlers["viewer/json/browse"] = new TJsonHandler<TJsonBrowse>;
-    JsonHandlers["viewer/json/cluster"] = new TJsonHandler<TJsonCluster>;
-    JsonHandlers["viewer/json/content"] = new TJsonHandler<TJsonContent>;
-    JsonHandlers["viewer/json/labeledcounters"] = new TJsonHandler<TJsonLabeledCounters>;
-    JsonHandlers["viewer/json/tenants"] = new TJsonHandler<TJsonTenants>;
-    JsonHandlers["viewer/json/hivestats"] = new TJsonHandler<TJsonHiveStats>;
-    JsonHandlers["viewer/json/tenantinfo"] = new TJsonHandler<TJsonTenantInfo>;
-    JsonHandlers["viewer/json/whoami"] = new TJsonHandler<TJsonWhoAmI>;
-    JsonHandlers["viewer/json/query"] = new TJsonHandler<TJsonQuery>;
-    JsonHandlers["viewer/json/netinfo"] = new TJsonHandler<TJsonNetInfo>;
-    JsonHandlers["viewer/json/compute"] = new TJsonHandler<TJsonCompute>;
-    JsonHandlers["viewer/json/healthcheck"] = new TJsonHandler<TJsonHealthCheck>;
-    JsonHandlers["viewer/json/nodes"] = new TJsonHandler<TJsonNodes>;
-    JsonHandlers["viewer/json/acl"] = new TJsonHandler<TJsonACL>;
-}
-
-}
+void TViewerJsonHandlers::Init() {
+    JsonHandlers["/json/nodelist"] = new TJsonHandler<TJsonNodeList>;
+    JsonHandlers["/json/nodeinfo"] = new TJsonHandler<TJsonNodeInfo>;
+    JsonHandlers["/json/vdiskinfo"] = new TJsonHandler<TJsonVDiskInfo>;
+    JsonHandlers["/json/pdiskinfo"] = new TJsonHandler<TJsonPDiskInfo>;
+    JsonHandlers["/json/describe"] = new TJsonHandler<TJsonDescribe>;
+    JsonHandlers["/json/hotkeys"] = new TJsonHandler<TJsonHotkeys>;
+    JsonHandlers["/json/sysinfo"] = new TJsonHandler<TJsonSysInfo>;
+    JsonHandlers["/json/tabletinfo"] = new TJsonHandler<TJsonTabletInfo>;
+    JsonHandlers["/json/hiveinfo"] = new TJsonHandler<TJsonHiveInfo>;
+    JsonHandlers["/json/bsgroupinfo"] = new TJsonHandler<TJsonBSGroupInfo>;
+    JsonHandlers["/json/bscontrollerinfo"] = new TJsonHandler<TJsonBSControllerInfo>;
+    JsonHandlers["/json/config"] = new TJsonHandler<TJsonConfig>;
+    JsonHandlers["/json/counters"] = new TJsonHandler<TJsonCounters>;
+    JsonHandlers["/json/topicinfo"] = new TJsonHandler<TJsonTopicInfo>;
+    JsonHandlers["/json/pqconsumerinfo"] = new TJsonHandler<TJsonPQConsumerInfo>();
+    JsonHandlers["/json/tabletcounters"] = new TJsonHandler<TJsonTabletCounters>;
+    JsonHandlers["/json/storage"] = new TJsonHandler<TJsonStorage>;
+    JsonHandlers["/json/metainfo"] = new TJsonHandler<TJsonMetaInfo>;
+    JsonHandlers["/json/browse"] = new TJsonHandler<TJsonBrowse>;
+    JsonHandlers["/json/cluster"] = new TJsonHandler<TJsonCluster>;
+    JsonHandlers["/json/content"] = new TJsonHandler<TJsonContent>;
+    JsonHandlers["/json/labeledcounters"] = new TJsonHandler<TJsonLabeledCounters>;
+    JsonHandlers["/json/tenants"] = new TJsonHandler<TJsonTenants>;
+    JsonHandlers["/json/hivestats"] = new TJsonHandler<TJsonHiveStats>;
+    JsonHandlers["/json/tenantinfo"] = new TJsonHandler<TJsonTenantInfo>;
+    JsonHandlers["/json/whoami"] = new TJsonHandler<TJsonWhoAmI>;
+    JsonHandlers["/json/query"] = new TJsonHandler<TJsonQuery>;
+    JsonHandlers["/json/netinfo"] = new TJsonHandler<TJsonNetInfo>;
+    JsonHandlers["/json/compute"] = new TJsonHandler<TJsonCompute>;
+    JsonHandlers["/json/healthcheck"] = new TJsonHandler<TJsonHealthCheck>;
+    JsonHandlers["/json/nodes"] = new TJsonHandler<TJsonNodes>;
+    JsonHandlers["/json/acl"] = new TJsonHandler<TJsonACL>;
+}}
diff --git a/ydb/core/viewer/viewer.cpp b/ydb/core/viewer/viewer.cpp
index 62d81ba4629..d171e6a684e 100644
--- a/ydb/core/viewer/viewer.cpp
+++ b/ydb/core/viewer/viewer.cpp
@@ -168,8 +168,8 @@ public:
     }
 
 private:
-    TViewerJsonHadlers ViewerJsonHandlers;
-    TVDiskJsonHadlers VDiskJsonHandlers;
+    TViewerJsonHandlers ViewerJsonHandlers;
+    TVDiskJsonHandlers VDiskJsonHandlers;
     THashMap<TString, TAutoPtr<TJsonHandlerBase>> JsonHandlers;
     const TKikimrRunConfig KikimrRunConfig;
     std::unordered_multimap<NKikimrViewer::EObjectType, TVirtualHandler> VirtualHandlersByParentType;