Add close form button on deep relations form

components/Toolbox.vue

@@ -615,7 +615,7 @@
     padding: 13px;
     color: currentColor !important;
     font-size: 1.1em;
-    margin: 0px;
+    margin: 0;
   }
   .panel-title {
     font-weight: bold;
@@ -655,7 +655,6 @@
     margin-bottom: 5px;
     font-size: 1.1em;
     color: #000;
-    margin-top: 5px;
   }
   .snap-tool {
     display: flex;
@@ -671,6 +670,9 @@
   .tools-of-tool-snap label span {
     color: #222d32 !important;
   }
+  .panel-body {
+    padding: 15px;
+  }
   .panel-body.disabled {
     opacity: .7;
   }

g3wsdk/workflow/step.js

@@ -31,7 +31,9 @@ export class Step extends G3WObject {
 
     this._options = options;
 
+    //store promise of current running step when call run
     this._run  = (options.run  || this.run  || (async () => true)).bind(this);
+    //store promise of current running step when call stop
     this._stop = (options.stop || this.stop || (async () => true)).bind(this);
 
     /**
@@ -102,7 +104,7 @@ export class Step extends G3WObject {
      * @since [email protected]
      */
     if (options.onStop) {
-      this.on('run', options.onStop);
+      this.on('stop', options.onStop);
     }
 
     /**
@@ -389,7 +391,7 @@ export class Step extends G3WObject {
    */
   registerEscKeyEvent(callback) {
     if (callback) {
-      this.on('run', ()  => this.bindEscKeyUp(callback));
+      this.on('run',  () => this.bindEscKeyUp(callback));
       this.on('stop', () => this.unbindEscKeyUp());
     }
   }
@@ -410,10 +412,12 @@ export class Step extends G3WObject {
    */ 
   __run(inputs, context) {
     return $promisify(async() => {
+      //set step inputs
       this.setInputs(inputs);
+      //set step context
       this.setContext(context);
 
-      const step = this;
+      const step         = this;
       const toolsOfTools = {
 
         snap: {
@@ -471,7 +475,7 @@ export class Step extends G3WObject {
       try {
         this.state.running = true;                // change state to running
         return await promisify(this._run(inputs, context));
-      } catch (e) {
+      } catch(e) {
         console.warn(e);
         this.state.error = e;
         return Promise.reject(e);
@@ -489,8 +493,8 @@ export class Step extends G3WObject {
    *
    * @fires stop
    */
-  __stop() {
-    this._stop(this._inputs, this._context);   // stop task
+  async __stop() {
+    await this._stop(this._inputs, this._context);   // stop task
     this.state.running = false;                // remove running state
     if (this._workflow) {
       this._workflow._toolsoftool.forEach(t => t.options.stop());

g3wsdk/workflow/workflow.js

@@ -187,16 +187,6 @@ export class Workflow extends G3WObject {
     }
   }
 
-  /**
-   * @FIXME add description
-   */
-  removeChild() {
-    if (this._child) {
-      Workflow.Stack.removeAt(this._child.getStackIndex());
-    }
-    this._child = null;
-  }
-
   /**
    * @param input.key
    * @param input.value
@@ -298,7 +288,7 @@ export class Workflow extends G3WObject {
   /**
    * @FIXME add description
    */
-  reject () {
+  reject() {
     if (this._promise) {
       this._promise.reject();
     }
@@ -314,19 +304,28 @@ export class Workflow extends G3WObject {
     }
   }
 
+  /**
+   * Method to run steps of workflow
+   * @param step
+   * @param inputs
+   * @return {Promise<unknown>}
+   */
   async runStep(step, inputs) {
     try {
+      //set step message
       this.setMessages({ help: step.state.help });
+      //run step
       const outputs = await promisify(step.__run(inputs, this.getContext()));
       // onDone → check if all step is resolved
       this._stepIndex++;
+      //check if is the last of workflow steps
       if (this._stepIndex === this.getSteps().length) {
         this._stepIndex = 0;
         return outputs;
       } else {
         return this.runStep(this.getSteps()[this._stepIndex], outputs);
       }
-    } catch (e) {
+    } catch(e) { //In case of reject
       this._stepIndex = 0;
       return Promise.reject(e);
     }
@@ -358,13 +357,15 @@ export class Workflow extends G3WObject {
       ) {
         Workflow.Stack.getCurrent().addChild(this)
       }
-
+
+      //get stack index
       this._stackIndex = Workflow.Stack.push(this);
+      //get steps
       this._steps      = options.steps || this._steps;
-
+      //for each step assign current workflow to _workflow
       (this._steps || []).forEach(s => s._workflow = this);
 
-      const showUserMessage = Object.keys(this._userMessageSteps).length;
+      const showUserMessage = Object.keys(this._userMessageSteps).length > 0;
 
       if (showUserMessage) {
         GUI.showUserMessage({
@@ -383,26 +384,28 @@ export class Workflow extends G3WObject {
           }
         });
       }
-      //emit start
+      //emit start Workflow
       this.emit('start');
 
       try {
         console.assert(0 === this._stepIndex, `reset workflow before restarting: ${this._stepIndex}`)
         //start flow of workflow
         const outputs = await this.runStep(this.getSteps()[this._stepIndex], this.getInputs());
+        //In case of show user message (tool steps)
         if (showUserMessage) {
           setTimeout(() => { this.clearUserMessagesSteps(); resolve(outputs); }, 500);
         } else {
           resolve(outputs);
         }
-      } catch (e) {
+      } catch(e) {
         console.warn(e);
         if (showUserMessage) {
           this.clearUserMessagesSteps();
         }
         reject(e);
       }
 
+      //in case of worflow that need to run once time, stop workflow
       if (this.runOnce) {
         this.stop();
       }
@@ -414,31 +417,32 @@ export class Workflow extends G3WObject {
    * 
    * @fires stop
    */
-  stop() {
+  async stop() {
     return $promisify(new Promise(async (resolve, reject) => {
+
       this._promise = null;
 
       try {
         // stop child workflow
         if (this._child) {
-          await promisify(this._child.stop());  
+          await promisify(this._child.stop());
         }
       } catch(e) {
         console.warn(e);
       }
-
-      // ensure that child is always removed
-      this.removeChild();
-
-      Workflow.Stack.removeAt(this.getStackIndex());
+      //remove child
+      this._child = null;
 
       // stop flow
       try {
-        if (this.getSteps()[this._stepIndex].isRunning()) {
+        //get current step
+        const step = this.getSteps()[this._stepIndex];
+        //check if it is running
+        if (step.isRunning()) {
           //clear messages steps
           this.clearMessages();
-          //stop a current step
-          this.getSteps()[this._stepIndex].__stop();
+          //wait stop run
+          await step.__stop();
         }
         // reset counter and reject flow
         if (this._stepIndex > 0) {
@@ -448,11 +452,15 @@ export class Workflow extends G3WObject {
         } else {
           resolve();
         }
-      } catch (e) {
+      } catch(e) {
         console.warn(e);
         reject(e);
       }
 
+      //remove workflow from stack
+      Workflow.Stack.removeAt(this.getStackIndex());
+
+      //emit stop Workflow
       this.emit('stop');
 
     }));
@@ -634,5 +642,5 @@ Workflow.Stack = {
   removeAt(i)    { workflows.splice(i, 1); },
   insertAt(i, w) { workflows[i] = w; },
   getAt(i)       { return workflows[i]; },
-  clear()        { while (workflows.length) { (workflows.pop()).stop(); } },
+  async clear()  { workflows.splice(0); }
 };

toolboxes/toolbox.js

@@ -25,7 +25,6 @@ import { promisify, $promisify }                        from '../utils/promisify
 import { unlinkRelation }                               from '../utils/unlinkRelation';
 import { splitFeatures }                                from '../utils/splitFeatures';
 import { isSameBaseGeometryType }                       from '../utils/isSameBaseGeometryType';
-import { dissolve }                                     from '../utils/dissolve';
 import { PickFeaturesInteraction }                      from '../interactions/pickfeaturesinteraction';
 
 import {
@@ -59,7 +58,7 @@ const {
 const { ProjectsRegistry }                = g3wsdk.core.project;
 const { DataRouterService }               = g3wsdk.core.data;
 const { CatalogLayersStoresRegistry }     = g3wsdk.core.catalog;
-const { Geometry }                        = g3wsdk.core.geoutils;
+const { Geometry, dissolve }              = g3wsdk.core.geoutils;
 const { removeZValueToOLFeatureGeometry } = g3wsdk.core.geoutils.Geometry;
 const { tPlugin }                         = g3wsdk.core.i18n;
 const { Layer }                           = g3wsdk.core.layer;
@@ -544,7 +543,7 @@ export class ToolBox extends G3WObject {
                     context: {
                       session:        Workflow.Stack.getCurrent().getSession(),        // get parent workflow
                       excludeFields:  fields.ownField,                                 // array of fields to be excluded
-                      isContentChild: false, //@since 3.9.0 force child to flase
+                      isContentChild: false, //@since 3.9.0 force child to false
                     },
                     inputs: {
                       features: rLayer.readFeatures(),