From 07be5df029e5c7ef71eb31f390a6785bacd75357 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 15 Aug 2024 07:13:22 +0000 Subject: [PATCH] fix(Linting):blacked code --- src/app/api-connector/group.service.ts | 8 +-- src/app/api-connector/news.service.ts | 4 +- src/app/api-connector/playbook.service.ts | 4 +- .../applications/type-overview.component.ts | 18 ++--- src/app/shared/breadcrumb.component.ts | 72 ++++++++++--------- .../application-base-class.component.ts | 2 +- .../conda/res-env.component.ts | 2 +- .../virtualmachines/flavordetail.component.ts | 4 +- .../imageCarouselSlide.component.ts | 2 +- .../virtualmachines/imagedetail.component.ts | 9 ++- .../number-charts/number-charts.component.ts | 6 +- 11 files changed, 69 insertions(+), 62 deletions(-) diff --git a/src/app/api-connector/group.service.ts b/src/app/api-connector/group.service.ts index 0122236ca0..044f03284a 100644 --- a/src/app/api-connector/group.service.ts +++ b/src/app/api-connector/group.service.ts @@ -18,14 +18,14 @@ export class GroupService { this.http = http; } - toggleVisibility(groupId: string | number): Observable { - return this.http.post(`${ApiSettings.getApiBaseURL()}projects/${groupId}/toggle_member_names_visibility/`, { + toggleVisibility(groupId: string | number): Observable { + return this.http.post(`${ApiSettings.getApiBaseURL()}projects/${groupId}/toggle_member_names_visibility/`, { withCredentials: true, }); } - toggleStartingMachines(groupId: string | number): Observable { - return this.http.post(`${ApiSettings.getApiBaseURL()}projects/${groupId}/toggle_starting_machines/`, { + toggleStartingMachines(groupId: string | number): Observable { + return this.http.post(`${ApiSettings.getApiBaseURL()}projects/${groupId}/toggle_starting_machines/`, { withCredentials: true, }); } diff --git a/src/app/api-connector/news.service.ts b/src/app/api-connector/news.service.ts index 883f784644..50d1363400 100644 --- a/src/app/api-connector/news.service.ts +++ b/src/app/api-connector/news.service.ts @@ -50,8 +50,8 @@ export class NewsService { }); } - getFacilitiesFromWagtail(): Observable { - return this.http.get(`${ApiSettings.getApiBaseURL()}facility-management/`, { + getFacilitiesFromWagtail(): Observable { + return this.http.get(`${ApiSettings.getApiBaseURL()}facility-management/`, { withCredentials: true, }); } diff --git a/src/app/api-connector/playbook.service.ts b/src/app/api-connector/playbook.service.ts index 60d0f7ccd1..12e385819e 100644 --- a/src/app/api-connector/playbook.service.ts +++ b/src/app/api-connector/playbook.service.ts @@ -16,10 +16,8 @@ export class PlaybookService { } getPlaybookForVM(vm_id: string): Observable { - - return this.http.get(`${this.baseUrl}${vm_id}/`, { + return this.http.get(`${this.baseUrl}${vm_id}/`, { withCredentials: true, }); } - } diff --git a/src/app/applications/type-overview.component.ts b/src/app/applications/type-overview.component.ts index 13378e1502..e0d8d0d2b1 100644 --- a/src/app/applications/type-overview.component.ts +++ b/src/app/applications/type-overview.component.ts @@ -22,19 +22,19 @@ export class TypeOverviewComponent implements OnInit { kubernetes_color: string = '#326ce5'; is_vo_admin: boolean = is_vo; - simpleVM_logo_link: String; - simpleVM_ease_logo: String; - simpleVM_curve_logo: String; - simpleVM_remote_logo: String; + simpleVM_logo_link: string; + simpleVM_ease_logo: string; + simpleVM_curve_logo: string; + simpleVM_remote_logo: string; kubernetes_logo_link: string; kubernetes_logo_border: string; - openstack_logo_link: String; - openstack_api_logo: String; - openstack_conf_logo: String; - openstack_scale_logo: String; - static_img_folder: String = 'static/webapp/assets/img/'; + openstack_logo_link: string; + openstack_api_logo: string; + openstack_conf_logo: string; + openstack_scale_logo: string; + static_img_folder: string = 'static/webapp/assets/img/'; WIKI_WORKSHOPS: string = WIKI_WORKSHOPS; SIMPLE_VM_LINK: string = SIMPLE_VM_LINK; diff --git a/src/app/shared/breadcrumb.component.ts b/src/app/shared/breadcrumb.component.ts index 63350b81fe..a7ed00150b 100644 --- a/src/app/shared/breadcrumb.component.ts +++ b/src/app/shared/breadcrumb.component.ts @@ -6,46 +6,52 @@ import { filter } from 'rxjs/operators'; // tslint:disable @Component({ selector: 'app-breadcrumbs', - template: ` - -
  • - {{breadcrumb.label.title}} - {{breadcrumb.label.title}} -
    • -     `, + template: ` +
  • + {{ breadcrumb.label.title }} + {{ breadcrumb.label.title }} +
    • +     `, }) export class BreadcrumbsComponent implements OnInit { - breadcrumbs: Object[]; + breadcrumbs: object[]; - constructor(private router: Router, private route: ActivatedRoute) { + constructor( + private router: Router, + private route: ActivatedRoute, + ) { this.router = router; this.route = route; } ngOnInit(): void { - this.router.events.pipe(filter(event => event instanceof NavigationEnd)) - .subscribe(() => { - this.breadcrumbs = []; - let currentRoute = this.route.root; - let url = ''; - do { - const childrenRoutes = currentRoute.children; - currentRoute = null; - // eslint-disable-next-line no-loop-func - childrenRoutes.forEach(route => { - if (route.outlet === 'primary') { - const routeSnapshot = route.snapshot; - url += `/${routeSnapshot.url.map(segment => segment.path).join('/')}`; - this.breadcrumbs.push({ - label: route.snapshot.data, - url, - }); - currentRoute = route; - } - }); - } while (currentRoute); - }); + this.router.events.pipe(filter(event => event instanceof NavigationEnd)).subscribe(() => { + this.breadcrumbs = []; + let currentRoute = this.route.root; + let url = ''; + do { + const childrenRoutes = currentRoute.children; + currentRoute = null; + // eslint-disable-next-line no-loop-func + childrenRoutes.forEach(route => { + if (route.outlet === 'primary') { + const routeSnapshot = route.snapshot; + url += `/${routeSnapshot.url.map(segment => segment.path).join('/')}`; + this.breadcrumbs.push({ + label: route.snapshot.data, + url, + }); + currentRoute = route; + } + }); + } while (currentRoute); + }); } } diff --git a/src/app/shared/shared_modules/baseClass/application-base-class.component.ts b/src/app/shared/shared_modules/baseClass/application-base-class.component.ts index cf49e0cb30..d7d868746c 100644 --- a/src/app/shared/shared_modules/baseClass/application-base-class.component.ts +++ b/src/app/shared/shared_modules/baseClass/application-base-class.component.ts @@ -84,7 +84,7 @@ export class ApplicationBaseClassComponent extends AbstractBaseClass { /** * */ - constantStrings: Object; + constantStrings: object; /** * List of flavors. diff --git a/src/app/virtualmachines/conda/res-env.component.ts b/src/app/virtualmachines/conda/res-env.component.ts index 86bec728f3..72b2df9863 100644 --- a/src/app/virtualmachines/conda/res-env.component.ts +++ b/src/app/virtualmachines/conda/res-env.component.ts @@ -26,7 +26,7 @@ export class ResEnvComponent implements OnInit, OnChanges, OnDestroy { @Input() blockedImageTagsResenv: BlockedImageTagResenv[]; @Input() workshopMode: boolean = false; - Object: Object = Object; + Object: object = Object; templates_to_block: string[] = []; diff --git a/src/app/virtualmachines/flavordetail.component.ts b/src/app/virtualmachines/flavordetail.component.ts index 3d484b4d10..df06ecce1c 100644 --- a/src/app/virtualmachines/flavordetail.component.ts +++ b/src/app/virtualmachines/flavordetail.component.ts @@ -57,7 +57,7 @@ export class FlavorDetailComponent implements OnInit, OnChanges { // icons for graphics within flavor cards: - STATIC_IMG_FOLDER: String = 'static/webapp/assets/img/'; + STATIC_IMG_FOLDER: string = 'static/webapp/assets/img/'; CPU_ICON_PATH: string = `${this.STATIC_IMG_FOLDER}/new_instance/cpu_icon.svg`; RAM_ICON_PATH: string = `${this.STATIC_IMG_FOLDER}/new_instance/ram_icon.svg`; @@ -72,7 +72,7 @@ export class FlavorDetailComponent implements OnInit, OnChanges { pullDrag: false, dots: true, navSpeed: 700, - navText: ['', ''], + navText: ["", ""], responsive: { 0: { items: 1, diff --git a/src/app/virtualmachines/imageCarouselSlide.component.ts b/src/app/virtualmachines/imageCarouselSlide.component.ts index f70acfe60b..0c927a6bf9 100644 --- a/src/app/virtualmachines/imageCarouselSlide.component.ts +++ b/src/app/virtualmachines/imageCarouselSlide.component.ts @@ -23,7 +23,7 @@ export class ImageCarouselSlideComponent implements OnInit { object_fit_scale: string = 'scale'; image_visible: boolean = true; regexp_data_test_id: RegExp = /[ ().]/g; - STATIC_IMG_FOLDER: String = 'static/webapp/assets/img/'; + STATIC_IMG_FOLDER: string = 'static/webapp/assets/img/'; RAM_ICON_PATH: string = `${this.STATIC_IMG_FOLDER}/new_instance/ram_icon.svg`; STORAGE_ICON_PATH: string = `${this.STATIC_IMG_FOLDER}/new_instance/storage_icon.svg`; diff --git a/src/app/virtualmachines/imagedetail.component.ts b/src/app/virtualmachines/imagedetail.component.ts index 4af039c381..3b0e9d7c28 100644 --- a/src/app/virtualmachines/imagedetail.component.ts +++ b/src/app/virtualmachines/imagedetail.component.ts @@ -65,7 +65,7 @@ export class ImageDetailComponent implements OnInit, OnDestroy { } } - STATIC_IMG_FOLDER: String = 'static/webapp/assets/img/'; + STATIC_IMG_FOLDER: string = 'static/webapp/assets/img/'; RAM_ICON_PATH: string = `${this.STATIC_IMG_FOLDER}/new_instance/ram_icon.svg`; STORAGE_ICON_PATH: string = `${this.STATIC_IMG_FOLDER}/new_instance/storage_icon.svg`; @@ -76,7 +76,7 @@ export class ImageDetailComponent implements OnInit, OnDestroy { pullDrag: false, dots: true, navSpeed: 700, - navText: ['', ''], + navText: ["", ""], responsive: { 0: { items: 1, @@ -94,7 +94,10 @@ export class ImageDetailComponent implements OnInit, OnDestroy { nav: true, }; - constructor(private imageService: ImageService, private condaService: BiocondaService) { + constructor( + private imageService: ImageService, + private condaService: BiocondaService, + ) { // eslint-disable-next-line no-empty-function } diff --git a/src/app/vo_manager/number-charts/number-charts.component.ts b/src/app/vo_manager/number-charts/number-charts.component.ts index d6cbcd89c4..52648f88ca 100644 --- a/src/app/vo_manager/number-charts/number-charts.component.ts +++ b/src/app/vo_manager/number-charts/number-charts.component.ts @@ -73,7 +73,7 @@ export class NumberChartsComponent implements OnInit { getData(): void { /* tslint:disable */ this.numbersService.getProjectCounterTimeline().subscribe( - (result: Object[]): void => { + (result: object[]): void => { result.forEach((valuePack: any): void => { this.runningOpenstack.push(valuePack['running_openstack']); this.runningSimpleVM.push(valuePack['running_simple_vm']); @@ -89,8 +89,8 @@ export class NumberChartsComponent implements OnInit { ); this.numbersService.getRamCoresTimeline().subscribe( - (result: Object[]): void => { - result.forEach((valuePack: Object): void => { + (result: object[]): void => { + result.forEach((valuePack: object): void => { this.openstackCores.push(valuePack['openstack_cores']); this.openstackRam.push(valuePack['openstack_ram']); this.simpleVMCores.push(valuePack['simple_vm_cores']);