arbetsformedlingen/mina-sidor-fa-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated news functionality

Browse Source
This commit is contained in:
Erik Tiekstra
2021-11-11 15:56:49 +01:00
parent 397b6769a2
commit 9806776b2f
15 changed files with 87 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apps/mina-sidor-fa/src/app/shared/components/nyheter/news.component.html
View File

@@ -1,6 +0,0 @@
<ng-container *ngIf="newsData$ | async as news">
<h1>{{news.title}}</h1>
<hr />
<div [innerHtml]="news.body"></div>
</ng-container>
<ui-loader *ngIf="newsLoading$ | async" uiType="padded"></ui-loader>

5
apps/mina-sidor-fa/src/app/shared/components/nyheter/news.component.scss
View File

@@ -1,5 +0,0 @@
@import 'variables/gutters';
h1 {
margin-top: $digi--layout--gutter--xl;
}

22
apps/mina-sidor-fa/src/app/shared/components/nyheter/news.component.spec.ts
View File

@@ -1,22 +0,0 @@
import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { NewsComponent } from './news.component';
describe('NewsComponent', () => {
let component: NewsComponent;
let fixture: ComponentFixture<NewsComponent>;
beforeEach(async () => {
await TestBed.configureTestingModule({
schemas: [CUSTOM_ELEMENTS_SCHEMA],
declarations: [NewsComponent]
})
.compileComponents();
});
beforeEach(() => {
fixture = TestBed.createComponent(NewsComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});

17
apps/mina-sidor-fa/src/app/shared/components/nyheter/news.component.ts
View File

@@ -1,17 +0,0 @@
import { Component } from '@angular/core';
import { News } from '@msfa-models/news.model';
import { NewsApiService } from '@msfa-services/api/news.api.service';
import { Observable } from 'rxjs';
@Component({
selector: 'msfa-news',
templateUrl: 'news.component.html',
styleUrls: ['news.component.scss']
})
export class NewsComponent {
newsData$: Observable<News> = this.newsApiService.fetchNews$();
newsLoading$: Observable<boolean> = this.newsApiService.newsLoading$;
constructor(private newsApiService: NewsApiService) { }
}

14
apps/mina-sidor-fa/src/app/shared/components/nyheter/news.module.ts
View File

@@ -1,14 +0,0 @@
import { CommonModule } from '@angular/common';
import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';
import { UiLoaderModule } from '@ui/loader/loader.module';
import { NewsComponent } from './news.component';
@NgModule({
schemas: [CUSTOM_ELEMENTS_SCHEMA],
declarations: [NewsComponent],
imports: [CommonModule, UiLoaderModule],
exports: [NewsComponent]
})
export class NewsModule {
}

1
apps/mina-sidor-fa/src/app/shared/enums/feature.enum.ts
View File

@@ -16,4 +16,5 @@ export enum Feature {
REPORTING_PERIODISK_REDOVISNING,
REPORTING_INFORMATIV_RAPPORT,
EXPORTS,
NEWS,
}

32
apps/mina-sidor-fa/src/app/shared/services/api/news.api.service.ts
View File

@@ -1,37 +1,37 @@
import { HttpClient } from '@angular/common/http';
import { Injectable } from '@angular/core';
import { ErrorType } from '@msfa-enums/error-type.enum';
import { environment } from '@msfa-environment';
import { NewsResponse } from '@msfa-models/api/news.response.model';
import { errorToCustomError } from '@msfa-models/error/custom-error';
import { mapNewsResponseToNews, News } from '@msfa-models/news.model';
import { CustomError } from '@msfa-models/error/custom-error';
import { ErrorService } from '@msfa-services/error.service';
import { BehaviorSubject, Observable, throwError } from 'rxjs';
import { catchError, filter, map } from 'rxjs/operators';
import { BehaviorSubject, Observable } from 'rxjs';
import { catchError, map } from 'rxjs/operators';
@Injectable({
providedIn: 'root'
providedIn: 'root',
})
export class NewsApiService {
private _apiBaseUrl = `${environment.api.url}/confluence/nyheter`;
private _newsLoading$ = new BehaviorSubject<boolean>(false);
public newsLoading$: Observable<boolean> = this._newsLoading$.asObservable();
constructor(private http: HttpClient, private errorService: ErrorService) { }
constructor(private http: HttpClient, private errorService: ErrorService) {}
public fetchNews$(): Observable<News> {
public fetchNews$(): Observable<NewsResponse> {
this._newsLoading$.next(true);
return this.http.get<NewsResponse>(this._apiBaseUrl).pipe(
filter(response => !!response),
map(response => {
this._newsLoading$.next(false);
return mapNewsResponseToNews(response['data']);
}),
return this.http.get<{ data: NewsResponse }>(this._apiBaseUrl).pipe(
map(({ data }) => data),
catchError((error: Error) => {
this.errorService.add(errorToCustomError({ ...error, message: `Kunde inte hämta nyheter.\n\n${error.message}` }));
return throwError(errorToCustomError(error));
const customError = new CustomError({
error,
message: `Kunde inte hämta nyheter.\n\n${error.message}`,
type: ErrorType.API,
});
this.errorService.add(customError);
throw customError;
})
);
}
}