Merge pull request #697 from bcgov/olex

DSS-360, DSS-362:: Manage and add Platforms List - FE Development

Author: OleksandrBohuslavskyi

frontend/src/app/app.routes.ts

@@ -9,7 +9,7 @@ import { PageNotFoundComponent } from './common/components/page-not-found/page-n
 import { approvedUserGuard } from './common/guards/approved-user.guard';
 import { activeUserGuard } from './common/guards/active-user.guard';
 import { accessRequestTokenGuard } from './common/guards/access-request-token.guard';
-import { licence_file_upload, listing_file_upload, listing_read, role_read, role_write, takedown_action, upload_history_read, user_read, user_write } from './common/consts/permissions.const';
+import { licence_file_upload, listing_file_upload, listing_read, platform_write, role_read, role_write, takedown_action, upload_history_read, user_read, user_write } from './common/consts/permissions.const';
 import { hasPermissionsGuard } from './common/guards/has-permissions.guard';
 import { TermsAndConditionsComponent } from './common/components/terms-and-conditions/terms-and-conditions.component';
 import { areTermsAceptedGuard } from './common/guards/are-terms-acepted.guard';
@@ -26,6 +26,11 @@ import { ExportListingsComponent } from './features/components/export-listings/e
 import { UploadBusinessLicenseComponent } from './features/components/upload-business-license/upload-business-license.component';
 import { AggregatedListingsTableComponent } from './features/components/listings-table/aggregated-listings-table/aggregated-listings-table.component';
 import { AddApsUserComponent } from './features/components/user-management/add-aps-user/add-aps-user.component';
