From 625d5fdd4ea91f4e16d83aa1f7dc4a6f99a275a6 Mon Sep 17 00:00:00 2001 From: OZGCloud <ozgcloud@mgm-tp.com> Date: Thu, 9 Feb 2023 19:11:30 +0100 Subject: [PATCH] OZG-3259 OZG-3436 Update code for RxJS 7 --- .../libs/kommentar-shared/src/lib/kommentar.service.ts | 4 ++-- .../kommentar-list-item-in-vorgang.component.ts | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/goofy-client/libs/kommentar-shared/src/lib/kommentar.service.ts b/goofy-client/libs/kommentar-shared/src/lib/kommentar.service.ts index f96df621df..d2d253e1c3 100644 --- a/goofy-client/libs/kommentar-shared/src/lib/kommentar.service.ts +++ b/goofy-client/libs/kommentar-shared/src/lib/kommentar.service.ts @@ -23,6 +23,7 @@ */ import { Injectable } from '@angular/core'; import { Params } from '@angular/router'; +import { BinaryFileListResource, BinaryFileService } from '@goofy-client/binary-file-shared'; import { CommandOrder, CommandResource, CommandService, CreateCommand, isDone } from '@goofy-client/command-shared'; import { createEmptyStateResource, createStateResource, doIfLoadingRequired, NavigationService, StateResource } from '@goofy-client/tech-shared'; import { VorgangResource, VorgangService } from '@goofy-client/vorgang-shared'; @@ -33,7 +34,6 @@ import { startWith, tap } from 'rxjs/operators'; import { KommentarLinkRel, KommentarListLinkRel } from './kommentar.linkrel'; import { CreateKommentarCommand, Kommentar, KommentarListResource, KommentarResource } from './kommentar.model'; import { KommentarRepository } from './kommentar.repository'; -import { BinaryFileListResource, BinaryFileService } from '@goofy-client/binary-file-shared'; @Injectable({ providedIn: 'root' }) export class KommentarService { @@ -147,6 +147,6 @@ export class KommentarService { if (hasLink(kommentar, KommentarLinkRel.ATTACHMENTS)) { return this.binaryFileService.getFiles(kommentar, KommentarLinkRel.ATTACHMENTS); } - return of(createEmptyStateResource()); + return of(createEmptyStateResource<BinaryFileListResource>()); } } \ No newline at end of file diff --git a/goofy-client/libs/kommentar/src/lib/kommentar-list-in-vorgang-container/kommentar-list-in-vorgang/kommentar-list-item-in-vorgang/kommentar-list-item-in-vorgang.component.ts b/goofy-client/libs/kommentar/src/lib/kommentar-list-in-vorgang-container/kommentar-list-in-vorgang/kommentar-list-item-in-vorgang/kommentar-list-item-in-vorgang.component.ts index fd7e27b30b..c635608f9d 100644 --- a/goofy-client/libs/kommentar/src/lib/kommentar-list-in-vorgang-container/kommentar-list-in-vorgang/kommentar-list-item-in-vorgang/kommentar-list-item-in-vorgang.component.ts +++ b/goofy-client/libs/kommentar/src/lib/kommentar-list-in-vorgang-container/kommentar-list-in-vorgang/kommentar-list-item-in-vorgang/kommentar-list-item-in-vorgang.component.ts @@ -22,9 +22,9 @@ * unter der Lizenz sind dem Lizenztext zu entnehmen. */ import { Component, Input, OnInit } from '@angular/core'; +import { BinaryFileListResource } from '@goofy-client/binary-file-shared'; import { KommentarLinkRel, KommentarListResource, KommentarResource, KommentarService } from '@goofy-client/kommentar-shared'; import { createEmptyStateResource, StateResource } from "@goofy-client/tech-shared"; -import { BinaryFileListResource } from '@goofy-client/binary-file-shared'; import { Observable, of } from 'rxjs'; @Component({ @@ -36,7 +36,7 @@ export class KommentarListItemInVorgangComponent implements OnInit { @Input() kommentar: KommentarResource; @Input() kommentarListStateResource: StateResource<KommentarListResource>; - attachments$: Observable<StateResource<BinaryFileListResource>> = of(createEmptyStateResource()); + attachments$: Observable<StateResource<BinaryFileListResource>> = of(createEmptyStateResource<BinaryFileListResource>()); editMode: boolean = false; -- GitLab