Sprint 0.36.0 (#720)

* reapply even likert changes (#680)

* 2012 - editor resize using 'react-measure'

* change resizing method

* remove dependency

* Authoring 2058 xref cleared (#681)

* fixed hasTargetChanged function to update correctly

* fixed xref clearing, looking into brief display of target error

* cleaned up code

* made recommended changes

* Authoring 2043 reference error (#679)

* starting work on 2043 and 2025 on this branch.  converting refs to resources

* removed deleted and duplicate references, and now also sort by ref type and title

* made suggested changes

* fixed typo of using || instead of &&

* have band-aid solution of setting maxLines to 45, min to 35, which re… (#677)

* bump version

* have band-aid solution of setting maxLines to 45, min to 35, which results in usually using all available screen space. does not work as well when a banner is present.  recommend eventually switching to a height dependent on screen size.

* recommended changes made

* updated version to 33.0

* bind rectangle and circle hotspots within boundaries (#687)

* Add team members description (#685)

* Authoring 2018 likert hotfix (#682)

* allow for even number of likert entries

* set version

* add team members description

* package version

* accidental save format

* change wording

* Fix error thrown sometimes on objective skill view (#684)

* Authoring 2018 likert hotfix (#682)

* allow for even number of likert entries

* set version

* prevent type error

* version

* allow resource scoped messages for objectives view (#689)

* Limit package id and org id lengths (#690)

* change package id length on creation

* remove package id 20 char restriction

* Remove responses that point to answer choices that don't exist (#688)

* clean up missing responses on question persistence

* remove unused import

* add tests

* more

* Finish tests

* Remove console log

* add comment

* style fix

* do not strip out * match

* Add support for learning dependencies in workbook page editor (#691)

* working learning prereq editor

* finish removing comments

* version uptick

* Fix assessment rendering when toggling branching assessment (#693)

* fix branching rendering issue

* remove comments

* remove another comment

* remove unused import

* fix data loss issue (#695)

* Preserve missing scores when parsing questions (#692)

* start making score optional

* Add unit tests and finish score parsing

* fix advanced scoring in ordering

* fix default score

* change score box logic

* finish score box logic

* Authoring 2108 slate (#694)

* stashing

* round trip saving working

* clean contiguous.ts

* towards full compilation

* major streamlining

* towards inputref restoration

* basic inputref is working

* set the input ref type

* Fix block splitting logic

* fix all mark persistence, rendering

* active input ref tracking and display

* input ref rendering

* click to activate inlines

* fix undo redo for CTEs

* delete dead classes

* extra element rendering and persistence

* citation rendering

* fix citation persistence

* proper command parsing

* mark buttons blue when style is active

* handle pasting of inlines

* set active inline on selection change

* fix bareTextSelected

* fix selection changing bug

* adjust focus placement

* push backingTextProvider all the way down through tables and lists

* fix input ref change detection, remove dead code

* cleanup input ref creation

* find all input refs, not top level

* remove selected inline, not acive

* apply hot keys to cmd key

* add missing mark renderers

* highlight active math

* ensure selection is displayed after mark toggle

* adding more comments

* remove empty file

* simplified parsing code, added comments

* dedupee ids from pasted content

* properly set the active content on focus

* ignore unknown keys

* assign new block ids

* account properly for paragraph-less blocks

* add more comments

* remove draft.js as a dependency

* regen package-lock.json

* update vendor bundles

* add slate libs to vendor bundle

* enabled click to select citations

* clone ids properly, allow inlines to work in all toolbars

* click anywhere in CTE focuses on slate

* ensure click to activate works

* fix merge error

* transpose bib and dependencies (#697)

* version uptick (#699)

* Add workbook page importing (#700)

* get importer working

* Add error handling

* Fix formatting

* lint issues

* fix courses view styling (#705)

* version uptick

* change tooltip delay (#706)

* 0.36.0 - Add support for "lang" attribute (#712)

* more foreign changes

* use language attr

* Add support for multiple selections in sidebar, add to/from persistence for lang attr

* Remove foreign wrapper

* remove console log

* Change styling

* Clean up code

* Add default language when toggling foreign

* fix lint error

* fix node type error

* Remove merge conflict marker

* Change default value for language when making new course

* Change default foreign language, remove accessibility option from console, change language from maybe to normal string, use Spanish as default language

* lint error

* merge master to 36 (#717)

Author: darrensiegel

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "course-editor",
-  "version": "0.35.0",
+  "version": "0.36.0",
   "description": "Course Authoring Web Application for the Open Learning Initiative",
   "main": "./src/app.tsx",
   "author": "Carnegie Mellon University",
@@ -9,7 +9,6 @@
     "@types/chroma-js": "^1.3.4",
     "@types/history": "^4.7.2",
     "@types/jasmine": "^2.5.41",
-    "@types/node": "^12.11.2",
     "@types/react": "^16.8.8",
     "@types/react-dom": "^16.8.2",
     "@types/react-jss": "^8.6.3",
@@ -64,6 +63,7 @@
   "devDependencies": {
     "@types/jasmine": "^2.5.41",
     "@types/jest": "^24.0.15",
+    "@types/node": "^12.11.7",
     "babel-core": "^6.22.1",
     "babel-loader": "^7.1.4",
     "babel-polyfill": "^6.26.0",

package.json

@@ -8,7 +8,7 @@ import { ContentElement } from 'data/content/common/interfaces';
 import { validateRemoval } from 'data/models/utils/validation';
 import { displayModalMessasge } from 'utils/message';
 import { Editor, Inline } from 'slate';
-import { removeInlineEntity, getEntityAtCursor }
+import { removeInlineEntity, getInlineAtCursor }
   from 'editors/content/learning/contiguoustext/utils';
 
 export type UPDATE_CONTENT = 'active/UPDATE_CONTENT';

src/actions/active.ts

@@ -13,7 +13,7 @@ import { ParentContainer } from 'types/active';
 import { getEditorByContentType } from 'editors/content/container/registry';
 import { Resource, ResourceState } from 'data/content/resource';
 import {
-  ModelTypes, ContentModel, AssessmentModel, CourseModel, OrganizationModel,
+  ModelTypes, ContentModel, AssessmentModel, OrganizationModel,
 } from 'data/models';
 import { AppContext } from 'editors/common/AppContext';
 import { AppServices } from 'editors/common/AppServices';

src/components/sidebar/ContextAwareSidebar.tsx

@@ -55,8 +55,15 @@ class ToolbarButton
 
     return tooltip ?
       (
-        <Tooltip title={tooltip} delay={1000} distance={5} style={{ display: 'inline-block' }}
-          size="small" arrowSize="small">
+        <Tooltip
+          duration={0}
+          title={tooltip}
+          delay={0}
+          distance={5}
+          style={{ display: 'inline-block' }}
+          size="small"
+          arrowSize="small"
+        >
           {button}
         </Tooltip>
       )

src/components/toolbar/ToolbarButton.tsx

@@ -1,7 +1,7 @@
 import * as Immutable from 'immutable';
 import * as ct from 'data/contentTypes';
 import { Maybe } from 'tsmonad';
-import { augment, ensureIdGuidPresent } from 'data/content/common';
+import { augment } from 'data/content/common';
 import guid from 'utils/guid';
 import { Value, Block, Inline } from 'slate';
 import Html from 'slate-html-serializer';

src/data/content/learning/contiguous.ts

@@ -0,0 +1,43 @@
+type LocaleCodes = {
+  [Friendly in LocaleFriendly]: LocaleCode;
+};
+
+export type LocaleFriendly =
+  | 'Arabic'
+  | 'Chinese (Mandarin)'
+  | 'English (Great Britain)'
+  | 'English (USA)'
+  | 'French'
+  | 'German'
+  | 'Italian'
+  | 'Japanese'
+  | 'Russian'
+  | 'Spanish (LATAM)'
+  | 'Spanish (Spain)';
+
+export type LocaleCode =
+  | 'ar'
+  | 'de'
+  | 'en_GB'
+  | 'en_US'
+  | 'es'
+  | 'es_419'
+  | 'fr'
+  | 'it'
+  | 'ja'
+  | 'ru'
+  | 'zh_CN';
+
+export const localeCodes: LocaleCodes = {
+  Arabic: 'ar',
+  'Chinese (Mandarin)': 'zh_CN',
+  'English (Great Britain)': 'en_GB',
+  'English (USA)': 'en_US',
+  French: 'fr',
+  German: 'de',
+  Italian: 'it',
+  Japanese: 'ja',
+  Russian: 'ru',
+  'Spanish (LATAM)': 'es_419',
+  'Spanish (Spain)': 'es',
+};

src/data/content/learning/foreign.ts

@@ -1,5 +1,5 @@
 
-import { Value, Block, Inline, Text } from 'slate';
+import { Value, Block, Inline, Text, Mark } from 'slate';
 import guid from 'utils/guid';
 
 import * as common from '../common';
@@ -73,43 +73,52 @@ function handleText(node: Text, content) {
 
 // Handler for a text node that contains one or more marks
 function handleMarkedText(node: Text, content) {
+  const isBdo = (m: Mark) => m.type === 'bdo';
+  const isForeign = (m: Mark) => m.type === 'foreign';
 
-  // We only care about the string type of the mark, so
-  // map the mark object array to just an array of strings
-  const marks = node.marks.toArray().map(m => m.type);
+  // const marks = node.marks.toArray().map(m => m.type);
+  const marks = node.marks.toArray();
 
   // if bdo is present, it must be the first element that
   // we place in the OLI JSON.  This is a DTD constraint.
-  const adjusted = marks.includes('bdo')
-    ? ['bdo', ...marks.filter(m => m !== 'bdo')]
+  const adjustedMarks = marks.some(isBdo)
+    ? [Mark.create({ type: 'bdo' }), ...marks.filter(m => !isBdo(m))]
     : marks;
 
   const root = { root: {} };
   let last = root;
 
-  adjusted.forEach((s) => {
-
+  adjustedMarks.forEach((mark) => {
     // For each style, create the object representation for that style
-    if (s !== undefined) {
-      const container = styleContainers[s];
-      let style;
-      if (container === undefined) {
-        style = Object.assign({}, styleContainers.em());
-      } else {
-        style = Object.assign({}, container());
-      }
-
-      // Now root this style object into the parent style
-      const key = common.getKey(last);
-      last[key][common.getKey(style)] = style[common.getKey(style)];
-      last = style;
+    if (mark === undefined) {
+      return;
+    }
+
+    const type = mark.type;
+    const container = styleContainers[type];
+    let style;
+    if (container === undefined) {
+      style = Object.assign({}, styleContainers.em());
+    } else {
+      style = Object.assign({}, container());
     }
+
+    // Foreigns are a special case because they are currently the only
+    // slate marks where we use the "data" object. Specifically,
+    // we store the `@lang` attr here before it is persisted to OLI.
+    if (isForeign(mark) && mark.data && mark.data.get('lang')) {
+      style.foreign = { ...style.foreign, '@lang': mark.data.get('lang') };
+    }
+
+    // Now root this style object into the parent style
+    const key = common.getKey(last);
+    last[key][common.getKey(style)] = style[common.getKey(style)];
+    last = style;
   });
 
   // Set the text on the last one, add the tree to the container
   last[common.getKey(last)]['#text'] = node.text;
   content.push(root.root);
-
 }
 
 function handleInline(node: Inline, content) {

src/data/content/learning/slate/topersistence.ts

@@ -3,8 +3,7 @@ import * as Immutable from 'immutable';
 import { registeredTypes } from '../../common/parse';
 import guid from 'utils/guid';
 import { InputRef, InputRefType } from 'data/content/learning/input_ref';
-import { Value, ValueJSON, BlockJSON, InlineJSON, MarkJSON } from 'slate';
-import { instanceOf } from 'prop-types';
+import { Value, ValueJSON, BlockJSON, InlineJSON, MarkJSON, Data, Mark } from 'slate';
 
 // The elements that we handle as slate marks
 const marks = Immutable.Set<string>(
@@ -118,18 +117,33 @@ function isNestedMark(item: Object): boolean {
   return item['#text'] === undefined;
 }
 
-// Extract the mark style name from a mark element. For em elements,
+// Create a slate mark from a persisted from a mark element. For em elements,
 // we use 'em' as the mark style for bold, all other em styles we use
-// the style name.  sub, sup and other non em styles are just there
+// the style name. sub, sup and other non em styles are just their
 // element names.
-function getMark(item: Object) {
+function getMark(item: Object): Mark {
   const key = common.getKey(item);
   if (key === 'em') {
     if (item['em']['@style'] !== undefined && item['em']['@style'] !== 'bold') {
-      return item['em']['@style'];
+      return Mark.create({
+        object: 'mark',
+        type: item['em']['@style'],
+        data: {},
+      });
     }
   }
-  return key;
+
+  // Currently, `foreign` is the only mark to use the data object to store additional
+  // attributes.
+  const data = key === 'foreign'
+    ? Data.create({ lang: item[key]['@lang'] })
+    : {};
+
+  return Mark.create({
+    object: 'mark',
+    type: key,
+    data,
+  });
 }
 
 // Safely access the children elements of an item.
@@ -278,7 +292,7 @@ function handleChild(item: Object, parent: BlockJSON | InlineJSON, backingTextPr
 
     // 2. A style mark, such as em or sup
   } else if (marks.contains(key)) {
-    processMark(item, parent, Immutable.List<string>());
+    processMark(item, parent, Immutable.List<Mark>());
 
     // 3. Unmarked text
   } else if (key === '#text' || key === '#cdata') {
@@ -292,7 +306,7 @@ function handleChild(item: Object, parent: BlockJSON | InlineJSON, backingTextPr
 
 // Handle an OLI style element that we will render as a Slate mark.
 function processMark(item: Object,
-  parent: BlockJSON | InlineJSON, previousMarks: Immutable.List<string>) {
+  parent: BlockJSON | InlineJSON, previousMarks: Immutable.List<Mark>) {
 
   // If this mark is the parent of another mark, add this style and
   // process recursively. This allows us to handle situations like this:
@@ -309,17 +323,10 @@ function processMark(item: Object,
     return;
   }
 
-  // Create the mark array for all styles that we need to apply
-  const marks = previousMarks.toArray().map(type => ({
-    object: 'mark',
-    type,
-    data: {},
-  }) as MarkJSON);
-
   parent.nodes.push({
     object: 'text',
     text: item['#text'],
-    marks,
+    marks: previousMarks.toArray(),
   });
 }
 

src/data/content/learning/slate/toslate.ts

@@ -5,6 +5,8 @@ import { LegacyTypes } from '../types';
 import { parseDate } from 'utils/date';
 import { DatasetStatus } from 'types/analytics/dataset';
 import { CourseIdVers, CourseGuid } from 'data/types';
+import { Maybe } from 'tsmonad';
+import { localeCodes } from 'data/content/learning/foreign';
 
 // Must match DeployStage enum values in ContentService
 export enum DeployStage {
@@ -45,6 +47,7 @@ export type CourseModelParams = {
     dateCreated: string;
     guid: string;
   };
+  language?: string;
   resources?: Immutable.OrderedMap<string, contentTypes.Resource>,
   resourcesById?: Immutable.OrderedMap<string, contentTypes.Resource>,
   webContents?: Immutable.OrderedMap<string, contentTypes.WebContent>,
@@ -71,6 +74,7 @@ const defaultCourseModel = {
   icon: new contentTypes.WebContent(),
   theme: '',
   activeDataset: null,
+  language: localeCodes['Spanish (LATAM)'],
   resources: Immutable.OrderedMap<string, contentTypes.Resource>(),
   resourcesById: Immutable.OrderedMap<string, contentTypes.Resource>(),
   webContents: Immutable.OrderedMap<string, contentTypes.WebContent>(),
@@ -124,6 +128,7 @@ export class CourseModel extends Immutable.Record(defaultCourseModel) {
     dateCreated: string;
     guid: string;
   };
+  language: '';
   resources: Immutable.OrderedMap<string, contentTypes.Resource>;
   resourcesById: Immutable.OrderedMap<string, contentTypes.Resource>;
   webContents: Immutable.OrderedMap<string, contentTypes.WebContent>;
@@ -186,6 +191,7 @@ export class CourseModel extends Immutable.Record(defaultCourseModel) {
       icon: new contentTypes.WebContent(),
       theme: c.theme,
       activeDataset: c.activeDataset,
+      language: c.language || localeCodes['Spanish (LATAM)'],
       metadata,
       resources,
       webContents,
@@ -206,6 +212,7 @@ export class CourseModel extends Immutable.Record(defaultCourseModel) {
         metadata: this.metadata.toPersistence(),
         description: this.description,
         preferences: this.options,
+        language: this.language || localeCodes['Spanish (LATAM)'],
       },
     }];
     const values = {