Просмотр исходного кода

style(admin-ui): Fix all linter issues

Michael Bromley 7 лет назад
Родитель
Сommit
f0ff8c72c4
24 измененных файлов с 92 добавлено и 74 удалено
  1. 9 7
      admin-ui/src/app/app.component.ts
  2. 1 0
      admin-ui/src/app/app.routes.ts
  3. 2 0
      admin-ui/src/app/catalog/catalog.module.ts
  4. 2 0
      admin-ui/src/app/catalog/catalog.routes.ts
  5. 4 3
      admin-ui/src/app/core/components/app-shell/app-shell.component.ts
  6. 1 0
      admin-ui/src/app/core/components/breadcrumb/breadcrumb.component.spec.ts
  7. 1 0
      admin-ui/src/app/core/components/breadcrumb/breadcrumb.component.ts
  8. 2 7
      admin-ui/src/app/core/components/main-nav/main-nav.component.ts
  9. 1 0
      admin-ui/src/app/core/components/notification/notification.component.ts
  10. 4 3
      admin-ui/src/app/core/core.module.ts
  11. 2 1
      admin-ui/src/app/core/providers/data/data.service.ts
  12. 3 2
      admin-ui/src/app/core/providers/data/user-data.service.ts
  13. 3 2
      admin-ui/src/app/core/providers/guard/auth.guard.ts
  14. 1 1
      admin-ui/src/app/core/providers/notification/notification.service.spec.ts
  15. 1 1
      admin-ui/src/app/core/providers/notification/notification.service.ts
  16. 5 3
      admin-ui/src/app/dashboard/dashboard.module.ts
  17. 3 2
      admin-ui/src/app/login/components/login/login.component.ts
  18. 3 2
      admin-ui/src/app/login/login.module.ts
  19. 3 3
      admin-ui/src/app/shared/shared.module.ts
  20. 2 1
      admin-ui/src/app/state/action-logger.ts
  21. 4 3
      admin-ui/src/app/state/state-store.service.ts
  22. 5 5
      admin-ui/src/app/state/user/user-actions.ts
  23. 1 0
      admin-ui/src/test.ts
  24. 29 28
      admin-ui/tslint.json

+ 9 - 7
admin-ui/src/app/app.component.ts

@@ -1,7 +1,8 @@
 import { Component, OnInit } from '@angular/core';
