|
|
@@ -1,12 +1,9 @@
|
|
|
import { Component, inject, OnInit, signal } from '@angular/core';
|
|
|
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
|
|
|
-import { firstValueFrom, Observable } from 'rxjs';
|
|
|
-import { ArticleGroup } from '../bo/article-group';
|
|
|
-import { Article } from '../bo/article';
|
|
|
import { DataService } from '../data-service';
|
|
|
-import { ActivatedRoute, Router } from '@angular/router';
|
|
|
+import { Router } from '@angular/router';
|
|
|
import { ArticleForm, ArticleInput } from '../article-form/article-form';
|
|
|
-
|
|
|
+import { ArticleEditState } from '../articleEditState';
|
|
|
@Component({
|
|
|
selector: 'is-article-form-edit',
|
|
|
templateUrl: './article-form-edit.html',
|
|
|
@@ -28,46 +25,36 @@ export class ArticleFormEdit implements OnInit {
|
|
|
// this.update(id)
|
|
|
// }
|
|
|
|
|
|
- articleToEditId!: number;
|
|
|
- articleToEdit!: Article;
|
|
|
- articleToEditArticleGroup!: ArticleGroup | null;
|
|
|
-
|
|
|
+ private editState = inject(ArticleEditState);
|
|
|
+ private dataService = inject(DataService);
|
|
|
+ articleToEdit!: number;
|
|
|
articleInputSignal = signal<ArticleInput|undefined>(undefined) ;
|
|
|
|
|
|
- constructor(private route: ActivatedRoute, private router: Router) {
|
|
|
+ constructor( private router: Router) {
|
|
|
|
|
|
}
|
|
|
|
|
|
- private dataService = inject(DataService);
|
|
|
-
|
|
|
ngOnInit() {
|
|
|
- this.route.paramMap.subscribe((paramMap) => {
|
|
|
- const id = Number(paramMap.get('id'));
|
|
|
- if (isNaN(id)) {
|
|
|
- this.cancel();
|
|
|
- }
|
|
|
+ const article = this.editState.article;
|
|
|
|
|
|
- this.articleToEditId = id;
|
|
|
- this.update(id);
|
|
|
- });
|
|
|
- }
|
|
|
+ if (!article) {
|
|
|
+ this.cancel();
|
|
|
+ return;
|
|
|
+ }
|
|
|
|
|
|
- private update(id: number) {
|
|
|
- this.dataService.getArticleById(id).subscribe((article: Article) => {
|
|
|
- this.articleToEdit = article;
|
|
|
+ this.articleToEdit = article.id;
|
|
|
|
|
|
- this.articleInputSignal.set({
|
|
|
- title: this.articleToEdit.title,
|
|
|
- text: this.articleToEdit.text,
|
|
|
- categoryName: this.articleToEdit.categoryName,
|
|
|
- articleGroupId: this.articleToEdit.articleGroupId,
|
|
|
- });
|
|
|
+ this.articleInputSignal.set({
|
|
|
+ title: article.title,
|
|
|
+ text: article.text,
|
|
|
+ categoryName: article.categoryName,
|
|
|
+ articleGroupId: article.articleGroupId,
|
|
|
});
|
|
|
}
|
|
|
|
|
|
|
|
|
handleSubmit(articleInput: ArticleInput) {
|
|
|
- this.dataService.putArticle(this.articleToEditId, articleInput).subscribe(() => {
|
|
|
+ this.dataService.putArticle(this.articleToEdit, articleInput).subscribe(() => {
|
|
|
this.cancel();
|
|
|
});
|
|
|
}
|