Merge branch 'origin/master' into 132636/NAS-132636

truenas · Dec 11, 2024 · d957d3f · d957d3f
2 parents 0a1d273 + a0bc808
commit d957d3f
Show file tree

Hide file tree

Showing 367 changed files with 8,622 additions and 5,281 deletions.
diff --git a/eslint.config.mjs b/eslint.config.mjs
@@ -2,10 +2,7 @@ import eslint from "@eslint/js";
 import tsEslint from "typescript-eslint";
 import angular from "angular-eslint";
 import stylistic from "@stylistic/eslint-plugin";
-import {fixupConfigRules, fixupPluginRules} from "@eslint/compat";
-import { FlatCompat }  from "@eslint/eslintrc";
-import {dirname} from "node:path";
-import {fileURLToPath} from "node:url";
+import { fixupPluginRules } from "@eslint/compat";
 import rxjsAngular from "eslint-plugin-rxjs-angular";
 import angularFileNaming from "eslint-plugin-angular-file-naming";
 import importPlugin from "eslint-plugin-import";
@@ -17,11 +14,7 @@ import { eslintSpec } from "./eslint/eslint-spec.mjs";
 import { fixLaterRules } from "./eslint/eslint-ts-rules-fix-later.mjs";
 import { ruleOverrides } from "./eslint/eslint-ts-rules-overrides.mjs";
 import { extraRules } from "./eslint/eslint-ts-rules-extra.mjs";
