@micromag/data 0.3.679 → 0.3.699

package/es/index.js

@@ -9,10 +9,10 @@ import { getJSON, getCSRFHeaders, postJSON } from '@folklore/fetch';
 import { generatePath } from '@folklore/routes';
 import queryString from 'query-string';
 import _slicedToArray from '@babel/runtime/helpers/slicedToArray';
+import { useVisitor, useStory } from '@micromag/core/contexts';
 import _objectWithoutProperties from '@babel/runtime/helpers/objectWithoutProperties';
 import _toConsumableArray from '@babel/runtime/helpers/toConsumableArray';
 import isString from 'lodash/isString';
-import { useVisitor, useStory } from '@micromag/core/contexts';
 
 var Base = /*#__PURE__*/function () {
   function Base() {
@@ -230,9 +230,10 @@ var QuizApi = /*#__PURE__*/function (_Base) {
   return _createClass(QuizApi, [{
     key: "results",
     value: function results(screenId) {
+      var query = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
       return this.requestGet(this.route('results', {
         screen: screenId
-      }));
+      }), query);
     }
   }, {
     key: "create",
@@ -292,6 +293,10 @@ ApiProvider.defaultProps = defaultProps$1;
 var useContributionCreate = function useContributionCreate() {
   var _ref = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
     screenId = _ref.screenId,
+    _ref$visitorId = _ref.visitorId,
+    providedVisitorId = _ref$visitorId === void 0 ? null : _ref$visitorId,
+    _ref$storyId = _ref.storyId,
+    providedStoryId = _ref$storyId === void 0 ? null : _ref$storyId,
     _ref$onSuccess = _ref.onSuccess,
     onSuccess = _ref$onSuccess === void 0 ? null : _ref$onSuccess;
   var api = useApi();
@@ -299,13 +304,20 @@ var useContributionCreate = function useContributionCreate() {
     _useState2 = _slicedToArray(_useState, 2),
     creating = _useState2[0],
     setCreating = _useState2[1];
+  var _ref2 = useVisitor() || {},
+    visitorId = _ref2.id;
+  var _ref3 = useStory() || {},
+    storyId = _ref3.id,
+    documentId = _ref3.document_id;
   var create = useCallback(function (data) {
     if (api === null) {
       return null;
     }
     setCreating(true);
     return api.contributions.create(_objectSpread({
-      screen_id: screenId
+      screen_id: screenId,
+      visitor_id: providedVisitorId || visitorId,
+      story_id: documentId || providedStoryId || storyId
     }, data)).then(function (response) {
       setCreating(false);
       if (onSuccess !== null) {
@@ -313,7 +325,7 @@ var useContributionCreate = function useContributionCreate() {
       }
       return response;
     });
-  }, [api, setCreating, onSuccess, screenId]);
+  }, [api, setCreating, onSuccess, screenId, visitorId, storyId, providedVisitorId, providedStoryId]);
   return {
     create: create,
     creating: creating
@@ -380,9 +392,14 @@ var _excluded$3 = ["data"];
 var useContributions = function useContributions() {
   var _ref = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
     screenId = _ref.screenId,
+    _ref$storyId = _ref.storyId,
+    providedStoryId = _ref$storyId === void 0 ? null : _ref$storyId,
     _ref$opts = _ref.opts,
     opts = _ref$opts === void 0 ? {} : _ref$opts;
   var api = useApi();
+  var _ref2 = useStory() || {},
+    storyId = _ref2.id,
+    documentId = _ref2.document_id;
   var _useState = useState(_toConsumableArray(new Array(10)).map(function (el, i) {
       return {
         name: "Nom ".concat(i + 1),
@@ -392,13 +409,15 @@ var useContributions = function useContributions() {
     _useState2 = _slicedToArray(_useState, 1),
     defaultContributions = _useState2[0];
   var loader = useCallback(function () {
-    return api !== null ? api.contributions.get(screenId) : null;
-  }, [api, screenId]);
-  var _ref2 = api !== null ? useData(loader, opts) : {
+    return api !== null ? api.contributions.get(screenId, {
+      story_id: documentId || providedStoryId || storyId
+    }) : null;
+  }, [api, screenId, documentId, providedStoryId, storyId]);
+  var _ref3 = api !== null ? useData(loader, opts) : {
       data: null
     },
-    data = _ref2.data,
-    request = _objectWithoutProperties(_ref2, _excluded$3);
+    data = _ref3.data,
+    request = _objectWithoutProperties(_ref3, _excluded$3);
   return _objectSpread({
     contributions: data || defaultContributions
   }, request);
@@ -979,17 +998,24 @@ var _excluded = ["data"];
 var useQuiz = function useQuiz() {
   var _ref = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
     screenId = _ref.screenId,
+    _ref$storyId = _ref.storyId,
+    providedStoryId = _ref$storyId === void 0 ? null : _ref$storyId,
     _ref$opts = _ref.opts,
     opts = _ref$opts === void 0 ? {} : _ref$opts;
   var api = useApi();
+  var _ref2 = useStory() || {},
+    storyId = _ref2.id,
+    documentId = _ref2.document_id;
   var loader = useCallback(function () {
-    return api !== null ? api.quiz.results(screenId) : null;
-  }, [api, screenId]);
-  var _ref2 = api !== null ? useData(loader, opts) : {
+    return api !== null ? api.quiz.results(screenId, {
+      story_id: documentId || providedStoryId || storyId
+    }) : null;
+  }, [api, screenId, documentId, providedStoryId, storyId]);
+  var _ref3 = api !== null ? useData(loader, opts) : {
       data: null
     },
-    data = _ref2.data,
-    request = _objectWithoutProperties(_ref2, _excluded);
+    data = _ref3.data,
+    request = _objectWithoutProperties(_ref3, _excluded);
   return _objectSpread({
     quiz: data || []
   }, request);
@@ -1012,7 +1038,8 @@ var useQuizCreate = function useQuizCreate() {
   var _ref2 = useVisitor() || {},
     visitorId = _ref2.id;
   var _ref3 = useStory() || {},
-    storyId = _ref3.id;
+    storyId = _ref3.id,
+    documentId = _ref3.document_id;
   var create = useCallback(function (data) {
     if (api === null) {
       return null;
@@ -1021,7 +1048,7 @@ var useQuizCreate = function useQuizCreate() {
     return api.quiz.create(_objectSpread({
       screen_id: screenId,
       visitor_id: providedVisitorId || visitorId,
-      story_id: providedStoryId || storyId
+      story_id: documentId || providedStoryId || storyId
     }, data)).then(function (response) {
       setCreating(false);
       if (onSuccess !== null) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@micromag/data",
-    "version": "0.3.679",
+    "version": "0.3.699",
     "private": false,
     "description": "",
     "keywords": [
@@ -68,5 +68,5 @@
         "access": "public",
         "registry": "https://registry.npmjs.org/"
     },
-    "gitHead": "ed32123e4d66d2cfe32ec1fecaf1a435e1b04bbf"
+    "gitHead": "8d69620bde11630e19004ac76f6ed1454fc33516"
 }