digirati-annotation-redux - npm Package Compare versions

Comparing version 0.2.20-alpha.0ae92440 to 0.2.20-alpha.5892bb78

es/actions/drafts.js

@@ -8,2 +8,3 @@ import uuid from 'uuid/v4';
 export var DRAFT_UPDATE_SELECTOR = 'DRAFT_UPDATE_SELECTOR';
+export var DRAFT_UPDATE_FIELD_SELECTOR = 'DRAFT_UPDATE_FIELD_SELECTOR';
 export var DRAFT_UPDATE_INPUT = 'DRAFT_UPDATE_INPUT';
@@ -22,3 +23,3 @@ export var DRAFT_SELECT = 'DRAFT_SELECT';
     var id = uuid();
-    dispatch({ type: DRAFT_CREATE, payload: { id: id, input: input, template: template, motivation: motivation } });
+    dispatch({ type: DRAFT_CREATE, payload: { id: id, input: input, template: template, selectors: input, motivation: motivation } });
     dispatch(selectDraft(id));
@@ -43,2 +44,8 @@ var currentTemplate = getCurrentResourceTemplate(state());
 
+export function addSelectorToDraftField(id, selector, fieldId) {
+  var _selectors;
+
+  return { type: DRAFT_UPDATE_FIELD_SELECTOR, payload: { id: id, selectors: (_selectors = {}, _selectors[fieldId] = selector, _selectors) } };
+}
+
 export function addSelectorToDraft(id, selector) {
@@ -45,0 +52,0 @@ return { type: DRAFT_UPDATE_SELECTOR, payload: { id: id, selector: selector } };

es/reducers/draftReducer.js

 import _objectWithoutProperties from 'babel-runtime/helpers/objectWithoutProperties';
-import { DRAFT_CREATE, DRAFT_PUBLISHED, DRAFT_PUBLISHING, DRAFT_SELECT, DRAFT_UPDATE_INPUT, DRAFT_UPDATE_SELECTOR, DRAFT_DESELECT, DRAFT_PREVIEW, DRAFT_UNPREVIEW } from '../actions/drafts';
+import { DRAFT_CREATE, DRAFT_PUBLISHED, DRAFT_PUBLISHING, DRAFT_SELECT, DRAFT_UPDATE_INPUT, DRAFT_UPDATE_SELECTOR, DRAFT_DESELECT, DRAFT_PREVIEW, DRAFT_UNPREVIEW, DRAFT_UPDATE_FIELD_SELECTOR } from '../actions/drafts';
 import update from 'immutability-helper';
@@ -10,4 +10,17 @@
 
+function draftModel(draft) {
+  return {
+    id: draft.id,
+    input: draft.input || {},
+    selectors: draft.selectors || {},
+    template: draft.template,
+    motivation: draft.motivation,
+    isPublishing: draft.isPublishing || false,
+    isPreviewing: draft.isPreviewing || false,
+    selector: draft.selector || null
+  };
+}
+
 export default function draftReducer() {
-  var _list, _list2, _list3, _list4, _list5, _list6;
+  var _list, _list2, _list3, _list4, _list5, _list6, _list7;
 
@@ -21,28 +34,27 @@ var state = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : defaultState;
         list: (_list = {}, _list[action.payload.id] = {
-          $set: {
-            id: action.payload.id,
-            input: action.payload.input,
-            template: action.payload.template,
-            motivation: action.payload.motivation,
-            isPublishing: false,
-            isPreviewing: false,
-            selector: null
-          }
+          $set: draftModel(action.payload)
         }, _list)
       });
 
-    case DRAFT_UPDATE_INPUT:
+    case DRAFT_UPDATE_FIELD_SELECTOR:
       return update(state, {
         list: (_list2 = {}, _list2[action.payload.id] = {
-          input: { $merge: action.payload.fields }
+          selectors: { $merge: action.payload.selectors }
         }, _list2)
       });
 
-    case DRAFT_UPDATE_SELECTOR:
+    case DRAFT_UPDATE_INPUT:
       return update(state, {
         list: (_list3 = {}, _list3[action.payload.id] = {
-          selector: { $set: action.payload.selector ? action.payload.selector : state.list[action.payload.id].selector }
+          input: { $merge: action.payload.fields }
         }, _list3)
       });
 
