Update to latest

exlbashirn · exlbashirn · commit d9f85ad5dc27 · 2025-01-10T07:30:31.000+02:00
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -15,5 +15,10 @@
             ],
             "url": "/node_modules/@exlibris/exl-cloudapp-base/manifest.schema.json"
         }
-    ]   
+    ],
+    "workbench.colorCustomizations": {
+        "activityBar.background": "#3F1172",
+        "titleBar.activeBackground": "#5818A0",
+        "titleBar.activeForeground": "#FDFCFF"
+    }
 }
diff --git a/cloudapp/jsconfig.json b/cloudapp/jsconfig.json
@@ -1,6 +1,3 @@
 {
-  "compilerOptions": {
-    "experimentalDecorators": true,
-    "target": "es5"
-  }
+  "extends": "../.ng/tsconfig.json",
 }
diff --git a/cloudapp/src/app/app.module.ts b/cloudapp/src/app/app.module.ts
@@ -1,10 +1,10 @@
 import { NgModule } from '@angular/core';
-import { HttpClientModule } from '@angular/common/http';
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
 import { BrowserModule, Title } from '@angular/platform-browser';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { MaterialModule, AlertModule, MenuModule, CloudAppTranslateModule } from '@exlibris/exl-cloudapp-angular-lib';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { SelectEntitiesModule } from 'eca-components';
+import { SelectEntitiesModule } from '@exlibris/eca-components';
 
 import { AppComponent } from './app.component';
 import { AppRoutingModule } from './app-routing.module';
@@ -26,47 +26,44 @@ import { ErrorComponent } from './static/error.component';
 import { ConfirmationDialog, StyleComponent } from './style/style.component';
 
 @NgModule({
-   declarations: [	
-      AppComponent,
-      MainComponent,
-      TopmenuComponent,
-      NewrouteComponent,
-      ThemingComponent,
-      SettingsComponent,
-      ParallelComponent,
-      ExternalComponent,
-      XmlComponent,
-      BindComponent,
-      StoreComponent,
-      TranslateComponent,
-      ConfigurationComponent,
-      MultiSelectComponent,
-      LightboxComponent,
-      ErrorComponent,
-      StyleComponent,
-      ConfirmationDialog,
-   ],
-   imports: [
-      MaterialModule,
-      BrowserModule,
-      BrowserAnimationsModule,
-      AppRoutingModule,
-      HttpClientModule,
-      FormsModule,
-      ReactiveFormsModule,
-      CloudAppTranslateModule.forRoot(),
-      AlertModule,
-      SelectEntitiesModule,
-      MenuModule,
-   ],
-   providers: [
-      Title
-   ],
-   bootstrap: [
-      AppComponent
-   ],
-   entryComponents: [
-      ConfirmationDialog
-   ]
+    declarations: [
+        AppComponent,
+        MainComponent,
+        TopmenuComponent,
+        NewrouteComponent,
+        ThemingComponent,
+        SettingsComponent,
+        ParallelComponent,
+        ExternalComponent,
+        XmlComponent,
+        BindComponent,
+        StoreComponent,
+        TranslateComponent,
+        ConfigurationComponent,
+        MultiSelectComponent,
+        LightboxComponent,
+        ErrorComponent,
+        StyleComponent,
+        ConfirmationDialog,
+    ],
+    bootstrap: [
+        AppComponent
+    ],
+    imports: [
+        MaterialModule,
+        BrowserModule,
+        BrowserAnimationsModule,
+        AppRoutingModule,
+        FormsModule,
+        ReactiveFormsModule,
+        CloudAppTranslateModule.forRoot(),
+        AlertModule,
+        SelectEntitiesModule,
+        MenuModule
+    ],
+    providers: [
+        Title,
+        provideHttpClient(withInterceptorsFromDi())
+    ]
 })
 export class AppModule { }
diff --git a/cloudapp/src/app/configuration/configuration.component.ts b/cloudapp/src/app/configuration/configuration.component.ts
@@ -1,10 +1,10 @@
-import { Component, OnInit, Injectable } from '@angular/core';
-import { AppService } from '../app.service';
+import { Component, Injectable, OnInit } from '@angular/core';
 import { FormBuilder, FormGroup } from '@angular/forms';
-import { CloudAppConfigService, CloudAppEventsService, CloudAppRestService, InitData, AlertService } from '@exlibris/exl-cloudapp-angular-lib';
-import { CanActivate, Router } from '@angular/router';
-import { Observable, iif, of } from 'rxjs';
+import { Router } from '@angular/router';
+import { AlertService, CloudAppConfigService, CloudAppEventsService, CloudAppRestService } from '@exlibris/exl-cloudapp-angular-lib';
+import { Observable } from 'rxjs';
 import { map, switchMap } from 'rxjs/operators';
