Dev branch changes

.gitmodules

@@ -13,3 +13,6 @@
 [submodule "tools/download.sh"]
 	path = tools/download.sh
 	url = https://github.com/ceremcem/download.sh
+[submodule "tools/debug-ls"]
+	path = tools/debug-ls
+	url = https://github.com/ceremcem/debug-ls

Makefile

@@ -20,7 +20,7 @@ update-deps: __c
 update-app-version:
 	touch lib/app-version.json
 
-production: __c __prepare_release_dir __production __release_commit
+release: __c __prepare_release_dir __production __release_commit
 
 __production: __app
 	gulp --webapp $(APP) --production
@@ -55,6 +55,9 @@ create-venv:
 	$(eval NODE_VERSION := $(shell echo `grep "^#node@" nodeenv.txt | cut -d@ -f2` | sed 's/^$$/system/'))
 	nodeenv --requirement=./nodeenv.txt --node=$(NODE_VERSION) --prompt="($(VENV_NAME))" --jobs=4 nodeenv
 
+use-venv:
+	./venv
+
 __prepare_release_dir:
 	@( if [ ! -d release/$(APP) ]; then \
 		 	mkdir -p release; \
@@ -64,7 +67,14 @@ __prepare_release_dir:
 	)
 
 __release_commit:
-	( cd release/$(APP) && git add . && git commit )
+	( cd release/$(APP) && git add . && git commit -m "unattended commit")
 
 release-push:
 	@( cd release/$(APP) && git push )
+
+list-modules:
+	@find . -name package.json -and -not -path "*/node_modules/*" | xargs dirname | sort
+
+npm-audit-all:
+	@$(MAKE) list-modules --no-print-directory | xargs -I '{}' bash -c \
+	'cd {}; echo -e "-----------\nAudit for {}:\n-----------\n\n"; npm i --package-lock-only; npm audit'

components/debug-obj/index.ls

@@ -1,25 +1,3 @@
-Ractive.components['json-edit'] = Ractive.extend do
-  template: require('./json-edit.pug')
-  isolated: true
-  data: -> 
-    objStr: null 
-    objFormatted: null 
-  computed: 
-    objFormatted: 
-      get: ->
-        if @get \objTmp
-            return that 
-        else 
-            return JSON.stringify @get('value'), null, 2
-
-      set: (objStr) -> 
-        try 
-          obj = JSON.parse(objStr)
-          @set('value', obj)
-          @set('objTmp', null)
-        catch
-          return @set 'objTmp', objStr
-
 Ractive.components['debug-obj'] = Ractive.extend do
     template: require('./index.pug')
     data: ->

components/debug-obj/index.pug

@@ -3,5 +3,4 @@
         icon.bug
 
     modal(title="{{title}}" basedon="{{mymodal1}}")
-        .ui.segment(style="width: 80vw; height: calc(80vh - 80px)")
-            json-edit(value="{{obj || null}}" style="width: 100%; height: 100%;")
+        json-edit(value="{{obj}}" style="width: 80vw; height: calc(80vh - 120px)")

components/dropdown/index.ls

@@ -65,7 +65,7 @@ Ractive.components['dropdown'] = Ractive.extend do
         selected-key-observer = null
         update-dropdown = (_new) ~>
             if @get \debug
-                @actor.log.log "#{@_guid}: selected key is changed to: ", _new
+                @actor.log.log "#{@_guid}: selected key is _being_ changed to: ", _new
             <~ set-immediate
             external-change := yes
             <~ :lo(op) ~>
@@ -113,6 +113,7 @@ Ractive.components['dropdown'] = Ractive.extend do
                         # button action. When selected key is cleared, all
                         # necessary actions are handled in the listener.
                         @fire \select, c, {}, (err) ~>
+                            debugger if @get \debug
                             if err and typeof! err is \String
                                 @actor.v-err err
                         return op!
@@ -150,13 +151,16 @@ Ractive.components['dropdown'] = Ractive.extend do
                             if @get \async
                                 selected-key-observer.silence!
                                 @fire \select, c, selected, (err) ~>
+                                    debugger if @get \debug 
                                     unless err
                                         @set \emptyReduced, no
                                         update-dropdown selected[keyField]
                                     else
                                         curr = @get \selected-key
                                         if typeof! err is \String
