refactor: remove ensure-safe-component.string deprecation

eclipse-pass · Jun 27, 2024 · 93ed238 · 93ed238
1 parent 2826c09
commit 93ed238
Show file tree

Hide file tree

Showing 11 changed files with 360 additions and 54 deletions.
diff --git a/app/components/workflow-grants/index.hbs b/app/components/workflow-grants/index.hbs
@@ -53,6 +53,11 @@
       <ModelsTable
         @data={{this.submitterGrants}}
         @columns={{this.grantColumns}}
+        @columnComponents={{hash
+          grantLinkNewtabCell=(component "grant-link-newtab-cell")
+          grantTitleDateCell=(component "grant-title-date-cell")
+          selectRowToggle=(component "select-row-toggle")
+        }}
         @themeInstance={{this.themeInstance}}
         @showColumnsDropdown={{false}}
         @useFilteringByColumns={{false}}

diff --git a/app/components/workflow-grants/index.js b/app/components/workflow-grants/index.js
@@ -35,13 +35,13 @@ export default class WorkflowGrants extends Component {
       propertyName: 'awardNumber',
       title: 'Award Number',
       className: 'awardnum-column',
-      component: 'grant-link-newtab-cell',
+      component: 'grantLinkNewtabCell',
       disableSorting: true,
     },
     {
       title: 'Project name (funding period)',
       className: 'projectname-date-column',
-      component: 'grant-title-date-cell',
+      component: 'grantTitleDateCell',
       disableSorting: true,
     },
     {
@@ -52,7 +52,7 @@ export default class WorkflowGrants extends Component {
     },
     {
       title: 'Select',
-      component: 'select-row-toggle',
+      component: 'selectRowToggle',
       mayBeHidden: false,
     },
   ];

diff --git a/app/controllers/grants/detail.js b/app/controllers/grants/detail.js
@@ -20,19 +20,19 @@ export default class GrantDetailsController extends Controller {
       propertyName: 'publicationTitle',
       className: 'title-column',
       title: 'Article',
-      component: 'submissions-article-cell',
+      component: 'submissionsArticleCell',
     },
     {
       title: 'Award Number (Funder)',
       propertyName: 'grantInfo',
       className: 'awardnum-funder-column',
-      component: 'submissions-award-cell',
+      component: 'submissionsAwardCell',
       disableSorting: true,
     },
     {
       propertyName: 'repositoryNames',
       title: 'Repositories',
-      component: 'submissions-repo-cell',
+      component: 'submissionsRepoCell',
       className: 'repositories-column',
       disableSorting: true,
     },
@@ -46,19 +46,19 @@ export default class GrantDetailsController extends Controller {
       propertyName: 'submissionStatus',
       title: 'Status',
       className: 'status-column',
-      component: 'submissions-status-cell',
+      component: 'submissionsStatusCell',
     },
     {
       propertyName: 'repoCopies',
       className: 'msid-column',
       title: 'Manuscript IDs',
-      component: 'submissions-repoid-cell',
+      component: 'submissionsRepoidCell',
       disableSorting: true,
     },
     {
       title: 'Actions',
       className: 'actions-column',
-      component: 'submission-action-cell',
+      component: 'submissionActionCell',
     },
   ];
 

