Adapt withEdit/withNew to support new fragments API

VulcanJS · Feb 3, 2017 · afebadb · afebadb
1 parent a2f7592
commit afebadb
Show file tree

Hide file tree

Showing 5 changed files with 465 additions and 38 deletions.
diff --git a/packages/nova-cloudinary/lib/server/cloudinary.js b/packages/nova-cloudinary/lib/server/cloudinary.js
@@ -27,7 +27,7 @@ const CloudinaryUtils = {
       return data;
     } catch (error) {
       console.log("// Cloudinary upload failed for URL: "+imageUrl); // eslint-disable-line
-      console.log(error.stack); // eslint-disable-line
+      console.log(error); // eslint-disable-line
     }
   },
 
@@ -92,10 +92,12 @@ function cachePostThumbnailOnSubmit (post) {
     if (post.thumbnailUrl) {
 
       const data = CloudinaryUtils.uploadImage(post.thumbnailUrl);
-      Posts.update(post._id, {$set:{
-        cloudinaryId: data.cloudinaryId,
-        cloudinaryUrls: data.urls
-      }});
+      if (data) {
+        Posts.update(post._id, {$set:{
+          cloudinaryId: data.cloudinaryId,
+          cloudinaryUrls: data.urls
+        }});
+      }
 
     }
   }

diff --git a/packages/nova-core/lib/containers/withDocument.js b/packages/nova-core/lib/containers/withDocument.js
@@ -30,7 +30,8 @@ export default function withDocument (options) {
       const { ownProps, data } = returnedProps;
       return {
         loading: data.networkStatus === 1,
-        document: Utils.convertDates(collection, data[singleResolverName]),
+        // document: Utils.convertDates(collection, data[singleResolverName]),
+        document: data[singleResolverName],
         fragmentName,
         fragment,
       };

diff --git a/packages/nova-core/lib/containers/withEdit.js b/packages/nova-core/lib/containers/withEdit.js
@@ -25,11 +25,13 @@ Child Props:
 import React, { Component } from 'react';
 import { graphql } from 'react-apollo';
 import gql from 'graphql-tag';
+import { getFragment, getFragmentName } from 'meteor/nova:core';
 
 export default function withEdit(options) {
 
-  const {collection, fragment } = options,
-        fragmentName = fragment.definitions[0].name.value,
+  const {collection } = options,
+        fragment = options.fragment || getFragment(options.fragmentName),
+        fragmentName = getFragmentName(fragment),
         collectionName = collection._name,
         mutationName = collection.options.mutations.edit.name;
 

diff --git a/packages/nova-core/lib/containers/withNew.js b/packages/nova-core/lib/containers/withNew.js
@@ -24,12 +24,14 @@ Child Props:
 import React, { Component } from 'react';
 import { graphql } from 'react-apollo';
 import gql from 'graphql-tag';
+import { getFragment, getFragmentName } from 'meteor/nova:core';
 
 export default function withNew(options) {
 
   // get options
-  const { collection, fragment } = options,
-        fragmentName = fragment.definitions[0].name.value,
+  const { collection } = options,
+        fragment = options.fragment || getFragment(options.fragmentName),
+        fragmentName = getFragmentName(fragment),
         collectionName = collection._name,
         mutationName = collection.options.mutations.new.name;