-import { Apollo } from 'apollo-angular';
-import gql from 'graphql-tag';
-import { UserActions } from './state/user/user-actions';
+import { Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
+
+import { StateStore } from './state/state-store.service';
 
 @Component({
     selector: 'vdr-root',
@@ -9,13 +10,14 @@ import { UserActions } from './state/user/user-actions';
     styleUrls: ['./app.component.scss'],
 })
 export class AppComponent implements OnInit {
-    title = 'Vendure';
-    products: any[] = [];
+    loading$: Observable<boolean>;
 
-    constructor() {
+    constructor(private store: StateStore) {
     }
 
     ngOnInit() {
-
+        this.loading$ = this.store.select(state => state.api.inFlightRequests).pipe(
+            map(count => 0 < count),
+        );
     }
 }

+ 1 - 0
admin-ui/src/app/app.routes.ts

@@ -1,4 +1,5 @@
 import { Route } from '@angular/router';
+
 import { AppShellComponent } from './core/components/app-shell/app-shell.component';
 import { AuthGuard } from './core/providers/guard/auth.guard';
 

+ 2 - 0
admin-ui/src/app/catalog/catalog.module.ts

@@ -1,6 +1,8 @@
 import { NgModule } from '@angular/core';
 import { RouterModule } from '@angular/router';
+
 import { SharedModule } from '../shared/shared.module';
+
 import { catalogRoutes } from './catalog.routes';
 import { ProductDetailComponent } from './components/product-detail/product-detail.component';
 import { ProductListComponent } from './components/product-list/product-list.component';

+ 2 - 0
admin-ui/src/app/catalog/catalog.routes.ts

@@ -1,4 +1,6 @@
 import { Route } from '@angular/router';
+
+import { ProductDetailComponent } from './components/product-detail/product-detail.component';
 import { ProductListComponent } from './components/product-list/product-list.component';
 
 export const catalogRoutes: Route[] = [

+ 4 - 3
admin-ui/src/app/core/components/app-shell/app-shell.component.ts

@@ -1,13 +1,14 @@
 import { Component, OnInit } from '@angular/core';
-import { StateStore } from '../../../state/state-store.service';
+import { Router } from '@angular/router';
 import { Observable } from 'rxjs';
+
+import { StateStore } from '../../../state/state-store.service';
 import { UserActions } from '../../../state/user/user-actions';
-import { Router } from '@angular/router';
 
 @Component({
     selector: 'vdr-app-shell',
     templateUrl: './app-shell.component.html',
-    styleUrls: ['./app-shell.component.scss']
+    styleUrls: ['./app-shell.component.scss'],
 })
 export class AppShellComponent implements OnInit {
 

+ 1 - 0
admin-ui/src/app/core/components/breadcrumb/breadcrumb.component.spec.ts

@@ -7,6 +7,7 @@ import { Observable, of as observableOf } from 'rxjs';
 import { BehaviorSubject } from 'rxjs/BehaviorSubject';
 
 import { StateStore } from '../../../state/state-store.service';
+
 import { BreadcrumbComponent, BreadcrumbLabelLinkPair } from './breadcrumb.component';
 
 describe('BeadcrumbsComponent', () => {

+ 1 - 0
admin-ui/src/app/core/components/breadcrumb/breadcrumb.component.ts

@@ -3,6 +3,7 @@ import { ActivatedRoute, Data, NavigationEnd, Params, PRIMARY_OUTLET, Router } f
 import { flatten } from 'lodash';
 import { combineLatest as observableCombineLatest, Observable, of as observableOf, Subject } from 'rxjs';
 import { filter, map, takeUntil } from 'rxjs/operators';
+
 import { StateStore } from '../../../state/state-store.service';
 
 export type BreadcrumbString = string;

+ 2 - 7
admin-ui/src/app/core/components/main-nav/main-nav.component.ts

@@ -3,13 +3,8 @@ import { Component, OnInit } from '@angular/core';
 @Component({
   selector: 'vdr-main-nav',
   templateUrl: './main-nav.component.html',
-  styleUrls: ['./main-nav.component.scss']
+  styleUrls: ['./main-nav.component.scss'],
 })
-export class MainNavComponent implements OnInit {
-
-  constructor() { }
-
-  ngOnInit() {
-  }
+export class MainNavComponent {
 
 }

+ 1 - 0
admin-ui/src/app/core/components/notification/notification.component.ts

@@ -1,4 +1,5 @@
 import { ChangeDetectionStrategy, Component, ElementRef, HostListener, ViewChild } from '@angular/core';
+
 import { NotificationType } from '../../providers/notification/notification.service';
 
 @Component({

+ 4 - 3
admin-ui/src/app/core/core.module.ts

@@ -8,19 +8,20 @@ import { API_PATH } from '../../../../shared/shared-constants';
 import { API_URL } from '../app.config';
 import { SharedModule } from '../shared/shared.module';
 import { APOLLO_NGRX_CACHE, StateModule } from '../state/state.module';
+
 import { AppShellComponent } from './components/app-shell/app-shell.component';
 import { BreadcrumbComponent } from './components/breadcrumb/breadcrumb.component';
 import { MainNavComponent } from './components/main-nav/main-nav.component';
+import { NotificationComponent } from './components/notification/notification.component';
+import { OverlayHostComponent } from './components/overlay-host/overlay-host.component';
 import { UserMenuComponent } from './components/user-menu/user-menu.component';
 import { BaseDataService } from './providers/data/base-data.service';
 import { DataService } from './providers/data/data.service';
 import { DefaultInterceptor } from './providers/data/interceptor';
 import { AuthGuard } from './providers/guard/auth.guard';
 import { LocalStorageService } from './providers/local-storage/local-storage.service';
-import { OverlayHostComponent } from './components/overlay-host/overlay-host.component';
-import { OverlayHostService } from './providers/overlay-host/overlay-host.service';
 import { NotificationService } from './providers/notification/notification.service';
-import { NotificationComponent } from './components/notification/notification.component';
+import { OverlayHostService } from './providers/overlay-host/overlay-host.service';
 
 export function createApollo(httpLink: HttpLink, ngrxCache: InMemoryCache) {
   return {

+ 2 - 1
admin-ui/src/app/core/providers/data/data.service.ts

@@ -1,7 +1,8 @@
 import { Injectable } from '@angular/core';
-import { UserDataService } from './user-data.service';
+
 import { BaseDataService } from './base-data.service';
 import { ProductDataService } from './product-data.service';
+import { UserDataService } from './user-data.service';
 
 @Injectable()
 export class DataService {

+ 3 - 2
admin-ui/src/app/core/providers/data/user-data.service.ts

@@ -1,7 +1,9 @@
-import { BaseDataService } from './base-data.service';
 import { Observable } from 'rxjs';
+
 import { LoginResponse, UserResponse } from '../../../common/types/response';
 
+import { BaseDataService } from './base-data.service';
+
 export class UserDataService {
 
     constructor(private baseDataService: BaseDataService) {}
@@ -18,4 +20,3 @@ export class UserDataService {
     }
 
 }
-

+ 3 - 2
admin-ui/src/app/core/providers/guard/auth.guard.ts

@@ -1,8 +1,9 @@
 import { Injectable } from '@angular/core';
 import { ActivatedRouteSnapshot, CanActivate, Router } from '@angular/router';
-import { StateStore } from '../../../state/state-store.service';
-import { flatMap, mergeMap, tap } from 'rxjs/operators';
 import { Observable, of } from 'rxjs';
+import { flatMap, mergeMap, tap } from 'rxjs/operators';
+
+import { StateStore } from '../../../state/state-store.service';
 import { UserActions } from '../../../state/user/user-actions';
 
 @Injectable()

+ 1 - 1
admin-ui/src/app/core/providers/notification/notification.service.spec.ts

@@ -2,10 +2,10 @@ import { Component, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
 import {ComponentFixture, fakeAsync, TestBed, tick} from '@angular/core/testing';
 import {BrowserDynamicTestingModule} from '@angular/platform-browser-dynamic/testing';
 
+import {NotificationComponent} from '../../components/notification/notification.component';
 import {OverlayHostComponent} from '../../components/overlay-host/overlay-host.component';
 import {OverlayHostService} from '../overlay-host/overlay-host.service';
 
-import {NotificationComponent} from '../../components/notification/notification.component';
 import {NotificationService} from './notification.service';
 
 describe('NotificationService:', () => {

+ 1 - 1
admin-ui/src/app/core/providers/notification/notification.service.ts

@@ -21,7 +21,7 @@ const TOAST_DURATION = 3000;
 export class NotificationService {
 
     private hostView: ViewContainerRef;
-    private openToastRefs: { ref: ComponentRef<NotificationComponent>, timerId: any }[] = [];
+    private openToastRefs: Array<{ ref: ComponentRef<NotificationComponent>, timerId: any }> = [];
 
     constructor(private resolver: ComponentFactoryResolver, overlayHostService: OverlayHostService) {
         overlayHostService.getHostView().then(view => {

+ 5 - 3
admin-ui/src/app/dashboard/dashboard.module.ts

@@ -1,8 +1,10 @@
-import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
-import { DashboardComponent } from './components/dashboard/dashboard.component';
-import { SharedModule } from '../shared/shared.module';
+import { NgModule } from '@angular/core';
 import { RouterModule } from '@angular/router';
+
+import { SharedModule } from '../shared/shared.module';
+
+import { DashboardComponent } from './components/dashboard/dashboard.component';
 import { dashboardRoutes } from './dashboard.routes';
 
 @NgModule({

+ 3 - 2
admin-ui/src/app/login/components/login/login.component.ts

@@ -1,8 +1,9 @@
+import { HttpErrorResponse } from '@angular/common/http';
 import { Component, OnInit } from '@angular/core';
-import { UserActions } from '../../../state/user/user-actions';
 import { Router } from '@angular/router';
-import { HttpErrorResponse } from '@angular/common/http';
+
 import { API_URL } from '../../../app.config';
+import { UserActions } from '../../../state/user/user-actions';
 
 @Component({
     selector: 'vdr-login',

+ 3 - 2
admin-ui/src/app/login/login.module.ts

@@ -1,8 +1,9 @@
 import { NgModule } from '@angular/core';
+import { RouterModule } from '@angular/router';
 
-import { LoginComponent } from './components/login/login.component';
 import { SharedModule } from '../shared/shared.module';
-import { RouterModule } from '@angular/router';
+
+import { LoginComponent } from './components/login/login.component';
 import { loginRoutes } from './login.routes';
 
 @NgModule({

+ 3 - 3
admin-ui/src/app/shared/shared.module.ts

@@ -1,11 +1,11 @@
+import { CommonModule } from '@angular/common';
 import { HttpClientModule } from '@angular/common/http';
 import { NgModule } from '@angular/core';
+import { FormsModule, ReactiveFormsModule } from '@angular/forms';
+import { RouterModule } from '@angular/router';
 import { ClarityModule } from '@clr/angular';
 import { ApolloModule } from 'apollo-angular';
 import { HttpLinkModule } from 'apollo-angular-link-http';
-import { CommonModule } from '@angular/common';
-import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { RouterModule } from '@angular/router';
 
 const IMPORTS = [
     ClarityModule,

+ 2 - 1
admin-ui/src/app/state/action-logger.ts

@@ -1,7 +1,8 @@
 import { ActionReducer } from '@ngrx/store';
-import { AppState } from './app-state';
 import { storeLogger } from 'ngrx-store-logger';
 
+import { AppState } from './app-state';
+
 /**
  * A meta reducer which logs actions to the console for debugging purposes.
  */

+ 4 - 3
admin-ui/src/app/state/state-store.service.ts

@@ -1,9 +1,10 @@
 import { Injectable } from '@angular/core';
-import { Observable, Subscription } from 'rxjs';
 import { Action, Store } from '@ngrx/store';
-import { AppState } from './app-state';
+import { Observable, Subscription } from 'rxjs';
 import { distinctUntilChanged, take } from 'rxjs/operators';
 
+import { AppState } from './app-state';
+
 /**
  * Wrapper class which wraps the @ngrx/store Store object, and also provides additional
  * convenience methods for accessing data.
@@ -68,7 +69,7 @@ export class StateStore {
                 err => {
                     console.log(`%c "${selector.toString()}" is an invalid selector function:`, 'color: #f00', err.message);
                     hasError = true;
-                }
+                },
             );
         // tslint:enable:no-console
 

+ 5 - 5
admin-ui/src/app/state/user/user-actions.ts

@@ -1,13 +1,13 @@
 import {Injectable} from '@angular/core';
-
-import { StateStore } from '../state-store.service';
-
-import {Actions} from './user-state';
-import { DataService } from '../../core/providers/data/data.service';
 import { EMPTY, Observable, of, throwError } from 'rxjs';
 import { catchError, map } from 'rxjs/operators';
+
+import { DataService } from '../../core/providers/data/data.service';
 import { LocalStorageService } from '../../core/providers/local-storage/local-storage.service';
 import { handleError } from '../handle-error';
+import { StateStore } from '../state-store.service';
+
+import {Actions} from './user-state';
 
 @Injectable()
 export class UserActions {

+ 1 - 0
admin-ui/src/test.ts

@@ -1,4 +1,5 @@
 // This file is required by karma.conf.js and loads recursively all the .spec and framework files
+// tslint:disable
 import 'zone.js/dist/zone-testing';
 import { getTestBed } from '@angular/core/testing';
 import {

+ 29 - 28
admin-ui/tslint.json

@@ -1,32 +1,33 @@
 {
-    "extends": [
-        "../tslint.json"
+  "extends": [
+    "../tslint.json"
+  ],
+  "rulesDirectory": [
+    "node_modules/codelyzer"
+  ],
+  "rules": {
+    "deprecation": {
+      "severity": "warn"
+    },
+    "import-blacklist": [
+      true,
+      "rxjs/Rx"
     ],
-    "rulesDirectory": [
-        "node_modules/codelyzer"
+    "indent": [
+      true,
+      "spaces"
     ],
-    "rules": {
-        "deprecation": {
-            "severity": "warn"
-        },
-        "import-blacklist": [
-            true,
-            "rxjs/Rx"
-        ],
-        "indent": [
-            true,
-            "spaces"
-        ],
-        "no-string-literal": false,
-        "no-output-on-prefix": true,
-        "use-input-property-decorator": true,
-        "use-output-property-decorator": true,
-        "use-host-property-decorator": true,
-        "no-input-rename": true,
-        "no-output-rename": true,
-        "use-life-cycle-interface": true,
-        "use-pipe-transform-interface": true,
-        "component-class-suffix": true,
-        "directive-class-suffix": true
-    }
+    "no-string-literal": false,
+    "no-output-on-prefix": true,
+    "use-input-property-decorator": true,
+    "use-output-property-decorator": true,
+    "use-host-property-decorator": true,
+    "no-input-rename": true,
+    "no-output-rename": true,
+    "use-life-cycle-interface": true,
+    "use-pipe-transform-interface": true,
+    "component-class-suffix": true,
+    "directive-class-suffix": true,
+    "no-floating-promises": false
+  }
 }