Add more strict rxjs lint rules and get rid of rxjs 5 usages (#5478)

* Add more strict rxjs lint rules and get rid of rxjs 5 usages * Use proper naming suffix for private var * Fix conflicts
kubernetes · Aug 27, 2020 · 46f3b00 · 46f3b00
1 parent f0acd2e
commit 46f3b00
Show file tree

Hide file tree

Showing 130 changed files with 1,074 additions and 879 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -2,9 +2,14 @@ root = true
 
 [*]
 charset = utf-8
-end_of_line = lf
 indent_style = space
 indent_size = 2
 insert_final_newline = true
-max_line_length = 120
 trim_trailing_whitespace = true
+
+[*.go]
+indent_style = tab
+
+[*.md]
+max_line_length = off
+trim_trailing_whitespace = false
diff --git a/.prettierrc.js b/.prettierrc.js
@@ -5,13 +5,12 @@ const modifiedConfig = _.merge(
   {},
   gtsConfig,
   {
-    insertPragma: false,
-    printWidth: 120,
-    requirePragma: false,
+    // Print semicolons at the ends of statements.
     semi: true,
-    tabWidth: 2,
-    trailingComma: 'all',
-    useTabs: false,
+    // Include parentheses around a sole arrow function parameter (x => x).
+    arrowParens: 'avoid',
+    // Specify the line length that the printer will wrap on.
+    printWidth: 120,
   }
 )
 

diff --git a/i18n/de/messages.de.xlf b/i18n/de/messages.de.xlf
diff --git a/i18n/messages.xlf b/i18n/messages.xlf
@@ -425,11 +425,11 @@
           <context context-type="linenumber">24</context>
         </context-group>
         <context-group purpose="location">
-          <context context-type="sourcefile">../src/app/frontend/resource/workloads/replicationcontroller/detail/template.html</context>
+          <context context-type="sourcefile">../src/app/frontend/resource/workloads/replicaset/detail/template.html</context>
           <context context-type="linenumber">22</context>
         </context-group>
         <context-group purpose="location">
-          <context context-type="sourcefile">../src/app/frontend/resource/workloads/replicaset/detail/template.html</context>
+          <context context-type="sourcefile">../src/app/frontend/resource/workloads/replicationcontroller/detail/template.html</context>
           <context context-type="linenumber">22</context>
         </context-group>
         <context-group purpose="location">
@@ -600,27 +600,46 @@
           <context context-type="linenumber">101</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="53d3c87046022140381be2fc9b864d6fdd9f2cc8" datatype="html">
-        <source>Label Selector</source>
+      <trans-unit id="65f15d6396a9b96f745b7306df38ba538e190640" datatype="html">
+        <source>Pods: </source>
         <context-group purpose="location">
-          <context context-type="sourcefile">../src/app/frontend/resource/workloads/replicationcontroller/detail/template.html</context>
-          <context context-type="linenumber">30</context>
+          <context context-type="sourcefile">../src/app/frontend/resource/workloads/replicaset/detail/template.html</context>
+          <context context-type="linenumber">28</context>
         </context-group>
         <context-group purpose="location">
-          <context context-type="sourcefile">../src/app/frontend/resource/workloads/statefulset/detail/template.html</context>
+          <context context-type="sourcefile">../src/app/frontend/resource/workloads/deployment/detail/template.html</context>
+          <context context-type="linenumber">214</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="5de9d226db382155f482a557b832da6d63108112" datatype="html">
+        <source>Selector</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">../src/app/frontend/resource/workloads/replicaset/detail/template.html</context>
+          <context context-type="linenumber">38</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">../src/app/frontend/resource/workloads/daemonset/detail/template.html</context>
           <context context-type="linenumber">30</context>
         </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">../src/app/frontend/resource/workloads/deployment/detail/template.html</context>
+          <context context-type="linenumber">71</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">../src/app/frontend/resource/discovery/service/detail/template.html</context>
+          <context context-type="linenumber">44</context>
+        </context-group>
       </trans-unit>
       <trans-unit id="b73f7f5060fb22a1e9ec462b1bb02493fa3ab866" datatype="html">
         <source>Images</source>
-        <context-group purpose="location">
-          <context context-type="sourcefile">../src/app/frontend/resource/workloads/replicationcontroller/detail/template.html</context>
-          <context context-type="linenumber">39</context>
-        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">../src/app/frontend/resource/workloads/replicaset/detail/template.html</context>
           <context context-type="linenumber">47</context>
         </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">../src/app/frontend/resource/workloads/replicationcontroller/detail/template.html</context>
+          <context context-type="linenumber">39</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">../src/app/frontend/common/components/creator/template.html</context>
           <context context-type="linenumber">90</context>
@@ -668,14 +687,14 @@
       </trans-unit>
       <trans-unit id="318e1e7193512514e192cab4e4b6b722548b017b" datatype="html">
         <source>Init images</source>
-        <context-group purpose="location">
-          <context context-type="sourcefile">../src/app/frontend/resource/workloads/replicationcontroller/detail/template.html</context>
-          <context context-type="linenumber">48</context>
-        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">../src/app/frontend/resource/workloads/replicaset/detail/template.html</context>
           <context context-type="linenumber">56</context>
         </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">../src/app/frontend/resource/workloads/replicationcontroller/detail/template.html</context>
+          <context context-type="linenumber">48</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">../src/app/frontend/resource/workloads/daemonset/detail/template.html</context>
           <context context-type="linenumber">48</context>
@@ -693,34 +712,15 @@
           <context context-type="linenumber">48</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="65f15d6396a9b96f745b7306df38ba538e190640" datatype="html">
-        <source>Pods: </source>
-        <context-group purpose="location">
-          <context context-type="sourcefile">../src/app/frontend/resource/workloads/replicaset/detail/template.html</context>
-          <context context-type="linenumber">28</context>
-        </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">../src/app/frontend/resource/workloads/deployment/detail/template.html</context>
-          <context context-type="linenumber">214</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit id="5de9d226db382155f482a557b832da6d63108112" datatype="html">
-        <source>Selector</source>
-        <context-group purpose="location">
-          <context context-type="sourcefile">../src/app/frontend/resource/workloads/replicaset/detail/template.html</context>
-          <context context-type="linenumber">38</context>
-        </context-group>
+      <trans-unit id="53d3c87046022140381be2fc9b864d6fdd9f2cc8" datatype="html">
+        <source>Label Selector</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">../src/app/frontend/resource/workloads/daemonset/detail/template.html</context>
+          <context context-type="sourcefile">../src/app/frontend/resource/workloads/replicationcontroller/detail/template.html</context>
           <context context-type="linenumber">30</context>
         </context-group>
         <context-group purpose="location">
-          <context context-type="sourcefile">../src/app/frontend/resource/workloads/deployment/detail/template.html</context>
-          <context context-type="linenumber">71</context>
-        </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">../src/app/frontend/resource/discovery/service/detail/template.html</context>
-          <context context-type="linenumber">44</context>
+          <context context-type="sourcefile">../src/app/frontend/resource/workloads/statefulset/detail/template.html</context>
+          <context context-type="linenumber">30</context>
         </context-group>
       </trans-unit>
       <trans-unit id="5ca707824ab93066c7d9b44e1b8bf216725c2c22" datatype="html">

diff --git a/package.json b/package.json
@@ -54,7 +54,7 @@
     "fix:i18n": "ng xi18n --outFile ../i18n/messages.xlf && aio/scripts/xliffmerge.sh",
     "clean": "rm -rf .go_workspace .tmp coverage dist npm-debug.log",
     "postversion": "node aio/scripts/version.js",
-    "postinstall": "node aio/scripts/version.js && command -v golangci-lint >/dev/null 2>&1 || { curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $(go env GOPATH)/bin v1.23.6; } && go mod download && ngcc"
+    "postinstall": "node aio/scripts/version.js && command -v golangci-lint >/dev/null 2>&1 || { curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $(go env GOPATH)/bin v1.23.6; } && go mod download && ./aio/scripts/install-codegen.sh && ngcc"
   },
   "husky": {
     "hooks": {
@@ -235,7 +235,8 @@
       "prefer-rest-params": "error",
       "rxjs/no-ignored-observable": "error",
       "rxjs/no-unbound-methods": "error",
-      "rxjs/no-unsafe-takeuntil": "error"
+      "rxjs/no-unsafe-takeuntil": "error",
+      "rxjs/no-nested-subscribe": "error"
     },
     "overrides": [
       {

diff --git a/src/app/frontend/chrome/component.ts b/src/app/frontend/chrome/component.ts
@@ -40,7 +40,7 @@ export class ChromeComponent implements OnInit {
     private readonly http_: HttpClient,
     private readonly router_: Router,
     @Inject(DOCUMENT) private readonly document_: Document,
-    private readonly globalSettings_: GlobalSettingsService,
+    private readonly globalSettings_: GlobalSettingsService
   ) {}
 
   ngOnInit(): void {
@@ -85,7 +85,7 @@ export class ChromeComponent implements OnInit {
   private registerVisibilityChangeHandler_(): void {
     if (typeof this.document_.addEventListener === 'undefined') {
       console.log(
-        'Your browser does not support Page Visibility API. Page cannot properly stop background tasks when tab is inactive.',
+        'Your browser does not support Page Visibility API. Page cannot properly stop background tasks when tab is inactive.'
       );
       return;
     }

diff --git a/src/app/frontend/chrome/nav/item/component.ts b/src/app/frontend/chrome/nav/item/component.ts
@@ -31,7 +31,7 @@ const rollInOut = trigger('rollInOut', [
       keyframes([
         style({width: '16px', 'border-radius': '50%', color: 'rgba(0,0,0,0)'}),
         style({width: '72px', 'border-radius': '8px'}),
-      ]),
+      ])
     ),
   ]),
 
@@ -41,7 +41,7 @@ const rollInOut = trigger('rollInOut', [
       keyframes([
         style({width: '72px', 'border-radius': '8px', color: 'rgba(0,0,0,0)'}),
         style({width: '16px', 'border-radius': '50%'}),
-      ]),
+      ])
     ),
   ]),
 ]);
