diff --git a/src/app/admin/components/delete-user/delete-user.component.spec.ts b/src/app/admin/components/delete-user/delete-user.component.spec.ts index 4f1ef118955e67f22af84be2d66afc6ab65e42ed..b57ae62303160ae43f5bd64f32d05e39fedac10d 100644 --- a/src/app/admin/components/delete-user/delete-user.component.spec.ts +++ b/src/app/admin/components/delete-user/delete-user.component.spec.ts @@ -1,7 +1,6 @@ import { HttpClientModule } from '@angular/common/http'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { of } from 'rxjs'; -import { AdminService } from '../../services/admin.service'; import { DeleteUserComponent } from './delete-user.component'; @@ -13,9 +12,9 @@ describe('DeleteUserComponent', () => { beforeEach(async () => { USERS = [ - {email: "paula@test.com", name: "paula"}, - {email: "jeanpaul@test.com", name: "jeanpaul"}, - {email: "admin@test.com", name: "admin"}, + { email: 'paula@test.com', name: 'paula' }, + { email: 'jeanpaul@test.com', name: 'jeanpaul' }, + { email: 'admin@test.com', name: 'admin' }, ]; await TestBed.configureTestingModule({ imports: [HttpClientModule], @@ -28,7 +27,7 @@ describe('DeleteUserComponent', () => { component = fixture.componentInstance; fixture.detectChanges(); - service = jasmine.createSpyObj(['searchUsers', 'deleteUser']) + service = jasmine.createSpyObj(['searchUsers', 'deleteUser']); component = new DeleteUserComponent(service); }); @@ -37,16 +36,16 @@ describe('DeleteUserComponent', () => { }); it('should searchUsers', () => { - let searchString = "paula" - service.searchUsers.and.returnValue(of(USERS.filter(item => item.email.indexOf(searchString) !== -1))); + let searchString = 'paula'; + service.searchUsers.and.returnValue(of(USERS.filter((item) => item.email.indexOf(searchString) !== -1))); component.users = USERS; component.searchUsers(searchString); expect(component.users.length).toBe(1); }); it('should searchUsers all users', () => { - let searchString = "" - service.searchUsers.and.returnValue(of(USERS.filter(item => item.email.indexOf(searchString) !== -1))); + let searchString = ''; + service.searchUsers.and.returnValue(of(USERS.filter((item) => item.email.indexOf(searchString) !== -1))); component.users = USERS; component.searchUsers(searchString); expect(component.users.length).toBe(USERS.length); @@ -54,7 +53,14 @@ describe('DeleteUserComponent', () => { it('should delete user', () => { component.users = USERS; - service.deleteUser.and.returnValue(of(USERS.splice(USERS.findIndex(e => e.email === USERS[0].email),1))); + service.deleteUser.and.returnValue( + of( + USERS.splice( + USERS.findIndex((e) => e.email === USERS[0].email), + 1 + ) + ) + ); component.deleteUser(component.users[0]); expect(component.users.length).toBe(2); }); diff --git a/src/app/admin/components/panel/panel.component.ts b/src/app/admin/components/panel/panel.component.ts index 2fa9821737c1ba5eb9668c35ad32a93d91219a1d..c938918a32c48b6d7e70ce522c301902d73aff82 100644 --- a/src/app/admin/components/panel/panel.component.ts +++ b/src/app/admin/components/panel/panel.component.ts @@ -1,5 +1,4 @@ import { Component, OnInit } from '@angular/core'; -import { TestBed } from '@angular/core/testing'; import { AdminPannelEnum } from '../../../shared/enum/adminPanel.enum'; @Component({ @@ -7,10 +6,9 @@ import { AdminPannelEnum } from '../../../shared/enum/adminPanel.enum'; templateUrl: './panel.component.html', }) export class PanelComponent implements OnInit { - public features = AdminPannelEnum; public selectedFeature; - + constructor() {} ngOnInit(): void { diff --git a/src/app/admin/services/admin.service.ts b/src/app/admin/services/admin.service.ts index 689fdc66831e08fc0049f84c18842a1d8723054a..adc590b8d4be2bdaf8d796b01bf639d92a2bff6a 100644 --- a/src/app/admin/services/admin.service.ts +++ b/src/app/admin/services/admin.service.ts @@ -1,5 +1,4 @@ import { HttpClient } from '@angular/common/http'; -import { stringify } from '@angular/compiler/src/util'; import { Injectable } from '@angular/core'; import { Observable } from 'rxjs'; import { User } from '../../models/user.model'; @@ -24,7 +23,6 @@ export class AdminService { public searchUsers(searchString: string): Observable<User[]> { return this.http.post<User[]>(`api/admin/searchUsers`, { searchString }); } - public deleteUser(id: string): Observable<User> { return this.http.delete<User>(`api/admin/user/` + id); diff --git a/src/app/form/form.component.ts b/src/app/form/form.component.ts index 692a0a761ba6101bdaaf36744fc784c6e1f1df1c..7c7409c162dae0d7d81121780a9dd03615c0765b 100644 --- a/src/app/form/form.component.ts +++ b/src/app/form/form.component.ts @@ -855,10 +855,10 @@ export class FormComponent implements OnInit { } private createStructure(structure: Structure, user: User): void { - this.structureService.createStructure(structure, user).subscribe((structure) => { + this.structureService.createStructure(structure, user).subscribe((newStructure) => { this.currentPage++; this.progressStatus += 100 / this.nbPagesForm; - this.createdStructure = structure; + this.createdStructure = newStructure; }); } public toggleMenu(): void { diff --git a/src/app/post/components/post-header/post-header.component.ts b/src/app/post/components/post-header/post-header.component.ts index 2a9125ad040f173dfeb432d2ac3d3a792946375b..1a7ca628d1c9a293626be12dc9d36b7271e21a72 100644 --- a/src/app/post/components/post-header/post-header.component.ts +++ b/src/app/post/components/post-header/post-header.component.ts @@ -1,7 +1,6 @@ -import { Component, EventEmitter, OnInit, Output } from '@angular/core'; +import { Component, OnInit } from '@angular/core'; import { Tag } from '../../models/tag.model'; import { TagWithMeta } from '../../models/tagWithMeta.model'; -import * as _ from 'lodash'; import { TypeModalNews } from '../../enum/typeModalNews.enum'; import { ActivatedRoute, Router } from '@angular/router'; import { TagEnum } from '../../enum/tag.enum'; @@ -28,7 +27,9 @@ export class PostHeaderComponent implements OnInit { if (data.tags) { this.tags = data.tags; this.tags.others.forEach((tag) => { - tag.slug == TagEnum.aLaUne ? (tag.name = 'Les + récentes') : tag.name; + if (tag.slug == TagEnum.aLaUne) { + tag.name = 'Les + récentes'; + } }); this.tags.commune.sort((tagA, tagB) => { return this.sortArray(tagA, tagB); diff --git a/src/app/post/components/post-list/post-list.component.ts b/src/app/post/components/post-list/post-list.component.ts index 152ddb1c49c704aef8f9fd03110fc19d27e63ce3..1d9b13b1225f91b27d03d8a5795345d56c30755b 100644 --- a/src/app/post/components/post-list/post-list.component.ts +++ b/src/app/post/components/post-list/post-list.component.ts @@ -48,7 +48,7 @@ export class PostListComponent implements OnInit { this.isLoading = true; // Init APP news list this.postService.getPosts(1, [TagEnum.appels]).subscribe((news) => { - let projectNews = news.posts.map((news) => (news = this.addAuthorToPost(news))); + let projectNews = news.posts.map((newsData) => this.addAuthorToPost(newsData)); this.projectsNew = projectNews; }); this.postService.getPosts(1, [TagEnum.aLaUne]).subscribe((news) => { diff --git a/src/app/post/news.component.scss b/src/app/post/news.component.scss deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/src/app/post/news.component.ts b/src/app/post/news.component.ts index 40e2377766e92e84c50eb184be8f87604c2a288b..36d43437627eafb6ec5e8e45bbb51b530b89eb99 100644 --- a/src/app/post/news.component.ts +++ b/src/app/post/news.component.ts @@ -4,7 +4,6 @@ import { Tag } from './models/tag.model'; @Component({ selector: 'app-news', templateUrl: './news.component.html', - styleUrls: ['./news.component.scss'], }) export class NewsComponent implements OnInit { public filters: Tag[]; diff --git a/src/app/post/resolvers/tags.resolver.ts b/src/app/post/resolvers/tags.resolver.ts index 6f92f989e8b3b4d3b4a12a9322ef41f0a19d91bf..cc26c709783bf1e4b2f0128cbc92733117d726bf 100644 --- a/src/app/post/resolvers/tags.resolver.ts +++ b/src/app/post/resolvers/tags.resolver.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { ActivatedRouteSnapshot, Resolve, Router } from '@angular/router'; +import { Resolve, Router } from '@angular/router'; import { Observable } from 'rxjs'; import { map, catchError } from 'rxjs/operators'; import { TagWithMeta } from '../models/tagWithMeta.model'; diff --git a/src/app/post/services/post.service.ts b/src/app/post/services/post.service.ts index b0fc02fb257ff31679d55e5ca1f0b63a9b0e0439..2948919654194df9a5b2791c66b98c7eeea203fd 100644 --- a/src/app/post/services/post.service.ts +++ b/src/app/post/services/post.service.ts @@ -5,7 +5,6 @@ import { map } from 'rxjs/operators'; import { Post } from '../models/post.model'; import { TagEnum } from '../enum/tag.enum'; import { PostWithMeta } from '../models/postWithMeta.model'; -import { Tag } from '../models/tag.model'; import { TagWithMeta } from '../models/tagWithMeta.model'; @Injectable({ @@ -18,9 +17,7 @@ export class PostService { public getPost(idPost: string): Observable<PostWithMeta> { return this.http.get<PostWithMeta>(`${this.baseUrl}/` + idPost).pipe( map((item: PostWithMeta) => { - item.posts.forEach((post) => { - post = this.addAuthorToPost(post); - }); + item.posts.map((post) => this.addAuthorToPost(post)); return new PostWithMeta(item); }) ); diff --git a/src/app/structure-list/components/card/card.component.ts b/src/app/structure-list/components/card/card.component.ts index b3a414f4a8fd446011c456f9652fe29a26ae8f7a..5d2d7dd66fe0eb2dbe425cde4abf40b12f37de20 100644 --- a/src/app/structure-list/components/card/card.component.ts +++ b/src/app/structure-list/components/card/card.component.ts @@ -2,7 +2,6 @@ import { Component, Input, Output, OnInit, EventEmitter } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; import { Structure } from '../../../models/structure.model'; import { ProfileService } from '../../../profile/services/profile.service'; -import { GeojsonService } from '../../../services/geojson.service'; import { StructureService } from '../../../services/structure.service'; @Component({