From 885998bc9db0774b7f64b0823ffbe7e8844bb892 Mon Sep 17 00:00:00 2001
From: Bointeka <jkaoga@gmail.com>
Date: Mon, 15 Nov 2021 18:48:45 -0500
Subject: [PATCH 01/12] Added Administrator to dashboard in
 ./nav-bar/index.hbs. Added administrator routing to router.js

---
 app/components/nav-bar/index.hbs | 2 ++
 app/router.js                    | 5 +++++
 2 files changed, 7 insertions(+)

diff --git a/app/components/nav-bar/index.hbs b/app/components/nav-bar/index.hbs
index 6564c9d80..c7ecdd6b0 100644
--- a/app/components/nav-bar/index.hbs
+++ b/app/components/nav-bar/index.hbs
@@ -13,6 +13,8 @@
           <ul class="navbar-nav" style="width:100%">
             <li class="nav-item"><LinkTo @route="dashboard" class="nav-link pl-0 ml-0">Dashboard</LinkTo></li>
             {{#if this.hasAUser}}
+              {{!-- TODO: Check whether the user is an administrator and not a regular user --}}
+              <li class="nav-item"><LinkTo @route="administrator" class="nav-link" data-test-navbar-administrator-link>Administrator</LinkTo></li>
               <li class="nav-item"><LinkTo @route="grants" class="nav-link" data-test-navbar-grants-link>Grants</LinkTo></li>
               <li class="nav-item"><LinkTo @route="submissions" class="nav-link" data-test-navbar-submissions-link>Submissions</LinkTo></li>
             {{/if}}
diff --git a/app/router.js b/app/router.js
index ba14f45b9..7c99400d7 100644
--- a/app/router.js
+++ b/app/router.js
@@ -9,6 +9,10 @@ class Router extends EmberRouter {
 
 Router.map(function () {
   this.route('dashboard', { path: '/' });
+  this.route('administrator', function() {
+      this.route('detail', {path: '/*path'});
+      this.route('detail', {path: '/:submission_id'});
+  });
   this.route('submissions', function () {
     this.route('detail', { path: '/*path' });
     this.route('detail', { path: '/:submission_id' });
@@ -26,6 +30,7 @@ Router.map(function () {
     this.route('detail', { path: '/*path' });
     this.route('detail', { path: '/:grant_id' });
   });
+
   this.route('not-found-error', { path: '/*path' });
   this.route('thanks');
 });

From 9cb858407b561638a1394eb46dac381109b7f8b9 Mon Sep 17 00:00:00 2001
From: Bointeka <jkaoga@gmail.com>
Date: Mon, 15 Nov 2021 18:50:42 -0500
Subject: [PATCH 02/12] Copied relevant base code from ./templates/submissions

---
 app/templates/administrator.hbs        |   1 +
 app/templates/administrator/detali.hbs | 241 +++++++++++++++++++++++++
 app/templates/administrator/index.hbs  |  33 ++++
 3 files changed, 275 insertions(+)
 create mode 100644 app/templates/administrator.hbs
 create mode 100644 app/templates/administrator/detali.hbs
 create mode 100644 app/templates/administrator/index.hbs

diff --git a/app/templates/administrator.hbs b/app/templates/administrator.hbs
new file mode 100644
index 000000000..e2147cab0
--- /dev/null
+++ b/app/templates/administrator.hbs
@@ -0,0 +1 @@
+{{outlet}}
\ No newline at end of file
diff --git a/app/templates/administrator/detali.hbs b/app/templates/administrator/detali.hbs
new file mode 100644
index 000000000..736c00848
--- /dev/null
+++ b/app/templates/administrator/detali.hbs
@@ -0,0 +1,241 @@
+<div class="block-user-input text-center">
+  <div class="lds-dual-ring mx-auto"></div>
+</div>
+<div id="submission-details-title" class="row mb-2">
+  <div class="col-6">
+    <LinkTo @route="submissions" class="btn btn-small back-arrow"><i class="fa fa-arrow-left fa-lg"></i></LinkTo>
+    <h2 class="font-weight-light d-inline-block">Submission Detail</h2>
+  </div>
+  <div class="col-6 text-right">
+    {{#if this.model.sub.isStub}}
+      <LinkTo @route="submissions.new" @query={{hash submission=this.model.sub.id}} class="btn btn-outline-primary text-right">
+        Finish submission
+      </LinkTo>
+    {{else if this.model.sub.isDraft}}
+      <LinkTo
+        @route="submissions.new"
+        @query={{hash submission=this.model.sub.id}}
+        class="btn btn-outline-primary text-right"
+        data-test-submission-detail-edit-submission
+      >
+        Edit submission
+      </LinkTo>
+      <button {{action "deleteSubmission" this.model.sub}} class="btn btn-outline-danger text-right">
+        Delete
+      </button>
+    {{/if}}
+  </div>
+</div>
+<div id="submission-details-body" class="form-group row">
+  <div class="col-12">
+    <div class="list-group">
+      <div href="#" class="list-group-item flex-column align-items-start">
+        <div class="d-flex w-100 justify-content-between">
+          <h5 class="mb-1"> {{this.model.sub.publication.title}}</h5>
+          {{#if this.model.sub.submittedDate}}<small class="text-muted text-right">Submitted {{format-date
+            this.model.sub.submittedDate}}</small>{{/if}}
+        </div>
+        <p class="mb-1">DOI: {{#if this.model.sub.publication.doi}}{{this.model.sub.publication.doi}}{{else}}<span class="text-muted">None</span>{{/if}}</p>
+        <table class="table table-responsive-sm table-bordered w-100 d-flex">
+          <tbody>
+            <tr>
+              <td><strong>Submission status</strong></td>
+              <td>
+                <SubmissionStatus @submissionStatus={{this.model.sub.submissionStatus}} />
+              </td>
+            </tr>
+            {{#if this.model.sub.isCovid}}
+              <tr class="font-weight-bold">
+                <td></td>
+                <td>
+                  <div data-test-submission-detail-covid>
+                    This submission was marked as pertaining to COVID-19 research
+                    <a href="/faq.html#covid-19" target="_blank">(What does this mean?)</a>
+                  </div>
+                </td>
+              </tr>
+            {{/if}}
+            <tr>
+              <td><strong>Grants</strong></td>
+              <td>
+                <ul class="list-unstyled">
+                  {{#each this.model.sub.grants as |grant|}}
+                  <li data-test-submission-detail-grant><b>{{grant.awardNumber}}</b>: {{grant.projectName}}</li>
+                  <li data-test-submission-detail-funder><b>Funder</b>: {{grant.primaryFunder.name}}</li>
+                  {{#if (not-eq grant this.model.sub.grants.lastObject)}}
+                  <hr>
+                  {{/if}}
+                  {{/each}}
+                </ul>
+              </td>
+            </tr>
+            {{!-- Consolidate repository, deposit, repoCopy info --}}
+            {{#if this.repoMap}}
+            <tr>
+              <td class="text-nowrap"><strong>Repositories</strong></td>
+              <td>
+                <ul class="list-unstyled">
+                  {{#each this.repoMap as |repoInfo index|}}
+                    <SubmissionRepoDetails
+                      @repo={{repoInfo.repo}}
+                      @deposit={{repoInfo.deposit}}
+                      @repoCopy={{repoInfo.repositoryCopy}}
+                      @submission={{this.model.sub}}
+                    />
+                  {{/each}}
+                </ul>
+              </td>
+            </tr>
+            {{/if}}
+            {{#if this.externalSubmission}}
+            <tr>
+              <td><strong>External Submission Repositories</strong></td>
+              <td>
+                <ul class="list-unstyled">
+                  {{#each this.externalSubmission as |sub|}}
+                  <li>{{sub.message}}</li>
+                  {{/each}}
+                </ul>
+              </td>
+            </tr>
+            {{/if}}
+            <tr>
+              <td class="text-nowrap"><strong>Submitter</strong></td>
+              <td data-test-submission-detail-submitter>
+                {{#if (eq this.model.sub.source "other")}}
+                  <i>This submission did not originate from PASS</i>
+                {{else if this.displaySubmitterName}}
+                  {{this.displaySubmitterName}}
+                {{/if}}
+                {{#if this.displaySubmitterEmail}}
+                  &nbsp;(<a href="mailto:{{this.displaySubmitterEmail}}">{{this.displaySubmitterEmail}}</a>)
+                {{/if}}
+              </td>
+            </tr>
+            {{#if (await this.model.sub.preparers)}}
+            <tr>
+              <td class="text-nowrap"><strong>Preparer(s)</strong></td>
+              <td data-test-submission-detail-preparer>
+                {{#each (await this.model.sub.preparers) as |preparer index|}}
+                  {{#if index}}, {{/if}} {{get (await preparer) 'displayName'}}
+                  {{#if (get (await preparer) 'email')}}
+                    &nbsp;(<a href="mailto:{{get (await preparer) 'email'}}">{{get (await preparer) 'email'}}</a>)
+                  {{/if}}
+                {{/each}}
+              </td>
+            </tr>
+            {{/if}}
+            {{#if this.mustVisitWeblink}}
+            <tr>
+              <td id="externalSubmission">
+                <strong>External Submission Required</strong>
+                <br>
+                {{#if this.disableSubmit}}
+                <i class="fa fa-exclamation-triangle fa-2x mt-3 ml-3 notice-triangle"></i>
+                {{/if}}
+              </td>
+              <td>
+                <label class="">
+                  Please visit the following web portal to submit your manuscript directly. Metadata displayed above
+                  could be used to aid in your submission progress.
+                </label>
+                <ul class="m-0">
+                  {{#each this.weblinkRepos as |repo|}}
+                  <li>
+                    <button type="button" class="btn btn-link" {{action "openWeblinkAlert" repo}}>
+                      {{repo.url}}
+                    </button>
+                  </li>
+                  {{/each}}
+                </ul>
+              </td>
+            </tr>
+            {{/if}}
+            <tr>
+              <td><strong>Details</strong></td>
+              <td>
+                <DisplayMetadataKeys @submission={{this.model.sub}} />
+              </td>
+            </tr>
+            <tr>
+              <td><strong>Files</strong></td>
+              <td>
+                {{#if (eq this.model.sub.source "other")}}
+                <p class="mb-0">
+                  <i>We do not have a copy of manuscript files because this submission did not originate from PASS</i>
+                </p>
+                {{else}}
+                <table local-class="files-table" class="w-100">
+                  <thead>
+                    <tr>
+                      <th scope="col"></th>
+                      <th scope="col" class="font-weight-light">Name</th>
+                      <th scope="col" class="font-weight-light">Type</th>
+                      <th scope="col" class="font-weight-light">Description</th>
+                    </tr>
+                  </thead>
+                  <tbody class="striped">
+                    {{#each (get this.model 'files') as |file|}}
+                    <tr>
+                      <td data-label="icon">
+                        {{#if (eq file.mimeType 'png')}}
+                        <i local-class="line-height-35 text-gray fa-30" class="fas fa-file-image"></i> {{else if (eq file.mimeType
+                        'vnd.openxmlformats-officedocument.presentationml.presentation')}}
+                        <i local-class="line-height-35 text-gray fa-30" class="fas fa-file-powerpoint"></i> {{else if (eq
+                        file.mimeType 'msword')}}
+                        <i local-class="line-height-35 text-gray fa-30" class="fas fa-file-word"></i> {{else if (eq file.mimeType
+                        'pdf')}}
+                        <i local-class="line-height-35 text-gray fa-30" class="fas fa-file-pdf"></i>
+                        {{else}}
+                        <i local-class="line-height-35 text-gray fa-30" class="far fa-file"></i>
+                        {{/if}}
+                      </td>
+                      <td data-label="name" style="min-width:200px;">
+                        <a href={{file.uri}}>{{file.name}}</a>
+                      </td>
+                      <td data-label="type" class="text-nowrap">
+                        {{file.fileRole}}
+                      </td>
+                      <td data-label="description">
+                        {{file.description}}
+                      </td>
+                    </tr>
+                    {{/each}}
+                  </tbody>
+                </table>
+                {{/if}}
+              </td>
+            </tr>
+            {{#if (or this.this.isPreparer this.isSubmitter)}}
+              <tr>
+                <td class="text-nowrap"><strong>Comments</strong></td>
+                <td>
+                  <CommentingBlock @submissionEvents={{this.model.submissionEvents}} />
+                  {{#if (or (and this.isSubmitter this.submissionNeedsSubmitter) (and this.isPreparer this.submissionNeedsPreparer))}}
+                  <Textarea placeholder="Add comment" @value={{this.message}} class="form-control custom-control p-2" @rows="2" @style="resize:none; min-height: 38px!important;" />                {{/if}}              </td>
+              </tr>
+            {{/if}}
+          </tbody>
+        </table>
+      </div>
+    </div>
+  </div>
+</div>
+{{#if (and this.isSubmitter this.submissionNeedsSubmitter)}}
+  <div class="row">
+    <div class="col-12 text-right">
+      <button class="btn btn-primary" onclick={{action 'approveChanges'}}>Submit</button>
+      <button class="btn btn-outline-primary" onclick={{action 'requestMoreChanges'}}>Request More Changes</button>
+      <LinkTo @route="submissions.new" @query={{hash submission=this.model.sub.id}} class="btn btn-outline-primary">Edit Submission</LinkTo>
+      <button class="btn btn-danger" onclick={{action 'cancelSubmission'}}>Cancel Submission</button>
+    </div>
+  </div>
+{{/if}}
+{{#if (and this.isPreparer this.submissionNeedsPreparer)}}
+  <div class="row">
+    <div class="col-12 text-right">
+      <LinkTo @route="submissions.new" @query={{hash submission=this.model.sub.id}} class="btn btn-primary">Edit this
+      submission</LinkTo>
+    </div>
+  </div>
+{{/if}}
diff --git a/app/templates/administrator/index.hbs b/app/templates/administrator/index.hbs
new file mode 100644
index 000000000..bef13a838
--- /dev/null
+++ b/app/templates/administrator/index.hbs
@@ -0,0 +1,33 @@
+<div class="row mt-3 mb-3">
+    <div class="col-6">
+        <h1 class="font-weight-light pt-1">Administrator</h1>
+    </div>
+</div>
+<p>
+    This list contains all Submissions uploaded in pass. Please see our 
+    <a href="{{this.assetsUri}}faq.html#nih-submissions"> FAQ page</a>
+</p>
+<div class="row">
+    <div class="col-12" style="overflow-x: auto;">
+        <div class="submission-table" data-test-submissions-index-submissions-tab;e>
+            <ModelsTable
+                @data={{this.model.submissions}}
+                @columns={{this.columns}}
+                @themeInstance={{this.themeInstance}}
+                @showColumnsDropdown={{false}}
+                @useFilteringByColumns={{false}}
+                @filteringIgnoreCase={{true}}
+                @multipleColumnsSorting={{false}}
+                @authorSelected="authorclick"
+                @pageSize={{this.tablePageSize}}
+                @pageSizeValues={{this.tablePageSizeValues}}
+            />   
+        </div>
+    </div>
+</div>
+<MessageDialog
+  @show={{this.messageShow}}
+  @to={{this.messageTo}}
+  @subject={{this.messageSubject}}
+  @message={{this.messageText}}
+/>
\ No newline at end of file

From 77dcacf2e5c8776f1acb8f3b1417305b4f868149 Mon Sep 17 00:00:00 2001
From: Bointeka <jkaoga@gmail.com>
Date: Mon, 15 Nov 2021 18:52:47 -0500
Subject: [PATCH 03/12] Copied relevant base code from
 ./controllers/submissions

---
 app/controllers/administrator/detail.js | 450 ++++++++++++++++++++++++
 app/controllers/administrator/index.js  |  72 ++++
 2 files changed, 522 insertions(+)
 create mode 100644 app/controllers/administrator/detail.js
 create mode 100644 app/controllers/administrator/index.js

diff --git a/app/controllers/administrator/detail.js b/app/controllers/administrator/detail.js
new file mode 100644
index 000000000..7a6e78ee3
--- /dev/null
+++ b/app/controllers/administrator/detail.js
@@ -0,0 +1,450 @@
+import Controller from '@ember/controller';
+import { tracked } from '@glimmer/tracking';
+import { action, get, computed } from '@ember/object';
+import ENV from 'pass-ember/config/environment';
+import { inject as service } from '@ember/service';
+
+export default class SubmissionsDetail extends Controller {
+  @service currentUser;
+  @service store;
+  @service submissionHandler;
+  @service searchHelper;
+
+  constructor() {
+    super(...arguments);
+
+    let element = document.querySelector('[data-toggle="tooltip"]');
+    if (element) element.tooltip();
+  }
+
+  @tracked submitted = get(this, 'model.sub.submitted');
+  @tracked repositories = get(this, 'model.sub.repositories');
+  @tracked externalRepoMap = {};
+  @tracked _hasVisitedWeblink = null;
+
+  @computed('model.sub', 'model.sub.submitter.firstName')
+  get displaySubmitterName() {
+    if (get(this, 'model.sub.submitter.displayName')) {
+      return get(this, 'model.sub.submitter.displayName');
+    } else if (get(this, 'model.sub.submitter.firstName')) {
+      return `${get(this, 'model.sub.submitter.firstName')} ${get(this, 'model.sub.submitter.lastName')}`;
+    } else if (get(this, 'model.sub.submitterName')) {
+      return get(this, 'model.sub.submitterName');
+    }
+
+    return '';
+  }
+
+  @computed('model.sub', 'model.sub.submitter.email')
+  get displaySubmitterEmail() {
+    if (get(this, 'model.sub.submitter.email')) {
+      return get(this, 'model.sub.submitter.email');
+    } else if (get(this, 'model.sub.submitterEmail')) {
+      return get(this, 'model.sub.submitterEmailDisplay');
+    }
+
+    return '';
+  }
+
+  get externalSubmission() {
+    if (!this.submitted) {
+      return [];
+    }
+    return this.externalSubmissionsMetadata || [];
+  }
+
+  /**
+   * Ugly way to generate data for the template to use.
+   * {
+   *    'repository-id': {
+   *      repo: { }, // repository obj
+   *      deposit: {}, // related deposit, if exists
+   *      repositoryCopy: {} // related repoCopy if exists
+   *    }
+   * }
+   * This map is then turned into an array for use in the template
+   */
+  get hasVisitedWeblink() {
+    if (this._hasVisitedWeblink) {
+      return this._hasVisitedWeblink;
+    }
+    return Object.values(this.externalRepoMap).every(val => val === true);
+  }
+
+  set hasVisitedWeblink(value) {
+    this._hasVisitedWeblink = value;
+  }
+
+  /**
+   * Get enough information about 'web-link' repositories to display to a user.
+   */
+  get externalSubmissionsMetadata() {
+    let result = [];
+
+    this.repositories.filter(repo => repo._isWebLink)
+      .forEach((repo) => {
+        result.push({
+          message: `Deposit into ${repo.name} was prompted`,
+          name: repo.name,
+          url: repo.url
+        });
+      });
+
+    return result;
+  }
+
+  get weblinkRepos() {
+    let md = this.externalSubmissionsMetadata;
+
+    if (Array.isArray(md) && md.length > 0) {
+      md.forEach((repo) => {
+        this.externalRepoMap[repo.name] = false;
+      });
+      return md;
+    }
+
+    return [];
+  }
+
+  get mustVisitWeblink() {
+    const weblinkExists = this.weblinkRepos.length > 0;
+    const isSubmitter = get(this, 'currentUser.user.id') === get(this, 'model.sub.submitter.id');
+    const isProxySubmission = get(this, 'model.sub.isProxySubmission');
+    const isSubmitted = this.submitted;
+
+    return weblinkExists && isSubmitter && isProxySubmission && !isSubmitted;
+  }
+
+  get disableSubmit() {
+    const needsToVisitWeblink = this.mustVisitWeblink && !this.hasVisitedWeblink;
+
+    return needsToVisitWeblink;
+  }
+
+  /**
+   * Awkward object for use in the UI composing Repository objects with related
+   * Deposit and RepositoryCopy objects.
+   *
+   * Explicitly exclude 'web-link' repositories.
+   */
+  get repoMap() {
+    let hasStuff = false;
+    const repos = get(this, 'model.repos');
+    const deps = get(this, 'model.deposits');
+    const repoCopies = get(this, 'model.repoCopies');
+    if (!repos) {
+      return null;
+    }
+    let map = {};
+    repos.filter(repo => !repo._isWebLink).forEach((r) => {
+      (map[r.id] = {
+        repo: r
+      });
+    });
+
+    if (deps) {
+      deps.forEach((deposit) => {
+        hasStuff = true;
+        const repo = get(deposit, 'repository');
+        const repoId = get(repo, 'id');
+        if (!map.hasOwnProperty(repoId)) {
+          map[repoId] = {
+            repo,
+            deposit
+          };
+        } else {
+          map[repoId] = Object.assign(map[repoId], {
+            deposit,
+            repositoryCopy: get(deposit, 'repositoryCopy')
+          });
+        }
+      });
+    }
+    if (repoCopies) {
+      hasStuff = true;
+      repoCopies.forEach((rc) => {
+        const repo = rc.get('repository');
+        const repoId = get(repo, 'id');
+        if (!map.hasOwnProperty(repoId)) {
+          map[repoId] = {
+            repo,
+            repositoryCopy: rc
+          };
+        } else {
+          map[repoId] = Object.assign(map[repoId], {
+            repositoryCopy: rc
+          });
+        }
+      });
+    }
+    if (hasStuff) {
+      let results = [];
+      Object.keys(map).forEach(k => results.push(map[k]));
+      return results;
+    }
+
+    return null;
+  }
+
+  get isSubmitter() {
+    return (
+      get(this, 'model.sub.submitter.id') === get(this, 'currentUser.user.id')
+    );
+  }
+
+  get isPreparer() {
+    return get(this, 'model.sub.preparers')
+      .map(x => x.id)
+      .includes(get(this, 'currentUser.user.id'));
+  }
+
+  get submissionNeedsPreparer() {
+    return get(this, 'model.sub.submissionStatus') === 'changes-requested';
+  }
+
+  get submissionNeedsSubmitter() {
+    return (
+      get(this, 'model.sub.submissionStatus') === 'approval-requested' ||
+      get(this, 'model.sub.submissionStatus') === 'approval-requested-newuser'
+    );
+  }
+
+  @action
+  async openWeblinkAlert(repo) {
+    let value = await swal({
+      title: 'Notice!',
+      text:
+        'You are being sent to an external site. This will open a new tab.',
+      showCancelButton: true,
+      cancelButtonText: 'Cancel',
+      confirmButtonText: 'Open new tab'
+    });
+
+    if (value.dismiss) {
+      // Don't redirect
+      return;
+    }
+    // Go to the weblink repo
+    this.externalRepoMap[repo.name] = true;
+    const allLinksVisited = Object.values(this.externalRepoMap).every(val => val === true);
+    if (allLinksVisited) {
+      this.hasVisitedWeblink = true;
+    }
+    $('#externalSubmission').modal('hide');
+
+    var win = window.open(repo.url, '_blank');
+    win.focus();
+  }
+
+  @action
+  async requestMoreChanges() {
+    let sub = get(this, 'model.sub');
+    let message = this.message;
+
+    if (!message) {
+      swal(
+        'Comment field empty',
+        'Please add a comment before requesting changes.',
+        'warning'
+      );
+    } else {
+      $('.block-user-input').css('display', 'block');
+      await this.submissionHandler.requestSubmissionChanges(sub, message);
+      window.location.reload(true);
+    }
+  }
+
+  @action
+  async approveChanges() {
+    let baseURL = window.location.href.replace(new RegExp(`${ENV.rootURL}.*`), '');
+    // First, check if user has visited all required weblinks.
+    if (this.disableSubmit) {
+      if (!this.hasVisitedWeblink) {
+        $('.fa-exclamation-triangle').css('color', '#f86c6b');
+        $('.fa-exclamation-triangle').css('font-size', '2.2em');
+        setTimeout(() => {
+          $('.fa-exclamation-triangle').css('color', '#b0b0b0');
+          $('.fa-exclamation-triangle').css('font-size', '2em');
+        }, 4000);
+        toastr.warning('Please visit the listed web portal(s) to submit your manuscript directly. Metadata displayed on this page can be used to help in the submission process.');
+      }
+      return;
+    }
+
+    // Validate manuscript files
+    let manuscriptFiles = [].concat(this.filesTemp, get(this, 'model.files') && get(this, 'model.files').toArray())
+      .filter(file => file && file.get('fileRole') === 'manuscript');
+
+    if (manuscriptFiles.length == 0) {
+      swal(
+        'Manuscript is missing',
+        'At least one manuscript file is required.  Please Edit the submission to add one',
+        'warning'
+      );
+      return;
+    } else if (manuscriptFiles.length > 1) {
+      swal(
+        'Incorrect manuscript count',
+        `Only one file may be designated as the manuscript.  Instead, found ${manuscriptFiles.length}.  Please edit the file list`,
+        'warning'
+      );
+      return;
+    }
+
+    let reposWithAgreementText = get(this, 'model.repos')
+      .filter(repo => (!get(repo, '_isWebLink')) && get(repo, 'agreementText'))
+      .map(repo => ({
+        id: get(repo, 'name'),
+        title: `Deposit requirements for ${get(repo, 'name')}`,
+        html: `<textarea rows="16" cols="40" name="embargo" class="alpaca-control form-control disabled" disabled="" autocomplete="off">${get(repo, 'agreementText')}</textarea>`
+      }));
+
+    let reposWithoutAgreementText = get(this, 'model.repos')
+      .filter(repo => !get(repo, '_isWebLink') && !get(repo, 'agreementText'))
+      .map(repo => ({
+        id: get(repo, 'name')
+      }));
+
+    let reposWithWebLink = get(this, 'model.repos')
+      .filter(repo => get(repo, '_isWebLink'))
+      .map(repo => ({
+        id: get(repo, 'name')
+      }));
+
+    const result = await swal.mixin({
+      input: 'checkbox',
+      inputPlaceholder: 'I agree to the above statement on today\'s date ',
+      confirmButtonText: 'Next &rarr;',
+      showCancelButton: true,
+      progressSteps: reposWithAgreementText.map((repo, index) => index + 1),
+    }).queue(reposWithAgreementText);
+    if (result.value) {
+      let reposThatUserAgreedToDeposit = reposWithAgreementText.filter((repo, index) => {
+        // if the user agreed to depost to this repo === 1
+        if (result.value[index] === 1) {
+          return repo;
+        }
+      });
+      // make sure there are repos to submit to.
+      if (get(this, 'model.sub.repositories.length') > 0) {
+        if (reposWithoutAgreementText.length > 0 || reposThatUserAgreedToDeposit.length > 0 || reposWithWebLink.length > 0) {
+          let swalMsg = 'Once you click confirm you will no longer be able to edit this submission or add repositories.<br/>';
+          if (reposWithoutAgreementText.length > 0 || reposThatUserAgreedToDeposit.length) {
+            swalMsg = `${swalMsg}You are about to submit your files to: <pre><code>${JSON.stringify(reposThatUserAgreedToDeposit.map(repo => repo.id)).replace(/[\[\]']/g, '')}${JSON.stringify(reposWithoutAgreementText.map(repo => repo.id)).replace(/[\[\]']/g, '')} </code></pre>`;
+          }
+          if (reposWithWebLink.length > 0) {
+            swalMsg = `${swalMsg}You were prompted to submit to: <code><pre>${JSON.stringify(reposWithWebLink.map(repo => repo.id)).replace(/[\[\]']/g, '')}</code></pre>`;
+          }
+
+          let result = await swal({
+            title: 'Confirm submission',
+            html: swalMsg, // eslint-disable-line
+            confirmButtonText: 'Confirm',
+            showCancelButton: true,
+          });
+
+          if (result.value) {
+            // Update repos to reflect repos that user agreed to deposit.
+            // Must keep web-link repos.
+            this.set('model.sub.repositories', get(this, 'model.sub.repositories').filter((repo) => {
+              if (get(repo, '_isWebLink')) {
+                return true;
+              }
+              let temp = reposWithAgreementText.map(x => x.id).includes(get(repo, 'name'));
+              if (!temp) {
+                return true;
+              } else if (reposThatUserAgreedToDeposit.map(r => r.id).includes(get(repo, 'name'))) {
+                return true;
+              }
+              return false;
+            }));
+
+            let sub = get(this, 'model.sub');
+            let message = this.message;
+            this.submissionHandler.approveSubmission(sub, message);
+          }
+        } else {
+          // there were repositories, but the user didn't sign any of the agreements
+          let reposUserDidNotAgreeToDeposit = reposWithAgreementText.filter((repo) => {
+            if (!reposThatUserAgreedToDeposit.includes(repo)) {
+              return true;
+            }
+          });
+          let result = await swal({
+            title: 'Your submission cannot be submitted.',
+            html: `You declined to agree to the deposit agreement(s) for ${JSON.stringify(reposUserDidNotAgreeToDeposit.map(repo => repo.id)).replace(/[\[\]']/g, '')}. Therefore, this submission cannot be submitted. \n You can either (a) cancel the submission or (b) return to the submission to provide required input and try again.`,
+            confirmButtonText: 'Cancel submission',
+            showCancelButton: true,
+            cancelButtonText: 'Go back to edit information'
+          });
+
+          if (result.value) {
+            this.cancelSubmission();
+          }
+        }
+      } else {
+        // no repositories associated with the submission
+        let result = await swal({
+          title: 'Your submission cannot be submitted.',
+          html: 'No repositories are associated with this submission. \n You can either (a) cancel the submission or (b) return to the submission and edit it to include a repository.',
+          confirmButtonText: 'Cancel submission',
+          showCancelButton: true,
+          cancelButtonText: 'Go back to edit information'
+        });
+
+        if (result.value) {
+          this.cancelSubmission();
+        }
+      }
+    }
+  }
+
+  @action
+  async cancelSubmission() {
+    let message = this.message;
+    let sub = get(this, 'model.sub');
+
+    if (!message) {
+      swal(
+        'Comment field empty',
+        'Please add a comment for your cancellation.',
+        'warning'
+      );
+      return;
+    }
+
+    let result = await swal({
+      title: 'Are you sure?',
+      text: 'If you cancel this submission, it will not be able to be resumed.',
+      confirmButtonText: 'Yes, cancel this submission',
+      confirmButtonColor: '#f86c6b',
+      cancelButtonText: 'Never mind',
+      showCancelButton: true,
+    });
+
+    if (result.value) {
+      $('.block-user-input').css('display', 'block');
+      await this.submissionHandler.cancelSubmission(sub, message);
+      window.location.reload(true);
+    }
+  }
+
+  @action
+  async deleteSubmission(submission) {
+    let result = await swal({
+      text: 'Are you sure you want to delete this draft submission? This cannot be undone.',
+      confirmButtonText: 'Delete',
+      confirmButtonColor: '#f86c6b',
+      showCancelButton: true
+    });
+
+    if (result.value) {
+      const ignoreList = this.searchHelper;
+
+      await this.submissionHandler.deleteSubmission(submission);
+      ignoreList.clearIgnore();
+      ignoreList.ignore(submission.get('id'));
+      this.transitionToRoute('submissions');
+    }
+  }
+}
diff --git a/app/controllers/administrator/index.js b/app/controllers/administrator/index.js
new file mode 100644
index 000000000..9f593fe2d
--- /dev/null
+++ b/app/controllers/administrator/index.js
@@ -0,0 +1,72 @@
+import Controller from '@ember/controller';
+import { tracked } from '@glimmer/tracking';
+import Bootstrap4Theme from 'ember-models-table/themes/bootstrap4';
+import { get } from '@ember/object';
+import { inject as service } from '@ember/service';
+
+export default class SubmissionsIndex extends Controller {
+  @service currentUser;
+  @service('app-static-config') configurator;
+
+  @tracked assetsUri = null;
+  @tracked themeInstance = Bootstrap4Theme.create();
+  // Bound to message dialog.
+  @tracked messageShow = false
+  @tracked messageTo = '';
+  @tracked messageSubject = '';
+  @tracked messageText = '';
+  @tracked tablePageSize = 50;
+  @tracked tablePageSizeValues = [10, 25, 50];
+
+  constructor() {
+    super(...arguments);
+
+    this.configurator.getStaticConfig()
+      .then(config => this.set('assetsUri', config.assetsUri));
+  }
+
+  // Columns displayed depend on the user role
+  get columns() {
+    if (get(this, 'currentUser.user.isAdmin')) {
+      return [
+        {
+          propertyName: 'publication',
+          title: 'Article',
+          className: 'title-column',
+          component: 'submissions-article-cell'
+        },
+        {
+          title: 'Award Number (Funder)',
+          className: 'awardnum-funder-column',
+          component: 'submissions-award-cell'
+        },
+        {
+          propertyName: 'repositories',
+          title: 'Repositories',
+          className: 'repositories-column',
+          component: 'submissions-repo-cell'
+        },
+        {
+          propertyName: 'submittedDate',
+          title: 'Submitted Date',
+          className: 'date-column',
+          component: 'date-cell'
+        },
+        {
+          propertyName: 'submissionStatus',
+          title: 'Status',
+          className: 'status-column',
+          component: 'submissions-status-cell'
+        },
+        {
+          // propertyName: 'repoCopies',
+          title: 'Manuscript IDs',
+          className: 'msid-column',
+          component: 'submissions-repoid-cell'
+        }
+      ];
+    } else { // eslint-disable-line
+      return [];
+    }
+  }
+}

From aeae6cf24ae0d855771d10f36f97bc214c923b73 Mon Sep 17 00:00:00 2001
From: Bointeka <jkaoga@gmail.com>
Date: Mon, 15 Nov 2021 19:37:49 -0500
Subject: [PATCH 04/12] Copied relevant base code from ./routers/submissions

---
 app/routes/administrator/detail.js | 36 +++++++++++++
 app/routes/administrator/index.js  | 86 ++++++++++++++++++++++++++++++
 2 files changed, 122 insertions(+)
 create mode 100644 app/routes/administrator/detail.js
 create mode 100644 app/routes/administrator/index.js

diff --git a/app/routes/administrator/detail.js b/app/routes/administrator/detail.js
new file mode 100644
index 000000000..55e961ec1
--- /dev/null
+++ b/app/routes/administrator/detail.js
@@ -0,0 +1,36 @@
+import CheckSessionRoute from '../check-session-route';
+import { hash } from 'rsvp';
+
+export default class DetailRoute extends CheckSessionRoute {
+  model(params) {
+    if (!params || !params.submission_id) {
+      this.errorHandler.handleError(new Error('didNotLoadData'));
+      return;
+    }
+
+    const querySize = 500;
+    const sub = this.store.findRecord('submission', params.submission_id);
+    const files = this.store.query('file', { term: { submission: params.submission_id }, size: querySize });
+    const deposits = this.store.query('deposit', { term: { submission: params.submission_id }, size: querySize });
+    const submissionEvents = this.store.query('submissionEvent', {
+      sort: [
+        { performedDate: 'asc' }
+      ],
+      query: {
+        term: { submission: params.submission_id }
+      }
+    });
+    const repoCopies = sub.then(s =>
+      this.store.query('repositoryCopy', { term: { publication: s.get('publication.id') }, size: querySize }));
+    const repos = sub.then(s => s.get('repositories'));
+
+    return hash({
+      sub,
+      files,
+      deposits,
+      repoCopies,
+      submissionEvents,
+      repos
+    });
+  }
+}
diff --git a/app/routes/administrator/index.js b/app/routes/administrator/index.js
new file mode 100644
index 000000000..9cba5c53f
--- /dev/null
+++ b/app/routes/administrator/index.js
@@ -0,0 +1,86 @@
+import { inject as service } from '@ember/service';
+import CheckSessionRoute from '../check-session-route';
+import RSVP from 'rsvp';
+import { get } from '@ember/object';
+
+export default class IndexRoute extends CheckSessionRoute {
+  @service('current-user')
+  currentUser;
+
+  @service('search-helper')
+  searchHelper;
+
+  async model() {
+    const user = get(this, 'currentUser.user');
+
+    let submissions = null;
+
+    if (user.get('isAdmin')) {
+      submissions = this._doAdmin();
+    } else if (user.get('isSubmitter')) {
+      submissions = this._doSubmitter(user);
+    }
+
+    submissions.then(() => this.searchHelper.clearIgnore());
+
+    return RSVP.hash({
+      submissions
+    });
+  }
+
+  _doAdmin() {
+    const ignoreList = this.searchHelper.getIgnoreList();
+
+    const query = {
+      sort: [{
+        submittedDate: {
+          missing: '_last',
+          order: 'desc'
+        }
+      }],
+      query: {
+        match_all: {},
+        must_not: [
+          { term: { submissionStatus: 'cancelled' } }
+        ]
+      },
+      size: 500
+    };
+
+    if (ignoreList && ignoreList.length > 0) {
+      query.query.must_not.push({ terms: { '@id': ignoreList } });
+    }
+
+    return this.store.query('submission', query);
+  }
+
+  _doSubmitter(user) {
+    const ignoreList = this.searchHelper.getIgnoreList();
+
+    const query = {
+      sort: [
+        { submitted: { missing: '_last', order: 'asc' } },
+        { submittedDate: { missing: '_last', order: 'desc' } },
+        { submissionStatus: { missing: '_last', order: 'asc' } }
+      ],
+      query: {
+        bool: {
+          should: [
+            { term: { submitter: user.get('id') } },
+            { term: { preparers: user.get('id') } },
+          ],
+          must_not: [
+            { term: { submissionStatus: 'cancelled' } }
+          ]
+        }
+      },
+      size: 500
+    };
+
+    if (ignoreList && ignoreList.length > 0) {
+      query.query.bool.must_not.push({ terms: { '@id': ignoreList } });
+    }
+
+    return this.store.query('submission', query);
+  }
+}

From 6b79544011c7260757e37ef8c1fd36f2e899641b Mon Sep 17 00:00:00 2001
From: Bointeka <jkaoga@gmail.com>
Date: Mon, 15 Nov 2021 20:48:53 -0500
Subject: [PATCH 05/12] Created cell components that populates table with
 correct name and email

---
 app/components/submissions-email-cell/index.hbs | 7 +++++++
 app/components/submissions-email-cell/index.js  | 3 +++
 app/components/submissions-name-cell/index.hbs  | 9 +++++++++
 app/components/submissions-name-cell/index.js   | 3 +++
 4 files changed, 22 insertions(+)
 create mode 100644 app/components/submissions-email-cell/index.hbs
 create mode 100644 app/components/submissions-email-cell/index.js
 create mode 100644 app/components/submissions-name-cell/index.hbs
 create mode 100644 app/components/submissions-name-cell/index.js

diff --git a/app/components/submissions-email-cell/index.hbs b/app/components/submissions-email-cell/index.hbs
new file mode 100644
index 000000000..6c68630a9
--- /dev/null
+++ b/app/components/submissions-email-cell/index.hbs
@@ -0,0 +1,7 @@
+{{#if (get @record 'submitter.email')}}
+    {{get @record 'submitter.email' }}
+{{else if (get @record @column.propertyName)}}
+    {{get @record @column.propertyName}}
+{{else}}
+    {{''}}
+{{/if}}
\ No newline at end of file
diff --git a/app/components/submissions-email-cell/index.js b/app/components/submissions-email-cell/index.js
new file mode 100644
index 000000000..66e4bd04b
--- /dev/null
+++ b/app/components/submissions-email-cell/index.js
@@ -0,0 +1,3 @@
+import Component from '@glimmer/component';
+
+export default class SubmissionsEmailCell extends Component {}
\ No newline at end of file
diff --git a/app/components/submissions-name-cell/index.hbs b/app/components/submissions-name-cell/index.hbs
new file mode 100644
index 000000000..96cbfe066
--- /dev/null
+++ b/app/components/submissions-name-cell/index.hbs
@@ -0,0 +1,9 @@
+{{#if (get @record 'submitter.displayName')}}
+    {{get @record 'submitter.displayName' }}
+{{else if (get @record 'submitter.firstName')}}
+    {{concat (get @record 'submitter.firstName' get @record 'submitter.lastName')}}
+{{else if (get @record @column.propertyName)}}
+    {{get @record @column.propertyName}}
+{{else}}
+    {{''}}
+{{/if}}
\ No newline at end of file
diff --git a/app/components/submissions-name-cell/index.js b/app/components/submissions-name-cell/index.js
new file mode 100644
index 000000000..5363c29c9
--- /dev/null
+++ b/app/components/submissions-name-cell/index.js
@@ -0,0 +1,3 @@
+import Component from '@glimmer/component';
+
+export default class SubmissionsNameCell extends Component {}
\ No newline at end of file

From b94918ac592c122e91f8849bf508945cd6b86814 Mon Sep 17 00:00:00 2001
From: Bointeka <jkaoga@gmail.com>
Date: Mon, 15 Nov 2021 20:49:48 -0500
Subject: [PATCH 06/12] Added name and email columns to the table.

---
 app/controllers/administrator/index.js | 15 ++++++++++++++-
 app/styles/app.scss                    |  2 ++
 app/templates/administrator/index.hbs  |  7 ++++---
 3 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/app/controllers/administrator/index.js b/app/controllers/administrator/index.js
index 9f593fe2d..b552aef2c 100644
--- a/app/controllers/administrator/index.js
+++ b/app/controllers/administrator/index.js
@@ -27,7 +27,8 @@ export default class SubmissionsIndex extends Controller {
 
   // Columns displayed depend on the user role
   get columns() {
-    if (get(this, 'currentUser.user.isAdmin')) {
+    //TODO: Change currentUser.user.isAdmin
+    if (get(this, 'currentUser.user.isSubmitter')) {
       return [
         {
           propertyName: 'publication',
@@ -58,6 +59,18 @@ export default class SubmissionsIndex extends Controller {
           className: 'status-column',
           component: 'submissions-status-cell'
         },
+        {
+          propertyName: 'submitterName',
+          title: 'Submitter Name',
+          className: 'name-column',
+          component: 'submissions-name-cell'
+        },
+        {
+          propertyName: 'submitterEmail',
+          title: 'Submitter Email',
+          className: 'email-column',
+          component: 'submissions-email-cell'
+        },
         {
           // propertyName: 'repoCopies',
           title: 'Manuscript IDs',
diff --git a/app/styles/app.scss b/app/styles/app.scss
index e533d7cf5..22b501913 100644
--- a/app/styles/app.scss
+++ b/app/styles/app.scss
@@ -428,6 +428,8 @@ table td {
 .msid-column { min-width: 10rem; }
 .actions-column { min-width: 8rem; }
 .awardnum-column { min-width: 8rem; }
+.name-column{ min-width: 8rem;}
+.email-column{ min-width: 8rem;}
 .awardnum-funder-column {
   min-width: 9.5rem;
 }
diff --git a/app/templates/administrator/index.hbs b/app/templates/administrator/index.hbs
index bef13a838..31dfe26a5 100644
--- a/app/templates/administrator/index.hbs
+++ b/app/templates/administrator/index.hbs
@@ -9,13 +9,13 @@
 </p>
 <div class="row">
     <div class="col-12" style="overflow-x: auto;">
-        <div class="submission-table" data-test-submissions-index-submissions-tab;e>
+        <div class="submission-table" data-test-submissions-index-submissions-table>
             <ModelsTable
                 @data={{this.model.submissions}}
                 @columns={{this.columns}}
                 @themeInstance={{this.themeInstance}}
                 @showColumnsDropdown={{false}}
-                @useFilteringByColumns={{false}}
+                @useFilteringByColumns={{true}}
                 @filteringIgnoreCase={{true}}
                 @multipleColumnsSorting={{false}}
                 @authorSelected="authorclick"
@@ -30,4 +30,5 @@
   @to={{this.messageTo}}
   @subject={{this.messageSubject}}
   @message={{this.messageText}}
-/>
\ No newline at end of file
+>
+</MessageDialog>
\ No newline at end of file

From 4542b22ee2c02f3cea722ac9c7043709a564e81f Mon Sep 17 00:00:00 2001
From: Bointeka <jkaoga@gmail.com>
Date: Tue, 23 Nov 2021 18:52:32 -0500
Subject: [PATCH 07/12] To enable sorting through elastic search rather than
 Ember models table, Added displayDataChangedAction that submits another
 action to the router which submits a new query based on the sort/filter
 requested.

---
 app/controllers/administrator/index.js | 45 +++++++++++++++++++++-
 app/routes/administrator/index.js      | 53 +++++++++++++++++++-------
 app/templates/administrator/index.hbs  |  1 +
 3 files changed, 84 insertions(+), 15 deletions(-)

diff --git a/app/controllers/administrator/index.js b/app/controllers/administrator/index.js
index b552aef2c..11ab6b664 100644
--- a/app/controllers/administrator/index.js
+++ b/app/controllers/administrator/index.js
@@ -1,13 +1,15 @@
 import Controller from '@ember/controller';
 import { tracked } from '@glimmer/tracking';
 import Bootstrap4Theme from 'ember-models-table/themes/bootstrap4';
-import { get } from '@ember/object';
+import { set, get } from '@ember/object';
 import { inject as service } from '@ember/service';
+import {action} from '@ember/object';
 
 export default class SubmissionsIndex extends Controller {
   @service currentUser;
   @service('app-static-config') configurator;
 
+  actionData = null;
   @tracked assetsUri = null;
   @tracked themeInstance = Bootstrap4Theme.create();
   // Bound to message dialog.
@@ -45,7 +47,7 @@ export default class SubmissionsIndex extends Controller {
           propertyName: 'repositories',
           title: 'Repositories',
           className: 'repositories-column',
-          component: 'submissions-repo-cell'
+          component: 'submissions-repo-cell',
         },
         {
           propertyName: 'submittedDate',
@@ -82,4 +84,43 @@ export default class SubmissionsIndex extends Controller {
       return [];
     }
   }
+
+  @action 
+  myAction(data) {
+      let filteredColumn = this.getFilteredColumns(data);
+      let sortedColumn = this.getSortedColumns(data);
+ 
+      this.send('updateTable', {sortedColumn: sortedColumn, 
+                                filteredColumn: filteredColumn})
+  }
+
+  getSortedColumns(data) {
+    if (data.sort.length === 0) {
+        return undefined;
+    }
+    let sort = data.sort[0].split(':')
+    let propertyName = sort[0];
+    let sortDirection = sort[1]; 
+
+    let querySort = {};
+    querySort[propertyName] = {
+        missing: '_last',
+        order: `${sortDirection}`
+    }
+    return [querySort];
+  }
+
+  getFilteredColumns(data) {
+    if (Object.keys(data.columnFilters).length === 0) {
+        return undefined;
+    }
+    let filterSort = [];
+    for (let column in data.columnFilters) {
+        let query = { 'term' : {}}
+        query['term'][column] = data.columnFilters[column]
+        filterSort.push(query)
+    }
+    return filterSort;
+  }
+  
 }
diff --git a/app/routes/administrator/index.js b/app/routes/administrator/index.js
index 9cba5c53f..396a794f8 100644
--- a/app/routes/administrator/index.js
+++ b/app/routes/administrator/index.js
@@ -2,6 +2,7 @@ import { inject as service } from '@ember/service';
 import CheckSessionRoute from '../check-session-route';
 import RSVP from 'rsvp';
 import { get } from '@ember/object';
+import {action} from '@ember/object';
 
 export default class IndexRoute extends CheckSessionRoute {
   @service('current-user')
@@ -10,6 +11,19 @@ export default class IndexRoute extends CheckSessionRoute {
   @service('search-helper')
   searchHelper;
 
+  defaultAdminSort = [{
+    submittedDate: {
+        missing: '_last',
+        order: 'desc'
+    }
+  }];
+
+  defaultSubmitterSort = [
+    { submitted: { missing: '_last', order: 'asc' } },
+    { submittedDate: { missing: '_last', order: 'desc' } },
+    { submissionStatus: { missing: '_last', order: 'asc' } }
+  ];
+
   async model() {
     const user = get(this, 'currentUser.user');
 
@@ -28,16 +42,13 @@ export default class IndexRoute extends CheckSessionRoute {
     });
   }
 
-  _doAdmin() {
+
+
+  _doAdmin(sortedColumn = this.defaultAdminSort) {
     const ignoreList = this.searchHelper.getIgnoreList();
 
     const query = {
-      sort: [{
-        submittedDate: {
-          missing: '_last',
-          order: 'desc'
-        }
-      }],
+      sort: sortedColumn,
       query: {
         match_all: {},
         must_not: [
@@ -54,15 +65,11 @@ export default class IndexRoute extends CheckSessionRoute {
     return this.store.query('submission', query);
   }
 
-  _doSubmitter(user) {
+  _doSubmitter(user, sortedColumn = this.defaultSubmitterSort) {
     const ignoreList = this.searchHelper.getIgnoreList();
 
     const query = {
-      sort: [
-        { submitted: { missing: '_last', order: 'asc' } },
-        { submittedDate: { missing: '_last', order: 'desc' } },
-        { submissionStatus: { missing: '_last', order: 'asc' } }
-      ],
+      sort: sortedColumn,
       query: {
         bool: {
           should: [
@@ -83,4 +90,24 @@ export default class IndexRoute extends CheckSessionRoute {
 
     return this.store.query('submission', query);
   }
+
+  @action
+  async updateTable({sortedColumn, filteredColumn}) {
+    console.log(sortedColumn, filteredColumn)
+    const user = get(this, 'currentUser.user');
+
+    let submissions = null;
+    
+    if (user.get('isAdmin')) {
+      submissions = this._doAdmin(sortedColumn);
+    } else if (user.get('isSubmitter')) {
+      submissions = this._doSubmitter(user, sortedColumn);
+    }
+
+    submissions.then(() => this.searchHelper.clearIgnore());
+
+    return RSVP.hash({
+      submissions
+    });
+  }
 }
diff --git a/app/templates/administrator/index.hbs b/app/templates/administrator/index.hbs
index 31dfe26a5..ef678c4b0 100644
--- a/app/templates/administrator/index.hbs
+++ b/app/templates/administrator/index.hbs
@@ -21,6 +21,7 @@
                 @authorSelected="authorclick"
                 @pageSize={{this.tablePageSize}}
                 @pageSizeValues={{this.tablePageSizeValues}}
+                @displayDataChangedAction={{this.myAction}}
             />   
         </div>
     </div>

From b0a2d3882f64524c200d36136eaafeffb2f9d40c Mon Sep 17 00:00:00 2001
From: Bointeka <jkaoga@gmail.com>
Date: Tue, 23 Nov 2021 19:16:58 -0500
Subject: [PATCH 08/12] Added another method of updating query

---
 app/routes/administrator/index.js | 35 ++++++++++++++++++++++++-------
 1 file changed, 28 insertions(+), 7 deletions(-)

diff --git a/app/routes/administrator/index.js b/app/routes/administrator/index.js
index 396a794f8..68025e6ab 100644
--- a/app/routes/administrator/index.js
+++ b/app/routes/administrator/index.js
@@ -24,17 +24,29 @@ export default class IndexRoute extends CheckSessionRoute {
     { submissionStatus: { missing: '_last', order: 'asc' } }
   ];
 
+  sort = undefined;
+  filter = undefined;
+
+
   async model() {
     const user = get(this, 'currentUser.user');
 
     let submissions = null;
 
+    //Method 1 of updating model
     if (user.get('isAdmin')) {
-      submissions = this._doAdmin();
+      submissions = this._doAdmin(this.sort, this.filter);
     } else if (user.get('isSubmitter')) {
-      submissions = this._doSubmitter(user);
+      submissions = this._doSubmitter(user, this.sort, this.filter);
     }
 
+    /* Default model - Method 2
+    if (user.get('isAdmin')) {
+        submissions = this._doAdmin();
+    } else if (user.get('isSubmitter')) {
+        submissions = this._doSubmitter(user);
+    } */
+
     submissions.then(() => this.searchHelper.clearIgnore());
 
     return RSVP.hash({
@@ -44,13 +56,14 @@ export default class IndexRoute extends CheckSessionRoute {
 
 
 
-  _doAdmin(sortedColumn = this.defaultAdminSort) {
+  _doAdmin(sortedColumn = this.defaultAdminSort, filteredColumn = []) {
     const ignoreList = this.searchHelper.getIgnoreList();
 
     const query = {
       sort: sortedColumn,
       query: {
         match_all: {},
+        filter: filteredColumn,
         must_not: [
           { term: { submissionStatus: 'cancelled' } }
         ]
@@ -65,7 +78,7 @@ export default class IndexRoute extends CheckSessionRoute {
     return this.store.query('submission', query);
   }
 
-  _doSubmitter(user, sortedColumn = this.defaultSubmitterSort) {
+  _doSubmitter(user, sortedColumn = this.defaultSubmitterSort, filteredColumn = []) {
     const ignoreList = this.searchHelper.getIgnoreList();
 
     const query = {
@@ -76,6 +89,7 @@ export default class IndexRoute extends CheckSessionRoute {
             { term: { submitter: user.get('id') } },
             { term: { preparers: user.get('id') } },
           ],
+          filter: filteredColumn,
           must_not: [
             { term: { submissionStatus: 'cancelled' } }
           ]
@@ -93,15 +107,21 @@ export default class IndexRoute extends CheckSessionRoute {
 
   @action
   async updateTable({sortedColumn, filteredColumn}) {
-    console.log(sortedColumn, filteredColumn)
     const user = get(this, 'currentUser.user');
 
+    //Method 1 of updating model
+    //Update fields then call model()
+    this.sort = sortedColumn;
+    this.filter = filteredColumn;
+    this.model();
+    
+    /* Method 2 of updating model
     let submissions = null;
     
     if (user.get('isAdmin')) {
-      submissions = this._doAdmin(sortedColumn);
+      submissions = this._doAdmin(sortedColumn, filteredColumn);
     } else if (user.get('isSubmitter')) {
-      submissions = this._doSubmitter(user, sortedColumn);
+      submissions = this._doSubmitter(user, sortedColumn, filteredColumn);
     }
 
     submissions.then(() => this.searchHelper.clearIgnore());
@@ -109,5 +129,6 @@ export default class IndexRoute extends CheckSessionRoute {
     return RSVP.hash({
       submissions
     });
+    */
   }
 }

From ebf147714044253a11cb09c7e5454c9a38fb6416 Mon Sep 17 00:00:00 2001
From: Bointeka <jkaoga@gmail.com>
Date: Sat, 4 Dec 2021 00:34:36 -0500
Subject: [PATCH 09/12] Split the Award/Funder cell into two distinct cells

---
 app/components/submissions-award-cell/index.hbs  | 2 +-
 app/components/submissions-funder-cell/index.hbs | 6 ++++++
 app/components/submissions-funder-cell/index.js  | 3 +++
 3 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100644 app/components/submissions-funder-cell/index.hbs
 create mode 100644 app/components/submissions-funder-cell/index.js

diff --git a/app/components/submissions-award-cell/index.hbs b/app/components/submissions-award-cell/index.hbs
index ab90c64bb..5cbbe9efa 100644
--- a/app/components/submissions-award-cell/index.hbs
+++ b/app/components/submissions-award-cell/index.hbs
@@ -1,6 +1,6 @@
 {{#each @record.grants as |grant index|}}
   {{if index ',<br>'}}
-    <LinkTo @route="grants.detail" @model={{grant.id}}>{{grant.awardNumber}}</LinkTo> ({{grant.primaryFunder.name}})
+    <LinkTo @route="grants.detail" @model={{grant.id}}>{{grant.awardNumber}}</LinkTo> 
   {{else}}
     Not Available
 {{/each}}
diff --git a/app/components/submissions-funder-cell/index.hbs b/app/components/submissions-funder-cell/index.hbs
new file mode 100644
index 000000000..4c2ec5a14
--- /dev/null
+++ b/app/components/submissions-funder-cell/index.hbs
@@ -0,0 +1,6 @@
+{{#each @record.grants as |grant index|}}
+  {{if index ',<br>'}}
+    {{grant.primaryFunder.name}}
+  {{else}}
+    Not Available
+{{/each}}
diff --git a/app/components/submissions-funder-cell/index.js b/app/components/submissions-funder-cell/index.js
new file mode 100644
index 000000000..985cac0a0
--- /dev/null
+++ b/app/components/submissions-funder-cell/index.js
@@ -0,0 +1,3 @@
+import Component from '@glimmer/component';
+
+export default class SubmissionsAwardCell extends Component {}

From 30f127183030ba8d13dd64b62d321030f4b22d4d Mon Sep 17 00:00:00 2001
From: Bointeka <jkaoga@gmail.com>
Date: Sat, 4 Dec 2021 00:35:19 -0500
Subject: [PATCH 10/12] Fixed naming error

---
 app/templates/administrator/detail.hbs | 241 +++++++++++++++++++++++++
 1 file changed, 241 insertions(+)
 create mode 100644 app/templates/administrator/detail.hbs

diff --git a/app/templates/administrator/detail.hbs b/app/templates/administrator/detail.hbs
new file mode 100644
index 000000000..736c00848
--- /dev/null
+++ b/app/templates/administrator/detail.hbs
@@ -0,0 +1,241 @@
+<div class="block-user-input text-center">
+  <div class="lds-dual-ring mx-auto"></div>
+</div>
+<div id="submission-details-title" class="row mb-2">
+  <div class="col-6">
+    <LinkTo @route="submissions" class="btn btn-small back-arrow"><i class="fa fa-arrow-left fa-lg"></i></LinkTo>
+    <h2 class="font-weight-light d-inline-block">Submission Detail</h2>
+  </div>
+  <div class="col-6 text-right">
+    {{#if this.model.sub.isStub}}
+      <LinkTo @route="submissions.new" @query={{hash submission=this.model.sub.id}} class="btn btn-outline-primary text-right">
+        Finish submission
+      </LinkTo>
+    {{else if this.model.sub.isDraft}}
+      <LinkTo
+        @route="submissions.new"
+        @query={{hash submission=this.model.sub.id}}
+        class="btn btn-outline-primary text-right"
+        data-test-submission-detail-edit-submission
+      >
+        Edit submission
+      </LinkTo>
+      <button {{action "deleteSubmission" this.model.sub}} class="btn btn-outline-danger text-right">
+        Delete
+      </button>
+    {{/if}}
+  </div>
+</div>
+<div id="submission-details-body" class="form-group row">
+  <div class="col-12">
+    <div class="list-group">
+      <div href="#" class="list-group-item flex-column align-items-start">
+        <div class="d-flex w-100 justify-content-between">
+          <h5 class="mb-1"> {{this.model.sub.publication.title}}</h5>
+          {{#if this.model.sub.submittedDate}}<small class="text-muted text-right">Submitted {{format-date
+            this.model.sub.submittedDate}}</small>{{/if}}
+        </div>
+        <p class="mb-1">DOI: {{#if this.model.sub.publication.doi}}{{this.model.sub.publication.doi}}{{else}}<span class="text-muted">None</span>{{/if}}</p>
+        <table class="table table-responsive-sm table-bordered w-100 d-flex">
+          <tbody>
+            <tr>
+              <td><strong>Submission status</strong></td>
+              <td>
+                <SubmissionStatus @submissionStatus={{this.model.sub.submissionStatus}} />
+              </td>
+            </tr>
+            {{#if this.model.sub.isCovid}}
+              <tr class="font-weight-bold">
+                <td></td>
+                <td>
+                  <div data-test-submission-detail-covid>
+                    This submission was marked as pertaining to COVID-19 research
+                    <a href="/faq.html#covid-19" target="_blank">(What does this mean?)</a>
+                  </div>
+                </td>
+              </tr>
+            {{/if}}
+            <tr>
+              <td><strong>Grants</strong></td>
+              <td>
+                <ul class="list-unstyled">
+                  {{#each this.model.sub.grants as |grant|}}
+                  <li data-test-submission-detail-grant><b>{{grant.awardNumber}}</b>: {{grant.projectName}}</li>
+                  <li data-test-submission-detail-funder><b>Funder</b>: {{grant.primaryFunder.name}}</li>
+                  {{#if (not-eq grant this.model.sub.grants.lastObject)}}
+                  <hr>
+                  {{/if}}
+                  {{/each}}
+                </ul>
+              </td>
+            </tr>
+            {{!-- Consolidate repository, deposit, repoCopy info --}}
+            {{#if this.repoMap}}
+            <tr>
+              <td class="text-nowrap"><strong>Repositories</strong></td>
+              <td>
+                <ul class="list-unstyled">
+                  {{#each this.repoMap as |repoInfo index|}}
+                    <SubmissionRepoDetails
+                      @repo={{repoInfo.repo}}
+                      @deposit={{repoInfo.deposit}}
+                      @repoCopy={{repoInfo.repositoryCopy}}
+                      @submission={{this.model.sub}}
+                    />
+                  {{/each}}
+                </ul>
+              </td>
+            </tr>
+            {{/if}}
+            {{#if this.externalSubmission}}
+            <tr>
+              <td><strong>External Submission Repositories</strong></td>
+              <td>
+                <ul class="list-unstyled">
+                  {{#each this.externalSubmission as |sub|}}
+                  <li>{{sub.message}}</li>
+                  {{/each}}
+                </ul>
+              </td>
+            </tr>
+            {{/if}}
+            <tr>
+              <td class="text-nowrap"><strong>Submitter</strong></td>
+              <td data-test-submission-detail-submitter>
+                {{#if (eq this.model.sub.source "other")}}
+                  <i>This submission did not originate from PASS</i>
+                {{else if this.displaySubmitterName}}
+                  {{this.displaySubmitterName}}
+                {{/if}}
+                {{#if this.displaySubmitterEmail}}
+                  &nbsp;(<a href="mailto:{{this.displaySubmitterEmail}}">{{this.displaySubmitterEmail}}</a>)
+                {{/if}}
+              </td>
+            </tr>
+            {{#if (await this.model.sub.preparers)}}
+            <tr>
+              <td class="text-nowrap"><strong>Preparer(s)</strong></td>
+              <td data-test-submission-detail-preparer>
+                {{#each (await this.model.sub.preparers) as |preparer index|}}
+                  {{#if index}}, {{/if}} {{get (await preparer) 'displayName'}}
+                  {{#if (get (await preparer) 'email')}}
+                    &nbsp;(<a href="mailto:{{get (await preparer) 'email'}}">{{get (await preparer) 'email'}}</a>)
+                  {{/if}}
+                {{/each}}
+              </td>
+            </tr>
+            {{/if}}
+            {{#if this.mustVisitWeblink}}
+            <tr>
+              <td id="externalSubmission">
+                <strong>External Submission Required</strong>
+                <br>
+                {{#if this.disableSubmit}}
+                <i class="fa fa-exclamation-triangle fa-2x mt-3 ml-3 notice-triangle"></i>
+                {{/if}}
+              </td>
+              <td>
+                <label class="">
+                  Please visit the following web portal to submit your manuscript directly. Metadata displayed above
+                  could be used to aid in your submission progress.
+                </label>
+                <ul class="m-0">
+                  {{#each this.weblinkRepos as |repo|}}
+                  <li>
+                    <button type="button" class="btn btn-link" {{action "openWeblinkAlert" repo}}>
+                      {{repo.url}}
+                    </button>
+                  </li>
+                  {{/each}}
+                </ul>
+              </td>
+            </tr>
+            {{/if}}
+            <tr>
+              <td><strong>Details</strong></td>
+              <td>
+                <DisplayMetadataKeys @submission={{this.model.sub}} />
+              </td>
+            </tr>
+            <tr>
+              <td><strong>Files</strong></td>
+              <td>
+                {{#if (eq this.model.sub.source "other")}}
+                <p class="mb-0">
+                  <i>We do not have a copy of manuscript files because this submission did not originate from PASS</i>
+                </p>
+                {{else}}
+                <table local-class="files-table" class="w-100">
+                  <thead>
+                    <tr>
+                      <th scope="col"></th>
+                      <th scope="col" class="font-weight-light">Name</th>
+                      <th scope="col" class="font-weight-light">Type</th>
+                      <th scope="col" class="font-weight-light">Description</th>
+                    </tr>
+                  </thead>
+                  <tbody class="striped">
+                    {{#each (get this.model 'files') as |file|}}
+                    <tr>
+                      <td data-label="icon">
+                        {{#if (eq file.mimeType 'png')}}
+                        <i local-class="line-height-35 text-gray fa-30" class="fas fa-file-image"></i> {{else if (eq file.mimeType
+                        'vnd.openxmlformats-officedocument.presentationml.presentation')}}
+                        <i local-class="line-height-35 text-gray fa-30" class="fas fa-file-powerpoint"></i> {{else if (eq
+                        file.mimeType 'msword')}}
+                        <i local-class="line-height-35 text-gray fa-30" class="fas fa-file-word"></i> {{else if (eq file.mimeType
+                        'pdf')}}
+                        <i local-class="line-height-35 text-gray fa-30" class="fas fa-file-pdf"></i>
+                        {{else}}
+                        <i local-class="line-height-35 text-gray fa-30" class="far fa-file"></i>
+                        {{/if}}
+                      </td>
+                      <td data-label="name" style="min-width:200px;">
+                        <a href={{file.uri}}>{{file.name}}</a>
+                      </td>
+                      <td data-label="type" class="text-nowrap">
+                        {{file.fileRole}}
+                      </td>
+                      <td data-label="description">
+                        {{file.description}}
+                      </td>
+                    </tr>
+                    {{/each}}
+                  </tbody>
+                </table>
+                {{/if}}
+              </td>
+            </tr>
+            {{#if (or this.this.isPreparer this.isSubmitter)}}
+              <tr>
+                <td class="text-nowrap"><strong>Comments</strong></td>
+                <td>
+                  <CommentingBlock @submissionEvents={{this.model.submissionEvents}} />
+                  {{#if (or (and this.isSubmitter this.submissionNeedsSubmitter) (and this.isPreparer this.submissionNeedsPreparer))}}
+                  <Textarea placeholder="Add comment" @value={{this.message}} class="form-control custom-control p-2" @rows="2" @style="resize:none; min-height: 38px!important;" />                {{/if}}              </td>
+              </tr>
+            {{/if}}
+          </tbody>
+        </table>
+      </div>
+    </div>
+  </div>
+</div>
+{{#if (and this.isSubmitter this.submissionNeedsSubmitter)}}
+  <div class="row">
+    <div class="col-12 text-right">
+      <button class="btn btn-primary" onclick={{action 'approveChanges'}}>Submit</button>
+      <button class="btn btn-outline-primary" onclick={{action 'requestMoreChanges'}}>Request More Changes</button>
+      <LinkTo @route="submissions.new" @query={{hash submission=this.model.sub.id}} class="btn btn-outline-primary">Edit Submission</LinkTo>
+      <button class="btn btn-danger" onclick={{action 'cancelSubmission'}}>Cancel Submission</button>
+    </div>
+  </div>
+{{/if}}
+{{#if (and this.isPreparer this.submissionNeedsPreparer)}}
+  <div class="row">
+    <div class="col-12 text-right">
+      <LinkTo @route="submissions.new" @query={{hash submission=this.model.sub.id}} class="btn btn-primary">Edit this
+      submission</LinkTo>
+    </div>
+  </div>
+{{/if}}

From 354c414159c09c31c85c3150d9fcf59fd67eb09d Mon Sep 17 00:00:00 2001
From: Bointeka <jkaoga@gmail.com>
Date: Sat, 4 Dec 2021 00:38:43 -0500
Subject: [PATCH 11/12] Removed unneeded comments. Added admin check in
 nav-bar/index.js

---
 app/components/nav-bar/index.hbs       |   5 +-
 app/routes/administrator/index.js      |   8 +-
 app/templates/administrator/detali.hbs | 241 -------------------------
 3 files changed, 7 insertions(+), 247 deletions(-)
 delete mode 100644 app/templates/administrator/detali.hbs

diff --git a/app/components/nav-bar/index.hbs b/app/components/nav-bar/index.hbs
index c7ecdd6b0..5b82f7a5c 100644
--- a/app/components/nav-bar/index.hbs
+++ b/app/components/nav-bar/index.hbs
@@ -13,8 +13,9 @@
           <ul class="navbar-nav" style="width:100%">
             <li class="nav-item"><LinkTo @route="dashboard" class="nav-link pl-0 ml-0">Dashboard</LinkTo></li>
             {{#if this.hasAUser}}
-              {{!-- TODO: Check whether the user is an administrator and not a regular user --}}
-              <li class="nav-item"><LinkTo @route="administrator" class="nav-link" data-test-navbar-administrator-link>Administrator</LinkTo></li>
+              {{#if this.currentUser.isAdmin}}
+                <li class="nav-item"><LinkTo @route="administrator" class="nav-link" data-test-navbar-administrator-link>Administrator</LinkTo></li>
+              {{/if}}
               <li class="nav-item"><LinkTo @route="grants" class="nav-link" data-test-navbar-grants-link>Grants</LinkTo></li>
               <li class="nav-item"><LinkTo @route="submissions" class="nav-link" data-test-navbar-submissions-link>Submissions</LinkTo></li>
             {{/if}}
diff --git a/app/routes/administrator/index.js b/app/routes/administrator/index.js
index 68025e6ab..869740cc6 100644
--- a/app/routes/administrator/index.js
+++ b/app/routes/administrator/index.js
@@ -3,6 +3,7 @@ import CheckSessionRoute from '../check-session-route';
 import RSVP from 'rsvp';
 import { get } from '@ember/object';
 import {action} from '@ember/object';
+import PublicationModel from '../../models/publication';
 
 export default class IndexRoute extends CheckSessionRoute {
   @service('current-user')
@@ -80,7 +81,6 @@ export default class IndexRoute extends CheckSessionRoute {
 
   _doSubmitter(user, sortedColumn = this.defaultSubmitterSort, filteredColumn = []) {
     const ignoreList = this.searchHelper.getIgnoreList();
-
     const query = {
       sort: sortedColumn,
       query: {
@@ -89,19 +89,19 @@ export default class IndexRoute extends CheckSessionRoute {
             { term: { submitter: user.get('id') } },
             { term: { preparers: user.get('id') } },
           ],
-          filter: filteredColumn,
           must_not: [
             { term: { submissionStatus: 'cancelled' } }
           ]
-        }
+          
+        },
       },
       size: 500
     };
-
     if (ignoreList && ignoreList.length > 0) {
       query.query.bool.must_not.push({ terms: { '@id': ignoreList } });
     }
 
+    console.log("tets")
     return this.store.query('submission', query);
   }
 
diff --git a/app/templates/administrator/detali.hbs b/app/templates/administrator/detali.hbs
deleted file mode 100644
index 736c00848..000000000
--- a/app/templates/administrator/detali.hbs
+++ /dev/null
@@ -1,241 +0,0 @@
-<div class="block-user-input text-center">
-  <div class="lds-dual-ring mx-auto"></div>
-</div>
-<div id="submission-details-title" class="row mb-2">
-  <div class="col-6">
-    <LinkTo @route="submissions" class="btn btn-small back-arrow"><i class="fa fa-arrow-left fa-lg"></i></LinkTo>
-    <h2 class="font-weight-light d-inline-block">Submission Detail</h2>
-  </div>
-  <div class="col-6 text-right">
-    {{#if this.model.sub.isStub}}
-      <LinkTo @route="submissions.new" @query={{hash submission=this.model.sub.id}} class="btn btn-outline-primary text-right">
-        Finish submission
-      </LinkTo>
-    {{else if this.model.sub.isDraft}}
-      <LinkTo
-        @route="submissions.new"
-        @query={{hash submission=this.model.sub.id}}
-        class="btn btn-outline-primary text-right"
-        data-test-submission-detail-edit-submission
-      >
-        Edit submission
-      </LinkTo>
-      <button {{action "deleteSubmission" this.model.sub}} class="btn btn-outline-danger text-right">
-        Delete
-      </button>
-    {{/if}}
-  </div>
-</div>
-<div id="submission-details-body" class="form-group row">
-  <div class="col-12">
-    <div class="list-group">
-      <div href="#" class="list-group-item flex-column align-items-start">
-        <div class="d-flex w-100 justify-content-between">
-          <h5 class="mb-1"> {{this.model.sub.publication.title}}</h5>
-          {{#if this.model.sub.submittedDate}}<small class="text-muted text-right">Submitted {{format-date
-            this.model.sub.submittedDate}}</small>{{/if}}
-        </div>
-        <p class="mb-1">DOI: {{#if this.model.sub.publication.doi}}{{this.model.sub.publication.doi}}{{else}}<span class="text-muted">None</span>{{/if}}</p>
-        <table class="table table-responsive-sm table-bordered w-100 d-flex">
-          <tbody>
-            <tr>
-              <td><strong>Submission status</strong></td>
-              <td>
-                <SubmissionStatus @submissionStatus={{this.model.sub.submissionStatus}} />
-              </td>
-            </tr>
-            {{#if this.model.sub.isCovid}}
-              <tr class="font-weight-bold">
-                <td></td>
-                <td>
-                  <div data-test-submission-detail-covid>
-                    This submission was marked as pertaining to COVID-19 research
-                    <a href="/faq.html#covid-19" target="_blank">(What does this mean?)</a>
-                  </div>
-                </td>
-              </tr>
-            {{/if}}
-            <tr>
-              <td><strong>Grants</strong></td>
-              <td>
-                <ul class="list-unstyled">
-                  {{#each this.model.sub.grants as |grant|}}
-                  <li data-test-submission-detail-grant><b>{{grant.awardNumber}}</b>: {{grant.projectName}}</li>
-                  <li data-test-submission-detail-funder><b>Funder</b>: {{grant.primaryFunder.name}}</li>
-                  {{#if (not-eq grant this.model.sub.grants.lastObject)}}
-                  <hr>
-                  {{/if}}
-                  {{/each}}
-                </ul>
-              </td>
-            </tr>
-            {{!-- Consolidate repository, deposit, repoCopy info --}}
-            {{#if this.repoMap}}
-            <tr>
-              <td class="text-nowrap"><strong>Repositories</strong></td>
-              <td>
-                <ul class="list-unstyled">
-                  {{#each this.repoMap as |repoInfo index|}}
-                    <SubmissionRepoDetails
-                      @repo={{repoInfo.repo}}
-                      @deposit={{repoInfo.deposit}}
-                      @repoCopy={{repoInfo.repositoryCopy}}
-                      @submission={{this.model.sub}}
-                    />
-                  {{/each}}
-                </ul>
-              </td>
-            </tr>
-            {{/if}}
-            {{#if this.externalSubmission}}
-            <tr>
-              <td><strong>External Submission Repositories</strong></td>
-              <td>
-                <ul class="list-unstyled">
-                  {{#each this.externalSubmission as |sub|}}
-                  <li>{{sub.message}}</li>
-                  {{/each}}
-                </ul>
-              </td>
-            </tr>
-            {{/if}}
-            <tr>
-              <td class="text-nowrap"><strong>Submitter</strong></td>
-              <td data-test-submission-detail-submitter>
-                {{#if (eq this.model.sub.source "other")}}
-                  <i>This submission did not originate from PASS</i>
-                {{else if this.displaySubmitterName}}
-                  {{this.displaySubmitterName}}
-                {{/if}}
-                {{#if this.displaySubmitterEmail}}
-                  &nbsp;(<a href="mailto:{{this.displaySubmitterEmail}}">{{this.displaySubmitterEmail}}</a>)
-                {{/if}}
-              </td>
-            </tr>
-            {{#if (await this.model.sub.preparers)}}
-            <tr>
-              <td class="text-nowrap"><strong>Preparer(s)</strong></td>
-              <td data-test-submission-detail-preparer>
-                {{#each (await this.model.sub.preparers) as |preparer index|}}
-                  {{#if index}}, {{/if}} {{get (await preparer) 'displayName'}}
-                  {{#if (get (await preparer) 'email')}}
-                    &nbsp;(<a href="mailto:{{get (await preparer) 'email'}}">{{get (await preparer) 'email'}}</a>)
-                  {{/if}}
-                {{/each}}
-              </td>
-            </tr>
-            {{/if}}
-            {{#if this.mustVisitWeblink}}
-            <tr>
-              <td id="externalSubmission">
-                <strong>External Submission Required</strong>
-                <br>
-                {{#if this.disableSubmit}}
-                <i class="fa fa-exclamation-triangle fa-2x mt-3 ml-3 notice-triangle"></i>
-                {{/if}}
-              </td>
-              <td>
-                <label class="">
-                  Please visit the following web portal to submit your manuscript directly. Metadata displayed above
-                  could be used to aid in your submission progress.
-                </label>
-                <ul class="m-0">
-                  {{#each this.weblinkRepos as |repo|}}
-                  <li>
-                    <button type="button" class="btn btn-link" {{action "openWeblinkAlert" repo}}>
-                      {{repo.url}}
-                    </button>
-                  </li>
-                  {{/each}}
-                </ul>
-              </td>
-            </tr>
-            {{/if}}
-            <tr>
-              <td><strong>Details</strong></td>
-              <td>
-                <DisplayMetadataKeys @submission={{this.model.sub}} />
-              </td>
-            </tr>
-            <tr>
-              <td><strong>Files</strong></td>
-              <td>
-                {{#if (eq this.model.sub.source "other")}}
-                <p class="mb-0">
-                  <i>We do not have a copy of manuscript files because this submission did not originate from PASS</i>
-                </p>
-                {{else}}
-                <table local-class="files-table" class="w-100">
-                  <thead>
-                    <tr>
-                      <th scope="col"></th>
-                      <th scope="col" class="font-weight-light">Name</th>
-                      <th scope="col" class="font-weight-light">Type</th>
-                      <th scope="col" class="font-weight-light">Description</th>
-                    </tr>
-                  </thead>
-                  <tbody class="striped">
-                    {{#each (get this.model 'files') as |file|}}
-                    <tr>
-                      <td data-label="icon">
-                        {{#if (eq file.mimeType 'png')}}
-                        <i local-class="line-height-35 text-gray fa-30" class="fas fa-file-image"></i> {{else if (eq file.mimeType
-                        'vnd.openxmlformats-officedocument.presentationml.presentation')}}
-                        <i local-class="line-height-35 text-gray fa-30" class="fas fa-file-powerpoint"></i> {{else if (eq
-                        file.mimeType 'msword')}}
-                        <i local-class="line-height-35 text-gray fa-30" class="fas fa-file-word"></i> {{else if (eq file.mimeType
-                        'pdf')}}
-                        <i local-class="line-height-35 text-gray fa-30" class="fas fa-file-pdf"></i>
-                        {{else}}
-                        <i local-class="line-height-35 text-gray fa-30" class="far fa-file"></i>
-                        {{/if}}
-                      </td>
-                      <td data-label="name" style="min-width:200px;">
-                        <a href={{file.uri}}>{{file.name}}</a>
-                      </td>
-                      <td data-label="type" class="text-nowrap">
-                        {{file.fileRole}}
-                      </td>
-                      <td data-label="description">
-                        {{file.description}}
-                      </td>
-                    </tr>
-                    {{/each}}
-                  </tbody>
-                </table>
-                {{/if}}
-              </td>
-            </tr>
-            {{#if (or this.this.isPreparer this.isSubmitter)}}
-              <tr>
-                <td class="text-nowrap"><strong>Comments</strong></td>
-                <td>
-                  <CommentingBlock @submissionEvents={{this.model.submissionEvents}} />
-                  {{#if (or (and this.isSubmitter this.submissionNeedsSubmitter) (and this.isPreparer this.submissionNeedsPreparer))}}
-                  <Textarea placeholder="Add comment" @value={{this.message}} class="form-control custom-control p-2" @rows="2" @style="resize:none; min-height: 38px!important;" />                {{/if}}              </td>
-              </tr>
-            {{/if}}
-          </tbody>
-        </table>
-      </div>
-    </div>
-  </div>
-</div>
-{{#if (and this.isSubmitter this.submissionNeedsSubmitter)}}
-  <div class="row">
-    <div class="col-12 text-right">
-      <button class="btn btn-primary" onclick={{action 'approveChanges'}}>Submit</button>
-      <button class="btn btn-outline-primary" onclick={{action 'requestMoreChanges'}}>Request More Changes</button>
-      <LinkTo @route="submissions.new" @query={{hash submission=this.model.sub.id}} class="btn btn-outline-primary">Edit Submission</LinkTo>
-      <button class="btn btn-danger" onclick={{action 'cancelSubmission'}}>Cancel Submission</button>
-    </div>
-  </div>
-{{/if}}
-{{#if (and this.isPreparer this.submissionNeedsPreparer)}}
-  <div class="row">
-    <div class="col-12 text-right">
-      <LinkTo @route="submissions.new" @query={{hash submission=this.model.sub.id}} class="btn btn-primary">Edit this
-      submission</LinkTo>
-    </div>
-  </div>
-{{/if}}

From ebe12955bc413b589d55ae942f4e7ad7a8e62425 Mon Sep 17 00:00:00 2001
From: Bointeka <jkaoga@gmail.com>
Date: Sat, 4 Dec 2021 00:40:07 -0500
Subject: [PATCH 12/12] Removed filtering and sorting from non-working cells.
 Split up Funder and Award Cells. Added drop down filtering for status cell

---
 app/controllers/administrator/index.js | 36 +++++++++++++++++++-------
 1 file changed, 27 insertions(+), 9 deletions(-)

diff --git a/app/controllers/administrator/index.js b/app/controllers/administrator/index.js
index 11ab6b664..6a8d82de0 100644
--- a/app/controllers/administrator/index.js
+++ b/app/controllers/administrator/index.js
@@ -17,7 +17,7 @@ export default class SubmissionsIndex extends Controller {
   @tracked messageTo = '';
   @tracked messageSubject = '';
   @tracked messageText = '';
-  @tracked tablePageSize = 50;
+  @tracked tablePageSize = 10;
   @tracked tablePageSizeValues = [10, 25, 50];
 
   constructor() {
@@ -29,19 +29,31 @@ export default class SubmissionsIndex extends Controller {
 
   // Columns displayed depend on the user role
   get columns() {
-    //TODO: Change currentUser.user.isAdmin
-    if (get(this, 'currentUser.user.isSubmitter')) {
+    if (get(this, 'currentUser.user.isAdmin')) {
       return [
         {
           propertyName: 'publication',
           title: 'Article',
           className: 'title-column',
-          component: 'submissions-article-cell'
+          component: 'submissions-article-cell',
+          disableSorting: true,
+          disableFiltering: true
         },
         {
-          title: 'Award Number (Funder)',
+          propertyName: 'awardNumber',
+          title: 'Award Number',
           className: 'awardnum-funder-column',
-          component: 'submissions-award-cell'
+          component: 'submissions-award-cell',
+          disableSorting: true,
+          disableFiltering: true
+        },
+        {
+          propertyName: 'Funder',
+          title: 'Funder',
+          className: 'funder-column',
+          component: 'submissions-funder-cell',
+          disableSorting: true,
+          disableFiltering: true
         },
         {
           propertyName: 'repositories',
@@ -59,7 +71,8 @@ export default class SubmissionsIndex extends Controller {
           propertyName: 'submissionStatus',
           title: 'Status',
           className: 'status-column',
-          component: 'submissions-status-cell'
+          component: 'submissions-status-cell',
+          filterWithSelect: true
         },
         {
           propertyName: 'submitterName',
@@ -74,10 +87,12 @@ export default class SubmissionsIndex extends Controller {
           component: 'submissions-email-cell'
         },
         {
-          // propertyName: 'repoCopies',
+          propertyName: 'repoCopies',
           title: 'Manuscript IDs',
           className: 'msid-column',
-          component: 'submissions-repoid-cell'
+          component: 'submissions-repoid-cell',
+          disableSorting: true,
+          disableFiltering: true
         }
       ];
     } else { // eslint-disable-line
@@ -107,6 +122,7 @@ export default class SubmissionsIndex extends Controller {
         missing: '_last',
         order: `${sortDirection}`
     }
+    console.log(querySort)
     return [querySort];
   }
 
@@ -117,6 +133,8 @@ export default class SubmissionsIndex extends Controller {
     let filterSort = [];
     for (let column in data.columnFilters) {
         let query = { 'term' : {}}
+        if (column === "publication") {
+        }
         query['term'][column] = data.columnFilters[column]
         filterSort.push(query)
     }