Skip to content

Annotations against api v1 #872

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

Open
olzraiti wants to merge 4 commits into
base: development
Choose a base branch
from
Open

Annotations against api v1 #872

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
1e6d4f0
update laji-api-client-b generated swagger types
olzraiti Nov 28, 2025
ecdb7e5
Merge branch 'development' into annotations-api-v1
olzraiti Dec 2, 2025
2762695
annotations use laji-api-client-b
olzraiti Dec 2, 2025
901fa90
fix annotation-form-new type/quality mismatch
olzraiti Dec 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion projects/laji/src/app/+observation/annotations/annotation-item/annotation-item.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { Component, OnInit, Input } from '@angular/core';
import { AnnotationTag } from '../../../shared/model/AnnotationTag';
import { components } from 'projects/laji-api-client-b/generated/api.d';

type AnnotationTag = components['schemas']['tag'];

@Component({
selector: 'laji-annotation-item',
Expand Down
3 changes: 2 additions & 1 deletion ...ects/laji/src/app/+observation/annotations/annotations-list/annotations-list.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@ import { Component, Input, OnInit } from '@angular/core';
import { PagedResult } from '../../../shared/model/PagedResult';
import {TranslateService} from '@ngx-translate/core';
import { DocumentViewerFacade } from '../../../shared-modules/document-viewer/document-viewer.facade';
import { AnnotationTag } from '../../../shared/model/AnnotationTag';
import { components } from 'projects/laji-api-client-b/generated/api.d';

type AnnotationTag = components['schemas']['tag'];

@Component({
selector: 'laji-annotations-list',
Expand Down
7 changes: 4 additions & 3 deletions projects/laji/src/app/+observation/annotations/annotations.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,10 @@ import { TranslateService } from '@ngx-translate/core';
import { WarehouseApi } from '../../shared/api/WarehouseApi';
import { PagedResult } from '../../shared/model/PagedResult';
import { AnnotationService } from '../../shared-modules/document-viewer/service/annotation.service';
import { AnnotationTag } from '../../shared/model/AnnotationTag';
import { DeleteOwnDocumentService } from '../../shared/service/delete-own-document.service';
import { components } from 'projects/laji-api-client-b/generated/api.d';

type AnnotationTag = components['schemas']['tag'];

@Component({
selector: 'laji-annotations',
Expand Down Expand Up @@ -51,13 +53,12 @@ export class AnnotationsComponent implements OnInit, OnChanges, OnDestroy {
private translations: TranslateService,
private cd: ChangeDetectorRef,
private annotationService: AnnotationService,
private translate: TranslateService,
private deleteOwnDocument: DeleteOwnDocumentService
) { }

ngOnInit() {
this.lang = this.translations.currentLang;
this.annotationTags$ = this.annotationService.getAllTags(this.lang);
this.annotationTags$ = this.annotationService.getAllTags();

this.subscriptionDeleteOwnDocument = this.deleteOwnDocument.childEventListner().subscribe(info => {
this.childEvent = info;
Expand Down
13 changes: 5 additions & 8 deletions projects/laji/src/app/+project-form/form/document-form/document-form.facade.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,14 @@ import * as moment from 'moment';
import { LocalStorage } from 'ngx-webstorage';
import { Global } from 'projects/laji/src/environments/global';
import { Person } from '../../../shared/model/Person';
import { Annotation } from '../../../shared/model/Annotation';
import { LajiApi, LajiApiService } from '../../../shared/service/laji-api.service';
import { Logger } from '../../../shared/logger';
import { LajiFormUtil } from 'projects/laji/src/app/+project-form/form/laji-form/laji-form-util.service';
import equals from 'deep-equal';
import { ProjectFormService } from '../../../shared/service/project-form.service';
import { LajiApiClientBService } from 'projects/laji-api-client-b/src/laji-api-client-b.service';
import { components } from 'projects/laji-api-client-b/generated/api.d';

type Annotation = components['schemas']['annotation'];

export enum FormError {
notFoundForm = 'notFoundForm',
Expand Down Expand Up @@ -100,7 +101,6 @@ export class DocumentFormFacade {
private formPermissionService: FormPermissionService,
private namedPlacesService: NamedPlacesService,
private documentStorage: DocumentStorage,
private lajiApi: LajiApiService,
private logger: Logger,
private projectFormService: ProjectFormService,
private api: LajiApiClientBService
Expand Down Expand Up @@ -508,7 +508,7 @@ export class DocumentFormFacade {
return this.getAnnotations(documentID).pipe(
shareReplay(),
map((annotations) => (annotations || []).reduce<Form.IAnnotationMap>((cumulative, current) => {
if ((current.byRole || [] as any[]).includes('MMAN.formAdmin')) {
if (current.byRole?.includes('MMAN.formAdmin')) {
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
cumulative[current.targetID!] = [current];
}
Expand All @@ -526,10 +526,7 @@ export class DocumentFormFacade {

this.annotationCache[cacheKey] = (!documentID || FormService.isTmpId(documentID))
? of([])
: this.lajiApi.getList(
LajiApi.Endpoints.annotations,
{personToken: this.userService.getToken(), rootID: documentID, pageSize: 100, page}
).pipe(
: this.api.get('/annotations', { query: { rootID: documentID, pageSize: 100, page } }).pipe(
mergeMap(result => (result.currentPage < result.lastPage) ?
this.getAnnotations(documentID, result.currentPage + 1, [...results, ...result.results]) :
of([...results, ...result.results])),
Expand Down
99 changes: 16 additions & 83 deletions ...src/app/shared-modules/annotations/annotation-form-new/annotation-form-new.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ <h5>{{(expert ? 'annotation.addIdentificationExpert' : 'annotation.addIdentifica
class="form-control input-sm taxon-input"
name="opinion"
[disabled]="unIdentifyable"
[required]="expert && (personRoleAnnotation===annotationRole.expert || personRoleAnnotation === 'MMAN.ictAdmin' ) && (annotation.addedTags.length > 0)"
[required]="expert && (personRoleAnnotation=== 'MMAN.expert' || personRoleAnnotation === 'MMAN.ictAdmin' ) && (annotation.addedTags.length > 0)"
[(ngModel)]="annotation.identification.taxon"
[luTypeahead]="taxonAutocomplete"
[luTypeaheadOptionsLimit]="20"
Expand Down Expand Up @@ -48,33 +48,34 @@ <h5>{{(expert ? 'annotation.addIdentificationExpert' : 'annotation.addIdentifica
<div class="lu tags-step-1" *ngIf="expert else checkTags">
<label>{{ 'annotation.addTags' | translate }}</label>
<div class="d-flex flex-row flex-wrap margin-top-10">
<div *ngFor="let item of annotationAddadableTags$ | async | filterValue: 'quality': ['MMAN.typePositiveQuality','MMAN.typeNegativeQuality']: 'include': 'id': [] | sort: 'position'; let i = index;" class="tag-value">
<div *ngFor="let item of annotationAddableTags$ | async | filterValue: 'type': ['MMAN.typePositiveQuality','MMAN.typeNegativeQuality']: 'include': 'id': [] | sort: 'position'; let i = index;" class="tag-value">
<lu-checkbox (input)="addToAddTags(item)" [checked]="annotation.addedTags.indexOf(item.id | toQName) !== -1">
<div class="pill" [ngClass]="{'success': item.quality==='MMAN.typePositiveQuality', 'warning': item.quality==='MMAN.typeCheck', 'danger': (item.quality==='MMAN.typeNegativeQuality' || item.quality==='MMAN.typeAdmin'), 'info': item.quality ==='self' }">{{ item.id | toQName | label }}</div>
<div class="pill" [ngClass]="{'success': item.type ===' MMAN.typePositiveQuality', 'warning':
item.type==='MMAN.typeCheck', 'danger': (item.type ===' MMAN.typeNegativeQuality' || item.type === 'MMAN.typeAdmin'), 'info': item.type ==='self' }">{{ item.id | toQName | label }}</div>
</lu-checkbox>
</div>
<ng-container *ngIf="personRoleAnnotation === 'MMAN.expert'">
<div *ngFor="let item of annotationAddadableTags$ | async | filterValue: 'quality': ['MMAN.typeAdmin']: 'exclude': 'id': [] | sort: 'position'; let i = index;" class="tag-value">
<div *ngFor="let item of annotationAddableTags$ | async | filterValue: 'type': ['MMAN.typeAdmin']: 'exclude': 'id': [] | sort: 'position'; let i = index;" class="tag-value">
<lu-checkbox (input)="addToAddTags(item)" [checked]="annotation.addedTags.indexOf(item.id | toQName) !== -1">
<div class="pill" [ngClass]="{'success': item.quality==='MMAN.typePositiveQuality', 'warning': item.quality==='MMAN.typeCheck', 'danger': item.quality==='MMAN.typeNegativeQuality', 'admin': item.quality==='MMAN.typeAdmin', 'info': item.quality ==='self' }">{{ item.id | toQName | label }}</div>
<div class="pill" [ngClass]="{'success': item.type==='MMAN.typePositiveQuality', 'warning': item.type === 'MMAN.typeCheck', 'danger': item.type === 'MMAN.typeNegativeQuality', 'admin': item.type==='MMAN.typeAdmin', 'info': item.type ==='self' }">{{ item.id | toQName | label }}</div>
</lu-checkbox>
</div>
</ng-container>
</div>
<div class="d-flex flex-row flex-wrap margin-top-10">
<ng-container *ngIf="personRoleAnnotation === 'MMAN.expert'">
<div *ngFor="let item of annotationAddadableTags$ | async | filterValue: 'quality': ['MMAN.typeInfo']: 'exclude': 'id': [''] | sort: 'position'; let i = index;" class="tag-value">
<div *ngFor="let item of annotationAddableTags$ | async | filterValue: 'quality': ['MMAN.typeInfo']: 'exclude': 'id': [''] | sort: 'position'; let i = index;" class="tag-value">
<lu-checkbox (input)="addToAddTags(item)" [checked]="annotation.addedTags.indexOf(item.id | toQName) !== -1">
<div class="pill" [ngClass]="{'success': item.quality==='MMAN.typePositiveQuality', 'warning': item.quality==='MMAN.typeCheck', 'danger': item.quality==='MMAN.typeNegativeQuality', 'info': item.quality ==='MMAN.typeInfo' }">{{ item.id | toQName | label }}</div>
<div class="pill" [ngClass]="{'success': item.type==='MMAN.typePositiveQuality', 'warning': item.type==='MMAN.typeCheck', 'danger': item.type==='MMAN.typeNegativeQuality', 'info': item.type ==='MMAN.typeInfo' }">{{ item.id | toQName | label }}</div>
</lu-checkbox>
</div>
</ng-container>
</div>
<div class="d-flex flex-row flex-wrap margin-top-10">
<ng-container *ngIf="annotation.addedTags.indexOf('MMAN.5') === -1 && annotation.addedTags.indexOf('MMAN.3') === -1">
<div *ngFor="let item of annotationAddadableTags$ | async | filterValue: 'quality': ['MMAN.typeCheck']: 'exclude': 'id': [''] | sort: 'position'; let i = index;" class="tag-value">
<div *ngFor="let item of annotationAddableTags$ | async | filterValue: 'quality': ['MMAN.typeCheck']: 'exclude': 'id': [''] | sort: 'position'; let i = index;" class="tag-value">
<lu-checkbox (input)="addToAddTags(item)" [checked]="annotation.addedTags.indexOf(item.id | toQName) !== -1">
<div class="pill" [ngClass]="{'success': item.quality==='MMAN.typePositiveQuality', 'warning': item.quality==='MMAN.typeCheck', 'danger': item.quality==='MMAN.typeNegativeQuality', 'info': item.quality ==='self' }">{{ item.id | toQName | label }}</div>
<div class="pill" [ngClass]="{'success': item.type==='MMAN.typePositiveQuality', 'warning': item.type==='MMAN.typeCheck', 'danger': item.type==='MMAN.typeNegativeQuality', 'info': item.type ==='self' }">{{ item.id | toQName | label }}</div>
</lu-checkbox>
</div>
</ng-container>
Expand All @@ -84,9 +85,9 @@ <h5>{{(expert ? 'annotation.addIdentificationExpert' : 'annotation.addIdentifica
<div class="lu tags-step-1">
<label>{{ 'annotation.addTags' | translate }}</label>
<div class="d-flex flex-row flex-wrap margin-top-10">
<div *ngFor="let item of annotationAddadableTags$ | async | filterValue: 'quality': ['MMAN.typeCheck']: 'exclude': 'id': [''] | sort: 'position'; let i = index;" class="tag-value">
<div *ngFor="let item of annotationAddableTags$ | async | filterValue: 'quality': ['MMAN.typeCheck']: 'exclude': 'id': [''] | sort: 'position'; let i = index;" class="tag-value">
<lu-checkbox (input)="addToAddTags(item)" [checked]="annotation.addedTags.indexOf(item.id | toQName) !== -1">
<div class="pill" [ngClass]="{'success': item.quality==='typePositiveQuality', 'warning': item.quality==='MMAN.typeCheck', 'danger': item.quality==='typeNegativeQuality' }">{{ item.id | toQName | label }} </div>
<div class="pill" [ngClass]="{'success': item.type==='typePositiveQuality', 'warning': item.type==='MMAN.typeCheck', 'danger': item.type==='typeNegativeQuality' }">{{ item.id | toQName | label }} </div>
</lu-checkbox>
</div>
</div>
Expand All @@ -98,86 +99,19 @@ <h5>{{(expert ? 'annotation.addIdentificationExpert' : 'annotation.addIdentifica
<div *ngFor="let item of annotationRemovableTags$ | async " class="list-checkbox">
<main class="lu">
<lu-checkbox (input)="addToRemoveTags(item.id)" [disabled]="((annotation.addedTags.indexOf('MMAN.5') !== -1 && item.id !== 'MMAN.52') || annotation.addedTags.indexOf('MMAN.3') !== -1)" [checked]="annotation.removedTags.indexOf(item.id) !== -1">
<div class="pill" [ngClass]="{'success': item.quality==='positive', 'warning': item.quality==='check', 'danger': item.quality==='negative' }">{{ item.id | toQName | label }}</div>
<div class="pill" [ngClass]="{'success': item.type==='positive', 'warning': item.type==='check', 'danger': item.type==='negative' }">{{ item.id | toQName | label }}</div>
</lu-checkbox>
</main>
</div>
</div>
</div>
<!--
<div class="d-flex flex-row flex-nowrap">
<ng-container *ngIf="expert else checkTags">
<lu-combo-checkbox [title]="'annotation.addTags' | translate" [small]="true" class="mr-2">
<lu-combo-checkbox-row
*ngFor="let item of annotationAddadableTags$ | async | filterValue: 'quality': ['MMAN.typePositiveQuality','MMAN.typeNegativeQuality']: 'include': 'id': [] | sort: 'position'; let i = index;"
(checked)="addToAddTags(item)"
[checked]="annotation.addedTags.indexOf(item.id | toQName) !== -1"
>
<span class="pill" [ngClass]="{'success': item.quality==='MMAN.typePositiveQuality', 'warning': item.quality==='MMAN.typeCheck', 'danger': (item.quality==='MMAN.typeNegativeQuality' || item.quality==='MMAN.typeAdmin'), 'info': item.quality ==='self' }">{{ item.id | toQName | label }}</span>
</lu-combo-checkbox-row>
<ng-container *ngIf="personRoleAnnotation === 'MMAN.expert'">
<lu-combo-checkbox-row
*ngFor="let item of annotationAddadableTags$ | async | filterValue: 'quality': ['MMAN.typeAdmin']: 'exclude': 'id': [] | sort: 'position'; let i = index;"
(checked)="addToAddTags(item)"
[checked]="annotation.addedTags.indexOf(item.id | toQName) !== -1"
>
<span class="pill" [ngClass]="{'success': item.quality==='MMAN.typePositiveQuality', 'warning': item.quality==='MMAN.typeCheck', 'danger': (item.quality==='MMAN.typeNegativeQuality' || item.quality==='MMAN.typeAdmin'), 'info': item.quality ==='self' }">{{ item.id | toQName | label }}</span>
</lu-combo-checkbox-row>
</ng-container>
<hr>
<ng-container *ngIf="personRoleAnnotation === 'MMAN.expert'">
<lu-combo-checkbox-row
*ngFor="let item of annotationAddadableTags$ | async | filterValue: 'quality': ['MMAN.typeInfo']: 'exclude': 'id': [''] | sort: 'position'; let i = index;"
(checked)="addToAddTags(item)"
[checked]="annotation.addedTags.indexOf(item.id | toQName) !== -1"
>
<span class="pill" [ngClass]="{'success': item.quality==='MMAN.typePositiveQuality', 'warning': item.quality==='MMAN.typeCheck', 'danger': (item.quality==='MMAN.typeNegativeQuality' || item.quality==='MMAN.typeAdmin'), 'info': item.quality ==='self' }">{{ item.id | toQName | label }}</span>
</lu-combo-checkbox-row>
</ng-container>
<hr>
<ng-container *ngIf="annotation.addedTags.indexOf('MMAN.5') === -1 && annotation.addedTags.indexOf('MMAN.3') === -1">
<lu-combo-checkbox-row
*ngFor="let item of annotationAddadableTags$ | async | filterValue: 'quality': ['MMAN.typeCheck']: 'exclude': 'id': [''] | sort: 'position'; let i = index;"
(checked)="addToAddTags(item)"
[checked]="annotation.addedTags.indexOf(item.id | toQName) !== -1"
>
<span class="pill" [ngClass]="{'success': item.quality==='MMAN.typePositiveQuality', 'warning': item.quality==='MMAN.typeCheck', 'danger': (item.quality==='MMAN.typeNegativeQuality' || item.quality==='MMAN.typeAdmin'), 'info': item.quality ==='self' }">{{ item.id | toQName | label }}</span>
</lu-combo-checkbox-row>
</ng-container>
</lu-combo-checkbox>
</ng-container>
<ng-template #checkTags>
<lu-combo-checkbox [title]="'annotation.addTags' | translate" [small]="true">
<lu-combo-checkbox-row
*ngFor="let item of annotationAddadableTags$ | async | filterValue: 'quality': ['MMAN.typeCheck']: 'exclude': 'id': [''] | sort: 'position'; let i = index;"
(checked)="addToAddTags(item)"
[checked]="annotation.addedTags.indexOf(item.id | toQName) !== -1"
>
<span class="pill" [ngClass]="{'success': item.quality==='typePositiveQuality', 'warning': item.quality==='MMAN.typeCheck', 'danger': item.quality==='typeNegativeQuality' }">{{ item.id | toQName | label }}</span>
</lu-combo-checkbox-row>
</lu-combo-checkbox>
</ng-template>

<lu-combo-checkbox [title]="'annotation.removeTags' | translate" [small]="true"
*ngIf="(annotationRemovableTags$ | async)?.length > 0 && expert && (personRoleAnnotation === 'MMAN.expert' || personRoleAnnotation === 'MMAN.ictAdmin' ) && (unit.interpretations && unit.interpretations.effectiveTags && unit.interpretations.effectiveTags.length > 0)"
>
<lu-combo-checkbox-row
*ngFor="let item of annotationRemovableTags$ | async "
(checked)="addToRemoveTags(item.id)"
[disabled]="((annotation.addedTags.indexOf('MMAN.5') !== -1 || annotation.addedTags.indexOf('MMAN.3') !== -1))"
[checked]="annotation.removedTags.indexOf(item.id) !== -1"
>
<span class="pill" [ngClass]="{'success': item.quality==='positive', 'warning': item.quality==='check', 'danger': item.quality==='negative' }">{{ item.id | toQName | label }}</span>
</lu-combo-checkbox-row>
</lu-combo-checkbox>
</div> -->

<div class="alert alert-warning" *ngIf="alertNotSpamVerified">
In this type of annotation, you need to add at lest 1 check tag or a taxon
</div>

<ng-container *ngIf="!isEditor">
<div class="mb-4" *ngIf="(personRoleAnnotation===annotationRole.expert || personRoleAnnotation === 'MMAN.ictAdmin') && expert">
<div class="mb-4" *ngIf="(personRoleAnnotation === 'MMAN.expert' || personRoleAnnotation === 'MMAN.ictAdmin') && expert">
<h5>{{ 'annotation.taxonSpecifier' | translate }} <laji-info>{{ 'annotation.taxonSpecifierInfo' | translate }}</laji-info></h5>
<input
type="text"
Expand All @@ -188,7 +122,7 @@ <h5>{{ 'annotation.taxonSpecifier' | translate }} <laji-info>{{ 'annotation.taxo
(focus)="onFocus($event)"
(blur)="onBlur($event)">
</div>
<div class="mb-4" *ngIf="(personRoleAnnotation===annotationRole.expert || personRoleAnnotation === 'MMAN.ictAdmin') && expert">
<div class="mb-4" *ngIf="(personRoleAnnotation === 'MMAN.expert' || personRoleAnnotation === 'MMAN.ictAdmin') && expert">
<h5>{{ 'MAN.atlasCode' | label }}</h5>
<laji-metadata-select
[(ngModel)]="annotation.atlasCode"
Expand All @@ -210,13 +144,12 @@ <h5>{{ 'MAN.notes' | label }}</h5>
<textarea #comment
name="notes"
class="form-control feedback-text input-sm"
[required]="(!expert || (personRoleAnnotation!==annotationRole.expert && personRoleAnnotation!==annotationRole.ictAdmin)) || (((annotation.addedTags && annotation.addedTags.length > 0) && (annotation.identification && annotation.identification.taxon == '')) || (annotation.identification && annotation.identification.taxon == ''))"
[required]="(!expert || (personRoleAnnotation!== 'MMAN.expert' && personRoleAnnotation !== 'MMAN.ictAdmin')) || (((annotation.addedTags && annotation.addedTags.length > 0) && (annotation.identification && annotation.identification.taxon == '')) || (annotation.identification && annotation.identification.taxon == ''))"
[(ngModel)]="annotation.notes"
(focus)="onFocus($event)"
(blur)="onBlur($event)"></textarea>
</div>

<!-- <button type="button" class="btn btn-danger btn-sm" (click)="cancel.emit()">{{ 'feedback.cancel' | translate }}</button> -->
<button class="btn btn-default" (click)="trySavingAnnotation()" [disabled]="disableSend()">{{ 'annotation.sendAnnotation' | translate }}</button>

</div>
Expand Down
Loading