+
+
- { this.props.currentUserLoading ? : (this.props.children ? this.props.children : ) }
+ {this.props.currentUserLoading ? (
+
+ ) : this.props.children ? (
+ this.props.children
+ ) : (
+
+ )}
@@ -40,11 +72,11 @@ class App extends PureComponent {
App.propTypes = {
currentUserLoading: PropTypes.bool,
-}
+};
App.childContextTypes = {
intl: intlShape,
-}
+};
App.displayName = 'App';
diff --git a/packages/vulcan-core/lib/modules/components/Datatable.jsx b/packages/vulcan-core/lib/modules/components/Datatable.jsx
index 664d016d9..f9481b289 100644
--- a/packages/vulcan-core/lib/modules/components/Datatable.jsx
+++ b/packages/vulcan-core/lib/modules/components/Datatable.jsx
@@ -112,10 +112,12 @@ DatatableContents Component
*/
const DatatableContents = (props) => {
- const {collection, columns, results, loading, loadMore, count, totalCount, networkStatus, showEdit, currentUser} = props;
+ const {collection, columns, results, loading, loadMore, count, totalCount, networkStatus, showEdit, currentUser, emptyState} = props;
if (loading) {
return ;
+ } else if (!results.length) {
+ return emptyState || null;
}
const isLoadingMore = networkStatus === 2;
@@ -123,26 +125,26 @@ const DatatableContents = (props) => {
return (
-
-
-
- {_.sortBy(columns, column => column.order).map((column, index) => )}
- {showEdit ? | : null}
-
-
-
- {results.map((document, index) => )}
-
-
-
- {hasMore ?
- isLoadingMore ?
-
- :
- : null
- }
+
+
+
+ {_.sortBy(columns, column => column.order).map((column, index) => )}
+ {showEdit ? | : null}
+
+
+
+ {results.map((document, index) => )}
+
+
+
+ {hasMore ?
+ isLoadingMore ?
+
+ :
+ : null
+ }
+
-
+
+
+
+registerComponent('Callbacks', CallbacksDashboard);
+
+export default Callbacks;
\ No newline at end of file
diff --git a/packages/vulcan-debug/lib/components/Emails.jsx b/packages/vulcan-debug/lib/components/Emails.jsx
index 395ce4c6a..8747c09d1 100644
--- a/packages/vulcan-debug/lib/components/Emails.jsx
+++ b/packages/vulcan-debug/lib/components/Emails.jsx
@@ -37,7 +37,7 @@ class Email extends PureComponent {
{name} |
{email.template} |
{typeof email.subject === 'function' ? email.subject({}) : email.subject} |
- {email.path} |
+ {email.path} |
diff --git a/packages/vulcan-debug/lib/modules/callbacks/collection.js b/packages/vulcan-debug/lib/modules/callbacks/collection.js
new file mode 100644
index 000000000..ca30d4a7a
--- /dev/null
+++ b/packages/vulcan-debug/lib/modules/callbacks/collection.js
@@ -0,0 +1,19 @@
+import { createCollection } from 'meteor/vulcan:lib';
+import schema from './schema.js';
+import resolvers from './resolvers.js';
+import './fragments.js';
+
+const Callbacks = createCollection({
+
+ collectionName: 'Callbacks',
+
+ typeName: 'Callback',
+
+ schema,
+
+ resolvers,
+
+});
+
+
+export default Callbacks;
diff --git a/packages/vulcan-debug/lib/modules/callbacks/fragments.js b/packages/vulcan-debug/lib/modules/callbacks/fragments.js
new file mode 100644
index 000000000..b0f706b5e
--- /dev/null
+++ b/packages/vulcan-debug/lib/modules/callbacks/fragments.js
@@ -0,0 +1,12 @@
+import { registerFragment } from 'meteor/vulcan:lib';
+
+registerFragment(`
+ fragment CallbacksFragment on Callback {
+ name
+ arguments
+ runs
+ returns
+ description
+ hooks
+ }
+`);
diff --git a/packages/vulcan-debug/lib/modules/callbacks/resolvers.js b/packages/vulcan-debug/lib/modules/callbacks/resolvers.js
new file mode 100644
index 000000000..4d2326a9e
--- /dev/null
+++ b/packages/vulcan-debug/lib/modules/callbacks/resolvers.js
@@ -0,0 +1,26 @@
+import { CallbackHooks } from 'meteor/vulcan:lib';
+
+const resolvers = {
+
+ list: {
+
+ name: 'CallbacksList',
+
+ resolver(root, {terms = {}}, context, info) {
+ return CallbackHooks;
+ },
+
+ },
+
+ total: {
+
+ name: 'CallbacksTotal',
+
+ resolver(root, {terms = {}}, context) {
+ return CallbackHooks.length;
+ },
+
+ }
+};
+
+export default resolvers;
\ No newline at end of file
diff --git a/packages/vulcan-debug/lib/modules/callbacks/schema.js b/packages/vulcan-debug/lib/modules/callbacks/schema.js
new file mode 100644
index 000000000..52643074c
--- /dev/null
+++ b/packages/vulcan-debug/lib/modules/callbacks/schema.js
@@ -0,0 +1,57 @@
+import { Callbacks } from 'meteor/vulcan:lib';
+
+const schema = {
+ name: {
+ label: 'Name',
+ type: String,
+ viewableBy: ['admins'],
+ },
+
+ arguments: {
+ label: 'Arguments',
+ type: Array,
+ viewableBy: ['admins'],
+ },
+
+ 'arguments.$': {
+ type: Object,
+ viewableBy: ['admins'],
+ },
+
+ runs: {
+ label: 'Runs',
+ type: String,
+ viewableBy: ['admins'],
+ },
+
+ returns: {
+ label: 'Should Return',
+ type: String,
+ viewableBy: ['admins'],
+ },
+
+ description: {
+ label: 'Description',
+ type: String,
+ viewableBy: ['admins'],
+ },
+
+ hooks: {
+ label: 'Hooks',
+ type: Array,
+ viewableBy: ['admins'],
+ resolveAs: {
+ type: '[String]',
+ resolver: callback => {
+ if (Callbacks[callback.name]) {
+ const callbacks = Callbacks[callback.name].map(f => f.name);
+ return callbacks;
+ } else {
+ return [];
+ }
+ },
+ },
+ },
+};
+
+export default schema;
diff --git a/packages/vulcan-debug/lib/modules/components.js b/packages/vulcan-debug/lib/modules/components.js
index 4e61994fe..017a9ea69 100644
--- a/packages/vulcan-debug/lib/modules/components.js
+++ b/packages/vulcan-debug/lib/modules/components.js
@@ -2,3 +2,4 @@
import '../components/Emails.jsx';
import '../components/Groups.jsx';
import '../components/Settings.jsx';
+import '../components/Callbacks.jsx';
diff --git a/packages/vulcan-debug/lib/modules/routes.js b/packages/vulcan-debug/lib/modules/routes.js
index f1b85b835..a557289eb 100644
--- a/packages/vulcan-debug/lib/modules/routes.js
+++ b/packages/vulcan-debug/lib/modules/routes.js
@@ -4,6 +4,7 @@ addRoute([
// {name: 'cheatsheet', path: '/cheatsheet', component: import('./components/Cheatsheet.jsx')},
{name: 'groups', path: '/groups', component: () => getDynamicComponent(import('../components/Groups.jsx'))},
{name: 'settings', path: '/settings', componentName: 'Settings'},
+ {name: 'callbacks', path: '/callbacks', componentName: 'Callbacks'},
// {name: 'emails', path: '/emails', component: () => getDynamicComponent(import('./components/Emails.jsx'))},
{name: 'emails', path: '/emails', componentName: 'Emails'},
]);
\ No newline at end of file
diff --git a/packages/vulcan-debug/package.js b/packages/vulcan-debug/package.js
index c14b96fc9..46b2b2abe 100644
--- a/packages/vulcan-debug/package.js
+++ b/packages/vulcan-debug/package.js
@@ -1,7 +1,7 @@
Package.describe({
name: "vulcan:debug",
summary: "Vulcan debug package",
- version: '1.8.0',
+ version: '1.8.1',
git: "https://github.com/VulcanJS/Vulcan.git",
debugOnly: true
});
@@ -17,8 +17,8 @@ Package.onUse(function (api) {
// Vulcan packages
- 'vulcan:lib@1.8.0',
- 'vulcan:email@1.8.0',
+ 'vulcan:lib@1.8.1',
+ 'vulcan:email@1.8.1',
]);
diff --git a/packages/vulcan-email/lib/server/email.js b/packages/vulcan-email/lib/server/email.js
index 3d3d90d99..8161799c0 100644
--- a/packages/vulcan-email/lib/server/email.js
+++ b/packages/vulcan-email/lib/server/email.js
@@ -24,7 +24,7 @@ VulcanEmail.addTemplates = templates => {
VulcanEmail.getTemplate = templateName => Handlebars.compile(
VulcanEmail.templates[templateName],
- { noEscape: true}
+ { noEscape: true, strict: true}
);
VulcanEmail.buildTemplate = (htmlContent, optionalProperties = {}) => {
@@ -46,9 +46,7 @@ VulcanEmail.buildTemplate = (htmlContent, optionalProperties = {}) => {
};
const emailHTML = VulcanEmail.getTemplate("wrapper")(emailProperties);
-
const inlinedHTML = Juice(emailHTML, {preserveMediaQueries: true});
-
const doctype = ''
return doctype+inlinedHTML;
@@ -122,7 +120,7 @@ VulcanEmail.build = async ({ emailName, variables }) => {
const subject = typeof email.subject === 'function' ? email.subject(data) : email.subject;
- const html = VulcanEmail.buildTemplate(VulcanEmail.getTemplate(email.template)(data));
+ const html = VulcanEmail.buildTemplate(VulcanEmail.getTemplate(email.template)(data), data);
return { data, subject, html };
}
diff --git a/packages/vulcan-email/lib/server/routes.js b/packages/vulcan-email/lib/server/routes.js
index 5f3db6158..844906160 100644
--- a/packages/vulcan-email/lib/server/routes.js
+++ b/packages/vulcan-email/lib/server/routes.js
@@ -10,7 +10,6 @@ Meteor.startup(function () {
Picker.route(email.path, async (params, req, res) => {
let html;
-
// if email has a custom way of generating test HTML, use it
if (typeof email.getTestHTML !== "undefined") {
@@ -20,14 +19,20 @@ Meteor.startup(function () {
// else get test object (sample post, comment, user, etc.)
const testVariables = (typeof email.testVariables === 'function' ? email.testVariables() : email.testVariables) || {};
- const result = email.query ? await runQuery(email.query, testVariables) : {data: {}};
+ // merge test variables with params from URL
+ const variables = {...testVariables, ...params};
+
+ const result = email.query ? await runQuery(email.query, variables) : {data: {}};
// if email has a data() function, merge it with results of query
- const emailTestData = email.data ? {...result.data, ...email.data(testVariables)} : result.data;
+ const emailTestData = email.data ? {...result.data, ...email.data(variables)} : result.data;
const subject = typeof email.subject === 'function' ? email.subject(emailTestData) : email.subject;
+ const template = VulcanEmail.getTemplate(email.template);
+ const htmlContent = template(emailTestData)
+
// then apply email template to properties, and wrap it with buildTemplate
- html = VulcanEmail.buildTemplate(VulcanEmail.getTemplate(email.template)(emailTestData));
+ html = VulcanEmail.buildTemplate(htmlContent, emailTestData);
html += `
Subject: ${subject}
diff --git a/packages/vulcan-email/package.js b/packages/vulcan-email/package.js
index 8dad243df..1cca49b40 100644
--- a/packages/vulcan-email/package.js
+++ b/packages/vulcan-email/package.js
@@ -1,7 +1,7 @@
Package.describe({
name: "vulcan:email",
summary: "Vulcan email package",
- version: '1.8.0',
+ version: '1.8.1',
git: "https://github.com/VulcanJS/Vulcan.git"
});
@@ -10,7 +10,7 @@ Package.onUse(function (api) {
api.versionsFrom('METEOR@1.5.2');
api.use([
- 'vulcan:lib@1.8.0'
+ 'vulcan:lib@1.8.1'
]);
api.mainModule("lib/server.js", "server");
diff --git a/packages/vulcan-embed/package.js b/packages/vulcan-embed/package.js
index 9b881c415..3b0c2f4a7 100644
--- a/packages/vulcan-embed/package.js
+++ b/packages/vulcan-embed/package.js
@@ -1,7 +1,7 @@
Package.describe({
name: "vulcan:embed",
summary: "Vulcan Embed package",
- version: '1.8.0',
+ version: '1.8.1',
git: 'https://github.com/VulcanJS/Vulcan.git'
});
@@ -10,7 +10,7 @@ Package.onUse( function(api) {
api.versionsFrom('METEOR@1.5.2');
api.use([
- 'vulcan:core@1.8.0',
+ 'vulcan:core@1.8.1',
'fourseven:scss@4.5.0'
]);
diff --git a/packages/vulcan-events-ga/README.md b/packages/vulcan-events-ga/README.md
new file mode 100644
index 000000000..70247b7e5
--- /dev/null
+++ b/packages/vulcan-events-ga/README.md
@@ -0,0 +1 @@
+Vulcan events package, used internally.
\ No newline at end of file
diff --git a/packages/vulcan-events-ga/lib/client/ga.js b/packages/vulcan-events-ga/lib/client/ga.js
new file mode 100644
index 000000000..6eb126937
--- /dev/null
+++ b/packages/vulcan-events-ga/lib/client/ga.js
@@ -0,0 +1,62 @@
+import { getSetting } from 'meteor/vulcan:core';
+import { addPageFunction, addInitFunction } from 'meteor/vulcan:events';
+
+/*
+
+ We provide a special support for Google Analytics.
+
+ If you want to enable GA page viewing / tracking, go to
+ your settings file and update the 'public > googleAnalytics > apiKey'
+ field with your GA unique identifier (UA-xxx...).
+
+*/
+
+function googleAnaticsTrackPage() {
+ if (window && window.ga) {
+ window.ga('send', 'pageview', {
+ page: window.location.pathname,
+ });
+ }
+ return {};
+}
+
+// add client-side callback: log a ga request on page view
+addPageFunction(googleAnaticsTrackPage);
+
+function googleAnalyticsInit() {
+ // get the google analytics id from the settings
+ const googleAnalyticsId = getSetting('googleAnalytics.apiKey');
+
+ // the google analytics id exists & isn't the placeholder from sample_settings.json
+ if (googleAnalyticsId && googleAnalyticsId !== 'foo123') {
+ (function(i, s, o, g, r, a, m) {
+ i['GoogleAnalyticsObject'] = r;
+ (i[r] =
+ i[r] ||
+ function() {
+ (i[r].q = i[r].q || []).push(arguments);
+ }),
+ (i[r].l = 1 * new Date());
+ (a = s.createElement(o)), (m = s.getElementsByTagName(o)[0]);
+ a.async = 1;
+ a.src = g;
+ m.parentNode.insertBefore(a, m);
+ })(
+ window,
+ document,
+ 'script',
+ '//www.google-analytics.com/analytics.js',
+ 'ga'
+ );
+
+ const cookieDomain = document.domain === 'localhost' ? 'none' : 'auto';
+
+ window.ga('create', googleAnalyticsId, cookieDomain);
+
+ // trigger first request once analytics are initialized
+ googleAnaticsTrackPage();
+ }
+}
+
+// init google analytics on the client module
+addInitFunction(googleAnalyticsInit);
diff --git a/packages/vulcan-events-ga/lib/client/main.js b/packages/vulcan-events-ga/lib/client/main.js
new file mode 100644
index 000000000..bd90865fc
--- /dev/null
+++ b/packages/vulcan-events-ga/lib/client/main.js
@@ -0,0 +1,2 @@
+import './ga.js';
+export * from '../modules/index.js';
\ No newline at end of file
diff --git a/packages/vulcan-events-ga/lib/modules/index.js b/packages/vulcan-events-ga/lib/modules/index.js
new file mode 100644
index 000000000..29ed8aee7
--- /dev/null
+++ b/packages/vulcan-events-ga/lib/modules/index.js
@@ -0,0 +1,3 @@
+import { registerSetting } from 'meteor/vulcan:core';
+
+registerSetting('googleAnalytics.apiKey', null, 'Google Analytics ID');
diff --git a/packages/vulcan-events-ga/lib/server/main.js b/packages/vulcan-events-ga/lib/server/main.js
new file mode 100644
index 000000000..094a9a675
--- /dev/null
+++ b/packages/vulcan-events-ga/lib/server/main.js
@@ -0,0 +1 @@
+export * from '../modules/index.js';
diff --git a/packages/vulcan-events-ga/package.js b/packages/vulcan-events-ga/package.js
new file mode 100644
index 000000000..d98194730
--- /dev/null
+++ b/packages/vulcan-events-ga/package.js
@@ -0,0 +1,20 @@
+Package.describe({
+ name: "vulcan:events-ga",
+ summary: "Vulcan Google Analytics event tracking package",
+ version: '1.8.1',
+ git: "https://github.com/VulcanJS/Vulcan.git"
+});
+
+Package.onUse(function(api) {
+
+ api.versionsFrom('METEOR@1.5.2');
+
+ api.use([
+ 'vulcan:core@1.8.1',
+ 'vulcan:events@1.8.1',
+ ]);
+
+ api.mainModule("lib/server/main.js", "server");
+ api.mainModule('lib/client/main.js', 'client');
+
+});
diff --git a/packages/vulcan-events-intercom/README.md b/packages/vulcan-events-intercom/README.md
new file mode 100644
index 000000000..128e4c4dc
--- /dev/null
+++ b/packages/vulcan-events-intercom/README.md
@@ -0,0 +1,21 @@
+Intercom package.
+
+### Settings
+
+```
+{
+ "public": {
+
+ "intercom": {
+ "appId": "123foo"
+ }
+
+ },
+
+ "intercom": {
+ "accessToken": "456bar"
+ }
+}
+```
+
+Requires installing the [react-intercom](https://github.com/nhagen/react-intercom) package (`npm install --save react-intercom`).
\ No newline at end of file
diff --git a/packages/vulcan-events-intercom/lib/client/intercom-client.js b/packages/vulcan-events-intercom/lib/client/intercom-client.js
new file mode 100644
index 000000000..5767b30f1
--- /dev/null
+++ b/packages/vulcan-events-intercom/lib/client/intercom-client.js
@@ -0,0 +1,103 @@
+import { getSetting, addCallback, Utils } from 'meteor/vulcan:core';
+import { addPageFunction, addInitFunction, addIdentifyFunction, addTrackFunction } from 'meteor/vulcan:events';
+
+/*
+
+Identify User
+
+*/
+function intercomIdentify(currentUser) {
+ intercomSettings = {
+ app_id: getSetting('intercom.appId'),
+ name: currentUser.displayName,
+ email: currentUser.email,
+ created_at: currentUser.createdAt,
+ _id: currentUser._id,
+ pageUrl: currentUser.pageUrl,
+ };
+ (function() {
+ var w = window;
+ var ic = w.Intercom;
+ if (typeof ic === 'function') {
+ ic('reattach_activator');
+ ic('update', intercomSettings);
+ } else {
+ var d = document;
+ var i = function() {
+ i.c(arguments);
+ };
+ i.q = [];
+ i.c = function(args) {
+ i.q.push(args);
+ };
+ w.Intercom = i;
+ function l() {
+ var s = d.createElement('script');
+ s.type = 'text/javascript';
+ s.async = true;
+ s.src = 'https://widget.intercom.io/widget/icygo7se';
+ var x = d.getElementsByTagName('script')[0];
+ x.parentNode.insertBefore(s, x);
+ }
+ if (w.attachEvent) {
+ w.attachEvent('onload', l);
+ } else {
+ w.addEventListener('load', l, false);
+ }
+ }
+ })();
+}
+addIdentifyFunction(intercomIdentify);
+
+/*
+
+Track Event
+
+*/
+// function segmentTrack(eventName, eventProperties) {
+// analytics.track(eventName, eventProperties);
+// }
+// addTrackFunction(segmentTrack);
+
+/*
+
+Init Snippet
+
+*/
+function intercomInit() {
+ window.intercomSettings = {
+ app_id: getSetting('intercom.appId'),
+ };
+ (function() {
+ var w = window;
+ var ic = w.Intercom;
+ if (typeof ic === 'function') {
+ ic('reattach_activator');
+ ic('update', intercomSettings);
+ } else {
+ var d = document;
+ var i = function() {
+ i.c(arguments);
+ };
+ i.q = [];
+ i.c = function(args) {
+ i.q.push(args);
+ };
+ w.Intercom = i;
+ function l() {
+ var s = d.createElement('script');
+ s.type = 'text/javascript';
+ s.async = true;
+ s.src = 'https://widget.intercom.io/widget/icygo7se';
+ var x = d.getElementsByTagName('script')[0];
+ x.parentNode.insertBefore(s, x);
+ }
+ if (w.attachEvent) {
+ w.attachEvent('onload', l);
+ } else {
+ w.addEventListener('load', l, false);
+ }
+ }
+ })();
+}
+addInitFunction(intercomInit);
diff --git a/packages/vulcan-events-intercom/lib/client/main.js b/packages/vulcan-events-intercom/lib/client/main.js
new file mode 100644
index 000000000..e3113bcb6
--- /dev/null
+++ b/packages/vulcan-events-intercom/lib/client/main.js
@@ -0,0 +1,3 @@
+import './intercom-client.js';
+
+export * from '../modules/index.js';
\ No newline at end of file
diff --git a/packages/vulcan-events-intercom/lib/modules/index.js b/packages/vulcan-events-intercom/lib/modules/index.js
new file mode 100644
index 000000000..e69de29bb
diff --git a/packages/vulcan-events-intercom/lib/server/intercom-server.js b/packages/vulcan-events-intercom/lib/server/intercom-server.js
new file mode 100644
index 000000000..cc15444f9
--- /dev/null
+++ b/packages/vulcan-events-intercom/lib/server/intercom-server.js
@@ -0,0 +1,49 @@
+import Intercom from 'intercom-client';
+import { getSetting, addCallback, Utils } from 'meteor/vulcan:core';
+import { addPageFunction, addUserFunction, addInitFunction, addIdentifyFunction, addTrackFunction } from 'meteor/vulcan:events';
+
+const token = getSetting('intercom.accessToken');
+
+if (!token) {
+ throw new Error('Please add your Intercom access token in settings.json');
+} else {
+
+ const intercomClient = new Intercom.Client({ token });
+
+ const getDate = () => new Date().valueOf().toString().substr(0,10);
+
+ /*
+
+ New User
+
+ */
+ function intercomNewUser(user) {
+ intercomClient.users.create({
+ email: user.email,
+ custom_attributes: {
+ name: user.displayName,
+ profileUrl: Users.getProfileUrl(user, true),
+ _id: user._id,
+ }
+ });
+ }
+ addUserFunction(intercomNewUser);
+
+ /*
+
+ Track Event
+
+ */
+ function intercomTrackServer(eventName, eventProperties, currentUser) {
+ intercomClient.events.create({
+ event_name: eventName,
+ created_at: getDate(),
+ email: currentUser.email,
+ metadata: {
+ ...eventProperties
+ }
+ });
+ }
+ addTrackFunction(intercomTrackServer);
+
+}
diff --git a/packages/vulcan-events-intercom/lib/server/main.js b/packages/vulcan-events-intercom/lib/server/main.js
new file mode 100644
index 000000000..094a9a675
--- /dev/null
+++ b/packages/vulcan-events-intercom/lib/server/main.js
@@ -0,0 +1 @@
+export * from '../modules/index.js';
diff --git a/packages/vulcan-events-intercom/package.js b/packages/vulcan-events-intercom/package.js
new file mode 100644
index 000000000..d9bcd25f4
--- /dev/null
+++ b/packages/vulcan-events-intercom/package.js
@@ -0,0 +1,20 @@
+Package.describe({
+ name: 'vulcan:events-intercom',
+ summary: 'Vulcan Intercom integration package.',
+ version: '1.8.1',
+ git: "https://github.com/VulcanJS/Vulcan.git"
+});
+
+Package.onUse(function (api) {
+
+ api.versionsFrom('METEOR@1.5.2');
+
+ api.use([
+ 'vulcan:core@1.8.1',
+ 'vulcan:events@1.8.1'
+ ]);
+
+ api.mainModule("lib/client/main.js", "client");
+ api.mainModule("lib/server/main.js", "server");
+
+});
diff --git a/packages/vulcan-events-internal/README.md b/packages/vulcan-events-internal/README.md
new file mode 100644
index 000000000..70247b7e5
--- /dev/null
+++ b/packages/vulcan-events-internal/README.md
@@ -0,0 +1 @@
+Vulcan events package, used internally.
\ No newline at end of file
diff --git a/packages/vulcan-events-internal/lib/client/internal-client.js b/packages/vulcan-events-internal/lib/client/internal-client.js
new file mode 100644
index 000000000..3651371b9
--- /dev/null
+++ b/packages/vulcan-events-internal/lib/client/internal-client.js
@@ -0,0 +1,25 @@
+import { addTrackFunction } from 'meteor/vulcan:events';
+import { ApolloClient } from 'apollo-client';
+import { getRenderContext } from 'meteor/vulcan:lib';
+import gql from 'graphql-tag';
+
+function trackInternal(eventName, eventProperties) {
+ const { apolloClient, store } = getRenderContext();
+ const mutation = gql`
+ mutation EventsNew($document: EventsInput) {
+ EventsNew(document: $document) {
+ name
+ createdAt
+ }
+ }
+ `;
+ const variables = {
+ document: {
+ name: eventName,
+ properties: eventProperties,
+ },
+ };
+ apolloClient.mutate({ mutation, variables });
+}
+
+addTrackFunction(trackInternal);
diff --git a/packages/vulcan-events-internal/lib/client/main.js b/packages/vulcan-events-internal/lib/client/main.js
new file mode 100644
index 000000000..c24f47e84
--- /dev/null
+++ b/packages/vulcan-events-internal/lib/client/main.js
@@ -0,0 +1,3 @@
+export * from '../modules/index.js';
+
+import './internal-client.js';
\ No newline at end of file
diff --git a/packages/vulcan-events-internal/lib/modules/collection.js b/packages/vulcan-events-internal/lib/modules/collection.js
new file mode 100644
index 000000000..b8ba51bd6
--- /dev/null
+++ b/packages/vulcan-events-internal/lib/modules/collection.js
@@ -0,0 +1,27 @@
+import { createCollection, getDefaultResolvers, getDefaultMutations } from 'meteor/vulcan:core';
+import schema from './schema.js';
+import Users from 'meteor/vulcan:users';
+
+const Events = createCollection({
+
+ collectionName: 'Events',
+
+ typeName: 'Event',
+
+ schema,
+
+ resolvers: getDefaultResolvers('Events'),
+
+ mutations: getDefaultMutations('Events', {
+ newCheck: () => true,
+ editCheck: () => false,
+ removeCheck: () => false
+ })
+
+});
+
+Events.checkAccess = (currentUser, doc) => {
+ return Users.isAdmin(currentUser);
+}
+
+export default Events;
diff --git a/packages/vulcan-events-internal/lib/modules/index.js b/packages/vulcan-events-internal/lib/modules/index.js
new file mode 100644
index 000000000..d193f1a60
--- /dev/null
+++ b/packages/vulcan-events-internal/lib/modules/index.js
@@ -0,0 +1 @@
+export * from './collection.js';
\ No newline at end of file
diff --git a/packages/vulcan-events-internal/lib/modules/schema.js b/packages/vulcan-events-internal/lib/modules/schema.js
new file mode 100644
index 000000000..6f216bb50
--- /dev/null
+++ b/packages/vulcan-events-internal/lib/modules/schema.js
@@ -0,0 +1,38 @@
+const schema = {
+ createdAt: {
+ type: Date,
+ optional: true,
+ onInsert: () => {
+ return new Date()
+ }
+ },
+ name: {
+ type: String,
+ insertableBy: ['guests'],
+ },
+ userId: {
+ type: String,
+ optional: true,
+ },
+ description: {
+ type: String,
+ optional: true,
+ },
+ unique: {
+ type: Boolean,
+ optional: true,
+ },
+ important: {
+ // marking an event as important means it should never be erased
+ type: Boolean,
+ optional: true,
+ },
+ properties: {
+ type: Object,
+ optional: true,
+ blackbox: true,
+ insertableBy: ['guests'],
+ },
+};
+
+export default schema;
\ No newline at end of file
diff --git a/packages/vulcan-events-internal/lib/server/internal-server.js b/packages/vulcan-events-internal/lib/server/internal-server.js
new file mode 100644
index 000000000..b966fe0b1
--- /dev/null
+++ b/packages/vulcan-events-internal/lib/server/internal-server.js
@@ -0,0 +1,19 @@
+import { addTrackFunction } from 'meteor/vulcan:events';
+import { newMutation } from 'meteor/vulcan:lib';
+import Events from '../modules/collection';
+
+async function trackInternalServer(eventName, eventProperties, currentUser) {
+ const document = {
+ name: eventName,
+ properties: eventProperties,
+ };
+ return await newMutation({
+ collection: Events,
+ document,
+ currentUser,
+ validate: false,
+ context: {},
+ });
+}
+
+addTrackFunction(trackInternalServer);
diff --git a/packages/vulcan-events-internal/lib/server/main.js b/packages/vulcan-events-internal/lib/server/main.js
new file mode 100644
index 000000000..e9da5ae82
--- /dev/null
+++ b/packages/vulcan-events-internal/lib/server/main.js
@@ -0,0 +1,3 @@
+export * from '../modules/index.js';
+
+import './internal-server';
diff --git a/packages/vulcan-events-internal/package.js b/packages/vulcan-events-internal/package.js
new file mode 100644
index 000000000..18231cc12
--- /dev/null
+++ b/packages/vulcan-events-internal/package.js
@@ -0,0 +1,20 @@
+Package.describe({
+ name: "vulcan:events-internal",
+ summary: "Vulcan internal event tracking package",
+ version: '1.8.1',
+ git: "https://github.com/VulcanJS/Vulcan.git"
+});
+
+Package.onUse(function(api) {
+
+ api.versionsFrom('METEOR@1.5.2');
+
+ api.use([
+ 'vulcan:core@1.8.1',
+ 'vulcan:events@1.8.1',
+ ]);
+
+ api.mainModule("lib/server/main.js", "server");
+ api.mainModule('lib/client/main.js', 'client');
+
+});
diff --git a/packages/vulcan-events-segment/lib/client/main.js b/packages/vulcan-events-segment/lib/client/main.js
new file mode 100644
index 000000000..288be2607
--- /dev/null
+++ b/packages/vulcan-events-segment/lib/client/main.js
@@ -0,0 +1,3 @@
+export * from '../modules/index';
+
+import './segment-client.js';
\ No newline at end of file
diff --git a/packages/vulcan-events-segment/lib/client/segment-client.js b/packages/vulcan-events-segment/lib/client/segment-client.js
new file mode 100644
index 000000000..b733d1e52
--- /dev/null
+++ b/packages/vulcan-events-segment/lib/client/segment-client.js
@@ -0,0 +1,110 @@
+import { getSetting, addCallback, Utils } from 'meteor/vulcan:core';
+import {
+ addPageFunction,
+ addInitFunction,
+ addIdentifyFunction,
+ addTrackFunction,
+} from 'meteor/vulcan:events';
+
+/*
+
+Track Page
+
+*/
+function segmentTrackPage(route) {
+ const { name, path } = route;
+ const properties = {
+ url: Utils.getSiteUrl().slice(0, -1) + path,
+ path,
+ };
+ window.analytics.page(null, name, properties);
+ return {};
+}
+addPageFunction(segmentTrackPage);
+
+/*
+
+Identify User
+
+*/
+function segmentIdentify(currentUser) {
+ window.analytics.identify(currentUser._id, {
+ email: currentUser.email,
+ pageUrl: currentUser.pageUrl,
+ });
+}
+addIdentifyFunction(segmentIdentify);
+
+/*
+
+Track Event
+
+*/
+function segmentTrack(eventName, eventProperties) {
+ analytics.track(eventName, eventProperties);
+}
+addTrackFunction(segmentTrack);
+
+/*
+
+Init Snippet
+
+*/
+function segmentInit() {
+ !(function() {
+ var analytics = (window.analytics = window.analytics || []);
+ if (!analytics.initialize)
+ if (analytics.invoked)
+ window.console &&
+ console.error &&
+ console.error('Segment snippet included twice.');
+ else {
+ analytics.invoked = !0;
+ analytics.methods = [
+ 'trackSubmit',
+ 'trackClick',
+ 'trackLink',
+ 'trackForm',
+ 'pageview',
+ 'identify',
+ 'reset',
+ 'group',
+ 'track',
+ 'ready',
+ 'alias',
+ 'debug',
+ 'page',
+ 'once',
+ 'off',
+ 'on',
+ ];
+ analytics.factory = function(t) {
+ return function() {
+ var e = Array.prototype.slice.call(arguments);
+ e.unshift(t);
+ analytics.push(e);
+ return analytics;
+ };
+ };
+ for (var t = 0; t < analytics.methods.length; t++) {
+ var e = analytics.methods[t];
+ analytics[e] = analytics.factory(e);
+ }
+ analytics.load = function(t) {
+ var e = document.createElement('script');
+ e.type = 'text/javascript';
+ e.async = !0;
+ e.src =
+ ('https:' === document.location.protocol ? 'https://' : 'http://') +
+ 'cdn.segment.com/analytics.js/v1/' +
+ t +
+ '/analytics.min.js';
+ var n = document.getElementsByTagName('script')[0];
+ n.parentNode.insertBefore(e, n);
+ };
+ analytics.SNIPPET_VERSION = '4.0.0';
+ analytics.load(getSetting('segment.clientKey'));
+ }
+ })();
+}
+addInitFunction(segmentInit);
\ No newline at end of file
diff --git a/packages/vulcan-events-segment/lib/modules/index.js b/packages/vulcan-events-segment/lib/modules/index.js
new file mode 100644
index 000000000..f04e7c61d
--- /dev/null
+++ b/packages/vulcan-events-segment/lib/modules/index.js
@@ -0,0 +1,4 @@
+import { registerSetting } from 'meteor/vulcan:core';
+
+registerSetting('segment.clientKey', null, 'Segment client-side API key');
+registerSetting('segment.serverKey', null, 'Segment server-side API key');
diff --git a/packages/vulcan-events-segment/lib/server/main.js b/packages/vulcan-events-segment/lib/server/main.js
new file mode 100644
index 000000000..132be3f68
--- /dev/null
+++ b/packages/vulcan-events-segment/lib/server/main.js
@@ -0,0 +1,3 @@
+// export * from '../modules/index';
+
+export * from './segment-server.js';
\ No newline at end of file
diff --git a/packages/vulcan-events-segment/lib/server/segment-server.js b/packages/vulcan-events-segment/lib/server/segment-server.js
new file mode 100644
index 000000000..6d19e9a6b
--- /dev/null
+++ b/packages/vulcan-events-segment/lib/server/segment-server.js
@@ -0,0 +1,40 @@
+import Analytics from 'analytics-node';
+import { getSetting, addCallback, Utils } from 'meteor/vulcan:core';
+import { addPageFunction, addInitFunction, addIdentifyFunction, addTrackFunction } from 'meteor/vulcan:events';
+
+const segmentWriteKey = getSetting('segment.serverKey');
+
+if (segmentWriteKey) {
+
+ const analytics = new Analytics(segmentWriteKey);
+
+ /*
+
+ Identify User
+
+ */
+ function segmentIdentifyServer(currentUser) {
+ analytics.identify({
+ userId: currentUser._id,
+ traits: {
+ email: currentUser.email,
+ pageUrl: currentUser.pageUrl,
+ },
+ });
+ }
+ addIdentifyFunction(segmentIdentifyServer);
+
+ /*
+
+ Track Event
+
+ */
+ function segmentTrackServer(eventName, eventProperties, currentUser) {
+ analytics.track({
+ event: eventName,
+ properties: eventProperties,
+ userId: currentUser && currentUser._id,
+ });
+ }
+ addTrackFunction(segmentTrackServer);
+}
diff --git a/packages/vulcan-events-segment/package.js b/packages/vulcan-events-segment/package.js
new file mode 100644
index 000000000..d5544bd57
--- /dev/null
+++ b/packages/vulcan-events-segment/package.js
@@ -0,0 +1,20 @@
+Package.describe({
+ name: "vulcan:events-segment",
+ summary: "Vulcan Segment",
+ version: '1.8.1',
+ git: "https://github.com/VulcanJS/Vulcan.git"
+});
+
+Package.onUse(function (api) {
+
+ api.versionsFrom('METEOR@1.5.2');
+
+ api.use([
+ 'vulcan:core@1.8.1',
+ 'vulcan:events@1.8.1',
+ ]);
+
+ api.mainModule('lib/server/main.js', 'server');
+ api.mainModule('lib/client/main.js', 'client');
+
+});
diff --git a/packages/vulcan-events/lib/callbacks.js b/packages/vulcan-events/lib/callbacks.js
deleted file mode 100644
index 75d594d60..000000000
--- a/packages/vulcan-events/lib/callbacks.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import { addCallback } from 'meteor/vulcan:core';
-import { sendGoogleAnalyticsRequest } from './helpers';
-
-// add client-side callback: log a ga request on page view
-addCallback('router.onUpdate', sendGoogleAnalyticsRequest);
\ No newline at end of file
diff --git a/packages/vulcan-events/lib/client.js b/packages/vulcan-events/lib/client.js
deleted file mode 100644
index 5f5e7d985..000000000
--- a/packages/vulcan-events/lib/client.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import Events from './collection.js';
-import { initGoogleAnalytics } from './helpers.js';
-import './callbacks.js';
-
-// init google analytics on the client module
-initGoogleAnalytics();
-
-export default Events;
diff --git a/packages/vulcan-events/lib/client/main.js b/packages/vulcan-events/lib/client/main.js
new file mode 100644
index 000000000..67d11275b
--- /dev/null
+++ b/packages/vulcan-events/lib/client/main.js
@@ -0,0 +1 @@
+export * from '../modules/index.js';
\ No newline at end of file
diff --git a/packages/vulcan-events/lib/collection.js b/packages/vulcan-events/lib/collection.js
deleted file mode 100644
index 031492f08..000000000
--- a/packages/vulcan-events/lib/collection.js
+++ /dev/null
@@ -1,33 +0,0 @@
-import SimpleSchema from 'simpl-schema';
-
-const Events = new Mongo.Collection('events');
-
-Events.schema = new SimpleSchema({
- createdAt: {
- type: Date
- },
- name: {
- type: String
- },
- description: {
- type: String,
- optional: true
- },
- unique: {
- type: Boolean,
- optional: true
- },
- important: { // marking an event as important means it should never be erased
- type: Boolean,
- optional: true
- },
- properties: {
- type: Object,
- optional: true,
- blackbox: true
- }
-});
-
-Events.attachSchema(Events.schema);
-
-export default Events;
diff --git a/packages/vulcan-events/lib/helpers.js b/packages/vulcan-events/lib/helpers.js
deleted file mode 100644
index b3355c05c..000000000
--- a/packages/vulcan-events/lib/helpers.js
+++ /dev/null
@@ -1,60 +0,0 @@
-import { getSetting, registerSetting } from 'meteor/vulcan:core';
-import Events from './collection.js';
-
-registerSetting('googleAnalyticsId', null, 'Google Analytics ID');
-
-/*
-
- We provide a special support for Google Analytics.
-
- If you want to enable GA page viewing / tracking, go to
- your settings file and update the 'public > googleAnalyticsId'
- field with your GA unique identifier (UA-xxx...).
-
-*/
-
-export function sendGoogleAnalyticsRequest () {
- if (window && window.ga) {
- window.ga('send', 'pageview', {
- 'page': window.location.pathname
- });
- }
- return {}
-}
-
-export const initGoogleAnalytics = () => {
-
- // get the google analytics id from the settings
- const googleAnalyticsId = getSetting('googleAnalyticsId');
-
- // the google analytics id exists & isn't the placeholder from sample_settings.json
- if (googleAnalyticsId && googleAnalyticsId !== 'foo123') {
-
- (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
- (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
- m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
- })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-
- const cookieDomain = document.domain === 'localhost' ? 'none' : 'auto';
-
- window.ga('create', googleAnalyticsId, cookieDomain);
-
- // trigger first request once analytics are initialized
- sendGoogleAnalyticsRequest();
- }
-};
-
-
-// collection based logging
-Events.log = function (event) {
-
- // if event is supposed to be unique, check if it has already been logged
- if (!!event.unique && !!Events.findOne({name: event.name})) {
- return;
- }
-
- event.createdAt = new Date();
-
- Events.insert(event);
-
-};
diff --git a/packages/vulcan-events/lib/modules/events.js b/packages/vulcan-events/lib/modules/events.js
new file mode 100644
index 000000000..c04a37279
--- /dev/null
+++ b/packages/vulcan-events/lib/modules/events.js
@@ -0,0 +1,41 @@
+import { addCallback } from 'meteor/vulcan:core';
+
+export const initFunctions = [];
+
+export const trackFunctions = [];
+
+export const addInitFunction = f => {
+ initFunctions.push(f);
+ // execute init function as soon as possible
+ f();
+};
+
+export const addTrackFunction = f => {
+ trackFunctions.push(f);
+};
+
+export const track = async (eventName, eventProperties, currentUser) => {
+ for (let f of trackFunctions) {
+ await f(eventName, eventProperties, currentUser);
+ }
+};
+
+export const addUserFunction = f => {
+ addCallback('users.new.async', f);
+};
+
+export const addIdentifyFunction = f => {
+ addCallback('events.identify', f);
+};
+
+export const addPageFunction = f => {
+ const f2 = (empty, route) => f(route);
+
+ // rename f2 to same name as f
+ // see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/defineProperty
+ const descriptor = Object.create(null); // no inherited properties
+ descriptor.value = f.name;
+ Object.defineProperty(f2, 'name', descriptor);
+
+ addCallback('router.onUpdate', f2);
+};
diff --git a/packages/vulcan-events/lib/modules/index.js b/packages/vulcan-events/lib/modules/index.js
new file mode 100644
index 000000000..099399ac2
--- /dev/null
+++ b/packages/vulcan-events/lib/modules/index.js
@@ -0,0 +1 @@
+export * from './events';
\ No newline at end of file
diff --git a/packages/vulcan-events/lib/mutations.js b/packages/vulcan-events/lib/mutations.js
deleted file mode 100644
index 17a92a1aa..000000000
--- a/packages/vulcan-events/lib/mutations.js
+++ /dev/null
@@ -1,18 +0,0 @@
-// import { GraphQLSchema } from 'meteor/vulcan:core';
-// // import Events from './collection.js';
-// import { requestAnalyticsAsync } from './helpers.js';
-
-// GraphQLSchema.addMutation('eventTrack(eventName: String, properties: JSON): JSON');
-
-// const resolvers = {
-// Mutation: {
-// eventTrack: (root, { eventName, properties }, context) => {
-// const user = context.currentUser || {_id: 'anonymous'};
-
-
-// return properties;
-// },
-// },
-// };
-
-// GraphQLSchema.addResolvers(resolvers);
diff --git a/packages/vulcan-events/lib/server.js b/packages/vulcan-events/lib/server.js
deleted file mode 100644
index 523fea258..000000000
--- a/packages/vulcan-events/lib/server.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import Events from './collection.js';
-import './callbacks.js';
-// import './mutations.js';
-
-export default Events;
diff --git a/packages/vulcan-events/lib/server/main.js b/packages/vulcan-events/lib/server/main.js
new file mode 100644
index 000000000..67d11275b
--- /dev/null
+++ b/packages/vulcan-events/lib/server/main.js
@@ -0,0 +1 @@
+export * from '../modules/index.js';
\ No newline at end of file
diff --git a/packages/vulcan-events/package.js b/packages/vulcan-events/package.js
index 2d14c24b3..96748fbf1 100644
--- a/packages/vulcan-events/package.js
+++ b/packages/vulcan-events/package.js
@@ -1,7 +1,7 @@
Package.describe({
name: "vulcan:events",
summary: "Vulcan event tracking package",
- version: '1.8.0',
+ version: '1.8.1',
git: "https://github.com/VulcanJS/Vulcan.git"
});
@@ -10,10 +10,10 @@ Package.onUse(function(api) {
api.versionsFrom('METEOR@1.5.2');
api.use([
- 'vulcan:core@1.8.0',
+ 'vulcan:core@1.8.1',
]);
- api.mainModule("lib/server.js", "server");
- api.mainModule("lib/client.js", "client");
+ api.mainModule("lib/server/main.js", "server");
+ api.mainModule('lib/client/main.js', 'client');
});
diff --git a/packages/vulcan-forms-tags/package.js b/packages/vulcan-forms-tags/package.js
index e5a33244f..9872f60b4 100644
--- a/packages/vulcan-forms-tags/package.js
+++ b/packages/vulcan-forms-tags/package.js
@@ -1,7 +1,7 @@
Package.describe({
name: "vulcan:forms-tags",
summary: "Vulcan tag input package",
- version: '1.8.0',
+ version: '1.8.1',
git: 'https://github.com/VulcanJS/Vulcan.git'
});
@@ -10,8 +10,8 @@ Package.onUse( function(api) {
api.versionsFrom('METEOR@1.5.2');
api.use([
- 'vulcan:core@1.8.0',
- 'vulcan:forms@1.8.0'
+ 'vulcan:core@1.8.1',
+ 'vulcan:forms@1.8.1'
]);
api.mainModule("lib/export.js", ["client", "server"]);
diff --git a/packages/vulcan-forms-upload/lib/Upload.jsx b/packages/vulcan-forms-upload/lib/Upload.jsx
index 14f17c7e1..bc0030af2 100755
--- a/packages/vulcan-forms-upload/lib/Upload.jsx
+++ b/packages/vulcan-forms-upload/lib/Upload.jsx
@@ -169,15 +169,15 @@ class Upload extends PureComponent {
const newValue = this.enableMultiple() ? removeNthItem(this.state.value, index): '';
this.context.addToAutofilledValues({[this.props.name]: newValue});
this.setState({
- preview: newValue,
+ preview: null,
value: newValue,
});
}
render() {
const { uploading, preview, value } = this.state;
+
// show the actual uploaded image or the preview
-
const imageData = this.enableMultiple() ? (preview ? value.concat(preview) : value) : value || preview;
return (
diff --git a/packages/vulcan-forms-upload/package.js b/packages/vulcan-forms-upload/package.js
index 734df83c4..62c0d2b7b 100755
--- a/packages/vulcan-forms-upload/package.js
+++ b/packages/vulcan-forms-upload/package.js
@@ -1,7 +1,7 @@
Package.describe({
name: "vulcan:forms-upload",
summary: "Vulcan package extending vulcan:forms to upload images to Cloudinary from a drop zone.",
- version: "1.8.0",
+ version: "1.8.1",
git: 'https://github.com/xavcz/nova-forms-upload.git'
});
@@ -10,8 +10,8 @@ Package.onUse( function(api) {
api.versionsFrom('METEOR@1.5.2');
api.use([
- 'vulcan:core@1.8.0',
- 'vulcan:forms@1.8.0',
+ 'vulcan:core@1.8.1',
+ 'vulcan:forms@1.8.1',
'fourseven:scss@4.5.0'
]);
diff --git a/packages/vulcan-forms/lib/components/Flash.jsx b/packages/vulcan-forms/lib/components/Flash.jsx
index 9ce77b4ff..927fdb821 100644
--- a/packages/vulcan-forms/lib/components/Flash.jsx
+++ b/packages/vulcan-forms/lib/components/Flash.jsx
@@ -1,6 +1,7 @@
import React from 'react';
import PropTypes from 'prop-types';
import Alert from 'react-bootstrap/lib/Alert'
+import { registerComponent } from 'meteor/vulcan:core';
const Flash = ({message, type}) => {
@@ -24,4 +25,4 @@ Flash.propTypes = {
message: PropTypes.oneOfType([PropTypes.object.isRequired, PropTypes.array.isRequired])
}
-export default Flash;
\ No newline at end of file
+registerComponent('FormFlash', Flash);
\ No newline at end of file
diff --git a/packages/vulcan-forms/lib/components/Form.jsx b/packages/vulcan-forms/lib/components/Form.jsx
index 8ca04813a..f8527995c 100644
--- a/packages/vulcan-forms/lib/components/Form.jsx
+++ b/packages/vulcan-forms/lib/components/Form.jsx
@@ -25,12 +25,9 @@ This component expects:
import { Components, Utils, runCallbacks } from 'meteor/vulcan:core';
import React, { Component } from 'react';
import PropTypes from 'prop-types';
-import { FormattedMessage, intlShape } from 'meteor/vulcan:i18n';
+import { intlShape } from 'meteor/vulcan:i18n';
import Formsy from 'formsy-react';
-import Button from 'react-bootstrap/lib/Button';
-import Flash from "./Flash.jsx";
-import FormGroup from "./FormGroup.jsx";
-import { flatten, deepValue, getEditableFields, getInsertableFields } from '../modules/utils.js';
+import { getEditableFields, getInsertableFields } from '../modules/utils.js';
/*
@@ -156,21 +153,32 @@ class Form extends Component {
}
// replace empty value, which has not been prefilled, by the default value from the schema
- if (fieldSchema.defaultValue && field.value === "") {
+ // keep defaultValue for backwards compatibility even though it doesn't actually work
+ if (fieldSchema.defaultValue && (typeof field.value === 'undefined' || field.value === '')) {
field.value = fieldSchema.defaultValue;
}
+ if (fieldSchema.default && (typeof field.value === 'undefined' || field.value === '')) {
+ field.value = fieldSchema.default;
+ }
// add options if they exist
if (fieldSchema.form && fieldSchema.form.options) {
field.options = typeof fieldSchema.form.options === "function" ? fieldSchema.form.options.call(fieldSchema, this.props) : fieldSchema.form.options;
+
+ // in case of checkbox groups, check "checked" option to populate value
+ if (!field.value) {
+ field.value = _.where(field.options, {checked: true}).map(option => option.value);
+ }
}
-
- if (fieldSchema.form && fieldSchema.form.disabled) {
- field.disabled = typeof fieldSchema.form.disabled === "function" ? fieldSchema.form.disabled.call(fieldSchema) : fieldSchema.form.disabled;
- }
-
- if (fieldSchema.form && fieldSchema.form.help) {
- field.help = typeof fieldSchema.form.help === "function" ? fieldSchema.form.help.call(fieldSchema) : fieldSchema.form.help;
+
+ if (fieldSchema.form) {
+ for (const prop in fieldSchema.form) {
+ if (prop !== 'prefill' && prop !== 'options' && fieldSchema.form.hasOwnProperty(prop)) {
+ field[prop] = typeof fieldSchema.form[prop] === "function" ?
+ fieldSchema.form[prop].call(fieldSchema) :
+ fieldSchema.form[prop];
+ }
+ }
}
// add limit
@@ -353,7 +361,8 @@ class Form extends Component {
message = error.data.errors.map(error => {
return {
- content: this.getErrorMessage(error)
+ content: this.getErrorMessage(error),
+ data: error.data,
}
});
@@ -362,8 +371,8 @@ class Form extends Component {
message = {content: error.message || this.context.intl.formatMessage({id: error.id, defaultMessage: error.id}, error.data)}
}
-
- return
+
+ return ;
})}
)
@@ -613,26 +622,25 @@ class Form extends Component {
disabled={this.state.disabled}
ref="form"
>
- {this.renderErrors()}
- {fieldGroups.map(group => )}
-
+ {this.renderErrors()}
+
+ {fieldGroups.map(group => )}
+
+ {this.props.repeatErrors && this.renderErrors()}
+
+
-
- {
- this.props.formType === 'edit' && this.props.showRemove
- ?
- : null
- }
)
}
@@ -660,6 +668,7 @@ Form.propTypes = {
showRemove: PropTypes.bool,
submitLabel: PropTypes.string,
cancelLabel: PropTypes.string,
+ repeatErrors: PropTypes.bool,
// callbacks
submitCallback: PropTypes.func,
@@ -673,7 +682,8 @@ Form.propTypes = {
}
Form.defaultProps = {
- layout: "horizontal",
+ layout: 'horizontal',
+ repeatErrors: false,
}
Form.contextTypes = {
diff --git a/packages/vulcan-forms/lib/components/FormComponent.jsx b/packages/vulcan-forms/lib/components/FormComponent.jsx
index 58e1f86fb..2e1cc468a 100644
--- a/packages/vulcan-forms/lib/components/FormComponent.jsx
+++ b/packages/vulcan-forms/lib/components/FormComponent.jsx
@@ -3,6 +3,7 @@ import PropTypes from 'prop-types';
import { intlShape } from 'meteor/vulcan:i18n';
import classNames from 'classnames';
import { Components } from 'meteor/vulcan:core';
+import { registerComponent } from 'meteor/vulcan:core';
class FormComponent extends PureComponent {
@@ -97,6 +98,9 @@ class FormComponent extends PureComponent {
case 'datetime':
return ;
+ case 'time':
+ return ;
+
case 'text':
return ;
@@ -120,16 +124,37 @@ class FormComponent extends PureComponent {
)
}
+ showClear = () => {
+ return ['datetime', 'select', 'radiogroup'].includes(this.props.control);
+ }
+
+ clearField = (e) => {
+ e.preventDefault();
+ console.log(this.props)
+ const fieldName = this.props.name;
+ // clear value
+ this.props.updateCurrentValues({[fieldName]: null});
+ // add it to unset
+ this.context.addToDeletedValues(fieldName);
+ }
+
+ renderClear() {
+ return (
+ ✕
+ )
+ }
+
render() {
const hasErrors = this.props.errors && this.props.errors.length;
- const inputClass = classNames('form-input', `input-${this.props.name}`, {'input-error': hasErrors});
+ const inputClass = classNames('form-input', `input-${this.props.name}`, `form-component-${this.props.control || 'default'}`,{'input-error': hasErrors});
return (
{this.props.beforeComponent ? this.props.beforeComponent : null}
{this.renderComponent()}
{hasErrors ? this.renderErrors() : null}
+ {this.showClear() ? this.renderClear() : null}
{this.props.limit ? {this.state.limit} : null}
{this.props.afterComponent ? this.props.afterComponent : null}
{this.props.name === 'default' ? null : this.renderHeading()}
- {this.props.fields.map(field => )}
+ {this.props.fields.map(field => )}
+
+
+ this.updateDate(newDate)}
+ inputProps={{name: this.props.name}}
+ />
+
+ |