feat: sort aritcle when add/save

ylc395 · Nov 1, 2021 · fafcf76 · fafcf76
1 parent 08477ef
commit fafcf76
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 3 deletions.
diff --git a/src/domain/service/ArticleService.ts b/src/domain/service/ArticleService.ts
@@ -1,5 +1,5 @@
 import { ref, computed, InjectionKey, reactive, toRaw } from 'vue';
-import { filter, pull, negate, uniq, findIndex, sortBy, compact, mapValues, pick } from 'lodash';
+import { filter, pull, negate, uniq, findIndex, compact, mapValues, pick } from 'lodash';
 import { singleton } from 'tsyringe';
 import moment from 'moment';
 import isValidFilename from 'valid-filename';
@@ -28,13 +28,14 @@ export class ArticleService {
  }
 
  private async init() {
- const articles = sortBy(await this.pluginDataRepository.getArticles(), ['createdAt']).reverse();
+ const articles = (await this.pluginDataRepository.getArticles()) || undefined;
 
  if (articles) {
  await this.associateNotes(articles);
  }
 
  this.articles.push(...(articles ?? []));
+ this.sortByCreatedAt();
  }
 
  private async associateNotes(articles: Article[]) {
@@ -51,6 +52,15 @@ export class ArticleService {
  }
  }
 
+ private sortByCreatedAt() {
+ this.articles.sort((a1, a2) => {
+ const createdAt1 = moment.isMoment(a1.createdAt) ? a1.createdAt.valueOf() : a1.createdAt;
+ const createdAt2 = moment.isMoment(a2.createdAt) ? a2.createdAt.valueOf() : a2.createdAt;
+
+ return createdAt2 - createdAt1;
+ });
+ }
+
  saveArticles() {
  return this.pluginDataRepository.saveArticles(
  toRaw(this.articles).map((article) => pick(article, REQUIRED_KEYS)),
@@ -96,6 +106,11 @@ export class ArticleService {
  }
  }
 
+ addArticles(article: Article) {
+ this.articles.push(article);
+ this.sortByCreatedAt();
+ }
+
  selectAll(status: 'published' | 'unpublished') {
  const articles =
  status === 'published' ? this.publishedArticles.value : this.unpublishedArticles.value;
@@ -120,6 +135,8 @@ export class ArticleService {
  }) as Partial<Article>;
 
  Object.assign(this.articles[index], result);
+ this.sortByCreatedAt();
+
  return this.saveArticles();
  }
 

diff --git a/src/domain/service/NoteService.ts b/src/domain/service/NoteService.ts
@@ -95,7 +95,7 @@ export class NoteService {
  article.url = this.articleService.getValidUrl(article.url);
  }
 
- this.articleService.articles.push(article);
+ this.articleService.addArticles(article);
  }
 
  this.notesToBeAdded.value = [];