From bce0381e516d422614e2cf9254cd5e6e13425694 Mon Sep 17 00:00:00 2001
From: Hugo SUBTIL <ext.sopra.husubtil@grandlyon.com>
Date: Wed, 31 Mar 2021 17:11:30 +0200
Subject: [PATCH] fix: sonar issues
---
.../delete-user/delete-user.component.spec.ts | 26 ++++++++++++-------
.../admin/components/panel/panel.component.ts | 4 +--
src/app/admin/services/admin.service.ts | 2 --
src/app/form/form.component.ts | 4 +--
.../post-header/post-header.component.ts | 7 ++---
.../post-list/post-list.component.ts | 2 +-
src/app/post/news.component.scss | 0
src/app/post/news.component.ts | 1 -
src/app/post/resolvers/tags.resolver.ts | 2 +-
src/app/post/services/post.service.ts | 5 +---
.../components/card/card.component.ts | 1 -
11 files changed, 26 insertions(+), 28 deletions(-)
delete mode 100644 src/app/post/news.component.scss
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 4f1ef1189..b57ae6230 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 2fa982173..c938918a3 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 689fdc668..adc590b8d 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 692a0a761..7c7409c16 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 2a9125ad0..1a7ca628d 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 152ddb1c4..1d9b13b12 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 e69de29bb..000000000
diff --git a/src/app/post/news.component.ts b/src/app/post/news.component.ts
index 40e237776..36d434376 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 6f92f989e..cc26c7097 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 b0fc02fb2..294891965 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 b3a414f4a..5d2d7dd66 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({
--
GitLab