Skip to content

Commit

Permalink
Merge branch 'main' into feature/dev-3723-editing-empty-properties-no…
Browse files Browse the repository at this point in the history
…t-or-no-longer-possible

* main:
  chore(main): release 11.10.2 (#1635)
  fix: resource switching (#1634)
  chore(main): release 11.10.1 (#1631)
  fix: property value add button permissions (#DEV-3723) (#1633)
  • Loading branch information
irmastnt committed Jun 6, 2024
2 parents ce872d8 + 2cd96e5 commit ab82e66
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 6 deletions.
17 changes: 17 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,22 @@
# Changelog

## [11.10.2](https://github.com/dasch-swiss/dsp-das/compare/v11.10.1...v11.10.2) (2024-06-06)


### Bug Fixes

* resource switching ([#1634](https://github.com/dasch-swiss/dsp-das/issues/1634)) ([173aaa0](https://github.com/dasch-swiss/dsp-das/commit/173aaa030bc1ae40a395ddf5b2435babdd6a5d0e))

## [11.10.1](https://github.com/dasch-swiss/dsp-das/compare/v11.10.0...v11.10.1) (2024-06-05)


### Bug Fixes

* highlighting image region after creating new one (#DEV-3700) ([#1632](https://github.com/dasch-swiss/dsp-das/issues/1632)) ([ec9807c](https://github.com/dasch-swiss/dsp-das/commit/ec9807c1c001bd30aa5ed7db454e1aeab8e90d03))
* highlights selected image region (#DEV-3700) ([#1630](https://github.com/dasch-swiss/dsp-das/issues/1630)) ([b0b8feb](https://github.com/dasch-swiss/dsp-das/commit/b0b8feb1f794c9f5d0d1a2bd8241c77e64ea4ec1))
* on resource change, display first tab ([#1629](https://github.com/dasch-swiss/dsp-das/issues/1629)) ([bd31f3e](https://github.com/dasch-swiss/dsp-das/commit/bd31f3e603bb620e0eb6412d250857828eba34a0))
* property value add button permissions (#DEV-3723) ([#1633](https://github.com/dasch-swiss/dsp-das/issues/1633)) ([4119a07](https://github.com/dasch-swiss/dsp-das/commit/4119a07d476b4d932a9afcc4301db5a528d106e2))

## [11.10.0](https://github.com/dasch-swiss/dsp-das/compare/v11.9.1...v11.10.0) (2024-05-30)


Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Component, Input, OnInit } from '@angular/core';
import { Component, Input, OnChanges, OnInit } from '@angular/core';
import { DspResource } from '@dasch-swiss/vre/shared/app-common';
import { FileRepresentation, RepresentationConstants, getFileValue } from '@dasch-swiss/vre/shared/app-representations';

Expand Down Expand Up @@ -58,14 +58,14 @@ import { FileRepresentation, RepresentationConstants, getFileValue } from '@dasc
</app-text>
</div>`,
})
export class ResourceRepresentationComponent implements OnInit {
export class ResourceRepresentationComponent implements OnChanges {
@Input({ required: true }) resource!: DspResource;
representationToDisplay!: FileRepresentation;

loading = false;
protected readonly representationConstants = RepresentationConstants;

ngOnInit() {
ngOnChanges() {
this.representationToDisplay = new FileRepresentation(getFileValue(this.resource)!);
}

Expand Down
4 changes: 2 additions & 2 deletions package-lock.json

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

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "dsp-app",
"version": "11.10.0",
"version": "11.10.2",
"repository": {
"type": "git",
"url": "https://github.com/dasch-swiss/dsp-app.git"
Expand Down

0 comments on commit ab82e66

Please sign in to comment.