goblin-desktop 2.0.9 → 2.0.13

package/builders/wizard.js

@@ -39,14 +39,9 @@ module.exports = (config) => {
     hinters,
   } = config;
   const goblinName = `${name}-wizard`;
-  if (gadgets) {
-    for (const [alias, def] of Object.entries(gadgets)) {
-      Goblin.registerAliasNamespace(alias, `${def.type}-gadget`);
-    }
-  }
   const wizardSteps = Object.keys(steps);
   const wizardFlow = ['init'].concat(wizardSteps);
-
+  const hinterIdsByName = {};
   // Define logic handlers according rc.json
   const logicHandlers = {
     'create': (state, action) => {
@@ -132,35 +127,7 @@ module.exports = (config) => {
       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 common.createGadgets(quest, goblinName, gadgets, wizardGadgets);
       }
       if (hinters) {
         yield quest.me.createHinters();
@@ -209,10 +176,12 @@ module.exports = (config) => {
           detailWidget = `${hName}-workitem`;
         }
         if (quest.hasAPI(`${hName}-hinter`)) {
+          const id = `${hName}-hinter@${h}@${quest.goblin.id}`;
+          hinterIdsByName[h] = id;
           quest.create(
             `${hName}-hinter`,
             {
-              id: `${h}-hinter@${quest.goblin.id}`,
+              id,
               desktopId,
               hinterName: h,
               workitemId: quest.goblin.id,
@@ -254,11 +223,10 @@ module.exports = (config) => {
 
       if (gadgets[key].onActions) {
         for (const handler of Object.keys(gadgets[key].onActions)) {
-          logicHandlers[`${key}-${handler}`] = gadgets[key].onActions[handler];
+          const questName = common.jsifyQuestName(`${key}-${handler}`);
+          logicHandlers[questName] = gadgets[key].onActions[handler];
 
-          Goblin.registerSafeQuest(goblinName, `${key}-${handler}`, function* (
-            quest
-          ) {
+          Goblin.registerSafeQuest(goblinName, questName, function* (quest) {
             quest.do();
             yield quest.me.update();
           });
@@ -430,9 +398,8 @@ module.exports = (config) => {
     type,
     withDetail = true
   ) {
-    const hinterAPI = quest
-      .getAPI(`${type}-hinter@${quest.goblin.id}`)
-      .noThrow();
+    const hinterId = hinterIdsByName[type];
+    const hinterAPI = quest.getAPI(hinterId).noThrow();
     yield hinterAPI.show();
     if (withDetail) {
       yield hinterAPI.showDetail();
@@ -451,8 +418,8 @@ module.exports = (config) => {
     type,
     entityId
   ) {
+    const hinterId = hinterIdsByName[type];
     const deskAPI = quest.getAPI(quest.getDesktop()).noThrow();
-    const hinterId = `${type}-hinter@${quest.goblin.id}`;
     yield deskAPI.setDetail({
       hinterId,
     });

package/package.json

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

package/widgets/search/widget.js

@@ -41,14 +41,13 @@ class HinterNewButton extends Widget {
   onNew() {
     const model = this.getRouting().get('location.hash').substring(1);
     const value = this.getModelValue(model, true);
-    this.doAs('hinter', 'create-new', {
+    this.doFor(this.props.id, 'create-new', {
       value,
     });
   }
 
   render() {
     const {id, onNew, title, type} = this.props;
-
     if (!id) {
       return null;
     }
@@ -182,7 +181,6 @@ class Search extends Widget {
 
   renderParams() {
     const listId = `list@${this.props.id}`;
-
     return (
       <div className={this.styles.classNames.params}>
         <div className={this.styles.classNames.pane}>
@@ -222,7 +220,7 @@ class Search extends Widget {
         <div className={this.styles.classNames.sajex} />
 
         <Container kind="actions">
-          <NewEntityButton id={this.props.hinterId} />
+          <NewEntityButton id={`hinter@${this.props.type}@${this.props.id}`} />
         </Container>
       </div>
     );