update swagger schema & fix type errors

projects/laji/src/app/home/home-data.service.ts

@@ -45,7 +45,7 @@ export interface IHomeData {
   news: {
     prevPage: number;
     nextPage: number;
-    results: Pick<News, 'id'|'title'|'external'|'externalURL'|'tags'|'posted'>[];
+    results: Pick<News, 'id'|'title'|'external'|'externalURL'|'tag'|'posted'>[];
   };
 }
 
@@ -124,7 +124,7 @@ const HOME_QUERY = gql`
       results {
         id
         title
-        tags
+        tag
         posted
         external
         externalURL

projects/laji/src/app/observation/horizontal-chart/horizontal-chart-data.service.ts

@@ -12,7 +12,7 @@ export class HorizontalChartDataService {
   ) { }
 
 
-  getChartDataLabels(ids: string[]): Observable<Record<string, {vernacularName: string; scientificName: string}>> {
+  getChartDataLabels(ids: string[]): Observable<Record<string, {vernacularName?: string; scientificName: string}>> {
     if (ids.length === 0) { return of({}); }
     return this.api.get('/taxa',
       { query: { id: ids.join(','), pageSize: ids.length, selectedFields: 'id,vernacularName,scientificName' } },
@@ -21,7 +21,7 @@ export class HorizontalChartDataService {
       map(({ results }) => results.reduce((idToNames, {id, vernacularName, scientificName }) => {
         idToNames[id] = { vernacularName, scientificName };
         return idToNames;
-      }, {} as Record<string, {vernacularName: string; scientificName: string}>))
+      }, {} as Record<string, {vernacularName?: string; scientificName: string}>))
     );
   }
 }

projects/laji/src/app/shared-modules/own-submissions/service/document-export.service.ts

@@ -390,8 +390,7 @@ export class DocumentExportService {
     }
 
     if (key.match(new RegExp('^' + this.valuePrefixes.collection + '\.[0-9]+$'))) {
-      return this.collectionService
-        .getName$(key, this.translate.getCurrentLang());
+      return this.collectionService.getName$(key);
     }
 
     return ObservableOf(key);

projects/laji/src/app/shared-modules/select/metadata-select/metadata-select.component.ts

@@ -244,7 +244,7 @@ export class MetadataSelectComponent implements OnChanges, OnDestroy, ControlVal
         case 'KE.informationSystem':
           return this.sourceService.getAllAsLookUp().pipe(
             map(system => Object.keys(system).reduce<SelectOption[]>((total, current) => {
-              total.push({id: current, value: system[current].name});
+              total.push({id: current, value: system[current].name || current});
               return total;
             }, [])));
         default:

projects/laji/src/app/shared-modules/technical-news/technical-news-dumb/technical-news-dumb.component.ts

@@ -18,7 +18,7 @@ export class TechnicalNewsDumbComponent {
         isNew = Date.now() - parseInt(newsItem.posted, 10) < (days * 86400000); // number of milliseconds in a day
       }
 
-      const isTechnical = newsItem.tags?.includes('technical');
+      const isTechnical = newsItem.tag === 'technical';
       return isTechnical && isNew;
     }));
   }

projects/laji/src/app/shared/iucn-footer/footer.component.ts

@@ -1,11 +1,9 @@
 import { Component, OnDestroy, OnInit } from '@angular/core';
 import { FooterService } from '../service/footer.service';
 import { NavigationEnd, Router } from '@angular/router';
-import { of, Subscription } from 'rxjs';
+import { Subscription } from 'rxjs';
 import { TranslateService } from '@ngx-translate/core';
-import { Logger } from '../logger/logger.service';
-import { LajiApiClientService } from 'projects/laji-api-client/src/laji-api-client.service';
-import { filter, map } from 'rxjs';
+import { filter } from 'rxjs';
 
 @Component({
     selector: 'laji-iucn-footer',
@@ -15,13 +13,10 @@ import { filter, map } from 'rxjs';
 })
 export class IucnFooterComponent implements OnInit, OnDestroy {
 
-  private static treeData: any;
-
   public onFrontPage = false;
   public onMapPage = false;
   public subRouteEvent!: Subscription;
   public subLangChange!: Subscription;
-  public tree$: any;
   public columns = [
     'col-sm-offset-1 col-sm-6 col-md-3',
     'col-sm-5 col-md-2',
@@ -32,24 +27,17 @@ export class IucnFooterComponent implements OnInit, OnDestroy {
   constructor(
     public footerService: FooterService,
     private router: Router,
-    private api: LajiApiClientService,
     private translate: TranslateService,
-    private logger: Logger
   ) {
   }
 
   ngOnInit() {
-    this.tree$ = of(IucnFooterComponent.treeData);
-    this.fetchTreeData(false);
     this.subRouteEvent = this.router.events.pipe(filter(event => event instanceof NavigationEnd))
       .subscribe(() => {
         this.onFrontPage = this.router.isActive('/', true)
           || this.router.isActive('/en', true)
           || this.router.isActive('/sv', true);
       });
-    this.subLangChange = this.translate.onLangChange.subscribe(() => {
-      this.fetchTreeData();
-    });
   }
 
   ngOnDestroy() {
@@ -64,19 +52,4 @@ export class IucnFooterComponent implements OnInit, OnDestroy {
   currentLangIsFinnish() {
     return this.translate.getCurrentLang() === 'fi';
   }
-
-  fetchTreeData(force = true) {
-    if (!force && IucnFooterComponent.treeData) {
-      return;
-    }
-    this.api.get('/information/index').pipe(
-      map(tree => tree.children || [])
-    ).subscribe(
-        tree => {
-          IucnFooterComponent.treeData = tree;
-          this.tree$ = of(IucnFooterComponent.treeData);
-        },
-        err =>  this.logger.error('Failed to fetchList information tree', err)
-      );
-  }
 }

projects/laji/src/app/shared/news-list/news-list.component.html

@@ -35,9 +35,7 @@ <h3>{{ 'home.news-list.current' | translate }}</h3>
             </div>
           }
           <div>
-            @for (tag of item.tags!; track tag) {
-              <span class="label label-default">{{ tag | translate }}</span>
-            }
+            <span class="label label-default">{{ item.tag | translate }}</span>
             <span class="pull-right">{{ item.posted! | amFromUnix | amDateFormat:'DD.MM.YYYY' }}</span>
           </div>
         </div>

projects/laji/src/app/shared/pipe/collection-name.pipe.ts

@@ -20,7 +20,7 @@ export class CollectionNamePipe extends AbstractLabelPipe implements PipeTransfo
 
   protected _updateValue(key: string): Observable<string> {
     this.key = key;
-    return this.collectionService.getName$(key, '');
+    return this.collectionService.getName$(key);
   }
 
   protected _parseValue(res: string): string {

projects/laji/src/app/shared/service/collection.service.ts

@@ -108,7 +108,7 @@ export class CollectionService {
 
   getAllAsKeyValue$(mustHaveWarehouseData = false) {
     const all$ = this.api.get('/collections', { query: { selectedFields: 'id,collectionName', pageSize: 100000 } })
-    .pipe(map(({results}) => results.map(({id, collectionName}) => ({ id, value: collectionName }))));
+    .pipe(map(({results}) => results.map(({id, collectionName}) => ({ id, value: collectionName || id }))));
     if (mustHaveWarehouseData) {
       return this.getAllWarehouseCollections$().pipe(
         switchMap(warehouseCollection => all$.pipe(
@@ -123,10 +123,10 @@ export class CollectionService {
     return this.api.get('/collections/{id}', { path: { id } });
   }
 
-  getName$(id: string, empty: null|string = null): Observable<string> {
+  getName$(id: string): Observable<string> {
     return this.getAllAsKeyValue$().pipe(
       map(data => data.find(col => col.id === id)),
-      map(col => col ? col.value : (empty === null ? id : empty))
+      map(col => col?.value ? col.value : id)
     );
   }
 

projects/laji/src/app/taxonomy/species/service/taxon-export.service.ts

@@ -10,7 +10,7 @@ type Taxon = components['schemas']['LajiBackendTaxon'];
 type SimpleTaxon = components['schemas']['LajiBackendSimpleTaxon'];
 
 type SimpleTaxonArrayKeys = {
-    [K in keyof Taxon]: Taxon[K] extends SimpleTaxon[] ? K : never
+    [K in keyof Taxon]-?: Taxon[K] extends SimpleTaxon[] ? K : never
 }[keyof Taxon];
 
 export const SYNONYM_KEYS: SimpleTaxonArrayKeys[] = [

projects/laji/src/app/taxonomy/taxon/info-card/taxon-taxonomy/taxon-names/taxon-names.component.ts

@@ -5,7 +5,7 @@ type Taxon = components['schemas']['LajiBackendTaxon'];
 type SimpleTaxon = components['schemas']['LajiBackendSimpleTaxon'];
 
 type SimpleTaxonArrayKeys = {
-  [K in keyof Taxon]: Taxon[K] extends SimpleTaxon[] ? K : never
+  [K in keyof Taxon]-?: Taxon[K] extends SimpleTaxon[] ? K : never
 }[keyof Taxon];
 
 interface AvailableLangs {

projects/laji/src/app/taxonomy/taxon/info-card/taxon-taxonomy/taxon-synonyms/taxon-synonyms.component.ts

@@ -5,7 +5,7 @@ type Taxon = components['schemas']['LajiBackendTaxon'];
 type SimpleTaxon = components['schemas']['LajiBackendSimpleTaxon'];
 
 type SimpleTaxonArrayKeys = {
-  [K in keyof Taxon]: Taxon[K] extends SimpleTaxon[] ? K : never
+  [K in keyof Taxon]-?: Taxon[K] extends SimpleTaxon[] ? K : never
 }[keyof Taxon];
 
 @Component({

projects/laji/src/app/theme/sound-identification/sound-identification-table/sound-identification-table.component.ts

@@ -20,7 +20,7 @@ export class SoundIdentificationTableComponent implements OnInit {
   @Input() loading = false;
 
   columns!: DatatableColumn[];
-  vernacularCache: Record<string, Observable<string>> = {};
+  vernacularCache: Record<string, Observable<string | undefined>> = {};
   lang!: string;
 
   constructor(