From 220a25a2566c90bc540e7190342f73824d2ff54a Mon Sep 17 00:00:00 2001 From: mravula Date: Mon, 31 Aug 2020 12:29:32 -0400 Subject: Raptor UI Changes, user profile, folder restructure Issue-ID: PORTAL-902 Change-Id: Ib76bb3fce7efe55504b75d2fc4764bafb9f8e908 Signed-off-by: mravula --- .../ngappsrc/src/app/pages/ext/profile/.gitignore | 2 - .../src/app/pages/ext/profile/profile.module.ts | 10 --- .../app/pages/ext/profile/profile.service.spec.ts | 78 ---------------------- .../src/app/pages/ext/profile/profile.service.ts | 69 ------------------- .../ngappsrc/src/app/pages/pages-routing.module.ts | 18 +---- .../ngappsrc/src/app/pages/pages.module.ts | 36 +++------- 6 files changed, 12 insertions(+), 201 deletions(-) delete mode 100644 ecomp-sdk/epsdk-app-os/ngappsrc/src/app/pages/ext/profile/.gitignore delete mode 100644 ecomp-sdk/epsdk-app-os/ngappsrc/src/app/pages/ext/profile/profile.module.ts delete mode 100644 ecomp-sdk/epsdk-app-os/ngappsrc/src/app/pages/ext/profile/profile.service.spec.ts delete mode 100644 ecomp-sdk/epsdk-app-os/ngappsrc/src/app/pages/ext/profile/profile.service.ts (limited to 'ecomp-sdk/epsdk-app-os/ngappsrc/src/app/pages') diff --git a/ecomp-sdk/epsdk-app-os/ngappsrc/src/app/pages/ext/profile/.gitignore b/ecomp-sdk/epsdk-app-os/ngappsrc/src/app/pages/ext/profile/.gitignore deleted file mode 100644 index 741b049d..00000000 --- a/ecomp-sdk/epsdk-app-os/ngappsrc/src/app/pages/ext/profile/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -search -self \ No newline at end of file diff --git a/ecomp-sdk/epsdk-app-os/ngappsrc/src/app/pages/ext/profile/profile.module.ts b/ecomp-sdk/epsdk-app-os/ngappsrc/src/app/pages/ext/profile/profile.module.ts deleted file mode 100644 index 9cffa3b3..00000000 --- a/ecomp-sdk/epsdk-app-os/ngappsrc/src/app/pages/ext/profile/profile.module.ts +++ /dev/null @@ -1,10 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; - -@NgModule({ - declarations: [], - imports: [ - CommonModule - ] -}) -export class ProfileModule { } diff --git a/ecomp-sdk/epsdk-app-os/ngappsrc/src/app/pages/ext/profile/profile.service.spec.ts b/ecomp-sdk/epsdk-app-os/ngappsrc/src/app/pages/ext/profile/profile.service.spec.ts deleted file mode 100644 index 70e8ac4b..00000000 --- a/ecomp-sdk/epsdk-app-os/ngappsrc/src/app/pages/ext/profile/profile.service.spec.ts +++ /dev/null @@ -1,78 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { ProfileService } from './profile.service'; -import { HttpClientTestingModule } from '@angular/common/http/testing'; -import { HttpClient } from '@angular/common/http'; -import { environment } from 'src/environments/environment'; - -describe('ProfileService', () => { - - let service: ProfileService; - - beforeEach(() => {TestBed.configureTestingModule({ - imports: [HttpClientTestingModule], - providers: [HttpClient, ProfileService] - }) - service = TestBed.get(ProfileService); -}); - - it('should be created', () => { - const service: ProfileService = TestBed.get(ProfileService); - expect(service).toBeTruthy(); - }); - - it('should get getUserPagination', () => { - service.getUserPagination().subscribe((resp) => { - expect(resp).toBe(environment.getUserPagination); - }); - }); - - it('should get getPostSearch', () => { - let test : any; - service.getPostSearch(test).subscribe((resp) => { - expect(resp).toBe(environment.postSearch); - }); - }); - - it('should get importUser', () => { - let test : any; - service.importUser(test).subscribe((resp) => { - expect(resp).toBe(environment.importSearch); - }); -}); - -it('should get getPostProfile', () => { - service.getPostProfile().subscribe((resp) => { - expect(resp).toBe(environment.getPostProfile); - }); -}); - -it('should get getSelfProfile', () => { - service.getSelfProfile().subscribe((resp) => { - expect(resp).toBe(environment.getSelfProfile); - }); -}); - -it('should get removeRole', () => { - let data, id; - service.removeRole(data, id).subscribe((resp) => { - expect(resp).toBe(environment.removeUserRole); - }); -}); - -it('should get addUserRole', () => { - let data, id; - service.addUserRole(data, id).subscribe((resp) => { - expect(resp).toBe(environment.addUserRole); - }); -}); - -it('should get toggleProfileActive', () => { - let data, id; - service.toggleProfileActive(id).subscribe((resp) => { - expect(resp).toBe(environment); - }); -}); - -}); - diff --git a/ecomp-sdk/epsdk-app-os/ngappsrc/src/app/pages/ext/profile/profile.service.ts b/ecomp-sdk/epsdk-app-os/ngappsrc/src/app/pages/ext/profile/profile.service.ts deleted file mode 100644 index 1c631347..00000000 --- a/ecomp-sdk/epsdk-app-os/ngappsrc/src/app/pages/ext/profile/profile.service.ts +++ /dev/null @@ -1,69 +0,0 @@ -import { Injectable } from '@angular/core'; -import { HttpClient, HttpHeaders } from '@angular/common/http'; -import { environment } from 'src/environments/environment'; - -@Injectable({ - providedIn: 'root' -}) -export class ProfileService { - - constructor(private http:HttpClient) { } - - getUserPagination(){ - return this.http.get(environment.getUserPagination); - } - - getAllUsers(){ - return this.http.get(environment.getAllUsers); - } - - getPostSearch(postSearchBean:any) - { - return this.http.post(environment.postSearch,JSON.stringify({postSearchBean: postSearchBean})); - - } - - importUser(postSearchBean:any) - { - return this.http.post(environment.importSearch,JSON.stringify({postSearchBean: postSearchBean})); - - } - - getPostProfile() - { - return this.http.get(environment.getPostProfile); - - } - - getSelfProfile() - { - return this.http.get(environment.getSelfProfile); - - } - - getProfileById(profileId){ - return this.http.get(environment.getProfileById+"?profile_id="+profileId); - } - - removeRole(data,profileId) - { - return this.http.post(environment.removeUserRole+'?profile_id='+profileId,JSON.stringify({role: data})); - } - - addUserRole(data,profileId) - { - return this.http.post(environment.addUserRole+'?profile_id='+profileId,JSON.stringify({role: data})); - } - - saveProfile(data,profileId) - { - return this.http.post(environment.saveProfile+'?profile_id='+profileId,JSON.stringify({profile: data.profile,selectedCountry:data.selectedCountry, selectedState:data.selectedState, selectedTimeZone:data.selectedTimeZone})); - - } - - toggleProfileActive(profileId){ - return this.http.get(environment.toggleProfileActive+profileId); - } - - -} diff --git a/ecomp-sdk/epsdk-app-os/ngappsrc/src/app/pages/pages-routing.module.ts b/ecomp-sdk/epsdk-app-os/ngappsrc/src/app/pages/pages-routing.module.ts index 20120d6c..fe38e10e 100644 --- a/ecomp-sdk/epsdk-app-os/ngappsrc/src/app/pages/pages-routing.module.ts +++ b/ecomp-sdk/epsdk-app-os/ngappsrc/src/app/pages/pages-routing.module.ts @@ -1,29 +1,15 @@ import {NgModule} from '@angular/core'; -import {Routes, RouterModule, ActivatedRoute} from '@angular/router'; -import {RoleFunctionsComponent} from '../admin/role-functions/role-functions.component'; -import {UsageComponent} from '../admin/usage/usage.component'; -import {CacheAdminComponent} from '../admin/cache-admin/cache-admin.component'; -import {RolesComponent} from '../admin/roles/roles.component'; -import {MenusComponent} from '../admin/menus/menus.component'; -import {SearchComponent} from './ext/profile/search/search.component'; -import {SelfComponent} from './ext/profile/self/self.component'; +import {Routes, RouterModule} from '@angular/router'; import {ReportComponent} from './analytics/Report_List/Report/report.component'; -import {RunReportComponent} from './analytics/Report_List/Report/run/run-report/run-report.component'; import {HeaderTabsWrapperComponent} from './analytics/Report_List/header-tabs-wrapper-component/header-tabs-wrapper.component'; -import {RunReportFormFieldsComponent} from './analytics/Report_List/Report/run/run-report-form-fields/run-report-form-fields.component'; + import {RefreshComponent} from './refresh/refresh.component'; const routes: Routes = [ - {path: 'userProfile', component: SearchComponent}, - {path: 'userProfile/self_profile', component: SelfComponent}, {path: 'report-list', component: ReportComponent}, {path: 'create', component: HeaderTabsWrapperComponent}, {path: 'reports/:reportMode/:reportId', component: HeaderTabsWrapperComponent}, - {path: 'run/:reportId', component: RunReportFormFieldsComponent}, - {path: 'run/:reportId/:queryParameters', component: RunReportFormFieldsComponent}, - {path: 'run/:reportId/:queryParameters/:groupSelectValue', component: RunReportFormFieldsComponent}, - {path: 'run', component: RunReportFormFieldsComponent}, {path: 'refresh', component: RefreshComponent}, ]; diff --git a/ecomp-sdk/epsdk-app-os/ngappsrc/src/app/pages/pages.module.ts b/ecomp-sdk/epsdk-app-os/ngappsrc/src/app/pages/pages.module.ts index fb5f8130..ca1297be 100644 --- a/ecomp-sdk/epsdk-app-os/ngappsrc/src/app/pages/pages.module.ts +++ b/ecomp-sdk/epsdk-app-os/ngappsrc/src/app/pages/pages.module.ts @@ -8,20 +8,15 @@ import {MaterialModule} from '../material-module'; import {NgbModule} from '@ng-bootstrap/ng-bootstrap'; import {MatTooltipModule} from '@angular/material/tooltip'; import {MatExpansionModule} from '@angular/material/expansion'; -import {SuccessModalComponent} from '../modals/success-modal/success-modal.component'; -import {ErrorModalComponent} from '../modals/error-modal/error-modal.component'; import {MatFormFieldModule} from '@angular/material/form-field'; -import {SearchComponent} from './ext/profile/search/search.component'; -import {SelfComponent} from './ext/profile/self/self.component'; import {DefinitionComponent} from './analytics/Report_List/Report/definition/definition.component'; import {MatTabsModule, MatGridListModule, MatCardModule, MatMenuModule, MatButtonModule} from '@angular/material'; import {SQLComponent} from './analytics/Report_List/Report/sql/sql.component'; import {ColumnsComponent} from './analytics/Report_List/Report/columns/columns.component'; -import {FormFieldsComponent, DialogOverviewExampleDialog} from './analytics/Report_List/Report/form-fields/form-fields.component'; +import {FormFieldsComponent, DialogOverviewExampleDialog, EditGroupDialog} from './analytics/Report_List/Report/form-fields/form-fields.component'; import {ChartWizardComponent} from './analytics/Report_List/Report/chart-wizard/chart-wizard.component'; import {SecurityComponent} from './analytics/Report_List/Report/security/security.component'; import {LogComponent} from './analytics/Report_List/Report/log/log.component'; -import {RunComponent} from './analytics/Report_List/Report/run/run.component'; import {MatButtonToggleModule} from '@angular/material/button-toggle'; import {DefinitionSaveDialogComponent} from './analytics/Report_List/Report/definition/definition-save-dialog/definition-save-dialog.component'; import {SQLSaveChangesDialogComponent} from './analytics/Report_List/Report/sql/sql-save-changes-dialog/sql-save-changes-dialog.component'; @@ -37,14 +32,10 @@ import {MatIconModule} from '@angular/material/icon'; import {ColumnsEditComponent} from './analytics/Report_List/Report/columns/columns-edit-component/columns-edit.component'; import {HeaderTabsComponent} from './analytics/Report_List/header-tabs-component/header-tabs.component'; import {ReportListComponent} from './analytics/Report_List/report-list.component'; -import {RunReportComponent} from './analytics/Report_List/Report/run/run-report/run-report.component'; import {HeaderTabsWrapperComponent} from './analytics/Report_List/header-tabs-wrapper-component/header-tabs-wrapper.component'; import {EditDrillDownLinkComponent} from './analytics/Report_List/Report/columns/columns-edit-component/edit-drill-down-link/edit-drill-down-link.component'; import {FormFieldsAddEditComponent} from './analytics/Report_List/Report/form-fields/form-fields-add-edit/form-fields-add-edit.component'; -import {RunReportFormFieldsComponent} from './analytics/Report_List/Report/run/run-report-form-fields/run-report-form-fields.component'; -import {RunReportResultSetComponent} from './analytics/Report_List/Report/run/run-report-result-set/run-report-result-set.component'; import {GridsterModule} from 'angular-gridster2'; -import {ConfirmationModalComponent } from '../modals/confirmation-modal/confirmation-modal.component'; import {LayoutModule} from '@angular/cdk/layout'; import {Ng6O2ChartModule} from 'ng6-o2-chart'; import {TagCloudModule} from 'angular-tag-cloud-module'; @@ -52,21 +43,16 @@ import {GoogleChartsModule} from 'angular-google-charts'; import {jqxChartModule} from 'jqwidgets-ng/jqxchart'; import {DashboardReportGridComponent} from './analytics/Report_List/Report/definition/dashboard-report-grid/dashboard-report-grid.component'; import {DataChartComponent} from './analytics/Report_List/Report/definition/dashboard-report-grid/data-chart/data-chart.component'; -import {RunDashboardReportComponent} from './analytics/Report_List/Report/run/run-report/run-dashboard-report/run-dashboard-report.component'; import {NumbersOnlyDirective} from './analytics/Report_List/Report/chart-wizard/numbers-only.directive'; import {ColumnAdvancedDisplayComponent} from './analytics/Report_List/Report/columns/columns-edit-component/column-advanced-display/column-advanced-display.component'; import {RdpModule} from 'portalsdk-tag-lib'; import {RefreshComponent} from './refresh/refresh.component'; +import {ReportRun} from '../report-run/report-run.module'; @NgModule({ declarations: [ PagesComponent, - SearchComponent, - ConfirmationModalComponent, - SelfComponent, - SuccessModalComponent, - ErrorModalComponent, DefinitionComponent, SQLComponent, ColumnsComponent, @@ -74,7 +60,6 @@ import {RefreshComponent} from './refresh/refresh.component'; ChartWizardComponent, SecurityComponent, LogComponent, - RunComponent, DefinitionSaveDialogComponent, SQLSaveChangesDialogComponent, SQLValidateChangesDialogComponent, @@ -85,17 +70,16 @@ import {RefreshComponent} from './refresh/refresh.component'; ColumnsEditComponent, HeaderTabsComponent, ReportListComponent, - RunReportComponent, HeaderTabsWrapperComponent, EditDrillDownLinkComponent, FormFieldsAddEditComponent, - RunReportFormFieldsComponent, - RunReportResultSetComponent, - DashboardReportGridComponent, DataChartComponent, RunDashboardReportComponent, + DashboardReportGridComponent, + DataChartComponent, DialogOverviewExampleDialog, ColumnAdvancedDisplayComponent, NumbersOnlyDirective, - RefreshComponent + RefreshComponent, + EditGroupDialog ], imports: [ CommonModule, @@ -131,11 +115,11 @@ import {RefreshComponent} from './refresh/refresh.component'; GoogleChartsModule.forRoot(), GridsterModule, jqxChartModule, - RdpModule - ], - entryComponents: [DialogOverviewExampleDialog, SuccessModalComponent, ErrorModalComponent, SelfComponent, ConfirmationModalComponent], - exports: [ + RdpModule, + ReportRun ], + entryComponents: [DialogOverviewExampleDialog,EditGroupDialog], + exports: [], providers: [] }) -- cgit 1.2.3-korg