Merge branch 'release/v0.9.3'

webern-unibas-ch · Dec 20, 2022 · 99c682a · 99c682a
2 parents 4c6760a + 2ff60a1
commit 99c682a
Show file tree

Hide file tree

Showing 57 changed files with 2,481 additions and 3,110 deletions.
diff --git a/.browserslistrc b/.browserslistrc
diff --git a/.github/workflows/ci_workflow.yml b/.github/workflows/ci_workflow.yml
@@ -25,7 +25,7 @@ jobs:
         strategy:
             matrix:
                 os: [ubuntu-latest]
-                node-version: [14.17, 16.15, 18.x]
+                node-version: [14.21, 16.18, 18.x]
 
         steps:
             - name: Checkout repo
@@ -48,15 +48,15 @@ jobs:
                   yarn run test:ci
 
             - name: Upload code coverage
-              if: matrix.node-version == 16.15 # upload coverage report for current node version only
+              if: matrix.node-version == 16.18 # upload coverage report for current node version only
               uses: codecov/[email protected]
               with:
                   flags: unittests
                   env_vars: ${{ matrix.os }}, ${{ matrix.node-version }}
 
             - name: Perform SonarCloud Analysis
-              if: matrix.node-version == 16.15 && github.event_name != 'pull_request' && github.repository_owner == env.MAIN_REPO_OWNER # perform SonarCloud analysis only for current node version and not with pull requests or forks(token issue)
-              uses: SonarSource/sonarcloud-github-action@v1.7
+              if: matrix.node-version == 16.18 && github.event_name != 'pull_request' && github.repository_owner == env.MAIN_REPO_OWNER # perform SonarCloud analysis only for current node version and not with pull requests or forks(token issue)
+              uses: SonarSource/sonarcloud-github-action@v1.8
               env:
                   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
                   SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
@@ -77,7 +77,7 @@ jobs:
         strategy:
             matrix:
                 os: [ubuntu-latest]
-                node-version: [ 16.15 ]
+                node-version: [ 16.18 ]
 
         steps:
             - name: Checkout repo
@@ -114,7 +114,7 @@ jobs:
         strategy:
             matrix:
                 os: [ ubuntu-latest ]
-                node-version: [ 16.15 ]
+                node-version: [ 16.18 ]
 
         steps:
             - name: Get tag version

diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/angular.json b/angular.json
@@ -25,28 +25,16 @@
                         "inlineStyleLanguage": "scss",
                         "aot": false,
                         "assets": ["src/favicon.ico", "src/assets"],
-                        "allowedCommonJsDependencies": [
-                            "@ctrl/ngx-codemirror",
-                            "codemirror",
-                            "codemirror/mode/sparql/sparql",
-                            "codemirror/mode/turtle/turtle",
-                            "readable-stream",
-                            "queue-microtask",
-                            "rdfstore"
-                        ],
+                        "allowedCommonJsDependencies": ["readable-stream", "queue-microtask", "rdfstore"],
                         "styles": [
                             "src/index.style.scss",
                             "node_modules/bootstrap/dist/css/bootstrap.min.css",
                             "node_modules/font-awesome/scss/font-awesome.scss",
-                            "node_modules/codemirror/lib/codemirror.css",
                             "src/styles.scss"
                         ],
                         "scripts": [
                             "node_modules/snapsvg/dist/snap.svg-min.js",
                             "node_modules/rdfstore/dist/rdfstore_min.js",
-                            "node_modules/codemirror/lib/codemirror.js",
-                            "node_modules/codemirror/mode/turtle/turtle.js",
-                            "node_modules/codemirror/mode/sparql/sparql.js",
                             "src/assets/js/dateConverter.js",
                             "src/assets/js/htmlConverter.js"
                         ]
@@ -135,15 +123,11 @@
                             "src/index.style.scss",
                             "node_modules/bootstrap/dist/css/bootstrap.min.css",
                             "node_modules/font-awesome/scss/font-awesome.scss",
