Merge pull request #11447 from pangratz/upgrade-ember-data-and-model-…

…fragments Upgrade ember data to 3.24 and model fragments to 5.0.0-beta.2
hashicorp · Nov 5, 2021 · 1e951ec · 1e951ec
2 parents 2bb8313 + 8272605
commit 1e951ec
Show file tree

Hide file tree

Showing 4 changed files with 154 additions and 102 deletions.
diff --git a/ui/app/components/allocation-row.js b/ui/app/components/allocation-row.js
@@ -86,7 +86,7 @@ async function qualifyAllocation() {
   // Make sure the allocation is a complete record and not a partial so we
   // can show information such as preemptions and rescheduled allocation.
   if (allocation.isPartial) {
-    await allocation.reload();
+    await this.store.findRecord('allocation', allocation.id, { backgroundReload: false });
   }
 
   if (allocation.get('job.isPending')) {

diff --git a/ui/package.json b/ui/package.json
@@ -77,8 +77,8 @@
     "ember-composable-helpers": "^4.4.1",
     "ember-concurrency": "^1.0.0",
     "ember-copy": "^1.0.0",
-    "ember-data": "~3.12.0",
-    "ember-data-model-fragments": "4.0.0",
+    "ember-data": "~3.24",
+    "ember-data-model-fragments": "5.0.0-beta.2",
     "ember-decorators": "^6.1.1",
     "ember-export-application-global": "^2.0.1",
     "ember-fetch": "^8.0.2",

diff --git a/ui/tests/acceptance/job-versions-test.js b/ui/tests/acceptance/job-versions-test.js
@@ -114,7 +114,7 @@ module('Acceptance | job versions', function(hooks) {
 
     if (versionRowToRevertTo) {
       // The default Mirage implementation updates the job version as passed in, this does nothing
-      server.pretender.post('/v1/job/:id/revert', () => [200, {}, '']);
+      server.pretender.post('/v1/job/:id/revert', () => [200, {}, '{}']);
 
       await versionRowToRevertTo.revertToButton.idle();
       await versionRowToRevertTo.revertToButton.confirm();