From 3fb216b99ea2364331088f046279cea7d0f5215c Mon Sep 17 00:00:00 2001
From: SychO9 <sychocouldy@gmail.com>
Date: Tue, 1 Jun 2021 18:17:28 +0100
Subject: [PATCH] Load all tags in permission grid

---
 .../js/src/admin/addTagsPermissionScope.js    | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/extensions/tags/js/src/admin/addTagsPermissionScope.js b/extensions/tags/js/src/admin/addTagsPermissionScope.js
index d1d31300e..b08a85dd5 100644
--- a/extensions/tags/js/src/admin/addTagsPermissionScope.js
+++ b/extensions/tags/js/src/admin/addTagsPermissionScope.js
@@ -3,12 +3,33 @@ import PermissionGrid from 'flarum/components/PermissionGrid';
 import PermissionDropdown from 'flarum/components/PermissionDropdown';
 import Dropdown from 'flarum/components/Dropdown';
 import Button from 'flarum/components/Button';
+import LoadingIndicator from 'flarum/components/LoadingIndicator';
 
 import tagLabel from '../common/helpers/tagLabel';
 import tagIcon from '../common/helpers/tagIcon';
 import sortTags from '../common/utils/sortTags';
 
 export default function() {
+  extend(PermissionGrid.prototype, 'oninit', function () {
+    this.loading = true;
+  })
+
+  extend(PermissionGrid.prototype, 'oncreate', function () {
+    app.store.find('tags').then(() => {
+      this.loading = false;
+
+      m.redraw();
+    });
+  });
+
+  override(PermissionGrid.prototype, 'view', function (original, vnode) {
+    if (this.loading) {
+      return <LoadingIndicator />;
+    }
+
+    return original(vnode);
+  })
+
   override(app, 'getRequiredPermissions', (original, permission) => {
     const tagPrefix = permission.match(/^tag\d+\./);