refactor: reports module (#1227)

Fixes: #1196
2020-08-26 01:53:10 +05:30
parent efdd779aa9
commit 0f83739080
19 changed files with 206 additions and 200 deletions
@@ -33,35 +33,20 @@ const routes: Routes = [
      children: [
        {
          path: '',
-          component: ReportsComponent,
+          component: ReportsComponent
        },
        {
          path: ':filter',
          data: { routeParamBreadcrumb: 'filter' },
-          component: ReportsComponent,
-        }
-      ]
-    },
-    {
-      path: 'run-report',
-      data: { title: extract('Reports'), breadcrumb: 'Reports' },
-      children: [
-        {
-          path: '',
-          redirectTo: '/reports', pathMatch: 'full'
+          component: ReportsComponent
        },
        {
-          path: ':report-name/:report-type/:report-id',
-          data: { title: extract('Run Report'), routeParamBreadcrumb: 'report-name' },
-          children: [
-            {
-              path: '',
-              component: RunReportComponent,
-              resolve: {
-                params: RunReportResolver
-              }
-            }
-          ]
+          path: 'run/:name',
+          data: { title: extract('Reports'), routeParamBreadcrumb: 'name' },
+          component: RunReportComponent,
+          resolve: {
+            reportParameters: RunReportResolver
+          }
        }
      ]
    },