Переглянути джерело

Move every Lists.find(idOrFirstObjectSelector, options) to the ReactiveCache (directory client/)

Martin Filser 2 роки тому
батько
коміт
4a8dcde8ee

+ 2 - 2
client/components/boards/boardBody.js

@@ -61,7 +61,7 @@ BlazeComponent.extendComponent({
 
     // fix lists sort field if there are null values
     const nullSortLists = currentBoardData.nullSortLists();
-    if (nullSortLists.count() > 0) {
+    if (nullSortLists.length > 0) {
       const lists = currentBoardData.lists();
       let count = 0;
       lists.forEach(l => {
@@ -215,7 +215,7 @@ BlazeComponent.extendComponent({
     // If there is no data in the board (ie, no lists) we autofocus the list
     // creation form by clicking on the corresponding element.
     const currentBoard = Utils.getCurrentBoard();
-    if (Utils.canModifyBoard() && currentBoard.lists().count() === 0) {
+    if (Utils.canModifyBoard() && currentBoard.lists().length === 0) {
       boardComponent.openNewListForm();
     }
   },

+ 1 - 1
client/components/boards/boardsList.js

@@ -187,8 +187,8 @@ BlazeComponent.extendComponent({
     return ret;
   },
   boardLists(boardId) {
-    const lists = Lists.find({ 'boardId': boardId, 'archived': false },{sort: ['sort','asc']});
     /* Bug Board icons random dance https://github.com/wekan/wekan/issues/4214
+    const lists = ReactiveCache.getLists({ 'boardId': boardId, 'archived': false },{sort: ['sort','asc']});
     const ret = lists.map(list => {
       let cardCount = ReactiveCache.getCards({ 'boardId': boardId, 'listId': list._id }).length;
       return `${list.title}: ${cardCount}`;

+ 3 - 3
client/components/lists/listBody.js

@@ -479,14 +479,14 @@ BlazeComponent.extendComponent({
     if (!this.selectedBoardId.get()) {
       return [];
     }
-    const lists = Lists.find(
+    const lists = ReactiveCache.getLists(
     {
       boardId: this.selectedBoardId.get()
     },
     {
       sort: { sort: 1 },
     });
-    if (lists.count()) this.selectedListId.set(lists.fetch()[0]._id);
+    if (lists.length) this.selectedListId.set(lists[0]._id);
     return lists;
   },
 
@@ -740,7 +740,7 @@ BlazeComponent.extendComponent({
           } else if (this.isListTemplateSearch) {
             element.sort = ReactiveCache.getSwimlane(this.swimlaneId)
               .lists()
-              .count();
+              .length;
             element.type = 'list';
             _id = element.copy(this.boardId, this.swimlaneId);
           } else if (this.isSwimlaneTemplateSearch) {

+ 6 - 6
client/components/sidebar/sidebar.js

@@ -799,7 +799,7 @@ BlazeComponent.extendComponent({
   },
 
   lists() {
-    return Lists.find(
+    return ReactiveCache.getLists(
       {
         boardId: this.currentBoard._id,
         archived: false,
@@ -811,7 +811,7 @@ BlazeComponent.extendComponent({
   },
 
   hasLists() {
-    return this.lists().count() > 0;
+    return this.lists().length > 0;
   },
 
   isListSelected() {
@@ -998,7 +998,7 @@ BlazeComponent.extendComponent({
   },
 
   lists() {
-    return Lists.find(
+    return ReactiveCache.getLists(
       {
         boardId: this.currentBoard._id,
         archived: false,
@@ -1010,7 +1010,7 @@ BlazeComponent.extendComponent({
   },
 
   hasLists() {
-    return this.lists().count() > 0;
+    return this.lists().length > 0;
   },
 
   isListSelected() {
@@ -1346,7 +1346,7 @@ BlazeComponent.extendComponent({
   },
 
  lists() {
-    return Lists.find(
+    return ReactiveCache.getLists(
       {
         boardId: this.currentBoard._id,
         archived: false,
@@ -1358,7 +1358,7 @@ BlazeComponent.extendComponent({
   },
 
   hasLists() {
-    return this.lists().count() > 0;
+    return this.lists().length > 0;
   },
 
   isListSelected() {

+ 1 - 1
client/components/sidebar/sidebarArchives.js

@@ -47,7 +47,7 @@ BlazeComponent.extendComponent({
   },
 
   archivedLists() {
-    return Lists.find(
+    return ReactiveCache.getLists(
       {
         archived: true,
         boardId: Session.get('currentBoard'),

+ 1 - 1
client/lib/multiSelection.js

@@ -6,7 +6,7 @@ function getCardsBetween(idA, idB) {
   }
 
   function getListsStrictlyBetween(id1, id2) {
-    return Lists.find({
+    return ReactiveCache.getLists({
       $and: [
         { sort: { $gt: ReactiveCache.getList(id1).sort } },
         { sort: { $lt: ReactiveCache.getList(id2).sort } },