From d12310bdb6f8f85f5fab4a9ee08c0eb86538ac3b Mon Sep 17 00:00:00 2001
From: Audrey Hamelers <audrey@datadryad.org>
Date: Tue, 13 Aug 2024 13:57:01 +0200
Subject: [PATCH 1/5] remove beta notice

---
 app/views/stash_engine/admin_dashboard/index.html.erb | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/views/stash_engine/admin_dashboard/index.html.erb b/app/views/stash_engine/admin_dashboard/index.html.erb
index bdb398b790..18640195ec 100644
--- a/app/views/stash_engine/admin_dashboard/index.html.erb
+++ b/app/views/stash_engine/admin_dashboard/index.html.erb
@@ -1,8 +1,5 @@
 <% @page_title = "Admin dashboard" %>
 <% unaltered = @saved_search&.filters == @filters && @saved_search&.fields == @fields && (@saved_search&.search_string == @search_string || (@saved_search&.search_string.blank? && @search_string.blank?)) %>
-<div class="callout alt">
-  <p style="text-align: center;">Welcome to the beta version of the new Admin dashboard! Please send your feedback to <a href="mailto:community@datadryad.org?subject=Admin dashboard feedback">community@datadryad.org</a>.</p>
-</div>
 <div class="admin-dashboard-header">
   <h1 class="o-heading__level1">Admin dashboard</h1>
   <%= render partial: 'role_select' %>
@@ -23,6 +20,10 @@
 
 <div id="search_results" data-load="<%= stash_url_helpers.admin_dashboard_results_path(format: :js, search: params[:search], sort: params[:sort], direction: params[:direction], page_size: params[:page_size], page: params[:page]) %>"></div>
 
