style: rxjs/finnish, simplify imports

Author: autowp

package-lock.json

@@ -22,7 +22,7 @@ export class AccountAccountsComponent implements OnInit {
 
   private readonly reload$ = new BehaviorSubject<void>(void 0);
   protected readonly accounts$: Observable<APIAccount[]> = combineLatest([
-    this.api.request<APIAccountItemsGetResponse>('GET', 'account'),
+    this.api.request$<APIAccountItemsGetResponse>('GET', 'account'),
     this.reload$,
   ]).pipe(
     catchError((error: unknown) => {
@@ -39,7 +39,7 @@ export class AccountAccountsComponent implements OnInit {
   }
 
   protected remove(account: APIAccount) {
-    this.api.request('DELETE', 'account/' + account.id).subscribe({
+    this.api.request$('DELETE', 'account/' + account.id).subscribe({
       error: (response: unknown) => {
         this.disconnectFailed = true;
         this.toastService.handleError(response);

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

@@ -6,14 +6,13 @@ import {UsersClient} from '@grpc/spec.pbsc';
 import {GrpcStatusEvent} from '@ngx-grpc/common';
 import {AuthService} from '@services/auth.service';
 import {PageEnvService} from '@services/page-env.service';
-import {InvalidParams} from '@utils/invalid-params.pipe';
+import {InvalidParams, InvalidParamsPipe} from '@utils/invalid-params.pipe';
+import {MarkdownComponent} from '@utils/markdown/markdown.component';
 import {EMPTY} from 'rxjs';
 import {switchMap} from 'rxjs/operators';
 
 import {extractFieldViolations, fieldViolations2InvalidParams} from '../../grpc';
 import {ToastsService} from '../../toasts/toasts.service';
-import {InvalidParamsPipe} from '../../utils/invalid-params.pipe';
-import {MarkdownComponent} from '../../utils/markdown/markdown.component';
 
 @Component({
   imports: [MarkdownComponent, FormsModule, InvalidParamsPipe],

src/app/account/delete/delete.component.ts

@@ -1,7 +1,6 @@
 import {Component, inject, OnInit} from '@angular/core';
 import {PageEnvService} from '@services/page-env.service';
-
-import {MarkdownComponent} from '../../../utils/markdown/markdown.component';
+import {MarkdownComponent} from '@utils/markdown/markdown.component';
 
 @Component({
   imports: [MarkdownComponent],

src/app/account/delete/deleted/deleted.component.ts

@@ -6,15 +6,15 @@ import {MessagingClient} from '@grpc/spec.pbsc';
 import {MessageService} from '@services/message';
 import {PageEnvService} from '@services/page-env.service';
 import {UserService} from '@services/user';
+import {PastTimeIndicatorComponent} from '@utils/past-time-indicator/past-time-indicator.component';
+import {UserTextComponent} from '@utils/user-text/user-text.component';
 import {BehaviorSubject, EMPTY, Observable, of} from 'rxjs';
 import {catchError, debounceTime, distinctUntilChanged, map, switchMap, tap} from 'rxjs/operators';
 
 import {MessageDialogService} from '../../message-dialog/message-dialog.service';
 import {PaginatorComponent} from '../../paginator/paginator/paginator.component';
 import {ToastsService} from '../../toasts/toasts.service';
 import {UserComponent} from '../../user/user/user.component';
-import {PastTimeIndicatorComponent} from '../../utils/past-time-indicator/past-time-indicator.component';
-import {UserTextComponent} from '../../utils/user-text/user-text.component';
 
 @Component({
   imports: [UserComponent, RouterLink, UserTextComponent, PastTimeIndicatorComponent, PaginatorComponent, AsyncPipe],

src/app/account/messages/messages.component.ts

@@ -10,14 +10,13 @@ import {AuthService} from '@services/auth.service';
 import {LanguageService} from '@services/language';
 import {PageEnvService} from '@services/page-env.service';
 import {TimezoneService} from '@services/timezone';
-import {InvalidParams} from '@utils/invalid-params.pipe';
+import {InvalidParams, InvalidParamsPipe} from '@utils/invalid-params.pipe';
+import {MarkdownComponent} from '@utils/markdown/markdown.component';
 import {KeycloakService} from 'keycloak-angular';
 import {EMPTY, of, Subscription} from 'rxjs';
 import {catchError, switchMap, tap} from 'rxjs/operators';
 
 import {ToastsService} from '../../toasts/toasts.service';
-import {InvalidParamsPipe} from '../../utils/invalid-params.pipe';
-import {MarkdownComponent} from '../../utils/markdown/markdown.component';
 
 @Component({
   imports: [MarkdownComponent, FormsModule, AsyncPipe, InvalidParamsPipe],
@@ -118,7 +117,7 @@ export class AccountProfileComponent implements OnInit, OnDestroy {
   protected sendSettings() {
     this.settingsInvalidParams = {};
 
-    this.api.request<void>('PUT', 'user/me', {body: this.settings}).subscribe({
+    this.api.request$<void>('PUT', 'user/me', {body: this.settings}).subscribe({
       error: (response: unknown) => {
         if (response instanceof HttpErrorResponse && response.status === 400) {
           this.settingsInvalidParams = response.error.invalid_params;
@@ -138,7 +137,7 @@ export class AccountProfileComponent implements OnInit, OnDestroy {
   }*/
 
   protected resetPhoto() {
-    this.api.request('DELETE', 'user/me/photo').subscribe({
+    this.api.request$('DELETE', 'user/me/photo').subscribe({
       error: (response: unknown) => this.toastService.handleError(response),
       next: () => {
         if (this.user) {
@@ -161,7 +160,7 @@ export class AccountProfileComponent implements OnInit, OnDestroy {
     formData.append('file', file);
 
     return this.api
-      .request('POST', 'user/me/photo', {body: formData})
+      .request$('POST', 'user/me/photo', {body: formData})
       .pipe(
         catchError((response: unknown) => {
           if (this.input) {

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

@@ -39,7 +39,7 @@ export class BrandsComponent implements OnInit {
   private readonly toastService = inject(ToastsService);
   private readonly grpc = inject(AutowpClient);
 
-  protected readonly items$: Observable<APIBrandsLines> = this.api.request<APIBrandsGetResponse>('GET', 'brands').pipe(
+  protected readonly items$: Observable<APIBrandsLines> = this.api.request$<APIBrandsGetResponse>('GET', 'brands').pipe(
     catchError((response: unknown) => {
       this.toastService.handleError(response);
       return EMPTY;

src/app/brands/brands.component.ts

@@ -56,7 +56,7 @@ export class CarsSpecificationsEditorEngineComponent {
 
   private setEngineID(item: APIItem, value: string) {
     this.api
-      .request<void>('PUT', 'item/' + item.id, {
+      .request$<void>('PUT', 'item/' + item.id, {
         body: {
           engine_id: value,
         },

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

@@ -137,7 +137,7 @@ export class CarsEngineSelectComponent {
 
   protected selectEngine(itemID: number, engineId: number) {
     this.api
-      .request<void>('PUT', 'item/' + itemID, {
+      .request$<void>('PUT', 'item/' + itemID, {
         body: {
           engine_id: engineId,
         },

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

@@ -22,7 +22,7 @@ export class CarsSpecificationsEditorResultComponent {
   protected readonly html$ = this.item$.pipe(
     switchMap((item) =>
       item
-        ? this.api.request('GET', 'item/' + item.id + '/specifications', {
+        ? this.api.request$('GET', 'item/' + item.id + '/specifications', {
             responseType: 'text',
           })
         : EMPTY,

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

@@ -282,7 +282,7 @@ export class CarsSpecificationsEditorSpecComponent {
     this.loading++;
     this.invalidParams.clear();
     this.api
-      .request<APIAttrUserValuePatchResponse>('PATCH', 'attr/user-value', {
+      .request$<APIAttrUserValuePatchResponse>('PATCH', 'attr/user-value', {
         body: {
           items,
         },

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

@@ -7,11 +7,11 @@ import {APIService} from '@services/api.service';
 import {AuthService} from '@services/auth.service';
 import {APIItem, ItemService} from '@services/item';
 import {PageEnvService} from '@services/page-env.service';
+import {MarkdownComponent} from '@utils/markdown/markdown.component';
 import {BehaviorSubject, EMPTY, Observable, of} from 'rxjs';
 import {debounceTime, distinctUntilChanged, map, switchMap} from 'rxjs/operators';
 
 import {ToastsService} from '../../toasts/toasts.service';
-import {MarkdownComponent} from '../../utils/markdown/markdown.component';
 import {CarsSpecificationsEditorEngineComponent} from './engine/engine.component';
 import {CarsSpecificationsEditorResultComponent} from './result/result.component';
 import {CarsSpecificationsEditorSpecComponent} from './spec/spec.component';
@@ -78,7 +78,7 @@ export class CarsSpecificationsEditorComponent {
   }
 
   protected refreshInheritance(item: APIItem) {
-    this.api.request<void>('POST', 'item/' + item.id + '/refresh-inheritance', {body: {}}).subscribe({
+    this.api.request$<void>('POST', 'item/' + item.id + '/refresh-inheritance', {body: {}}).subscribe({
       error: (response: unknown) => this.toastService.handleError(response),
       next: () => {
         this.router.navigate(['/cars/specifications-editor'], {

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

@@ -90,7 +90,7 @@ export class CarsSpecsAdminComponent implements OnInit {
 
   protected deleteValue(value: AttrUserValueListItem) {
     this.api
-      .request(
+      .request$<void>(
         'DELETE',
         'attr/user-value/' + value.userValue.attributeId + '/' + value.userValue.itemId + '/' + value.userValue.userId,
       )
@@ -104,7 +104,7 @@ export class CarsSpecsAdminComponent implements OnInit {
 
   protected moveValues(itemID: string) {
     this.api
-      .request<void>('PATCH', 'attr/user-value', {
+      .request$<void>('PATCH', 'attr/user-value', {
         body: {
           item_id: this.move.item_id,
         },

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

@@ -15,12 +15,12 @@ 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 {CatalogueListItemComponent} from '@utils/list-item/list-item.component';
 import {getVehicleTypeTranslation} from '@utils/translations';
 import {combineLatest, EMPTY, Observable, of} from 'rxjs';
 import {debounceTime, distinctUntilChanged, map, shareReplay, switchMap} from 'rxjs/operators';
 
 import {PaginatorComponent} from '../../paginator/paginator/paginator.component';
-import {CatalogueListItemComponent} from '../../utils/list-item/list-item.component';
 
 @Component({
   imports: [RouterLink, CatalogueListItemComponent, PaginatorComponent, AsyncPipe],

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

@@ -7,11 +7,11 @@ 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 {CatalogueListItemComponent} from '@utils/list-item/list-item.component';
 import {combineLatest, EMPTY, Observable, of} from 'rxjs';
 import {debounceTime, distinctUntilChanged, map, shareReplay, switchMap, tap} from 'rxjs/operators';
 
 import {PaginatorComponent} from '../../paginator/paginator/paginator.component';
-import {CatalogueListItemComponent} from '../../utils/list-item/list-item.component';
 
 @Component({
   imports: [RouterLink, CatalogueListItemComponent, PaginatorComponent, AsyncPipe],

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

@@ -7,11 +7,11 @@ 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 {CatalogueListItemComponent} from '@utils/list-item/list-item.component';
 import {combineLatest, EMPTY, of} from 'rxjs';
 import {debounceTime, distinctUntilChanged, map, shareReplay, switchMap, tap} from 'rxjs/operators';
 
 import {PaginatorComponent} from '../../paginator/paginator/paginator.component';
-import {CatalogueListItemComponent} from '../../utils/list-item/list-item.component';
 
 @Component({
   imports: [RouterLink, CatalogueListItemComponent, PaginatorComponent, AsyncPipe],

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

@@ -17,14 +17,14 @@ import {ItemService} from '@services/item';
 import {LanguageService} from '@services/language';
 import {PageEnvService} from '@services/page-env.service';
 import {APIPicture, PictureService} from '@services/picture';
+import {MarkdownComponent} from '@utils/markdown/markdown.component';
 import {getCatalogueSectionsTranslation} from '@utils/translations';
 import {combineLatest, EMPTY, Observable, of} from 'rxjs';
 import {catchError, debounceTime, distinctUntilChanged, map, shareReplay, switchMap, tap} from 'rxjs/operators';
 
 import {chunk, chunkBy} from '../../chunk';
 import {ThumbnailComponent} from '../../thumbnail/thumbnail/thumbnail.component';
 import {ToastsService} from '../../toasts/toasts.service';
-import {MarkdownComponent} from '../../utils/markdown/markdown.component';
 import {CatalogueService} from '../catalogue-service';
 
 interface APIBrandSectionGroup {
@@ -191,7 +191,7 @@ export class CatalogueIndexComponent {
   protected readonly sections$: Observable<
     {halfChunks: APIBrandSectionGroup[][][]; name: string; routerLink: string[]}[]
   > = this.brand$.pipe(
-    switchMap((brand) => this.api.request<APIBrandSection[]>('GET', 'brands/' + brand.id + '/sections')),
+    switchMap((brand) => this.api.request$<APIBrandSection[]>('GET', 'brands/' + brand.id + '/sections')),
     map((response) =>
       response.map((section) => ({
         halfChunks: chunk(section.groups, 2).map((halfChunk) => chunk(halfChunk, 2)),

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

@@ -1,9 +1,7 @@
 import {Component, Input} from '@angular/core';
 import {RouterLink} from '@angular/router';
 import {APIItemChildsCounts} from '@services/item';
-import {ItemHeader} from '@utils/item-header/item-header.component';
-
-import {ItemHeaderComponent} from '../../utils/item-header/item-header.component';
+import {ItemHeader, ItemHeaderComponent} from '@utils/item-header/item-header.component';
 
 @Component({
   imports: [RouterLink, ItemHeaderComponent],

src/app/catalogue/item-menu/item-menu.component.ts

@@ -7,14 +7,14 @@ import {APIItem} from '@services/item';
 import {APIItemParent} from '@services/item-parent';
 import {PageEnvService} from '@services/page-env.service';
 import {PictureService} from '@services/picture';
+import {ItemHeaderComponent} from '@utils/item-header/item-header.component';
 import {getItemTypeTranslation} from '@utils/translations';
 import {combineLatest, EMPTY, Observable, of} from 'rxjs';
 import {debounceTime, distinctUntilChanged, map, shareReplay, switchMap, tap} from 'rxjs/operators';
 
 import {chunkBy} from '../../../chunk';
 import {PaginatorComponent} from '../../../paginator/paginator/paginator.component';
 import {ThumbnailComponent} from '../../../thumbnail/thumbnail/thumbnail.component';
-import {ItemHeaderComponent} from '../../../utils/item-header/item-header.component';
 import {Breadcrumbs, CatalogueService} from '../../catalogue-service';
 import {CatalogueItemMenuComponent} from '../../item-menu/item-menu.component';
 

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

@@ -58,13 +58,13 @@ export class CatalogueVehiclesSpecificationsComponent {
   protected readonly html$ = this.item$.pipe(
     switchMap((item) => {
       if (item.has_child_specs) {
-        return this.api.request('GET', 'item/' + item.id + '/child-specifications', {
+        return this.api.request$('GET', 'item/' + item.id + '/child-specifications', {
           responseType: 'text',
         });
       }
 
       if (item.has_specs) {
-        return this.api.request('GET', 'item/' + item.id + '/specifications', {
+        return this.api.request$('GET', 'item/' + item.id + '/specifications', {
           responseType: 'text',
         });
       }

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

@@ -8,15 +8,18 @@ import {APIItem, ItemService} from '@services/item';
 import {APIItemParent, ItemParentService} from '@services/item-parent';
 import {PageEnvService} from '@services/page-env.service';
 import {APIPicture, PictureService} from '@services/picture';
-import {CatalogueListItem, CatalogueListItemPicture} from '@utils/list-item/list-item.component';
+import {ItemHeaderComponent} from '@utils/item-header/item-header.component';
+import {
+  CatalogueListItem,
+  CatalogueListItemComponent,
+  CatalogueListItemPicture,
+} from '@utils/list-item/list-item.component';
+import {MarkdownComponent} from '@utils/markdown/markdown.component';
 import {getItemTypeTranslation} from '@utils/translations';
 import {combineLatest, EMPTY, Observable, of} from 'rxjs';
 import {debounceTime, distinctUntilChanged, map, shareReplay, switchMap, tap} from 'rxjs/operators';
 
 import {PaginatorComponent} from '../../paginator/paginator/paginator.component';
-import {ItemHeaderComponent} from '../../utils/item-header/item-header.component';
-import {CatalogueListItemComponent} from '../../utils/list-item/list-item.component';
-import {MarkdownComponent} from '../../utils/markdown/markdown.component';
 import {CatalogueService} from '../catalogue-service';
 import {CatalogueItemMenuComponent} from '../item-menu/item-menu.component';
 

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

@@ -7,11 +7,11 @@ import {APIItem, ItemService} from '@services/item';
 import {ItemParentService} from '@services/item-parent';
 import {PageEnvService} from '@services/page-env.service';
 import {APIPicture, PictureService} from '@services/picture';
+import {MarkdownComponent} from '@utils/markdown/markdown.component';
 import {combineLatest, Observable, of} from 'rxjs';
 import {debounceTime, distinctUntilChanged, map, shareReplay, switchMap, tap} from 'rxjs/operators';
 
 import {PaginatorComponent} from '../../../paginator/paginator/paginator.component';
-import {MarkdownComponent} from '../../../utils/markdown/markdown.component';
 import {CategoriesListItemComponent} from '../../list-item.component';
 import {CategoriesService} from '../../service';
 

src/app/categories/category/item/item.component.ts

@@ -6,12 +6,11 @@ import {ACLService, Privilege, Resource} from '@services/acl.service';
 import {APIImage} from '@services/api.service';
 import {APIItem} from '@services/item';
 import {APIPicture} from '@services/picture';
+import {ItemHeaderComponent} from '@utils/item-header/item-header.component';
+import {MarkdownComponent} from '@utils/markdown/markdown.component';
 import {BehaviorSubject, combineLatest, EMPTY, Observable, of} from 'rxjs';
 import {map, switchMap} from 'rxjs/operators';
 
-import {ItemHeaderComponent} from '../utils/item-header/item-header.component';
-import {MarkdownComponent} from '../utils/markdown/markdown.component';
-
 interface PictureThumbRoute {
   picture: APIPicture | null;
   route: null | string[];

src/app/categories/list-item.component.ts

@@ -84,7 +84,7 @@ export class ChartComponent implements OnInit {
   ngOnInit(): void {
     setTimeout(() => this.pageEnv.set({pageId: 1}), 0);
 
-    this.api.request<APIChartParameters>('GET', 'chart/parameters').subscribe({
+    this.api.request$<APIChartParameters>('GET', 'chart/parameters').subscribe({
       error: (response: unknown) => this.toastService.handleError(response),
       next: (response) => {
         this.parameters = response.parameters;
@@ -97,7 +97,7 @@ export class ChartComponent implements OnInit {
     this.chart.data = [];
 
     this.api
-      .request<APIChartData>('GET', 'chart/data', {
+      .request$<APIChartData>('GET', 'chart/data', {
         params: {id: id.toString()},
       })
       .subscribe({

src/app/chart/chart.component.ts

@@ -13,12 +13,12 @@ import {
 } from '@grpc/spec.pb';
 import {CommentsClient} from '@grpc/spec.pbsc';
 import {AuthService} from '@services/auth.service';
+import {MarkdownComponent} from '@utils/markdown/markdown.component';
 import {BehaviorSubject, combineLatest, EMPTY, Observable} from 'rxjs';
 import {catchError, debounceTime, distinctUntilChanged, map, switchMap, take, tap} from 'rxjs/operators';
 
 import {PaginatorComponent} from '../../paginator/paginator/paginator.component';
 import {ToastsService} from '../../toasts/toasts.service';
-import {MarkdownComponent} from '../../utils/markdown/markdown.component';
 import {CommentsFormComponent} from '../form/form.component';
 import {CommentsListComponent} from '../list/list.component';
 

src/app/comments/comments/comments.component.ts

@@ -3,13 +3,12 @@ import {FormsModule} from '@angular/forms';
 import {AddCommentRequest, CommentsType} from '@grpc/spec.pb';
 import {CommentsClient} from '@grpc/spec.pbsc';
 import {GrpcStatusEvent} from '@ngx-grpc/common';
-import {InvalidParams} from '@utils/invalid-params.pipe';
+import {InvalidParams, InvalidParamsPipe} from '@utils/invalid-params.pipe';
 import {BehaviorSubject, Subscription} from 'rxjs';
 import {switchMap, take, tap} from 'rxjs/operators';
 
 import {extractFieldViolations, fieldViolations2InvalidParams} from '../../grpc';
 import {ToastsService} from '../../toasts/toasts.service';
-import {InvalidParamsPipe} from '../../utils/invalid-params.pipe';
 
 @Component({
   imports: [FormsModule, InvalidParamsPipe],