Merge pull request #7400 from jrjohnson/data-config

Ember data compatibility upgrade
ilios · Sep 11, 2023 · 431caa4 · 431caa4
2 parents e0c4cb3 + 9ecae3c
commit 431caa4
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 10 deletions.
diff --git a/app/components/reports/subject/new/instructor.js b/app/components/reports/subject/new/instructor.js
@@ -9,7 +9,7 @@ export default class ReportsSubjectNewInstructorComponent extends Component {
 
   @cached
   get selectedInstructor() {
-    return new TrackedAsyncData(this.store.find('user', this.args.currentId));
+    return new TrackedAsyncData(this.store.findRecord('user', this.args.currentId));
   }
 
   @action

diff --git a/app/components/reports/subject/new/mesh-term.js b/app/components/reports/subject/new/mesh-term.js
@@ -9,7 +9,7 @@ export default class ReportsSubjectNewProgramComponent extends Component {
 
   @cached
   get selectedMeshTerm() {
-    return new TrackedAsyncData(this.store.find('mesh-descriptor', this.args.currentId));
+    return new TrackedAsyncData(this.store.findRecord('mesh-descriptor', this.args.currentId));
   }
 
   @action

diff --git a/config/deprecation-workflow.js b/config/deprecation-workflow.js
@@ -17,14 +17,6 @@ window.deprecationWorkflow.config = {
     { handler: 'silence', matchId: 'ember-modifier.use-modify' },
     { handler: 'silence', matchId: 'ember-modifier.function-based-options' },
     { handler: 'silence', matchId: 'ember-polyfills.deprecate-assign' },
-    { handler: 'silence', matchId: 'ember-data:model-save-promise' }, //https://github.com/emberjs/data/issues/7997
-    { handler: 'silence', matchId: 'ember-data:deprecate-promise-proxies' }, //https://github.com/emberjs/data/issues/7997
-    { handler: 'silence', matchId: 'ember-data:deprecate-non-strict-relationships' },
-    { handler: 'silence', matchId: 'ember-data:deprecate-early-static' },
-    { handler: 'silence', matchId: 'ember-data:deprecate-array-like' },
-    { handler: 'silence', matchId: 'ember-data:deprecate-promise-many-array-behaviors' },
-    { handler: 'silence', matchId: 'ember-data:no-a-with-array-like' },
-    { handler: 'silence', matchId: 'ember-data:deprecate-store-find' },
     { handler: 'silence', matchId: 'common.dates-no-dates' },
   ],
 };
diff --git a/ember-cli-build.js b/ember-cli-build.js
@@ -19,6 +19,9 @@ module.exports = function (defaults) {
     sourcemaps: {
       enabled: true,
     },
+    emberData: {
+      compatWith: '5.2',
+    },
 
     hinting: isTestBuild,
     babel: {