-                                            @actor.v-err err
+                                            @actor.v-err """#{err}
+                                                Dropdown, called #{@get 'selected'}
+                                                """
                                             @actor.c-warn "Error reported for dropdown callback: ", err,
                                                 "falling back to #{curr}"
                                         @set \emptyReduced, yes
@@ -204,7 +208,9 @@ Ractive.components['dropdown'] = Ractive.extend do
                         #@actor.c-log "Dropdown (#{@_guid}) : searchTerm is empty"
                         @set \dataReduced, small-part-of data
                 on-change: (value, text, selected) ~>
-                    return if external-change
+                    if external-change and not @get('listen-external')
+                        if @get \debug => @actor.c-log "Dropdown: Exiting from on-change handler as this is an external change."
+                        return 
                     if @get \debug => @actor.c-log "Dropdown: #{@_guid}: dropdown is changed: ", value
                     if @get \multiple
                         set-item unless value? => [] else value.split ','
@@ -251,6 +257,8 @@ Ractive.components['dropdown'] = Ractive.extend do
                 update-dropdown _new
 
         selected-key-observer = @observe \selected-key, ((val) ~>
+            unless val?
+                dd.dropdown 'clear'
             if @get \async
                 console.log "this is async mode and item is changed: ", val
                 set-item val
@@ -259,7 +267,9 @@ Ractive.components['dropdown'] = Ractive.extend do
             ), {-init}
 
         # first update should be silent
-        set-immediate ~> 
+        sleep 100ms, ~> 
+            if @get \debug 
+                @actor.c-log "Setting initial dropdown value: ", @get 'selected-key'
             dd.dropdown 'set selected', @get('selected-key')
             dd.dropdown 'refresh'
 
@@ -270,7 +280,8 @@ Ractive.components['dropdown'] = Ractive.extend do
             '_add': (ctx) ->
                 c.button = ctx.component
                 sleep 10, -> dd.dropdown 'show'
-                err <~ @fire \add, c, @get \search-term
+                newKey = @get \search-term
+                err <~ @fire \add, c, newKey
                 # dropdown should only be closed if there is
                 # no error returned
                 unless err
@@ -279,6 +290,10 @@ Ractive.components['dropdown'] = Ractive.extend do
                     @set \search-term, ''
                     # clear the dropdown search field
                     $('.ui.dropdown').find(".search").val("")
+                    <~ set-immediate 
+                    dd.dropdown 'set selected', newKey
+                    dd.dropdown 'refresh'
+
     data: ->
         'search-fields': <[ description ]>
         'search-term': ''
@@ -303,3 +318,4 @@ Ractive.components['dropdown'] = Ractive.extend do
         'selected-key': null
         'selected-name': null
         'load-first': 100
+        'listen-external': yes # listen external key changes by default

components/dropdown/index.pug

@@ -36,14 +36,17 @@
             span.text -------
         +endif
         .menu
+            //turn off autocomplete
+            input(type="hidden" value="something")
             .ui.icon.search.input
                 i.search.icon
-                input(type="text" placeholder="Search...")
+                input(type="search" autocomplete="off" placeholder="Search...")
 
             +each('dataReduced as item')
                 .item(
                     data-value!="{{item[keyField]}}" 
                     class-disabled="blacklist == item[keyField]"
+                    title="{{._tooltip}}"
                     ) {{item[nameField]}}
 
             +if('emptyReduced && ~/["allow-addition"]')
@@ -72,7 +75,7 @@
         .default.text {{ placeholder }}
         .menu
             +each('dataReduced')
-                .item(data-value!="{{.[keyField]}}") {{.[nameField]}}
+                .item(data-value!="{{.[keyField]}}" title="{{._tooltip}}") {{.[nameField]}}
 
             +if('@this.getContext().hasListener("add", true) && ~/["search-term"]')
                 +iff("@this.partials.addNew ")

components/index.ls

@@ -41,6 +41,7 @@ require! './data-table'
 require! './date-picker'
 require! './db-img'
 require! './debug-obj'
+require! './json-edit'
 require! './example-component'
 require! './export-to-csv'
 require! './file-button'

components/json-edit/index.ls

@@ -1,36 +1,33 @@
 require! 'relaxed-json': rjson
 
-fixJSON = (x) -> rjson.parse(x)
-
 Ractive.components['json-edit'] = Ractive.extend do
