@dhis2/analytics 26.2.0-alpha.1 → 26.2.0-cumulative-values-alpha.1

package/build/es/api/analytics/Analytics.js

@@ -6,15 +6,12 @@ import AnalyticsEnrollments from './AnalyticsEnrollments.js';
 import AnalyticsEvents from './AnalyticsEvents.js';
 import AnalyticsRequest from './AnalyticsRequest.js';
 import AnalyticsResponse from './AnalyticsResponse.js';
-import AnalyticsTrackedEntities from './AnalyticsTrackedEntities.js';
 
 /**
  * @description
  * Analytics class used to request analytics data from Web API.
  *
  * @requires analytics.AnalyticsAggregate
- * @requires analytics.AnalyticsTrackedEntities
- * @requires analytics.AnalyticsEnrollments
  * @requires analytics.AnalyticsEvents
  * @requires analytics.AnalyticsRequest
  * @requires analytics.AnalyticsResponse
@@ -34,7 +31,6 @@ import AnalyticsTrackedEntities from './AnalyticsTrackedEntities.js';
 class Analytics {
   /**
    * @param {!module:analytics.AnalyticsAggregate} analyticsAggregate The AnalyticsAggregate instance
-   * @param {!module:analytics.AnalyticsTrackedEntities} analyticsTrackedEntities The AnalyticsTrackedEntities instance
    * @param {!module:analytics.AnalyticsEnrollments} analyticsEnrollments The AnalyticsEnrollments instance
    * @param {!module:analytics.AnalyticsEvents} analyticsEvents The AnalyticsEvents instance
    * @param {!module:analytics.AnalyticsRequest} analyticsRequest The AnalyticsRequest class
@@ -43,14 +39,12 @@ class Analytics {
   constructor(_ref) {
     let {
       aggregate,
-      trackedEntities,
       enrollments,
       events,
       request,
       response
     } = _ref;
     this.aggregate = aggregate;
-    this.trackedEntities = trackedEntities;
     this.enrollments = enrollments;
     this.events = events;
     this.request = request;
@@ -73,7 +67,6 @@ class Analytics {
     if (!Analytics.getAnalytics.analytics) {
       Analytics.getAnalytics.analytics = new Analytics({
         aggregate: new AnalyticsAggregate(dataEngine),
-        trackedEntities: new AnalyticsTrackedEntities(dataEngine),
         enrollments: new AnalyticsEnrollments(dataEngine),
         events: new AnalyticsEvents(dataEngine),
         request: AnalyticsRequest,

package/build/es/api/analytics/AnalyticsBase.js

@@ -1,19 +1,13 @@
 import sortBy from 'lodash/sortBy';
 import AnalyticsRequest from './AnalyticsRequest.js';
-import { formatRequestPath } from './utils.js';
 const analyticsQuery = {
   resource: 'analytics',
   id: _ref => {
     let {
       path,
-      program,
-      trackedEntityType
+      program
     } = _ref;
-    return formatRequestPath({
-      path,
-      program,
-      trackedEntityType
-    });
+    return [path, program].filter(Boolean).join('/');
   },
   params: _ref2 => {
     let {
@@ -33,14 +27,9 @@ const analyticsDataQuery = {
   id: _ref3 => {
     let {
       path,
-      program,
-      trackedEntityType
+      program
     } = _ref3;
-    return formatRequestPath({
-      path,
-      program,
-      trackedEntityType
-    });
+    return [path, program].filter(Boolean).join('/');
   },
   params: _ref4 => {
     let {
@@ -62,14 +51,9 @@ const analyticsMetaDataQuery = {
   id: _ref5 => {
     let {
       path,
-      program,
-      trackedEntityType
+      program
     } = _ref5;
-    return formatRequestPath({
-      path,
-      program,
-      trackedEntityType
-    });
+    return [path, program].filter(Boolean).join('/');
   },
   params: _ref6 => {
     let {
@@ -161,7 +145,6 @@ class AnalyticsBase {
       variables: {
         path: req.path,
         program: req.program,
-        trackedEntityType: req.trackedEntityType,
         dimensions: generateDimensionStrings(req.dimensions),
         filters: generateDimensionStrings(req.filters),
         parameters: req.parameters,
@@ -204,7 +187,6 @@ class AnalyticsBase {
       variables: {
         path: req.path,
         program: req.program,
-        trackedEntityType: req.trackedEntityType,
         dimensions: generateDimensionStrings(req.dimensions, options),
         filters: generateDimensionStrings(req.filters, options),
         parameters: req.parameters

package/build/es/api/analytics/AnalyticsRequest.js

@@ -4,7 +4,6 @@ import AnalyticsRequestBase from './AnalyticsRequestBase.js';
 import AnalyticsRequestDimensionsMixin from './AnalyticsRequestDimensionsMixin.js';
 import AnalyticsRequestFiltersMixin from './AnalyticsRequestFiltersMixin.js';
 import AnalyticsRequestPropertiesMixin from './AnalyticsRequestPropertiesMixin.js';
-import { formatDimension } from './utils.js';
 
 /**
  * @description
@@ -42,7 +41,6 @@ class AnalyticsRequest extends AnalyticsRequestDimensionsMixin(AnalyticsRequestF
   fromVisualization(visualization) {
     let passFilterAsDimension = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
     let request = this;
-    const outputType = visualization.outputType;
 
     // extract dimensions from visualization
     const columns = visualization.columns || [];
@@ -53,28 +51,19 @@ class AnalyticsRequest extends AnalyticsRequestDimensionsMixin(AnalyticsRequestF
       if ((_d$legendSet = d.legendSet) !== null && _d$legendSet !== void 0 && _d$legendSet.id) {
         dimension += `-${d.legendSet.id}`;
       }
+      if ((_d$programStage = d.programStage) !== null && _d$programStage !== void 0 && _d$programStage.id) {
+        dimension = `${d.programStage.id}.${dimension}`;
+      }
       if (d.filter) {
         dimension += `:${d.filter}`;
       }
-      const programStageId = (_d$programStage = d.programStage) === null || _d$programStage === void 0 ? void 0 : _d$programStage.id;
       if ((_d$repetition = d.repetition) !== null && _d$repetition !== void 0 && (_d$repetition$indexes = _d$repetition.indexes) !== null && _d$repetition$indexes !== void 0 && _d$repetition$indexes.length) {
         d.repetition.indexes.forEach(index => {
-          var _d$program;
-          request = request.addDimension(formatDimension({
-            programId: (_d$program = d.program) === null || _d$program === void 0 ? void 0 : _d$program.id,
-            programStageId: `${programStageId}[${index}]`,
-            dimension,
-            outputType
-          }));
+          request = request.addDimension(dimension.replace(/\./, `[${index}].`));
         });
       } else {
-        var _d$program2, _d$items;
-        request = request.addDimension(formatDimension({
-          programId: (_d$program2 = d.program) === null || _d$program2 === void 0 ? void 0 : _d$program2.id,
-          programStageId,
-          dimension,
-          outputType
-        }), (_d$items = d.items) === null || _d$items === void 0 ? void 0 : _d$items.map(item => item.id));
+        var _d$items;
+        request = request.addDimension(dimension, (_d$items = d.items) === null || _d$items === void 0 ? void 0 : _d$items.map(item => item.id));
       }
     });
 
@@ -89,29 +78,17 @@ class AnalyticsRequest extends AnalyticsRequestDimensionsMixin(AnalyticsRequestF
         request = request.addDimension(f.dimension, (_f$items = f.items) === null || _f$items === void 0 ? void 0 : _f$items.map(item => item.id));
       } else {
         var _f$programStage, _f$repetition, _f$repetition$indexes;
-        let filterString = f.dimension;
+        let filterString = (_f$programStage = f.programStage) !== null && _f$programStage !== void 0 && _f$programStage.id ? `${f.programStage.id}.${f.dimension}` : f.dimension;
         if (f.filter) {
           filterString += `:${f.filter}`;
         }
-        const programStageId = (_f$programStage = f.programStage) === null || _f$programStage === void 0 ? void 0 : _f$programStage.id;
         if ((_f$repetition = f.repetition) !== null && _f$repetition !== void 0 && (_f$repetition$indexes = _f$repetition.indexes) !== null && _f$repetition$indexes !== void 0 && _f$repetition$indexes.length) {
           f.repetition.indexes.forEach(index => {
-            var _f$program;
-            request = request.addFilter(formatDimension({
-              programId: (_f$program = f.program) === null || _f$program === void 0 ? void 0 : _f$program.id,
-              programStageId: `${programStageId}[${index}]`,
-              dimension: filterString,
-              outputType
-            }));
+            request = request.addFilter(filterString.replace(/\./, `[${index}].`));
           });
         } else {
-          var _f$program2, _f$items2;
-          request = request.addFilter(formatDimension({
-            programId: (_f$program2 = f.program) === null || _f$program2 === void 0 ? void 0 : _f$program2.id,
-            programStageId,
-            dimension: filterString,
-            outputType
-          }), (_f$items2 = f.items) === null || _f$items2 === void 0 ? void 0 : _f$items2.map(item => item.id));
+          var _f$items2;
+          request = request.addFilter(filterString, (_f$items2 = f.items) === null || _f$items2 === void 0 ? void 0 : _f$items2.map(item => item.id));
         }
       }
     });

package/build/es/api/analytics/AnalyticsRequestBase.js

@@ -18,7 +18,6 @@ class AnalyticsRequestBase {
       format = 'json',
       path,
       program,
-      trackedEntityType,
       dimensions = [],
       filters = [],
       parameters = {}
@@ -27,7 +26,6 @@ class AnalyticsRequestBase {
     this.format = format.toLowerCase();
     this.path = path;
     this.program = program;
-    this.trackedEntityType = trackedEntityType;
     this.dimensions = dimensions;
     this.filters = filters;
     this.parameters = {
@@ -66,7 +64,7 @@ class AnalyticsRequestBase {
       }
       return dimension;
     });
-    const endPoint = [this.endPoint, this.path, this.program, this.trackedEntityType].filter(Boolean).join('/');
+    const endPoint = [this.endPoint, this.path, this.program].filter(e => !!e).join('/');
     return `${endPoint}.${this.format}?dimension=${encodedDimensions.join('&dimension=')}`;
   }
 

package/build/es/api/analytics/AnalyticsRequestPropertiesMixin.js

@@ -491,25 +491,6 @@ class extends base {
     return new AnalyticsRequest(this);
   }
 
-  /**
-   * Sets the tracked entity type for the request.
-   * It appends the tracked entity type id to the request's path.
-   *
-   * @param {!String} trackedEntityType The tracked entity type id
-   *
-   * @returns {AnalyticsRequest} A new instance of the class for chaining purposes
-   *
-   * @example
-   * const req = new analytics.request()
-   *    .withTrackedEntityType('nEenWmSyUEp');
-   */
-  withTrackedEntityType(trackedEntityType) {
-    if (trackedEntityType) {
-      this.trackedEntityType = trackedEntityType;
-    }
-    return new AnalyticsRequest(this);
-  }
-
   /**
    * Sets the program for the request.
    * It appends the program id to the request's path.

package/build/es/api/analytics/__tests__/AnalyticsTrackedEntities.spec.js

@@ -0,0 +1,41 @@
+import fixtures from '../../../__fixtures__/fixtures.js';
+import DataEngineMock from '../__mocks__/DataEngine.js';
+import AnalyticsRequest from '../AnalyticsRequest.js';
+import AnalyticsTrackedEntities from '../AnalyticsTrackedEntities.js';
+describe.skip('analytics.trackedEntity', () => {
+  let enrollments;
+  let request;
+  let dataEngineMock;
+  let fixture;
+  beforeEach(() => {
+    dataEngineMock = new DataEngineMock();
+    DataEngineMock.mockClear();
+    enrollments = new AnalyticsTrackedEntities();
+  });
+  it('should not be allowed to be called without new', () => {
+    expect(() => AnalyticsTrackedEntities()).toThrowErrorMatchingSnapshot();
+  });
+  it('should use the dataEngine object when it is passed', () => {
+    const dataEngineMockObject = {};
+    enrollments = new AnalyticsTrackedEntities(dataEngineMockObject);
+    expect(enrollments.dataEngine).toBe(dataEngineMockObject);
+  });
+  describe('.getQuery()', () => {
+    beforeEach(() => {
+      enrollments = new AnalyticsTrackedEntities(new DataEngineMock());
+      request = new AnalyticsRequest().addOrgUnitDimension('ImspTQPwCqd').addDimension('WZbXY0S00lP.de0FEHSIoxh').addDimension('WZbXY0S00lP.sWoqcoByYmD').addPeriodFilter('LAST_MONTH').withTrackedEntity('nEenWmSyUEp').withAsc('ENROLLMENTDATE').withOuMode('DESCENDANTS').withColumns('w75KJ2mc4zz').withPage(1).withPageSize(10);
+      fixture = fixtures.get('/api/analytics/enrollments'); // XXX
+
+      dataEngineMock.query.mockReturnValue(Promise.resolve({
+        data: fixture
+      }));
+    });
+    it('should be a function', () => {
+      expect(enrollments.getQuery).toBeInstanceOf(Function);
+    });
+    it('should resolve a promise with data', () => enrollments.getQuery(request).then(data => {
+      expect(data.width).toEqual(fixture.width);
+      expect(data.height).toEqual(fixture.height);
+    }));
+  });
+});

package/build/es/api/analytics/__tests__/__snapshots__/AnalyticsTrackedEntities.spec.js.snap

@@ -0,0 +1,3 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`analytics.trackedEntity should not be allowed to be called without new 1`] = `"Class constructor AnalyticsTrackedEntities cannot be invoked without 'new'"`;

package/build/es/api/analytics/utils.js

@@ -2,23 +2,4 @@
 const whitelistURI = ',&$=/;:';
 const whitelistURICodes = whitelistURI.split('').map(c => encodeURIComponent(c));
 const whitelistRegExp = new RegExp(`(?:${whitelistURICodes.join('|')})`, 'g');
-export const customEncodeURIComponent = uri => encodeURIComponent(uri).replace(whitelistRegExp, decodeURIComponent);
-export const formatRequestPath = _ref => {
-  let {
-    path,
-    program,
-    trackedEntityType
-  } = _ref;
-  return [path, program, trackedEntityType].filter(Boolean).join('/');
-};
-export const formatDimension = _ref2 => {
-  let {
-    outputType,
-    programId,
-    programStageId,
-    dimension
-  } = _ref2;
-  return [
-  // XXX it would be clearer to have this consistent with what is sent in the request as for EVENT/ENROLLMENT
-  outputType === 'TRACKED_ENTITY' ? programId : undefined, programStageId, dimension].filter(Boolean).join('.');
-};
+export const customEncodeURIComponent = uri => encodeURIComponent(uri).replace(whitelistRegExp, decodeURIComponent);

package/build/es/components/Options/VisualizationOptions.js

@@ -2,7 +2,7 @@ import i18n from '@dhis2/d2-i18n';
 import { ButtonStrip, Modal, ModalTitle, ModalContent, ModalActions, Button, FieldSet, Legend, TabBar, Tab, Help } from '@dhis2/ui';
 import PropTypes from 'prop-types';
 import React, { useState } from 'react';
-import { modalContent, tabSection, tabSectionTitle, tabSectionTitleMargin, tabSectionOption, tabSectionOptionItem, tabSectionOptionToggleable, tabSectionToggleableSubsection, tabSectionOptionComplexInline, tabSectionOptionText, tabBar, tabContent, tabSectionOptionIcon } from './styles/VisualizationOptions.style.js';
+import { modalContent, tabSection, tabSectionTitle, tabSectionTitleDisabled, tabSectionTitleMargin, tabSectionOption, tabSectionOptionItem, tabSectionOptionToggleable, tabSectionToggleableSubsection, tabSectionOptionComplexInline, tabSectionOptionText, tabBar, tabContent, tabSectionOptionIcon } from './styles/VisualizationOptions.style.js';
 const VisualizationOptions = _ref => {
   let {
     initiallyActiveTabKey,
@@ -59,7 +59,7 @@ const VisualizationOptions = _ref => {
       }, label);
     })), tabBar.styles), /*#__PURE__*/React.createElement("div", {
       className: tabContent.className
-    }, tabs[activeTabIndex].content, tabContent.styles, tabSection.styles, tabSectionTitle.styles, tabSectionTitleMargin.styles, tabSectionOption.styles, tabSectionOptionItem.styles, tabSectionOptionToggleable.styles, tabSectionToggleableSubsection.styles, tabSectionOptionComplexInline.styles, tabSectionOptionText.styles, tabSectionOptionIcon.styles));
+    }, tabs[activeTabIndex].content, tabContent.styles, tabSection.styles, tabSectionTitle.styles, tabSectionTitleDisabled.styles, tabSectionTitleMargin.styles, tabSectionOption.styles, tabSectionOptionItem.styles, tabSectionOptionToggleable.styles, tabSectionToggleableSubsection.styles, tabSectionOptionComplexInline.styles, tabSectionOptionText.styles, tabSectionOptionIcon.styles));
   };
   return /*#__PURE__*/React.createElement(Modal, {
     onClose: onClose,

package/build/es/components/Options/styles/VisualizationOptions.style.js

@@ -38,6 +38,12 @@ export const tabSectionTitle = {
   }, [`span.jsx-3115295887{display:inline-block;padding-bottom:${spacers.dp12};font-size:15px;color:${colors.grey900};font-weight:500;-webkit-letter-spacing:0.2px;-moz-letter-spacing:0.2px;-ms-letter-spacing:0.2px;letter-spacing:0.2px;}`]),
   className: "jsx-3115295887"
 };
