From 9e2d794cd499b75735780716fe2e31763c76868d Mon Sep 17 00:00:00 2001
From: Charlie <13856015+KyrneDev@users.noreply.github.com>
Date: Tue, 24 Nov 2020 13:58:40 -0800
Subject: [PATCH] AdminUX Changes (#33)

---
 extensions/flags/composer.json                |  4 ++
 extensions/flags/js/src/admin/compat.js       |  5 --
 .../admin/components/FlagsSettingsModal.js    | 26 ----------
 extensions/flags/js/src/admin/index.js        | 47 +++++++++----------
 4 files changed, 25 insertions(+), 57 deletions(-)
 delete mode 100644 extensions/flags/js/src/admin/compat.js
 delete mode 100644 extensions/flags/js/src/admin/components/FlagsSettingsModal.js

diff --git a/extensions/flags/composer.json b/extensions/flags/composer.json
index d75d872fa..6caa149a5 100644
--- a/extensions/flags/composer.json
+++ b/extensions/flags/composer.json
@@ -22,6 +22,10 @@
         },
         "flarum-extension": {
             "title": "Flags",
+            "category": "moderation",
+            "info": {
+                "donate": "https://flarum.org/donate/"
+            },
             "icon": {
                 "name": "fas fa-flag",
                 "backgroundColor": "#D659B5",
diff --git a/extensions/flags/js/src/admin/compat.js b/extensions/flags/js/src/admin/compat.js
deleted file mode 100644
index 0aad5de55..000000000
--- a/extensions/flags/js/src/admin/compat.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import FlagsSettingsModal from './components/FlagsSettingsModal';
-
-export default {
-  'flags/components/FlagsSettingsModal': FlagsSettingsModal,
-};
diff --git a/extensions/flags/js/src/admin/components/FlagsSettingsModal.js b/extensions/flags/js/src/admin/components/FlagsSettingsModal.js
deleted file mode 100644
index fe80bba86..000000000
--- a/extensions/flags/js/src/admin/components/FlagsSettingsModal.js
+++ /dev/null
@@ -1,26 +0,0 @@
-import SettingsModal from 'flarum/components/SettingsModal';
-
-export default class FlagsSettingsModal extends SettingsModal {
-  className() {
-    return 'FlagsSettingsModal Modal--small';
-  }
-
-  title() {
-    return app.translator.trans('flarum-flags.admin.settings.title');
-  }
-
-  form() {
-    return [
-      <div className="Form-group">
-        <label>{app.translator.trans('flarum-flags.admin.settings.guidelines_url_label')}</label>
-        <input className="FormControl" bidi={this.setting('flarum-flags.guidelines_url')}/>
-      </div>,
-      <div className="Form-group">
-        <label className="checkbox">
-          <input type="checkbox" bidi={this.setting('flarum-flags.can_flag_own')}/>
-          {app.translator.trans('flarum-flags.admin.settings.flag_own_posts_label')}
-        </label>
-      </div>
-    ];
-  }
-}
diff --git a/extensions/flags/js/src/admin/index.js b/extensions/flags/js/src/admin/index.js
index 712d344d6..cc481813e 100644
--- a/extensions/flags/js/src/admin/index.js
+++ b/extensions/flags/js/src/admin/index.js
@@ -1,31 +1,26 @@
-import { extend } from 'flarum/extend';
 import app from 'flarum/app';
-import PermissionGrid from 'flarum/components/PermissionGrid';
-
-import FlagsSettingsModal from './components/FlagsSettingsModal';
 
 app.initializers.add('flarum-flags', () => {
-  app.extensionSettings['flarum-flags'] = () => app.modal.show(FlagsSettingsModal);
+  app.extensionData.for('flarum-flags')
+    .registerSetting({
+      setting: 'flarum-flags.guidelines_url',
+      type: 'text',
+      label: app.translator.trans('flarum-flags.admin.settings.guidelines_url_label')
+    }, 15)
+    .registerSetting({
+      setting: 'flarum-flags.can_flag_own',
+      type: 'boolean',
+      label: app.translator.trans('flarum-flags.admin.settings.flag_own_posts_label')
+    })
+    .registerPermission({
+        icon: 'fas fa-flag',
+        label: app.translator.trans('flarum-flags.admin.permissions.view_flags_label'),
+        permission: 'discussion.viewFlags'
+      }, 'moderate', 65)
 
-  extend(PermissionGrid.prototype, 'moderateItems', items => {
-    items.add('viewFlags', {
-      icon: 'fas fa-flag',
-      label: app.translator.trans('flarum-flags.admin.permissions.view_flags_label'),
-      permission: 'discussion.viewFlags'
-    }, 65);
-  });
-
-  extend(PermissionGrid.prototype, 'replyItems', items => {
-    items.add('flagPosts', {
-      icon: 'fas fa-flag',
-      label: app.translator.trans('flarum-flags.admin.permissions.flag_posts_label'),
-      permission: 'discussion.flagPosts'
-    }, 70);
-  });
+    .registerPermission({
+        icon: 'fas fa-flag',
+        label: app.translator.trans('flarum-flags.admin.permissions.flag_posts_label'),
+        permission: 'discussion.flagPosts'
+      }, 'reply', 65);
 });
-
-// Expose compat API
-import flagsCompat from './compat';
-import { compat } from '@flarum/core/admin';
-
-Object.assign(compat, flagsCompat);