-    template: '''
-        <textarea lazy="true"
-          style="{{style}}; white-space: pre-wrap; border: {{#if err}}2px dashed red{{else}}1px solid green{{/if}}"
-          title="{{err}}"
-          class="{{class}}"
-          >{{ objFormatted }}</textarea>
-        '''
+    template: require('./index.pug')
     isolated: yes
     data: ->
         objTmp: null
         value: null
         err: null
+        timeout: 500ms 
+        readonly: no 
+        title: null 
 
     computed:
         objFormatted:
             get: ->
                 if @get \objTmp
-                    return that
+                    that
                 else
-                    return JSON.stringify(@get('value'), null, 2)
+                    JSON.stringify (@get('value') or null), null, 2
 
             set: (objStr) ->
+                objStr ?= null 
+                return if @get \readonly 
                 try
-                    obj = fixJSON objStr
+                    obj = rjson.parse objStr
                     @set \value, obj
                     @set \objTmp, null
                     @set \err, null
                 catch
-                    console.warn "json-edit error was: ", e
+                    #console.warn "json-edit error was: ", e
                     @set \err, e.message
                     @set \objTmp, objStr

components/json-edit/index.pug

@@ -0,0 +1,14 @@
+.ui.form(style="height: 100%; width: 100%;")
+    .field(style="height: 100%; width: 100%")
+        +if('title')
+            label {{title}}
+
+        //- lazy="xxx" : Update the content only when the mouse out of editing area
+            or timeout of xxx milliseconds is over.
+        textarea(
+            readonly="{{readonly}}"
+            lazy="{{timeout}}" 
+            style="height: 100%; width: 100%; {{style}}; white-space: pre-wrap; border: {{#if err}}2px dashed red{{else}}1px solid green{{/if}};"
+            title="{{err}}"
+            class="{{class}}"
+        ) {{ objFormatted }}

components/router/index.ls

@@ -3,7 +3,7 @@ require! 'actors':  {RactiveActor}
 require! './tools': {
     change-hash-listener, set-window-hash, make-link, scroll-to, 
     set-scroll-top, get-scroll-top, parse-link, get-window-hash, get-offset
-    set-window-hash
+    set-window-hash, basename 
 }
 
 Ractive.components['a'] = Ractive.extend do

components/router/tools.ls

@@ -1,6 +1,6 @@
 require! 'prelude-ls': {take, drop, split, find}
 
-basename = (.split(/[\\/]/).pop!) # https://stackoverflow.com/questions/3820381#comment29942319_15270931
+export basename = (.split(/[\\/]/).pop!) # https://stackoverflow.com/questions/3820381#comment29942319_15270931
 
 export get-offset = ->
     $ 'body' .scrollTop!

doc/using-virtual-environment.md

@@ -6,12 +6,12 @@
 
         pip install nodeenv
 
-2. Download or create the project:
+2. Download (or create) your project:
 
-        # download 
+        # download an existing project:
         git clone --recursive https://github.com/aktos-io/scadajs-template myproject && cd myproject
 
-        # create 
+        # or create a project from scratch:
         git init myproject && cd myproject 
         git submodule add git submodule add https://github.com/aktos-io/scada.js
 
@@ -29,8 +29,9 @@
 
 5. Optional: Move your nodeenv to a central location and use it between projects:
 
-        mv nodeenv/ ~/nodeenv/scadajs-1  # or anywhere you like
-        echo "export SCADAJS_1_ENV="~/nodeenv/scadajs-1" >> ~/.bashrc
+        dest=$HOME/nodeenv/scadajs-1  # or anywhere you like
+        mv nodeenv/ $dest  
+        echo "export SCADAJS_1_ENV='$dest'" >> ~/.bashrc
 
    > Next time you can use: `./scada.js/venv`
 

lib/aea/file-download.js

@@ -1,13 +1,13 @@
 // taken from https://stackoverflow.com/a/31438726/1952991
-var createDownload = function(filename,text){
+var createDownload = function(filename,content,mimetype="text/plain"){
     // Set up the link
     var link = document.createElement("a");
     link.setAttribute("target","_blank");
     if(Blob !== undefined) {
-        var blob = new Blob([text], {type: "text/plain"});
+        var blob = new Blob([content], {type: mimetype});
         link.setAttribute("href", URL.createObjectURL(blob));
     } else {
-        link.setAttribute("href","data:text/plain," + encodeURIComponent(text));
+        link.setAttribute("href","data:"+mimetype+"," + encodeURIComponent(content));
     }
     link.setAttribute("download",filename);
     document.body.appendChild(link);