Merged main branch, resolved conflicts

CHANGELOG.md

@@ -1,5 +1,44 @@
 # Changelog
 
+## [10.24.2](https://github.com/dasch-swiss/dsp-das/compare/v10.24.1...v10.24.2) (2023-10-20)
+
+
+### Bug Fixes
+
+* **date-picker:** fix YYYY-MM-dd formatting ([#1235](https://github.com/dasch-swiss/dsp-das/issues/1235)) ([f641ccb](https://github.com/dasch-swiss/dsp-das/commit/f641ccb9a71bb03c4adaff34f0f7cbb9f6fe5283))
+* **gravsearch-service:** incorrect gravsearch generated when searching for a linked property ([#1232](https://github.com/dasch-swiss/dsp-das/issues/1232)) ([200bbc0](https://github.com/dasch-swiss/dsp-das/commit/200bbc085c9ac3d67b06c3d2217faaa4bb7a203e))
+* **project:** host listener triggers when user types in an input or textarea ([#1233](https://github.com/dasch-swiss/dsp-das/issues/1233)) ([9f2a790](https://github.com/dasch-swiss/dsp-das/commit/9f2a7905db8967f32b60124bce13604f65e68f27))
+
+
+### Maintenance
+
+* Reconfigure all "zio" endpoints to use the original address ([#1222](https://github.com/dasch-swiss/dsp-das/issues/1222)) ([eaaefc9](https://github.com/dasch-swiss/dsp-das/commit/eaaefc915757800b9156e6d33754e3814735d7ce))
+
+## [10.24.1](https://github.com/dasch-swiss/dsp-das/compare/v10.24.0...v10.24.1) (2023-10-17)
+
+
+### Bug Fixes
+
+* **advanced-search:** generate correct gravsearch for linked resources with property values ([#1229](https://github.com/dasch-swiss/dsp-das/issues/1229)) ([2caa0a2](https://github.com/dasch-swiss/dsp-das/commit/2caa0a2b576eff4206557b65512bf5fc4a162cda))
+
+
+### Maintenance
+
+* **string literal component:** move app string literal component into shared lib ([#1209](https://github.com/dasch-swiss/dsp-das/issues/1209)) ([3f2a562](https://github.com/dasch-swiss/dsp-das/commit/3f2a562b4999bcf625e257b425e2f75e47079bc1))
+
+## [10.24.0](https://github.com/dasch-swiss/dsp-das/compare/v10.23.7...v10.24.0) (2023-10-13)
+
+
+### Enhancements
+
+* **advanced-search:** advanced search library ([#1131](https://github.com/dasch-swiss/dsp-das/issues/1131)) ([7e0a550](https://github.com/dasch-swiss/dsp-das/commit/7e0a5505610cacc5af3deeee4fb4fcc1e0049c0a))
+* dev-2557-update-the-documentation-1 ([#1221](https://github.com/dasch-swiss/dsp-das/issues/1221)) ([e1c741d](https://github.com/dasch-swiss/dsp-das/commit/e1c741dea08a835a21f69e1740bcdd520a672e7d))
+
+
+### Maintenance
+
+* update dsp-js to v8.3.6 ([#1224](https://github.com/dasch-swiss/dsp-das/issues/1224)) ([543c0d8](https://github.com/dasch-swiss/dsp-das/commit/543c0d8d59a828a8f14e1671f320898c9f15dbf0))
+
 ## [10.23.7](https://github.com/dasch-swiss/dsp-das/compare/v10.23.6...v10.23.7) (2023-10-04)
 
 

apps/dsp-app/src/app/app-global.ts

@@ -49,7 +49,7 @@ export class AppGlobal {
         {
             label: 'My Projects',
             shortLabel: 'Projects',
-            route: RouteConstants.projectRelative,
+            route: RouteConstants.projectsRelative,
             icon: 'assignment',
         },
         // label to reactivate when dsp-app will be used as a research platform again: -->

apps/dsp-app/src/app/app.component.ts

@@ -1,6 +1,7 @@
 import { Component, OnInit } from '@angular/core';
 import { Title } from '@angular/platform-browser';
 import { Router } from '@angular/router';
+import {RouteConstants} from "@dasch-swiss/vre/shared/app-config";
 
 @Component({
     selector: 'app-root',
@@ -30,7 +31,7 @@ export class AppComponent implements OnInit {
     }
 
     goToCookiePolicy() {
-        this._router.navigate(['cookie-policy']);
+        this._router.navigate([RouteConstants.cookiePolicy]);
     }
 
     closeCookieBanner() {

apps/dsp-app/src/app/app.module.ts

@@ -21,7 +21,6 @@ import { ConfirmationMessageComponent } from './main/action/confirmation-dialog/
 import { LoginFormComponent } from './main/action/login-form/login-form.component';
 import { SelectedResourcesComponent } from './main/action/selected-resources/selected-resources.component';
 import { SortButtonComponent } from './main/action/sort-button/sort-button.component';
-import { StringLiteralInputComponent } from './main/action/string-literal-input/string-literal-input.component';
 import { CookiePolicyComponent } from './main/cookie-policy/cookie-policy.component';
 import {
     DspApiConfigToken,
@@ -167,6 +166,7 @@ import { NgxsStoragePluginModule } from '@ngxs/storage-plugin';
 import { apiConnectionTokenProvider } from './providers/api-connection-token.provider';
 import { NgxsStoreModule } from '@dasch-swiss/vre/shared/app-state';
 import { AppProgressIndicatorComponent } from "@dasch-swiss/vre/shared/app-progress-indicator";
+import {AppStringLiteralComponent} from "@dasch-swiss/vre/shared/app-string-literal";
 
 // translate: AoT requires an exported function for factories
 export function httpLoaderFactory(httpClient: HttpClient) {
@@ -272,7 +272,6 @@ export function httpLoaderFactory(httpClient: HttpClient) {
         StatusComponent,
         StillImageComponent,
         StringifyStringLiteralPipe,
-        StringLiteralInputComponent,
         SublistValueComponent,
         SwitchPropertiesComponent,
         SystemComponent,
@@ -331,6 +330,7 @@ export function httpLoaderFactory(httpClient: HttpClient) {
                 deps: [HttpClient],
             },
         }),
+        AppStringLiteralComponent,
         NgxsStoreModule,
         NgxsStoragePluginModule.forRoot(),
     ],