diff --git a/packages/vulcan-core/lib/modules/components/App.jsx b/packages/vulcan-core/lib/modules/components/App.jsx index b2426acc1..a6f3ac24c 100644 --- a/packages/vulcan-core/lib/modules/components/App.jsx +++ b/packages/vulcan-core/lib/modules/components/App.jsx @@ -4,8 +4,6 @@ import PropTypes from 'prop-types'; import { IntlProvider, intlShape} from 'meteor/vulcan:i18n'; import withCurrentUser from '../containers/withCurrentUser.js'; -import { FormattedMessage } from 'meteor/vulcan:i18n'; - class App extends PureComponent { getLocale() { diff --git a/packages/vulcan-core/lib/modules/containers/withMutation.js b/packages/vulcan-core/lib/modules/containers/withMutation.js index ace088232..8ced01323 100644 --- a/packages/vulcan-core/lib/modules/containers/withMutation.js +++ b/packages/vulcan-core/lib/modules/containers/withMutation.js @@ -35,6 +35,7 @@ export default function withMutation({name, args}) { } return graphql(gql`${mutation}`, { + alias: 'withMutation', props: ({ownProps, mutate}) => ({ [name]: (vars) => { return mutate({ diff --git a/packages/vulcan-forms/lib/DateTime.jsx b/packages/vulcan-forms/lib/DateTime.jsx index a3b4a214f..dfba97a2a 100644 --- a/packages/vulcan-forms/lib/DateTime.jsx +++ b/packages/vulcan-forms/lib/DateTime.jsx @@ -9,6 +9,13 @@ class DateTime extends PureComponent { this.updateDate = this.updateDate.bind(this); } + // when the datetime picker has mounted, SmartForm will catch the date value (no formsy mixin in this component) + componentDidMount() { + if (this.props.value) { + this.updateDate(this.props.value); + } + } + updateDate(date) { this.context.updateCurrentValues({[this.props.name]: date}); } diff --git a/packages/vulcan-i18n/lib/modules/message.js b/packages/vulcan-i18n/lib/modules/message.js index 089348a87..e4a7c12a1 100644 --- a/packages/vulcan-i18n/lib/modules/message.js +++ b/packages/vulcan-i18n/lib/modules/message.js @@ -10,7 +10,7 @@ const FormattedMessage = ({ id, values, defaultMessage }) => { message = message.replace(`{${key}}`, value); }); } - return {messages[id]} + return {message} } export default FormattedMessage; \ No newline at end of file diff --git a/packages/vulcan-posts/lib/resolvers.js b/packages/vulcan-posts/lib/resolvers.js index 89128e9cf..0bbc18386 100644 --- a/packages/vulcan-posts/lib/resolvers.js +++ b/packages/vulcan-posts/lib/resolvers.js @@ -1,4 +1,4 @@ -import { GraphQLSchema, Utils } from 'meteor/vulcan:core'; +import { addGraphQLResolvers, Utils } from 'meteor/vulcan:core'; import Users from 'meteor/vulcan:users'; const specificResolvers = { @@ -16,7 +16,7 @@ const specificResolvers = { } }; -GraphQLSchema.addResolvers(specificResolvers); +addGraphQLResolvers(specificResolvers); const resolvers = {