general subApp.inline method (#1527)

electrode-io · Feb 10, 2020 · 963a9f4 · 963a9f4
1 parent ecc47d3
commit 963a9f4
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 15 deletions.
diff --git a/packages/subapp-web/src/index.js b/packages/subapp-web/src/index.js
@@ -109,6 +109,34 @@ export function loadSubApp(info, renderStart, options) {
     }
   };
 
+  subApp.inline = ({ group, props }) => {
+    const groupInfo = xarc.rt.groups[group];
+    const fail = msg => {
+      console.error(msg);
+      return `<!--
+****** ${msg}
+-->`;
+    };
+
+    if (!groupInfo) {
+      return fail(`subApp inline unable to find group ${group}`);
+    }
+
+    const found = groupInfo.queue.find(x => {
+      if (x.options.name === subApp.info.name && x.options.group === group && x.options.inline) {
+        return x.instance;
+      }
+      return undefined;
+    });
+
+    if (!found) {
+      return fail(`subApp inline unable to find instance in group ${group} \
+for subapp ${subApp.info.name}`);
+    }
+
+    return subApp.start(found.instance, Object.assign({}, found.options, { props }), found.info);
+  };
+
   // xarc.addOnLoadStart(name, options);
 
   // getOnLoadStart(name)

diff --git a/packages/subapp-web/src/subapp-web.js b/packages/subapp-web/src/subapp-web.js
@@ -153,21 +153,6 @@
         })
         .then(makeInvoke("preRender"))
         .then(makeInvoke("signalReady"))
-        .then(() => {
-          return xv1.asyncMap(
-            groupInfo.queue.filter(x => x.options.inline),
-            startInfo => {
-              const subApp = startInfo.subApp;
-              subApp.inline = ({ group, props }) => {
-                return subApp.start(
-                  startInfo.instance,
-                  Object.assign({}, startInfo.options, { props }),
-                  subApp.info
-                );
-              };
-            }
-          );
-        })
         .then(
           makeInvoke(
             "start",