+import { PlatformManagementComponent } from './features/components/platform-management/platform-management.component';
+import { AddNewPlatformComponent } from './features/components/platform-management/add-new-platform/add-new-platform.component';
+import { AddSubPlatformComponent } from './features/components/platform-management/add-sub-platform/add-sub-platform.component';
+import { EditPlatformComponent } from './features/components/platform-management/edit-platform/edit-platform.component';
+import { ViewPlatformComponent } from './features/components/platform-management/view-platform/view-platform.component';
 
 export const routes: Routes = [
     {
@@ -108,6 +113,42 @@ export const routes: Routes = [
         component: UserManagementComponent,
         data: { permissions: [user_write] }
     },
+    {
+        path: 'user-management',
+        canActivate: [approvedUserGuard, activeUserGuard, hasPermissionsGuard, areTermsAceptedGuard],
+        component: UserManagementComponent,
+        data: { permissions: [user_write] }
+    },
+    {
+        path: 'platform-management',
+        canActivate: [approvedUserGuard, activeUserGuard, hasPermissionsGuard, areTermsAceptedGuard],
+        component: PlatformManagementComponent,
+        data: { permissions: [platform_write] }
+    },
+    {
+        path: 'add-new-platform',
+        canActivate: [approvedUserGuard, activeUserGuard, hasPermissionsGuard, areTermsAceptedGuard],
+        component: AddNewPlatformComponent,
+        data: { permissions: [platform_write] }
+    },
+    {
+        path: 'add-sub-platform',
+        canActivate: [approvedUserGuard, activeUserGuard, hasPermissionsGuard, areTermsAceptedGuard],
+        component: AddSubPlatformComponent,
+        data: { permissions: [platform_write] }
+    },
+    {
+        path: 'edit-platform',
+        canActivate: [approvedUserGuard, activeUserGuard, hasPermissionsGuard, areTermsAceptedGuard],
+        component: EditPlatformComponent,
+        data: { permissions: [platform_write] }
+    },
+    {
+        path: 'platform/:id',
+        canActivate: [approvedUserGuard, activeUserGuard, hasPermissionsGuard, areTermsAceptedGuard],
+        component: ViewPlatformComponent,
+        data: { permissions: [platform_write] }
+    },
     {
         path: 'user/:id',
         canActivate: [approvedUserGuard, activeUserGuard, hasPermissionsGuard, areTermsAceptedGuard],

frontend/src/app/common/models/platform.ts

@@ -0,0 +1,31 @@
+export interface Platform {
+    id?: string;
+    organizationId: number;
+    organizationType: string;
+    organizationCd: string;
+    organizationNm: string;
+    updDtm: string;
+    isActive: boolean;
+    updUserGuid: string;
+    primaryNoticeOfTakedownContactId: number;
+    primaryNoticeOfTakedownContactEmail: string;
+    primaryTakedownRequestContactId: number;
+    primaryTakedownRequestContactEmail: string;
+    secondaryNoticeOfTakedownContactId: number;
+    secondaryNoticeOfTakedownContactEmail: string;
+    secondaryTakedownRequestContactId: number;
+    secondaryTakedownRequestContactEmail: string;
+    subsidiaries: Array<Platform>;
+    platformType: string;
+}
+
+export interface PlatformCreate {
+    organizationCd: string;
+    organizationNm: string;
+    isActive: boolean;
+    platformType: string;
+    primaryNoticeOfTakedownContactEmail: string;
+    primaryTakedownRequestContactEmail: string;
+    secondaryNoticeOfTakedownContactEmail: string;
+    secondaryTakedownRequestContactEmail: string;
+}

frontend/src/app/common/services/dashboard.service.ts

@@ -140,12 +140,10 @@ export class DashboardService {
         buttonIcon: '',
         buttonText: 'Manage Platforms',
         description: 'Manage platform information',
-        route: '/',
+        route: '/platform-management',
         boxId: 'platformManagement_box',
         buttonId: 'platformManagement_btn',
         section: 'admin',
-        isButtonDisabled: true,
-        isComingSoon: true,
       },
       {
         title: 'Guidance for Local Government',

frontend/src/app/common/services/organization.service.spec.ts

@@ -0,0 +1,16 @@
+import { TestBed } from '@angular/core/testing';
+
+import { OrganizationService } from './organization.service';
+
+xdescribe('OrganizationService', () => {
+  let service: OrganizationService;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+    service = TestBed.inject(OrganizationService);
+  });
+
+  it('should be created', () => {
+    expect(service).toBeTruthy();
+  });
+});

frontend/src/app/common/services/organization.service.ts

@@ -0,0 +1,54 @@
+import { Injectable } from '@angular/core';
+import { DropdownOption } from '../models/dropdown-option';
+import { environment } from '../../../environments/environment';
+import { HttpClient } from '@angular/common/http';
+import { Observable } from 'rxjs';
+import { Platform } from '../models/platform';
+import { PagingResponse } from '../models/paging-response';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class OrganizationService {
+
+  constructor(private httpClient: HttpClient) { }
+
+  getOrganizationTypes(): Observable<Array<DropdownOption>> {
+    return this.httpClient.get<Array<DropdownOption>>(`${environment.API_HOST}/organizations/types`);
+  }
+
+  getOrganizations(type?: string): Observable<Array<DropdownOption>> {
+    if (type) {
+      return this.httpClient.get<Array<DropdownOption>>(`${environment.API_HOST}/organizations?type=${type}`);
+    } else {
+      return this.httpClient.get<Array<DropdownOption>>(`${environment.API_HOST}/organizations`);
+    }
+  }
+
+  getPlatforms(pageSize = 1000, pageNumber = 1, orderBy?: string, direction?: 'asc'): Observable<PagingResponse<Platform>> {
+
+    let url = `${environment.API_HOST}/organizations/platforms?pageSize=${pageSize}&pageNumber=${pageNumber}`;
+
+    if (orderBy) {
+      url += `&orderBy=${orderBy}&direction=${direction || 'asc'}`;
+    }
+
+    return this.httpClient.get<PagingResponse<Platform>>(url);
+  }
+
+  getPlatform(id: number): Observable<Platform> {
+    return this.httpClient.get<Platform>(`${environment.API_HOST}/organizations/platform/${id}`);
+  }
+
+  addPlatform(platform: Platform): Observable<Platform> {
+    return this.httpClient.post<Platform>(`${environment.API_HOST}/organizations/platforms`, platform);
+  }
+
+  addSubPlatform(platform: Platform, parentId: number): Observable<Platform> {
+    return this.httpClient.post<Platform>(`${environment.API_HOST}/organizations/platform/${parentId}`, platform);
+  }
+
+  editPlatform(platform: Platform): Observable<Platform> {
+    return this.httpClient.put<Platform>(`${environment.API_HOST}/organizations/platform`, platform);
+  }
+}

frontend/src/app/common/services/request-access.service.ts

@@ -13,18 +13,6 @@ export class RequestAccessService {
 
   constructor(private httpClient: HttpClient) { }
 
-  getOrganizationTypes(): Observable<Array<DropdownOption>> {
-    return this.httpClient.get<Array<DropdownOption>>(`${environment.API_HOST}/organizations/types`);
-  }
-
-  getOrganizations(type?: string): Observable<Array<DropdownOption>> {
-    if (type) {
-      return this.httpClient.get<Array<DropdownOption>>(`${environment.API_HOST}/organizations?type=${type}`);
-    } else {
-      return this.httpClient.get<Array<DropdownOption>>(`${environment.API_HOST}/organizations`);
-    }
-  }
-
   createAccessRequest(body: AccessRequest): Observable<unknown> {
     return this.httpClient.post<unknown>(`${environment.API_HOST}/users/accessrequests`, body);
   }

frontend/src/app/common/services/top-menu.service.ts

@@ -142,7 +142,6 @@ export class TopMenuService {
         accessPermission: platform_write,
         buttonId: 'platformManagement_mi_btn',
         route: '/platform-management',
-        disabled: true,
         title: 'Manage Platforms',
         folderName: 'Admin Tools',
       },

frontend/src/app/features/components/access-request/access-request.component.ts

@@ -13,6 +13,7 @@ import { AccessRequest } from '../../../common/models/access-request';
 import { UserDataService } from '../../../common/services/user-data.service';
 import { GlobalLoaderService } from '../../../common/services/global-loader.service';
 import { forkJoin } from 'rxjs';
+import { OrganizationService } from '../../../common/services/organization.service';
 
 @Component({
   selector: 'app-access-request',
@@ -51,6 +52,7 @@ export class AccessRequestComponent implements OnInit {
   constructor(
     private fb: FormBuilder,
     private requestAccessService: RequestAccessService,
+    private organizationsService: OrganizationService,
     private userDataService: UserDataService,
     private loaderService: GlobalLoaderService,
     private cd: ChangeDetectorRef,
@@ -111,7 +113,7 @@ export class AccessRequestComponent implements OnInit {
   private initData(): void {
     this.loaderService.loadingStart();
     const getCurrentUser = this.userDataService.getCurrentUser();
-    const getOrgs = this.requestAccessService.getOrganizationTypes();
+    const getOrgs = this.organizationsService.getOrganizationTypes();
 
     forkJoin([getCurrentUser, getOrgs]).subscribe({
       next: ([user, types]) => {

frontend/src/app/features/components/listings-table/aggregated-listings-table/aggregated-listings-table.component.ts

@@ -17,7 +17,7 @@ import { TooltipModule } from 'primeng/tooltip';
 import { ListingDetailsComponent } from '../listing-details/listing-details.component';
 import { ListingFilter } from '../../../../common/models/listing-filter';
 import { environment } from '../../../../../environments/environment';
-import { PagingResponse, PagingResponsePageInfo } from '../../../../common/models/paging-response';
+import { PagingResponsePageInfo } from '../../../../common/models/paging-response';
 import {
     DropdownOption,
     DropdownOptionOrganization,
@@ -29,12 +29,12 @@ import {
 import { ListingDataService } from '../../../../common/services/listing-data.service';
 import { FilterPersistenceService } from '../../../../common/services/filter-persistence.service';
 import { GlobalLoaderService } from '../../../../common/services/global-loader.service';
-import { RequestAccessService } from '../../../../common/services/request-access.service';
 import { SelectedListingsStateService } from '../../../../common/services/selected-listings-state.service';
 import { UserDataService } from '../../../../common/services/user-data.service';
 import { User } from '../../../../common/models/user';
 import { ListingSearchRequest } from '../../../../common/models/listing-search-request';
 import { ListingDetails } from '../../../../common/models/listing-details';
+import { OrganizationService } from '../../../../common/services/organization.service';
 
 @Component({
     selector: 'app-aggregated-listings-table',
@@ -88,13 +88,13 @@ export class AggregatedListingsTableComponent implements OnInit {
         private listingService: ListingDataService,
         private userService: UserDataService,
         private router: Router,
-        private requestAccessService: RequestAccessService,
+        private organizationsService: OrganizationService,
         private searchStateService: SelectedListingsStateService,
         private route: ActivatedRoute,
         private loaderService: GlobalLoaderService,
         private cd: ChangeDetectorRef,
         private filterPersistenceService: FilterPersistenceService,
-    ) {}
+    ) { }
 
     ngOnInit(): void {
         this.getOrganizations();
@@ -474,7 +474,7 @@ export class AggregatedListingsTableComponent implements OnInit {
     }
 
     private getOrganizations(): void {
-        this.requestAccessService.getOrganizations('LG').subscribe({
+        this.organizationsService.getOrganizations('LG').subscribe({
             next: (orgs) => {
                 this.communities = orgs.map((org: DropdownOptionOrganization) => ({
                     label: org.label,

frontend/src/app/features/components/listings-table/listings-table.component.ts

@@ -26,8 +26,8 @@ import { SidebarModule } from 'primeng/sidebar';
 import { ListingFilter } from '../../../common/models/listing-filter';
 import { AccordionModule } from 'primeng/accordion';
 import { RadioButtonModule } from 'primeng/radiobutton';
-import { RequestAccessService } from '../../../common/services/request-access.service';
 import { FilterPersistenceService } from '../../../common/services/filter-persistence.service';
+import { OrganizationService } from '../../../common/services/organization.service';
 
 @Component({
   selector: 'app-listings-table',
@@ -78,7 +78,7 @@ export class ListingsTableComponent implements OnInit {
     private listingService: ListingDataService,
     private userService: UserDataService,
     private router: Router,
-    private requestAccessService: RequestAccessService,
+    private organizationsService: OrganizationService,
     private searchStateService: SelectedListingsStateService,
     private route: ActivatedRoute,
     private loaderService: GlobalLoaderService,
@@ -327,7 +327,7 @@ export class ListingsTableComponent implements OnInit {
   }
 
   private getOrganizations(): void {
-    this.requestAccessService.getOrganizations('LG').subscribe({
+    this.organizationsService.getOrganizations('LG').subscribe({
       next: (orgs) => {
         this.communities = orgs.map((org: DropdownOptionOrganization) =>
           ({ label: org.label, value: org.value, localGovernmentType: org.localGovernmentType || 'Other' }));