[WIP] Always make complete updates (#49)

criteo-forks · Jan 25, 2022 · 3035a2d · 3035a2d
1 parent 7f610e0
commit 3035a2d
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 12 deletions.
diff --git a/src/js/actions/AppsActions.js b/src/js/actions/AppsActions.js
@@ -185,9 +185,9 @@ var AppsActions = {
       appId: appId
     });
 
-    var url = `${config.apiURL}v2/apps/${appId}`;
+    var url = `${config.apiURL}v2/apps/${appId}?partialUpdate=false`;
     if (force) {
-      url = url + "?force=true";
+      url = url + "&force=true";
     }
 
     this.request({

diff --git a/src/js/components/AppVersionComponent.jsx b/src/js/components/AppVersionComponent.jsx
@@ -103,8 +103,7 @@ var AppVersionComponent = React.createClass({
 
   handleRollbackToAppVersion: function () {
     var appVersion = this.props.appVersion;
-    var appDiff = AppVersionStore.getAppConfigDiff(appVersion.id, appVersion);
-    AppsActions.applySettingsOnApp(appVersion.id, appDiff);
+    AppsActions.applySettingsOnApp(appVersion.id, appVersion);
   },
 
   getButtonClassSet: function () {

diff --git a/src/js/components/modals/AppModalComponent.jsx b/src/js/components/modals/AppModalComponent.jsx
@@ -120,8 +120,7 @@ var AppModalComponent = React.createClass({
       const app = this.state.app;
 
       if (this.props.editMode) {
-        let appDiff = AppVersionStore.getAppConfigDiff(app.id, app);
-        AppsActions.applySettingsOnApp(app.id, appDiff, true, this.state.force);
+        AppsActions.applySettingsOnApp(app.id, app, true, this.state.force);
       } else {
         AppsActions.createApp(app);
       }

diff --git a/src/test/scenarios/updateApplication.test.js b/src/test/scenarios/updateApplication.test.js
@@ -34,7 +34,7 @@ describe("Update Application", function () {
     // like the API would do.
     // Indeed the payload isn't processed by the store yet.
     nock(config.apiURL)
-      .put("/v2/apps//app-1")
+      .put("/v2/apps//app-1?partialUpdate=false")
       .reply(200, {
         "deploymentId": "deployment-that-applies-new-settings",
         "version": "v2"
@@ -55,8 +55,8 @@ describe("Update Application", function () {
 
   it("receives an apply error on bad data", function (done) {
     nock(config.apiURL)
-      .put("/v2/apps//app-1")
-      .reply(400, {message: "apply bad data error"});
+      .put("/v2/apps//app-1?partialUpdate=false")
+      .reply(400, { message: "apply bad data error" });
 
     AppsStore.once(AppsEvents.APPLY_APP_ERROR, function (error) {
       expectAsync(function () {
@@ -77,7 +77,7 @@ describe("Update Application", function () {
     // like the API would do.
     // Indeed the payload isn't processed by the store yet.
     nock(config.apiURL)
-      .put("/v2/apps//app-1")
+      .put("/v2/apps//app-1?partialUpdate=false")
       .reply(200, {
         "deploymentId": "deployment-that-applies-new-settings",
         "version": "v2"
@@ -94,8 +94,8 @@ describe("Update Application", function () {
 
   it("it passes isEditing-flag on error", function (done) {
     nock(config.apiURL)
-      .put("/v2/apps//app-1")
-      .reply(400, {message: "apply bad data error"});
+      .put("/v2/apps//app-1?partialUpdate=false")
+      .reply(400, { message: "apply bad data error" });
 
     AppsStore.once(AppsEvents.APPLY_APP_ERROR, function (error, isEditing) {
       expectAsync(function () {