rb-homer 1.6.8 → 1.6.12

package/index.js

@@ -12,7 +12,8 @@ const componentTypes = [
     "-function",
     "-widget",
     "-VUE",
-    "-rbclass"
+    "-rbclass",
+    "-rex2"
 ];
 
 // Read command line arguments
@@ -165,6 +166,78 @@ else if (validCommand(commands.first, "listen", "l") || validCommand(commands.fi
         }).on('error', function () { });
     }
 }
+else if (validCommand(commands.first, "rex2", "rex2")) {
+    login.tryLogin(rbConfig).then(listenAndSync);
+
+    function listenAndSync(rbConfigMod) {
+
+        var chokidar = require('chokidar');
+        var folderToWatch;
+        if (!commands.second || commands.second === "this") {
+            folderToWatch = process.cwd();
+        }
+        else if (commands.second && pathModule.isAbsolute(commands.second)) {
+            folderToWatch = commands.second;
+            if (folderToWatch.endsWith("/")) {
+                folderToWatch = folderToWatch.slice(0, -1);
+            }
+        }
+        else {
+            throw "Please provide a valid path";
+        }
+
+        console.log('\x1b[5m%s\x1b[0m', 'Listening to: ' + folderToWatch);
+        var lastTriggered = 0;
+        var walk = require("./src/walk.js");
+        
+        chokidar.watch(folderToWatch, { ignored: /(^|[\/\\])\..|node_modules|\/min\/|\/Translation\/|tsconfig.json|\.git|\.css|\.min|\.pot|\.svn/, disableGlobbing: true }).on('change', (path) => {         
+            
+            if (path.indexOf(folderToWatch) !== -1) {
+                //Return if in progress   
+                var newTriggered = new Date().getTime();
+                if (newTriggered - lastTriggered < 5000) {
+                    return;
+                }
+      
+                lastTriggered = new Date().getTime();               
+
+                if (new Date().getTime() - rbConfigMod.access_tokenUpdatedTimeStamp > 28000000) {
+                    login.tryLogin(rbConfigMod).then(syncWithValidAccessToken);
+                }
+                else {
+                    syncWithValidAccessToken(rbConfigMod);
+                }
+
+                function syncWithValidAccessToken(rbConfigMod) {
+                    var folderToZip = walk.walkUp(pathModule.dirname(path), "config.js");
+                    if (!folderToZip) {
+                        return;
+                    }
+
+                    if (!folderToZip.endsWith("/")) {
+                        folderToZip += "/";
+                    }
+
+                    var synchronizer = require("./src/synchronizeREX2.js");
+
+                    try {                        
+                        synchronizer.sync(folderToZip, rbConfigMod);
+                    } catch (error) {                        
+                        notifier.notify({
+                            'wait': true,
+                            'title': 'Error :(',
+                            'message': error.message || error,
+                            'appName': "{1AC14E77-02E7-4E5D-B744-2EB1AE5198B7}\\WindowsPowerShell\\v1.0\\powershell.exe"
+                        });
+                        console.log("Error :( " + error.message || error);
+                    }
+                }
+
+            }
+
+        }).on('error', function () { });
+    }
+}
 else if (validCommand(commands.first, "vue", "vue")) {
     login.tryLogin(rbConfig).then(syncVue);    
     
@@ -343,6 +416,14 @@ function createTemplate(appNo, componentName, createWithinFolder, componenttype)
         createPath = "";
     }
 
+    if (componenttype === "rex2") {
+        var configContent = fs.readFileSync(createPath + "config.js", 'utf8');
+        configContent = configContent.replace("111111111", appNo);
+        configContent = configContent.replace("222222222", componentName);
+        fs.writeFileSync(createPath + "config.js", configContent, 'utf8');
+        return;
+    }
+
     //Update config.ts to include appNo and appName
     var configContent = fs.readFileSync(createPath + "config.ts", 'utf8');
     configContent = configContent.replace("111111111", appNo);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rb-homer",
