Skip to content
Snippets Groups Projects
Commit 625d5fdd authored by OZGCloud's avatar OZGCloud
Browse files

OZG-3259 OZG-3436 Update code for RxJS 7

parent 5e8d4460
No related branches found
No related tags found
No related merge requests found
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
*/ */
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
import { Params } from '@angular/router'; 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 { CommandOrder, CommandResource, CommandService, CreateCommand, isDone } from '@goofy-client/command-shared';
import { createEmptyStateResource, createStateResource, doIfLoadingRequired, NavigationService, StateResource } from '@goofy-client/tech-shared'; import { createEmptyStateResource, createStateResource, doIfLoadingRequired, NavigationService, StateResource } from '@goofy-client/tech-shared';
import { VorgangResource, VorgangService } from '@goofy-client/vorgang-shared'; import { VorgangResource, VorgangService } from '@goofy-client/vorgang-shared';
...@@ -33,7 +34,6 @@ import { startWith, tap } from 'rxjs/operators'; ...@@ -33,7 +34,6 @@ import { startWith, tap } from 'rxjs/operators';
import { KommentarLinkRel, KommentarListLinkRel } from './kommentar.linkrel'; import { KommentarLinkRel, KommentarListLinkRel } from './kommentar.linkrel';
import { CreateKommentarCommand, Kommentar, KommentarListResource, KommentarResource } from './kommentar.model'; import { CreateKommentarCommand, Kommentar, KommentarListResource, KommentarResource } from './kommentar.model';
import { KommentarRepository } from './kommentar.repository'; import { KommentarRepository } from './kommentar.repository';
import { BinaryFileListResource, BinaryFileService } from '@goofy-client/binary-file-shared';
@Injectable({ providedIn: 'root' }) @Injectable({ providedIn: 'root' })
export class KommentarService { export class KommentarService {
...@@ -147,6 +147,6 @@ export class KommentarService { ...@@ -147,6 +147,6 @@ export class KommentarService {
if (hasLink(kommentar, KommentarLinkRel.ATTACHMENTS)) { if (hasLink(kommentar, KommentarLinkRel.ATTACHMENTS)) {
return this.binaryFileService.getFiles(kommentar, KommentarLinkRel.ATTACHMENTS); return this.binaryFileService.getFiles(kommentar, KommentarLinkRel.ATTACHMENTS);
} }
return of(createEmptyStateResource()); return of(createEmptyStateResource<BinaryFileListResource>());
} }
} }
\ No newline at end of file
...@@ -22,9 +22,9 @@ ...@@ -22,9 +22,9 @@
* unter der Lizenz sind dem Lizenztext zu entnehmen. * unter der Lizenz sind dem Lizenztext zu entnehmen.
*/ */
import { Component, Input, OnInit } from '@angular/core'; 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 { KommentarLinkRel, KommentarListResource, KommentarResource, KommentarService } from '@goofy-client/kommentar-shared';
import { createEmptyStateResource, StateResource } from "@goofy-client/tech-shared"; import { createEmptyStateResource, StateResource } from "@goofy-client/tech-shared";
import { BinaryFileListResource } from '@goofy-client/binary-file-shared';
import { Observable, of } from 'rxjs'; import { Observable, of } from 'rxjs';
@Component({ @Component({
...@@ -36,7 +36,7 @@ export class KommentarListItemInVorgangComponent implements OnInit { ...@@ -36,7 +36,7 @@ export class KommentarListItemInVorgangComponent implements OnInit {
@Input() kommentar: KommentarResource; @Input() kommentar: KommentarResource;
@Input() kommentarListStateResource: StateResource<KommentarListResource>; @Input() kommentarListStateResource: StateResource<KommentarListResource>;
attachments$: Observable<StateResource<BinaryFileListResource>> = of(createEmptyStateResource()); attachments$: Observable<StateResource<BinaryFileListResource>> = of(createEmptyStateResource<BinaryFileListResource>());
editMode: boolean = false; editMode: boolean = false;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment