@gudhub/core 1.1.74 → 1.1.76

package/GUDHUB/GHConstructor/interpritate.js

@@ -7,9 +7,8 @@ export class Interpritate {
     // In this method we are looking for interpretation in data model according to interpretation src
     // then we merged with default interpretation from defaultFieldDataModel
     // if there are no current interpretation we use default interpretation
-    getInterpretationObj(fieldDataModel, defaultFieldDataModel, src, containerId) {
-        var currentIntrpr = {};
-
+    async getInterpretationObj(fieldDataModel, defaultFieldDataModel, src, containerId, itemId, appId) {
+        var currentIntrpr = [];
         // Creating default interpretation
         var defaultIntrprObj = defaultFieldDataModel.data_model.interpretation.find(function (interpritation) {
             return interpritation.src == src;
@@ -17,15 +16,34 @@ export class Interpritate {
             return interpritation.src == 'table';
         }) || { id: 'default' };
 
+        var interpretation = defaultIntrprObj;
+
         if (fieldDataModel.data_model && fieldDataModel.data_model.interpretation) {
             // To detect interpretation we use (container_id), if there is not (container_id) we use (src)
-            currentIntrpr = fieldDataModel.data_model.interpretation.find(function (interpritation) {
-                return interpritation.src == containerId;
-            }) || fieldDataModel.data_model.interpretation.find(function (interpritation) {
-                return interpritation.src == src;
-            });
+            for(var i = 0; i < fieldDataModel.data_model.interpretation.length; i++) {
+                if(fieldDataModel.data_model.interpretation[i].src == src || fieldDataModel.data_model.interpretation[i].src == containerId) {
+                    currentIntrpr.push(fieldDataModel.data_model.interpretation[i]);
+                }
+            }
+
+            for(var i = 0; i < currentIntrpr.length; i++) {
+                if(currentIntrpr[i].settings.condition_filter && currentIntrpr[i].settings.filters_list.length > 0) {
+                    const item = await gudhub.getItem(appId, itemId);
+                    if(item) {
+                        const filteredItems = gudhub.filter([item], currentIntrpr[i].settings.filters_list);
+                        if(filteredItems.length > 0) {
+                            interpretation = currentIntrpr[i];
+                            break;
+                        }
+                    }
+                } else {
+                    interpretation = gudhub.mergeObjects(interpretation, currentIntrpr[i]);
+                }
+            }
+
         }
-        return gudhub.mergeObjects(defaultIntrprObj, currentIntrpr);
+        
+        return interpretation;
     }
 
     /*********************** GET INTERPRETATION ***********************/
@@ -39,9 +57,9 @@ export class Interpritate {
             /*---- Constructing Data Object ----*/
             if (data_type) {
                 /*-- if we have data_type then we construct new data object to interpritate value*/
-                gudhub.ghconstructor.getInstance(data_type).then(function (data) {
+                gudhub.ghconstructor.getInstance(data_type).then(async function (data) {
                     if(data) {
-                        var interpretationObj = self.getInterpretationObj(field, data.getTemplate().model, source, containerId);
+                        var interpretationObj = await self.getInterpretationObj(field, data.getTemplate().model, source, containerId, itemId, appId);
                         data.getInterpretation(value, interpretationObj.id, data_type, field, itemId, appId).then(function (result) {
                             // console.log(result, interpretationObj)
 

package/GUDHUB/Storage/ModulesList.js

@@ -1162,11 +1162,25 @@ export default function generateModulesList(async_modules_path, file_server_url,
         },
         {
             data_type: 'TwilioSMS',
-            name: 'Twilio',
+            name: 'Twilio SMS',
             url: file_server_url + '/' + automation_modules_path + 'twilio_sms.js',
             type: 'automation',
             icon: 'automation_twilio'
         },
+        {
+            data_type: 'TwilioAuth',
+            name: 'Twilio Auth',
+            url: file_server_url + '/' + automation_modules_path + 'twilio_auth.js',
+            type: 'automation',
+            icon: 'table'
+        },
+        {
+            data_type: 'TwilioDevice',
+            name: 'Twilio Device',
+            url: file_server_url + '/' + automation_modules_path + 'twilio_device.js',
+            type: 'automation',
+            icon: 'table'
+        },
         {
             data_type: 'UpdateItemsApi',
             name: 'Update Items Api',
@@ -1253,6 +1267,13 @@ export default function generateModulesList(async_modules_path, file_server_url,
             url: file_server_url + '/' + automation_modules_path + 'delete_items.js',
             type: 'automation',
             icon: 'rubbish'
+        },
+        {
+            data_type: 'GoToItem',
+            name: 'Go To Item',
+            url: file_server_url + '/' + automation_modules_path + 'go_to_item.js',
+            type: 'automation',
+            icon: 'cursor_point'
         }
     ]
 }

package/GUDHUB/Utils/Utils.js

@@ -23,6 +23,7 @@ import AppsTemplateService from "./AppsTemplateService/AppsTemplateService.js";
 import { FileHelper } from "./FIleHelper/FileHelper.js";
 import { compareObjects } from "./compareObjects/compareObjects.js";
 import { dynamicPromiseAll } from "./dynamicPromiseAll/dynamicPromiseAll.js";
+import { sortItems } from './filter/sortItems.js';
 
 export class Utils {
   constructor(gudhub) {
@@ -212,4 +213,8 @@ export class Utils {
   dynamicPromiseAll(promisesArray) {
     return dynamicPromiseAll(promisesArray);
   }
+
+  sortItems(items, options) {
+    return sortItems(items, options);
+  }
 }

package/GUDHUB/Utils/filter/sortItems.js

@@ -0,0 +1,63 @@
+
+/**
+ * Sort items by field value of given field
+ * 
+ * @param {array} items - items of application
+ * @param {object} options - object with options for sorting
+ *  @property {number|string} sort_field_id - field id for sorting items 
+ *  @property {boolean} descending - sort type (if set to true - items sort by descending else by ascending)
+ * 
+ */
+
+export function sortItems(items, options) {
+    
+      /*-- stop filtering if arguments are empty*/
+      if (!items || !items.length) {
+        return [];
+      }
+
+      if (!items[0].fields.length) {
+        return items;
+      }
+
+      var compareFieldId = options && options.sort_field_id || items[0].fields[0].field_id;
+
+      /* Get field value*/
+      function getFieldValue(item) {
+        var result = null;
+        for (var i = 0; i < item.fields.length; i++) {
+
+          if (item.fields[i].field_id == compareFieldId) {
+            result = item.fields[i].field_value;
+            break;
+          }
+
+        }
+        return result;
+
+      }
+
+      /* Sort items array*/
+      items.sort(function(a, b) {
+        var aVal = getFieldValue(a);
+        var bVal = getFieldValue(b);
+
+        if (aVal === null) {
+          return -1;
+        }
+        if (bVal === null) {
+          return 1;
+        }
+
+        if (/^\d+$/.test(aVal) && /^\d+$/.test(bVal)) {
+          return Number(aVal) < Number(bVal) ? -1 : 1;
+        }
+
+        if (/^\d+$/.test(aVal) || /^\d+$/.test(bVal)) {
+          return /^\d+$/.test(aVal) ? -1 : 1;
+        }
+
+        return aVal.toLowerCase() > bVal.toLowerCase() ? 1 : -1;
+      });
+      return options && options.descending ? items.reverse() : items;
+  }

package/GUDHUB/Utils/filter/sortItems.test.js

@@ -0,0 +1,26 @@
+import {GudHub} from './../../gudhub.js';
+
+import { app_8263 } from '../../../fake_server/fake_server_data/app_8263.js';
+
+const items = app_8263.items_list;
+
+  describe('Sort Items', function() {
+    const gudhub = new GudHub();
+
+    it('Should return sorted items by descending', function(){
+      const options = {
+        sort_field_id: "96606",
+        descending: true
+      }
+        gudhub.sortItems(items, options)[0].item_id.should.equal(396898);
+    });
+
+    it('Should return sorted items by ascending', function(){
+      const options = {
+        sort_field_id: "96606",
+        descending: false
+      }
+        gudhub.sortItems(items, options)[0].item_id.should.equal(396906);
+    });
+    
+  });

package/GUDHUB/gudhub.js

@@ -198,6 +198,10 @@ export class GudHub {
     );
   }
 
+  sortItems(items, options) {
+    return this.util.sortItems(items, options);
+  }
+
   jsonToItems(json, map) {
     return this.util.jsonToItems(json, map);
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gudhub/core",
-  "version": "1.1.74",
+  "version": "1.1.76",
   "description": "",
   "main": "index.js",
   "scripts": {