Merge branch 'release/v0.11.3'

CHANGELOG.md

@@ -2,6 +2,57 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [0.11.3](https://github.com/webern-unibas-ch/awg-app/compare/v0.11.2...v0.11.3) (2024-01-19)
+
+### Features
+
+-   **assets:** add files for M 31 ([#844](https://github.com/webern-unibas-ch/awg-app/issues/844)) ([1a5347b](https://github.com/webern-unibas-ch/awg-app/commit/1a5347b80d3a7338e988adf4d72ee4a06009dee4); thanks to [@chael-mi](https://github.com/chael-mi))
+-   **edition:** add edition complex M 31 ([b66bb54](https://github.com/webern-unibas-ch/awg-app/commit/b66bb54b5aa5c9e806af8ec2d5872c0c6d9e3d6c))
+-   **edition:** adjust selectSvgSheet for cross-complex linking ([81a9940](https://github.com/webern-unibas-ch/awg-app/commit/81a99408e9a0462e21f35b4e04a6a5d27a0fbc45))
+
+### Bug Fixes
+
+-   **app:** avoid conditional expression for default assignment ([ae21c7f](https://github.com/webern-unibas-ch/awg-app/commit/ae21c7f3daa313815e8934b5c929e12812078d9b))
+-   **app:** fix unexpected lexical declaration in case blocks ([ff30f8d](https://github.com/webern-unibas-ch/awg-app/commit/ff30f8d8df397c806b317df44a4ea717f4f3316b))
+-   **app:** fix unnecessary use of boolean literals ([a2e999e](https://github.com/webern-unibas-ch/awg-app/commit/a2e999ec760a1a801ed82176d6abe21a27ba7c7c))
+-   **app:** prefer object chaining for object checks ([e4c3749](https://github.com/webern-unibas-ch/awg-app/commit/e4c37493ab680a9f85f8ce5100ca1bc046dd5964))
+-   **assets:** activate Textfassung 1 for m30 and m31 ([9ad3657](https://github.com/webern-unibas-ch/awg-app/commit/9ad36578f780d816d82881e089ae634ca7244f6f))
+-   **assets:** add firm signs for m30, m31, m34, and m37 ([47692d0](https://github.com/webern-unibas-ch/awg-app/commit/47692d0aa3c9846a147a7263dc8f8d3bc2bf70cd))
+-   **assets:** add linkBoxes for m30 ([2d0cf21](https://github.com/webern-unibas-ch/awg-app/commit/2d0cf21db080846302373dc9f046e14b4fbdb757))
+-   **assets:** add missing data files and placeholders for m31 ([dac88d0](https://github.com/webern-unibas-ch/awg-app/commit/dac88d037ce295f505e1c2cb6955e03ffdc087b4))
+-   **assets:** adjust data after changes to svg link models ([1ee7268](https://github.com/webern-unibas-ch/awg-app/commit/1ee72685f4f72886e795ad6483e21873bf861c71))
+-   **assets:** adjust folio convolute for m34 and m37 ([957feb9](https://github.com/webern-unibas-ch/awg-app/commit/957feb90da833ff5acf2ec072979aae47c4a1ab9))
+-   **assets:** fix folio convolute file for m30 ([d5dc23a](https://github.com/webern-unibas-ch/awg-app/commit/d5dc23a0e11388a44976978408707bb495407cb9))
+-   **assets:** fix link box for m37 ([7ee69f0](https://github.com/webern-unibas-ch/awg-app/commit/7ee69f0722fa715ca4676699be6ade5dcee5d0a5))
+-   **assets:** fix source descriptions for m34 and m37 ([bfd2e83](https://github.com/webern-unibas-ch/awg-app/commit/bfd2e83e120dcb261dd20d5d84f68ff3c47b7623))
+-   **assets:** format textcritics files ([0db6905](https://github.com/webern-unibas-ch/awg-app/commit/0db69053d149983115980c59f3b3a8d7d4f6eb2d))
+-   **assets:** rename svg file for m 31 ([6b49eae](https://github.com/webern-unibas-ch/awg-app/commit/6b49eaeca64ac6cfd7fa9fe9c6c511ce6aa4e0c0))
+-   **assets:** unify naming of sources ([bbb444b](https://github.com/webern-unibas-ch/awg-app/commit/bbb444b220d17cc8814fe91238ad6d06f971b224))
+-   **assets:** update files for m30, m31, and m37 ([#1308](https://github.com/webern-unibas-ch/awg-app/issues/1308)) ([e87a7e0](https://github.com/webern-unibas-ch/awg-app/commit/e87a7e06448c7ba2f7e03eae6888678ddc9e92a4))
+-   **assets:** update source description for m30 ([a6ab069](https://github.com/webern-unibas-ch/awg-app/commit/a6ab069884e62bd27ec0ce0e177ee8ec5ea00934))
+-   **assets:** update source evaluation for Textfassung 1 for m34 and m37 ([3b7b728](https://github.com/webern-unibas-ch/awg-app/commit/3b7b7283bf596242da777ce719d28b753a3af7d9))
+-   **edition:** add graph query example for edition complexes ([fe0bce0](https://github.com/webern-unibas-ch/awg-app/commit/fe0bce0ed9dbee92987e313d5d75be0e711af693))
+-   **edition:** adjust folio model for non-selectable items ([e8fb6ee](https://github.com/webern-unibas-ch/awg-app/commit/e8fb6eeced313a54c4556ca522100f8c07c31411))
+-   **edition:** fix naming and formatting of graph RDF triples ([6dfd59b](https://github.com/webern-unibas-ch/awg-app/commit/6dfd59b29e285612f7671cf222c27ef564ab17ca))
+-   **edition:** remove unused method from sheet viewer ([8fe1e8a](https://github.com/webern-unibas-ch/awg-app/commit/8fe1e8a79388b59933b1d9fd2a96ffd9932fb1d1))
+
+### Tests
+
+-   **edition:** adjust tests after changes to svg link models ([08e687f](https://github.com/webern-unibas-ch/awg-app/commit/08e687f10169bf6848bb9e4ec1c11ac7fba3de3f))
+
+### Code Refactoring
+
+-   **edition:** move tka description into separate component ([5a2fab9](https://github.com/webern-unibas-ch/awg-app/commit/5a2fab90742da512ec3f945f96bef8c8483615a7))
+-   **search:** simplify methods in bibliography format pipe ([eebc87d](https://github.com/webern-unibas-ch/awg-app/commit/eebc87dde827c8e3917f0a29faa7bfbe2de8a444))
+
+### Build System
+
+-   **deps-dev:** bump prettier from 3.1.1 to 3.2.2 ([01b85dd](https://github.com/webern-unibas-ch/awg-app/commit/01b85dd64c43ce744e70005b4359ea4e950c240b))
+-   **deps-dev:** bump the angular-cli-devkit group with 2 updates ([06c26a9](https://github.com/webern-unibas-ch/awg-app/commit/06c26a92297113138a01b23ae7aecb17379fa295))
+-   **deps-dev:** bump the typescript-eslint group with 2 updates ([01f5691](https://github.com/webern-unibas-ch/awg-app/commit/01f569174ee7fd25760e1366aa9f5eb466c1b1c9))
+-   **deps:** bump the angular group with 11 updates ([d5c2895](https://github.com/webern-unibas-ch/awg-app/commit/d5c28958b1ce7d76d34b88eb7c64034adc20e6d8))
+-   **deps:** bump the angular group with 11 updates ([930dd6f](https://github.com/webern-unibas-ch/awg-app/commit/930dd6fc7f838d1c7fddeac4de0882ccfa12ea67))
+
 ### [0.11.2](https://github.com/webern-unibas-ch/awg-app/compare/v0.11.1...v0.11.2) (2024-01-10)
 
 ### Features

package.json

@@ -1,6 +1,6 @@
 {
     "name": "awg-app",
-    "version": "0.11.2",
+    "version": "0.11.3",
     "license": "MIT",
     "author": {
         "name": "Stefan Münnich",
@@ -82,16 +82,16 @@
         "deploy:ci": "ng deploy --no-build --message=\"Release $npm_package_name (v$npm_package_version) on gh-pages\""
     },
     "dependencies": {
-        "@angular/animations": "^17.0.8",
-        "@angular/common": "^17.0.8",
-        "@angular/compiler": "^17.0.8",
-        "@angular/core": "^17.0.8",
-        "@angular/forms": "^17.0.8",
-        "@angular/localize": "^17.0.8",
-        "@angular/platform-browser": "^17.0.8",
-        "@angular/platform-browser-dynamic": "^17.0.8",
-        "@angular/platform-server": "^17.0.8",
-        "@angular/router": "^17.0.8",
+        "@angular/animations": "^17.1.0",
+        "@angular/common": "^17.1.0",
+        "@angular/compiler": "^17.1.0",
+        "@angular/core": "^17.1.0",
+        "@angular/forms": "^17.1.0",
+        "@angular/localize": "^17.1.0",
+        "@angular/platform-browser": "^17.1.0",
+        "@angular/platform-browser-dynamic": "^17.1.0",
+        "@angular/platform-server": "^17.1.0",
+        "@angular/router": "^17.1.0",
         "@codemirror/legacy-modes": "^6.3.3",
         "@fortawesome/angular-fontawesome": "^0.14.1",
         "@fortawesome/fontawesome-svg-core": "^6.5.1",
@@ -118,22 +118,22 @@
         "zone.js": "~0.14.2"
     },
     "devDependencies": {
-        "@angular-devkit/build-angular": "^17.0.10",
+        "@angular-devkit/build-angular": "^17.1.0",
         "@angular-eslint/builder": "^17.2.0",
         "@angular-eslint/eslint-plugin": "^17.2.0",
         "@angular-eslint/eslint-plugin-template": "^17.2.0",
         "@angular-eslint/schematics": "^17.2.0",
         "@angular-eslint/template-parser": "^17.2.0",
-        "@angular/cli": "^17.0.10",
-        "@angular/compiler-cli": "^17.0.8",
+        "@angular/cli": "^17.1.0",
+        "@angular/compiler-cli": "^17.1.0",
         "@commitlint/cli": "^18.4.4",
         "@commitlint/config-angular": "^18.4.4",
         "@compodoc/compodoc": "^1.1.23",
         "@types/d3": "^7.4.3",
         "@types/jasmine": "~5.1.4",
         "@types/node": "^18.19.6",
-        "@typescript-eslint/eslint-plugin": "^6.18.1",
-        "@typescript-eslint/parser": "^6.18.1",
+        "@typescript-eslint/eslint-plugin": "^6.19.0",
+        "@typescript-eslint/parser": "^6.19.0",
         "angular-cli-ghpages": "^1.0.7",
         "conventional-recommended-bump": "^9.0.0",
         "eslint": "^8.56.0",
@@ -152,7 +152,7 @@
         "karma-jasmine": "~5.1.0",
         "karma-jasmine-html-reporter": "^2.1.0",
         "lint-staged": "^15.2.0",
-        "prettier": "^3.1.1",
+        "prettier": "^3.2.2",
         "source-map-explorer": "^2.5.3",
         "standard-version": "^9.5.0",
         "typescript": "~5.2.2",

src/app/app.globals.ts

@@ -1,15 +1,15 @@
 // THIS IS AN AUTO-GENERATED FILE. DO NOT CHANGE IT MANUALLY!
-// Generated last time on Wed, Jan 10, 2024  9:50:54 PM
+// Generated last time on Fri, Jan 19, 2024 10:06:33 PM
 
 /**
  * The latest version of the AWG App
  */
-export const appVersion = '0.11.2';
+export const appVersion = '0.11.3';
 
 /**
  * The release date of the latest version of the AWG App
  */
-export const appVersionReleaseDate = '10. Januar 2024';
+export const appVersionReleaseDate = '19. Januar 2024';
 
 /**
  * The URL of the AWG App

src/app/core/services/conversion-service/conversion.service.ts

@@ -279,7 +279,7 @@ export class ConversionService extends ApiService {
      * @returns {ResourceDetail} The converted resource detail object.
      */
     convertResourceData(resourceData: IResourceDataResponse, resourceId: string): ResourceDetail {
-        if (!resourceData || !resourceData[0] || !resourceData[0].access) {
+        if (!resourceData?.[0]?.access) {
             return new ResourceDetail(undefined, undefined);
         }
         if (resourceData[0].access === 'OK') {

src/app/core/services/gnd-service/gnd.service.ts

@@ -98,7 +98,7 @@ export class GndService extends StorageService {
      * @returns {void} It exposes or removes the event to/from the storage.
      */
     exposeGnd(gndEvent: GndEvent) {
-        if (!gndEvent || !gndEvent.type) {
+        if (!gndEvent?.type) {
             return;
         }
         switch (gndEvent.type) {

src/app/core/services/http-cache/http-cache.service.ts

@@ -55,9 +55,7 @@ export class HttpCacheService implements HttpCache {
      * @returns {HttpResponse<any> | null} A cached response or null.
      */
     get(req: HttpRequest<any>): HttpResponse<any> | null {
-        return this._cachedResponses && this._cachedResponses.has(req.urlWithParams)
-            ? this._cachedResponses.get(req.urlWithParams)
-            : null;
+        return this._cachedResponses?.has(req.urlWithParams) ? this._cachedResponses.get(req.urlWithParams) : null;
     }
 
     /**

src/app/shared/modal/data/modal-content-snippets.data.ts

@@ -16,10 +16,10 @@ export const MODAL_CONTENT_SNIPPETS = {
         '<p>Die Beschreibung der Quellen <strong>A</strong> sowie <strong>C–D</strong> einschließlich der darin gegebenenfalls enthaltenen Korrekturen erfolgt im Zusammenhang der vollständigen Edition der <em>Drei Gesänge aus</em> Viae Inviae <em>von Hildegard Jone</em> op. 23 in AWG I/5.</p>',
     OP24_SOURCE_NOT_AVAILABLE:
         '<p>Die Beschreibung der Quellen <strong>A</strong> sowie <strong>C–D</strong> einschließlich der darin gegebenenfalls enthaltenen Korrekturen erfolgt im Zusammenhang der vollständigen Edition des <em>Konzert für neun Instrumente</em> op. 24 in AWG I/1.</p>',
-    OP25_SHEET_COMING_SOON:
-        'Die edierten Notentexte weiterer Skizzen der <em>Drei Lieder nach Gedichten von Hildegard Jone</em> op. 25 erscheinen in Kürze (02/2022).',
     OP25_SOURCE_NOT_AVAILABLE:
         '<p>Die Beschreibung der Quellen <strong>D</strong> und <strong>E</strong> einschließlich der darin gegebenenfalls enthaltenen Korrekturen erfolgt im Zusammenhang der vollständigen Edition der <em>Drei Lieder nach Gedichten von Hildegard Jone</em> op. 25 in AWG I/5.</p>',
+    VOL_2A_EDITION_COMING_SOON:
+        '<p>Die Einleitungen, edierten Notentexte und Kritischen Berichte zu</p><ul class="nobullets"><li>Studienkomposition für Klavier M* 402,</li><li>Studienkomposition für Klavier M* 403</li></ul><p> erscheinen im Zusammenhang der vollständigen Edition der Studienkompositionen für Klavier in AWG II/2a.</p>',
     M198: '<p>Das Fragment „<em>Schien mir’s als ich sah die Sonne</em>“ (M 198) für Chor und Orchester wird in AWG II/3 ediert.</p>',
     HINT_EDITION_SHEETS:
         '<p>\n' +

src/app/shared/table/table.component.ts

@@ -246,7 +246,7 @@ export class TableComponent implements OnInit {
                         if (rowEntry === null || rowEntry === undefined) {
                             return false;
                         }
-                        return rowEntry['label'] && rowEntry['label'].toString().toLowerCase().includes(term);
+                        return rowEntry['label']?.toString().toLowerCase().includes(term);
                     })
                 );
                 return this.tableData.filteredRows;

src/app/views/data-view/data-outlets/bibliography/bibliography-format.pipe.ts

@@ -321,30 +321,29 @@ export class BibliographyFormatPipe implements PipeTransform {
                     console.warn('Verlag fehlt: "' + out + '" (' + this._bibEntry['Kurztitel'] + ')');
                 }
             }
-        } else {
-            if (pub) {
-                out += pubPlace + ': ';
-                // Publisher == object
-                // Case: "Wien: Böhlau, Lafite, "
-                if (typeof pub === 'object') {
-                    const publ = Object.keys(pub).length;
-                    for (let i = 0; i < publ; i++) {
-                        out += pub[i] + ', ';
-                    }
-                } else {
-                    // Publisher == String
-                    // Case: "Wien: Böhlau,"
-                    out += pub + ', ';
+        } else if (pub) {
+            out += pubPlace + ': ';
+            // Publisher == object
+            // Case: "Wien: Böhlau, Lafite, "
+            if (typeof pub === 'object') {
+                const publ = Object.keys(pub).length;
+                for (let i = 0; i < publ; i++) {
+                    out += pub[i] + ', ';
                 }
             } else {
-                // Place without publisher (e.g. "Hochschulschriften")
-                // Case: "Wien, "
-                if (!this._bibEntry['unpubliziert']) {
-                    console.warn('Verlag fehlt: "' + out + '" (' + this._bibEntry['Kurztitel'] + ')');
-                }
-                out += pubPlace + ', ';
+                // Publisher == String
+                // Case: "Wien: Böhlau,"
+                out += pub + ', ';
             }
+        } else {
+            // Place without publisher (e.g. "Hochschulschriften")
+            // Case: "Wien, "
+            if (!this._bibEntry['unpubliziert']) {
+                console.warn('Verlag fehlt: "' + out + '" (' + this._bibEntry['Kurztitel'] + ')');
+            }
+            out += pubPlace + ', ';
         }
+
         return out;
     }
 
@@ -429,15 +428,11 @@ export class BibliographyFormatPipe implements PipeTransform {
      * @returns {string} The splitted name(s).
      */
     private _splitName(name: string, preDelimiter: string): string {
-        let tmp = [];
-        if (name.match(',')) {
-            tmp = name.split(', ');
-            // Changes positions of first and last name
-            // Look here: http://stackoverflow.com/a/5306832
-            tmp.splice(1, 0, tmp.splice(0, 1)[0]);
-            return preDelimiter + tmp[0] + ' ' + tmp[1];
+        if (name.includes(',')) {
+            const [lastName, firstName] = name.split(', ');
+            return `${preDelimiter}${firstName} ${lastName}`;
         } else {
-            return preDelimiter + name;
+            return `${preDelimiter}${name}`;
         }
     }
 }

src/app/views/data-view/data-outlets/resource-detail/resource-detail-html/resource-detail-html-content/props/props.component.ts

@@ -82,7 +82,7 @@ export class ResourceDetailHtmlContentPropsComponent implements OnChanges, OnDes
      * @returns {void} Emits the event.
      */
     exposeGnd(gndEvent: GndEvent): void {
-        if (!gndEvent || !gndEvent.type) {
+        if (!gndEvent?.type) {
             return;
         }
         this.gndRequest.emit(gndEvent);

src/app/views/data-view/data-outlets/resource-detail/resource-detail-html/resource-detail-html-content/resource-detail-html-content.component.ts

@@ -54,7 +54,7 @@ export class ResourceDetailHtmlContentComponent {
      * @returns {void} Emits the event.
      */
     exposeGnd(gndEvent: GndEvent): void {
-        if (!gndEvent || !gndEvent.type) {
+        if (!gndEvent?.type) {
             return;
         }
         this.gndRequest.emit(gndEvent);

src/app/views/data-view/data-outlets/resource-detail/resource-detail-html/resource-detail-html.component.ts

@@ -52,7 +52,7 @@ export class ResourceDetailHtmlComponent {
      * @returns {void} Emits the event.
      */
     exposeGnd(gndEvent: GndEvent): void {
-        if (!gndEvent || !gndEvent.type) {
+        if (!gndEvent?.type) {
             return;
         }
         this.gndRequest.emit(gndEvent);

src/app/views/data-view/models/resource-detail-header.model.ts

@@ -75,7 +75,7 @@ export class ResourceDetailHeader {
             // Extract restype specific title for header
             switch (info.restype_id) {
                 // CHRONOLOGIE
-                case '28':
+                case '28': {
                     // Richtext value has already been converted in detail using plugin "htmlConverter"
                     let htmlstr = props['webern-onto:event'].toHtml[0];
 
@@ -84,42 +84,48 @@ export class ResourceDetailHeader {
 
                     this.title = htmlstr;
                     break;
+                }
 
                 // KORRESPONDENZ (same as SUPPLEMENT)
-                case '29':
+                case '29': {
                     this.title = props['dc:title'].toHtml[0] + '<br/>' + props['dc:date'].toHtml[0];
                     break;
+                }
 
                 // SUPPLEMENT
-                case '125':
+                case '125': {
                     this.title = props['dc:title'].toHtml[0] + '<br/>' + props['dc:date'].toHtml[0];
                     break;
+                }
 
                 // MUSIKSTÜCK (Moldenhauer-Nummer)
-                case '36':
+                case '36': {
                     this.title = '[M ' + props['webern-onto:mnr'].toHtml[0] + '] ' + props['dc:title'].toHtml[0];
                     break;
-
+                }
                 // WERK
-                case '43':
+                case '43': {
                     this.title = props['dc:title'].toHtml[0];
                     break;
-
+                }
                 // PERSON
-                case '45':
+                case '45': {
                     const lname: string = props['salsah:lastname'].toHtml[0];
                     const fname: string = props['salsah:firstname'].toHtml[0];
                     this.title = fname + ' ' + lname;
                     break;
+                }
 
                 // BIBLIOGRAPHIE
-                case '126':
+                case '126': {
                     this.title = props['webern-onto:bibl_title_short'].toHtml[0];
                     break;
+                }
 
                 // DEFAULT
-                default:
+                default: {
                     this.title = info.restype_description;
+                }
             }
         } else {
             // Header for undefined & restricted object

src/app/views/data-view/services/data-api.service.ts

@@ -1,7 +1,7 @@
 import { HttpClient, HttpParams } from '@angular/common/http';
 import { Injectable } from '@angular/core';
 
-import { forkJoin as observableForkJoin, Observable, of as observableOf } from 'rxjs';
+import { Observable, forkJoin as observableForkJoin, of as observableOf } from 'rxjs';
 import { defaultIfEmpty, map } from 'rxjs/operators';
 
 import { ApiService, ConversionService } from '@awg-core/services/';
@@ -186,10 +186,10 @@ export class DataApiService extends ApiService {
      * @returns {Observable<SearchResponseJson>} The observable with the SearchResponseJson data.
      */
     getSearchData(searchParams: SearchParams): Observable<SearchResponseJson> {
-        if (!searchParams || !searchParams.query) {
-            return observableOf(new SearchResponseJson());
-        }
-        if (typeof searchParams.query === 'object' && !searchParams.query['filterByRestype']) {
+        if (
+            !searchParams?.query ||
+            (typeof searchParams?.query === 'object' && !searchParams?.query?.['filterByRestype'])
+        ) {
             return observableOf(new SearchResponseJson());
         }