From 4704e7ab3139956ccdb697a93eeddda35c9f87da Mon Sep 17 00:00:00 2001
From: Djordje Vlaisavljevic <dzvlais@gmail.com>
Date: Fri, 7 Oct 2022 10:42:44 +0200
Subject: [PATCH] Added column sorting and removed the dropdown

refs https://github.com/TryGhost/Team/issues/1986
---
 .../dashboard/charts/attribution.hbs           | 18 +-----------------
 .../source-attribution-table.hbs               |  4 ++++
 2 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/ghost/admin/app/components/dashboard/charts/attribution.hbs b/ghost/admin/app/components/dashboard/charts/attribution.hbs
index c330df7d3f..ea1f82cee2 100644
--- a/ghost/admin/app/components/dashboard/charts/attribution.hbs
+++ b/ghost/admin/app/components/dashboard/charts/attribution.hbs
@@ -8,29 +8,13 @@
                 <p>Once someone signs up, you’ll be able to see where they came from here.</p>
             </div>
         {{else}}
-        <div class="gh-dashboard-select">
-            <PowerSelect
-                @selected={{this.selectedDisplayOption}}
-                @options={{this.allowedDisplayOptions}}
-                @searchEnabled={{false}}
-                @onChange={{this.onDisplayChange}}
-                @triggerComponent={{component "gh-power-select/trigger"}}
-                @triggerClass="gh-contentfilter-menu-trigger"
-                @dropdownClass="gh-contentfilter-menu-dropdown is-narrow"
-                @matchTriggerWidth={{false}}
-                @horizontalPosition="right"
-                @disabled={{this.isDropdownDisabled}}
-                as |option|
-            >
-                {{#if option.name}}{{option.name}}{{else}}<span class="red">Unknown option</span>{{/if}}
-            </PowerSelect>
-        </div>
         <div class="gh-dashboard-attribution-grid">
             <div>
                 <h3 class="gh-dashboard-metric-label">Top sources</h3>
                 <MemberAttribution::SourceAttributionTable
                     @sources={{this.sources}}
                     @sortColumn={{this.selectedSortColumn}}
+                    @setSortColumn={{this.setSortColumn}}
                     class="gh-dashboard-attribution-list gh-dashboard-list"
                 />
             </div>
diff --git a/ghost/admin/app/components/member-attribution/source-attribution-table.hbs b/ghost/admin/app/components/member-attribution/source-attribution-table.hbs
index 81424c85cf..8ef2bc7146 100644
--- a/ghost/admin/app/components/member-attribution/source-attribution-table.hbs
+++ b/ghost/admin/app/components/member-attribution/source-attribution-table.hbs
@@ -2,13 +2,17 @@
     <div class="gh-dashboard-list-header">
         <div class="gh-dashboard-list-title gh-dashboard-list-title-sources">Sources</div>
         <div
+            role="button" aria-label="Sort by free signups"
             class="gh-dashboard-list-title {{if (eq @sortColumn "signups") "sorted-by"}}"
+            {{on "click" (fn @setSortColumn "signups")}}
         >
             <span class="hide-when-small">Free </span>signups{{svg-jar "arrow-down-fill"}}
         </div>
         {{#if this.membersUtils.paidMembersEnabled}}
             <div
+                role="button" aria-label="Sort by paid conversions"
                 class="gh-dashboard-list-title {{if (eq @sortColumn "paid") "sorted-by"}}"
+                {{on "click" (fn @setSortColumn "paid")}}
             >
                 <span class="hide-when-small">Paid </span>Conversions{{svg-jar "arrow-down-fill"}}
             </div>