@@ -74,8 +74,8 @@ export class NavItemComponent implements OnInit, OnDestroy {
         tap(
           state =>
             (this.animationState =
-              state === NamespacedIndicatorState.Leave ? NamespacedIndicatorState.Leave : this.animationState),
-        ),
+              state === NamespacedIndicatorState.Leave ? NamespacedIndicatorState.Leave : this.animationState)
+        )
       )
       .pipe(debounceTime(this.debounceTime_))
       .pipe(takeUntil(this.unsubscribe_))

diff --git a/src/app/frontend/chrome/search/component.ts b/src/app/frontend/chrome/search/component.ts
@@ -29,7 +29,7 @@ export class SearchComponent implements OnInit {
   constructor(
     private readonly router_: Router,
     private readonly activatedRoute_: ActivatedRoute,
-    private readonly paramsService_: ParamsService,
+    private readonly paramsService_: ParamsService
   ) {}
 
   ngOnInit(): void {

diff --git a/src/app/frontend/common/components/actionbar/detailactions/delete/component.ts b/src/app/frontend/common/components/actionbar/detailactions/delete/component.ts
@@ -31,7 +31,7 @@ export class ActionbarDetailDeleteComponent implements OnInit {
   constructor(
     private readonly verber_: VerberService,
     private readonly route_: ActivatedRoute,
-    private readonly router_: Router,
+    private readonly router_: Router
   ) {}
 
   ngOnInit(): void {

diff --git a/src/app/frontend/common/components/actionbar/detailactions/edit/component.ts b/src/app/frontend/common/components/actionbar/detailactions/edit/component.ts
@@ -13,9 +13,7 @@
 // limitations under the License.
 
 import {Component, Input} from '@angular/core';
-import {ActivatedRoute, Router} from '@angular/router';
 import {ObjectMeta, TypeMeta} from '@api/backendapi';
-import {Subscription} from 'rxjs/Subscription';
 
 import {VerberService} from '../../../../services/global/verber';
 

diff --git a/src/app/frontend/common/components/actionbar/detailactions/logs/component.ts b/src/app/frontend/common/components/actionbar/detailactions/logs/component.ts
@@ -31,7 +31,7 @@ export class ActionbarDetailLogsComponent {
       'log',
       this.resourceMeta.objectMeta.name,
       this.resourceMeta.objectMeta.namespace,
-      this.resourceMeta.typeMeta.kind,
+      this.resourceMeta.typeMeta.kind
     );
   }
 }
diff --git a/src/app/frontend/common/components/actionbar/detailactions/pin/component.ts b/src/app/frontend/common/components/actionbar/detailactions/pin/component.ts
@@ -37,7 +37,7 @@ export class ActionbarDetailPinComponent {
         this.objectMeta.name,
         this.objectMeta.namespace,
         this.displayName,
-        this.namespaced,
+        this.namespaced
       );
     }
   }

