Merge pull request #289 from reTHINK-project/testMigration

Test migration

.babelrc

@@ -1,4 +1,4 @@
 {
   "presets": ["@babel/preset-env"],
-  "plugins": ["syntax-dynamic-import"]
+  "plugins": ["@babel/plugin-syntax-dynamic-import"]
 }

package.json

@@ -46,6 +46,7 @@
     "@babel/cli": "^7.2.0",
     "@babel/core": "^7.2.0",
     "@babel/parser": "^7.2.0",
+    "@babel/plugin-syntax-dynamic-import": "^7.2.0",
     "@babel/preset-env": "^7.2.0",
     "babel-loader": "^8.0.4",
     "base64-url": "^1.3.3",

src/identity/IdentityModule.js

@@ -1262,7 +1262,7 @@ class IdentityModule {
 
       }, (error) => {
         if (error.hasOwnProperty('description') && error.description.hasOwnProperty('loginUrl')) {
-          _this.callIdentityModuleFunc('openPopup', { urlreceived: error.description.loginUrl }).then((value) => {
+          _this.callIdentityModuleFunc('login', { urlreceived: error.description.loginUrl }).then((value) => {
             log.log('[IdentityModule:callIdentityModuleFunc:openPopup]', usernameHint);
 
             resolve(value);

src/registry/Registry.js

@@ -712,7 +712,7 @@ class Registry {
 
                 let registrationAtdomain = true;
 
-                if ( descriptor.hasOwnProperty("_configuration") && descriptor.configuration.hasOwnProperty("domain_registration")) {
+                if ( descriptor.hasOwnProperty("configuration") && descriptor.configuration.hasOwnProperty("domain_registration")) {
                   registrationAtdomain = descriptor.configuration.domain_registration;
                   }
 

src/rethink/IdentitiesGUI.js

@@ -101,8 +101,8 @@ class IdentitiesGUI {
               clearInterval(pollTimer);
             }
 
-            if (win.document.URL.indexOf('id_token') !== -1 || win.document.URL.indexOf(location.origin) !== -1) {
-//            if ( win.document.URL.indexOf(location.origin) !== -1) {
+//            if (win.document.URL.indexOf('id_token') !== -1 || win.document.URL.indexOf(location.origin) !== -1) {
+            if ( win.document.URL.indexOf(location.origin) !== -1) {
                 window.clearInterval(pollTimer);
               let url = win.document.URL;
 

src/rethink/rethink.js

@@ -218,6 +218,15 @@ const rethink = {
                 });
 
             });
+          },
+          listenOnline: (callback) => {
+            return runtimeFactory.listenOnline(callback);
+
+          },
+
+          listenOffline: (callback) => {
+            return runtimeFactory.listenOffline(callback);
+
           }
 
         }

src/rethink/runtimeFactory.js

@@ -134,6 +134,18 @@ const runtimeFactory = Object.create({
     return this.catalogue;
   },*/
 
+  isOnline() {
+    return window.navigator.onLine;
+  },
+
+  listenOnline(callback) {
+    window.addEventListener('online', callback);
+  },
+
+  listenOffline(callback) {
+    window.addEventListener('offline', callback);
+  },
+
   runtimeCapabilities() {
 
     if (!this.capabilitiesManager) {

src/runtime-catalogue/RuntimeCatalogue.js

@@ -9,12 +9,14 @@ class RuntimeCatalogue {
   constructor(runtimeFactory, name, schema) {
     if (!runtimeFactory) throw Error('The catalogue needs the runtimeFactory');
 
+    this._runtimeFactory = runtimeFactory;
+
     this._factory = new CatalogueFactory();
     this.httpRequest = runtimeFactory.createHttpRequest();
     this.atob = runtimeFactory.atob ? runtimeFactory.atob : atob;
 
     const storageName = name ? name : 'runtimeCatalogue';
-    const storageSchema = schema ? schema : '&cguid, accessControlPolicy, constraints, dataObjects, hypertyType, objectName, sourcePackage, version';
+    const storageSchema = schema ? schema : '&cguid, accessControlPolicy, constraints, dataObjects, type, objectName, sourcePackage, version, url';
 
     const schemas = {};
     schemas[storageName] = storageSchema;
@@ -32,8 +34,27 @@ class RuntimeCatalogue {
      * @returns {Promise} - Promise that fulfills with the requested descriptor in the appropriate type.
      * If constraints were provided, a descriptor is only returned if it meets the constraints, otherwise the promise will be rejected.
      */
-  getDescriptor(descriptorURL, createFunc, getFull = true, constraints) {
-    log.info('[RuntimeCatalogue] - getting descriptor from: ', descriptorURL, ' with constraints: ', constraints);
+    getDescriptor(descriptorURL, createFunc, getFull = true, constraints) {
+      log.info('[RuntimeCatalogue] - getting descriptor from: ', descriptorURL, ' with constraints: ', constraints);
+
+      return new Promise ((resolve, reject)=>{
+        if (this._runtimeFactory.isOnline() ) {
+            resolve( this._getDescriptor(descriptorURL, createFunc, getFull, constraints));
+        } else {
+          this.storageManager.get('url', descriptorURL).then((descriptor) => {
+            console.log('[RuntimeCatalogue] saved offline descriptor ', descriptor);
+
+            if (descriptor) resolve(createFunc.apply(this, [descriptor, constraints]));
+            else resolve( this._getDescriptor(descriptorURL, createFunc, getFull, constraints));
+
+          });
+        } 
+
+      });
+
+    }
+
+    _getDescriptor(descriptorURL, createFunc, getFull = true, constraints) {
 
     // some flags for optimization
     // (later the descriptor will not be saved in case both of these booleans are true)
@@ -101,6 +122,7 @@ class RuntimeCatalogue {
     returnPromise = returnPromise.then((descriptor) => {
       // store if not saved before, or if full descriptor was requested and only partial descriptor was stored.
       if (!isSavedDescriptor || (isSavedDescriptor && !isCompleteDescriptor && getFull)) {
+        descriptor.url = descriptorURL;
         this.storageManager.set(descriptor.cguid, descriptor.version, descriptor);
       }
       return createFunc.apply(this, [descriptor, constraints]);

src/runtime/RuntimeUA.js

@@ -148,6 +148,7 @@ class RuntimeUA {
 
       this.domain = this.runtimeConfiguration.domain;
 
+
       log.info('[RuntimeUA - init] Starting ');
 
       try {
@@ -191,6 +192,8 @@ class RuntimeUA {
 
 
         }).then((status) => {
+          this._setNetworkStatusListeners();
+
 
           this._hypertyResourcesStorage = new HypertyResourcesStorage(this.runtimeURL, this.messageBus, this.storages.hypertyResources, this._hypertyResources);
 
@@ -218,6 +221,13 @@ class RuntimeUA {
 
   }
 
+  _setNetworkStatusListeners() {
+
+    this.runtimeFactory.listenOnline( this._updateRuntimeStatus('online') );
+    this.runtimeFactory.listenOffline( this._updateRuntimeStatus('offline') );
+
+  }
+
   _updateRuntimeStatus(event) {
 
     let _this = this;

src/runtime/Storage.js

@@ -5,6 +5,8 @@ let storages = {};
 export function storage(runtimeFactory, runtimeStatusUpdate) {
   if (!runtimeFactory) throw new Error('The runtime factory is a needed parameter');
 
+  console.log('[Storage.storage] storageSchemas ', runtimeConfiguration.storageSchemas);
+
   Object.keys(runtimeConfiguration.storageSchemas).forEach((key) => {
 
     if (!storages.hasOwnProperty(key)) {

src/runtime/runtimeConfiguration.js

@@ -27,7 +27,7 @@ export const runtimeConfiguration = {
       identities: 'userURL, userProfile.email, userProfile.userURL, userProfile.name'
     },
     runtimeCatalogue: {
-      runtimeCatalogue: '&cguid, accessControlPolicy, constraints, dataObjects, hypertyType, objectName, sourcePackage, version'
+      runtimeCatalogue: '&cguid, accessControlPolicy, constraints, dataObjects, type, objectName, sourcePackage, version, url'
     },
     policy: {
       'rethink:activePolicy': 'key,version,value',
@@ -94,5 +94,5 @@ export const runtimeConfiguration = {
     suffix: ''
   },
   globalRegistryURL: 'global://registry.',
-  remoteStorage: 'https://hysmart.rethink.ptinovacao.pt/backup/'
+  remoteStorage: 'https://backup.rethink-dev.alticelabs.com/'
 };

src/syncher/SyncherManager.js

@@ -322,7 +322,7 @@ class SyncherManager {
 
       let properties = descriptor.sourcePackage.sourceCode.properties;
       let scheme = properties.scheme ? properties.scheme : 'resource';
-      let childrens = properties.children ? properties.children : [];
+      let childrens = properties.childrens ? properties.childrens : [];
 
       // Do schema validation
       // TODO: check if is need to handle with the result of validation
@@ -511,7 +511,7 @@ class SyncherManager {
 
         let properties = descriptor.sourcePackage.sourceCode.properties;
         let scheme = properties.scheme ? properties.scheme.constant : 'resource';
-        let childrens = properties.children ? properties.children.constant : [];
+        let childrens = properties.childrens ? properties.childrens : [];
 
         log.log('[SyncherManager] - getDataSchemaDescriptor: ', descriptor, childrens);
 
@@ -827,7 +827,7 @@ class SyncherManager {
     //get schema from catalogue and parse -> (children)
     _this._catalog.getDataSchemaDescriptor(msg.body.schema).then((descriptor) => {
       let properties = descriptor.sourcePackage.sourceCode.properties;
-      let childrens = properties.children ? properties.children.constant : [];
+      let childrens = properties.childrens ? properties.childrens : [];
 
       let subscriptions = [];
       subscriptions.push(objURL + '/changes');
@@ -1013,7 +1013,7 @@ class SyncherManager {
       // TODO: remove this since children resources should be available in the DataObjectsStorage
       this._catalog.getDataSchemaDescriptor(schema).then((descriptor) => {
         let properties = descriptor.sourcePackage.sourceCode.properties;
-        let childrens = properties.children ? properties.children.constant : [];
+        let childrens = properties.childrens ? properties.childrens : [];
 
         //children addresses
         let subscriptions = [];