From be155ceab98ca7da83f60e8cb5e792962ce826c7 Mon Sep 17 00:00:00 2001
From: Nicolas Perriault <nicolas@perriault.net>
Date: Tue, 31 Jan 2017 17:09:05 +0100
Subject: [PATCH] Fix #377, #378: Allow dropping edited resource properties.

---
 package.json                  |  2 +-
 src/components/HomePage.js    |  3 ++-
 src/sagas/bucket.js           | 10 ++--------
 src/sagas/collection.js       |  4 +---
 test/sagas/bucket_test.js     |  7 ++++---
 test/sagas/collection_test.js |  1 -
 6 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/package.json b/package.json
index 2ab691c58..c3e914031 100644
--- a/package.json
+++ b/package.json
@@ -41,7 +41,7 @@
     "react-breadcrumbs": "^1.3.16",
     "react-codemirror": "^0.2.3",
     "react-dom": "^15.2.0",
-    "react-jsonschema-form": "^0.41.2",
+    "react-jsonschema-form": "^0.42.0",
     "react-redux": "^4.0.0",
     "react-router": "^2.7.0",
     "react-router-redux": "4.0.5",
diff --git a/src/components/HomePage.js b/src/components/HomePage.js
index ca0857b25..60bda4ce3 100644
--- a/src/components/HomePage.js
+++ b/src/components/HomePage.js
@@ -5,6 +5,7 @@ import React, { Component } from "react";
 
 import Spinner from "./Spinner";
 import AuthForm from "./AuthForm";
+import { isObject } from "../utils";
 
 
 function ServerProps({node}: {node: Object}) {
@@ -17,7 +18,7 @@ function ServerProps({node}: {node: Object}) {
             <tr key={i}>
               <th>{key}</th>
               <td style={{width: "100%"}}>{
-                typeof childNode === "object" ?
+                isObject(childNode) ?
                   <ServerProps node={childNode} /> :
                   typeof childNode === "string" && childNode.startsWith("http") ?
                     <a href={childNode} target="_blank">{childNode}</a> :
diff --git a/src/sagas/bucket.js b/src/sagas/bucket.js
index ec2a9d462..aa60c702b 100644
--- a/src/sagas/bucket.js
+++ b/src/sagas/bucket.js
@@ -44,7 +44,6 @@ export function* updateBucket(getState: GetStateFn, action: ActionType<typeof ac
     if (data) {
       const updatedBucket = {...data, last_modified};
       yield call([bucket, bucket.setData], updatedBucket, {
-        patch: true,
         safe: true,
       });
       yield put(redirectTo("bucket:attributes", {bid}));
@@ -102,9 +101,7 @@ export function* updateCollection(getState: GetStateFn, action: ActionType<typeo
     const coll = getCollection(bid, cid);
     if (data) {
       const updatedCollection = {...data, last_modified};
-      yield call([coll, coll.setData], updatedCollection, {
-        patch: true,
-        safe: true});
+      yield call([coll, coll.setData], updatedCollection, {safe: true});
       yield put(redirectTo("collection:records", {bid, cid}));
       yield put(notifySuccess("Collection attributes updated."));
     } else if (permissions) {
@@ -222,10 +219,7 @@ export function* updateGroup(getState: GetStateFn, action: ActionType<typeof act
     const bucket = getBucket(bid);
     if (data) {
       const updatedGroup = {...data, id: gid, last_modified};
-      yield call([bucket, bucket.updateGroup], updatedGroup, {
-        patch: true,
-        safe: true,
-      });
+      yield call([bucket, bucket.updateGroup], updatedGroup, {safe: true});
       yield put(redirectTo("group:attributes", {bid, gid}));
       yield put(notifySuccess("Group attributes updated."));
     } else if (permissions) {
diff --git a/src/sagas/collection.js b/src/sagas/collection.js
index 3cb7ac53a..89c41205d 100644
--- a/src/sagas/collection.js
+++ b/src/sagas/collection.js
@@ -150,9 +150,7 @@ export function* updateRecord(getState: GetStateFn, action: ActionType<typeof ac
         const attachmentOptions = getAttachmentOptions(attachmentCapability, collection.data);
         yield call([coll, coll.addAttachment], attachment, updatedRecord, attachmentOptions);
       } else {
-        // Note: We update using PATCH to keep existing record attributes possibly
-        // not defined by the JSON schema, if any.
-        yield call([coll, coll.updateRecord], updatedRecord, {patch: true, safe: true});
+        yield call([coll, coll.updateRecord], updatedRecord, {safe: true});
       }
       yield put(resetRecord());
       yield put(redirectTo("collection:records", {bid, cid}));
diff --git a/test/sagas/bucket_test.js b/test/sagas/bucket_test.js
index bae8ee803..dcb221f55 100644
--- a/test/sagas/bucket_test.js
+++ b/test/sagas/bucket_test.js
@@ -114,7 +114,8 @@ describe("bucket sagas", () => {
         it("should post new bucket data", () => {
           expect(updateBucket.next().value)
             .eql(call([bucket, bucket.setData], {a: 1, last_modified: 42}, {
-              patch: true, safe: true}));
+              safe: true,
+            }));
         });
 
         it("should update the route path", () => {
@@ -374,7 +375,7 @@ describe("bucket sagas", () => {
             .eql(call([collection, collection.setData], {
               ...collectionData,
               last_modified: 42,
-            }, {patch: true, safe: true}));
+            }, {safe: true}));
         });
 
         it("should update the route path", () => {
@@ -733,7 +734,7 @@ describe("bucket sagas", () => {
             .eql(call([bucket, bucket.updateGroup], {
               ...groupData,
               last_modified: 42
-            }, {patch: true, safe: true}));
+            }, {safe: true}));
         });
 
         it("should update the route path", () => {
diff --git a/test/sagas/collection_test.js b/test/sagas/collection_test.js
index 38e4e8a94..25bfd6bed 100644
--- a/test/sagas/collection_test.js
+++ b/test/sagas/collection_test.js
@@ -382,7 +382,6 @@ describe("collection sagas", () => {
               ...record,
               last_modified: 42
             }, {
-              patch: true,
               safe: true
             }));
         });