feat: add tracks, dump dependencies, cs fixes

Author: autowp

src/app/about/about.component.ts

@@ -11,6 +11,8 @@ import {BytesPipe} from 'ngx-pipes';
 import {map, switchMap} from 'rxjs/operators';
 import showdown from 'showdown';
 
+import * as versionJson from '../../version.json';
+
 function replaceAll(str: string, find: string, replace: string): string {
   return str.replace(new RegExp(escapeRegExp(find), 'g'), replace);
 }
@@ -84,7 +86,7 @@ Take part in [the translation of the site](https://github.com/autowp/autowp-fron
   templateUrl: './about.component.html',
 })
 export class AboutComponent implements OnInit {
-  protected readonly version = require('../../version.json');
+  protected readonly version = versionJson;
 
   protected readonly html$ = this.statGrpc
     .getAboutData(new Empty())

src/app/account/account.component.ts

@@ -5,7 +5,7 @@ import {AuthService} from '@services/auth.service';
 import {MessageService} from '@services/message';
 import {PageEnvService} from '@services/page-env.service';
 import {PictureService} from '@services/picture';
-import {Observable, combineLatest, of} from 'rxjs';
+import {combineLatest, Observable, of} from 'rxjs';
 import {map, shareReplay, switchMap} from 'rxjs/operators';
 
 import {ToastsService} from '../toasts/toasts.service';

src/app/account/accounts/accounts.component.ts

@@ -1,7 +1,7 @@
 import {Component, OnInit} from '@angular/core';
 import {APIService} from '@services/api.service';
 import {PageEnvService} from '@services/page-env.service';
-import {BehaviorSubject, EMPTY, Observable, combineLatest} from 'rxjs';
+import {BehaviorSubject, combineLatest, EMPTY, Observable} from 'rxjs';
 import {catchError, map} from 'rxjs/operators';
 
 import {ToastsService} from '../../toasts/toasts.service';

src/app/account/contacts/contacts.component.ts

@@ -7,7 +7,7 @@ import {LanguageService} from '@services/language';
 import {PageEnvService} from '@services/page-env.service';
 import {KeycloakService} from 'keycloak-angular';
 import {BehaviorSubject, EMPTY, Observable} from 'rxjs';
-import {catchError, map, switchMap} from 'rxjs/operators'; 
+import {catchError, map, switchMap} from 'rxjs/operators';
 
 import {ToastsService} from '../../toasts/toasts.service';
 
@@ -18,27 +18,25 @@ import {ToastsService} from '../../toasts/toasts.service';
 export class AccountContactsComponent implements OnInit {
   private readonly reload$ = new BehaviorSubject<void>(void 0);
 
-  protected readonly items$: Observable<Contact[]> = this.auth
-    .getUser$()
-    .pipe(
-      map((user) => {
-        if (!user) {
-          this.keycloak.login({
-            locale: this.languageService.language,
-            redirectUri: window.location.href,
-          });
-          return EMPTY;
-        }
-        return user;
-      }),
-      switchMap(() => this.reload$),
-      switchMap(() => this.contactsService.getContacts$()),
-      catchError((error) => {
-        this.toastService.handleError(error);
+  protected readonly items$: Observable<Contact[]> = this.auth.getUser$().pipe(
+    map((user) => {
+      if (!user) {
+        this.keycloak.login({
+          locale: this.languageService.language,
+          redirectUri: window.location.href,
+        });
         return EMPTY;
-      }),
-      map(response => response.items || [])
-    );
+      }
+      return user;
+    }),
+    switchMap(() => this.reload$),
+    switchMap(() => this.contactsService.getContacts$()),
+    catchError((error: unknown) => {
+      this.toastService.handleError(error);
+      return EMPTY;
+    }),
+    map((response) => response.items || []),
+  );
 
   constructor(
     private readonly contactsService: ContactsService,
@@ -48,8 +46,7 @@ export class AccountContactsComponent implements OnInit {
     private readonly contacts: ContactsClient,
     private readonly languageService: LanguageService,
     private readonly keycloak: KeycloakService,
-  ) {
-  }
+  ) {}
 
   ngOnInit(): void {
     setTimeout(() => this.pageEnv.set({pageId: 198}), 0);

src/app/account/inbox-pictures/inbox-pictures.component.ts

@@ -3,7 +3,7 @@ import {ActivatedRoute} from '@angular/router';
 import {AuthService} from '@services/auth.service';
 import {PageEnvService} from '@services/page-env.service';
 import {PictureService} from '@services/picture';
-import {EMPTY, combineLatest} from 'rxjs';
+import {combineLatest, EMPTY} from 'rxjs';
 import {catchError, debounceTime, distinctUntilChanged, map, switchMap} from 'rxjs/operators';
 
 import {ToastsService} from '../../toasts/toasts.service';

src/app/account/profile/profile.component.ts

@@ -10,7 +10,7 @@ import {PageEnvService} from '@services/page-env.service';
 import {TimezoneService} from '@services/timezone';
 import {InvalidParams} from '@utils/invalid-params.pipe';
 import {KeycloakService} from 'keycloak-angular';
-import {EMPTY, Subscription, of} from 'rxjs';
+import {EMPTY, of, Subscription} from 'rxjs';
 import {catchError, switchMap, tap} from 'rxjs/operators';
 
 import {ToastsService} from '../../toasts/toasts.service';
@@ -102,7 +102,9 @@ export class AccountProfileComponent implements OnInit, OnDestroy {
       });
   }
   ngOnDestroy(): void {
-    this.sub && this.sub.unsubscribe();
+    if (this.sub) {
+      this.sub.unsubscribe();
+    }
   }
 
   private showSavedMessage() {

src/app/account/specs-conflicts/specs-conflicts.component.ts

@@ -5,7 +5,7 @@ import {AuthService} from '@services/auth.service';
 import {PageEnvService} from '@services/page-env.service';
 import {UserService} from '@services/user';
 import {getUnitAbbrTranslation} from '@utils/translations';
-import {Observable, combineLatest} from 'rxjs';
+import {combineLatest, Observable} from 'rxjs';
 import {debounceTime, distinctUntilChanged, map, switchMap} from 'rxjs/operators';
 
 import {APIAttrConflict, APIAttrConflictValue, APIAttrsService} from '../../api/attrs/attrs.service';

src/app/api/attrs/attrs.service.ts

@@ -2,8 +2,8 @@ import {Injectable} from '@angular/core';
 import {
   AttrAttribute,
   AttrAttributeID,
-  AttrAttributeType,
   AttrAttributesRequest,
+  AttrAttributeType,
   AttrListOptionsRequest,
   AttrListOptionsResponse,
   AttrZone,

src/app/api/picture-moder-vote-template/picture-moder-vote-template.service.ts

@@ -3,7 +3,7 @@ import {DeleteModerVoteTemplateRequest, ModerVoteTemplate} from '@grpc/spec.pb';
 import {PicturesClient} from '@grpc/spec.pbsc';
 import {Empty} from '@ngx-grpc/well-known-types';
 import {AuthService} from '@services/auth.service';
-import {BehaviorSubject, Observable, combineLatest} from 'rxjs';
+import {BehaviorSubject, combineLatest, Observable} from 'rxjs';
 import {map, shareReplay, switchMap, tap} from 'rxjs/operators';
 
 export interface APIPictureModerVoteTemplatePostData {

src/app/cars/attrs-change-log/attrs-change-log.component.ts

@@ -9,10 +9,10 @@ import {APIItem} from '@services/item';
 import {PageEnvService} from '@services/page-env.service';
 import {UserService} from '@services/user';
 import {getAttrsTranslation, getUnitAbbrTranslation} from '@utils/translations';
-import {EMPTY, Observable, Subscription, combineLatest, of} from 'rxjs';
+import {combineLatest, EMPTY, Observable, of, Subscription} from 'rxjs';
 import {catchError, debounceTime, distinctUntilChanged, map, shareReplay, switchMap} from 'rxjs/operators';
 
-import {APIAttrAttributeValue, APIAttrUnit, APIAttrsService} from '../../api/attrs/attrs.service';
+import {APIAttrAttributeValue, APIAttrsService, APIAttrUnit} from '../../api/attrs/attrs.service';
 import {ToastsService} from '../../toasts/toasts.service';
 
 @Component({
@@ -158,7 +158,9 @@ export class CarsAttrsChangeLogComponent implements OnInit, OnDestroy {
   }
 
   ngOnDestroy(): void {
-    this.querySub && this.querySub.unsubscribe();
+    if (this.querySub) {
+      this.querySub.unsubscribe();
+    }
   }
 
   protected getAttrsTranslation(id: string): string {

src/app/cars/specifications-editor/engine/select/select.component.ts

@@ -6,7 +6,7 @@ import {APIService} from '@services/api.service';
 import {APIItemParentGetResponse, ItemParentService} from '@services/item-parent';
 import {LanguageService} from '@services/language';
 import {PageEnvService} from '@services/page-env.service';
-import {BehaviorSubject, EMPTY, Observable, combineLatest} from 'rxjs';
+import {BehaviorSubject, combineLatest, EMPTY, Observable} from 'rxjs';
 import {catchError, debounceTime, distinctUntilChanged, map, shareReplay, switchMap, tap} from 'rxjs/operators';
 
 import {chunk} from '../../../../chunk';

src/app/cars/specifications-editor/engine/select/tree-item/tree-item.component.ts

@@ -23,7 +23,7 @@ export class CarsSelectEngineTreeItemComponent {
 
   private loadChildCatalogues() {
     this.loading = true;
-    this.item &&
+    if (this.item) {
       this.itemParentService
         .getItems$({
           fields: 'item.name_html,item.childs_count',
@@ -42,6 +42,7 @@ export class CarsSelectEngineTreeItemComponent {
             this.loading = false;
           },
         });
+    }
   }
 
   protected selectEngine(engineId: number) {

src/app/cars/specifications-editor/spec/spec.component.ts

@@ -12,16 +12,16 @@ import {
   getUnitAbbrTranslation,
   getUnitNameTranslation,
 } from '@utils/translations';
-import {BehaviorSubject, EMPTY, Observable, combineLatest, forkJoin, of} from 'rxjs';
+import {BehaviorSubject, combineLatest, EMPTY, forkJoin, Observable, of} from 'rxjs';
 import {catchError, distinctUntilChanged, map, shareReplay, switchMap, tap} from 'rxjs/operators';
 
 import {
   APIAttrAttributeValue,
+  APIAttrsService,
   APIAttrUnit,
   APIAttrUserValue,
   APIAttrUserValueGetResponse,
   APIAttrValue,
-  APIAttrsService,
   AttrAttributeTreeItem,
 } from '../../../api/attrs/attrs.service';
 import {ToastsService} from '../../../toasts/toasts.service';

src/app/cars/specs-admin/specs-admin.component.ts

@@ -6,10 +6,10 @@ import {APIItem} from '@services/item';
 import {PageEnvService} from '@services/page-env.service';
 import {UserService} from '@services/user';
 import {getAttrsTranslation, getUnitNameTranslation} from '@utils/translations';
-import {BehaviorSubject, EMPTY, Observable, combineLatest} from 'rxjs';
+import {BehaviorSubject, combineLatest, EMPTY, Observable} from 'rxjs';
 import {catchError, debounceTime, distinctUntilChanged, map, shareReplay, switchMap} from 'rxjs/operators';
 
-import {APIAttrAttributeValue, APIAttrUnit, APIAttrUserValue, APIAttrsService} from '../../api/attrs/attrs.service';
+import {APIAttrAttributeValue, APIAttrsService, APIAttrUnit, APIAttrUserValue} from '../../api/attrs/attrs.service';
 import {ToastsService} from '../../toasts/toasts.service';
 
 @Component({

src/app/catalogue/cars/cars.component.ts

@@ -14,7 +14,7 @@ import {LanguageService} from '@services/language';
 import {PageEnvService} from '@services/page-env.service';
 import {CatalogueListItem, CatalogueListItemPicture} from '@utils/list-item/list-item.component';
 import {getVehicleTypeTranslation} from '@utils/translations';
-import {EMPTY, Observable, combineLatest, of} from 'rxjs';
+import {combineLatest, EMPTY, Observable, of} from 'rxjs';
 import {debounceTime, distinctUntilChanged, map, shareReplay, switchMap} from 'rxjs/operators';
 
 @Component({

src/app/catalogue/catalogue-service.ts

@@ -6,7 +6,7 @@ import {APIPathTreeItemParent} from '@services/item';
 import {APIItemParent, ItemParentService} from '@services/item-parent';
 import {LanguageService} from '@services/language';
 import {APIPicture} from '@services/picture';
-import {EMPTY, Observable, OperatorFunction, of} from 'rxjs';
+import {EMPTY, Observable, of, OperatorFunction} from 'rxjs';
 import {debounceTime, distinctUntilChanged, map, switchMap} from 'rxjs/operators';
 
 interface Parent {
@@ -20,7 +20,7 @@ export interface Breadcrumbs {
   routerLink: string[];
 }
 
-type ParentObservableFunc = () => OperatorFunction<Parent | null, Parent | null>;
+type ParentObservableFunc = () => OperatorFunction<null | Parent, null | Parent>;
 
 @Injectable()
 export class CatalogueService {
@@ -56,7 +56,7 @@ export class CatalogueService {
     fields: string,
   ): Observable<{brand: APIItem; path: APIItemParent[]; type: string} | null> {
     const pathPipeRecursive: ParentObservableFunc = () =>
-      switchMap((parent: Parent | null) => {
+      switchMap((parent: null | Parent) => {
         if (!parent || !parent.id || parent.path.length <= 0) {
           return of(parent);
         }
@@ -78,7 +78,7 @@ export class CatalogueService {
             parent_id: parent.id,
           })
           .pipe(
-            map((response): Parent | null => {
+            map((response): null | Parent => {
               if (response.items.length <= 0) {
                 return null;
               }

src/app/catalogue/concepts/concepts.component.ts

@@ -6,7 +6,7 @@ import {ItemService} from '@services/item';
 import {LanguageService} from '@services/language';
 import {PageEnvService} from '@services/page-env.service';
 import {CatalogueListItem, CatalogueListItemPicture} from '@utils/list-item/list-item.component';
-import {EMPTY, Observable, combineLatest, of} from 'rxjs';
+import {combineLatest, EMPTY, Observable, of} from 'rxjs';
 import {debounceTime, distinctUntilChanged, map, shareReplay, switchMap, tap} from 'rxjs/operators';
 
 @Component({

src/app/catalogue/engines/engines.component.ts

@@ -6,7 +6,7 @@ import {ItemParentService} from '@services/item-parent';
 import {LanguageService} from '@services/language';
 import {PageEnvService} from '@services/page-env.service';
 import {CatalogueListItem, CatalogueListItemPicture} from '@utils/list-item/list-item.component';
-import {EMPTY, combineLatest, of} from 'rxjs';
+import {combineLatest, EMPTY, of} from 'rxjs';
 import {debounceTime, distinctUntilChanged, map, shareReplay, switchMap, tap} from 'rxjs/operators';
 
 @Component({

src/app/catalogue/index/index.component.ts

@@ -9,7 +9,7 @@ import {LanguageService} from '@services/language';
 import {PageEnvService} from '@services/page-env.service';
 import {APIPicture, PictureService} from '@services/picture';
 import {getCatalogueSectionsTranslation} from '@utils/translations';
-import {EMPTY, Observable, combineLatest, of} from 'rxjs';
+import {combineLatest, EMPTY, Observable, of} from 'rxjs';
 import {debounceTime, distinctUntilChanged, map, shareReplay, switchMap, tap} from 'rxjs/operators';
 
 import {chunk, chunkBy} from '../../chunk';

src/app/catalogue/matcher.ts

@@ -37,8 +37,8 @@ export function cataloguePathMatcher(url: UrlSegment[]) {
   if (i < url.length) {
     const segment = url[i].path;
     switch (segment) {
-      case 'tuning':
       case 'sport':
+      case 'tuning':
         type = segment;
         consumed.push(url[i]);
         break;

src/app/catalogue/mixed/mixed.component.ts

@@ -5,7 +5,7 @@ import {ItemsClient} from '@grpc/spec.pbsc';
 import {LanguageService} from '@services/language';
 import {PageEnvService} from '@services/page-env.service';
 import {PictureService} from '@services/picture';
-import {EMPTY, Observable, combineLatest, of} from 'rxjs';
+import {combineLatest, EMPTY, Observable, of} from 'rxjs';
 import {debounceTime, distinctUntilChanged, map, shareReplay, switchMap, tap} from 'rxjs/operators';
 
 import {chunkBy} from '../../chunk';

src/app/catalogue/mixed/picture/picture.component.ts

@@ -5,7 +5,7 @@ import {ItemsClient} from '@grpc/spec.pbsc';
 import {LanguageService} from '@services/language';
 import {PageEnvService} from '@services/page-env.service';
 import {APIPicture, PictureService} from '@services/picture';
-import {BehaviorSubject, EMPTY, Observable, combineLatest, of} from 'rxjs';
+import {BehaviorSubject, combineLatest, EMPTY, Observable, of} from 'rxjs';
 import {debounceTime, distinctUntilChanged, map, shareReplay, switchMap, tap} from 'rxjs/operators';
 
 import {BrandPerspectivePageData} from '../../catalogue.module';

src/app/catalogue/recent/recent.component.ts

@@ -5,7 +5,7 @@ import {ItemsClient} from '@grpc/spec.pbsc';
 import {LanguageService} from '@services/language';
 import {PageEnvService} from '@services/page-env.service';
 import {APIPicture, PictureService} from '@services/picture';
-import {EMPTY, Observable, combineLatest} from 'rxjs';
+import {combineLatest, EMPTY, Observable} from 'rxjs';
 import {debounceTime, distinctUntilChanged, map, shareReplay, switchMap, tap} from 'rxjs/operators';
 
 import {chunkBy} from '../../chunk';

src/app/catalogue/vehicles/gallery/gallery.component.ts

@@ -1,7 +1,7 @@
 import {Component} from '@angular/core';
 import {ActivatedRoute, Router} from '@angular/router';
 import {PageEnvService} from '@services/page-env.service';
-import {EMPTY, combineLatest, of} from 'rxjs';
+import {combineLatest, EMPTY, of} from 'rxjs';
 import {debounceTime, distinctUntilChanged, map, shareReplay, switchMap} from 'rxjs/operators';
 
 import {APIGalleryItem} from '../../../gallery/definitions';

src/app/catalogue/vehicles/pictures/picture/picture.component.ts

@@ -3,7 +3,7 @@ import {ActivatedRoute, Router} from '@angular/router';
 import {APIItem, CommentsType} from '@grpc/spec.pb';
 import {PageEnvService} from '@services/page-env.service';
 import {APIPicture, PictureService} from '@services/picture';
-import {BehaviorSubject, EMPTY, Observable, combineLatest, of} from 'rxjs';
+import {BehaviorSubject, combineLatest, EMPTY, Observable, of} from 'rxjs';
 import {debounceTime, distinctUntilChanged, map, shareReplay, switchMap, tap} from 'rxjs/operators';
 
 import {CatalogueService} from '../../../catalogue-service';

src/app/catalogue/vehicles/pictures/pictures.component.ts

@@ -7,7 +7,7 @@ import {APIItemParent} from '@services/item-parent';
 import {PageEnvService} from '@services/page-env.service';
 import {PictureService} from '@services/picture';
 import {getItemTypeTranslation} from '@utils/translations';
-import {EMPTY, Observable, combineLatest, of} from 'rxjs';
+import {combineLatest, EMPTY, Observable, of} from 'rxjs';
 import {debounceTime, distinctUntilChanged, map, shareReplay, switchMap, tap} from 'rxjs/operators';
 
 import {chunkBy} from '../../../chunk';

src/app/catalogue/vehicles/vehicles.component.ts

@@ -9,7 +9,7 @@ import {PageEnvService} from '@services/page-env.service';
 import {APIPicture, PictureService} from '@services/picture';
 import {CatalogueListItem, CatalogueListItemPicture} from '@utils/list-item/list-item.component';
 import {getItemTypeTranslation} from '@utils/translations';
-import {EMPTY, Observable, combineLatest, of} from 'rxjs';
+import {combineLatest, EMPTY, Observable, of} from 'rxjs';
 import {debounceTime, distinctUntilChanged, map, shareReplay, switchMap, tap} from 'rxjs/operators';
 
 import {CatalogueService} from '../catalogue-service';
@@ -272,10 +272,10 @@ export class CatalogueVehiclesComponent {
 
   private static resolveTypeId(type: string) {
     switch (type) {
-      case 'tuning':
-        return 1;
       case 'sport':
         return 2;
+      case 'tuning':
+        return 1;
     }
     return 0;
   }