goblin-desktop 2.0.0 → 2.0.7

package/builders/wizard.js

@@ -30,6 +30,7 @@ module.exports = (config) => {
   const {
     name,
     title,
+    skills,
     dialog,
     steps,
     gadgets,
@@ -120,81 +121,81 @@ module.exports = (config) => {
     },
   };
 
-  Goblin.registerQuest(goblinName, 'create', function* (
-    quest,
-    desktopId,
-    form,
-    isDialog
-  ) {
-    const id = quest.goblin.id;
-    quest.goblin.setX('desktopId', desktopId);
-    quest.goblin.setX('isDialog', isDialog);
-    quest.goblin.setX('isDisposing', false);
-    const wizardGadgets = {};
-
-    if (gadgets) {
-      for (const key of Object.keys(gadgets)) {
-        const gadget = gadgets[key];
-        // const newGadgetId = `${gadget.type}@${quest.goblin.id}`;
-        const newGadgetId = `${key}@${quest.goblin.id}`; // Uses 'key' instead of 'gadget.type' to allow the same gadget to be used in a wizard more than once.
-        wizardGadgets[key] = {id: newGadgetId, type: gadget.type};
-
-        if (gadgets[key].onActions) {
-          for (const handler of Object.keys(gadgets[key].onActions)) {
-            quest.goblin.defer(
-              quest.sub(`*::${newGadgetId}.${handler}`, function* (
-                err,
-                {msg, resp}
-              ) {
-                const cmdName = `${key}-${handler}`;
-                yield resp.cmd(
-                  `${goblinName}.${cmdName}`,
-                  Object.assign({id}, msg.data)
-                );
-              })
-            );
+  Goblin.registerQuest(
+    goblinName,
+    'create',
+    function* (quest, desktopId, form, isDialog) {
+      const id = quest.goblin.id;
+      quest.goblin.setX('desktopId', desktopId);
+      quest.goblin.setX('isDialog', isDialog);
+      quest.goblin.setX('isDisposing', false);
+      const wizardGadgets = {};
+
+      if (gadgets) {
+        for (const key of Object.keys(gadgets)) {
+          const gadget = gadgets[key];
+          // const newGadgetId = `${gadget.type}@${quest.goblin.id}`;
+          const newGadgetId = `${key}@${quest.goblin.id}`; // Uses 'key' instead of 'gadget.type' to allow the same gadget to be used in a wizard more than once.
+          wizardGadgets[key] = {id: newGadgetId, type: gadget.type};
+
+          if (gadgets[key].onActions) {
+            for (const handler of Object.keys(gadgets[key].onActions)) {
+              quest.goblin.defer(
+                quest.sub(`*::${newGadgetId}.${handler}`, function* (
+                  err,
+                  {msg, resp}
+                ) {
+                  const cmdName = `${key}-${handler}`;
+                  yield resp.cmd(
+                    `${goblinName}.${cmdName}`,
+                    Object.assign({id}, msg.data)
+                  );
+                })
+              );
+            }
           }
-        }
 
-        yield quest.create(`${gadget.type}-gadget`, {
-          id: newGadgetId,
-          desktopId,
-          options: gadget.options || null,
-        });
+          yield quest.create(`${gadget.type}-gadget`, {
+            id: newGadgetId,
+            desktopId,
+            options: gadget.options || null,
+          });
+        }
+      }
+      if (hinters) {
+        yield quest.me.createHinters();
       }
-    }
-    if (hinters) {
-      yield quest.me.createHinters();
-    }
-
-    let running = 0;
 
-    quest.goblin.defer(
-      quest.sub.local(`*::${quest.goblin.id}.<wizard-tick>`, function* (
-        err,
-        {msg, resp}
-      ) {
-        const {calledFrom} = msg.data;
-        const isInternal = calledFrom.split('.')[0] === quest.goblin.id;
-        if (running > 0 && !isInternal) {
-          return; /* Drop this tick because a step is already running */
-        }
+      let running = 0;
+
+      quest.goblin.defer(
+        quest.sub.local(`*::${quest.goblin.id}.<wizard-tick>`, function* (
+          err,
+          {msg, resp}
+        ) {
+          const {calledFrom} = msg.data;
+          const isInternal = calledFrom.split('.')[0] === quest.goblin.id;
+          if (running > 0 && !isInternal) {
+            return; /* Drop this tick because a step is already running */
+          }
 
-        try {
-          ++running;
-          const step = quest.goblin.getState().get('step');
-          yield resp.cmd(`${goblinName}.${step}`, {id});
-        } finally {
-          --running;
-        }
-      })
-    );
+          try {
+            ++running;
+            const step = quest.goblin.getState().get('step');
+            yield resp.cmd(`${goblinName}.${step}`, {id});
+          } finally {
+            --running;
+          }
+        })
+      );
 
-    quest.do({id: quest.goblin.id, initialFormState, form, wizardGadgets});
-    yield quest.me.initWizard();
-    yield quest.me.idle();
-    return quest.goblin.id;
-  });
+      quest.do({id: quest.goblin.id, initialFormState, form, wizardGadgets});
+      yield quest.me.initWizard();
+      yield quest.me.idle();
+      return quest.goblin.id;
+    },
+    {skills: skills ?? []}
+  );
 
   Goblin.registerQuest(goblinName, 'create-hinters', function* (quest, next) {
     const desktopId = quest.goblin.getX('desktopId');
@@ -228,18 +229,18 @@ module.exports = (config) => {
 
   common.registerHinters(goblinName, hinters);
 
-  Goblin.registerQuest(goblinName, 'busy', function (quest) {
+  Goblin.registerSafeQuest(goblinName, 'busy', function (quest) {
     quest.do();
   });
 
-  Goblin.registerQuest(goblinName, 'idle', function (quest) {
+  Goblin.registerSafeQuest(goblinName, 'idle', function (quest) {
     quest.do();
   });
 
   if (gadgets) {
     for (const key of Object.keys(gadgets)) {
       //Gogo gadgeto stylo!
-      Goblin.registerQuest(goblinName, `use-${key}`, function* (
+      Goblin.registerSafeQuest(goblinName, `use-${key}`, function* (
         quest,
         action,
         payload
@@ -255,7 +256,7 @@ module.exports = (config) => {
         for (const handler of Object.keys(gadgets[key].onActions)) {
           logicHandlers[`${key}-${handler}`] = gadgets[key].onActions[handler];
 
-          Goblin.registerQuest(goblinName, `${key}-${handler}`, function* (
+          Goblin.registerSafeQuest(goblinName, `${key}-${handler}`, function* (
             quest
           ) {
             quest.do();
@@ -268,32 +269,32 @@ module.exports = (config) => {
 
   if (quests) {
     Object.keys(quests).forEach((q) => {
-      Goblin.registerQuest(goblinName, q, quests[q]);
+      Goblin.registerSafeQuest(goblinName, q, quests[q]);
     });
   }
 
-  Goblin.registerQuest(goblinName, 'init-wizard', function (quest) {
+  Goblin.registerSafeQuest(goblinName, 'init-wizard', function (quest) {
     quest.do();
     quest.evt('<wizard-tick>', {calledFrom: quest.calledFrom});
   });
 
-  Goblin.registerQuest(goblinName, 'next', function (quest, result) {
+  Goblin.registerSafeQuest(goblinName, 'next', function (quest, result) {
     quest.do();
     quest.evt('<wizard-tick>', {calledFrom: quest.calledFrom});
     return result;
   });
 
-  Goblin.registerQuest(goblinName, 'back', function (quest) {
+  Goblin.registerSafeQuest(goblinName, 'back', function (quest) {
     quest.do();
     quest.evt('<wizard-tick>', {calledFrom: quest.calledFrom});
   });
 
-  Goblin.registerQuest(goblinName, 'goto', function (quest, step) {
+  Goblin.registerSafeQuest(goblinName, 'goto', function (quest, step) {
     quest.do();
     quest.evt('<wizard-tick>', {calledFrom: quest.calledFrom});
   });
 
-  Goblin.registerQuest(goblinName, '_goto', function* (quest) {
+  Goblin.registerSafeQuest(goblinName, '_goto', function* (quest) {
     const state = quest.goblin.getState();
     const form = state.get('form').toJS();
     const nextStep = state.get('nextStep');
@@ -315,7 +316,7 @@ module.exports = (config) => {
     }
   });
 
-  Goblin.registerQuest(goblinName, 'done', function* (quest) {
+  Goblin.registerSafeQuest(goblinName, 'done', function* (quest) {
     let result = quest.goblin.getState().get('result');
     if (Shredder.isImmutable(result)) {
       result = result.toJS();
@@ -328,12 +329,16 @@ module.exports = (config) => {
     yield quest.me.dispose();
   });
 
-  Goblin.registerQuest(goblinName, 'cancel', function (quest) {
+  Goblin.registerSafeQuest(goblinName, 'cancel', function (quest) {
     quest.do();
     quest.evt('<wizard-tick>', {calledFrom: quest.calledFrom});
   });
 
-  Goblin.registerQuest(goblinName, 'change', function* (quest, path, newValue) {
+  Goblin.registerSafeQuest(goblinName, 'change', function* (
+    quest,
+    path,
+    newValue
+  ) {
     if (hinters && hinters[path]) {
       return;
     }
@@ -341,12 +346,12 @@ module.exports = (config) => {
     yield quest.me.update();
   });
 
-  Goblin.registerQuest(goblinName, 'apply', function* (quest) {
+  Goblin.registerSafeQuest(goblinName, 'apply', function* (quest) {
     quest.do();
     yield quest.me.update();
   });
 
-  Goblin.registerQuest(goblinName, 'update', function* (quest) {
+  Goblin.registerSafeQuest(goblinName, 'update', function* (quest) {
     const state = quest.goblin.getState();
     const stepName = state.get('step');
     const step = steps[stepName];
@@ -362,7 +367,7 @@ module.exports = (config) => {
     }
   });
 
-  Goblin.registerQuest(goblinName, 'update-buttons', function* (quest) {
+  Goblin.registerSafeQuest(goblinName, 'update-buttons', function* (quest) {
     const state = quest.goblin.getState();
     const stepName = state.get('step');
     const step = steps[stepName];
@@ -392,31 +397,35 @@ module.exports = (config) => {
     };
 
     if (step.quest) {
-      Goblin.registerQuest(goblinName, stepName, step.quest);
+      Goblin.registerSafeQuest(goblinName, stepName, step.quest);
     }
 
     if (step.buttons) {
-      Goblin.registerQuest(goblinName, `${stepName}-buttons`, step.buttons);
+      Goblin.registerSafeQuest(goblinName, `${stepName}-buttons`, step.buttons);
     }
 
     if (step.onChange) {
-      Goblin.registerQuest(goblinName, `${stepName}-on-change`, step.onChange);
+      Goblin.registerSafeQuest(
+        goblinName,
+        `${stepName}-on-change`,
+        step.onChange
+      );
     }
 
     for (const action in step.actions) {
       const actionQuest = `${stepName}-${action}`;
       logicHandlers[actionQuest] = step.actions[action];
-      Goblin.registerQuest(goblinName, actionQuest, function (quest) {
+      Goblin.registerSafeQuest(goblinName, actionQuest, function (quest) {
         quest.do();
       });
     }
   }
 
-  Goblin.registerQuest(goblinName, 'get-entity', common.getEntityQuest);
-  Goblin.registerQuest(goblinName, 'load-entity', common.loadEntityQuest);
-  Goblin.registerQuest(goblinName, 'open-wizard', common.openWizard);
+  Goblin.registerSafeQuest(goblinName, 'get-entity', common.getEntityQuest);
+  Goblin.registerSafeQuest(goblinName, 'load-entity', common.loadEntityQuest);
+  Goblin.registerSafeQuest(goblinName, 'open-wizard', common.openWizard);
 
-  Goblin.registerQuest(goblinName, 'showHinter', function* (
+  Goblin.registerSafeQuest(goblinName, 'showHinter', function* (
     quest,
     type,
     withDetail = true
@@ -430,14 +439,14 @@ module.exports = (config) => {
     }
   });
 
-  Goblin.registerQuest(goblinName, 'hideHinter', function* (quest, type) {
+  Goblin.registerSafeQuest(goblinName, 'hideHinter', function* (quest, type) {
     const hinterAPI = quest
       .getAPI(`${type}-hinter@${quest.goblin.id}`)
       .noThrow();
     yield hinterAPI.hide();
   });
 
-  Goblin.registerQuest(goblinName, 'setDetail', function* (
+  Goblin.registerSafeQuest(goblinName, 'setDetail', function* (
     quest,
     type,
     entityId
@@ -467,7 +476,7 @@ module.exports = (config) => {
     });
   }
 
-  Goblin.registerQuest(goblinName, 'dispose', disposeQuest);
+  Goblin.registerSafeQuest(goblinName, 'dispose', disposeQuest);
 
   Goblin.registerQuest(goblinName, 'delete', function (quest) {
     quest.evt('done', {finished: true});

package/lib/service.js

@@ -89,7 +89,10 @@ Goblin.registerQuest(goblinName, 'open', function* (
   if (serverTick === 0) {
     quest.dispatch('tick');
     const serverTickInterval = setInterval(
-      () => busClient.command.send('desktop-manager.tick'),
+      () =>
+        busClient.command.send('desktop-manager.tick', null, null, null, {
+          forceNested: true,
+        }),
       60000
     );
     quest.goblin.defer(() => clearInterval(serverTickInterval));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "goblin-desktop",
-  "version": "2.0.0",
+  "version": "2.0.7",
   "description": "Goblin Desktop",
   "main": "./builders/builders.js",
   "scripts": {

package/widgets/datagrid/widget.js

@@ -11,7 +11,7 @@ import Button from 'goblin-gadgets/widgets/button/widget';
 import List from 'goblin-gadgets/widgets/list/widget';
 import DatagridEntity from './datagrid-entity.js';
 import DatagridHeaders from './datagrid-headers.js';
-import DatagridItem from './datagrid-item.js';
+import DatagridItem from 'goblin-desktop/widgets/datagrid-item/widget';
 
 import importer from 'goblin_importer';
 const uiImporter = importer('ui');
@@ -81,6 +81,7 @@ class Datagrid extends Widget {
   renderListItem(props) {
     return (
       <DatagridItem
+        height={props.height ?? 40}
         renderItem={this.renderDatagridItem}
         onDrillDown={this.drillDown}
         {...props}

package/widgets/datagrid-item/styles.js

@@ -0,0 +1,15 @@
+import {Unit} from 'goblin-theme';
+const px = Unit.toPx;
+
+/******************************************************************************/
+
+export const propNames = ['height'];
+
+export default function styles(theme, props) {
+  const row = {
+    minHeight: px(props.height),
+    maxHeight: px(props.height),
+  };
+
+  return {row};
+}

package/widgets/{datagrid/datagrid-item.js → datagrid-item/widget.js}

@@ -4,10 +4,12 @@ import React from 'react';
 import Widget from 'goblin-laboratory/widgets/widget';
 import {FontAwesomeIcon} from '@fortawesome/react-fontawesome';
 import Container from 'goblin-gadgets/widgets/container/widget';
+import * as styles from './styles';
 
 class DatagridItem extends Widget {
   constructor() {
     super(...arguments);
+    this.styles = styles;
 
     this.renewTTL = this.renewTTL.bind(this);
     this.renderItem = this.renderItem.bind(this);
@@ -54,18 +56,8 @@ class DatagridItem extends Widget {
   }
 
   render() {
-    let {height} = this.props;
-
-    if (height < 40) {
-      height = 40;
-    }
-
     return (
-      <Container
-        minHeight={`${height}px`}
-        maxHeight={`${height}px`}
-        kind="content"
-      >
+      <Container className={this.styles.classNames.row} kind="content">
         {this.renderItem()}
       </Container>
     );

package/widgets/desktop/service.js

@@ -642,19 +642,28 @@ Goblin.registerQuest(goblinName, 'download-file', function (
   filePath,
   openFile
 ) {
-  const labId = quest.goblin.getX('labId');
-  const fs = require('fs');
-  const stream = fs.createReadStream;
-  const routingKey = require('xcraft-core-host').getRoutingKey();
-  if (fs.existsSync(filePath)) {
-    let file = stream(filePath);
-    quest.evt(`wm@${labId}.download-file-requested`, {
-      xcraftStream: file,
-      routingKey,
-      fileFilter: getFileFilter(filePath),
-      defaultPath: path.basename(filePath),
-      openFile,
-    });
+  if (quest.user) {
+    const {sessionType, sessionId, windowId} = quest.user.getContext();
+    const clientSessionId = `${sessionType}@${sessionId}`;
+    const clientWindowId = windowId;
+    const fs = require('fs');
+    const stream = fs.createReadStream;
+    const routingKey = require('xcraft-core-host').getRoutingKey();
+    if (fs.existsSync(filePath)) {
+      let file = stream(filePath);
+      quest.evt(
+        `<${clientSessionId}-${clientWindowId}-download-file-requested>`,
+        {
+          xcraftStream: file,
+          routingKey,
+          fileFilter: getFileFilter(filePath),
+          defaultPath: path.basename(filePath),
+          openFile,
+        }
+      );
+    }
+  } else {
+    throw new Error('Cannot identifie user requesting download');
   }
 });
 

package/widgets/entity-alerts/widget.js

@@ -231,19 +231,19 @@ class EntityAlerts extends Widget {
       a.push(T('1 erreur'));
     }
     if (nError > 1) {
-      a.push(T(`${nError} erreurs`, null, {nError}));
+      a.push(T('{nError} erreurs', null, {nError}));
     }
     if (nWarning === 1) {
       a.push(T('1 avertissement'));
     }
     if (nWarning > 1) {
-      a.push(T(`${nWarning} avertissements`, null, {nWarning}));
+      a.push(T('{nWarning} avertissements', null, {nWarning}));
     }
     if (nInfo === 1) {
       a.push(T('1 information'));
     }
     if (nInfo > 1) {
-      a.push(T(`${nInfo} informations`, null, {nInfo}));
+      a.push(T('{nInfo} informations', null, {nInfo}));
     }
     const message = StringBuilder.joinSentences(a);
 

package/widgets/entity-row/styles.js

@@ -74,7 +74,8 @@ export default function styles(theme, props) {
     position: 'relative',
     height: px(busyHeight),
     minHeight: '40px',
-    top: '10px',
+    display: 'flex',
+    alignItems: 'center',
   };
 
   const filteredCellBarre = {

package/widgets/entity-row/widget.js

@@ -4,9 +4,9 @@ import Widget from 'goblin-laboratory/widgets/widget';
 import TableCell from 'goblin-gadgets/widgets/table-cell/widget';
 import Gauge from 'goblin-gadgets/widgets/gauge/widget';
 import Label from 'goblin-gadgets/widgets/label/widget';
+import Spinner from 'goblin-gadgets/widgets/spinner/widget';
 import ColoredContainer from 'goblin-gadgets/widgets/colored-container/widget';
 import EntityRowButton from 'goblin-desktop/widgets/entity-row-button/widget';
-import {FontAwesomeIcon} from '@fortawesome/react-fontawesome';
 import T from 't';
 import ListHelpers from 'goblin-workshop/lib/list-helpers.js';
 import RetroGear from 'goblin-gadgets/widgets/retro-gear/widget';
@@ -59,7 +59,7 @@ class _Driller extends Widget {
         </div>
       );
     } else {
-      return <FontAwesomeIcon icon={[`fas`, 'spinner']} size={'1x'} pulse />;
+      <Spinner size="24px" />;
     }
   }
 
@@ -449,7 +449,7 @@ class EntityRow extends Widget {
     } else {
       return (
         <div className={this.styles.classNames.spinner}>
-          <FontAwesomeIcon icon={[`fas`, 'spinner']} size={'1x'} pulse />
+          <Spinner size="24px" />
         </div>
       );
     }

package/widgets/facet-filter-list-dialog/styles.js

@@ -42,8 +42,8 @@ export default function styles(theme) {
 
   const closeButton = {
     position: 'absolute',
-    top: '0px',
-    right: '0px',
+    top: '10px',
+    right: '10px',
   };
 
   return {

package/widgets/facet-filter-list-dialog/widget.js

@@ -80,50 +80,50 @@ class FacetFilterListDialog extends Widget {
   /******************************************************************************/
 
   renderClose() {
-    return null;
-    //- return (
-    //-   <div className={this.styles.classNames.closeButton}>
-    //-     <Button
-    //-       border="none"
-    //-       glyph="solid/times"
-    //-       glyphSize="120%"
-    //-       height="32px"
-    //-       width="32px"
-    //-       onClick={this.onClose}
-    //-     />
-    //-   </div>
-    //- );
-  }
-
-  renderHeader(keys) {
-    if (this.props.numberOfCheckboxes <= 5) {
-      return null;
-    }
-
     return (
-      <div className={this.styles.classNames.header}>
-        <Label text={T('Filtre')} />
-        <TextFieldNC
-          width="300px"
-          shape={this.filter ? 'left-rounded' : 'rounded'}
-          value={this.filter}
-          changeMode="throttled"
-          throttleDelay={200}
-          onChange={this.filterChange}
-        />
+      <div className={this.styles.classNames.closeButton}>
         <Button
-          kind="combo"
-          shape="right-rounded"
-          leftSpacing="overlap"
-          glyph="solid/eraser"
-          tooltip={T('Tout montrer')}
-          show={!!this.filter}
-          onClick={() => this.filterChange(null)}
+          border="none"
+          glyph="solid/times"
+          glyphSize="120%"
+          tooltip={T('Fermer')}
+          height="32px"
+          width="32px"
+          onClick={this.onClose}
         />
       </div>
     );
   }
 
+  renderHeader(keys) {
+    if (this.props.numberOfCheckboxes <= 5) {
+      return <div className={this.styles.classNames.header}></div>;
+    } else {
+      return (
+        <div className={this.styles.classNames.header}>
+          <Label text={T('Filtre')} />
+          <TextFieldNC
+            width="300px"
+            shape={this.filter ? 'left-rounded' : 'rounded'}
+            value={this.filter}
+            changeMode="throttled"
+            throttleDelay={200}
+            onChange={this.filterChange}
+          />
+          <Button
+            kind="combo"
+            shape="right-rounded"
+            leftSpacing="overlap"
+            glyph="solid/eraser"
+            tooltip={T('Tout montrer')}
+            show={!!this.filter}
+            onClick={() => this.filterChange(null)}
+          />
+        </div>
+      );
+    }
+  }
+
   renderFooter(keys) {
     return (
       <FacetFilterListDialogFooter

package/widgets/facet-filter-range-dialog/styles.js

@@ -59,8 +59,8 @@ export default function styles(theme) {
 
   const closeButton = {
     position: 'absolute',
-    top: '0px',
-    right: '0px',
+    top: '10px',
+    right: '10px',
   };
 
   return {

package/widgets/facet-filter-range-dialog/widget.js

@@ -2,6 +2,7 @@ import React from 'react';
 import Widget from 'goblin-laboratory/widgets/widget';
 import DialogModal from 'goblin-gadgets/widgets/dialog-modal/widget';
 import Label from 'goblin-gadgets/widgets/label/widget';
+import Button from 'goblin-gadgets/widgets/button/widget';
 import TextFieldTypedNC from 'goblin-gadgets/widgets/text-field-typed-nc/widget';
 import Slider from 'goblin-gadgets/widgets/slider/widget';
 import CheckList from 'goblin-gadgets/widgets/check-list/widget';
@@ -124,19 +125,19 @@ class FacetFilterRangeDialog extends Widget {
   /******************************************************************************/
 
   renderClose() {
-    return null;
-    //- return (
-    //-   <div className={this.styles.classNames.closeButton}>
-    //-     <Button
-    //-       border="none"
-    //-       glyph="solid/times"
-    //-       glyphSize="120%"
-    //-       height="32px"
-    //-       width="32px"
-    //-       onClick={this.onClose}
-    //-     />
-    //-   </div>
-    //- );
+    return (
+      <div className={this.styles.classNames.closeButton}>
+        <Button
+          border="none"
+          glyph="solid/times"
+          glyphSize="120%"
+          tooltip={T('Fermer')}
+          height="32px"
+          width="32px"
+          onClick={this.onClose}
+        />
+      </div>
+    );
   }
 
   renderRadios() {

package/widgets/search/widget.js

@@ -9,6 +9,7 @@ import throttle from 'lodash/throttle';
 import Container from 'goblin-gadgets/widgets/container/widget';
 import Label from 'goblin-gadgets/widgets/label/widget';
 import Button from 'goblin-gadgets/widgets/button/widget';
+import CommandButton from 'goblin-gadgets/widgets/command-button/widget';
 import StatusFilters from 'goblin-desktop/widgets/status-filters/widget';
 import C from 'goblin-laboratory/widgets/connect-helpers/c';
 import TextField from 'goblin-gadgets/widgets/text-field/widget';
@@ -46,7 +47,7 @@ class HinterNewButton extends Widget {
   }
 
   render() {
-    const {id, onNew, title} = this.props;
+    const {id, onNew, title, type} = this.props;
 
     if (!id) {
       return null;
@@ -54,7 +55,8 @@ class HinterNewButton extends Widget {
     return (
       <>
         {onNew ? (
-          <Button
+          <CommandButton
+            command={`${type}-workitem.edit`}
             kind="action"
             place="1/1"
             glyph="solid/plus"

package/widgets/tab/widget.js

@@ -25,6 +25,7 @@ class Tab extends Widget {
     this.cmd('desktop.removeWorkitem', {
       id: this.props.desktopId,
       workitemId,
+      close: true,
     });
     SFX.blop.play();
   }

package/widgets/taskbar/widget.js

@@ -5,6 +5,7 @@ import Widget from 'goblin-laboratory/widgets/widget';
 
 import Container from 'goblin-gadgets/widgets/container/widget';
 import Button from 'goblin-gadgets/widgets/button/widget';
+import CommandButton from 'goblin-gadgets/widgets/command-button/widget';
 import Separator from 'goblin-gadgets/widgets/separator/widget';
 import SFX from '../audio/sfx.js';
 
@@ -50,9 +51,11 @@ class Taskbar extends Widget {
   renderButton(context, task, index) {
     if (task.workitem) {
       const runWorkitem = () => this.runWorkitem(task.workitem, task.context);
+      const command = `${task.workitem.name}.create`;
       return (
-        <Button
+        <CommandButton
           key={index}
+          command={command}
           kind="task-bar"
           text={task.text}
           glyph={task.glyph}
@@ -141,12 +144,7 @@ class Taskbar extends Widget {
               }
             }
 
-            let canDo = true;
-            if (task.workitem) {
-              canDo = this.canDo(`${task.workitem.name}.create`);
-            }
-
-            if (isValidScope && canDo) {
+            if (isValidScope) {
               if (task.separator) {
                 return this.renderSeparator(i);
               } else {

package/widgets/workitem/widget.js

@@ -7,6 +7,7 @@ import PropTypes from 'prop-types';
 import Container from 'goblin-gadgets/widgets/container/widget';
 import Label from 'goblin-gadgets/widgets/label/widget';
 import Button from 'goblin-gadgets/widgets/button/widget';
+import CommandButton from 'goblin-gadgets/widgets/command-button/widget';
 import ScrollableContainer from 'goblin-gadgets/widgets/scrollable-container/widget';
 import DialogModal from 'goblin-gadgets/widgets/dialog-modal/widget';
 import CheckList from 'goblin-gadgets/widgets/check-list/widget';
@@ -27,7 +28,7 @@ class Workitem extends Form {
 
     this.doAction = this.doAction.bind(this);
     this.onSubmit = this.onSubmit.bind(this);
-    this.onCancel = this.onCancel.bind(this);
+    this.onRollback = this.onRollback.bind(this);
     this.onClose = this.onClose.bind(this);
     this.onEdit = this.onEdit.bind(this);
     this.onTrash = this.onTrash.bind(this);
@@ -109,6 +110,29 @@ class Workitem extends Form {
     return this.context.contextId;
   }
 
+  getCommand(button) {
+    const getQuest = (id) => {
+      switch (id) {
+        case 'rollback':
+        case 'validate':
+          return `close`;
+        case 'delete':
+          return `trash-entity`;
+        case 'submit':
+        case 'publish':
+        case 'trash':
+        case 'archive':
+          return `${id}-entity`;
+        default:
+          return id;
+      }
+    };
+
+    const service = button.questService ?? this.props.id.split('@', 1)[0];
+    let quest = button.quest ?? getQuest(button.id);
+    return `${service}.${quest}`;
+  }
+
   onSubmit() {
     this.doAs(this.service, 'close', {
       kind: 'validate',
@@ -116,8 +140,11 @@ class Workitem extends Form {
     });
   }
 
-  onCancel() {
-    this.doAs(this.service, 'restore-entity');
+  onRollback() {
+    this.doAs(this.service, 'close', {
+      kind: 'rollback',
+      desktopId: this.desktopId,
+    });
     //TODO-VNEXT: REPAIR ME
     //this.hideHinter();
   }
@@ -230,8 +257,8 @@ class Workitem extends Form {
       case 'edit':
         this.onEdit();
         break;
-      case 'reset':
-        this.onCancel();
+      case 'rollback':
+        this.onRollback();
         break;
       case 'delete':
         this.onDelete();
@@ -256,6 +283,7 @@ class Workitem extends Form {
   }
 
   renderActionListButton(button, hasStature, index) {
+    const command = this.getCommand(button);
     return (
       <div
         key={index}
@@ -265,7 +293,8 @@ class Workitem extends Form {
             : this.styles.classNames.actionList
         }
       >
-        <Button
+        <CommandButton
+          command={command}
           kind="secondary-action"
           grow="1"
           place="1/1"
@@ -370,9 +399,11 @@ class Workitem extends Form {
 
   renderActionButton(button, layout, index, count) {
     const secondary = layout === 'secondary';
-
+    const command = this.getCommand(button);
+    console.log('renderActionButton', command);
     return (
-      <Button
+      <CommandButton
+        command={command}
         key={index}
         kind={secondary ? 'secondary-action' : 'action'}
         width={secondary ? null : '0px'}