-                            "node_modules/codemirror/lib/codemirror.css",
                             "src/styles.scss"
                         ],
                         "scripts": [
                             "node_modules/snapsvg/dist/snap.svg-min.js",
                             "node_modules/rdfstore/dist/rdfstore_min.js",
-                            "node_modules/codemirror/lib/codemirror.js",
-                            "node_modules/codemirror/mode/turtle/turtle.js",
-                            "node_modules/codemirror/mode/sparql/sparql.js",
                             "src/assets/js/dateConverter.js",
                             "src/assets/js/htmlConverter.js"
                         ],
@@ -181,9 +165,7 @@
             "path": ".angular/cache",
             "environment": "all"
         },
-        "schematicCollections": [
-            "@angular-eslint/schematics"
-        ],
+        "schematicCollections": ["@angular-eslint/schematics"],
         "analytics": false
     }
 }
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "awg-app",
-    "version": "0.9.2",
+    "version": "0.9.3",
     "license": "MIT",
     "author": {
         "name": "Stefan Münnich",
@@ -78,80 +78,80 @@
         "deploy:ci": "ng deploy --no-build --message=\"Release $npm_package_name (v$npm_package_version) on gh-pages\""
     },
     "dependencies": {
-        "@angular/animations": "^14.2.5",
-        "@angular/common": "^14.2.5",
-        "@angular/compiler": "^14.2.5",
-        "@angular/core": "^14.2.5",
-        "@angular/forms": "^14.2.5",
-        "@angular/localize": "^14.2.5",
-        "@angular/platform-browser": "^14.2.5",
-        "@angular/platform-browser-dynamic": "^14.2.5",
-        "@angular/platform-server": "^14.2.5",
-        "@angular/router": "^14.2.5",
-        "@ctrl/ngx-codemirror": "^5.1.1",
-        "@fortawesome/angular-fontawesome": "^0.11.1",
-        "@fortawesome/fontawesome-svg-core": "^6.2.0",
-        "@fortawesome/free-solid-svg-icons": "^6.2.0",
+        "@angular/animations": "^15.0.4",
+        "@angular/common": "^15.0.4",
+        "@angular/compiler": "^15.0.4",
+        "@angular/core": "^15.0.4",
+        "@angular/forms": "^15.0.4",
+        "@angular/localize": "^15.0.4",
+        "@angular/platform-browser": "^15.0.4",
+        "@angular/platform-browser-dynamic": "^15.0.4",
+        "@angular/platform-server": "^15.0.4",
+        "@angular/router": "^15.0.4",
+        "@codemirror/legacy-modes": "^6.3.1",
+        "@fortawesome/angular-fontawesome": "^0.12.0",
+        "@fortawesome/fontawesome-svg-core": "^6.2.1",
+        "@fortawesome/free-solid-svg-icons": "^6.2.1",
         "@kolkov/ngx-gallery": "2.0.1",
-        "@ng-bootstrap/ng-bootstrap": "^13.0.0",
+        "@ng-bootstrap/ng-bootstrap": "^14.0.0",
         "@popperjs/core": "^2.11.6",
-        "bootstrap": "^5.2.2",
-        "codemirror": "^5.65.9",
+        "bootstrap": "^5.2.3",
+        "codemirror": "^6.0.1",
         "d3-drag": "^3.0.0",
         "d3-fetch": "^3.0.1",
         "d3-force": "^3.0.0",
         "d3-selection": "^3.0.0",
         "d3-zoom": "^3.0.0",
         "font-awesome": "^4.7.0",
         "json2typescript": "^1.5.1",
-        "n3": "^1.16.2",
-        "ngx-json-viewer": "^3.1.0",
-        "rdfstore": "musicenfanthen/rdfstore-js#v0.9.18-alpha.6",
-        "rxjs": "~7.5.7",
+        "n3": "^1.16.3",
+        "ngx-json-viewer": "^3.2.1",
+        "rdfstore": "musicenfanthen/rdfstore-js#v0.9.18-alpha.7",
+        "rxjs": "~7.8.0",
         "snapsvg": "^0.5.1",
-        "tslib": "^2.4.0",
-        "zone.js": "~0.11.8"
+        "tslib": "^2.4.1",
+        "zone.js": "~0.12.0"
     },
     "devDependencies": {
-        "@angular-devkit/build-angular": "^14.2.5",
-        "@angular-eslint/builder": "^14.1.2",
-        "@angular-eslint/eslint-plugin": "^14.1.2",
-        "@angular-eslint/eslint-plugin-template": "^14.1.2",
-        "@angular-eslint/schematics": "^14.1.2",
-        "@angular-eslint/template-parser": "^14.1.2",
-        "@angular/cli": "^14.2.5",
-        "@angular/compiler-cli": "^14.2.5",
-        "@commitlint/cli": "^17.1.2",
-        "@commitlint/config-angular": "^17.1.0",
+        "@angular-devkit/build-angular": "^15.0.4",
+        "@angular-eslint/builder": "^15.1.0",
+        "@angular-eslint/eslint-plugin": "^15.1.0",
+        "@angular-eslint/eslint-plugin-template": "^15.1.0",
+        "@angular-eslint/schematics": "^15.1.0",
+        "@angular-eslint/template-parser": "^15.1.0",
+        "@angular/cli": "^15.0.4",
+        "@angular/compiler-cli": "^15.0.4",
+        "@commitlint/cli": "^17.3.0",
+        "@commitlint/config-angular": "^17.3.0",
         "@compodoc/compodoc": "^1.1.19",
         "@types/d3": "^7.4.0",
-        "@types/jasmine": "~4.3.0",
-        "@types/node": "^16.11.64",
-        "@typescript-eslint/eslint-plugin": "^5.39.0",
-        "@typescript-eslint/parser": "^5.39.0",
-        "angular-cli-ghpages": "^1.0.3",
+        "@types/jasmine": "~4.3.1",
+        "@types/node": "^16.18.10",
+        "@typescript-eslint/eslint-plugin": "^5.47.0",
+        "@typescript-eslint/parser": "^5.47.0",
+        "angular-cli-ghpages": "^1.0.5",
         "conventional-recommended-bump": "^6.1.0",
         "cross-var": "^1.1.0",
-        "eslint": "^8.25.0",
+        "eslint": "^8.30.0",
         "eslint-config-prettier": "^8.5.0",
         "eslint-plugin-angular": "^4.1.0",
         "eslint-plugin-import": "^2.26.0",
-        "eslint-plugin-jsdoc": "^39.3.6",
+        "eslint-plugin-jsdoc": "^39.6.4",
         "eslint-plugin-prettier": "^4.2.1",
-        "gzipper": "^7.1.0",
-        "husky": "^8.0.1",
-        "jasmine-core": "~4.4.0",
+        "gzipper": "^7.2.0",
+        "husky": "^8.0.2",
+        "jasmine-core": "~4.5.0",
         "karma": "~6.4.1",
         "karma-chrome-launcher": "~3.1.1",
         "karma-coverage": "^2.2.0",
         "karma-jasmine": "~5.1.0",
         "karma-jasmine-html-reporter": "^2.0.0",
-        "lint-staged": "^13.0.3",
-        "prettier": "^2.7.1",
+        "lint-staged": "^13.1.0",
+        "prettier": "^2.8.1",
         "source-map-explorer": "^2.5.3",
         "standard-version": "^9.5.0",
-        "typescript": "~4.7.4",
-        "webpack-bundle-analyzer": "^4.6.1"
+        "typescript": "~4.8.4",
+        "webpack-bundle-analyzer": "^4.7.0"
     },
     "engines": {
         "node": ">= 14.17.0",

diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
@@ -70,9 +70,7 @@ export const routedAppComponents = [HomeViewComponent];
             anchorScrolling: 'enabled',
             onSameUrlNavigation: 'reload',
             scrollPositionRestoration: 'enabled',
-            preloadingStrategy: PreloadAllModules, // Preload all lazy modules
-            // EnableTracing: true          // TODO: do not enable tracing for production
-            relativeLinkResolution: 'corrected',
+            preloadingStrategy: PreloadAllModules,
         }),
     ],
     exports: [RouterModule],

