SImplify data access

Author: dunglas

client/package.json

@@ -7,6 +7,7 @@
     "connected-react-router": "^5.0.1",
     "font-awesome": "^4.7.0",
     "jest-junit": "^5.2.0",
+    "lodash.get": "^4.4.2",
     "lodash.has": "^4.5.2",
     "lodash.mapvalues": "^4.6.0",
     "prettier": "^1.14.3",

client/src/components/book/Form.js

@@ -1,7 +1,13 @@
 import React, { Component } from 'react';
 import { Field, reduxForm } from 'redux-form';
+import PropTypes from 'prop-types';
 
 class Form extends Component {
+  static propTypes = {
+    handleSubmit: PropTypes.func.isRequired,
+    error: PropTypes.string
+  };
+
   renderField = data => {
     data.input.className = 'form-control';
 

client/src/utils/dataAccess.js

@@ -1,5 +1,6 @@
 import { ENTRYPOINT } from '../config/entrypoint';
 import { SubmissionError } from 'redux-form';
+import get from 'lodash/get';
 import has from 'lodash/has';
 import mapValues from 'lodash/mapValues';
 
@@ -39,10 +40,6 @@ export function mercureSubscribe(url) {
 }
 
 export function normalize(data) {
-  // Resolve IDs to absolute URLs
-  if (has(data, '@id'))
-    data['@id'] = new URL(data['@id'], ENTRYPOINT).toString();
-
   if (has(data, 'hydra:member')) {
     // Normalize items in collections
     data['hydra:member'] = data['hydra:member'].map(item => normalize(item));
@@ -51,16 +48,13 @@ export function normalize(data) {
   }
 
   // Flatten nested documents
-  mapValues(data, value => {
-    if (Array.isArray(value))
-      return value.map(
-        v => (has(v, '@id') ? new URL(v['@id'], ENTRYPOINT).toString() : v)
-      );
-    if (has(value, '@id')) return new URL(value['@id'], ENTRYPOINT).toString();
-    return value;
-  });
-
-  return data;
+  return mapValues(
+    data,
+    value =>
+      Array.isArray(value)
+        ? value.map(v => get(v, '@id', v))
+        : get(value, '@id', value)
+  );
 }
 
 export function extractHubURL(response) {
@@ -70,7 +64,6 @@ export function extractHubURL(response) {
   const matches = linkHeader.match(
     /<([^>]+)>;\s+rel=(?:mercure|"[^"]*mercure[^"]*")/
   );
-  if (!matches || !matches[1]) return null;
 
-  return new URL(matches[1], ENTRYPOINT);
+  return matches && matches[1] ? new URL(matches[1], ENTRYPOINT) : null;
 }

client/yarn.lock

@@ -5014,6 +5014,10 @@ lodash.debounce@^4.0.8:
   version "4.0.8"
   resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"
 
+lodash.get@^4.4.2:
+  version "4.4.2"
+  resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99"
+
 lodash.has@^4.5.2:
   version "4.5.2"
   resolved "https://registry.yarnpkg.com/lodash.has/-/lodash.has-4.5.2.tgz#d19f4dc1095058cccbe2b0cdf4ee0fe4aa37c862"