Merge pull request #4 in WS/webcomponents-web-integration-samples from custom/update-iink-js to master

* commit '9e7e414a750ce4edcf908c934fb523a01e0f3768':
  chore(web-samples): remove
  feat(batch-mode): use iink-js
  chore(deps): update all to iink-js@1.4.1

Author: Steven Roulleau

angular-integration-examples/package-lock.json

@@ -19,7 +19,7 @@
     "@angular/platform-browser": "~9.1.7",
     "@angular/platform-browser-dynamic": "~9.1.7",
     "@angular/router": "~9.1.7",
-    "iink-js": "git+https://scm.corp.myscript.com/scm/ws/iink-js.git#1.4",
+    "iink-js": "^1.4.1",
     "rxjs": "~6.5.4",
     "tslib": "^1.10.0",
     "zone.js": "~0.10.2"

angular-integration-examples/package.json

@@ -9,7 +9,7 @@
   },
   "dependencies": {
     "element-ui": "^2.4.5",
-    "myscript": "MyScript/MyScriptJS#rest-flows-improvement",
+    "iink-js": "^1.4.1",
     "register-service-worker": "^1.5.2",
     "vue": "^2.5.17",
     "vue-burger-menu": "^1.0.8",
@@ -25,7 +25,7 @@
     "@vue/cli-plugin-eslint": "^3.0.1",
     "@vue/cli-plugin-pwa": "^3.0.3",
     "@vue/cli-service": "^3.0.1",
-    "node-sass": "^4.9.2",
+    "node-sass": "4.14.1",
     "sass-loader": "^7.0.3",
     "vue-cli-plugin-element": "^1.0.0",
     "vue-template-compiler": "^2.5.17"

batch-mode-explorer/package-lock.json

@@ -257,7 +257,7 @@ export default {
     mimeFromMimeKey(mimeType) {
       return mimeTypesLabels[mimeType.key].mime;
     },
-    convert() {
+    async convert() {
       //FIXME Check at the end if this usage of $parent.$parent could not be avoided elegantly
       //this.$parent.$parent.$parent.$refs.vueEditor.getStrokeGroups()
       //const strokeGroups = this.$store.state.strokeGroups;
@@ -282,11 +282,12 @@ export default {
 
       store.commit('resetExportResult');
       store.commit('updateInterpretationOptions', newInterpretationOptions);
-      // eslint-disable-next-line
-      recognizer.launchExportAndUpdateStore(this.$store.state.strokeGroups, this.partTypeOptionKey, this.requestedMimeTypes, newInterpretationOptions, this.$store);
+      
       this.$store.commit('switchToConvertingStatus');
-
       EventBus.$emit('viewTabModificationRequested', 'interpretation');
+
+      await recognizer.launchExportAndUpdateStore(this.$store.state.strokeGroups, this.partTypeOptionKey, this.requestedMimeTypes, newInterpretationOptions, this.$store);
+
       EventBus.$emit('requestedMimeTypesChanged', this.requestedMimeTypes);
     }
   }

batch-mode-explorer/package.json

@@ -9,7 +9,7 @@
 /* eslint-disable import/no-named-as-default-member,no-underscore-dangle,no-undef,no-console */
 
 
-import MyScript from 'myscript/dist/myscript.esm';
+import iink from 'iink-js/dist/iink.esm';
 import EventBus from '@/event-bus';
 import { attach, detach } from '@/utils/custom_grabber';
 
@@ -112,7 +112,7 @@ export default {
         },
       },
     };
-    this.editor = MyScript.register(
+    this.editor = iink.register(
       this.$refs.editor,
       this.defaultConfiguration,
       undefined,
@@ -237,9 +237,6 @@ export default {
 };
 </script>
 
-<style>
-@import '../../node_modules/myscript/dist/myscript.min.css';
-</style>
 <style scoped>
 .vueEditor {
   height: 100%;

batch-mode-explorer/src/components/InterpretationOptions.vue

@@ -1,9 +1,9 @@
-import MyScript from 'myscript/dist/myscript.esm';
+import iink from 'iink-js/dist/iink.esm';
 
 // Creating a recognizer
-const iinkRecognizer = MyScript.DefaultBehaviors.recognizerList.filter(x => {
+const iinkRecognizer = iink.DefaultBehaviors.recognizerList.find(x => {
   const infos = x.getInfo();
-  return infos.apiVersion === 'V4' && infos.protocol === 'REST';
+  return infos.protocol === 'REST';
 });
 
 const convertBlobToBase64 = (blob) => new Promise((resolve, reject) => {
@@ -16,19 +16,19 @@ const convertBlobToBase64 = (blob) => new Promise((resolve, reject) => {
 });
 
 
-export function launchExportAndUpdateStore(strokeGroups, type, mimeTypes, interpretationOptions, store) {
-  launchExport(strokeGroups, type, mimeTypes, interpretationOptions, buildStoreCallback(store))
+export async function launchExportAndUpdateStore(strokeGroups, type, mimeTypes, interpretationOptions, store) {
+  await launchExport(strokeGroups, type, mimeTypes, interpretationOptions, buildStoreCallback(store))
 }
 
-export default function launchExport(strokeGroups, type, mimeTypes, interpretationOptions, recognitionCallback) {
+export default async function launchExport(strokeGroups, type, mimeTypes, interpretationOptions, recognitionCallback) {
   // Creating a empty model
-  const model = MyScript.InkModel.createModel();
+  const model = iink.InkModel.createModel();
   // Filling the model with the stroke groups
   model.strokeGroups = strokeGroups;
 
   // Creating a recognizer context with the configuration attached
-  const recognizerContext = MyScript.RecognizerContext.createEmptyRecognizerContext({
-    configuration: MyScript.DefaultConfiguration
+  const recognizerContext = iink.RecognizerContext.createEmptyRecognizerContext({
+    configuration: iink.DefaultConfiguration
   });
 
   const configuration = recognizerContext.editor.configuration;
@@ -43,33 +43,42 @@ export default function launchExport(strokeGroups, type, mimeTypes, interpretati
 
   configuration.recognitionParams.type = type;
   configuration.recognitionParams.protocol = 'REST';
-  configuration.recognitionParams.v4.lang = interpretationOptions.lang;
+  configuration.recognitionParams.iink.lang = interpretationOptions.lang;
   configuration.recognitionParams.server = {
     scheme: 'https',
     host: 'webdemoapi.myscript.com',
     applicationKey: '515131ab-35fa-411c-bb4d-3917e00faf60',
     hmacKey: '54b2ca8a-6752-469d-87dd-553bb450e9ad'
   };
-  configuration.recognitionParams.v4.export.jiix['bounding-box'] = interpretationOptions.jiixWithBoudingBox;
-  configuration.recognitionParams.v4.export.jiix.strokes = interpretationOptions.jiixWithStrokes;
-  configuration.recognitionParams.v4.export.jiix.text.chars	 = interpretationOptions.jiixWithChars;
-  configuration.recognitionParams.v4.export.jiix.text.words = interpretationOptions.jiixWithWords;
-  configuration.recognitionParams.v4['raw-content'].recognition.text = interpretationOptions.textRecoOn;
-  configuration.recognitionParams.v4['raw-content'].recognition.shape = interpretationOptions.shapeRecoOn;
+  configuration.recognitionParams.iink.export.jiix['bounding-box'] = interpretationOptions.jiixWithBoudingBox;
+  configuration.recognitionParams.iink.export.jiix.strokes = interpretationOptions.jiixWithStrokes;
+  configuration.recognitionParams.iink.export.jiix.text.chars	 = interpretationOptions.jiixWithChars;
+  configuration.recognitionParams.iink.export.jiix.text.words = interpretationOptions.jiixWithWords;
+  configuration.recognitionParams.iink['raw-content'].recognition.text = interpretationOptions.textRecoOn;
+  configuration.recognitionParams.iink['raw-content'].recognition.shape = interpretationOptions.shapeRecoOn;
 
 
   // Assigning a theme to the document
   // FIXME The theme should not be attached to the recognizer context
   if(interpretationOptions.styleshet){
     recognizerContext.editor.theme = interpretationOptions.styleshet;
   }else{
-    recognizerContext.editor.theme = MyScript.DefaultTheme;
+    recognizerContext.editor.theme = iink.DefaultTheme;
   }
 
 
 
   // Triggering the recognition
-  iinkRecognizer[0].export_(recognizerContext, model, recognitionCallback, mimeTypes);
+  try {
+    const values = await iinkRecognizer.export_(recognizerContext, model, mimeTypes)
+    if (values) {
+      values.forEach((value) => {
+        recognitionCallback(undefined, value);
+      })
+    }
+  } catch (error) {
+    recognitionCallback(error, undefined)
+  }
 }
 
 function buildStoreCallback(store){
@@ -94,10 +103,10 @@ function buildStoreCallback(store){
             exportValue: exp
           }))
         } else {
-        store.commit('persistExportResult', {
-          type: mimeType,
-          exportValue: exportValue
-        })
+          store.commit('persistExportResult', {
+            type: mimeType,
+            exportValue: exportValue
+          })
         }
       })
     }