Skip to content

Commit

Permalink
Merge branch 'main' into feature/dev-2379-eu-view-a-data-model
Browse files Browse the repository at this point in the history
* main:
  fix: ontology initialisation (DEV-3317) (#1483)
  fix: new list node field error is not displayed (#1481)
  chore(main): release 11.6.3 (#1470)
  chore: update dsp-js to v.9.1.12 (#1478)

# Conflicts:
#	package.json
  • Loading branch information
irmastnt committed Feb 23, 2024
2 parents d35e674 + be6ec9a commit 81714f2
Show file tree
Hide file tree
Showing 5 changed files with 38 additions and 16 deletions.
13 changes: 13 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,18 @@
# Changelog

## [11.6.3](https://github.com/dasch-swiss/dsp-das/compare/v11.6.2...v11.6.3) (2024-02-23)


### Bug Fixes

* highlits section by clicked region in image viewer (DEV-3277) ([#1468](https://github.com/dasch-swiss/dsp-das/issues/1468)) ([50a5db5](https://github.com/dasch-swiss/dsp-das/commit/50a5db556f544f3beaf8b23a26caabd0d7328a85))
* initiates new search when user is logged in sucessfully (DEV-3293) ([#1469](https://github.com/dasch-swiss/dsp-das/issues/1469)) ([70f7f25](https://github.com/dasch-swiss/dsp-das/commit/70f7f25f373e0e054c7cd4240ce969c07450efb0))


### Maintenance

* update dsp-js to v.9.1.12 ([#1478](https://github.com/dasch-swiss/dsp-das/issues/1478)) ([a99cfeb](https://github.com/dasch-swiss/dsp-das/commit/a99cfebbec6aeea49277a32ec6bc52486a564de5))

## [11.6.2](https://github.com/dasch-swiss/dsp-das/compare/v11.6.1...v11.6.2) (2024-02-14)


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,13 @@ export class ListNodeOperation {
</button>
</form>
`,
styles: [
`
:host ::ng-deep mat-error {
display: none;
}
`,
],
})
export class ListItemFormComponent implements OnInit {
loading = false;
Expand Down
16 changes: 9 additions & 7 deletions apps/dsp-app/src/app/project/ontology/ontology.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@ import {
SetCurrentProjectOntologyPropertiesAction,
UserSelectors,
} from '@dasch-swiss/vre/shared/app-state';
import { Actions, ofActionSuccessful, Select, Store } from '@ngxs/store';
import { combineLatest, Observable, Subject } from 'rxjs';
import { Actions, Select, Store, ofActionSuccessful } from '@ngxs/store';
import { Observable, Subject, combineLatest } from 'rxjs';
import { map, take, takeUntil } from 'rxjs/operators';
import { DialogComponent, DialogEvent } from '../../main/dialog/dialog.component';
import { ProjectBase } from '../project-base';
Expand Down Expand Up @@ -243,13 +243,15 @@ export class OntologyComponent extends ProjectBase implements OnInit, OnDestroy
*/
initOntologiesList(): void {
this._store.dispatch(new LoadProjectOntologiesAction(this.projectUuid));
combineLatest([this._actions$.pipe(ofActionSuccessful(LoadListsInProjectAction)), this.currentProjectOntologies$])
combineLatest([
this._actions$.pipe(ofActionSuccessful(LoadListsInProjectAction)),
this.project$,
this.currentProjectOntologies$,
])
.pipe(
take(1),
map(([loadListsInProjectAction, currentProjectOntologies]) =>
currentProjectOntologies.find(
x => x.id === this._ontologyService.getOntologyIriFromRoute(this.project?.shortcode)
)
map(([loadListsInProjectAction, project, currentProjectOntologies]) =>
currentProjectOntologies.find(x => x.id === this._ontologyService.getOntologyIriFromRoute(project?.shortcode))
)
)
.subscribe(readOnto => {
Expand Down
12 changes: 6 additions & 6 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "dsp-app",
"version": "11.6.2",
"version": "11.6.3",
"repository": {
"type": "git",
"url": "https://github.com/dasch-swiss/dsp-app.git"
Expand Down Expand Up @@ -42,7 +42,7 @@
"@angular/platform-browser-dynamic": "^16.2.12",
"@angular/router": "^16.2.12",
"@ckeditor/ckeditor5-angular": "^5.2.0",
"@dasch-swiss/dsp-js": "^9.1.3",
"@dasch-swiss/dsp-js": "^9.1.12",
"@dasch-swiss/jdnconvertiblecalendar": "^0.0.3",
"@dasch-swiss/jdnconvertiblecalendardateadapter": "^1.1.1",
"@grafana/faro-web-sdk": "^1.3.6",
Expand All @@ -60,7 +60,7 @@
"core-js": "^3.25.2",
"effect": "^2.0.0-next.21",
"immer": "^10.0.3",
"json2typescript": "^1.5.1",
"json2typescript": "^1.4.1",
"jsonld": "^6.0.0",
"jwt-decode": "^3.1.2",
"moment": "^2.29.4",
Expand Down

0 comments on commit 81714f2

Please sign in to comment.