+<div class="callout alt">
+  <p style="text-align: center;">Please send your Admin dashboard feedback to <a href="mailto:community@datadryad.org?subject=Admin dashboard feedback">community@datadryad.org</a>.</p>
+</div>
+
 <script type="text/javascript">
   document.getElementById('search_open').addEventListener('click', (e) => {
     e.target.toggleAttribute('aria-expanded')

From a2e84d56a047cb77e4c0adee081ac753c96c9bac Mon Sep 17 00:00:00 2001
From: Audrey Hamelers <audrey@datadryad.org>
Date: Tue, 13 Aug 2024 13:58:04 +0200
Subject: [PATCH 2/5] change link & redirect

---
 app/views/layouts/stash_engine/_nav.html.erb | 3 +--
 config/routes.rb                             | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/app/views/layouts/stash_engine/_nav.html.erb b/app/views/layouts/stash_engine/_nav.html.erb
index 682e58074f..0b2a3cb2f7 100644
--- a/app/views/layouts/stash_engine/_nav.html.erb
+++ b/app/views/layouts/stash_engine/_nav.html.erb
@@ -57,8 +57,7 @@
           <button class="c-header_nav-button" aria-haspopup="menu" aria-expanded="false" aria-controls="manage-menu">Datasets</button>
           <ul class="c-header__nav-submenu" id="manage-menu" hidden>
             <li><%= link_to 'My datasets', stash_url_helpers.dashboard_path, class: 'js-nav-out'%>
-            <li><%= link_to 'Admin dashboard', stash_url_helpers.url_for(controller: 'stash_engine/admin_datasets', action: 'index', editor_id: current_user.curator? && current_user.system_user? ? current_user.id : '', curation_status: current_user.curator? && current_user.system_user? ? 'submitted' : '', only_path: true) %>
-            <li><a href="<%=stash_url_helpers.admin_dashboard_path %>"><i class="fa fa-star" aria-hidden="true"></i>New Admin dashboard</a></li>
+            <li><%= link_to 'Admin dashboard', stash_url_helpers.admin_dashboard_path %>
             <% if current_user.system_user? %>
               <li><%= link_to 'Curation stats', stash_url_helpers.curation_stats_path %>
               <li><%= link_to 'Journals', stash_url_helpers.journals_path %>
diff --git a/config/routes.rb b/config/routes.rb
index 89bd644d12..aeca362f5a 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -320,8 +320,7 @@
     match 'saved_search/:id', to: 'saved_searches#update', via: %i[put patch], as: 'update_saved_search'
     delete 'saved_search/:id', to: 'saved_searches#destroy', as: 'saved_search_delete'
 
-    # admin_datasets, aka "Curator Dashboard"
-    get 'ds_admin', to: 'admin_datasets#index'
+    # activity log
     get 'ds_admin/:id/create_salesforce_case', to: 'admin_datasets#create_salesforce_case', as: 'create_salesforce_case'
     get 'ds_admin/:id/activity_log', to: 'admin_datasets#activity_log', as: 'activity_log'
     get 'ds_admin/:id/edit/:field', to: 'admin_datasets#popup', as: 'ds_admin_popup'
@@ -517,6 +516,7 @@
   get '/submit', to: redirect { |params, request| "/stash/resources/new?#{request.params.to_query}" }
   get '/interested', to: redirect('/stash/contact#get-involved')
   get '/stash/interested', to: redirect('/stash/contact#get-involved')
+  get '/stash/ds_admin', to: redirect('/stash/admin_dashboard')
 
   # Routing to redirect old Dryad landing pages to the correct location
   # Regex based on https://www.crossref.org/blog/dois-and-matching-regular-expressions/ but a little more restrictive specific to old dryad

From a2ccbcf3e8c17cd9bef7fe98a9d289a340ea44ea Mon Sep 17 00:00:00 2001
From: Audrey Hamelers <audrey@datadryad.org>
Date: Tue, 13 Aug 2024 14:38:10 +0200
Subject: [PATCH 3/5] update tests

---
 .../stash_datacite/dataset_versioning_spec.rb |  24 +-
 .../stash_engine/admin_datasets_spec.rb       | 485 ------------------
 .../features/stash_engine/admin_paths_spec.rb |   8 +-
 .../stash_engine/curation_activity_spec.rb    |  36 +-
 .../admin_datasets/curation_table_row_spec.rb |  59 ---
 5 files changed, 34 insertions(+), 578 deletions(-)
 delete mode 100644 spec/features/stash_engine/admin_datasets_spec.rb
 delete mode 100644 spec/models/stash_engine/admin_datasets/curation_table_row_spec.rb

diff --git a/spec/features/stash_datacite/dataset_versioning_spec.rb b/spec/features/stash_datacite/dataset_versioning_spec.rb
index 627090b7a3..0072c3a69b 100644
--- a/spec/features/stash_datacite/dataset_versioning_spec.rb
+++ b/spec/features/stash_datacite/dataset_versioning_spec.rb
@@ -105,11 +105,11 @@
         before(:each, js: true) do
           sign_in(@curator)
           find('.c-header_nav-button', text: 'Datasets').click
-          visit stash_url_helpers.ds_admin_path
+          visit stash_url_helpers.admin_dashboard_path
         end
 
         it 'displays the proper information on the Admin page', js: true do
-          within(:css, '.c-lined-table__row') do
+          within(:css, 'tbody tr') do
             # Make sure the appropriate buttons are available
             # Curators want to edit everything unless it's in progress, so enjoy
             expect(page).to have_css('button[title="Edit dataset"]')
@@ -117,7 +117,7 @@
 
             # Make sure the right text is shown
             expect(page).to have_link(@resource.title)
-            within(:css, "#js-curation-state-#{@resource.id}") do
+            within(:css, "#curation_activity_#{@resource.id}") do
               expect(page).to have_text('Submitted')
             end
             expect(page).to have_text(@resource.authors.collect(&:author_last_name).join('; '))
@@ -127,7 +127,7 @@
         end
 
         it 'displays the proper information on the Activity Log page', js: true do
-          within(:css, '.c-lined-table__row') do
+          within(:css, 'tbody tr') do
             find('a[aria-label="Activity log"]').click
           end
 
@@ -164,7 +164,7 @@
 
         sign_in(@curator)
         find('.c-header_nav-button', text: 'Datasets').click
-        visit stash_url_helpers.ds_admin_path
+        visit stash_url_helpers.admin_dashboard_path
 
         # Edit the Dataset as an admin
         click_button 'Edit dataset'
@@ -172,7 +172,7 @@
         update_dataset(curator: true)
         @resource.reload
 
-        visit stash_url_helpers.ds_admin_path
+        visit stash_url_helpers.admin_dashboard_path
       end
 
       it 'has a resource_state (Merritt status) of "submitted"', js: true do
@@ -188,7 +188,7 @@
       end
 
       it 'displays the proper information on the Admin page', js: true do
-        within(:css, '.c-lined-table__row') do
+        within(:css, 'tbody tr') do
           # Make sure the appropriate buttons are available
           expect(page).to have_css('button[title="Edit dataset"]')
           expect(page).to have_css('button[aria-label="Update status"]')
@@ -205,7 +205,7 @@
       end
 
       it 'displays the proper information on the Activity Log page', js: true do
-        within(:css, '.c-lined-table__row') do
+        within(:css, 'tbody tr') do
           find('a[aria-label="Activity log"]').click
         end
 
@@ -253,9 +253,9 @@
         sign_in(@curator)
         find('.c-header_nav-button', text: 'Datasets').click
 
-        visit stash_url_helpers.ds_admin_path
+        visit stash_url_helpers.admin_dashboard_path
 
-        within(:css, '.c-lined-table__row') do
+        within(:css, 'tbody tr') do
           # Make sure the appropriate buttons are available
           # Make sure the right text is shown
           expect(page).to have_link(@resource.title)
@@ -271,9 +271,9 @@
       it 'displays the proper information on the Activity Log page', js: true do
         sign_in(@curator)
         find('.c-header_nav-button', text: 'Datasets').click
-        visit stash_url_helpers.ds_admin_path
+        visit stash_url_helpers.admin_dashboard_path
 
-        within(:css, '.c-lined-table__row') do
+        within(:css, 'tbody tr') do
           find('a[aria-label="Activity log"]').click
         end
 
diff --git a/spec/features/stash_engine/admin_datasets_spec.rb b/spec/features/stash_engine/admin_datasets_spec.rb
deleted file mode 100644
index 5aebf78fd6..0000000000
--- a/spec/features/stash_engine/admin_datasets_spec.rb
+++ /dev/null
@@ -1,485 +0,0 @@
-require 'pry-remote'
-
-RSpec.feature 'AdminDatasets', type: :feature do
-  include DatasetHelper
-  include Mocks::Aws
-  include Mocks::Repository
-  include Mocks::CurationActivity
-  include Mocks::Datacite
-  include Mocks::RSolr
-  include Mocks::Salesforce
-  include Mocks::Stripe
-  include Mocks::DataFile
-
-  context :content do
-
-    before(:each) do
-      mock_stripe!
-      mock_salesforce!
-      Timecop.travel(Time.now.utc - 1.hour)
-      # Create a user, identifier and 2 resources for each tenant
-      %w[ucop dryad mock_tenant].each do |tenant|
-        user = create(:user, tenant_id: tenant)
-        @identifiers = []
-        2.times.each do
-          identifier = create(:identifier)
-          create(:resource, :submitted, user: user, identifier: identifier)
-          cite_number = rand(4)
-          cite_number.times { create(:counter_citation, identifier: identifier) }
-          create(:counter_stat, citation_count: cite_number, identifier: identifier)
-          @identifiers.push(identifier)
-        end
-      end
-      Timecop.return
-    end
-
-    it 'shows admins datasets for their tenant' do
-      sign_in(create(:user, role: 'admin', role_object: StashEngine::Tenant.find('ucop'), tenant_id: 'ucop'))
-      visit stash_url_helpers.ds_admin_path
-      expect(all('.c-lined-table__row').length).to eql(2)
-    end
-
-    it 'shows consortium admins datasets for their tenants' do
-      consortium = create(:tenant, id: 'consortium')
-      create(:tenant, id: 'member1', sponsor_id: 'consortium')
-      create(:tenant, id: 'member2', sponsor_id: 'consortium')
-      user = create(:user, tenant_id: 'member1')
-      2.times do
-        identifier = create(:identifier)
-        create(:resource, :submitted, user: user, identifier: identifier)
-      end
-      sign_in(create(:user, role: 'admin', role_object: consortium, tenant_id: 'consortium'))
-      visit stash_url_helpers.ds_admin_path
-      expect(page).to have_select('tenant')
-      expect(page).to have_selector('#tenant option', count: 4)
-      expect(all('.c-lined-table__row').length).to eql(2)
-    end
-
-    it 'lets curators see all datasets' do
-      sign_in(create(:user, role: 'curator'))
-      visit stash_url_helpers.ds_admin_path
-      expect(all('.c-lined-table__row').length).to eql(6)
-    end
-
-    it 'has ajax showing counter stats and citations', js: true do
-      sign_in(create(:user, role: 'curator'))
-      visit stash_url_helpers.ds_admin_path
-      el = find('td', text: @identifiers.first.resources.first.title)
-      el = el.find(:css, '.js-stats')
-      el.click
-      my_stats = @identifiers.first.counter_stat
-      page.first :css, '.o-metrics__icon'
-      expect(page).to have_content("#{my_stats.citation_count} citations")
-      expect(page).to have_content("#{my_stats.views} views")
-      expect(page).to have_content("#{my_stats.downloads} downloads")
-    end
-
-    it 'generates a csv having dataset information with citations, views and downloads' do
-      sign_in(create(:user, role: 'curator'))
-      visit stash_url_helpers.ds_admin_path
-      click_link('Get Comma Separated Values (CSV) for import into Excel')
-
-      title = @identifiers.first.resources.first.title
-      my_stats = @identifiers.first.counter_stat
-
-      csv_line = page.body.split("\n").select { |i| i.start_with?(title) }.first
-
-      # NOTE: this doesn't split "correctly", since some entries contain embedded commas,
-      # but it doesn't matter as long as it is synced with the index below
-      csv_parts = csv_line.split(',')
-
-      expect(csv_parts[-5].to_i).to eql(my_stats.views)
-      expect(csv_parts[-4].to_i).to eql(my_stats.downloads)
-      expect(csv_parts[-3].to_i).to eql(my_stats.citation_count)
-    end
-
-    it 'generates a csv that includes submitter institutional name' do
-      sign_in(create(:user, role: 'curator'))
-      visit stash_url_helpers.ds_admin_path
-      click_link('Get Comma Separated Values (CSV) for import into Excel')
-
-      title = @identifiers.first.resources.first.title
-
-      csv_line = page.body.split("\n").select { |i| i.start_with?(title) }.first
-
-      # NOTE: this doesn't split "correctly", since some entries contain embedded commas,
-      # but it doesn't matter as long as it is synced with the index below
-      csv_parts = csv_line.split(',')
-
-      expect(csv_parts[-2]).to eql(@identifiers.first.resources.first.tenant.long_name)
-    end
-  end
-
-  context :roles do
-    before(:each) do
-      mock_aws!
-      mock_solr!
-      mock_salesforce!
-      mock_stripe!
-      mock_repository!
-      mock_datacite!
-      mock_file_content!
-      neuter_curation_callbacks!
-      Timecop.travel(Time.now.utc - 1.minute)
-      create(:tenant)
-      @admin = create(:user, tenant_id: 'test_tenant')
-      create(:role, user: @admin, role_object: @admin.tenant)
-      @user = create(:user, tenant_id: @admin.tenant_id)
-      @identifier = create(:identifier)
-      @resource = create(:resource, :submitted, user: @user, identifier: @identifier, tenant_id: @admin.tenant_id, skip_datacite_update: true)
-      Timecop.return
-    end
-
-    context :tenant_admin do
-
-      before(:each) do
-        sign_in(@admin)
-      end
-
-      it 'has admin link', js: true do
-        visit root_path
-        click_button 'Datasets'
-        expect(page).to have_link('Admin dashboard')
-      end
-
-      it 'only shows datasets from the target institution', js: true do
-        ident1 = create(:identifier)
-        res1 = create(:resource, identifier_id: ident1.id, user: @user, tenant_id: @admin.tenant_id)
-        ident2 = create(:identifier)
-        user2 = create(:user, tenant_id: 'bad_tenant')
-        res2 = create(:resource, identifier_id: ident2.id, user: user2, tenant_id: user2.tenant_id)
-
-        visit root_path
-        click_button 'Datasets'
-        click_link 'Admin dashboard'
-        expect(page).to have_text('Admin dashboard')
-        expect(page).to have_text(res1.title)
-        expect(page).not_to have_text(res2.title)
-      end
-
-      it 'Limits options in the curation page', js: true do
-        visit root_path
-        click_button 'Datasets'
-        click_link 'Admin dashboard'
-        click_on('Reset all filters')
-
-        expect(page).to have_content(@resource.title)
-        expect(page).not_to have_selector('button.c-admin-edit-icon .fa-pencil') # no pencil editing icons for you
-      end
-
-      it 'does not allow editing a dataset from the curation page', js: true do
-        visit root_path
-        click_button 'Datasets'
-        click_link 'Admin dashboard'
-        expect(page).to have_text('Admin dashboard')
-        expect(page).not_to have_css('button[title="Edit dataset"]')
-      end
-    end
-
-    context :curator, js: true do
-
-      before(:each) do
-        create(:curation_activity_no_callbacks, status: 'curation', user_id: @user.id, resource_id: @resource.id)
-        @resource.resource_states.first.update(resource_state: 'submitted')
-        sign_in(create(:user, role: 'curator'))
-        visit stash_url_helpers.ds_admin_path(curation_status: 'curation')
-      end
-
-      it 'has admin link', js: true do
-        click_button 'Datasets'
-        expect(page).to have_link('Admin dashboard')
-      end
-
-      it 'submits a curation status changes and reflects in the page and history afterwards' do
-        within(:css, '.c-lined-table__row', wait: 10) do
-          find('button[title="Update status"]').click
-        end
-        # select the author action required
-
-        find("#activity_status_select option[value='action_required']").select_option
-
-        # fill in a note
-        fill_in(id: 'activity_note', with: 'My cat says hi')
-        click_button('Submit')
-
-        within(:css, '.c-lined-table__row', wait: 10) do
-          expect(page).to have_text('Action required')
-          find('a[title="Activity log"]').click
-        end
-
-        expect(page).to have_text('My cat says hi')
-      end
-
-      it 'allows curation editing of users dataset and returning to admin list in same state afterward' do
-        # the button to edit has this class on it
-        find('.js-trap-curator-url').click
-        all('[id^=instit_affil_]').last.set('test institution')
-        page.send_keys(:tab)
-        page.has_css?('.use-text-entered')
-        all(:css, '.use-text-entered').each { |i| i.set(true) }
-        fill_in_keywords
-        navigate_to_readme
-        add_required_data_files
-        navigate_to_review
-        agree_to_everything
-        fill_in 'user_comment', with: Faker::Lorem.sentence
-        submit = find_button('submit_dataset', disabled: :all)
-        submit.click
-        expect(URI.parse(current_url).request_uri).to eq("#{stash_url_helpers.ds_admin_path}?curation_status=curation")
-      end
-
-      it 'allows curation editing and aborting editing of user dataset and return to list in same state afterward' do
-        # the button to edit has this class on it
-        find('.js-trap-curator-url').click
-
-        expect(page).to have_field('Dataset title') # so it waits for actual ajax doc to load before doing anything else
-
-        click_on('Cancel and Discard Changes')
-        find('#railsConfirmDialogYes').click
-        expect(URI.parse(current_url).request_uri).to eq("#{stash_url_helpers.ds_admin_path}?curation_status=curation")
-      end
-    end
-
-    context :superuser, js: true do
-
-      before(:each) do
-        mock_salesforce!
-        @superuser = create(:user, role: 'superuser')
-        sign_in(@superuser, false)
-      end
-
-      it 'has admin link' do
-        visit root_path
-        click_button 'Datasets'
-        expect(page).to have_link('Admin dashboard')
-        expect(page).to have_link('Publication updater')
-        expect(page).to have_link('Status dashboard')
-        expect(page).to have_link('Submission queue')
-      end
-
-      it 'allows editing a dataset' do
-        Timecop.travel(Time.now.utc - 2.minutes)
-        @user = create(:user, tenant_id: @admin.tenant_id)
-        @identifier = create(:identifier)
-        expect { @resource = create(:resource, :submitted, user: @user, identifier: @identifier, tenant_id: @admin.tenant_id) }
-          .to change(StashEngine::Resource, :count).by(1)
-        expect { @resource.subjects << [create(:subject), create(:subject), create(:subject)] }
-          .to change(StashDatacite::Subject, :count).by(3)
-        Timecop.return
-        visit stash_url_helpers.user_admin_profile_path(@user)
-        expect(page).to have_css('button[title="Edit dataset"]')
-        find('button[title="Edit dataset"]').click
-        expect(page).to have_text("You are editing #{@user.name}'s dataset.")
-        all('[id^=instit_affil_]').last.set('test institution')
-        page.send_keys(:tab)
-        page.has_css?('.use-text-entered')
-        all(:css, '.use-text-entered').each { |i| i.set(true) }
-        add_required_data_files
-        mock_file_content!
-        click_link 'Review and submit'
-        agree_to_everything
-        expect(page).to have_css('input#user_comment')
-      end
-
-      it 'allows assigning a curator to a dataset' do
-        expect { @curator = create(:user, role: 'superuser', tenant_id: 'dryad') }.to change(StashEngine::User, :count).by(1)
-
-        visit stash_url_helpers.ds_admin_path
-
-        expect(page).to have_text('Admin dashboard')
-        expect(page).to have_css('button[title="Update curator"]')
-        find('button[title="Update curator"]').click
-        find("#current_editor option[value='#{@curator.id}']").select_option
-        click_button('Submit')
-
-        within(:css, '.c-lined-table__row', wait: 10) do
-          expect(page).to have_text(@curator.name.to_s)
-        end
-
-      end
-
-      it 'allows un-assigning a curator, keeping status if it is peer_review' do
-        @curator = create(:user, role: 'superuser', tenant_id: 'dryad')
-        expect { create(:curation_activity, resource: @resource, status: 'peer_review', note: 'forcing to peer_review') }
-          .to change(StashEngine::CurationActivity, :count).by(1)
-        @resource.reload
-
-        visit stash_url_helpers.ds_admin_path
-
-        expect(page).to have_text('Admin dashboard')
-        expect(page).to have_css('button[title="Update curator"]')
-        find('button[title="Update curator"]').click
-        find("#current_editor option[value='#{@curator.id}']").select_option
-        click_button('Submit')
-        find('button[title="Update curator"]').click
-        find("#current_editor option[value='0']").select_option
-        click_button('Submit')
-        within(:css, '.c-lined-table__row', wait: 10) do
-          expect(page).not_to have_text(@curator.name_last_first)
-        end
-        @resource.reload
-
-        expect(@resource.current_editor_id).to eq(nil)
-        expect(@resource.current_curation_status).to eq('peer_review')
-      end
-
-      it 'allows un-assigning a curator, changing status if it is curation' do
-        @curator = create(:user, role: 'superuser')
-        expect { create(:curation_activity, resource: @resource, status: 'curation', note: 'forcing to curation') }
-          .to change(StashEngine::CurationActivity, :count).by(1)
-        @resource.reload
-
-        visit stash_url_helpers.ds_admin_path
-
-        expect(page).to have_text('Admin dashboard')
-        expect(page).to have_css('button[title="Update curator"]')
-
-        within(:css, '.c-lined-table__row', wait: 10) do
-          expect(page).to have_text('Curation')
-        end
-
-        find('button[title="Update curator"]').click
-        find("#current_editor option[value='#{@curator.id}']").select_option
-        click_button('Submit')
-        within(:css, '.c-lined-table__row', wait: 10) do
-          expect(page).to have_text(@curator.name)
-        end
-        find('button[title="Update curator"]').click
-        find("#current_editor option[value='0']").select_option
-        click_button('Submit')
-        within(:css, '.c-lined-table__row', wait: 10) do
-          expect(page).not_to have_text(@curator.name)
-        end
-        @resource.reload
-
-        within(:css, '.c-lined-table__row', wait: 10) do
-          expect(page).to have_text('Submitted')
-        end
-      end
-    end
-
-    context :app_admin, js: true do
-
-      before(:each) do
-        create(:role, user: @user, role: 'admin')
-        sign_in(@user, false)
-      end
-
-      it 'shows limited menus to an administrative curator' do
-        click_button 'Datasets'
-        expect(page).to have_link('Admin dashboard')
-        expect(page).to have_link('Curation stats')
-        expect(page).to have_link('Journals')
-        expect(page).not_to have_link('User management')
-        expect(page).not_to have_link('Submission queue')
-      end
-
-      it 'Limits options in the curation page' do
-        visit root_path
-        click_button 'Datasets'
-        click_link 'Admin dashboard'
-        click_on('Reset all filters')
-
-        expect(page).to have_content(@resource.title)
-        expect(page).not_to have_selector('button.c-admin-edit-icon .fa-pencil') # no pencil editing icons for you
-      end
-    end
-
-    context :tenant_curator, js: true do
-
-      before(:each) do
-        mock_salesforce!
-        @tenant_curator = create(:user, role: 'curator', role_object: @admin.tenant, tenant_id: @admin.tenant_id)
-        sign_in(@tenant_curator, false)
-      end
-
-      it 'has admin link' do
-        visit root_path
-        click_button 'Datasets'
-        expect(page).to have_link('Admin dashboard')
-      end
-
-      it 'only shows datasets from the target institution' do
-        ident1 = create(:identifier)
-        res1 = create(:resource, identifier_id: ident1.id, user: @user, tenant_id: @tenant_curator.tenant_id)
-        ident2 = create(:identifier)
-        user2 = create(:user, tenant_id: 'bad_tenant')
-        res2 = create(:resource, identifier_id: ident2.id, user: user2, tenant_id: user2.tenant_id)
-
-        visit root_path
-        click_button 'Datasets'
-        click_link 'Admin dashboard'
-        expect(page).to have_text('Admin dashboard')
-        expect(page).to have_text(res1.title)
-        expect(page).not_to have_text(res2.title)
-      end
-    end
-
-    context :journal_admin, js: true do
-
-      before(:each) do
-        @journal = create(:journal)
-        @journal_admin = create(:user, tenant_id: 'mock_tenant')
-        @journal_role = create(:role, role_object: @journal, user: @journal_admin)
-        @journal_admin.reload
-        sign_in(@journal_admin, false)
-        ident1 = create(:identifier)
-        @res1 = create(:resource, identifier_id: ident1.id, user: @user, tenant_id: @admin.tenant_id)
-        create(:internal_datum, identifier_id: ident1.id, data_type: 'publicationISSN', value: @journal.single_issn)
-        create(:internal_datum, identifier_id: ident1.id, data_type: 'publicationName', value: @journal.title)
-        ident1.reload
-      end
-
-      it 'has admin link' do
-        visit root_path
-        click_button 'Datasets'
-        expect(page).to have_link('Admin dashboard')
-      end
-
-      it 'only shows datasets from the target journal' do
-        ident2 = create(:identifier)
-        res2 = create(:resource, identifier_id: ident2.id, user: @user, tenant_id: @admin.tenant_id)
-
-        visit root_path
-        click_button 'Datasets'
-        find('a', exact_text: 'Admin dashboard').click
-        expect(page).to have_text('Admin dashboard')
-        expect(page).to have_text(@res1.title)
-        expect(page).not_to have_text(res2.title)
-      end
-    end
-
-    context :funder_admin, js: true do
-
-      before(:each) do
-        ident1 = create(:identifier)
-        @res1 = create(:resource, identifier_id: ident1.id, user: @user, tenant_id: @admin.tenant_id)
-        contributor = create(:contributor, resource: @res1)
-        funder = create(:funder, name: contributor.contributor_name, ror_id: contributor.name_identifier_id)
-        @funder_admin = create(:user, tenant_id: 'mock_tenant')
-        @funder_role = create(:role, role_object: funder, user: @funder_admin)
-        @funder_role.reload
-        @funder_admin.reload
-        sign_in(@funder_admin, false)
-      end
-
-      it 'has admin link' do
-        visit root_path
-        click_button 'Datasets'
-        expect(page).to have_link('Admin dashboard')
-      end
-
-      it 'only shows datasets from the target journal' do
-        ident2 = create(:identifier)
-        res2 = create(:resource, identifier_id: ident2.id, user: @user, tenant_id: @admin.tenant_id)
-
-        visit root_path
-        click_button 'Datasets'
-        find('a', exact_text: 'Admin dashboard').click
-        expect(page).to have_text('Admin dashboard')
-        expect(page).to have_text(@res1.title)
-        expect(page).not_to have_text(res2.title)
-      end
-    end
-  end
-end
diff --git a/spec/features/stash_engine/admin_paths_spec.rb b/spec/features/stash_engine/admin_paths_spec.rb
index a1bd1645a6..15a4238f84 100644
--- a/spec/features/stash_engine/admin_paths_spec.rb
+++ b/spec/features/stash_engine/admin_paths_spec.rb
@@ -7,10 +7,10 @@
     create(:tenant)
   end
 
-  context :admin_datasets_path do
+  context :admin_dashboard_path do
     it 'is not accessible by regular users' do
       sign_in
-      visit stash_url_helpers.ds_admin_path
+      visit stash_url_helpers.admin_dashboard_path
       # User should be redirected to the My datasets page
       expect(page).to have_text('My datasets')
     end
@@ -18,13 +18,13 @@
     it 'is accessible by tenant admins' do
       tenant = create(:tenant_ucop)
       sign_in(create(:user, role: 'admin', role_object: tenant, tenant_id: 'ucop'))
-      visit stash_url_helpers.ds_admin_path
+      visit stash_url_helpers.admin_dashboard_path
       expect(page).to have_text('Admin dashboard')
     end
 
     it 'is accessible by dryad admins' do
       sign_in(create(:user, role: 'admin'))
-      visit stash_url_helpers.ds_admin_path
+      visit stash_url_helpers.admin_dashboard_path
       expect(page).to have_text('Admin dashboard')
     end
   end
diff --git a/spec/features/stash_engine/curation_activity_spec.rb b/spec/features/stash_engine/curation_activity_spec.rb
index 62287528db..6843693f82 100644
--- a/spec/features/stash_engine/curation_activity_spec.rb
+++ b/spec/features/stash_engine/curation_activity_spec.rb
@@ -18,14 +18,14 @@
       create(:curation_activity_no_callbacks, status: 'curation', user_id: @user.id, resource_id: @resource.id)
       @resource.resource_states.first.update(resource_state: 'submitted')
       sign_in(create(:user, role: 'curator'))
-      visit("#{stash_url_helpers.ds_admin_path}?curation_status=curation")
+      visit("#{stash_url_helpers.admin_dashboard_path}?curation_status=curation")
     end
 
-    it 'renders salesforce links in notes field' do
+    it 'renders salesforce links in notes field', js: true do
       @curation_activity = create(:curation_activity, note: 'Not a valid SF link', resource: @resource)
       @curation_activity = create(:curation_activity, note: 'SF #0001 does not exist', resource: @resource)
       @curation_activity = create(:curation_activity, note: 'SF #0002 should exist', resource: @resource)
-      within(:css, '.c-lined-table__row', wait: 10) do
+      within(:css, 'tbody tr', wait: 10) do
         find('a[title="Activity log"]').click
       end
       expect(page).to have_text('Activity log for')
@@ -37,8 +37,8 @@
       expect(page).to have_link('SF 0002', href: 'https://testsalesforce.com/lightning/r/Case/abc/view')
     end
 
-    it 'renders salesforce section' do
-      within(:css, '.c-lined-table__row', wait: 10) do
+    it 'renders salesforce section', js: true do
+      within(:css, 'tbody tr', wait: 10) do
         find('a[title="Activity log"]').click
       end
       expect(page).to have_text('Activity log for')
@@ -62,10 +62,10 @@
       @resource = create(:resource, :submitted, user: @user, identifier: @identifier, tenant_id: @admin.tenant_id)
     end
 
-    context :tenant_admin do
+    context :tenant_admin, js: true do
       it 'allows adding notes to the curation activity log' do
         sign_in(@admin)
-        visit stash_url_helpers.ds_admin_path
+        visit stash_url_helpers.admin_dashboard_path
 
         expect(page).to have_css('a[title="Activity log"]')
         find('a[title="Activity log"]').click
@@ -83,8 +83,8 @@
         sign_in(@superuser, false)
       end
 
-      it 'allows adding notes to the curation activity log' do
-        visit stash_url_helpers.ds_admin_path
+      it 'allows adding notes to the curation activity log', js: true do
+        visit stash_url_helpers.admin_dashboard_path
 
         expect(page).to have_css('a[title="Activity log"]')
         find('a[title="Activity log"]').click
@@ -94,7 +94,7 @@
       end
 
       it 'adds a note to the curation activity log', js: true do
-        visit stash_url_helpers.ds_admin_path
+        visit stash_url_helpers.admin_dashboard_path
 
         expect(page).to have_css('a[title="Activity log"]')
         find('a[title="Activity log"]').click
@@ -107,7 +107,7 @@
       end
 
       it 'adds internal data', js: true do
-        visit stash_url_helpers.ds_admin_path
+        visit stash_url_helpers.admin_dashboard_path
 
         expect(page).to have_css('a[title="Activity log"]')
         find('a[title="Activity log"]').click
@@ -122,7 +122,7 @@
       end
 
       it 'allows superuser to set a fee waiver', js: true do
-        visit stash_url_helpers.ds_admin_path
+        visit stash_url_helpers.admin_dashboard_path
 
         expect(page).to have_css('a[title="Activity log"]')
         find('a[title="Activity log"]').click
@@ -143,8 +143,8 @@
         sign_in(@user, false)
       end
 
-      it 'allows adding notes to the curation activity log' do
-        visit stash_url_helpers.ds_admin_path
+      it 'allows adding notes to the curation activity log', js: true do
+        visit stash_url_helpers.admin_dashboard_path
 
         expect(page).to have_css('a[title="Activity log"]')
         find('a[title="Activity log"]').click
@@ -169,8 +169,8 @@
         ident1.reload
       end
 
-      it 'allows adding notes to the curation activity log' do
-        visit stash_url_helpers.ds_admin_path
+      it 'allows adding notes to the curation activity log', js: true do
+        visit stash_url_helpers.admin_dashboard_path
 
         expect(page).to have_css('a[title="Activity log"]')
         find('a[title="Activity log"]').click
@@ -189,8 +189,8 @@
         sign_in(@tenant_curator, false)
       end
 
-      it 'allows adding notes to the curation activity log' do
-        visit stash_url_helpers.ds_admin_path
+      it 'allows adding notes to the curation activity log', js: true do
+        visit stash_url_helpers.admin_dashboard_path
 
         expect(page).to have_css('a[title="Activity log"]')
         find('a[title="Activity log"]').click
diff --git a/spec/models/stash_engine/admin_datasets/curation_table_row_spec.rb b/spec/models/stash_engine/admin_datasets/curation_table_row_spec.rb
deleted file mode 100644
index 7efb45c03d..0000000000
--- a/spec/models/stash_engine/admin_datasets/curation_table_row_spec.rb
+++ /dev/null
@@ -1,59 +0,0 @@
-# it seems like Brian never made any tests for this class, so putting it in main app tests because
-# we have to make extensive data to test and it crosses both engines
-require 'rails_helper'
-
-module StashEngine
-  module AdminDatasets
-    RSpec.describe CurationTableRow, type: :model do
-
-      describe 'admin_generous_results' do
-
-        before(:each) do
-          # need resource, user, identifier
-          @identifiers = []
-          3.times do
-            user = create(:user, tenant_id: 'ucop')
-            identifier = create(:identifier)
-            resource = create(:resource, user_id: user.id, tenant_id: user.tenant_id, identifier_id: identifier.id)
-            create(:version, resource_id: resource.id)
-            @identifiers.push(identifier)
-          end
-          @identifiers[0].resources.first.update(tenant_id: 'ucop')
-          @identifiers[1].resources.first.update(tenant_id: 'localhost')
-          @identifiers[2].resources.first.update(tenant_id: 'localhost')
-          @tenant = StashEngine::Tenant.find('ucop')
-        end
-
-        it "returns records only matching tenant_id when author RORs aren't set" do
-          @datasets = StashEngine::AdminDatasets::CurationTableRow.where(params: {}, tenant: @tenant)
-          # this should only return the first dataset which belongs to the ucop tenant
-          expect(@datasets.length).to eql(1)
-        end
-
-        it 'returns both matching tenant results AND authors with RORs for a partner' do
-          # make this random author claim to be part of this institution though not submitted under it
-          @identifiers.second.resources.first.authors.first.affiliations.first.update(ror_id: @tenant.ror_ids.first)
-
-          @datasets = StashEngine::AdminDatasets::CurationTableRow.where(params: {}, tenant: @tenant)
-          # this should include both tenant_ids and rors for this admin
-          expect(@datasets.length).to eql(2)
-        end
-
-        it "doesn't duplicate results when multiple authors are from same ROR affiliation" do
-          @identifiers.second.resources.first.authors << create(:author)
-          @identifiers.second.resources.first.authors.first.affiliations.first.update(ror_id: @tenant.ror_ids.first)
-          @identifiers.second.resources.first.authors.second.affiliations.first.update(ror_id: @tenant.ror_ids.first)
-
-          @datasets = StashEngine::AdminDatasets::CurationTableRow.where(params: {}, tenant: @tenant)
-          expect(@datasets.length).to eql(2)
-        end
-
-        it 'returns only one record when id requested specifically' do
-          dataset = StashEngine::AdminDatasets::CurationTableRow.where(params: {}, tenant: nil,
-                                                                       identifier_id: @identifiers[1].id).first
-          expect(dataset.identifier_id).to eq(@identifiers[1].id)
-        end
-      end
-    end
-  end
-end

From 0def39a86f4694d5573812de07c36ddafd2d14e9 Mon Sep 17 00:00:00 2001
From: Audrey Hamelers <audrey@datadryad.org>
Date: Tue, 13 Aug 2024 14:38:27 +0200
Subject: [PATCH 4/5] remove old admin dashboard

---
 .../stash_engine/admin_datasets_controller.rb | 187 +-----------
 .../admin_datasets/curation_table_row.rb      | 267 ------------------
 .../curation_table_row_policy.rb              |  31 --
 .../admin_datasets/_admin_head.html.erb       |  21 --
 .../_curation_activity.html.erb               |  29 --
 .../admin_datasets/_current_editor.html.erb   |  20 --
 .../admin_datasets/_datasets_row.html.erb     |  95 -------
 .../admin_datasets/_datasets_table.html.erb   |  44 ---
 .../admin_datasets/_filter.html.erb           |  73 -----
 .../admin_datasets/_search.html.erb           |  29 --
 .../_stats_popup_display.html.erb             |   7 -
 .../curation_activity_error.js.erb            |   2 -
 .../stash_engine/admin_datasets/edit.js.erb   |   4 -
 .../stash_engine/admin_datasets/index.csv.erb |  21 --
 .../admin_datasets/index.html.erb             |  44 ---
 .../stash_engine/admin_datasets/popup.js.erb  |  14 -
 16 files changed, 2 insertions(+), 886 deletions(-)
 delete mode 100644 app/models/stash_engine/admin_datasets/curation_table_row.rb
 delete mode 100644 app/policies/stash_engine/admin_datasets/curation_table_row_policy.rb
 delete mode 100644 app/views/stash_engine/admin_datasets/_admin_head.html.erb
 delete mode 100644 app/views/stash_engine/admin_datasets/_curation_activity.html.erb
 delete mode 100644 app/views/stash_engine/admin_datasets/_current_editor.html.erb
 delete mode 100644 app/views/stash_engine/admin_datasets/_datasets_row.html.erb
 delete mode 100644 app/views/stash_engine/admin_datasets/_datasets_table.html.erb
 delete mode 100644 app/views/stash_engine/admin_datasets/_filter.html.erb
 delete mode 100644 app/views/stash_engine/admin_datasets/_search.html.erb
 delete mode 100644 app/views/stash_engine/admin_datasets/_stats_popup_display.html.erb
 delete mode 100644 app/views/stash_engine/admin_datasets/curation_activity_error.js.erb
 delete mode 100644 app/views/stash_engine/admin_datasets/index.csv.erb
 delete mode 100644 app/views/stash_engine/admin_datasets/index.html.erb

diff --git a/app/controllers/stash_engine/admin_datasets_controller.rb b/app/controllers/stash_engine/admin_datasets_controller.rb
index 787c67eb85..793b808cac 100644
--- a/app/controllers/stash_engine/admin_datasets_controller.rb
+++ b/app/controllers/stash_engine/admin_datasets_controller.rb
@@ -1,56 +1,13 @@
 require 'stash/salesforce'
 
-# rubocop:disable Metrics/ClassLength
 module StashEngine
   class AdminDatasetsController < ApplicationController
     helper SortableTableHelper
     before_action :require_user_login
-    before_action :setup_paging, only: :index
     before_action :load, only: %i[popup note_popup edit]
 
-    TENANT_IDS = Tenant.enabled.map(&:id)
-
-    # the admin datasets main page showing users and stats, but slightly different in scope for curators vs tenant admins
-    # rubocop:disable Metrics/AbcSize
-    def index
-      # Limits due to the current search/filter settings are handled within CurationTableRow
-      authorize %i[stash_engine admin_datasets]
-      my_tenant_id = current_user.tenant_limited? ? current_user.tenants&.first&.id : nil
-      @all_stats = Stats.new
-      @seven_day_stats = Stats.new(tenant_id: my_tenant_id, since: (Time.new.utc - 7.days))
-
-      if request.format.to_s == 'text/csv' # we want all the results to put in csv
-        page = 1
-        page_size = 1_000_000
-      else
-        page = @page.to_i
-        page_size = @page_size.to_i
-      end
-
-      search_terms = { params: helpers.sortable_table_params, page: page.to_i, page_size: page_size.to_i }
-
-      @datasets = AdminDatasetsPolicy::Scope.new(current_user, StashEngine::AdminDatasets::CurationTableRow, search_terms).resolve
-      @publications = StashEngine::Journal.order(:title).map(&:title)
-      @pub_name = params[:publication_name] || nil
-
-      # paginate for display
-      blank_results = (page.to_i - 1) * page_size.to_i
-      @datasets = Array.new(blank_results, nil) + @datasets # pad out an array with empty results for earlier pages for kaminari
-      @datasets = Kaminari.paginate_array(@datasets, total_count: @datasets.length).page(page).per(page_size)
-
-      respond_to do |format|
-        format.html
-        format.csv do
-          headers['Content-Disposition'] = "attachment; filename=#{Time.new.strftime('%F')}_report.csv"
-        end
-      end
-    end
-    # rubocop:enable Metrics/AbcSize
-
     def popup
       case @field
-      when 'stats'
-        authorize %i[stash_engine admin_datasets], :stats_popup?
       when 'note'
         authorize %i[stash_engine admin_datasets], :note_popup?
         @curation_activity = CurationActivity.new(
@@ -66,28 +23,14 @@ def popup
       when 'waiver'
         authorize %i[stash_engine admin_datasets], :waiver_add?
         @desc = 'Add fee waiver'
-      when 'curation_activity', 'current_editor'
-        authorize %i[stash_engine admin_datasets], :curation_actions?
-        @desc = @field == 'curation_activity' ? 'Edit dataset status' : 'Change dataset curator'
-        @curation_activity = StashEngine::CurationActivity.new(resource_id: @resource.id)
       end
 
       respond_to(&:js)
     end
 
     def edit
-      case @field
-      when 'waiver'
-        authorize %i[stash_engine admin_datasets], :waiver_add?
-        waiver_add
-      when 'curation_activity'
-        authorize %i[stash_engine admin_datasets], :curation_actions?
-        curation_activity_change
-        @curation_row = StashEngine::AdminDatasets::CurationTableRow.where(params: {}, tenant: nil, identifier_id: @resource.identifier.id).first
-      when 'current_editor'
-        authorize %i[stash_engine admin_datasets], :curation_actions?
-        current_editor_change
-      end
+      authorize %i[stash_engine admin_datasets], :waiver_add?
+      waiver_add
       respond_to(&:js)
     end
 
@@ -117,20 +60,6 @@ def create_salesforce_case
 
     private
 
-    def setup_paging
-      if request.format.csv?
-        @page = 1
-        @page_size = 2_000
-        return
-      end
-      @page = params[:page] || '1'
-      @page_size = if params[:page_size].blank? || params[:page_size].to_i == 0
-                     10
-                   else
-                     params[:page_size].to_i
-                   end
-    end
-
     def load
       @identifier = Identifier.find(params[:id])
       @resource = if @identifier.last_submitted_resource&.id.present?
@@ -180,118 +109,6 @@ def waiver_add
       @identifier.update(payment_type: 'waiver', payment_id: '', waiver_basis: basis)
     end
 
-    def curation_activity_change
-      @last_resource = @identifier.latest_resource # the last resource of all, even not submitted
-      return publishing_error if @resource.id != @last_resource.id && %w[embargoed published].include?(params.dig(:curation_activity, :status))
-
-      @last_state = @resource&.curation_activities&.last&.status
-      @this_state = params.dig(:curation_activity, :status) || @last_state
-
-      return state_error unless CurationActivity.allowed_states(@last_state).include?(@this_state)
-
-      @note = params.dig(:curation_activity, :note)
-      @resource.current_editor_id = current_user.id
-      decipher_curation_activity
-      @resource.publication_date = @pub_date
-      @resource.hold_for_peer_review = true if @status == 'peer_review'
-      @resource.peer_review_end_date = (Time.now.utc + 6.months) if @status == 'peer_review'
-      @resource.save
-      @resource.reload
-      @resource.curation_activities << CurationActivity.create(user_id: current_user.id, status: @status, note: @note)
-    end
-
-    def decipher_curation_activity
-      @status = params.dig(:curation_activity, :status)
-      @pub_date = params[:publication_date]
-      # If the status was nil then we are just adding a note so get the prior status
-      @status = @resource.current_curation_status unless @status.present?
-      case @status
-      when 'published'
-        publish
-      when 'embargoed'
-        embargo
-      else
-        # The user selected a different status so clear the publication date
-        @pub_date = nil
-      end
-    end
-
-    def publish
-      if @pub_date.present? && @pub_date > Time.now.utc.to_date.to_s
-        # If the user selected published but the publication date is in the future
-        # revert to embargoed status. The item will publish when the date is reached
-        @status = 'embargoed'
-      end
-
-      return if @pub_date.present?
-
-      # If the user published but did not provide a publication date then default to today
-      @pub_date = Time.now.utc.to_date.to_s
-
-      return unless @resource.identifier.allow_blackout?
-
-      # BUT, if the associated journal allows Blackout, default to a year from today
-      @note = ' Adding 1-year blackout period due to journal settings.'
-      @status = 'embargoed'
-      @pub_date = (Time.now.utc.to_date + 1.year).to_s
-    end
-
-    def embargo
-      # If the user also provided a publication date and the date is today then
-      # revert to published status
-      @status = 'published' if @pub_date.present? && @pub_date <= Time.now.utc.to_date.to_s
-    end
-
-    def publishing_error
-      @error_message = <<-HTML.chomp.html_safe
-        <p>You're attempting to embargo or publish a dataset that is being edited or hasn't successfully finished submission.</p>
-        <p>The latest version submission status is <strong>#{@last_resource.current_resource_state.resource_state}</strong> for
-        resource id #{@last_resource.id}.</p>
-        <p>You may need to wait a minute for submission to complete if this was recently edited or submitted again.</p>
-      HTML
-      render :curation_activity_error
-    end
-
-    def state_error
-      @error_message = <<-HTML.chomp.html_safe
-        <p>You're attempting to set the curation state to <strong>#{@this_state}</strong>,
-          which isn't an allowed state change from <strong>#{@last_state}</strong>.</p>
-        <p>This error may indicate that you are operating on stale data--such as by holding the <strong>status</strong> dialog
-        open in a separate window while making changes elsewhere (or another user has made recent changes).</p>
-        <p>The most likely ways to fix this error:</p>
-        <ul>
-          <li>Close this dialog and re-open the dialog to set the curation status again.</li>
-          <li>Or refresh the <strong>Dataset curation</strong> list by reloading the page.</li>
-          <li>In some circumstances, submissions or re-submissions of metadata and files must be completed before states can update correctly,
-           so waiting a minute or two may fix the problem.</li>
-        </ul>
-         <hr/>
-        <p>Reference information -- resource id <strong>#{@resource.id}</strong> and doi <strong>#{@resource.identifier.identifier}</strong></p>
-      HTML
-      render :curation_activity_error
-    end
-
-    def current_editor_change
-      @resource = @identifier.latest_resource
-      decipher_curation_activity
-      editor_id = params.dig(:current_editor, :id)
-      if editor_id&.to_i == 0
-        @resource.update(current_editor_id: nil)
-        editor_name = 'unassigned'
-        @status = 'submitted' if @resource.current_curation_status == 'curation'
-      else
-        @resource.update(current_editor_id: editor_id)
-        editor_name = StashEngine::User.find(editor_id)&.name
-      end
-      @note = "Changing current editor to #{editor_name}. " + params.dig(:curation_activity, :note)
-      @resource.curation_activities << CurationActivity.create(user_id: current_user.id, status: @status, note: @note)
-      @resource.update_salesforce_metadata
-      @resource.reload
-      # Refresh the page the same way we would for a change of curation activity
-      @curation_row = StashEngine::AdminDatasets::CurationTableRow.where(params: {}, tenant: nil, identifier_id: @resource.identifier.id).first
-    end
-
   end
 
 end
-# rubocop:enable Metrics/ClassLength
diff --git a/app/models/stash_engine/admin_datasets/curation_table_row.rb b/app/models/stash_engine/admin_datasets/curation_table_row.rb
deleted file mode 100644
index 4321bbea48..0000000000
--- a/app/models/stash_engine/admin_datasets/curation_table_row.rb
+++ /dev/null
@@ -1,267 +0,0 @@
-# frozen_string_literal: true
-
-# This is NOT an ActiveRecord model and does not persist data!!
-# This class represents a row in the Admin's Curation page. It only retrieves the information
-# necessary to populate the table on that page.
-#
-# Use like
-# @datasets = StashEngine::AdminDatasets::CurationTableRow.where(params: helpers.sortable_table_params, tenant: tenant_limit) # (gets all results)
-#
-# If you want to get just one identifier for redrawing a single row, something like this should work
-# @dataset = StashEngine::AdminDatasets::CurationTableRow.where(params: {}, tenant: nil, identifier_id: 37575).first
-module StashEngine
-  module AdminDatasets
-    class CurationTableRow
-
-      attr_reader :publication_name, :identifier_id, :identifier, :qualified_identifier, :resource_size,
-                  :search_words, :resource_id, :title, :created_date, :publication_date, :tenant_id, :resource_state_id,
-                  :resource_state, :curation_activity_id, :status, :updated_at, :submission_date, :editor_id, :editor_name,
-                  :author_names, :views, :downloads, :citations, :relevance
-
-      SELECT_CLAUSE = <<-SQL
-        SELECT DISTINCT seid.value,
-          sei.id, sei.identifier, CONCAT(LOWER(sei.identifier_type), ':', sei.identifier), ser.total_file_size, sei.search_words,
-          ser.id, ser.title, sei.created_at, ser.publication_date, ser.tenant_id,
-          sers.id, sers.resource_state,
-          seca.id, seca.status, seca.updated_at, sd.submission_date,
-          seu.id, seu.last_name, seu.first_name,
-          (SELECT GROUP_CONCAT(DISTINCT sea.author_last_name ORDER BY sea.author_last_name SEPARATOR '; ')
-           FROM stash_engine_authors sea
-           WHERE sea.resource_id = ser.id),
-          secs.unique_investigation_count, secs.unique_request_count, secs.citation_count
-      SQL
-
-      FROM_CLAUSE = <<-SQL
-          FROM stash_engine_identifiers sei
-          INNER JOIN stash_engine_resources ser ON sei.latest_resource_id = ser.id
-          LEFT OUTER JOIN stash_engine_internal_data seid ON sei.id = seid.identifier_id AND seid.data_type = 'publicationName'
-          LEFT OUTER JOIN stash_engine_users seu ON ser.current_editor_id = seu.id
-          LEFT OUTER JOIN (SELECT rs2.resource_id, MAX(rs2.id) latest_resource_state_id FROM stash_engine_resource_states rs2 GROUP BY rs2.resource_id) j2 ON j2.resource_id = ser.id
-          LEFT OUTER JOIN stash_engine_resource_states sers ON sers.id = j2.latest_resource_state_id
-          LEFT OUTER JOIN stash_engine_curation_activities seca ON seca.id = ser.last_curation_activity_id
-          LEFT OUTER JOIN stash_engine_counter_stats secs ON sei.id = secs.identifier_id
-          LEFT OUTER JOIN dcs_contributors dcs_c ON ser.id = dcs_c.resource_id
-          LEFT OUTER JOIN (SELECT DISTINCT sei.id, min(subcur.created_at) submission_date
-            FROM stash_engine_identifiers sei
-            RIGHT OUTER JOIN stash_engine_resources subser on sei.id = subser.identifier_id
-            RIGHT OUTER JOIN stash_engine_curation_activities subcur on subser.id = subcur.resource_id
-            WHERE subcur.status in ('submitted', 'peer-review')
-            group by sei.id
-          ) sd on sd.id = sei.id
-      SQL
-
-      # add extra joins when I need to reach into author affiliations for every dataset
-      FROM_CLAUSE_ADMIN = <<-SQL.freeze
-        #{FROM_CLAUSE}
-        LEFT OUTER JOIN stash_engine_authors sea2 ON ser.id = sea2.resource_id
-        LEFT OUTER JOIN dcs_affiliations_authors dcs_aa ON sea2.id = dcs_aa.author_id
-        LEFT OUTER JOIN dcs_affiliations dcs_a ON dcs_aa.affiliation_id = dcs_a.id
-      SQL
-
-      SEARCH_CLAUSE = 'MATCH(sei.search_words) AGAINST(%{term})'
-      BOOLEAN_SEARCH_CLAUSE = 'MATCH(sei.search_words) AGAINST(%{term} IN BOOLEAN MODE)'
-      SCAN_CLAUSE = 'sei.search_words LIKE %{term}'
-      TENANT_CLAUSE = 'ser.tenant_id = %{term}'
-      STATE_CLAUSE = '(sers.resource_state = %{term} or seca.status = %{term})'
-      STATUS_CLAUSE = "(sers.resource_state not in ('error', 'processing') and seca.status = %{term})"
-      PUBLICATION_CLAUSE = 'seid.value = %{term}'
-      IDENTIFIER_CLAUSE = 'sei.id = %{term}'
-
-      # this method is long, but quite uncomplicated as it mostly just sets variables from the query
-      # rubocop:disable Metrics/AbcSize
-      def initialize(result, curator_ids)
-        return unless result.is_a?(Array) && result.length >= 23
-
-        # Convert the array of results into attribute values
-        @publication_name = result[0]
-        @identifier_id = result[1]
-        @identifier = result[2]
-        @qualified_identifier = result[3]
-        @resource_size = result[4]
-        @search_words = result[5]
-        @resource_id = result[6]
-        @title = result[7]
-        @created_date = result[8]
-        @publication_date = result[9]
-        @tenant_id = result[10]
-        @resource_state_id = result[11]
-        @resource_state = result[12]
-        @curation_activity_id = result[13]
-        @status = %w[error processing].include?(result[12]) ? result[12] : result[14]
-        @updated_at = result[15]
-        @submission_date = result[16]
-        @editor_id = curator_ids.include?(result[17].to_i) ? result[17] : nil
-        @editor_name = @editor_id ? "#{result[19]} #{result[18]}" : nil
-        @author_names = result[20]
-        @views = (result[22].nil? ? 0 : result[21] - result[22])
-        @downloads = result[22] || 0
-        @citations = result[23] || 0
-        @relevance = result.length > 24 ? result[24] : nil
-      end
-      # rubocop:enable Metrics/AbcSize
-
-      # lets you get a resource when you need it and caches it
-      def resource
-        @resource ||= StashEngine::Resource.find_by(id: @resource_id)
-      end
-
-      class << self
-
-        # params are params from the form.
-        # The tenant, if set, does two things in conjunction.  it limits to items with a tenant_id of the tenant OR
-        # affiliated author institution RORs (may be multiple) for this tenant with additional joins and conditions.
-        # tenant is only set for tenant admins (not superusers or curators).
-        # The journals, if set, limits to items associated with one of the given journals.
-        # The funders, if set, limits to items associated with one of the given funders.
-        #
-        # if resource_id is set then only returns that resource id
-        # rubocop:disable Metrics/ParameterLists
-        def where(params:, tenant: nil, journals: nil, funders: nil, identifier_id: nil, page: 1, page_size: 10)
-          # If a search term was provided include the relevance score in the results for sorting purposes
-          relevance = params.fetch(:q, '').blank? ? '' : ", (#{add_term_to_clause(SEARCH_CLAUSE, params.fetch(:q, ''))}) relevance"
-          # editor_name is derived from 2 DB fields so use the last_name instead
-          column = (params.fetch(:sort, '') == 'editor_name' ? 'last_name' : params.fetch(:sort, ''))
-
-          query = " \
-            #{SELECT_CLAUSE}
-            #{relevance}
-            #{tenant ? FROM_CLAUSE_ADMIN : FROM_CLAUSE}
-            #{build_where_clause(search_term: params.fetch(:q, ''),
-                                 all_advanced: params.fetch(:all_advanced, false),
-                                 tenant_filter: params.fetch(:tenant, ''),
-                                 status_filter: params.fetch(:curation_status, ''),
-                                 editor_filter: params.fetch(:editor_id, ''),
-                                 publication_filter: params.fetch(:publication_name, ''),
-                                 sponsor_filter: params.fetch(:sponsor_org, ''),
-                                 admin_tenant: tenant,
-                                 admin_journals: journals,
-                                 admin_funders: funders,
-                                 identifier_id: identifier_id)}
-            #{build_order_clause(column, params.fetch(:direction, ''), params.fetch(:q, ''))}
-            #{build_limit_clause(page: page, page_size: page_size)}
-          "
-          curator_ids = StashEngine::User.min_curators.map(&:id)
-          results = ApplicationRecord.connection.execute(query).map { |result| new(result, curator_ids) }
-          # If the user is trying to sort by author names, then
-          (column == 'author_names' ? sort_by_author_names(results, params.fetch(:direction, '')) : results)
-        end
-        # rubocop:enable Metrics/ParameterLists
-
-        private
-
-        # Create the WHERE portion of the query based on the filters set by the user (if any)
-        # rubocop:disable Metrics/ParameterLists
-        def build_where_clause(search_term:, all_advanced:, tenant_filter:, status_filter:, editor_filter:,
-                               publication_filter:, sponsor_filter:, admin_tenant:, admin_journals:, admin_funders:,
-                               identifier_id: nil)
-          where_clause = [
-            (search_term.present? ? build_search_clause(search_term, all_advanced) : nil),
-            add_term_to_clause(TENANT_CLAUSE, tenant_filter),
-            add_term_to_clause(%w[error processing].include?(status_filter) ? STATE_CLAUSE : STATUS_CLAUSE, status_filter),
-            add_term_to_clause(PUBLICATION_CLAUSE, publication_filter),
-            add_term_to_clause(IDENTIFIER_CLAUSE, identifier_id),
-            create_editor_limit(editor_filter),
-            create_tenant_limit(admin_tenant),
-            create_journals_limit(admin_journals),
-            create_sponsor_limit(sponsor_filter),
-            create_funders_limit(admin_funders)
-          ].compact
-          where_clause.empty? ? '' : " WHERE #{where_clause.join(' AND ')}"
-        end
-        # rubocop:enable Metrics/ParameterLists
-
-        # Build the WHERE portion of the query for the specified search term (if any)
-        def build_search_clause(term, all_advanced)
-          return '' unless term.present?
-
-          if all_advanced == '1'
-            "(#{add_term_to_clause(BOOLEAN_SEARCH_CLAUSE, advanced_search(term))})"
-          else
-            "(#{add_term_to_clause(SEARCH_CLAUSE, term)})"
-          end
-        end
-
-        # If someone is choosing 'all words' then default to boolean search and determine if they're using common
-        # modifiers, and if so just pass it through because they are likely a special person who knows what they're doing,
-        # otherwise add plusses to all their words to make them required internally
-        def advanced_search(terms)
-          if /[~+<>*]/.match?(terms)
-            terms
-          else
-            terms&.split&.map { |i| "+\"#{i}\"" }&.join(' ')
-          end
-        end
-
-        # Create the ORDER BY portion of the query. If the user included a search term order by relevance first!
-        # We cannot sort by author_names here, so ignore if that is the :sort_column
-        def build_order_clause(column, direction, q)
-          return 'ORDER BY title' if column == 'relevance' && q.blank?
-
-          if column == 'relevance'
-            'ORDER BY relevance DESC'
-          else
-            (column.present? && column != 'author_names' ? "ORDER BY #{column} #{direction || 'ASC'}" : '')
-          end
-        end
-
-        def build_limit_clause(page:, page_size:)
-          # rows start at 0 and limit is offset, row_count.  I multiply page size so we know if there are a few pages afterward
-          # LIMIT [offset,] row_count;
-          " LIMIT #{(page - 1) * page_size}, #{page_size * 4}"
-        end
-
-        def sort_by_author_names(results, direction)
-          multiply_by = (direction.casecmp('desc').zero? ? -1 : 1)
-          results.sort { |a, b| multiply_by * ((a&.author_names&.downcase || '') <=> (b&.author_names&.downcase || '')) }
-        end
-
-        # Swap a term into the SQL snippet/clause
-        def add_term_to_clause(clause, term)
-          return nil unless clause.present? && term.present?
-
-          format(clause.to_s, term: ActiveRecord::Base.connection.quote(term))
-        end
-
-        def create_editor_limit(editor_filter)
-          if editor_filter == 'NA'
-            admin_users = StashEngine::User.min_curators.map(&:id)
-            ActiveRecord::Base.send(:sanitize_sql_array, ['(ser.current_editor_id is NULL or ser.current_editor_id not in (?))', admin_users])
-          else
-            add_term_to_clause('ser.current_editor_id = %{term}', editor_filter)
-          end
-        end
-
-        def create_tenant_limit(admin_tenant)
-          return nil if admin_tenant.blank?
-
-          tenant_ids = StashEngine::TenantRorOrg.where(ror_id: admin_tenant.ror_ids).map(&:tenant_id)
-
-          ActiveRecord::Base.send(:sanitize_sql_array, ['( ser.tenant_id IN (?) OR dcs_a.ror_id IN (?) )',
-                                                        tenant_ids, admin_tenant.ror_ids])
-        end
-
-        def create_journals_limit(admin_journals)
-          return nil if admin_journals.blank?
-
-          ActiveRecord::Base.send(:sanitize_sql_array, ['( seid.value IN (?) )', admin_journals])
-        end
-
-        def create_sponsor_limit(sponsor_filter)
-          return nil if sponsor_filter.blank?
-
-          sponsor_org = StashEngine::JournalOrganization.find(sponsor_filter)
-          admin_journals = sponsor_org.journals_sponsored.map(&:title)
-          ActiveRecord::Base.send(:sanitize_sql_array, ['( seid.value IN (?) )', admin_journals])
-        end
-
-        def create_funders_limit(admin_funders)
-          return nil if admin_funders.blank?
-
-          ActiveRecord::Base.send(:sanitize_sql_array, ['( dcs_c.name_identifier_id IN (?) )', admin_funders])
-        end
-
-      end
-
-    end
-  end
-end
diff --git a/app/policies/stash_engine/admin_datasets/curation_table_row_policy.rb b/app/policies/stash_engine/admin_datasets/curation_table_row_policy.rb
deleted file mode 100644
index 3aff215763..0000000000
--- a/app/policies/stash_engine/admin_datasets/curation_table_row_policy.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-module StashEngine
-  module AdminDatasets
-    class CurationTableRowPolicy < StashEngine::AdminDatasetsPolicy
-      attr_reader :user, :dataset
-
-      def initialize(user, dataset)
-        super
-        @user = user
-        @dataset = dataset
-      end
-
-      def curation_activity_change?
-        super &&
-        @dataset.resource&.permission_to_edit?(user: @user) &&
-        @dataset.resource_state == 'submitted'
-      end
-
-      def current_editor_change?
-        super &&
-        @dataset.resource&.permission_to_edit?(user: @user) &&
-        @dataset.resource&.curatable?
-      end
-
-      def edit?
-        (@dataset.resource&.permission_to_edit?(user: @user) && @dataset.resource_state == 'submitted') ||
-        (@dataset.resource_state == 'in_progress' && @dataset.resource.current_editor_id == @user.id)
-      end
-
-    end
-  end
-end
diff --git a/app/views/stash_engine/admin_datasets/_admin_head.html.erb b/app/views/stash_engine/admin_datasets/_admin_head.html.erb
deleted file mode 100644
index 902e9974e2..0000000000
--- a/app/views/stash_engine/admin_datasets/_admin_head.html.erb
+++ /dev/null
@@ -1,21 +0,0 @@
-<%# takes a local of all_stats and seven_day_stats %>
-<div class="o-admin-container">
-  <div class="o-admin-head-left">
-    <h2 class="o-heading__level3">At a glance</h2>
-    <ul>
-      <li><%= number_with_delimiter(all_stats.user_count) %> Users
-      <li><%= number_with_delimiter(all_stats.dataset_count) %> Datasets
-    </ul>
-  </div>
-  <div class="o-admin-head-right">
-    <h2 class="o-heading__level3">Activity in the last 7 days</h2>
-    <ul>
-      <li><%= number_with_delimiter(seven_day_stats.user_count) %> users added
-      <li><%= number_with_delimiter(seven_day_stats.datasets_started_count) %> datasets started
-      <li><%= number_with_delimiter(seven_day_stats.datasets_submitted_count) %> datasets submitted
-    </ul>
-  </div>
-  <div style="align-self: flex-end; margin-left: auto;">
-    <p style="font-size: .9em"><a href="/stash/feedback?m=4&l=admin" class="o-link__buttonlink"><i class="fa fa-commenting-o" aria-hidden="true" style="margin-right: .5ch"></i>Give feedback on Dryad</a></p>
-  </div>
-</div>
\ No newline at end of file
diff --git a/app/views/stash_engine/admin_datasets/_curation_activity.html.erb b/app/views/stash_engine/admin_datasets/_curation_activity.html.erb
deleted file mode 100644
index bc4d060b5d..0000000000
--- a/app/views/stash_engine/admin_datasets/_curation_activity.html.erb
+++ /dev/null
@@ -1,29 +0,0 @@
-<p>Edit curation status of <em><%= @resource.title %></em></p>
-
-<%= hidden_field_tag :identifier_id, @resource.identifier_id %>
-
-<%# Users cannot change the status or publication date once the files are published %>
- <% if @resource.curatable? && filter_status_select(@resource.current_curation_status) %>
-  <%= form.fields_for :curation_activity, @curation_activity do |ca| %>
-      <div class="c-input">
-        <%= ca.label :status, 'Status', class: 'c-input__label' %>
-        <%= ca.select :status, options_for_select(filter_status_select(@resource.current_curation_status)), {include_blank: true}, {id: 'activity_status_select', class: 'c-input__select'} %>
-      </div>
-  <% end %>
-<% else %>
-  <p>Due to the state of the files, the submission status cannot be changed.<br/> Notes may be added.</p>
-<% end %>
-
-<%# User can change the publication date If the resource is published or embargoed %>
-<div class="c-input" id="c-input_publication_date" hidden>
-  <%= form.label :publication_date, 'Publication date', class: 'c-input__label' %>
-  <%= form.date_field :publication_date, class: 'c-input__text' %>
-</div>
-
-<%# User can always add a note %>
-<%= form.fields_for :curation_activity, @curation_activity do |ca| %>
-  <div class="c-input">
-    <%= ca.label :note, 'Notes', class: 'c-input__label' %>
-    <%= ca.text_area :note, class: 'c-input__textarea', id: 'activity_note', style: 'width: 100%;' %>
-  </div>
-<% end %>
diff --git a/app/views/stash_engine/admin_datasets/_current_editor.html.erb b/app/views/stash_engine/admin_datasets/_current_editor.html.erb
deleted file mode 100644
index 6a92bfacfb..0000000000
--- a/app/views/stash_engine/admin_datasets/_current_editor.html.erb
+++ /dev/null
@@ -1,20 +0,0 @@
-<p>Change curator for <em><%= @resource.title %></em></p>
-
-<%= hidden_field_tag :identifier_id, @resource.identifier_id %>
-<%# Users cannot change the editor once the files are published %>
-<%# if @resource.curatable? %>
-  <%= form.fields_for :current_editor, @resource do |r| %>
-    <div class="c-input">
-      <%= r.label :id, 'Curator', class: 'c-input__label' %>
-      <%= r.select :id, options_for_select([['(unassign)', '0']] + editor_select, @resource.current_editor_id), {include_blank: true}, {class: 'c-input__select', id: 'current_editor'} %>
-    </div>
-  <% end %>
-<%# end %>
-
-<%# User can always add a note %>
-<%= form.fields_for :curation_activity, @curation_activity do |ca| %>
-  <div class="c-input">
-    <label class="c-input__label">Notes</label>
-    <%= ca.text_area :note, class: 'c-input__textarea', style: 'width: 100%' %>
-  </div>
-<% end %>
\ No newline at end of file
diff --git a/app/views/stash_engine/admin_datasets/_datasets_row.html.erb b/app/views/stash_engine/admin_datasets/_datasets_row.html.erb
deleted file mode 100644
index e68204cc28..0000000000
--- a/app/views/stash_engine/admin_datasets/_datasets_row.html.erb
+++ /dev/null
@@ -1,95 +0,0 @@
-<%# takes dataset as local variable, dataset is a custom object of type StashEngine::AdminDatasets::CurationTableRow %>
-<tr class="c-lined-table__row" id="js-dataset-row-id-<%= dataset.identifier_id %>">
-  <!-- Title -->
-  <td>
-    <div class="c-lined-table__with-actions">
-      <div class="c-lined-table__data">
-        <% if dataset&.qualified_identifier %>
-          <%= link_to dataset.title, stash_url_helpers.show_path(id: dataset.qualified_identifier), target: '_blank' %>
-        <% else %>
-          <%= dataset.title %>
-        <% end %>
-        <!-- Identifier -->
-        <div class="c-lined-table__digits">DOI: <%= dataset.identifier %></div>
-      </div>
-      <div class="c-lined-table__actions">
-        <%# only with permission and not being messed with or in_progress or they're the ones futzing with it and making it in progress, lockout other concurrent editing %>
-      <% if policy([:stash_engine, :admin_datasets]).curation_actions? && policy(dataset).edit? %>
-        <%= form_with(url: stash_url_helpers.metadata_entry_pages_new_version_path, method: :post) do %>
-          <%= hidden_field_tag :resource_id, dataset.resource_id, id: "resource_id_#{dataset.resource_id}" %>
-          <%= hidden_field_tag :return_url, '/stash/dashboard' %>
-          <button class="c-admin-edit-icon js-trap-curator-url prevent-click" title="Edit dataset" aria-label="Edit dataset"><i class="fa fa-pencil" aria-hidden="true"></i></button>
-        <% end %>
-      <% end %>
-      <%= form_with(url: ds_admin_popup_path(id: dataset.identifier_id, field: 'stats'), method: :get, local: false) do %>
-        <button class="c-admin-edit-icon js-stats" title="See dataset statistics" aria-label="See dataset statistics" aria-haspopup="dialog" id="stats_button_<%= dataset.identifier_id %>"><i class="fa fa-bar-chart" aria-hidden="true"></i></button>
-      <% end %>
-      </div>
-    </div>
-  </td>
-  <!-- Status -->
-  <td>
-    <div class="c-lined-table__with-actions">
-      <div class="c-lined-table__data" id="js-curation-state-<%= dataset.identifier_id %>">
-        <%= StashEngine::CurationActivity.readable_status(dataset.status) %>
-      </div>
-      <% if policy([:stash_engine, :admin_datasets]).curation_actions? %>
-        <div class="c-lined-table__actions">
-        <%= form_with(url: ds_admin_popup_path(id: dataset.identifier_id, field: 'curation_activity'), method: :get, local: false) do %>
-          <button class="c-admin-edit-icon" title="Update status" aria-label="Update status" aria-haspopup="dialog" id="curation_activity_button_<%= dataset.identifier_id %>">
-            <i class="fa fa-pencil" aria-hidden="true"></i>
-          </button>
-        <% end %>
-        </div>
-      <% end %>
-    </div>
-  </td>
-  <!-- Authors -->
-  <td>
-    <% if (dataset&.author_names&.length || 0) > 50 %>
-      <%= "#{dataset.author_names[0..49]} ..." %>
-    <% else %>
-      <%= dataset.author_names %>
-    <% end %>
-  </td>
-  <!-- Last Modified -->
-  <td>
-    <div class="c-lined-table__with-actions">
-      <div class="c-lined-table__data c-lined-table__digits" id="js-curation-activity-date-<%= dataset.identifier_id %>">
-        <span class="local-date" title="<%= formatted_datetime(dataset.updated_at) %>" data-dt="<%= dataset.updated_at.iso8601 unless dataset.updated_at.blank? %>"><%= formatted_datetime(dataset.updated_at) %></span>
-      </div>
-      <% if policy([:stash_engine, :admin_datasets]).activity_log? %>
-        <div class="c-lined-table__actions">
-          <a title="Activity log" aria-label="Activity log" href="<%= stash_url_helpers.activity_log_path(id: dataset.identifier_id) %>" class="c-admin-edit-icon">
-            <i class="fa fa-clock" aria-hidden="true"></i>
-          </a>
-        </div>
-      <% end %>
-    </div>
-  </td>
-  <!-- Curation -->
-  <td>
-    <div class="c-lined-table__with-actions">
-      <div class="c-lined-table__data" id="js-curation-activity-user-<%= dataset.identifier_id %>"><%= dataset.editor_name %></div>
-      <% if policy([:stash_engine, :admin_datasets]).curation_actions? %>
-        <div class="c-lined-table__actions">
-          <%= form_with(url: ds_admin_popup_path(id: dataset.identifier_id, field: 'current_editor'), method: :get, local: false) do %>
-            <button class="c-admin-edit-icon" title="Update curator" aria-label="Update curator" aria-haspopup="dialog" id="current_editor_button_<%= dataset.identifier_id %>">
-              <i class="fa fa-pencil" aria-hidden="true"></i>
-            </button>
-          <% end %>
-        </div>
-      <% end %>
-    </div>
-  </td>                    
-  <!-- Size -->
-  <td class="c-lined-table__digits"><%= filesize(dataset.resource_size) %></td>
-  <!-- Submission Date -->
-  <td class="c-admin c-lined-table__digits">
-    <span class="local-date" title="<%= formatted_datetime(dataset.submission_date) %>" data-dt="<%= dataset.submission_date.iso8601 unless dataset.submission_date.blank? %>"><%= formatted_datetime(dataset.submission_date) %></span>    
-  </td>
-  <!-- Publication Date -->
-  <td class="c-admin c-lined-table__digits" id="js-embargo-state-<%= dataset.identifier_id %>">
-     <span class="local-date" title="<%= formatted_datetime(dataset.publication_date) %> UTC" data-dt="<%= dataset.publication_date.iso8601 unless dataset.publication_date.blank? %>"><%= formatted_datetime(dataset.publication_date) %></span>    
-  </td>
-</tr>
diff --git a/app/views/stash_engine/admin_datasets/_datasets_table.html.erb b/app/views/stash_engine/admin_datasets/_datasets_table.html.erb
deleted file mode 100644
index f6ae7e6bd2..0000000000
--- a/app/views/stash_engine/admin_datasets/_datasets_table.html.erb
+++ /dev/null
@@ -1,44 +0,0 @@
-<%# locals: ds_identifiers %>
-<p id="timezone">Timezone: UTC</p>
-<div class="table-wrapper c-lined-table-wrapper">
-<table class="c-lined-table">
-  <thead>
-    <tr>
-      <th class="c-lined-table__sort <%= sort_display('title') %>">
-        <%= sortable_column_head sort_field: 'title', title: 'Description' %> 
-      </th>
-      <th class="c-lined-table__sort<%= sort_display('status') %>">
-        <%= sortable_column_head sort_field: 'status', title: 'Status' %>
-      </th>
-      <th class="c-lined-table__sort <%= sort_display('author_names') %>">
-        <%= sortable_column_head sort_field: 'author_names', title: 'Author' %>
-      </th>
-      <th class="c-lined-table__sort <%= sort_display('updated_at') %>">
-        <%= sortable_column_head sort_field: 'updated_at', title: 'Last modified' %>
-      </th>
-      <th class="c-lined-table__sort <%= sort_display('editor_name') %>">
-        <%= sortable_column_head sort_field: 'editor_name', title: 'Curator' %>
-      </th>
-      <th class="c-lined-table__sort <%= sort_display('storage_size') %>">
-        <%= sortable_column_head sort_field: 'storage_size', title: 'Size' %>
-      </th>
-      <th class="c-lined-table__sort <%= sort_display('submission_date') %>">
-        <%= sortable_column_head sort_field: 'submission_date', title: 'Submitted' %>
-      </th>
-      <th class="c-lined-table__sort <%= sort_display('publication_date') %>">
-        <%= sortable_column_head sort_field: 'publication_date', title: 'Published' %>
-      </th>
-    </tr>
-</thead>
-<tbody>
-  <% datasets.each do |dataset| %>
-    <%= render partial: 'stash_engine/admin_datasets/datasets_row', locals: { dataset: dataset } %>
-  <% end %>
-  <% if datasets.empty? %>
-    <tr><td colspan="8">
-      No datasets matched your search term and/or filter settings.
-    </td></tr>
-  <% end %>
-</tbody>
-</table>
-</div>
diff --git a/app/views/stash_engine/admin_datasets/_filter.html.erb b/app/views/stash_engine/admin_datasets/_filter.html.erb
deleted file mode 100644
index b196209d71..0000000000
--- a/app/views/stash_engine/admin_datasets/_filter.html.erb
+++ /dev/null
@@ -1,73 +0,0 @@
-<%= form_with(url: stash_url_helpers.url_for(controller: '/stash_engine/admin_datasets', action: 'index', only_path: true),
-              method: 'get', id: 'filter_form') do -%>
-<div class="o-admin-form-inline">
-  <h3 class="o-heading__level3">Filter by:</h3>
-  <% if institution_select.length > 1 %>
-    <div class="o-admin-form-pair">
-      <label for="tenant">Institution:</label>
-      <%= select_tag(:tenant, options_for_select( [['Institution', '']] + institution_select, params[:tenant]), class: 'c-input__text', onchange: "this.form.submit();" ) %>
-    </div>
-  <% end %>
-  <% if current_user.min_app_admin? %>
-    <div class="o-admin-form-pair">
-      <label for="editor_id">Curator:</label>
-      <%= select_tag(:editor_id, options_for_select( [['Curator', ''], ['Unassigned', 'NA']] + editor_select, params[:editor_id]),
-		     class: 'c-input__text',                 
-		     onchange: "this.form.submit();" ) %>
-    </div>
-  <% end %>
-  <div class="o-admin-form-pair">
-    <label for="curation_status">Status:</label>
-    <%= select_tag(:curation_status, options_for_select( [['Status', '']] + status_select + [['Upload error', 'error']], params[:curation_status]),
-                 class: 'c-input__text', onchange: "this.form.submit();" ) %>
-  </div>
-  <% if @publications.any? %>
-    <div class="o-admin-form-pair">
-      <label for="publication_name">Journal name:</label>
-      <%= text_field_tag(:publication_name, params[:publication_name], class: 'c-input__text', id: 'publication_name') %>
-    </div>
-  <% end %>
-  <% if current_user.min_app_admin? %>
-    <div class="o-admin-form-pair">
-      <label for="sponsor_org">Sponsoring org:</label>
-      <%= select_tag(:sponsor_org, options_for_select( [['Sponsoring org', '']] + sponsor_select, params[:sponsor_org]),
-                   class: 'c-input__text', onchange: "this.form.submit();") %>
-    </div>
-  <% end %> 
-  <% params.except(:controller, :action, :tenant, :curation_status, :sponsor_org, :editor_id,
-		   :commit, :page, :page_size, :show_all, :publication_name).each_pair do |k,v| %>
-    <%= hidden_field_tag k, v, id: "filter_#{k}" %>
-  <% end %>
-</div>
-<% end -%>
-<a href="#" id="filter_resetter">Reset all filters</a>
-
-<script>
-  // put this in here because it goes along with this form only
-  $("#filter_resetter").click(function(e) {
-    e.preventDefault();
-    $("#tenant option[value='']").prop('selected',true);
-    $("#editor_id option[value='']").prop('selected',true);
-    $("#curation_status option[value='']").prop('selected',true);
-    $('#publication_name[type="text"]').val('');
-    $("#sponsor_org option[value='']").prop('selected',true);
-    $("#filter_form").submit();
-  });
-
-  <% if @publications.any? %>
-    $('#publication_name[type="text"]').autocomplete({
-      select: function(event, ui) {
-        $('#publication_name[type="text"]').val(ui.item.value)
-        $('#publication_name[type="hidden"]').val(ui.item.value)
-        this.form.submit();
-      },
-      change: function(event, ui) {
-        if($('#publication_name[type="text"]').val() == ''){
-          $('#publication_name[type="hidden"]').val('')
-          this.form.submit();
-        }
-      },
-      source: <%= @publications.to_json.html_safe %>
-    });
-  <% end %>
-</script>
diff --git a/app/views/stash_engine/admin_datasets/_search.html.erb b/app/views/stash_engine/admin_datasets/_search.html.erb
deleted file mode 100644
index 3a3adf6b7c..0000000000
--- a/app/views/stash_engine/admin_datasets/_search.html.erb
+++ /dev/null
@@ -1,29 +0,0 @@
-<%= form_with(url: stash_url_helpers.url_for(controller: '/stash_engine/admin_datasets', action: 'index', only_path: true),
-               method: 'get', id: 'search_form') do %>
-<div class="o-admin-form-inline">
-  <div class="o-admin-form-pair" id="search-pair">
-    <label for="search-terms">Search terms:</label>
-    <%= search_field_tag(:q, params[:q], class: 'c-input__text', id: 'search-terms' ) %>
-    <%= hidden_field_tag(:sort, 'relevance') %>
-  </div>
-  <div class="o-admin-form-pair">
-    <%= check_box_tag(:all_advanced, value = "1", checked = (params[:all_advanced] == '1')) %>
-    <span><%= label_tag(:all_advanced, 'All terms') %> <sup>&dagger;</sup></span>
-  </div>
-  <%= submit_tag('Search', name: nil, class: 'o-button__submit' ) %>
-  <a href="#" id="clear_search">Clear terms</a>
-  <% params.except(:controller, :action, :q, :commit, :page, :page_size, :show_all, :sort, :direction, :all_advanced).each_pair do |k,v| %>
-      <%= hidden_field_tag k, v, id: "search_#{k}" %>
-  <% end %>
-</div>
-<% end %>
-
-<script>
-  // put this in here because it goes along with this form only
-  $("#clear_search").click(function(e) {
-    e.preventDefault();
-    $('#search-terms').val("");
-    $('#all_advanced').prop("checked", false);
-    $("#search_form").submit();
-  });
-</script>
diff --git a/app/views/stash_engine/admin_datasets/_stats_popup_display.html.erb b/app/views/stash_engine/admin_datasets/_stats_popup_display.html.erb
deleted file mode 100644
index eff8e48cc6..0000000000
--- a/app/views/stash_engine/admin_datasets/_stats_popup_display.html.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<h1>Dataset statistics</h1>
-<%= render partial: 'stash_engine/landing/metrics', locals: {identifier: @identifier, no_link: true} %>
-
-<% if @resource&.identifier&.cached_citations.count > 0 %>
-  <br/>
-  <%= render partial: 'stash_engine/landing/citations', locals: {identifier: @identifier} %>
-<% end %>
\ No newline at end of file
diff --git a/app/views/stash_engine/admin_datasets/curation_activity_error.js.erb b/app/views/stash_engine/admin_datasets/curation_activity_error.js.erb
deleted file mode 100644
index 9650690961..0000000000
--- a/app/views/stash_engine/admin_datasets/curation_activity_error.js.erb
+++ /dev/null
@@ -1,2 +0,0 @@
-// replace dialog div with contents of dialog text from partial
-document.getElementById('genericModalContent').innerHTML = '<h1>Update error!</h1><%= escape_javascript(@error_message) %>';
diff --git a/app/views/stash_engine/admin_datasets/edit.js.erb b/app/views/stash_engine/admin_datasets/edit.js.erb
index 602bf42827..2dcfa04a86 100644
--- a/app/views/stash_engine/admin_datasets/edit.js.erb
+++ b/app/views/stash_engine/admin_datasets/edit.js.erb
@@ -1,7 +1,3 @@
-<% if @field == 'waiver' %>
 document.getElementById("payment_info_table").outerHTML = "<%= escape_javascript(render partial: 'payment_info_table', locals: { identifier: @identifier }) %>";
 document.getElementById("apply_fee_waiver").outerHTML = "<br/>"
-<% else %>
-document.getElementById("js-dataset-row-id-<%= @resource.identifier.id %>").outerHTML = "<%= escape_javascript(render partial: 'stash_engine/admin_datasets/datasets_row', locals: { dataset: @curation_row }) %>"
-<% end %>
 document.getElementById('genericModalDialog').close();
\ No newline at end of file
diff --git a/app/views/stash_engine/admin_datasets/index.csv.erb b/app/views/stash_engine/admin_datasets/index.csv.erb
deleted file mode 100644
index 6063509256..0000000000
--- a/app/views/stash_engine/admin_datasets/index.csv.erb
+++ /dev/null
@@ -1,21 +0,0 @@
-<%= "Title,DOI,Status,Author,Last modified,Last modified by,Size,Submitted,Published,Journal name,Views,Downloads,Citations,Submitting author institution,Created" %>
-<% @datasets.each do |resource| -%>
-<%
-    row = [ resource&.title || '[no title set]',
-            resource.identifier,
-            resource&.status,
-            resource&.author_names,
-            resource&.updated_at,
-            resource&.editor_name,
-            resource.resource_size,
-            resource&.submission_date,
-            resource&.publication_date,
-            resource&.publication_name,
-            resource.views,
-            resource.downloads,
-            resource.citations,
-            StashEngine::Tenant.exists?(resource.tenant_id) ? StashEngine::Tenant.find(resource.tenant_id)&.long_name : '',
-            resource&.created_date
-    ]
--%><%= row.to_csv(row_sep: nil).html_safe %>
-<% end -%>
diff --git a/app/views/stash_engine/admin_datasets/index.html.erb b/app/views/stash_engine/admin_datasets/index.html.erb
deleted file mode 100644
index 0a01fff87f..0000000000
--- a/app/views/stash_engine/admin_datasets/index.html.erb
+++ /dev/null
@@ -1,44 +0,0 @@
-<% @page_title = "Admin dashboard" %>
-<h1 class="o-heading__level1">Admin dashboard</h1>
-
-<%= render partial: 'admin_head', locals: { all_stats: @all_stats, seven_day_stats: @seven_day_stats } %>
- 
-<h2>Datasets</h2>
-
-<div class="o-admin-form">
-  <%= render partial: 'search' %>
-  <%= render partial: 'filter' %>
-</div>
-
-<%= render partial: 'datasets_table', locals: { datasets: @datasets } %>
-
-<div class="search-results-footer">
-<%= link_to 'Get Comma Separated Values (CSV) for import into Excel',
-     stash_url_helpers.ds_admin_path(sortable_table_params.merge(format: :csv)) %>
-
-  <div class="c-space-paginator">
-    <%= paginate @datasets, params: { page_size: @page_size } %>
-    <div class="c-paginator-page_size">
-      Page size:
-      <%
-        current_ps = params[:page_size].to_i
-        current_ps = 10 if current_ps == 0
-        [10, 50, 100].each do |ps| %>
-        <% if ps == current_ps %>
-          <span class="page-current"><%= ps %></span>
-        <% else %>
-            <%= link_to(ps, stash_url_helpers.ds_admin_path(request.parameters.except(:action, :controller).merge(page_size: ps, page: 1))) %>
-        <% end %>
-      <% end %>
-    </div>
-  </div>      
-</div>
-
-<p>
-  &dagger; By default the search uses relevance ranking and not all terms are required.  Choosing the <em>All terms</em>
-  option requires all the terms in your query to be present in the results.  If you prefer to do an advanced query
-  with more fine-grained options, select <em>All terms</em>
-  and add any of (<em>~ + &lt; &gt; *</em>) that are commonly part of
-  <a href="https://dev.mysql.com/doc/refman/5.5/en/fulltext-boolean.html">the boolean query syntax</a> to use that
-  syntax.
-</p>
diff --git a/app/views/stash_engine/admin_datasets/popup.js.erb b/app/views/stash_engine/admin_datasets/popup.js.erb
index cd2f821351..7663fec5e2 100644
--- a/app/views/stash_engine/admin_datasets/popup.js.erb
+++ b/app/views/stash_engine/admin_datasets/popup.js.erb
@@ -9,9 +9,6 @@ when 'publication'
 when 'note'
   partial = 'stash_engine/admin_datasets/curation_note_popup'
   locals = { identifier: @identifier, title: 'Add note' }
-when 'stats'
-  partial = 'stash_engine/admin_datasets/stats_popup_display'
-  locals = {}
 else
   partial = 'popup_form'
   locals = {}
@@ -33,15 +30,4 @@ document.getElementById('cancel_dialog').addEventListener('click', (e) => {
       else other.setAttribute('hidden', 'hidden')
     })
   <% end %>
-<% end %>
-
-<% if @field == 'curation_activity' %>
-  initDatePicker();
-  document.getElementById('activity_status_select').addEventListener('change', (e) => {
-    if (e.currentTarget.value === 'published' || e.currentTarget.value === 'embargoed') {
-      document.getElementById('c-input_publication_date').removeAttribute('hidden');
-    } else {
-      document.getElementById('c-input_publication_date').setAttribute('hidden', 'hidden');
-    }
-  })
 <% end %>
\ No newline at end of file

From 0a05ae5f0d0c37f9b0952bc2b3175053627ce4e4 Mon Sep 17 00:00:00 2001
From: Audrey Hamelers <audrey@datadryad.org>
Date: Wed, 14 Aug 2024 14:18:04 +0200
Subject: [PATCH 5/5] remove unneeded policies and scope

---
 .../stash_engine/admin_datasets_policy.rb     | 37 +------------------
 1 file changed, 2 insertions(+), 35 deletions(-)

diff --git a/app/policies/stash_engine/admin_datasets_policy.rb b/app/policies/stash_engine/admin_datasets_policy.rb
index 10f0853e9b..8b1e573c5b 100644
--- a/app/policies/stash_engine/admin_datasets_policy.rb
+++ b/app/policies/stash_engine/admin_datasets_policy.rb
@@ -1,20 +1,12 @@
 module StashEngine
   class AdminDatasetsPolicy < ApplicationPolicy
 
-    def index?
-      @user.min_admin?
-    end
-
     def activity_log?
-      index?
-    end
-
-    def stats_popup?
-      index?
+      @user.min_admin?
     end
 
     def note_popup?
-      index?
+      @user.min_admin?
     end
 
     def data_popup?
@@ -33,30 +25,5 @@ def waiver_add?
       @user.superuser?
     end
 
-    class Scope
-      def initialize(user, scope, params)
-        @user = user
-        @scope = scope
-        @params = params
-      end
-
-      def resolve
-        if @user.tenant_limited?
-          @scope.where(**@params, tenant: @user.tenant)
-        elsif @user.min_app_admin?
-          @scope.where(**@params)
-        elsif @user.journals_as_admin.present?
-          @scope.where(**@params, journals: @user.journals_as_admin.map(&:title))
-        elsif @user.funders.present?
-          @scope.where(**@params, funders: @user.funders.map(&:ror_id))
-        else
-          false
-        end
-      end
-
-      private
-
-      attr_reader :user, :scope
-    end
   end
 end