From da6ddb638f201ac51c4ef1f0f7a70192c389c45d Mon Sep 17 00:00:00 2001
From: Isaac Janzen <50783505+janzenisaac@users.noreply.github.com>
Date: Tue, 1 Aug 2023 14:51:18 -0500
Subject: [PATCH] DEV: Convert `api-key-urls` modal to component-based API
 (#22913)

<img width="474" alt="Screenshot 2023-08-01 at 1 29 26 PM" src="https://github.com/discourse/discourse/assets/50783505/1a46901f-8231-46fb-8c36-cb441b7fd883">
---
 .../addon/components/modal/api-key-urls.hbs      | 16 ++++++++++++++++
 .../addon/controllers/admin-api-keys-new.js      |  6 +++---
 .../addon/controllers/admin-api-keys-show.js     |  6 +++---
 .../addon/templates/modal/admin-api-key-urls.hbs | 11 -----------
 .../javascripts/discourse/app/services/modal.js  |  1 -
 5 files changed, 22 insertions(+), 18 deletions(-)
 create mode 100644 app/assets/javascripts/admin/addon/components/modal/api-key-urls.hbs
 delete mode 100644 app/assets/javascripts/admin/addon/templates/modal/admin-api-key-urls.hbs

diff --git a/app/assets/javascripts/admin/addon/components/modal/api-key-urls.hbs b/app/assets/javascripts/admin/addon/components/modal/api-key-urls.hbs
new file mode 100644
index 00000000000..0cb5b9c7b44
--- /dev/null
+++ b/app/assets/javascripts/admin/addon/components/modal/api-key-urls.hbs
@@ -0,0 +1,16 @@
+<DModal
+  @title={{i18n "admin.api.scopes.allowed_urls"}}
+  @closeModal={{@closeModal}}
+>
+  <:body>
+    <div>
+      <ul>
+        {{#each @model.urls as |url|}}
+          <li>
+            <code>{{url}}</code>
+          </li>
+        {{/each}}
+      </ul>
+    </div>
+  </:body>
+</DModal>
\ No newline at end of file
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-api-keys-new.js b/app/assets/javascripts/admin/addon/controllers/admin-api-keys-new.js
index 7569e0659df..bac3168656a 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-api-keys-new.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-api-keys-new.js
@@ -5,12 +5,13 @@ import discourseComputed from "discourse-common/utils/decorators";
 import { isBlank } from "@ember/utils";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import { action, get } from "@ember/object";
-import showModal from "discourse/lib/show-modal";
 import { ajax } from "discourse/lib/ajax";
 import { inject as service } from "@ember/service";
+import ApiKeyUrlsModal from "../components/modal/api-key-urls";
 
 export default class AdminApiKeysNewController extends Controller {
   @service router;
+  @service modal;
 
   userModes = [
     { id: "all", name: I18n.t("admin.api.all_users") },
@@ -84,8 +85,7 @@ export default class AdminApiKeysNewController extends Controller {
 
   @action
   showURLs(urls) {
-    return showModal("admin-api-key-urls", {
-      admin: true,
+    this.modal.show(ApiKeyUrlsModal, {
       model: { urls },
     });
   }
diff --git a/app/assets/javascripts/admin/addon/controllers/admin-api-keys-show.js b/app/assets/javascripts/admin/addon/controllers/admin-api-keys-show.js
index ba403002a39..499bd0c75d8 100644
--- a/app/assets/javascripts/admin/addon/controllers/admin-api-keys-show.js
+++ b/app/assets/javascripts/admin/addon/controllers/admin-api-keys-show.js
@@ -4,13 +4,14 @@ import Controller from "@ember/controller";
 import { bufferedProperty } from "discourse/mixins/buffered-content";
 import { isEmpty } from "@ember/utils";
 import { popupAjaxError } from "discourse/lib/ajax-error";
-import showModal from "discourse/lib/show-modal";
 import { inject as service } from "@ember/service";
+import ApiKeyUrlsModal from "../components/modal/api-key-urls";
 
 export default class AdminApiKeysShowController extends Controller.extend(
   bufferedProperty("model")
 ) {
   @service router;
+  @service modal;
 
   @empty("model.id") isNew;
 
@@ -67,8 +68,7 @@ export default class AdminApiKeysShowController extends Controller.extend(
 
   @action
   showURLs(urls) {
-    return showModal("admin-api-key-urls", {
-      admin: true,
+    this.modal.show(ApiKeyUrlsModal, {
       model: {
         urls,
       },
diff --git a/app/assets/javascripts/admin/addon/templates/modal/admin-api-key-urls.hbs b/app/assets/javascripts/admin/addon/templates/modal/admin-api-key-urls.hbs
deleted file mode 100644
index e29b2b0c584..00000000000
--- a/app/assets/javascripts/admin/addon/templates/modal/admin-api-key-urls.hbs
+++ /dev/null
@@ -1,11 +0,0 @@
-<DModalBody @title="admin.api.scopes.allowed_urls">
-  <div>
-    <ul>
-      {{#each this.model.urls as |url|}}
-        <li>
-          <code>{{url}}</code>
-        </li>
-      {{/each}}
-    </ul>
-  </div>
-</DModalBody>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/services/modal.js b/app/assets/javascripts/discourse/app/services/modal.js
index 5b6482ac52d..144df0d7ae0 100644
--- a/app/assets/javascripts/discourse/app/services/modal.js
+++ b/app/assets/javascripts/discourse/app/services/modal.js
@@ -49,7 +49,6 @@ const KNOWN_LEGACY_MODALS = [
   "topic-summary",
   "user-status",
   "admin-watched-word-test",
-  "admin-api-key-urls",
   "admin-delete-user-posts-progress",
   "admin-install-theme",
   "admin-penalize-user",