+    case DRAFT_UPDATE_SELECTOR:
+      return update(state, {
+        list: (_list4 = {}, _list4[action.payload.id] = {
+          selector: { $set: action.payload.selector ? action.payload.selector : state.list[action.payload.id].selector }
+        }, _list4)
+      });
+
     case DRAFT_SELECT:
@@ -60,5 +72,5 @@ return update(state, {
       return update(state, {
-        list: (_list4 = {}, _list4[action.payload.id] = {
+        list: (_list5 = {}, _list5[action.payload.id] = {
           isPublishing: { $set: true }
-        }, _list4)
+        }, _list5)
       });
@@ -68,5 +80,5 @@
       return update(state, {
-        list: (_list5 = {}, _list5[action.payload.id] = {
+        list: (_list6 = {}, _list6[action.payload.id] = {
           isPreviewing: { $set: true }
-        }, _list5)
+        }, _list6)
       });
@@ -76,5 +88,5 @@
       return update(state, {
-        list: (_list6 = {}, _list6[action.payload.id] = {
+        list: (_list7 = {}, _list7[action.payload.id] = {
           isPreviewing: { $set: false }
-        }, _list6)
+        }, _list7)
       });
@@ -81,0 +93,0 @@

lib/actions/drafts.js

 'use strict';
 
 exports.__esModule = true;
-exports.DRAFT_UNPREVIEW = exports.DRAFT_PREVIEW = exports.DRAFT_PUBLISHED = exports.DRAFT_PUBLISHING = exports.DRAFT_DESELECT = exports.DRAFT_SELECT = exports.DRAFT_UPDATE_INPUT = exports.DRAFT_UPDATE_SELECTOR = exports.DRAFT_CREATE = undefined;
+exports.DRAFT_UNPREVIEW = exports.DRAFT_PREVIEW = exports.DRAFT_PUBLISHED = exports.DRAFT_PUBLISHING = exports.DRAFT_DESELECT = exports.DRAFT_SELECT = exports.DRAFT_UPDATE_INPUT = exports.DRAFT_UPDATE_FIELD_SELECTOR = exports.DRAFT_UPDATE_SELECTOR = exports.DRAFT_CREATE = undefined;
 exports.createDraft = createDraft;
 exports.deselectDraft = deselectDraft;
 exports.updateDraft = updateDraft;
+exports.addSelectorToDraftField = addSelectorToDraftField;
 exports.addSelectorToDraft = addSelectorToDraft;
@@ -21,3 +22,3 @@ exports.selectDraft = selectDraft;
 
-var _selectors = require('./selectors');
+var _selectors2 = require('./selectors');
 
@@ -30,2 +31,3 @@ var _resourceTemplateQuery = require('../query/resourceTemplateQuery');
 var DRAFT_UPDATE_SELECTOR = exports.DRAFT_UPDATE_SELECTOR = 'DRAFT_UPDATE_SELECTOR';
+var DRAFT_UPDATE_FIELD_SELECTOR = exports.DRAFT_UPDATE_FIELD_SELECTOR = 'DRAFT_UPDATE_FIELD_SELECTOR';
 var DRAFT_UPDATE_INPUT = exports.DRAFT_UPDATE_INPUT = 'DRAFT_UPDATE_INPUT';
@@ -44,3 +46,3 @@ var DRAFT_SELECT = exports.DRAFT_SELECT = 'DRAFT_SELECT';
     var id = (0, _v2.default)();
-    dispatch({ type: DRAFT_CREATE, payload: { id: id, input: input, template: template, motivation: motivation } });
+    dispatch({ type: DRAFT_CREATE, payload: { id: id, input: input, template: template, selectors: input, motivation: motivation } });
     dispatch(selectDraft(id));
@@ -51,3 +53,3 @@ var currentTemplate = (0, _resourceTemplateQuery.getCurrentResourceTemplate)(state());
       if (form.meta && form.meta.selector) {
-        dispatch((0, _selectors.chooseSelector)(form.meta.selector));
+        dispatch((0, _selectors2.chooseSelector)(form.meta.selector));
       }
@@ -66,2 +68,8 @@ }
 
+function addSelectorToDraftField(id, selector, fieldId) {
+  var _selectors;
+
+  return { type: DRAFT_UPDATE_FIELD_SELECTOR, payload: { id: id, selectors: (_selectors = {}, _selectors[fieldId] = selector, _selectors) } };
+}
+
 function addSelectorToDraft(id, selector) {
@@ -68,0 +76,0 @@ return { type: DRAFT_UPDATE_SELECTOR, payload: { id: id, selector: selector } };

lib/reducers/draftReducer.js

@@ -24,4 +24,17 @@ 'use strict';
 
+function draftModel(draft) {
+  return {
+    id: draft.id,
+    input: draft.input || {},
+    selectors: draft.selectors || {},
+    template: draft.template,
+    motivation: draft.motivation,
+    isPublishing: draft.isPublishing || false,
+    isPreviewing: draft.isPreviewing || false,
+    selector: draft.selector || null
+  };
+}
+
 function draftReducer() {
-  var _list, _list2, _list3, _list4, _list5, _list6;
+  var _list, _list2, _list3, _list4, _list5, _list6, _list7;
 
@@ -35,28 +48,27 @@ var state = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : defaultState;
         list: (_list = {}, _list[action.payload.id] = {
-          $set: {
-            id: action.payload.id,
-            input: action.payload.input,
-            template: action.payload.template,
-            motivation: action.payload.motivation,
-            isPublishing: false,
-            isPreviewing: false,
-            selector: null
-          }
+          $set: draftModel(action.payload)
         }, _list)
       });
 
-    case _drafts.DRAFT_UPDATE_INPUT:
+    case _drafts.DRAFT_UPDATE_FIELD_SELECTOR:
       return (0, _immutabilityHelper2.default)(state, {
         list: (_list2 = {}, _list2[action.payload.id] = {
-          input: { $merge: action.payload.fields }
+          selectors: { $merge: action.payload.selectors }
         }, _list2)
       });
 
-    case _drafts.DRAFT_UPDATE_SELECTOR:
+    case _drafts.DRAFT_UPDATE_INPUT:
       return (0, _immutabilityHelper2.default)(state, {
         list: (_list3 = {}, _list3[action.payload.id] = {
-          selector: { $set: action.payload.selector ? action.payload.selector : state.list[action.payload.id].selector }
+          input: { $merge: action.payload.fields }
         }, _list3)
       });
 
+    case _drafts.DRAFT_UPDATE_SELECTOR:
+      return (0, _immutabilityHelper2.default)(state, {
+        list: (_list4 = {}, _list4[action.payload.id] = {
+          selector: { $set: action.payload.selector ? action.payload.selector : state.list[action.payload.id].selector }
+        }, _list4)
+      });
+
     case _drafts.DRAFT_SELECT:
@@ -74,5 +86,5 @@ return (0, _immutabilityHelper2.default)(state, {
       return (0, _immutabilityHelper2.default)(state, {
-        list: (_list4 = {}, _list4[action.payload.id] = {
+        list: (_list5 = {}, _list5[action.payload.id] = {
           isPublishing: { $set: true }
-        }, _list4)
+        }, _list5)
       });
@@ -82,5 +94,5 @@
       return (0, _immutabilityHelper2.default)(state, {
-        list: (_list5 = {}, _list5[action.payload.id] = {
+        list: (_list6 = {}, _list6[action.payload.id] = {
           isPreviewing: { $set: true }
-        }, _list5)
+        }, _list6)
       });
@@ -90,5 +102,5 @@
       return (0, _immutabilityHelper2.default)(state, {
-        list: (_list6 = {}, _list6[action.payload.id] = {
+        list: (_list7 = {}, _list7[action.payload.id] = {
           isPreviewing: { $set: false }
-        }, _list6)
+        }, _list7)
       });
@@ -95,0 +107,0 @@

package.json

 {
   "name": "digirati-annotation-redux",
-  "version": "0.2.20-alpha.0ae92440",
+  "version": "0.2.20-alpha.5892bb78",
   "description": "Describe annotation-redux here",
@@ -5,0 +5,0 @@ "main": "es/index.js",

No alert changes

Improved metrics

Total package byte prevSize

96628

increased by1.49%

Lines of code

2508

increased by1.29%

No dependency changes