-
-const __dirname = dirname(fileURLToPath(import.meta.url));
-const compat = new FlatCompat({
-  baseDirectory: __dirname,
-});
+import rxjs from "@smarttools/eslint-plugin-rxjs";
 
 export default tsEslint.config(
   {
@@ -48,6 +41,7 @@ export default tsEslint.config(
     },
     plugins: {
       unicorn,
+      rxjs,
       "rxjs-angular": fixupPluginRules(rxjsAngular),
       "angular-file-naming": fixupPluginRules(angularFileNaming),
       "unused-imports": unusedImports,
@@ -68,7 +62,7 @@ export default tsEslint.config(
       }),
       importPlugin.flatConfigs.recommended,
       sonarjs.configs.recommended,
-      ...fixupConfigRules(compat.extends('plugin:rxjs/recommended')),
+      rxjs.configs.recommended,
     ],
     rules: {
       ...ruleOverrides,

diff --git a/eslint/eslint-ts-rules-extra.mjs b/eslint/eslint-ts-rules-extra.mjs
@@ -7,7 +7,7 @@ import airbnbVariables from "eslint-config-airbnb-base/rules/variables";
  */
 export const extraRules = {
   // RxJS
-  "rxjs/no-unsafe-takeuntil": ["error", {
+  "@smarttools/rxjs/no-unsafe-takeuntil": ["error", {
     "alias": ["untilDestroyed"]
   }],
   "rxjs-angular/prefer-takeuntil": ["error", {
@@ -16,14 +16,14 @@ export const extraRules = {
     "checkDecorators": ["Component"],
     "checkDestroy": false
   }],
-  "rxjs/finnish": ["error", {
+  "@smarttools/rxjs/finnish": ["error", {
     "parameters": true,
     "properties": false, // TODO: Should be true, hard to implement now.
     "variables": true,
     "functions": false,
     "methods": false,
   }],
-  "rxjs/prefer-observer": ["error"],
+  "@smarttools/rxjs/prefer-observer": ["error"],
 
   // Angular
   "@angular-eslint/use-lifecycle-interface": ["error"],

diff --git a/eslint/eslint-ts-rules-fix-later.mjs b/eslint/eslint-ts-rules-fix-later.mjs
@@ -8,8 +8,7 @@ export const fixLaterRules = {
   "@typescript-eslint/no-dynamic-delete": ["off"],
   "@typescript-eslint/class-literal-property-style": ["off"],
   "no-prototype-builtins": ["off"],
-  "rxjs/no-implicit-any-catch": ["off"],
-  "rxjs/no-nested-subscribe": ["off"],
+  "@smarttools/rxjs/no-nested-subscribe": ["off"],
 
   "sonarjs/prefer-nullish-coalescing": ["off"],
   "sonarjs/deprecation": ["off"],

diff --git a/package.json b/package.json
@@ -99,6 +99,7 @@
     "@sentry/angular": "5.30.0",
     "@sentry/utils": "~7.42.0",
     "@shopify/eslint-plugin": "~46.0.0",
+    "@smarttools/eslint-plugin-rxjs": "~1.0.7",
     "@stylistic/eslint-plugin": "~2.9.0",
     "@types/cheerio": "~0.22.35",
     "@types/d3": "~7.4.3",
@@ -147,7 +148,6 @@
     "eslint-plugin-angular-test-ids": "~1.0.6",
     "eslint-plugin-import": "^2.31.0",
     "eslint-plugin-jest": "~28.8.3",
-    "eslint-plugin-rxjs": "^5.0.3",
     "eslint-plugin-rxjs-angular": "^2.0.1",
     "eslint-plugin-sonarjs": "~2.0.3",
     "eslint-plugin-unicorn": "^56.0.0",

diff --git a/proxy.config.json.template b/proxy.config.json.template
@@ -10,14 +10,14 @@
         "target": "http://_REMOTE_",
         "secure": false,
         "changeOrigin": true,
-        "pathRewrite": {"^/_upload" : "http://_REMOTE_:6000/_upload"},
+        "pathRewrite": {"^/_upload" : "http://_REMOTE_/_upload"},
         "loglevel": "debug"
     },
     "/_download": {
         "target": "http://_REMOTE_",
         "secure": false,
         "changeOrigin": true,
-        "pathRewrite": {"^/_download" : "http://_REMOTE_:6000/_download"},
+        "pathRewrite": {"^/_download" : "http://_REMOTE_/_download"},
         "loglevel": "debug"
     }
 }
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
@@ -9,6 +9,7 @@ import { WINDOW } from 'app/helpers/window.helper';
 import { AuthService } from 'app/services/auth/auth.service';
 import { DetectBrowserService } from 'app/services/detect-browser.service';
 import { LayoutService } from 'app/services/layout.service';
+import { PingService } from 'app/services/websocket/ping.service';
 
 @UntilDestroy()
 @Component({
@@ -26,6 +27,7 @@ export class AppComponent implements OnInit {
     private authService: AuthService,
     private detectBrowser: DetectBrowserService,
     private layoutService: LayoutService,
+    private pingService: PingService,
     @Inject(WINDOW) private window: Window,
   ) {
     this.authService.isAuthenticated$.pipe(untilDestroyed(this)).subscribe((isAuthenticated) => {
@@ -52,6 +54,7 @@ export class AppComponent implements OnInit {
         }
       }
     });
+    this.pingService.setupPing();
   }
 
   ngOnInit(): void {

diff --git a/src/app/core/guards/translations-loaded.guard.ts b/src/app/core/guards/translations-loaded.guard.ts
@@ -38,7 +38,7 @@ export class TranslationsLoadedGuard {
     return waitForTranslations$.pipe(
       timeout(this.maxLanguageLoadingTime),
       map(() => true),
-      catchError((error) => {
+      catchError((error: unknown) => {
         console.error('Error loading translations: ', error);
         return of(true);
       }),

diff --git a/src/app/core/guards/websocket-connection.guard.ts b/src/app/core/guards/websocket-connection.guard.ts
@@ -1,8 +1,9 @@
-import { Injectable } from '@angular/core';
+import { Inject, Injectable } from '@angular/core';
 import { MatDialog } from '@angular/material/dialog';
 import { Router } from '@angular/router';
 import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy';
 import { TranslateService } from '@ngx-translate/core';
+import { WINDOW } from 'app/helpers/window.helper';
 import { DialogService } from 'app/modules/dialog/dialog.service';
 import { WebSocketHandlerService } from 'app/services/websocket/websocket-handler.service';
 
@@ -16,6 +17,7 @@ export class WebSocketConnectionGuard {
     private matDialog: MatDialog,
     private dialogService: DialogService,
     private translate: TranslateService,
+    @Inject(WINDOW) private window: Window,
   ) {
     this.wsManager.isClosed$.pipe(untilDestroyed(this)).subscribe((isClosed) => {
       if (isClosed) {
@@ -37,7 +39,9 @@ export class WebSocketConnectionGuard {
   private resetUi(): void {
     this.closeAllDialogs();
     if (!this.wsManager.isSystemShuttingDown) {
-      this.router.navigate(['/signin']);
+      // manually preserve query params
+      const params = new URLSearchParams(this.window.location.search);
+      this.router.navigate(['/signin'], { queryParams: Object.fromEntries(params) });
     }
   }
 

diff --git a/src/app/core/testing/classes/mock-api.service.ts b/src/app/core/testing/classes/mock-api.service.ts
@@ -17,9 +17,10 @@ import {
   ApiJobParams,
   ApiJobResponse,
 } from 'app/interfaces/api/api-job-directory.interface';
-import { ApiEvent } from 'app/interfaces/api-message.interface';
+import { ApiEventTyped } from 'app/interfaces/api-message.interface';
 import { Job } from 'app/interfaces/job.interface';
 import { ApiService } from 'app/services/websocket/api.service';
+import { SubscriptionManagerService } from 'app/services/websocket/subscription-manager.service';
 import { WebSocketHandlerService } from 'app/services/websocket/websocket-handler.service';
 
 /**
@@ -41,14 +42,15 @@ const anyArgument = when((_: ApiJobParams<ApiJobMethod>) => true);
  */
 @Injectable()
 export class MockApiService extends ApiService {
-  private subscribeStream$ = new Subject<ApiEvent>();
+  private subscribeStream$ = new Subject<ApiEventTyped>();
   private jobIdCounter = 1;
 
   constructor(
-    protected override wsHandler: WebSocketHandlerService,
-    protected override translate: TranslateService,
+    wsHandler: WebSocketHandlerService,
+    subscriptionManager: SubscriptionManagerService,
+    translate: TranslateService,
   ) {
-    super(wsHandler, translate);
+    super(wsHandler, subscriptionManager, translate);
 
     this.call = jest.fn();
     this.job = jest.fn();
@@ -127,7 +129,7 @@ export class MockApiService extends ApiService {
     this.jobIdCounter += 1;
   }
 
-  emitSubscribeEvent(event: ApiEvent): void {
+  emitSubscribeEvent(event: ApiEventTyped): void {
     this.subscribeStream$.next(event);
   }
 }
diff --git a/src/app/core/testing/mock-enclosure/mock-enclosure-api.service.ts b/src/app/core/testing/mock-enclosure/mock-enclosure-api.service.ts
@@ -8,6 +8,7 @@ import { MockEnclosureGenerator } from 'app/core/testing/mock-enclosure/mock-enc
 import { ApiCallMethod, ApiCallParams, ApiCallResponse } from 'app/interfaces/api/api-call-directory.interface';
 import { SystemInfo } from 'app/interfaces/system-info.interface';
 import { ApiService } from 'app/services/websocket/api.service';
+import { SubscriptionManagerService } from 'app/services/websocket/subscription-manager.service';
 import { WebSocketHandlerService } from 'app/services/websocket/websocket-handler.service';
 
 @Injectable({
@@ -19,9 +20,10 @@ export class MockEnclosureApiService extends ApiService {
 
   constructor(
     wsManager: WebSocketHandlerService,
+    subscriptionManager: SubscriptionManagerService,
     translate: TranslateService,
   ) {
-    super(wsManager, translate);
+    super(wsManager, subscriptionManager, translate);
 
     console.warn('MockEnclosureApiService is in effect. Some calls will be mocked');
   }

diff --git a/src/app/core/testing/utils/empty-auth.service.ts b/src/app/core/testing/utils/empty-auth.service.ts
@@ -15,4 +15,5 @@ export class EmptyAuthService {
   logout = getMissingInjectionErrorFactory(AuthService.name);
   refreshUser = getMissingInjectionErrorFactory(AuthService.name);
   loginWithToken = getMissingInjectionErrorFactory(AuthService.name);
+  setQueryToken = getMissingInjectionErrorFactory(AuthService.name);
 }
diff --git a/src/app/core/testing/utils/mock-api.utils.ts b/src/app/core/testing/utils/mock-api.utils.ts
@@ -12,6 +12,7 @@ import { ApiCallMethod } from 'app/interfaces/api/api-call-directory.interface';
 import { ApiJobDirectory, ApiJobMethod } from 'app/interfaces/api/api-job-directory.interface';
 import { Job } from 'app/interfaces/job.interface';
 import { ApiService } from 'app/services/websocket/api.service';
+import { SubscriptionManagerService } from 'app/services/websocket/subscription-manager.service';
 import { WebSocketHandlerService } from 'app/services/websocket/websocket-handler.service';
 
 /**
@@ -47,8 +48,12 @@ export function mockApi(
   return [
     {
       provide: ApiService,
-      useFactory: (wsHandler: WebSocketHandlerService, translate: TranslateService) => {
-        const mockApiService = new MockApiService(wsHandler, translate);
+      useFactory: (
+        wsHandler: WebSocketHandlerService,
+        translate: TranslateService,
+      ) => {
+        const subscriptionManager = {} as SubscriptionManagerService;
+        const mockApiService = new MockApiService(wsHandler, subscriptionManager, translate);
         (mockResponses || []).forEach((mockResponse) => {
           if (mockResponse.type === MockApiResponseType.Call) {
             mockApiService.mockCall(mockResponse.method, mockResponse.response);

diff --git a/src/app/enums/api-error-name.enum.ts b/src/app/enums/api-error-name.enum.ts
diff --git a/src/app/enums/api-message-type.enum.ts b/src/app/enums/api-message-type.enum.ts
diff --git a/src/app/enums/api.enum.ts b/src/app/enums/api.enum.ts
@@ -0,0 +1,36 @@
+export enum ApiErrorName {
+  NotAuthenticated = 'ENOTAUTHENTICATED',
+  NoAccess = 'EACCES',
+  NoMemory = 'ENOMEM',
+  AlreadyExists = 'EEXIST',
+  Again = 'EAGAIN',
+  Validation = 'EINVAL',
+}
+
+export const apiErrorNames = new Map<ApiErrorName, string>([
+  [ApiErrorName.NotAuthenticated, 'Not Authenticated'],
+  [ApiErrorName.NoAccess, 'Access Error'],
+  [ApiErrorName.NoMemory, 'No Memory'],
+  [ApiErrorName.AlreadyExists, 'Already Exists'],
+  [ApiErrorName.Again, 'Try Again'],
+  [ApiErrorName.Validation, 'Validation Error'],
+]);
+
+export enum JsonRpcErrorCode {
+  InvalidRequest = -32600,
+  MethodNotFound = -32601,
+  InvalidParams = -32602,
+  InternalError = -32603,
+  TooManyConcurrentCalls = -32000,
+  CallError = -32001,
+}
+
+export enum CollectionChangeType {
+  Changed = 'changed',
+  Added = 'added',
+  Removed = 'removed',
+}
+
+export enum ShellMessageType {
+  Connected = 'connected',
+}
diff --git a/src/app/enums/iscsi.enum.ts b/src/app/enums/iscsi.enum.ts
@@ -39,3 +39,9 @@ export const iscsiExtentUseforMap = new Map([
   [IscsiExtentUsefor.Legacyos, T('Legacy OS: Extent block size 512b, TPC enabled, no Xen compat mode, SSD speed')],
   [IscsiExtentUsefor.Modernos, T('Modern OS: Extent block size 4k, TPC enabled, no Xen compat mode, SSD speed')],
 ]);
+
+export const iscsiTargetModeNames = new Map<IscsiTargetMode, string>([
+  [IscsiTargetMode.Iscsi, T('iSCSI')],
+  [IscsiTargetMode.Fc, T('Fibre Channel')],
+  [IscsiTargetMode.Both, T('Both')],
+]);
diff --git a/src/app/enums/response-error-type.enum.ts b/src/app/enums/response-error-type.enum.ts
@@ -1,3 +1,3 @@
-export enum ResponseErrorType {
+export enum JobExceptionType {
   Validation = 'VALIDATION',
 }