diff --git a/app/controllers/grants/index.js b/app/controllers/grants/index.js
@@ -25,7 +25,7 @@ export default class GrantsIndexController extends Controller {
       propertyName: 'grant.projectName',
       title: 'Project Name',
       className: 'projectname-column',
-      component: 'grant-link-cell',
+      component: 'grantLinkCell',
     },
     {
       propertyName: 'grant.primaryFunder.name',
@@ -39,12 +39,12 @@ export default class GrantsIndexController extends Controller {
       title: 'Award Number',
       className: 'awardnum-column',
       disableFiltering: true,
-      component: 'grant-link-cell',
+      component: 'grantLinkCell',
     },
     {
       title: 'PI',
       propertyName: 'grant.pi',
-      component: 'pi-list-cell',
+      component: 'piListCell',
     },
     {
       propertyName: 'grant.startDate',
@@ -70,7 +70,7 @@ export default class GrantsIndexController extends Controller {
       propertyName: 'submissions.length',
       title: 'Submissions count',
       disableFiltering: true,
-      component: 'grant-link-cell',
+      component: 'grantLinkCell',
     },
   ];
 
@@ -79,7 +79,7 @@ export default class GrantsIndexController extends Controller {
       propertyName: 'grant.projectName',
       title: 'Project Name',
       className: 'projectname-column',
-      component: 'grant-link-cell',
+      component: 'grantLinkCell',
     },
     {
       propertyName: 'grant.primaryFunder.name',
@@ -93,7 +93,7 @@ export default class GrantsIndexController extends Controller {
       title: 'Award #',
       className: 'awardnum-column',
       disableFiltering: true,
-      component: 'grant-link-cell',
+      component: 'grantLinkCell',
     },
     {
       propertyName: 'grant.endDate',
@@ -106,7 +106,7 @@ export default class GrantsIndexController extends Controller {
       propertyName: 'submissions.length',
       title: '# of Submissions',
       disableFiltering: true,
-      component: 'grant-submission-cell',
+      component: 'grantSubmissionCell',
     },
     {
       propertyName: 'grant.awardStatus',
@@ -115,7 +115,7 @@ export default class GrantsIndexController extends Controller {
     },
     {
       title: 'Actions',
-      component: 'grant-action-cell',
+      component: 'grantActionCell',
     },
   ];
 

diff --git a/app/controllers/submissions/index.js b/app/controllers/submissions/index.js
@@ -49,18 +49,18 @@ export default class SubmissionsIndex extends Controller {
           propertyName: 'publication',
           title: 'Article',
           className: 'title-column',
-          component: 'submissions-article-cell',
+          component: 'submissionsArticleCell',
         },
         {
           title: 'Award Number (Funder)',
           className: 'awardnum-funder-column',
-          component: 'submissions-award-cell',
+          component: 'submissionsAwardCell',
         },
         {
           propertyName: 'repositories',
           title: 'Repositories',
           className: 'repositories-column',
-          component: 'submissions-repo-cell',
+          component: 'submissionsRepoCell',
         },
         {
           propertyName: 'submittedDate',
@@ -72,13 +72,13 @@ export default class SubmissionsIndex extends Controller {
           propertyName: 'submissionStatus',
           title: 'Status',
           className: 'status-column',
-          component: 'submissions-status-cell',
+          component: 'submissionsStatusCell',
         },
         {
           // propertyName: 'repoCopies',
           title: 'Manuscript IDs',
           className: 'msid-column',
-          component: 'submissions-repoid-cell',
+          component: 'submissionsRepoidCell',
         },
       ];
     } else if (this.currentUser.user.isSubmitter) {
@@ -87,19 +87,19 @@ export default class SubmissionsIndex extends Controller {
           propertyName: 'publicationTitle',
           className: 'title-column',
           title: 'Article',
-          component: 'submissions-article-cell',
+          component: 'submissionsArticleCell',
         },
         {
           title: 'Award Number (Funder)',
           propertyName: 'grantInfo',
           className: 'awardnum-funder-column',
-          component: 'submissions-award-cell',
+          component: 'submissionsAwardCell',
           disableSorting: true,
         },
         {
           propertyName: 'repositoryNames',
           title: 'Repositories',
-          component: 'submissions-repo-cell',
+          component: 'submissionsRepoCell',
           className: 'repositories-column',
           disableSorting: true,
         },
@@ -113,19 +113,19 @@ export default class SubmissionsIndex extends Controller {
           propertyName: 'submissionStatus',
           title: 'Status',
           className: 'status-column',
-          component: 'submissions-status-cell',
+          component: 'submissionsStatusCell',
         },
         {
           propertyName: 'repoCopies',
           className: 'msid-column',
           title: 'Manuscript IDs',
-          component: 'submissions-repoid-cell',
+          component: 'submissionsRepoidCell',
           disableSorting: true,
         },
         {
           title: 'Actions',
           className: 'actions-column',
-          component: 'submission-action-cell',
+          component: 'submissionActionCell',
         },
       ];
     } else {

diff --git a/app/deprecation-workflow.js b/app/deprecation-workflow.js
@@ -2,7 +2,6 @@ import setupDeprecationWorkflow from 'ember-cli-deprecation-workflow';
 
 setupDeprecationWorkflow({
   workflow: [
-    { handler: 'silence', matchId: 'ensure-safe-component.string' },
     { handler: 'silence', matchId: 'routing.transition-methods' },
     { handler: 'silence', matchId: 'ember-data:deprecate-promise-many-array-behaviors' },
     { handler: 'silence', matchId: 'ember-data:deprecate-array-like' },

diff --git a/app/templates/grants/detail.hbs b/app/templates/grants/detail.hbs
@@ -87,6 +87,14 @@
       <ModelsTableServerPaginated
         @data={{this.queuedModel.submissions.data}}
         @columns={{this.columns}}
+        @columnComponents={{hash
+          submissionsArticleCell=(component "submissions-article-cell")
+          submissionsAwardCell=(component "submissions-award-cell")
+          submissionsRepoCell=(component "submissions-repo-cell")
+          submissionsStatusCell=(component "submissions-status-cell")
+          submissionsRepoidCell=(component "submissions-repoid-cell")
+          submissionActionCell=(component "submission-action-cell")
+        }}
         @themeInstance={{this.themeInstance}}
         @showColumnsDropdown={{false}}
         @filteringIgnoreCase={{true}}

diff --git a/app/templates/grants/index.hbs b/app/templates/grants/index.hbs
@@ -20,6 +20,12 @@
       <ModelsTableServerPaginated
         @data={{this.queuedModel.grantMap}}
         @columns={{this.columns}}
+        @columnComponents={{hash
+          grantLinkCell=(component "grant-link-cell")
+          piListCell=(component "pi-list-cell")
+          grantSubmissionCell=(component "grant-submission-cell")
+          grantActionCell=(component "grant-action-cell")
+        }}
         @themeInstance={{this.themeInstance}}
         @showColumnsDropdown={{false}}
         @useFilteringByColumns={{false}}

diff --git a/app/templates/submissions/index.hbs b/app/templates/submissions/index.hbs
@@ -27,6 +27,14 @@
       <ModelsTableServerPaginated
         @data={{this.queuedModel.submissions}}
         @columns={{this.columns}}
+        @columnComponents={{hash
+          submissionsArticleCell=(component "submissions-article-cell")
+          submissionsAwardCell=(component "submissions-award-cell")
+          submissionsRepoCell=(component "submissions-repo-cell")
+          submissionsStatusCell=(component "submissions-status-cell")
+          submissionsRepoidCell=(component "submissions-repoid-cell")
+          submissionActionCell=(component "submission-action-cell")
+        }}
         @themeInstance={{this.themeInstance}}
         @showColumnsDropdown={{false}}
         @useFilteringByColumns={{false}}

diff --git a/package.json b/package.json
@@ -75,7 +75,7 @@
     "ember-load-initializers": "^2.1.2",
     "ember-lodash": "^4.19.4",
     "ember-modal-dialog": "^4.1.2",
-    "ember-models-table": "^4.8.0",
+    "ember-models-table": "^5.4.1",
     "ember-page-title": "^7.0.0",
     "ember-power-select": "^7.0.0",
     "ember-qunit": "^6.2.0",