-  "version": "1.6.8",
+  "version": "1.6.12",
   "description": "Create and synchronize Rambase applications.",
   "main": "index.js",
   "scripts": {

package/src/rb.d.ts

@@ -315,7 +315,7 @@ interface vm {
 interface rbPromise {   
   then(callback:(data) => void):this;  
   catch(callback:(e) => void):this;  
-  finally(callback?: () => void | undefined | null):this;
+  finally(callback?: (() => void) | undefined | null):this; 
 }
 
 interface config{
@@ -343,7 +343,9 @@ interface configDatasources{
 interface configDataSourceProperties {
   url:string,
   /** true | false | "get" */
-  autoBind?:boolean | string
+  autoBind?:boolean | string,
+  minimumGetVersion?:number,
+  minimumPutVersion?:number
 }
 
 declare var toastr:toastr;

package/src/synchronize.js

@@ -105,6 +105,29 @@ function findResourcesInComponent(controllerContent, configContent, allHTMLConte
     return resourcesUsed;
 }
 
+function checkForRbClass(controllerContent){
+    var rbClassComponents = [];
+    var match = null;
+
+    //Find rbClass components
+
+    var re = /\/[a-zA-Z]+RbClassController/ig;
+
+    while ((match = re.exec(controllerContent)) !== null) {
+
+        if (rbClassComponents.indexOf(match[0]) === -1 && match[0].indexOf("{") === -1) {
+
+            var matchitem = match[0].split("/")[1];
+
+            matchitem = matchitem.replace("Controller", "");  
+
+            rbClassComponents.push(matchitem);
+        }
+    }
+
+    return rbClassComponents;
+}
+
 function findLookupComponents(content) {
     var lookupComponents = [];
 
@@ -386,6 +409,20 @@ exports.sync = function (folderToZip, rbConfigMod) {
                 allTsContent += viewModels[i].contentTS;
             }
         }
+
+        var rbClasses = checkForRbClass(allTsContent);
+        if (rbClasses.length > 0) {
+            for (x = 0; x < rbClasses.length; x++) {
+                lookupComponents.push(rbClasses[x]);
+            }
+            if (lookupComponents.length > 0) {
+                configModule.lookupComponents = lookupComponents;
+            }
+            else {
+                delete configModule.lookupComponents;
+            }
+        }
+
         var componentResources = findResourcesInComponent(allTsContent, configTSContent, allHTMLContent);
 
         if (componentResources && componentResources.length > 0) {

package/src/synchronizeREX2.js

@@ -0,0 +1,148 @@
+var exports = module.exports = {};
+
+var fs = require('fs');
+const notifier = require('node-notifier');
+
+
+function uploadToFileServer(fileStream, fullDocid, authKey, compName) {
+    var BasicHttpBinding = require('wcf.js').BasicHttpBinding
+        , Proxy = require('wcf.js').Proxy
+        , binding = new BasicHttpBinding()
+        , proxy = new Proxy(binding, "https://Apps.Rambase.Net/Service.svc")
+        , message = '<s:Envelope xmlns:s="http://schemas.xmlsoap.org/soap/envelope/">' +
+            '<s:Body>' +
+            '<UploadFile xmlns="http://tempuri.org/">' +
+            '<authKey>' + authKey + '</authKey>' +
+            '<fileStream>' + fileStream + '</fileStream>' +
+            '<fileName>' + compName + '.zip</fileName>' +
+            '<fullDocid>' + fullDocid + '</fullDocid>' +
+            '</UploadFile>' +
+            '</s:Body>' +
+            '</s:Envelope>'
+
+    proxy.send(message, "http://tempuri.org/IService1/UploadFile", function (response, ctx) {
+
+        var exceptionMessage;
+        var parseString = require('xml2js').parseString;
+        parseString(response, function (err, result) {
+            try {
+                exceptionMessage = result["s:Envelope"]["s:Body"][0]["UploadFileResponse"][0]["UploadFileResult"][0]["a:ExceptionMessage"][0];
+            } catch (error) {
+            }
+        });
+
+        if (exceptionMessage && exceptionMessage.indexOf("Url invalid") > -1) {
+            notifier.notify({
+                'wait': true,
+                'title': 'Error synching. ' + exceptionMessage,
+                'message': 'Make sure there exist a version 1 for your PID of: ' + fullDocid,
+                'sound': true,
+                'appName': "{1AC14E77-02E7-4E5D-B744-2EB1AE5198B7}\\WindowsPowerShell\\v1.0\\powershell.exe"
+            });
+            console.log("Error syncing. Make sure there exist a version 1 for your PID of: " + fullDocid + " " + compName + ". " + exceptionMessage + " " + (new Date().toString()).split("GMT")[0]);
+        }
+        else if (exceptionMessage) {
+            notifier.notify({
+                'wait': true,
+                'title': 'Error synching. ' + exceptionMessage,
+                'message': fullDocid,
+                'sound': true,
+                'appName': "{1AC14E77-02E7-4E5D-B744-2EB1AE5198B7}\\WindowsPowerShell\\v1.0\\powershell.exe"
+            });
+            console.log("Error syncing " + fullDocid + " " + compName + ". " + exceptionMessage + " " + (new Date().toString()).split("GMT")[0]);
+        }
+        else if (!response) {
+            notifier.notify({
+                'wait': true,
+                'title': 'Error synching',
+                'message': 'An error occured when uploading component: ' + fullDocid,
+                'appName': "{1AC14E77-02E7-4E5D-B744-2EB1AE5198B7}\\WindowsPowerShell\\v1.0\\powershell.exe"
+            });
+            console.log("Error syncing " + fullDocid + " " + compName + " " + (new Date().toString()).split("GMT")[0]);
+        }
+        else {            
+            notifier.notify({
+                'wait': true,
+                'title': 'Synced ok',
+                'message': 'Successfully synchronized component: ' + fullDocid + ' ' + compName,
+                'appName': "{1AC14E77-02E7-4E5D-B744-2EB1AE5198B7}\\WindowsPowerShell\\v1.0\\powershell.exe"
+            });
+            console.log(compName + " synced ok " + (new Date().toString()).split("GMT")[0]);
+            if (global.sendUTF) { //notify rb client
+                global.sendUTF();
+            }
+        }
+
+    });
+}
+
+exports.sync = function (folderToZip, rbConfigMod) {
+    // Check for config file existence   
+    if (!fs.existsSync(folderToZip + 'config.js')) {
+        throw "Missing config.js file";
+    }
+
+    //Check for mandatory properties in config file
+    
+    var configJSFile = fs.readFileSync(folderToZip + 'config.js', 'utf8');
+    var configModule = eval(configJSFile);    
+
+    if (!configModule.appName || !configModule.appNo) {
+        var pathModule = require('path');
+        var basePath = pathModule.basename(folderToZip);
+        var appNoFromBasePath = basePath.substring(0, 6);
+        var componentNameFromBasePath = basePath.substring(basePath.lastIndexOf(".") + 1, basePath.lastIndexOf("("));
+        componentNameFromBasePath = componentNameFromBasePath.trim();
+
+        if (isNaN(appNoFromBasePath) || basePath.indexOf("-") === -1 || basePath.indexOf(".") < 0 || componentNameFromBasePath.length < 3) {
+            throw ("Not able to get appNo and appName from the config file or from the current folder.");
+        }
+        configModule.appName = componentNameFromBasePath;
+        configModule.appNo = appNoFromBasePath;
+    }
+
+    configModule.appNo = parseInt(configModule.appNo, 10);
+
+    if (isNaN(configModule.appNo)) {
+        throw "appNo must be of type number";
+    }
+
+    //Zip folder  
+    var zipdir = require('zip-dir');
+
+    zipdir(folderToZip, {
+        filter: (path, stat) => !/\.zip|\.git|\.svn|\.vs|tsconfig.json|rex-project|\.vscode|node_modules/.test(path) //exclude this values in filepath
+        //each: path => console.log(path, "added!")
+        //saveTo: 'tempComponent.zip'
+    },
+        function (err, buffer) {
+            if (err) {
+                notifier.notify({
+                    'wait': true,
+                    'title': 'Zip error',
+                    'message': 'Unable to zip folder. ' + err,
+                    'appName': "{1AC14E77-02E7-4E5D-B744-2EB1AE5198B7}\\WindowsPowerShell\\v1.0\\powershell.exe"
+                });
+                console.log('Unable to zip folder. ' + err);
+
+            }
+            else if (buffer) {
+                try {
+                    // 6 Upload file
+                    var pid = rbConfigMod.pid;
+                    var fullDocid = "APP/" + configModule.appNo + ".1." + pid;
+                    uploadToFileServer(buffer.toString('base64'), fullDocid, rbConfigMod.access_token, configModule.appName);
+                } catch (error) {
+                    notifier.notify({
+                        'wait': true,
+                        'title': 'Error synching',
+                        'message': 'Are you on an unsecure network? ' + error,
+                        'appName': "{1AC14E77-02E7-4E5D-B744-2EB1AE5198B7}\\WindowsPowerShell\\v1.0\\powershell.exe"
+                    });
+                    console.log('Error synching. Are you on an unsecure network? ' + error)
+                }
+
+            }
+        }
+    );
+}

package/templates/rex2/config.js

@@ -0,0 +1,4 @@
+config = {        
+	appNo: 111111111,
+	appName: "222222222"
+};

package/templates/snippets/html.json

@@ -313,5 +313,19 @@
 				"<rb-timeline datasource=\"${1:vm.datasource}\" id=\"${2:id}\" subject=\"${3:title}\" description=\"${4:description}\" icon=\"${5:icon}\" created=\"${6:createdDate}\" created-by=\"${7:createdBy}\" created-by-userid=\"${8:createdByUserId}\" inspect-doc=\"${9:docid}\"\n template=\"${10:inlineTemplate}\" icon-set=\"${11:vm.icons}\" delete=\"${12:vm.delete}\" load-more=\"${13:vm.loadMore}\" on-open=\"${14:vm.onOpen}\" save=\"${15:vm.save}\" close=\"${16:vm.close}\" on-done=\"${17:vm.onDone}\" done=\"${18:itemCompleted}\" new-item=\"${19:vm.newitem}\" subtitle=\"${20:description}\">\n\t<rb-timeline-add>\n\t\t$BLOCK_COMMENT_START template for adding a new timeline item $BLOCK_COMMENT_END\n\t\t<rb-input type=\"text\" ng-model=\"vm.newitem.title\"></rb-input>\n\t</rb-timeline-add> \n\n\t<rb-timeline-item>\n\t\t$BLOCK_COMMENT_START template for editing an existing item. use 'dataItem' in this block to access each item in the vm.datasource  $BLOCK_COMMENT_END\n\t\t<rb-input type=\"text\" ng-model=\"dataItem.title\"></rb-input>\n\t</rb-timeline-item>\n</rb-timeline>"
 			],
 			"description": "Add a timeline to your component"
+		},
+		"rb_044":{
+			"prefix": "rb-input: multiselect(standard)",
+			"body": [
+				"<rb-input \n\t type=\"multiselect\" \n\t model=\"${1:vm.currency}\" \n\t label=\"{{'${2:Currency}' | translate}}\" \n\t rb-fieldname=\"${3:currency}\" \n\t k-data-source=\"${4:vm.currencies}\" \n\t value=\"${5:currency}\" \n\t text=\"${6:currencyDomainDescription}\" \n\t description=\"${7:vm.currencyDescr}\" \n\t k-on-change=\"${8:vm.currencySelected()}\" auto-close=\"${9:false}\" value-primitive=\"${10:true}\" k-on-deselect=\"${11:vm.currencyDeSelected()}\" placeholder=\"${12:vm.currencyPlaceholder}\">\n</rb-input>"
+			],
+			"description": "Mulstiselect using k-data-source."
+		},
+		"rb_045":{
+			"prefix": "rb-input: multiselect(apiresource)",
+			"body": [
+				"<rb-input \n\t type=\"multiselect\" \n\t model=\"${1:vm.currency}\" \n\t label=\"{{'${2:Currency}' | translate}}\" \n\t rb-fieldname=\"${3:currency}\" \n\t apiresource=\"${4:base/currencies/?$top=80}\" \n\t value=\"${5:currency}\" \n\t text=\"${6:currencyDomainDescription}\" \n\t description=\"${7:vm.currencyDescr}\" \n\t k-on-change=\"${8:vm.currencySelected()}\" auto-close=\"${9:false}\" value-primitive=\"${10:true}\" k-on-deselect=\"${11:vm.currencyDeSelected()}\" placeholder=\"${12:vm.currencyPlaceholder}\">\n</rb-input>"
+			],
+			"description": "Multiselect using apiresource."
 		}
 }