+export const tabSectionTitleDisabled = {
+  styles: /*#__PURE__*/React.createElement(_JSXStyle, {
+    id: "3352433486"
+  }, [`span.jsx-3352433486{color:${colors.grey600};}`]),
+  className: "jsx-3352433486"
+};
 export const tabSectionTitleMargin = {
   styles: /*#__PURE__*/React.createElement(_JSXStyle, {
     id: "642558349"

package/build/es/components/RichText/Editor.bk/Editor.js

@@ -0,0 +1,30 @@
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+import PropTypes from 'prop-types';
+import React, { Component } from 'react';
+import convertCtrlKey from './convertCtrlKey.js';
+class Editor extends Component {
+  constructor() {
+    super(...arguments);
+    _defineProperty(this, "onKeyDown", event => {
+      convertCtrlKey(event, this.props.onEdit);
+    });
+  }
+  render() {
+    const {
+      children
+    } = this.props;
+    return /*#__PURE__*/React.createElement("div", {
+      onKeyDown: this.onKeyDown
+    }, children);
+  }
+}
+Editor.defaultProps = {
+  onEdit: null
+};
+Editor.propTypes = {
+  children: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.node), PropTypes.node]),
+  onEdit: PropTypes.func
+};
+export default Editor;

package/build/es/components/RichText/Editor.bk/__tests__/Editor.spec.js

