Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(resource): open annotation (region) the correct way (DEV-785) #749

Merged
merged 4 commits into from May 23, 2022
Merged

feat(resource): open annotation (region) the correct way (DEV-785) #749

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
042b996
feat(resource): open annotation (region) the correct way (DEV-785)
kilchenmann May 20, 2022
649b0cf
Merge branch 'main' into wip/dev-785-open-region-with-still-image
kilchenmann May 23, 2022
c957a4b
chore(resource): add some remarks
kilchenmann May 23, 2022
560a419
Merge branch 'main' into wip/dev-785-open-region-with-still-image
kilchenmann May 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 6 additions & 4 deletions src/app/workspace/resource/representation/still-image/still-image.component.ts
View file
Open in desktop
Expand Up @@ -192,16 +192,16 @@ export class StillImageComponent implements OnChanges, OnDestroy, AfterViewInit
if (changes['images']) {
this._openImages();
this._unhighlightAllRegions();
// tODO: check if this is necessary or could be handled below
// --> TODO: check if this is necessary or could be handled below
// (remove the 'else' before the 'if', so changes['activateRegion'] is always checked for)
}

if (this.activateRegion !== undefined) {
this._highlightRegion(this.activateRegion);
}
if (this.currentTab === 'annotations') {
this.renderRegions();
}
if (this.activateRegion !== undefined) {
this._highlightRegion(this.activateRegion);
}
if (changes['activateRegion']) {
this._unhighlightAllRegions();
}
Expand Down Expand Up @@ -642,6 +642,8 @@ export class StillImageComponent implements OnChanges, OnDestroy, AfterViewInit
this._viewer.navigator.element.style.display = 'none';
// disable the region draw mode
this.regionDrawMode = false;
// stop loading tiles
this._viewer.removeAllHandlers('open');
} else {
// enable mouse navigation incl. zoom
this._viewer.setMouseNavEnabled(true);
Expand Down
1 change: 1 addition & 0 deletions src/app/workspace/resource/resource.component.html
View file
Open in desktop
Expand Up @@ -14,6 +14,7 @@
[project]="resource.res.attachedToProject"
[currentTab]="selectedTabLabel"
[parentResource]="resource.res"
[activateRegion]="selectedRegion"
(loaded)="representationLoaded($event)"
(goToPage)="compoundNavigation($event)"
(regionClicked)="openRegion($event)"
Expand Down
110 changes: 69 additions & 41 deletions src/app/workspace/resource/resource.component.ts
View file
Open in desktop
Expand Up @@ -18,10 +18,14 @@ import {
ReadArchiveFileValue,
ReadAudioFileValue,
ReadDocumentFileValue,
ReadLinkValue,
ReadMovingImageFileValue,
ReadResource,
ReadResourceSequence,
ReadStillImageFileValue,
ResourceClassAndPropertyDefinitions,
ResourceClassDefinition,
ResourceClassDefinitionWithPropertyDefinition,
SystemPropertyDefinition
} from '@dasch-swiss/dsp-js';
import { Subscription } from 'rxjs';
Expand Down Expand Up @@ -76,6 +80,8 @@ export class ResourceComponent implements OnInit, OnChanges, OnDestroy {

iiifUrl: string;

resourceIsAnnotation: 'region' | 'sequence';

// list of representations to be displayed
// --> TODO: will be expanded with | MovingImageRepresentation[] | AudioRepresentation[] etc.
representationsToDisplay: FileRepresentation[] = [];
Expand Down Expand Up @@ -243,56 +249,78 @@ export class ResourceComponent implements OnInit, OnChanges, OnDestroy {
const res = new DspResource(response);
this.resource = res;

if (response.isDeleted) {
// deleted resource; no further infos needed
// --> TODO: here we have to add also sequenceOf similar to regionOf (DEV-744)
if (this.resource.res.outgoingReferences.length && this.resource.res.entityInfo.classes[Constants.Region] && this.resource.res.id === this.resourceIri) {
// the main resource (resourceIri) is a region;
// display the corresponding still-image resource instance
// find the iri of the parent resource; still-image in case of region, moving-image or audio in case of sequence
const annotationOfIri = (this.resource.res.properties[Constants.IsRegionOfValue] as ReadLinkValue[])[0].linkedResourceIri;

} else {
// if there is no incomingResource and the resource has a still image property, assign the iiiUrl to be passed as an input to the still-image component
if (!this.incomingResource && this.resource.res.properties[Constants.HasStillImageFileValue]) {
this.iiifUrl = (this.resource.res.properties[Constants.HasStillImageFileValue][0] as ReadStillImageFileValue).fileUrl;
}
// get the parent resource to display
this.getResource(annotationOfIri);

this.selectedTabLabel = this.resource.res.entityInfo?.classes[this.resource.res.type].label;
// open annotation`s tab and highlight region
this.selectedTabLabel = 'annotations';
this.openRegion(iri);

// get information about the logged-in user, if one is logged-in
if (this._session.getSession()) {
this.session = this._session.getSession();
// is the logged-in user project member?
// --> TODO: as soon as we know how to handle the permissions, set this value the correct way
this.editPermissions = true;
// is the logged-in user system admin or project admin?
this.adminPermissions = this.session.user.sysAdmin ? this.session.user.sysAdmin : this.session.user.projectAdmin.some(e => e === res.res.attachedToProject);
}
this.selectedRegion = iri;
// define resource as annotation of type region
this.resourceIsAnnotation = (this.resource.res.entityInfo.classes[Constants.Region] ? 'region' : 'sequence');

this.representationsToDisplay = this.collectRepresentationsAndAnnotations(this.resource);
} else {

if (!this.representationsToDisplay.length && !this.compoundPosition) {
// the resource could be a compound object
this._incomingService.getStillImageRepresentationsForCompoundResource(this.resource.res.id, 0, true).subscribe(
(countQuery: CountQueryResponse) => {
if (response.isDeleted) {
// deleted resource; no further infos needed
// --> TODO: as soon as we know how to display deleted/archived resources, we can handle it here.

if (countQuery.numberOfResults > 0) {
this.compoundPosition = new DspCompoundPosition(countQuery.numberOfResults);
this.compoundNavigation(1);
} else {
// not a compound object
} else {
// if there is no incomingResource and the resource has a still image property, assign the iiiUrl to be passed as an input to the still-image component
if (!this.incomingResource && this.resource.res.properties[Constants.HasStillImageFileValue]) {
this.iiifUrl = (this.resource.res.properties[Constants.HasStillImageFileValue][0] as ReadStillImageFileValue).fileUrl;
}

this.selectedTabLabel = this.resource.res.entityInfo?.classes[this.resource.res.type].label;

// get information about the logged-in user, if one is logged-in
if (this._session.getSession()) {
this.session = this._session.getSession();
// is the logged-in user project member?
// --> TODO: as soon as we know how to handle the permissions, set this value the correct way
this.editPermissions = true;
// is the logged-in user system admin or project admin?
this.adminPermissions = this.session.user.sysAdmin ? this.session.user.sysAdmin : this.session.user.projectAdmin.some(e => e === res.res.attachedToProject);
}

this.representationsToDisplay = this.collectRepresentationsAndAnnotations(this.resource);

if (!this.representationsToDisplay.length && !this.compoundPosition) {
// the resource could be a compound object
this._incomingService.getStillImageRepresentationsForCompoundResource(this.resource.res.id, 0, true).subscribe(
(countQuery: CountQueryResponse) => {

if (countQuery.numberOfResults > 0) {
this.compoundPosition = new DspCompoundPosition(countQuery.numberOfResults);
this.compoundNavigation(1);
} else {
// not a compound object
this.loading = false;
}
},
(error: ApiResponseError) => {
this.loading = false;
this._errorHandler.showMessage(error);
}
},
(error: ApiResponseError) => {
this.loading = false;
this._errorHandler.showMessage(error);
}
);
} else {
this.requestIncomingResources(this.resource);
}
);
} else {
this.requestIncomingResources(this.resource);
}

// gather resource property information
res.resProps = this.initProps(response);
// gather resource property information
res.resProps = this.initProps(response);

// gather system property information
res.systemProps = this.resource.res.entityInfo.getPropertyDefinitionsByType(SystemPropertyDefinition);
// gather system property information
res.systemProps = this.resource.res.entityInfo.getPropertyDefinitionsByType(SystemPropertyDefinition);
}
}
},
(error: ApiResponseError) => {
Expand Down Expand Up @@ -444,7 +472,7 @@ export class ResourceComponent implements OnInit, OnChanges, OnDestroy {

// developer feature: this keeps the annotations tab open, if you add "/annotations" to the end of the URL
// e.g. http://0.0.0.0:4200/resource/[project-shortcode]/[resource-iri]/annotations
if (this.valueUuid === 'annotations') {
if (this.valueUuid === 'annotations' || this.selectedRegion === this.resourceIri) {
this.selectedTab = (this.incomingResource ? 2 : 1);
this.selectedTabLabel = 'annotations';
}
Expand Down