get collection name from typename on nova:subscribe, add missing impo…

…rt on previous commit
VulcanJS · Feb 10, 2017 · c33ebd5 · c33ebd5
1 parent 6833b35
commit c33ebd5
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/packages/nova-lib/lib/modules/apollo.js b/packages/nova-lib/lib/modules/apollo.js
@@ -1,5 +1,6 @@
 import ApolloClient, { createNetworkInterface } from 'apollo-client';
 import 'isomorphic-fetch';
+import { getSetting } from './settings.js';
 
 const defaultNetworkInterfaceConfig = {
   path: '/graphql',

diff --git a/packages/nova-subscribe/lib/components/SubscribeTo.jsx b/packages/nova-subscribe/lib/components/SubscribeTo.jsx
@@ -93,7 +93,7 @@ const subscribeMutationContainer = ({documentType, actionName}) => graphql(gql`
 
 const SubscribeTo = props => {
 
-  const documentType = `${props.document.__typename.toLowerCase()}s`;
+  const documentType = Utils.getCollectionNameFromTypename(props.document.__typename);
 
   const withSubscribeMutations = ['Subscribe', 'Unsubscribe'].map(actionName => subscribeMutationContainer({documentType, actionName})); 
 

diff --git a/packages/nova-subscribe/lib/helpers.js b/packages/nova-subscribe/lib/helpers.js
@@ -1,14 +1,15 @@
 import Users from 'meteor/nova:users';
+import { Utils } from 'meteor/nova:core';
 
 Users.isSubscribedTo = (user, document) => {
-  // return user && document && document.subscribers && document.subscribers.indexOf(user._id) !== -1;
+
   if (!user || !document) {
     // should return an error
     return false;
   }
 
   const { __typename, _id: itemId } = document;
-  const documentType = __typename + 's';
+  const documentType = Utils.capitalize(Utils.getCollectionNameFromTypename(__typename));
 
   if (user.subscribedItems && user.subscribedItems[documentType]) {
     return !!user.subscribedItems[documentType].find(subscribedItems => subscribedItems.itemId === itemId);