+import { AppService } from '../app.service';
 import { ErrorMessages } from '../static/error.component';
 
 @Component({
@@ -13,9 +13,10 @@ import { ErrorMessages } from '../static/error.component';
   styleUrls: ['./configuration.component.scss']
 })
 export class ConfigurationComponent implements OnInit {
+
   form: FormGroup;
   saving = false;
-  
+
   constructor(
     private appService: AppService,
     private fb: FormBuilder,
@@ -32,11 +33,11 @@ export class ConfigurationComponent implements OnInit {
   }
 
   load() {
-    this.configService.getAsFormGroup().subscribe( config => {
-      if (Object.keys(config.value).length!=0) {
+    this.configService.getAsFormGroup().subscribe(config => {
+      if (Object.keys(config.value).length != 0) {
         this.form = config;
       }
-    });   
+    });
   }
 
   save() {
@@ -47,33 +48,35 @@ export class ConfigurationComponent implements OnInit {
         this.form.markAsPristine();
       },
       err => this.alert.error(err.message),
-      ()  => this.saving = false
+      () => this.saving = false
     );
-  }  
+  }
 
 }
 
 @Injectable({
   providedIn: 'root',
 })
-export class ConfigurationGuard implements CanActivate {
-  constructor (
+export class ConfigurationGuard {
+
+  constructor(
     private eventsService: CloudAppEventsService,
     private restService: CloudAppRestService,
     private router: Router
-  ) {}
+  ) { }
 
   canActivate(): Observable<boolean> {
     return this.eventsService.getInitData().pipe(
-      switchMap( initData => this.restService.call(`/users/${initData.user.primaryId}`)),
-      map( user => {
-        if (!user.user_role.some(role=>role.role_type.value=='221')) {
-          this.router.navigate(['/error'], 
-            { queryParams: { error: ErrorMessages.NO_ACCESS }});
+      switchMap(initData => this.restService.call(`/users/${initData.user.primaryId}`)),
+      map(user => {
+        if (!user.user_role.some(role => role.role_type.value == '221')) {
+          this.router.navigate(['/error'],
+            { queryParams: { error: ErrorMessages.NO_ACCESS } });
           return false;
         }
         return true;
       })
     );
   }
+
 }
diff --git a/cloudapp/src/app/external/external.component.theme.scss b/cloudapp/src/app/external/external.component.theme.scss
@@ -0,0 +1,17 @@
+@use "@angular/material" as mat;
+
+@mixin external-component-theme($theme, $typgraphy) {
+  app-external .mat-mdc-tab-group.mat-tabs-with-background > .mat-mdc-tab-header {
+    color: mat.get-theme-color($theme, on-secondary-fixed-variant);
+    background-color: mat.get-theme-color($theme, secondary-fixed);
+
+    .mat-mdc-tab {
+      &.mdc-tab--active .mdc-tab__text-label {
+        color: mat.get-theme-color($theme, on-secondary-fixed);
+      }
+      &:hover {
+        background-color: mat.get-theme-color($theme, secondary-fixed-dim);
+      }
+    }
+  }
+}
diff --git a/cloudapp/src/app/main/main.component.theme.scss b/cloudapp/src/app/main/main.component.theme.scss
@@ -1,6 +1,8 @@
+@use "@angular/material" as mat;
+
 @mixin main-component-theme($theme, $typgraphy) {
-  section>h1 {
-    background-color: mat-color(map-get($theme, primary));
-    color: mat-color(map-get($theme, primary), default-contrast);
+  section > h1 {
+    background-color: mat.get-theme-color($theme, primary);
+    color: mat.get-theme-color($theme, on-primary);
   }
-}
+}
diff --git a/cloudapp/src/app/style/style.component.scss b/cloudapp/src/app/style/style.component.scss
@@ -8,6 +8,13 @@
   margin-right: 10px;
 }
 
-.mat-list {
-  max-width: 400px;
+::ng-deep {
+  mat-list {
+    max-width: 400px;
+    .mat-mdc-list-item-line {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+    }
+  }
 }
diff --git a/cloudapp/src/app/theming/theming.component.theme.scss b/cloudapp/src/app/theming/theming.component.theme.scss
@@ -1,5 +1,7 @@
+@use "@angular/material" as mat;
+
 @mixin theming-component-theme($theme, $typgraphy) {
   .themed-box {
-    border-color: mat-color(map-get($theme, primary));
+    border-color: mat.get-theme-color($theme, primary);
   }
-}
+}
diff --git a/cloudapp/src/app/xml/bib-utils.ts b/cloudapp/src/app/xml/bib-utils.ts
@@ -1,6 +1,4 @@
 import { CloudAppRestService, HttpMethod } from "@exlibris/exl-cloudapp-angular-lib";
-import { Observable } from "rxjs";
-import { map } from "rxjs/operators";
 
 export interface Bib {
   link: string,
@@ -19,43 +17,46 @@ export class BibUtils {
   }
 
   /** Retrieve a single BIB record */
-  getBib (mmsId: string) {
+  getBib(mmsId: string) {
     return this._restService.call<Bib>(`/bibs/${mmsId}`);
-  }   
+  }
 
   /** Update a BIB record with the specified MARCXML */
-  updateBib( bib: Bib ) {
-    return this._restService.call<Bib>( {
+  updateBib(bib: Bib) {
+    return this._restService.call<Bib>({
       url: `/bibs/${bib.mms_id}`,
-      headers: { 
+      headers: {
         "Content-Type": "application/xml",
-        Accept: "application/json" },
+        Accept: "application/json"
+      },
       requestBody: `<bib>${bib.anies}</bib>`,
       method: HttpMethod.PUT
     });
-  }    
+  }
 
   /** Adds a 500 note field to a MARC21 Bibliographic Record */
   addNoteToBib(bib: Bib) {
     const doc = new DOMParser().parseFromString(bib.anies, "application/xml");
-    const datafield = dom("datafield", { 
-      parent: doc.documentElement, 
-      attributes: [ ["tag", "500"], ["ind1", " "], ["ind2", " "] ]
+    const datafield = dom("datafield", {
+      parent: doc.documentElement,
+      attributes: [["tag", "500"], ["ind1", " "], ["ind2", " "]]
     });
-    dom("subfield", { 
-      parent: datafield, 
-      text: `Record processed at ${(new Date()).toLocaleString()}`, 
-      attributes: [ ["code", "a"] ]
+    dom("subfield", {
+      parent: datafield,
+      text: `Record processed at ${(new Date()).toLocaleString()}`,
+      attributes: [["code", "a"]]
     });
     bib.anies = new XMLSerializer().serializeToString(doc.documentElement);
     return bib;
-  }   
+  }
 }
 
 /** Adds Element to dom and returns it */
-const dom = (name: string, options: {parent?: Element | Node, text?: 
-  string, className?: string, id?: string, attributes?: string[][]} = {}
-  ): Element => {
+const dom = (name: string, options: {
+  parent?: Element, text?:
+    string, className?: string, id?: string, attributes?: string[][]
+} = {}
+): Element => {
 
   let ns = options.parent ? options.parent.namespaceURI : '';
   let element = document.createElementNS(ns, name);
@@ -66,5 +67,5 @@ const dom = (name: string, options: {parent?: Element | Node, text?:
   if (options.id) element.id = options.id;
   if (options.attributes) options.attributes.forEach(([att, val]) => element.setAttribute(att, val));
 
-  return element;  
+  return element;
 }
diff --git a/cloudapp/src/main.scss b/cloudapp/src/main.scss
@@ -1,11 +1,13 @@
 
 @import './app/main/main.component.theme';
 @import './app/theming/theming.component.theme';
+@import './app/external/external.component.theme';
 
 @mixin themed-styles($theme, $typography) {
     /* Include themed component mixins or theme dependent styles here */
     @include main-component-theme($theme, $typography);
     @include theming-component-theme($theme, $typography);
+    @include external-component-theme($theme, $typography);
 }
 
 @mixin global-styles {
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
diff --git a/tsconfig.override.json b/tsconfig.override.json

Original file line number	Diff line number	Diff line change
`@@ -15,5 +15,10 @@`
`15`	`15`	`],`
`16`	`16`	`"url": "/node_modules/@exlibris/exl-cloudapp-base/manifest.schema.json"`
`17`	`17`	`}`
`18`		`- ]`
	`18`	`+ ],`
	`19`	`+ "workbench.colorCustomizations": {`
	`20`	`+ "activityBar.background": "#3F1172",`
	`21`	`+ "titleBar.activeBackground": "#5818A0",`
	`22`	`+ "titleBar.activeForeground": "#FDFCFF"`
	`23`	`+ }`
`19`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,3 @@`
`1`	`1`	`{`
`2`		`- "compilerOptions": {`
`3`		`- "experimentalDecorators": true,`
`4`		`- "target": "es5"`
`5`		`- }`
	`2`	`+ "extends": "../.ng/tsconfig.json",`
`6`	`3`	`}`