Add description saving and silent save in service.
This commit is contained in:
@@ -16,7 +16,7 @@
|
|||||||
<label for="description">
|
<label for="description">
|
||||||
Description
|
Description
|
||||||
</label>
|
</label>
|
||||||
<textarea id="description"></textarea>
|
<textarea id="description" [formControl]="descriptionControl"></textarea>
|
||||||
</div>
|
</div>
|
||||||
<div class="actions">
|
<div class="actions">
|
||||||
<div class="row">
|
<div class="row">
|
||||||
|
|||||||
@@ -1,5 +1,7 @@
|
|||||||
import { AfterViewInit, Component, ElementRef, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core';
|
import { AfterViewInit, Component, ElementRef, EventEmitter, Input, OnDestroy, OnInit, Output, ViewChild } from '@angular/core';
|
||||||
import { FormControl } from '@angular/forms';
|
import { FormControl } from '@angular/forms';
|
||||||
|
import { Subscription } from 'rxjs';
|
||||||
|
import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
|
||||||
import { Task } from 'src/app/core/entity/task';
|
import { Task } from 'src/app/core/entity/task';
|
||||||
import { TaskListService } from 'src/app/core/service/task-list.service';
|
import { TaskListService } from 'src/app/core/service/task-list.service';
|
||||||
|
|
||||||
@@ -9,11 +11,14 @@ import { TaskListService } from 'src/app/core/service/task-list.service';
|
|||||||
templateUrl: './task-display.component.html',
|
templateUrl: './task-display.component.html',
|
||||||
styleUrls: ['./task-display.component.scss']
|
styleUrls: ['./task-display.component.scss']
|
||||||
})
|
})
|
||||||
export class TaskDisplayComponent implements AfterViewInit {
|
export class TaskDisplayComponent implements AfterViewInit, OnDestroy {
|
||||||
@Input() task?: Task;
|
@Input() task?: Task;
|
||||||
titleControl = new FormControl(this.task?.title);
|
|
||||||
isExpanded = false;
|
|
||||||
@ViewChild('titleInput', {static: true}) titleInput?: ElementRef<HTMLInputElement>;
|
@ViewChild('titleInput', {static: true}) titleInput?: ElementRef<HTMLInputElement>;
|
||||||
|
@ViewChild('descriptionInput', {static: true}) descriptionInput?: ElementRef<HTMLTextAreaElement>;
|
||||||
|
titleControl = new FormControl();
|
||||||
|
descriptionControl = new FormControl();
|
||||||
|
isExpanded = false;
|
||||||
|
private _subscriptions: Subscription[] = [];
|
||||||
|
|
||||||
constructor(
|
constructor(
|
||||||
private _taskListService: TaskListService
|
private _taskListService: TaskListService
|
||||||
@@ -21,6 +26,37 @@ export class TaskDisplayComponent implements AfterViewInit {
|
|||||||
|
|
||||||
ngAfterViewInit(): void {
|
ngAfterViewInit(): void {
|
||||||
this.titleControl.setValue(this?.task?.title);
|
this.titleControl.setValue(this?.task?.title);
|
||||||
|
this.descriptionControl.setValue(this?.task?.description);
|
||||||
|
|
||||||
|
const titleControlSubscription = this.titleControl.valueChanges
|
||||||
|
.pipe(
|
||||||
|
distinctUntilChanged(),
|
||||||
|
debounceTime(500)
|
||||||
|
)
|
||||||
|
.subscribe(newTitle => {
|
||||||
|
if (this.task) {
|
||||||
|
this.task.title = newTitle;
|
||||||
|
this._taskListService.updateTask(this.task);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
this._subscriptions.push(titleControlSubscription);
|
||||||
|
|
||||||
|
const descriptionControlSubscription = this.descriptionControl.valueChanges
|
||||||
|
.pipe(
|
||||||
|
distinctUntilChanged(),
|
||||||
|
debounceTime(500)
|
||||||
|
)
|
||||||
|
.subscribe(description => {
|
||||||
|
if (this.task) {
|
||||||
|
this.task.description = description;
|
||||||
|
this._taskListService.updateTask(this.task);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
this._subscriptions.push(descriptionControlSubscription);
|
||||||
|
}
|
||||||
|
|
||||||
|
ngOnDestroy(): void {
|
||||||
|
this._subscriptions.forEach(subscription => subscription.unsubscribe());
|
||||||
}
|
}
|
||||||
|
|
||||||
expand(): void {
|
expand(): void {
|
||||||
|
|||||||
@@ -13,49 +13,78 @@ import { Router } from "@angular/router";
|
|||||||
})
|
})
|
||||||
export class TaskListService {
|
export class TaskListService {
|
||||||
private _store: BehaviorSubject<Store> = new BehaviorSubject<Store>(undefined as unknown as Store);
|
private _store: BehaviorSubject<Store> = new BehaviorSubject<Store>(undefined as unknown as Store);
|
||||||
|
|
||||||
constructor(
|
constructor(
|
||||||
private _router: Router,
|
private _router: Router,
|
||||||
private _storePersistenceService: StorePersistenceService
|
private _storePersistenceService: StorePersistenceService
|
||||||
) {
|
) {
|
||||||
this.store$.subscribe(store => {
|
this.store$.subscribe(store => {
|
||||||
this._storePersistenceService.save(store);
|
this.saveStore(store, true);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
get store$(): Observable<Store> {
|
get store$(): Observable<Store> {
|
||||||
return this._store.asObservable()
|
return this._store.asObservable()
|
||||||
.pipe(filter(store => !!store));
|
.pipe(filter(store => !!store));
|
||||||
}
|
}
|
||||||
|
|
||||||
private get store(): Store {
|
private get store(): Store {
|
||||||
return this._storePersistenceService.load();
|
return this._storePersistenceService.load();
|
||||||
}
|
|
||||||
|
|
||||||
addTask(taskTitle: string): void {
|
|
||||||
const store = this.store;
|
|
||||||
const activeTaskList = store.taskLists.find(taskList => taskList.id === store.activeTaskListId);
|
|
||||||
if (!activeTaskList) {
|
|
||||||
throw new Error("No active tasklist");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!activeTaskList.tasks) {
|
private saveStore(store: Store, silent: boolean = false): void {
|
||||||
activeTaskList.tasks = [];
|
if (silent) {
|
||||||
|
this._storePersistenceService.save(store);
|
||||||
|
} else {
|
||||||
|
// We send the store into the subject because there is an observable on in, that saves the store at every single value.
|
||||||
|
this._store.next(store);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
addTask(taskTitle: string): void {
|
||||||
|
const store = this.store;
|
||||||
|
const activeTaskList = store.taskLists.find(taskList => taskList.id === store.activeTaskListId);
|
||||||
|
if (!activeTaskList) {
|
||||||
|
throw new Error("No active tasklist");
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!activeTaskList.tasks) {
|
||||||
|
activeTaskList.tasks = [];
|
||||||
|
}
|
||||||
|
|
||||||
|
const newTask = {
|
||||||
|
id: uuidv4(),
|
||||||
|
title: taskTitle,
|
||||||
|
creationDate: new Date(),
|
||||||
|
description: undefined as unknown as string
|
||||||
|
} as Task;
|
||||||
|
|
||||||
|
|
||||||
|
activeTaskList?.tasks.push(newTask);
|
||||||
|
this.saveStore(store);
|
||||||
|
}
|
||||||
|
|
||||||
|
updateTask(taskToUpdate: Task) {
|
||||||
|
const store = this.store;
|
||||||
|
const activeTaskList = store.taskLists.find(taskList => taskList.id === store.activeTaskListId);
|
||||||
|
if (!activeTaskList) {
|
||||||
|
throw new Error("No active tasklist");
|
||||||
|
}
|
||||||
|
|
||||||
const newTask = {
|
const task = activeTaskList?.tasks.find(task => task.id === taskToUpdate.id);
|
||||||
id: uuidv4(),
|
if (!task) {
|
||||||
title: taskTitle,
|
throw new Error('Unknown task to update');
|
||||||
creationDate: new Date(),
|
}
|
||||||
description: undefined as unknown as string
|
|
||||||
} as Task;
|
|
||||||
|
|
||||||
|
task.title = taskToUpdate.title;
|
||||||
|
task.description = taskToUpdate.description;
|
||||||
|
|
||||||
activeTaskList?.tasks.push(newTask);
|
// If the store is saved loudly, all views will be refreshed and the user will lose the focus of its input,
|
||||||
this._store.next(store);
|
// so we save the store silently here.
|
||||||
}
|
this.saveStore(store, true);
|
||||||
|
}
|
||||||
delete(taskToDelete: Task) {
|
|
||||||
|
delete(taskToDelete: Task) {
|
||||||
const store = this.store;
|
const store = this.store;
|
||||||
const activeTaskList = store.taskLists.find(taskList => taskList.id === store.activeTaskListId);
|
const activeTaskList = store.taskLists.find(taskList => taskList.id === store.activeTaskListId);
|
||||||
if (!activeTaskList) {
|
if (!activeTaskList) {
|
||||||
@@ -68,7 +97,7 @@ export class TaskListService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
activeTaskList?.tasks.splice(taskIndex, 1);
|
activeTaskList?.tasks.splice(taskIndex, 1);
|
||||||
this._store.next(store);
|
this.saveStore(store);
|
||||||
}
|
}
|
||||||
|
|
||||||
createTaskList(taskListName: string): void {
|
createTaskList(taskListName: string): void {
|
||||||
@@ -80,7 +109,7 @@ export class TaskListService {
|
|||||||
|
|
||||||
const store = this.store;
|
const store = this.store;
|
||||||
store.taskLists.push(newTaskList);
|
store.taskLists.push(newTaskList);
|
||||||
this._store.next(store);
|
this.saveStore(store);
|
||||||
}
|
}
|
||||||
|
|
||||||
getAll(): TaskList[] {
|
getAll(): TaskList[] {
|
||||||
@@ -90,14 +119,14 @@ export class TaskListService {
|
|||||||
setActive(taskList: TaskList): void {
|
setActive(taskList: TaskList): void {
|
||||||
const store = this.store;
|
const store = this.store;
|
||||||
store.activeTaskListId = taskList.id;
|
store.activeTaskListId = taskList.id;
|
||||||
this._store.next(store);
|
this.saveStore(store);
|
||||||
this._router.navigate(['/task-lists/active']);
|
this._router.navigate(['/task-lists/active']);
|
||||||
}
|
}
|
||||||
|
|
||||||
removeActiveTaskList(): void {
|
removeActiveTaskList(): void {
|
||||||
const store = this.store;
|
const store = this.store;
|
||||||
delete store.activeTaskListId;
|
delete store.activeTaskListId;
|
||||||
this._store.next(store);
|
this.saveStore(store);
|
||||||
this._router.navigate(['/']);
|
this._router.navigate(['/']);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -118,10 +147,10 @@ export class TaskListService {
|
|||||||
store.selectionMode = false;
|
store.selectionMode = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
this._store.next(store);
|
this.saveStore(store);
|
||||||
} else {
|
} else {
|
||||||
store.selectedTaskLists.push(taskList);
|
store.selectedTaskLists.push(taskList);
|
||||||
this._store.next(store);
|
this.saveStore(store);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -137,13 +166,13 @@ export class TaskListService {
|
|||||||
enableSelectionMode(): void {
|
enableSelectionMode(): void {
|
||||||
const store = this.store;
|
const store = this.store;
|
||||||
store.selectionMode = true;
|
store.selectionMode = true;
|
||||||
this._store.next(store);
|
this.saveStore(store);
|
||||||
}
|
}
|
||||||
|
|
||||||
disableSelectionMode(): void {
|
disableSelectionMode(): void {
|
||||||
const store = this.store;
|
const store = this.store;
|
||||||
store.selectionMode = false;
|
store.selectionMode = false;
|
||||||
store.selectedTaskLists = [];
|
store.selectedTaskLists = [];
|
||||||
this._store.next(store);
|
this.saveStore(store);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user