fix(tags): not all tags are loaded in the permission grid

Signed-off-by: Sami Mazouz <sychocouldy@gmail.com>
flarum · Apr 20, 2023 · 3fe3c68 · 3fe3c68
1 parent 8576df1
commit 3fe3c68
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/extensions/tags/js/src/admin/addTagsPermissionScope.tsx b/extensions/tags/js/src/admin/addTagsPermissionScope.tsx
@@ -17,9 +17,8 @@ export default function () {
   });
 
   extend(PermissionGrid.prototype, 'oncreate', function () {
-    app.tagList.load().then(() => {
+    app.tagList.query().then(() => {
       this.loading = false;
-
       m.redraw();
     });
   });

diff --git a/extensions/tags/js/src/common/states/TagListState.ts b/extensions/tags/js/src/common/states/TagListState.ts
@@ -7,12 +7,18 @@ export default class TagListState {
   async load(includes: string[] = []): Promise<Tag[]> {
     const unloadedIncludes = includes.filter((include) => !this.loadedIncludes.has(include));
 
+    console.log('TagListState.load', this.loadedIncludes, unloadedIncludes);
+
     if (unloadedIncludes.length === 0) {
       return Promise.resolve(app.store.all<Tag>('tags'));
     }
 
-    return app.store.find<Tag[]>('tags', { include: unloadedIncludes.join(',') }).then((val) => {
-      unloadedIncludes.forEach((include) => this.loadedIncludes.add(include));
+    return this.query(unloadedIncludes);
+  }
+
+  async query(includes: string[] = []): Promise<Tag[]> {
+    return app.store.find<Tag[]>('tags', { include: includes.join(',') }).then((val) => {
+      includes.forEach((include) => this.loadedIncludes.add(include));
       return val;
     });
   }