From 5f5074ae10e5a230ca54a943552694f44a93cd19 Mon Sep 17 00:00:00 2001 From: Dani Date: Tue, 28 Nov 2023 12:54:54 +0100 Subject: [PATCH 1/9] deny to view create route element on menu for admin --- src/app/navbar/navbar.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/navbar/navbar.component.html b/src/app/navbar/navbar.component.html index deee40d..c441201 100644 --- a/src/app/navbar/navbar.component.html +++ b/src/app/navbar/navbar.component.html @@ -22,7 +22,7 @@
- Create List From 372577ebce0a1b6f511752fdb22a2dabdf1f9629 Mon Sep 17 00:00:00 2001 From: Dani Date: Tue, 28 Nov 2023 17:10:47 +0100 Subject: [PATCH 2/9] filtering routes --- src/app/routes/route-create/route-create.component.html | 4 ++-- src/app/routes/route-create/route-create.component.ts | 7 +------ src/app/routes/route-search/route-search.component.html | 2 +- src/app/routes/route.service.ts | 4 ++++ 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/app/routes/route-create/route-create.component.html b/src/app/routes/route-create/route-create.component.html index 6323c2e..30fec65 100644 --- a/src/app/routes/route-create/route-create.component.html +++ b/src/app/routes/route-create/route-create.component.html @@ -25,8 +25,8 @@
- +
diff --git a/src/app/routes/route-create/route-create.component.ts b/src/app/routes/route-create/route-create.component.ts index 21013cf..9925e2b 100644 --- a/src/app/routes/route-create/route-create.component.ts +++ b/src/app/routes/route-create/route-create.component.ts @@ -40,7 +40,7 @@ export class RouteCreateComponent implements OnInit { this.creationDate = new Date(); this.http.get(`${environment.API}/profile/routes`) .subscribe(data => { - this.types = (data.alps.descriptor[0].descriptor[2].doc.value).split(','); + this.types = (data.alps.descriptor[0].descriptor[2].doc.value.trim()).split(','); }); this.userService.getPage({ pageParams: { size: this.pageSize }, sort: { username: 'ASC' } }).subscribe( @@ -64,9 +64,4 @@ export class RouteCreateComponent implements OnInit { isRole(role: string): boolean { return this.authenticationService.isRole(role); } - - defaultRoute(endpoint: string): string { - //return `http://192.168.1.95:8080/${endpoint}`; - return `http://localhost:8080/${endpoint}`; - } } diff --git a/src/app/routes/route-search/route-search.component.html b/src/app/routes/route-search/route-search.component.html index efcc653..c23c789 100644 --- a/src/app/routes/route-search/route-search.component.html +++ b/src/app/routes/route-search/route-search.component.html @@ -1,6 +1,6 @@
Sorry, suggestions could not be loaded.
diff --git a/src/app/routes/route.service.ts b/src/app/routes/route.service.ts index 43f5c6d..32e806c 100644 --- a/src/app/routes/route.service.ts +++ b/src/app/routes/route.service.ts @@ -21,4 +21,8 @@ export class RouteService extends HateoasResourceOperation { public findByTitleContainingIgnoreCase(title: string): Observable> { return this.searchCollection("findByTitleContainingIgnoreCase", { params: { title: title } }) } + + public findByType(type: string): Observable> { + return this.searchCollection("findByType", { params: { type: type } }) + } } From 50d1029211b4d4e3dfca3082a563b72b0bfcde5a Mon Sep 17 00:00:00 2001 From: Dani Date: Tue, 28 Nov 2023 17:11:18 +0100 Subject: [PATCH 3/9] filtering routes --- src/app/routes/route-list/route-list.component.ts | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/app/routes/route-list/route-list.component.ts b/src/app/routes/route-list/route-list.component.ts index 04fd0dc..207a1d8 100644 --- a/src/app/routes/route-list/route-list.component.ts +++ b/src/app/routes/route-list/route-list.component.ts @@ -5,6 +5,10 @@ import { Route } from '../route'; import { PagedResourceCollection } from '@lagoshny/ngx-hateoas-client'; import { User } from 'src/app/login-basic/user'; import { AuthenticationBasicService } from 'src/app/login-basic/authentication-basic.service'; +import {map} from "rxjs/operators"; +import {environment} from "../../../environments/environment"; +import {HttpClient} from "@angular/common/http"; +import {routes} from "../../login-basic/login-basic.routing"; @Component({ selector: 'app-routes-list', @@ -18,15 +22,22 @@ export class RouteListComponent implements OnInit { public pageSize = 5; public page = 1; public totalRoutes = 0; + public types: []; + public type: string; constructor( public router: Router, private routesService: RouteService, - private authenticationService: AuthenticationBasicService) { + private authenticationService: AuthenticationBasicService, + private http: HttpClient) { } ngOnInit(): void { + this.http.get(`${environment.API}/profile/routes`) + .subscribe(data => { + this.types = (data.alps.descriptor[0].descriptor[2].doc.value).split(','); + }); this.routesService.getPage({ pageParams: { size: this.pageSize }, sort: { username: 'ASC' } }).subscribe( (page: PagedResourceCollection) => { this.routes = page.resources; @@ -75,7 +86,6 @@ export class RouteListComponent implements OnInit { } detail(route: Route): void { - console.log(route.id); this.router.navigate([route.uri]); } } From 0fc4275e01a8db104da100e7cff8cbd8cd1963cd Mon Sep 17 00:00:00 2001 From: Dani Date: Thu, 30 Nov 2023 17:25:47 +0100 Subject: [PATCH 4/9] adding filter by type --- src/app/app.module.ts | 4 +- .../route-filter/route-filter.component.css | 0 .../route-filter/route-filter.component.html | 12 ++++ .../route-filter/route-filter.component.ts | 61 +++++++++++++++++++ .../route-list/route-list.component.html | 5 +- .../routes/route-list/route-list.component.ts | 5 +- .../route-search/route-search.component.html | 6 +- .../route-search/route-search.component.ts | 3 +- src/app/routes/route.service.ts | 4 ++ 9 files changed, 94 insertions(+), 6 deletions(-) create mode 100644 src/app/routes/route-filter/route-filter.component.css create mode 100644 src/app/routes/route-filter/route-filter.component.html create mode 100644 src/app/routes/route-filter/route-filter.component.ts diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 5264fdd..4b9d9b0 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -30,6 +30,7 @@ import { RouteDetailComponent } from './routes/route-detail/route-detail.compone import { RouteEditComponent } from './routes/routes-edit/route-edit.component'; import { RouteDeleteComponent } from './routes/route-delete/route-delete.component'; import { RouteSearchComponent } from './routes/route-search/route-search.component'; +import { RouteFilterComponent } from './routes/route-filter/route-filter.component'; @NgModule({ @@ -49,7 +50,8 @@ import { RouteSearchComponent } from './routes/route-search/route-search.compone RouteDetailComponent, RouteEditComponent, RouteDeleteComponent, - RouteSearchComponent + RouteSearchComponent, + RouteFilterComponent ], diff --git a/src/app/routes/route-filter/route-filter.component.css b/src/app/routes/route-filter/route-filter.component.css new file mode 100644 index 0000000..e69de29 diff --git a/src/app/routes/route-filter/route-filter.component.html b/src/app/routes/route-filter/route-filter.component.html new file mode 100644 index 0000000..a9463ff --- /dev/null +++ b/src/app/routes/route-filter/route-filter.component.html @@ -0,0 +1,12 @@ +
+
+ +
+ +
diff --git a/src/app/routes/route-filter/route-filter.component.ts b/src/app/routes/route-filter/route-filter.component.ts new file mode 100644 index 0000000..5d7a2ec --- /dev/null +++ b/src/app/routes/route-filter/route-filter.component.ts @@ -0,0 +1,61 @@ +import {Component, EventEmitter, Output} from '@angular/core'; +import {RouteService} from "../route.service"; +import {PagedResourceCollection, ResourceCollection, Sort} from "@lagoshny/ngx-hateoas-client"; +import {Route} from "../route"; +import {environment} from "../../../environments/environment"; +import {HttpClient} from "@angular/common/http"; +import {User} from "../../login-basic/user"; + +@Component({ + selector: 'app-route-filter', + templateUrl: './route-filter.component.html', + styleUrls: ['./route-filter.component.css'] +}) +export class RouteFilterComponent { + @Output() emitResults: EventEmitter = new EventEmitter(); + private routes: Array; + public types: []; + private pageSize: 5; + private routesPagedResource: PagedResourceCollection; + + constructor(private routeService: RouteService, private http: HttpClient) { + this.http.get(`${environment.API}/profile/routes`) + .subscribe(data => { + this.types = (data.alps.descriptor[0].descriptor[2].doc.value).split(',').sort().reverse(); + // @ts-ignore + this.types.push('Choose a type to filter'); + this.types.reverse() + }); + } + + filterRoutes(type: String) { + if (typeof type === 'string' && type.trim() != 'Choose a type to filter') { + this.routeService.findByType(type) + .subscribe((page: PagedResourceCollection) => { + this.routes = page.resources; + this.routesPagedResource = page; + this.routes.map(routes => { + routes.getRelation('createdBy') + .subscribe((user: User) => { + routes.createdBy = user; + }); + }); + this.emitResults.emit(this.routesPagedResource as any); + }); + } + else { + this.routeService.getPage({ pageParams: { size: this.pageSize }, sort: { username: 'ASC' } }).subscribe( + (page: PagedResourceCollection) => { + this.routes = page.resources; + this.routesPagedResource = page; + this.routes.map(routes => { + routes.getRelation('createdBy') + .subscribe((user: User) => { + routes.createdBy = user; + }); + }); + this.emitResults.emit(this.routesPagedResource as any); + }); + } + } +} diff --git a/src/app/routes/route-list/route-list.component.html b/src/app/routes/route-list/route-list.component.html index 47ed869..c8f66bd 100644 --- a/src/app/routes/route-list/route-list.component.html +++ b/src/app/routes/route-list/route-list.component.html @@ -1,4 +1,7 @@ - +
+ + +
diff --git a/src/app/routes/route-list/route-list.component.ts b/src/app/routes/route-list/route-list.component.ts index 04fd0dc..a68b4fc 100644 --- a/src/app/routes/route-list/route-list.component.ts +++ b/src/app/routes/route-list/route-list.component.ts @@ -75,7 +75,10 @@ export class RouteListComponent implements OnInit { } detail(route: Route): void { - console.log(route.id); this.router.navigate([route.uri]); } + + reBind(routes: any): void { + this.modifyList(routes); + } } diff --git a/src/app/routes/route-search/route-search.component.html b/src/app/routes/route-search/route-search.component.html index efcc653..5cb05f5 100644 --- a/src/app/routes/route-search/route-search.component.html +++ b/src/app/routes/route-search/route-search.component.html @@ -1,10 +1,12 @@ -
+
+
+ Search all routes by Title +
Sorry, suggestions could not be loaded.
-
{{r.title}}
diff --git a/src/app/routes/route-search/route-search.component.ts b/src/app/routes/route-search/route-search.component.ts index 748138c..c185d78 100644 --- a/src/app/routes/route-search/route-search.component.ts +++ b/src/app/routes/route-search/route-search.component.ts @@ -14,6 +14,7 @@ export class RouteSearchComponent { @Output() emitResults: EventEmitter = new EventEmitter(); searchFailed = false; searching = false; + minLength = 3; constructor(private routeService: RouteService) { } @@ -23,7 +24,7 @@ export class RouteSearchComponent { debounceTime(500), distinctUntilChanged(), tap(() => this.searching = true), - switchMap(term => term.length < 3 ? of([]) : + switchMap(term => term.length < this.minLength ? of([]) : this.routeService.findByTitleContainingIgnoreCase(term).pipe( map((collection: ResourceCollection) => collection.resources), tap(() => this.searchFailed = false), diff --git a/src/app/routes/route.service.ts b/src/app/routes/route.service.ts index 43f5c6d..32e806c 100644 --- a/src/app/routes/route.service.ts +++ b/src/app/routes/route.service.ts @@ -21,4 +21,8 @@ export class RouteService extends HateoasResourceOperation { public findByTitleContainingIgnoreCase(title: string): Observable> { return this.searchCollection("findByTitleContainingIgnoreCase", { params: { title: title } }) } + + public findByType(type: string): Observable> { + return this.searchCollection("findByType", { params: { type: type } }) + } } From 755f3a60a7ee10cc7f74d52f64a0d065bf76e604 Mon Sep 17 00:00:00 2001 From: Dani Date: Thu, 30 Nov 2023 17:32:16 +0100 Subject: [PATCH 5/9] sorting types for thr route --- src/app/routes/route-create/route-create.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/routes/route-create/route-create.component.ts b/src/app/routes/route-create/route-create.component.ts index 21013cf..4355ed1 100644 --- a/src/app/routes/route-create/route-create.component.ts +++ b/src/app/routes/route-create/route-create.component.ts @@ -40,7 +40,7 @@ export class RouteCreateComponent implements OnInit { this.creationDate = new Date(); this.http.get(`${environment.API}/profile/routes`) .subscribe(data => { - this.types = (data.alps.descriptor[0].descriptor[2].doc.value).split(','); + this.types = (data.alps.descriptor[0].descriptor[2].doc.value).split(',').sort(); }); this.userService.getPage({ pageParams: { size: this.pageSize }, sort: { username: 'ASC' } }).subscribe( From 518c0c7c4bd0691d53fa6a1428f82f26aa64dc83 Mon Sep 17 00:00:00 2001 From: Dani Date: Thu, 30 Nov 2023 17:32:58 +0100 Subject: [PATCH 6/9] sorting types for thr route --- src/app/routes/route-create/route-create.component.ts | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/app/routes/route-create/route-create.component.ts b/src/app/routes/route-create/route-create.component.ts index 4355ed1..7c1800b 100644 --- a/src/app/routes/route-create/route-create.component.ts +++ b/src/app/routes/route-create/route-create.component.ts @@ -64,9 +64,4 @@ export class RouteCreateComponent implements OnInit { isRole(role: string): boolean { return this.authenticationService.isRole(role); } - - defaultRoute(endpoint: string): string { - //return `http://192.168.1.95:8080/${endpoint}`; - return `http://localhost:8080/${endpoint}`; - } } From ee9434f08b75b41a19aa96c8d43ef6be7dbf286f Mon Sep 17 00:00:00 2001 From: Dani Date: Thu, 30 Nov 2023 17:45:13 +0100 Subject: [PATCH 7/9] deleting un used imports --- src/app/routes/route-filter/route-filter.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/routes/route-filter/route-filter.component.ts b/src/app/routes/route-filter/route-filter.component.ts index 5d7a2ec..66f39d2 100644 --- a/src/app/routes/route-filter/route-filter.component.ts +++ b/src/app/routes/route-filter/route-filter.component.ts @@ -1,6 +1,6 @@ import {Component, EventEmitter, Output} from '@angular/core'; import {RouteService} from "../route.service"; -import {PagedResourceCollection, ResourceCollection, Sort} from "@lagoshny/ngx-hateoas-client"; +import {PagedResourceCollection} from "@lagoshny/ngx-hateoas-client"; import {Route} from "../route"; import {environment} from "../../../environments/environment"; import {HttpClient} from "@angular/common/http"; From a1270a5291b462152b5c88ef53133fcb72c2baee Mon Sep 17 00:00:00 2001 From: Dani Date: Thu, 30 Nov 2023 17:56:23 +0100 Subject: [PATCH 8/9] lint error equals solved --- src/app/routes/route-filter/route-filter.component.html | 2 +- src/app/routes/routes-edit/route-edit.component.ts | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app/routes/route-filter/route-filter.component.html b/src/app/routes/route-filter/route-filter.component.html index a9463ff..0cd6516 100644 --- a/src/app/routes/route-filter/route-filter.component.html +++ b/src/app/routes/route-filter/route-filter.component.html @@ -6,7 +6,7 @@ (change)="filterRoutes($event.target.value)">
diff --git a/src/app/routes/routes-edit/route-edit.component.ts b/src/app/routes/routes-edit/route-edit.component.ts index 1ae5c98..89cf43c 100644 --- a/src/app/routes/routes-edit/route-edit.component.ts +++ b/src/app/routes/routes-edit/route-edit.component.ts @@ -1,4 +1,4 @@ -import { Component } from '@angular/core'; +import {Component, OnInit} from '@angular/core'; import {ActivatedRoute, Router} from "@angular/router"; import {RouteService} from "../route.service"; import {Route} from "../route"; @@ -11,7 +11,7 @@ import { Location } from '@angular/common' templateUrl: './route-edit.component.html', styleUrls: ['./route-edit.component.css'] }) -export class RouteEditComponent { +export class RouteEditComponent implements OnInit{ public route: Route = new Route(); constructor(private activatedRoute: ActivatedRoute, From 44426a6fd8f099dd91d505829dc32554ef09693a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roberto=20Garc=C3=ADa?= Date: Mon, 4 Dec 2023 17:53:02 +0100 Subject: [PATCH 9/9] Fix lint error in route-create.component.html --- src/app/routes/route-create/route-create.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/routes/route-create/route-create.component.html b/src/app/routes/route-create/route-create.component.html index 30fec65..bf995a2 100644 --- a/src/app/routes/route-create/route-create.component.html +++ b/src/app/routes/route-create/route-create.component.html @@ -26,7 +26,7 @@