chore(octra): update Nx to 16.8.1

IPS-LMU · Sep 21, 2023 · 0787107 · 0787107
1 parent c49fd0c
commit 0787107
Show file tree

Hide file tree

Showing 43 changed files with 7,836 additions and 7,681 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -1,13 +1,13 @@
 {
   "root": true,
   "ignorePatterns": ["**/*"],
-  "plugins": ["@nrwl/nx"],
+  "plugins": ["@nx"],
   "overrides": [
     {
       "files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
       "rules": {
         "@typescript-eslint/no-non-null-assertion": "off",
-        "@nrwl/nx/enforce-module-boundaries": [
+        "@nx/enforce-module-boundaries": [
           "error",
           {
             "enforceBuildableLibDependency": true,
@@ -24,21 +24,20 @@
     },
     {
       "files": ["*.ts", "*.tsx"],
-      "extends": ["plugin:@nrwl/nx/typescript"],
+      "extends": ["plugin:@nx/typescript"],
       "rules": {}
     },
     {
       "files": ["*.js", "*.jsx"],
-      "extends": ["plugin:@nrwl/nx/javascript"],
+      "extends": ["plugin:@nx/javascript"],
       "rules": {}
     },
     {
       "files": ["*.spec.ts", "*.spec.tsx", "*.spec.js", "*.spec.jsx"],
       "env": {
         "jest": true
       },
-      "rules": {
-      }
+      "rules": {}
     }
   ]
 }
diff --git a/apps/octra-e2e/cypress.config.ts b/apps/octra-e2e/cypress.config.ts
@@ -1,5 +1,5 @@
 import { defineConfig } from 'cypress';
-import { nxE2EPreset } from '@nrwl/cypress/plugins/cypress-preset';
+import { nxE2EPreset } from '@nx/cypress/plugins/cypress-preset';
 
 export default defineConfig({
   e2e: nxE2EPreset(__dirname),

diff --git a/apps/octra-e2e/project.json b/apps/octra-e2e/project.json
@@ -5,7 +5,7 @@
   "projectType": "application",
   "targets": {
     "e2e": {
-      "executor": "@nrwl/cypress:cypress",
+      "executor": "@nx/cypress:cypress",
       "options": {
         "cypressConfig": "apps/octra-e2e/cypress.config.ts",
         "devServerTarget": "octra:serve:development",
@@ -21,7 +21,7 @@
       }
     },
     "lint": {
-      "executor": "@nrwl/linter:eslint",
+      "executor": "@nx/linter:eslint",
       "outputs": ["{options.outputFile}"],
       "options": {
         "lintFilePatterns": ["apps/octra-e2e/**/*.{js,ts}"]

diff --git a/apps/octra/.eslintrc.json b/apps/octra/.eslintrc.json
@@ -24,13 +24,13 @@
         ]
       },
       "extends": [
-        "plugin:@nrwl/nx/angular",
+        "plugin:@nx/angular",
         "plugin:@angular-eslint/template/process-inline-templates"
       ]
     },
     {
       "files": ["*.html"],
-      "extends": ["plugin:@nrwl/nx/angular-template"],
+      "extends": ["plugin:@nx/angular-template"],
       "rules": {}
     }
   ]

diff --git a/apps/octra/project.json b/apps/octra/project.json
@@ -116,14 +116,14 @@
       }
     },
     "lint": {
-      "executor": "@nrwl/linter:eslint",
+      "executor": "@nx/linter:eslint",
       "outputs": ["{options.outputFile}"],
       "options": {
         "lintFilePatterns": ["apps/octra/**/*.ts", "apps/octra/**/*.html"]
       }
     },
     "test": {
-      "executor": "@nrwl/jest:jest",
+      "executor": "@nx/jest:jest",
       "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
       "options": {
         "jestConfig": "apps/octra/jest.config.ts",
@@ -137,7 +137,7 @@
       }
     },
     "serve-static": {
-      "executor": "@nrwl/web:file-server",
+      "executor": "@nx/web:file-server",
       "options": {
         "buildTarget": "octra:build"
       }

diff --git a/apps/octra/src/app/app.module.ts b/apps/octra/src/app/app.module.ts
@@ -47,10 +47,6 @@ import { ApplicationEffects } from './core/store/application/application.effects
 import { ModalsModule } from './core/modals/modals.module';
 import { AppSharedModule } from './app.shared.module';
 import { OctraComponentsModule } from '@octra/ngx-components';
-import {
-  TranslocoConfigProvider,
-  TranslocoLoaderProvider,
-} from './app.transloco';
 import { NgxOctraApiModule, OctraAPIService } from '@octra/ngx-octra-api';
 import {
   NgbCollapseModule,
@@ -68,6 +64,7 @@ import { APIEffects } from './core/store/api';
 import { PagesModule } from './core/pages/pages.module';
 import { OctraUtilitiesModule } from '@octra/ngx-utilities';
 import { AsrEffects } from './core/store/asr/asr.effects.service';
+import { TranslocoRootModule } from './app.transloco';
 
 @NgModule({
   declarations: [AppComponent, NavigationComponent],
@@ -121,7 +118,7 @@ import { AsrEffects } from './core/store/asr/asr.effects.service';
     NgbTooltipModule,
     NgbCollapseModule,
     ModalsModule,
-    TranslocoModule,
+    TranslocoRootModule,
     NgxOctraApiModule,
     OctraComponentsModule,
     OctraUtilitiesModule,
@@ -145,8 +142,6 @@ import { AsrEffects } from './core/store/asr/asr.effects.service';
     BugReportService,
     CompatibilityService,
     MultiThreadingService,
-    TranslocoConfigProvider,
-    TranslocoLoaderProvider,
   ],
   exports: [],
 })

diff --git a/apps/octra/src/app/app.shared.module.ts b/apps/octra/src/app/app.shared.module.ts
@@ -1,10 +1,5 @@
 import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
-import { TranslocoModule } from '@ngneat/transloco';
-import {
-  TranslocoConfigProvider,
-  TranslocoLoaderProvider,
-} from './app.transloco';
 import { AsrOptionsComponent } from './core/component/asr-options/asr-options.component';
 import { TranscriptionFeedbackComponent } from './core/component/transcription-feedback/transcription-feedback.component';
 import { ClipTextPipe } from './core/shared/clip-text.pipe';
@@ -21,6 +16,7 @@ import { AlertComponent, DropZoneComponent } from './core/component';
 import { OctraComponentsModule } from '@octra/ngx-components';
 import { OctraUtilitiesModule } from '@octra/ngx-utilities';
 import { SignupComponent } from './core/component/authentication-component/signup/signup.component';
+import { TranslocoModule } from '@ngneat/transloco';
 
 @NgModule({
   declarations: [
@@ -36,7 +32,6 @@ import { SignupComponent } from './core/component/authentication-component/signu
     CommonModule,
     FormsModule,
     RouterModule,
-    TranslocoModule,
     DragDropModule,
     NgbDropdownModule,
     NgbPopoverModule,
@@ -45,7 +40,6 @@ import { SignupComponent } from './core/component/authentication-component/signu
     TranslocoModule,
     NgbToast,
   ],
-  providers: [TranslocoConfigProvider, TranslocoLoaderProvider],
   exports: [
     AsrOptionsComponent,
     TranscriptionFeedbackComponent,

diff --git a/apps/octra/src/app/app.transloco.ts b/apps/octra/src/app/app.transloco.ts
@@ -1,10 +1,9 @@
-import { Injectable } from '@angular/core';
+import { Injectable, NgModule } from '@angular/core';
 import {
+  provideTransloco,
   Translation,
-  TRANSLOCO_CONFIG,
-  TRANSLOCO_LOADER,
-  translocoConfig,
   TranslocoLoader,
+  TranslocoModule,
 } from '@ngneat/transloco';
 import { HttpClient } from '@angular/common/http';
 import { environment } from '../environments/environment';
@@ -14,22 +13,24 @@ export class TranslocoHttpLoader implements TranslocoLoader {
   constructor(private http: HttpClient) {}
 
   getTranslation(lang: string) {
-    return this.http.get<Translation>(`./assets/i18n/${lang}.json`);
+    const code = lang.replace(/-.*/g, '');
+    return this.http.get<Translation>(`assets/i18n/${code}.json`);
   }
 }
 
-export const TranslocoConfigProvider = {
-  provide: TRANSLOCO_CONFIG,
-  useValue: translocoConfig({
-    availableLangs: ['en'],
-    defaultLang: 'en',
-    fallbackLang: 'en',
-    prodMode: environment.production,
-    reRenderOnLangChange: true,
-  }),
-};
-
-export const TranslocoLoaderProvider = {
-  provide: TRANSLOCO_LOADER,
-  useClass: TranslocoHttpLoader,
-};
+@NgModule({
+  exports: [TranslocoModule],
+  providers: [
+    provideTransloco({
+      config: {
+        availableLangs: ['en'],
+        defaultLang: 'en',
+        fallbackLang: 'en',
+        prodMode: environment.production,
+        reRenderOnLangChange: true,
+      },
+      loader: TranslocoHttpLoader,
+    }),
+  ],
+})
+export class TranslocoRootModule {}
diff --git a/apps/octra/src/app/core/component/octra-dropzone/octra-dropzone.component.ts b/apps/octra/src/app/core/component/octra-dropzone/octra-dropzone.component.ts
@@ -6,14 +6,14 @@ import { SessionFile } from '../../obj/SessionFile';
 import { contains, FileSize, getFileSize } from '@octra/utilities';
 import { FileProgress } from '../../obj/objects';
 import {
+  AnnotationLevelType,
   Converter,
   IFile,
   ImportResult,
   OAnnotJSON,
-  OctraAnnotationSegment,
-  OctraAnnotationSegmentLevel,
   OLabel,
   OSegment,
+  OSegmentLevel,
 } from '@octra/annotation';
 import { timer } from 'rxjs';
 import { SupportedFilesModalComponent } from '../../modals/supportedfiles-modal/supportedfiles-modal.component';
@@ -192,11 +192,10 @@ export class OctraDropzoneComponent extends DefaultComponent {
                       importResult.error === ''
                     ) {
                       file.status = 'valid';
-                      for (const level of importResult.annotjson.levels) {
-                        if (
-                          level instanceof
-                          OctraAnnotationSegmentLevel<OctraAnnotationSegment>
-                        ) {
+                      for (const lvl of importResult.annotjson.levels) {
+                        if (lvl.type === AnnotationLevelType.SEGMENT) {
+                          const level = lvl as OSegmentLevel<OSegment>;
+
                           if (level.items[0].sampleStart !== 0) {
                             let temp = [];
                             temp.push(
@@ -506,8 +505,8 @@ export class OctraDropzoneComponent extends DefaultComponent {
 
   private dropFile(
     filename: string,
-    containsTrue: boolean = false,
-    containsnot: boolean = false
+    containsTrue = false,
+    containsnot = false
   ): boolean {
     for (let i = 0; i < this.files.length; i++) {
       const file = this.files[i].file;

diff --git a/apps/octra/src/app/core/modals/modals.module.ts b/apps/octra/src/app/core/modals/modals.module.ts
@@ -28,10 +28,6 @@ import {
 } from '@ngneat/transloco';
 import { HttpClient } from '@angular/common/http';
 import { AppSharedModule } from '../../app.shared.module';
-import {
-  TranslocoConfigProvider,
-  TranslocoLoaderProvider,
-} from '../../app.transloco';
 import { OctraComponentsModule } from '@octra/ngx-components';
 import { FormsModule } from '@angular/forms';
 import { NamingDragAndDropComponent } from '../tools/naming-drag-and-drop/naming-drag-and-drop.component';
@@ -99,7 +95,6 @@ export class TranslocoHttpLoader implements TranslocoLoader {
     NgbModalModule,
     OctraUtilitiesModule,
   ],
-  providers: [TranslocoConfigProvider, TranslocoLoaderProvider],
   exports: [
     BugreportModalComponent,
     ErrorModalComponent,

diff --git a/apps/octra/src/app/core/pages/intern/reload-file/reload-file.activateguard.ts b/apps/octra/src/app/core/pages/intern/reload-file/reload-file.activateguard.ts
@@ -1,18 +1,14 @@
 import { Injectable } from '@angular/core';
 
-import {
-  ActivatedRouteSnapshot,
-  CanActivate,
-  RouterStateSnapshot,
-} from '@angular/router';
+import { ActivatedRouteSnapshot, RouterStateSnapshot } from '@angular/router';
 import { SettingsService } from '../../../shared/service';
 import { AppStorageService } from '../../../shared/service/appstorage.service';
 import { Store } from '@ngrx/store';
 import { AppInfo } from '../../../../app.info';
 import { RoutingService } from '../../../shared/service/routing.service';
 
 @Injectable()
-export class ReloadFileGuard implements CanActivate {
+export class ReloadFileGuard {
   constructor(
     private appStorage: AppStorageService,
     private routingService: RoutingService,

diff --git a/apps/octra/src/app/core/pages/login/login.activateguard.ts b/apps/octra/src/app/core/pages/login/login.activateguard.ts
@@ -1,17 +1,13 @@
 import { Injectable } from '@angular/core';
 
-import {
-  ActivatedRouteSnapshot,
-  CanActivate,
-  RouterStateSnapshot,
-} from '@angular/router';
+import { ActivatedRouteSnapshot, RouterStateSnapshot } from '@angular/router';
 import { map, Observable } from 'rxjs';
 import { AppInfo } from '../../../app.info';
 import { ApplicationStoreService } from '../../store/application/application-store.service';
 import { RoutingService } from '../../shared/service/routing.service';
 
 @Injectable()
-export class ALoginGuard implements CanActivate {
+export class ALoginGuard {
   constructor(
     private appStoreService: ApplicationStoreService,
     private routingService: RoutingService

diff --git a/apps/octra/src/app/core/pages/login/login.deactivateguard.ts b/apps/octra/src/app/core/pages/login/login.deactivateguard.ts
@@ -1,11 +1,10 @@
-import { CanDeactivate } from '@angular/router';
 import { Observable } from 'rxjs';
 
 export interface ComponentCanDeactivate {
   canDeactivate: () => boolean | Observable<boolean>;
 }
 
-export class DeALoginGuard implements CanDeactivate<ComponentCanDeactivate> {
+export class DeALoginGuard  {
   canDeactivate(
     component: ComponentCanDeactivate
   ): Observable<boolean> | boolean {

diff --git a/apps/octra/src/app/core/shared/guard/compatibility.guard.ts b/apps/octra/src/app/core/shared/guard/compatibility.guard.ts
@@ -1,7 +1,6 @@
 import { Injectable } from '@angular/core';
 import {
   ActivatedRouteSnapshot,
-  CanActivate,
   Router,
   RouterStateSnapshot,
 } from '@angular/router';
@@ -17,7 +16,7 @@ import { navigateTo } from '@octra/ngx-utilities';
 @Injectable({
   providedIn: 'root',
 })
-export class CompatibilityGuard implements CanActivate {
+export class CompatibilityGuard {
   constructor(
     private router: Router,
     private compatibility: CompatibilityService,

diff --git a/apps/octra/src/app/core/shared/guard/transcr-end.activateguard.ts b/apps/octra/src/app/core/shared/guard/transcr-end.activateguard.ts
@@ -2,17 +2,14 @@ import { Injectable } from '@angular/core';
 
 import {
   ActivatedRouteSnapshot,
-  CanActivate,
   Router,
   RouterStateSnapshot,
 } from '@angular/router';
 import { Observable } from 'rxjs';
-import { AppInfo } from '../../../app.info';
 import { AppStorageService } from '../service/appstorage.service';
-import { navigateTo } from '@octra/ngx-utilities';
 
 @Injectable()
-export class TranscrEndGuard implements CanActivate {
+export class TranscrEndGuard {
   constructor(private appStorage: AppStorageService, private router: Router) {}
 
   canActivate(