@@ -0,0 +1,26 @@
+import { shallow } from 'enzyme';
+import React from 'react';
+import convertCtrlKey from '../convertCtrlKey.js';
+import Editor from '../Editor.js';
+jest.mock('../convertCtrlKey');
+describe('RichText: Editor component', () => {
+  let richTextEditor;
+  const componentProps = {
+    onEdit: jest.fn()
+  };
+  beforeEach(() => {
+    convertCtrlKey.mockClear();
+  });
+  const renderComponent = props => {
+    return shallow( /*#__PURE__*/React.createElement(Editor, props, /*#__PURE__*/React.createElement("input", null)));
+  };
+  it('renders a result', () => {
+    richTextEditor = renderComponent(componentProps);
+    expect(richTextEditor).toHaveLength(1);
+  });
+  it('calls convertCtrlKey on keydown', () => {
+    richTextEditor = renderComponent(componentProps);
+    richTextEditor.simulate('keyDown');
+    expect(convertCtrlKey).toHaveBeenCalled();
+  });
+});

package/build/es/components/RichText/Editor.bk/__tests__/convertCtrlKey.spec.js

@@ -0,0 +1,202 @@
+import convertCtrlKey from '../convertCtrlKey.js';
+describe('convertCtrlKey', () => {
+  it('does not trigger callback if no ctrl key', () => {
+    const cb = jest.fn();
+    const e = {
+      key: 'j',
+      preventDefault: () => {}
+    };
+    convertCtrlKey(e, cb);
+    expect(cb).not.toHaveBeenCalled();
+  });
+  describe('when ctrl key + "b" pressed', () => {
+    it('triggers callback with open/close markers and caret pos in between', () => {
+      const cb = jest.fn();
+      const e = {
+        key: 'b',
+        ctrlKey: true,
+        target: {
+          selectionStart: 0,
+          selectionEnd: 0,
+          value: 'rainbow dash'
+        },
+        preventDefault: () => {}
+      };
+      convertCtrlKey(e, cb);
+      expect(cb).toHaveBeenCalled();
+      expect(cb).toHaveBeenCalledWith('** rainbow dash', 1);
+    });
+    it('triggers callback with open/close markers and caret pos in between (end of text)', () => {
+      const cb = jest.fn();
+      const e = {
+        key: 'b',
+        ctrlKey: true,
+        target: {
+          selectionStart: 22,
+          selectionEnd: 22,
+          value: 'rainbow dash is purple'
+        },
+        preventDefault: () => {}
+      };
+      convertCtrlKey(e, cb);
+      expect(cb).toHaveBeenCalled();
+      expect(cb).toHaveBeenCalledWith('rainbow dash is purple **', 24);
+    });
+    it('triggers callback with open/close markers mid-text with surrounding spaces (1)', () => {
+      const cb = jest.fn();
+      const e = {
+        key: 'b',
+        metaKey: true,
+        target: {
+          selectionStart: 4,
+          // caret located just before "quick"
+          selectionEnd: 4,
+          value: 'the quick brown fox'
+        },
+        preventDefault: () => {}
+      };
+      convertCtrlKey(e, cb);
+      expect(cb).toHaveBeenCalled();
+      expect(cb).toHaveBeenCalledWith('the ** quick brown fox', 5);
+    });
+    it('triggers callback with open/close markers mid-text with surrounding spaces (2)', () => {
+      const cb = jest.fn();
+      const e = {
+        key: 'b',
+        metaKey: true,
+        target: {
+          selectionStart: 3,
+          // caret located just after "the"
+          selectionEnd: 3,
+          value: 'the quick brown fox'
+        },
+        preventDefault: () => {}
+      };
+      convertCtrlKey(e, cb);
+      expect(cb).toHaveBeenCalled();
+      expect(cb).toHaveBeenCalledWith('the ** quick brown fox', 5);
+    });
+    it('triggers callback with correct double markers and padding', () => {
+      const cb = jest.fn();
+      const e = {
+        key: 'b',
+        metaKey: true,
+        target: {
+          selectionStart: 9,
+          // between the underscores
+          selectionEnd: 9,
+          value: 'rainbow __'
+        },
+        preventDefault: () => {}
+      };
+      convertCtrlKey(e, cb);
+      expect(cb).toHaveBeenCalled();
+      expect(cb).toHaveBeenCalledWith('rainbow _**_', 10);
+    });
+    describe('selected text', () => {
+      it('triggers callback with open/close markers around text and caret pos after closing marker', () => {
+        const cb = jest.fn();
+        const e = {
+          key: 'b',
+          metaKey: true,
+          target: {
+            selectionStart: 5,
+            // "ow da" is selected
+            selectionEnd: 10,
+            value: 'rainbow dash is purple'
+          },
+          preventDefault: () => {}
+        };
+        convertCtrlKey(e, cb);
+        expect(cb).toHaveBeenCalled();
+        expect(cb).toHaveBeenCalledWith('rainb *ow da* sh is purple', 13);
+      });
+      it('triggers callback with open/close markers around text when starting at beginning of line', () => {
+        const cb = jest.fn();
+        const e = {
+          key: 'b',
+          metaKey: true,
+          target: {
+            selectionStart: 0,
+            // "rainbow" is selected
+            selectionEnd: 7,
+            value: 'rainbow dash is purple'
+          },
+          preventDefault: () => {}
+        };
+        convertCtrlKey(e, cb);
+        expect(cb).toHaveBeenCalled();
+        expect(cb).toHaveBeenCalledWith('*rainbow* dash is purple', 9);
+      });
+      it('triggers callback with open/close markers around text when ending at end of line', () => {
+        const cb = jest.fn();
+        const e = {
+          key: 'b',
+          metaKey: true,
+          target: {
+            selectionStart: 16,
+            // "purple" is selected
+            selectionEnd: 22,
+            value: 'rainbow dash is purple'
+          },
+          preventDefault: () => {}
+        };
+        convertCtrlKey(e, cb);
+        expect(cb).toHaveBeenCalled();
+        expect(cb).toHaveBeenCalledWith('rainbow dash is *purple*', 24);
+      });
+      it('triggers callback with open/close markers around word', () => {
+        const cb = jest.fn();
+        const e = {
+          key: 'b',
+          metaKey: true,
+          target: {
+            selectionStart: 8,
+            // "dash" is selected
+            selectionEnd: 12,
+            value: 'rainbow dash is purple'
+          },
+          preventDefault: () => {}
+        };
+        convertCtrlKey(e, cb);
+        expect(cb).toHaveBeenCalled();
+        expect(cb).toHaveBeenCalledWith('rainbow *dash* is purple', 14);
+      });
+      it('triggers callback with leading/trailing spaces trimmed from selection', () => {
+        const cb = jest.fn();
+        const e = {
+          key: 'b',
+          metaKey: true,
+          target: {
+            selectionStart: 8,
+            // " dash " is selected (note leading and trailing space)
+            selectionEnd: 13,
+            value: 'rainbow dash is purple'
+          },
+          preventDefault: () => {}
+        };
+        convertCtrlKey(e, cb);
+        expect(cb).toHaveBeenCalled();
+        expect(cb).toHaveBeenCalledWith('rainbow *dash* is purple', 14);
+      });
+    });
+  });
+  describe('when ctrl key + "i" pressed', () => {
+    it('triggers callback with open/close italics markers and caret pos in between', () => {
+      const cb = jest.fn();
+      const e = {
+        key: 'i',
+        ctrlKey: true,
+        target: {
+          selectionStart: 0,
+          selectionEnd: 0,
+          value: ''
+        },
+        preventDefault: () => {}
+      };
+      convertCtrlKey(e, cb);
+      expect(cb).toHaveBeenCalled();
+      expect(cb).toHaveBeenCalledWith('__', 1);
+    });
+  });
+});