diff --git a/src/app/frontend/common/components/actionbar/detailactions/scale/component.ts b/src/app/frontend/common/components/actionbar/detailactions/scale/component.ts
@@ -14,7 +14,6 @@
 
 import {Component, Input} from '@angular/core';
 import {ObjectMeta, TypeMeta} from '@api/backendapi';
-import {Subscription} from 'rxjs/Subscription';
 
 import {VerberService} from '../../../../services/global/verber';
 

diff --git a/src/app/frontend/common/components/actionbar/detailactions/trigger/component.ts b/src/app/frontend/common/components/actionbar/detailactions/trigger/component.ts
@@ -14,7 +14,6 @@
 
 import {Component, Input} from '@angular/core';
 import {ObjectMeta, TypeMeta} from '@api/backendapi';
-import {Subscription} from 'rxjs/Subscription';
 
 import {VerberService} from '../../../../services/global/verber';
 

diff --git a/src/app/frontend/common/components/actionbars/default/component.ts b/src/app/frontend/common/components/actionbars/default/component.ts
@@ -15,7 +15,6 @@
 import {Component, OnDestroy, OnInit} from '@angular/core';
 import {Subject} from 'rxjs';
 import {takeUntil} from 'rxjs/operators';
-import {Subscription} from 'rxjs/Subscription';
 import {ActionbarService, ResourceMeta} from '../../../services/global/actionbar';
 
 @Component({
@@ -27,22 +26,22 @@ export class DefaultActionbar implements OnInit, OnDestroy {
   isVisible = false;
   resourceMeta: ResourceMeta;
 
-  private _unsubscribe = new Subject<void>();
+  private unsubscribe_ = new Subject<void>();
 
   constructor(private readonly actionbar_: ActionbarService) {}
 
   ngOnInit(): void {
-    this.actionbar_.onInit.pipe(takeUntil(this._unsubscribe)).subscribe((resourceMeta: ResourceMeta) => {
+    this.actionbar_.onInit.pipe(takeUntil(this.unsubscribe_)).subscribe((resourceMeta: ResourceMeta) => {
       this.resourceMeta = resourceMeta;
       this.isInitialized = true;
       this.isVisible = true;
     });
 
-    this.actionbar_.onDetailsLeave.pipe(takeUntil(this._unsubscribe)).subscribe(() => (this.isVisible = false));
+    this.actionbar_.onDetailsLeave.pipe(takeUntil(this.unsubscribe_)).subscribe(() => (this.isVisible = false));
   }
 
   ngOnDestroy(): void {
-    this._unsubscribe.next();
-    this._unsubscribe.complete();
+    this.unsubscribe_.next();
+    this.unsubscribe_.complete();
   }
 }
diff --git a/src/app/frontend/common/components/actionbars/logsdefault/component.ts b/src/app/frontend/common/components/actionbars/logsdefault/component.ts
@@ -26,22 +26,22 @@ export class LogsDefaultActionbar implements OnInit, OnDestroy {
   isVisible = false;
   resourceMeta: ResourceMeta;
 
-  private _unsubscribe = new Subject<void>();
+  private unsubscribe_ = new Subject<void>();
 
   constructor(private readonly actionbar_: ActionbarService) {}
 
   ngOnInit(): void {
-    this.actionbar_.onInit.pipe(takeUntil(this._unsubscribe)).subscribe((resourceMeta: ResourceMeta) => {
+    this.actionbar_.onInit.pipe(takeUntil(this.unsubscribe_)).subscribe((resourceMeta: ResourceMeta) => {
       this.resourceMeta = resourceMeta;
       this.isInitialized = true;
       this.isVisible = true;
     });
 
-    this.actionbar_.onDetailsLeave.pipe(takeUntil(this._unsubscribe)).subscribe(() => (this.isVisible = false));
+    this.actionbar_.onDetailsLeave.pipe(takeUntil(this.unsubscribe_)).subscribe(() => (this.isVisible = false));
   }
 
   ngOnDestroy(): void {
-    this._unsubscribe.next();
-    this._unsubscribe.complete();
+    this.unsubscribe_.next();
+    this.unsubscribe_.complete();
   }
 }
diff --git a/src/app/frontend/common/components/actionbars/logsexecdefault/component.ts b/src/app/frontend/common/components/actionbars/logsexecdefault/component.ts
@@ -26,22 +26,22 @@ export class LogsExecDefaultActionbar implements OnInit, OnDestroy {
   isVisible = false;
   resourceMeta: ResourceMeta;
 
-  private _unsubscribe = new Subject<void>();
+  private unsubscribe_ = new Subject<void>();
 
   constructor(private readonly actionbar_: ActionbarService) {}
 
   ngOnInit(): void {
-    this.actionbar_.onInit.pipe(takeUntil(this._unsubscribe)).subscribe((resourceMeta: ResourceMeta) => {
+    this.actionbar_.onInit.pipe(takeUntil(this.unsubscribe_)).subscribe((resourceMeta: ResourceMeta) => {
       this.resourceMeta = resourceMeta;
       this.isInitialized = true;
       this.isVisible = true;
     });
 
-    this.actionbar_.onDetailsLeave.pipe(takeUntil(this._unsubscribe)).subscribe(() => (this.isVisible = false));
+    this.actionbar_.onDetailsLeave.pipe(takeUntil(this.unsubscribe_)).subscribe(() => (this.isVisible = false));
   }
 
   ngOnDestroy(): void {
-    this._unsubscribe.next();
-    this._unsubscribe.complete();
+    this.unsubscribe_.next();
+    this.unsubscribe_.complete();
   }
 }