From 9b4fc3275f3c9746edfd43a48e2de9ea01bfa3c6 Mon Sep 17 00:00:00 2001 From: Keegan George Date: Mon, 1 May 2023 09:32:17 -0700 Subject: [PATCH] DEV: Remove old user menu related code --- .../initializers/extend-for-assigns.js | 18 ----- .../assigned-notification-item-test.js | 73 ------------------- .../acceptance/assigns-tab-user-menu-test.js | 11 ++- .../quick-access-assignments-test.js | 42 ----------- 4 files changed, 5 insertions(+), 139 deletions(-) delete mode 100644 test/javascripts/acceptance/assigned-notification-item-test.js delete mode 100644 test/javascripts/acceptance/quick-access-assignments-test.js diff --git a/assets/javascripts/discourse-assign/initializers/extend-for-assigns.js b/assets/javascripts/discourse-assign/initializers/extend-for-assigns.js index 2e46b2e..1f8573d 100644 --- a/assets/javascripts/discourse-assign/initializers/extend-for-assigns.js +++ b/assets/javascripts/discourse-assign/initializers/extend-for-assigns.js @@ -658,24 +658,6 @@ function initialize(api) { } }); - api.addUserMenuGlyph((widget) => { - if (widget.currentUser && widget.currentUser.can_assign) { - const glyph = { - label: "discourse_assign.assigned", - className: "assigned", - icon: "user-plus", - href: `${widget.currentUser.path}/activity/assigned`, - }; - - if (queryRegistry("quick-access-panel")) { - glyph["action"] = "quickAccess"; - glyph["actionParam"] = "assignments"; - } - - return glyph; - } - }); - api.createWidget("assigned-to", { html(attrs) { let { assignedToUser, assignedToGroup, href } = attrs; diff --git a/test/javascripts/acceptance/assigned-notification-item-test.js b/test/javascripts/acceptance/assigned-notification-item-test.js deleted file mode 100644 index 4510fb4..0000000 --- a/test/javascripts/acceptance/assigned-notification-item-test.js +++ /dev/null @@ -1,73 +0,0 @@ -import { click, visit } from "@ember/test-helpers"; -import { acceptance, query } from "discourse/tests/helpers/qunit-helpers"; -import { test } from "qunit"; - -acceptance("Discourse Assign | Assignment notifications", function (needs) { - needs.user(); - needs.settings({ assign_enabled: true, assigns_user_url_path: "/" }); - - needs.pretender((server, helper) => { - server.get("/notifications", () => - helper.response({ - notifications: [ - { - id: 43, - user_id: 2, - notification_type: 34, - read: false, - high_priority: true, - created_at: "2022-01-01T12:00:00.000Z", - post_number: 1, - topic_id: 43, - fancy_title: "An assigned topic", - slug: "user-assigned-topic", - data: { - message: "discourse_assign.assign_notification", - display_username: "Username", - topic_title: "An assigned topic", - assignment_id: 4, - }, - }, - { - id: 42, - user_id: 2, - notification_type: 34, - read: false, - high_priority: true, - created_at: "2022-01-01T12:00:00.000Z", - post_number: 1, - topic_id: 42, - fancy_title: "A group assigned topic", - slug: "group-assigned-topic", - data: { - message: "discourse_assign.assign_group_notification", - display_username: "Groupname", - topic_title: "A group assigned topic", - assignment_id: 3, - }, - }, - ], - seen_notification_id: 43, - }) - ); - }); - - test("Shows the right icons", async function (assert) { - await visit("/"); - await click("#current-user.header-dropdown-toggle"); - - const userAssignment = query(".quick-access-panel li:nth-child(1) a"); - assert.ok( - userAssignment - .querySelector(".d-icon") - .classList.contains("d-icon-user-plus") - ); - - const groupAssignment = query(".quick-access-panel li:nth-child(2) a"); - assert.ok( - groupAssignment - .querySelector(".d-icon") - .classList.contains("d-icon-group-plus") - ); - }); -}); diff --git a/test/javascripts/acceptance/assigns-tab-user-menu-test.js b/test/javascripts/acceptance/assigns-tab-user-menu-test.js index 01af8d0..b824818 100644 --- a/test/javascripts/acceptance/assigns-tab-user-menu-test.js +++ b/test/javascripts/acceptance/assigns-tab-user-menu-test.js @@ -199,9 +199,9 @@ const USER_MENU_ASSIGN_RESPONSE = { }; acceptance( - "Discourse Assign | experimental user menu | user cannot assign", + "Discourse Assign | user menu | user cannot assign", function (needs) { - needs.user({ redesigned_user_menu_enabled: true, can_assign: false }); + needs.user({ can_assign: false }); needs.settings({ assign_enabled: true, }); @@ -215,9 +215,9 @@ acceptance( ); acceptance( - "Discourse Assign | experimental user menu | assign_enabled setting is disabled", + "Discourse Assign | user menu | assign_enabled setting is disabled", function (needs) { - needs.user({ redesigned_user_menu_enabled: true, can_assign: true }); + needs.user({ can_assign: true }); needs.settings({ assign_enabled: false, }); @@ -230,9 +230,8 @@ acceptance( } ); -acceptance("Discourse Assign | experimental user menu", function (needs) { +acceptance("Discourse Assign | user menu", function (needs) { needs.user({ - redesigned_user_menu_enabled: true, can_assign: true, grouped_unread_notifications: { 34: 173, // assigned notification type diff --git a/test/javascripts/acceptance/quick-access-assignments-test.js b/test/javascripts/acceptance/quick-access-assignments-test.js deleted file mode 100644 index f4546f7..0000000 --- a/test/javascripts/acceptance/quick-access-assignments-test.js +++ /dev/null @@ -1,42 +0,0 @@ -import { - acceptance, - query, - updateCurrentUser, -} from "discourse/tests/helpers/qunit-helpers"; -import { click, currentURL, visit } from "@ember/test-helpers"; -import AssignedTopics from "../fixtures/assigned-topics-fixtures"; -import { test } from "qunit"; - -acceptance( - "Discourse Assign | Quick access assignments panel", - function (needs) { - needs.user(); - needs.settings({ assign_enabled: true, assigns_user_url_path: "/" }); - - needs.pretender((server, helper) => { - const messagesPath = "/topics/messages-assigned/eviltrout.json"; - const assigns = AssignedTopics[messagesPath]; - server.get(messagesPath, () => helper.response(assigns)); - }); - - test("Quick access assignments panel", async function (assert) { - updateCurrentUser({ can_assign: true }); - - await visit("/"); - await click("#current-user.header-dropdown-toggle"); - - await click(".widget-button.assigned"); - const assignment = query(".quick-access-panel li a"); - - assert.ok(assignment.innerText.includes("Greetings!")); - assert.ok(assignment.href.includes("/t/greetings/10/5")); - - await click(".widget-button.assigned"); - assert.strictEqual( - currentURL(), - "/u/eviltrout/activity/assigned", - "a second click should redirect to the full assignments page" - ); - }); - } -);