diff --git a/src/app/app.globals.ts b/src/app/app.globals.ts
@@ -1,15 +1,15 @@
 // THIS IS AN AUTO-GENERATED FILE. DO NOT CHANGE IT MANUALLY!
-// Generated last time on Mon Oct 10 19:33:22     2022
+// Generated last time on Wed, Dec 21, 2022 12:22:46 AM
 
 /**
  * The latest version of the AWG App
  */
-export const appVersion = '0.9.2';
+export const appVersion = '0.9.3';
 
 /**
  * The release date of the latest version of the AWG App
  */
-export const appVersionReleaseDate = '10. Oktober 2022';
+export const appVersionReleaseDate = '21. Dezember 2022';
 
 /**
  * The URL of the AWG App

diff --git a/src/app/core/services/conversion-service/conversion.service.ts b/src/app/core/services/conversion-service/conversion.service.ts
@@ -1,5 +1,5 @@
-import { Injectable } from '@angular/core';
 import { HttpClient } from '@angular/common/http';
+import { Injectable } from '@angular/core';
 
 import { Observable } from 'rxjs';
 
@@ -8,6 +8,7 @@ import { NgxGalleryImage } from '@kolkov/ngx-gallery';
 import { ApiService } from '@awg-core/services/api-service';
 
 import { GeoNames } from '@awg-core/core-models';
+import { UtilityService } from '@awg-core/services/utility-service';
 import {
     ContextJson,
     GeoDataItemJson,
@@ -23,6 +24,7 @@ import {
     SelectionJson,
     SubjectItemJson,
 } from '@awg-shared/api-objects';
+import { BibEntry } from '@awg-views/data-view/data-outlets/bibliography/bibliography-entry.model';
 import {
     IResourceDataResponse,
     ResourceDetail,
@@ -34,7 +36,6 @@ import {
     ResourceDetailProperty,
     SearchResponseWithQuery,
 } from '@awg-views/data-view/models';
-import { BibEntry } from '@awg-views/data-view/data-outlets/bibliography/bibliography-entry.model';
 
 /**
  * Declared variable: htmlConverter.
@@ -75,11 +76,12 @@ export class ConversionService extends ApiService {
      *
      * It declares a public {@link HttpClient} instance
      * with a super reference to base class (ApiService)
-     * and a private {@link StorageService} instance.
+     * and a private {@link UtilityService} instance.
      *
      * @param {HttpClient} http Instance of the HttpClient.
+     * @param {UtilityService} utils Instance of the UtilityService.
      */
-    constructor(public override http: HttpClient) {
+    constructor(public override http: HttpClient, private utils: UtilityService) {
         super(http);
     }
 
@@ -195,7 +197,7 @@ export class ConversionService extends ApiService {
                     case '7':
                         // SELECTION PULLDOWN: selection nodes have to be read seperately
                         // TODO
-                        if (prop.values !== []) {
+                        if (this.utils.isNotEmptyArray(prop.values)) {
                             propValue = this._convertSelectionValues(prop.values, prop.attributes);
                         }
                         break; // END selection

diff --git a/src/app/shared/codemirror/codemirror.component.html b/src/app/shared/codemirror/codemirror.component.html
@@ -0,0 +1 @@
+<div #codemirrorhost class="codemirrorhost"></div>
diff --git a/src/app/shared/codemirror/codemirror.component.scss b/src/app/shared/codemirror/codemirror.component.scss
@@ -0,0 +1,3 @@
+.codemirrorhost {
+    height: 100%;
+}