@dualbox/editor 1.0.93 → 1.0.94

package/js/src/GraphEditor.js

@@ -73,7 +73,7 @@ class DualboxEditor {
                     packages = this.filterPackages(text, packages);
                 }
 
-                return packages;
+                return Promise.resolve(packages);
             } else {
                 return new Promise((resolve, reject) => {
                     attrs.search(text, (err, packages) => {
@@ -175,7 +175,7 @@ class DualboxEditor {
             }
 
             // aggregate scores
-            for (let r of packages) {
+            _.each(packages, r => {
                 r.score = 0;
                 _.each(r.wordscore, (wordScores, field) => {
                     let fieldScore = 0;
@@ -185,9 +185,9 @@ class DualboxEditor {
                     fieldScore /= words.length;
                     r.score += fieldScore * ponderation[field];
                 });
-            }
+            });
 
-            packages = packages.filter(r => r.score > 0);
+            packages = _.filter(packages, r => r.score > 0);
 
             // return result sorted by score
             return _.sortBy(packages, r => 1 - (r.score || 0));

package/js/src/c/GraphController.js

@@ -782,16 +782,11 @@ class GraphController {
         var clipboard = await this.getClipboard();
         try {
             var json = JSON.parse(clipboard);
-            swal.queue([{
-                title: 'Dependencies required',
-                text: 'Dualbox will load additional required dependencies to paste your selection',
-                showLoaderOnConfirm: true,
-                preConfirm: async () => {
-                    await this.e.loadPackages(json);
-                    this.m.paste(json);
-                    await this.v.repaint();
-                }
-            }])
+            await this.e.loadPackages(json);
+            let validPaste = this.m.paste(json);
+            if (validPaste) {
+                await this.v.repaint();
+            }
         } catch (e) {
             swal.fire("Invalid content for copy/paste", "You must first copy boxes from Dualbox", "error");
             return;

package/js/src/m/GraphModel.js

@@ -274,47 +274,176 @@ class GraphModel {
     paste(json) {
         var currentMetanode = this.getCurrentMetanode();
 
-        this.batch(() => {
-            // paste metanodes
+        var checkValidPaste = () => {
+            let valid = true;
+
             _.each(json.metamodules, (mmDef, mmName) => {
                 var metamodule = _.get(currentMetanode, ["metanodes", mmName]);
-                if (metamodule === undefined) {
-                    _.set(currentMetanode, ["metanodes", mmName], mmDef);
+                if (metamodule !== undefined) {
+                    valid = false;
+                    const Toast = swal.mixin({
+                        toast: true,
+                        position: 'bottom-end',
+                        showConfirmButton: false,
+                        timer: 5000,
+                        timerProgressBar: true,
+                        html: "",
+                        onOpen: (toast) => {
+                            toast.addEventListener('mouseenter', swal.stopTimer)
+                            toast.addEventListener('mouseleave', swal.resumeTimer)
+                        }
+                    })
+                    Toast.fire({
+                        icon: 'error',
+                        title: '<span class="text-danger">Invalid paste : metanode ' + mmName + ' already exists here</span>'
+                    })
                 }
-            });
-
-            // paste inputs
+            })
             _.each(json.input, (inputDef, inputName) => {
                 var input = _.get(currentMetanode, ["input", inputName]);
-                if (input === undefined) {
-                    _.set(currentMetanode, ["input", inputName], inputDef);
+                if (input !== undefined) {
+                    valid = false;
+                    const Toast = swal.mixin({
+                        toast: true,
+                        position: 'bottom-end',
+                        showConfirmButton: false,
+                        timer: 5000,
+                        timerProgressBar: true,
+                        html: "",
+                        onOpen: (toast) => {
+                            toast.addEventListener('mouseenter', swal.stopTimer)
+                            toast.addEventListener('mouseleave', swal.resumeTimer)
+                        }
+                    })
+                    Toast.fire({
+                        icon: 'error',
+                        title: '<span class="text-danger">Invalid paste : input ' + inputName + ' already exists here</span>'
+                    })
                 }
-            });
-
+            })
             // paste outputs
             _.each(json.output, (outputDef, outputName) => {
                 var output = _.get(currentMetanode, ["output", outputName]);
-                if (output === undefined) {
-                    _.set(currentMetanode, ["output", outputName], outputDef);
+                if (output !== undefined) {
+                    valid = false;
+                    const Toast = swal.mixin({
+                        toast: true,
+                        position: 'bottom-end',
+                        showConfirmButton: false,
+                        timer: 5000,
+                        timerProgressBar: true,
+                        html: "",
+                        onOpen: (toast) => {
+                            toast.addEventListener('mouseenter', swal.stopTimer)
+                            toast.addEventListener('mouseleave', swal.resumeTimer)
+                        }
+                    })
+                    Toast.fire({
+                        icon: 'error',
+                        title: '<span class="text-danger">Invalid paste : output ' + outputName + ' already exists here</span>'
+                    })
                 }
             });
 
             // paste modules
             _.each(json.modules, (moduleDef, moduleName) => {
                 var node = _.get(currentMetanode, ["modules", moduleName]);
-                if (node === undefined) {
-                    _.set(currentMetanode, ["modules", moduleName], moduleDef);
+                if (node !== undefined) {
+                    valid = false;
+                    const Toast = swal.mixin({
+                        toast: true,
+                        position: 'bottom-end',
+                        showConfirmButton: false,
+                        timer: 5000,
+                        timerProgressBar: true,
+                        html: "",
+                        onOpen: (toast) => {
+                            toast.addEventListener('mouseenter', swal.stopTimer)
+                            toast.addEventListener('mouseleave', swal.resumeTimer)
+                        }
+                    })
+                    Toast.fire({
+                        icon: 'error',
+                        title: '<span class="text-danger">Invalid paste : compute box ' + moduleName + ' already exists here</span>'
+                    })
                 }
             });
 
             // paste uis
             _.each(json.ui, (uiDef, uiName) => {
                 var ui = _.get(currentMetanode, ["ui", uiName]);
-                if (ui === undefined) {
-                    _.set(currentMetanode, ["ui", uiName], uiDef);
+                if (ui !== undefined) {
+                    valid = false;
+                    const Toast = swal.mixin({
+                        toast: true,
+                        position: 'bottom-end',
+                        showConfirmButton: false,
+                        timer: 5000,
+                        timerProgressBar: true,
+                        html: "",
+                        onOpen: (toast) => {
+                            toast.addEventListener('mouseenter', swal.stopTimer)
+                            toast.addEventListener('mouseleave', swal.resumeTimer)
+                        }
+                    })
+                    Toast.fire({
+                        icon: 'error',
+                        title: '<span class="text-danger">Invalid paste : ui ' + uiName + ' already exists here</span>'
+                    })
                 }
             });
-        });
+
+            return valid;
+        }
+
+        let validPaste = checkValidPaste();
+        if (validPaste) {
+            this.batch(() => {
+                // paste metanodes
+                _.each(json.metamodules, (mmDef, mmName) => {
+                    var metamodule = _.get(currentMetanode, ["metanodes", mmName]);
+                    if (metamodule === undefined) {
+                        _.set(currentMetanode, ["metanodes", mmName], mmDef);
+                    } else {
+
+                    }
+                });
+
+                // paste inputs
+                _.each(json.input, (inputDef, inputName) => {
+                    var input = _.get(currentMetanode, ["input", inputName]);
+                    if (input === undefined) {
+                        _.set(currentMetanode, ["input", inputName], inputDef);
+                    }
+                });
+
+                // paste outputs
+                _.each(json.output, (outputDef, outputName) => {
+                    var output = _.get(currentMetanode, ["output", outputName]);
+                    if (output === undefined) {
+                        _.set(currentMetanode, ["output", outputName], outputDef);
+                    }
+                });
+
+                // paste modules
+                _.each(json.modules, (moduleDef, moduleName) => {
+                    var node = _.get(currentMetanode, ["modules", moduleName]);
+                    if (node === undefined) {
+                        _.set(currentMetanode, ["modules", moduleName], moduleDef);
+                    }
+                });
+
+                // paste uis
+                _.each(json.ui, (uiDef, uiName) => {
+                    var ui = _.get(currentMetanode, ["ui", uiName]);
+                    if (ui === undefined) {
+                        _.set(currentMetanode, ["ui", uiName], uiDef);
+                    }
+                });
+            });
+        }
+
+        return validPaste;
     }
 
     /**
@@ -409,14 +538,16 @@ class GraphModel {
 
     // add pkg dependencies (lib, types, etc) to app graph
     async addDependencies(pkg) {
-        for (const dependencyName of Object.keys(pkg.dependencies)) {
-            if (utils.isLibrary(dependencyName) || utils.isType(dependencyName)) {
-                console.log('[*] Adding dependency: ' + dependencyName);
-                // await this.e.loadPackage(dependencyName, dependencyVersion); // Is this better ?
-                await this.e.loadPackage(dependencyName); // or should we just load the last version ?
-                let pkg = this.e.packages[dependencyName]
-                this.data.root.libs[pkg.name] = pkg.version;
-                await this.addDependencies(pkg);
+        if (pkg.dependencies) {
+            for (const dependencyName of Object.keys(pkg.dependencies)) {
+                if (utils.isLibrary(dependencyName) || utils.isType(dependencyName)) {
+                    console.log('[*] Adding dependency: ' + dependencyName);
+                    // await this.e.loadPackage(dependencyName, dependencyVersion); // Is this better ?
+                    await this.e.loadPackage(dependencyName); // or should we just load the last version ?
+                    let pkg = this.e.packages[dependencyName]
+                    this.data.root.libs[pkg.name] = pkg.version;
+                    await this.addDependencies(pkg);
+                }
             }
         }
     }

package/js/src/v/templates/editType.vue

@@ -33,7 +33,7 @@
         <span class="d-inline-block"><span class="type-display">{{typePrefix}}</span></span>
         <select class="selectpicker d-inline-block">
             <option disabled value='default' :selected="!selectedType || selectedType=='*'" >Select a type</option>
-            <option v-for="typeName in getMatchingTypes()" :value="typeName" :selected="typeName == selectedType">{{typeName}}</option>
+            <option v-for="typeName in getMatchingTypes()" :key="typeName" :value="typeName" :selected="typeName == selectedType">{{typeName}}</option>
         </select>
         <span class="d-inline-block type-display">{{typeSuffix}}</span>
         <button v-if="displayOKButton!==false" class="btn btn-success d-inline-block" @click="emitType">Ok</button>

package/js/src/v/templates/main.vue

@@ -541,7 +541,7 @@ button.close {
                                         <button class="btn btn-success btn-sm btn-add-interface" @click="addInterface"><i class="fas fa-plus"></i></button>
                                         <select class="form-control btn-sm app-interface-select" @change="selectInterface" style="width: 150px; height: 32px;">
                                             <option>Load UI...</option>
-                                            <option v-for="interfaceName in getInterfacesNames()" :value="interfaceName">{{interfaceName}}</option>
+                                            <option v-for="interfaceName in getInterfacesNames()" :key="interfaceName" :value="interfaceName">{{interfaceName}}</option>
                                         </select>
                                         <button class="btn btn-sm btn-light btn-edit-panel-description" @click="editPanelDescription"><i class="fas fa-info" style="padding-left: 8px; padding-right: 8px;"></i></button>
                                         <button class="btn btn-danger btn-sm btn-remove-interface" @click="removeInterface"><i class="fas fa-minus"></i></button>
@@ -1129,13 +1129,14 @@ export default {
                             };
 
                             // add the value to our select, and load it
-                            $(self.$el)
-                                .find(".app-interface-select")
-                                .append(
-                                    $("<option/>", {
-                                        value: name
-                                    }).append(name)
-                                );
+                            // $(self.$el)
+                            //     .find(".app-interface-select")
+                            //     .append(
+                            //         $("<option/>", {
+                            //             value: name
+                            //         }).append(name)
+                            //     );
+                            self.$forceUpdate();
                             $(document).ready(() => {
                                 $(self.$el)
                                     .find(".app-interface-select")
@@ -1174,17 +1175,10 @@ export default {
             }).then(result => {
                 if (result.value) {
                     // set the interface back to first value
-                    $(this.$el)
-                        .find(
-                            ".app-interface-select option[value='" + name + "']"
-                        )
-                        .remove();
-                    $(this.$el)
-                        .find(".app-interface-select")
-                        .change();
                     delete self.view.m.data.root.interface[name];
                     self.htmlCode.setValue("");
                     self.view.m.save();
+                    self.view.m.repaint();
                     self.view.runApp(self.getOptions());
                 }
             });

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@dualbox/editor",
-    "version": "1.0.93",
+    "version": "1.0.94",
     "description": "Editor of Dualbox apps",
     "browser": "js/dist/GraphEditor.js",
     "main": "js/dist/GraphEditor.js",