diff --git a/sysom_server/sysom_diagnosis/apps/task/urls.py b/sysom_server/sysom_diagnosis/apps/task/urls.py index e4c02130..fac45c12 100644 --- a/sysom_server/sysom_diagnosis/apps/task/urls.py +++ b/sysom_server/sysom_diagnosis/apps/task/urls.py @@ -16,7 +16,6 @@ router.register('tasks', views.TaskAPIView) urlpatterns = [ path('api/v1/tasks/offline_import/', views.TaskAPIView.as_view({'post': 'offline_import'})), path('api/v1/tasks/host/', views.TaskAPIView.as_view({'get': 'get_host'})), - path('api/v1/', include(router.urls)), path('api/v2/tasks/', views.TaskAPIView.as_view({'post': 'create_task_v2'})), path('api/v1/tasks/health_check/', views.TaskAPIView.as_view({'get': 'health_check'})), path('api/v1/', include(router.urls)), diff --git a/sysom_web/src/app.jsx b/sysom_web/src/app.jsx index e2e88e5f..a9baac7c 100644 --- a/sysom_web/src/app.jsx +++ b/sysom_web/src/app.jsx @@ -154,28 +154,30 @@ export function patchRoutes({ routes }) { let diagnose = routes.find((item) => item.path == "/") .routes.find(item => item.name == "diagnose") - // Add forder - extraDiagnoseRoute.map(item => { - if (!_.keyBy(diagnose.routes, 'path')[item.path]) { - // Add forder if not exist - diagnose.routes = diagnose.routes.concat({ - ...item, - routes: [] - }) - } - }) + if (!!diagnose) { + // Add forder + extraDiagnoseRoute.map(item => { + if (!_.keyBy(diagnose.routes, 'path')[item.path]) { + // Add forder if not exist + diagnose.routes = diagnose.routes.concat({ + ...item, + routes: [] + }) + } + }) - //Add The extraDiagnoseRoute in it. - diagnose.routes.map(item => { - const new_routes = _.keyBy(extraDiagnoseRoute, 'path')[item.path]?.routes - if (item.routes && new_routes) { - item.routes = item.routes.concat(new_routes); + //Add The extraDiagnoseRoute in it. + diagnose.routes.map(item => { + const new_routes = _.keyBy(extraDiagnoseRoute, 'path')[item.path]?.routes + if (item.routes && new_routes) { + item.routes = item.routes.concat(new_routes); - } - if (!item.routes && new_routes) { - item.routes = new_routes - } - }) + } + if (!item.routes && new_routes) { + item.routes = new_routes + } + }) + } } import grafanaDash from './pages/Monitor/grafana'