From 03958cf113eb51cf3c92b538ec0f2d0519ffba44 Mon Sep 17 00:00:00 2001 From: "Kumar, Sudarshan (sk670p)" Date: Tue, 5 Jan 2021 14:23:35 +0530 Subject: Removed import and added MatInputModule Removed component import from child module and added MatInputModule Issue-ID: PORTAL-902 Change-Id: I5c51f954e1a9d2ac3a61c57c1b089a86b527e29d Signed-off-by: Sudarshan Kumar --- .../java/org/onap/portalsdk/analytics/model/ReportLoader.java | 2 +- .../src/main/webapp/ngapp/src/app/admin/admin.module.ts | 11 ++++++----- .../main/webapp/ngapp/src/app/report-run/report-run.module.ts | 4 +++- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/ReportLoader.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/ReportLoader.java index d3c21b6f..ae2e2184 100644 --- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/ReportLoader.java +++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/ReportLoader.java @@ -491,7 +491,7 @@ public class ReportLoader extends org.onap.portalsdk.analytics.RaptorObject { //link.append(AppUtils.getReportExecuteActionURLNG() + "c_master=" + ds.getString(i, 0)); //if (b) //link.append("&PAGE_ID=" + menuId + "&refresh=Y"); - link.append("v2/app/run/"+ ds.getString(i, 0)); + link.append("v2/run/"+ ds.getString(i, 0)); quickLink.setReportURL(link.toString()); quickLink.setReportName(ds.getString(i, 1)); quickLink.setShowDescr(Globals.getShowDescrAtRuntime()); diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/admin/admin.module.ts b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/admin/admin.module.ts index 1d7b9ba6..ac0b26b8 100644 --- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/admin/admin.module.ts +++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/admin/admin.module.ts @@ -8,6 +8,7 @@ import {MatSortModule} from '@angular/material/sort'; import { MatExpansionModule, MatFormFieldModule, + MatInputModule, MatPaginatorModule, MatRadioModule, MatSlideToggleModule, @@ -21,10 +22,9 @@ import {NewRoleComponent} from './roles/new-role/new-role.component'; import {MenusComponent} from './menus/menus.component'; import {NewMenuComponent} from './menus/new-menu/new-menu.component'; import {NewRoleFunctionComponent} from './role-functions/new-role-function/new-role-function.component'; -import { InformationModalComponent } from '../modals/information-modal/information-modal.component'; @NgModule({ - declarations: [AdminComponent, CacheAdminComponent, RoleFunctionsComponent, RolesComponent, NewRoleComponent, MenusComponent, NewMenuComponent, NewRoleFunctionComponent, UsageComponent, InformationModalComponent], + declarations: [AdminComponent, CacheAdminComponent, RoleFunctionsComponent, RolesComponent, NewRoleComponent, MenusComponent, NewMenuComponent, NewRoleFunctionComponent, UsageComponent], imports: [ CommonModule, FormsModule, @@ -32,12 +32,13 @@ import { InformationModalComponent } from '../modals/information-modal/informati RdpModule, AdminRouting, MatExpansionModule, - MatFormFieldModule, + MatFormFieldModule, + MatInputModule, MatTableModule, MatSlideToggleModule, MatPaginatorModule, - MatSortModule + MatSortModule, ], - entryComponents: [NewRoleComponent, InformationModalComponent] + entryComponents: [NewRoleComponent] }) export class AdminModule { } diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/report-run/report-run.module.ts b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/report-run/report-run.module.ts index 920379a8..77e05dce 100644 --- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/report-run/report-run.module.ts +++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/report-run/report-run.module.ts @@ -26,6 +26,7 @@ import {ReportRunRouting} from './report-run-routing.module'; import {NgbTooltipModule} from '@ng-bootstrap/ng-bootstrap'; import { RemoveSpaceDirective} from './run/run-report-form-fields/remove-space.directive'; import { RunCrossTabReportComponent } from './run/run-report/run-cross-tab-report/run-cross-tab-report.component'; +import { DisplayAreaComponent } from '../pages/analytics/Report_List/display-area/display-area.component'; @NgModule({ declarations: [RunDashboardReportComponent, @@ -35,7 +36,8 @@ import { RunCrossTabReportComponent } from './run/run-report/run-cross-tab-repor RunReportResultSetComponent, RunComponent, RemoveSpaceDirective, - RunCrossTabReportComponent], + RunCrossTabReportComponent, + DisplayAreaComponent], imports: [ MatTableModule, CommonModule, -- cgit 1.2.3-korg