iframe-coordinator-cli 5.0.0-beta.2 → 5.0.0-beta.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iframe-coordinator-cli",
-  "version": "5.0.0-beta.2",
+  "version": "5.0.0-beta.4",
   "description": "CLI for local iframe-coordinator development",
   "dependencies": {
     "cheerio": "^1.0.0-rc.10",

package/src/example-ifc.config.js

@@ -1,6 +1,6 @@
 module.exports = function(frameRouter) {
-  frameRouter.setupFrames(
-    {
+  frameRouter.clientConfig = {
+    clients: {
       app1: {
         url: 'http://localhost:8080/client-app-1/#/',
         assignedRoute: '/app1'
@@ -9,10 +9,11 @@ module.exports = function(frameRouter) {
         url: 'http://localhost:8080/client-app-2/#/',
         assignedRoute: '/app2',
         sandbox: 'allow-presentation', // optional
-        allow: 'microphone http://localhost:8080;' // optional 
+        allow: 'microphone http://localhost:8080;', // optional 
+        defaultTitle: 'iframe Application 2 Example' // optional, but needed for accessibility
       }
     },
-    {
+    envData: {
       locale: 'en-US',
       hostRootUrl: window.location.origin,
       registeredKeys: [
@@ -22,7 +23,7 @@ module.exports = function(frameRouter) {
       ],
       custom: getCustomClientData()
     }
-  );
+  };
 
   return {
     // These are the topics that the host app should display payloads for when

package/src/views/IframeEmbed.vue

@@ -14,18 +14,24 @@
         <nav>
           <ul>
             <li v-for="(client, id) in clientConfig" v-bind:key="id">
-              <a v-bind:href="'#' + client.assignedRoute">{{id}} @ {{client.assignedRoute}}</a>
+              <a v-bind:href="'#' + client.assignedRoute"
+                >{{ id }} @ {{ client.assignedRoute }}</a
+              >
             </li>
           </ul>
         </nav>
       </div>
       <div v-else>
-        <p>I couldn't find any registered client applications. Please check your ifc-cli configuration file.</p>
+        <p>
+          I couldn't find any registered client applications. Please check your
+          ifc-cli configuration file.
+        </p>
       </div>
     </div>
     <frame-router
       id="frameRouter"
       v-bind:route="frameRoute"
+      frame-id="ifc-cli-frame"
       v-on:notifyRequest="displayToast"
       v-on:registeredKeyFired="handleKeyEvent"
       v-on:navRequest="handleNav"
@@ -61,7 +67,14 @@ export default {
     handleNav(event) {
       // TODO: detect and handle external URLs properly
       const requestedUrl = new URL(event.detail.url);
-      window.location.hash = requestedUrl.hash;
+
+      if (location.hash === requestedUrl.hash) {
+        // The requested navigation is for the current location, do nothing
+      } else if (event.detail.history === 'replace') {
+        window.location.replace(requestedUrl.hash);
+      } else {
+        window.location.hash = requestedUrl.hash;
+      }
     },
     handleKeyEvent(event) {
       this.$notify({
@@ -91,12 +104,12 @@ export default {
     // Call the custom config set up on the CLI.
     const oldSetupFrames = frameRouter.setupFrames;
     frameRouter.setupFrames = (...args) => {
-      this.clientConfig = args[0];
       oldSetupFrames.apply(frameRouter, args);
     };
 
     if (window.routerSetup && typeof window.routerSetup === 'function') {
       const clientConfig = window.routerSetup(frameRouter);
+      this.clientConfig = frameRouter.clientConfig.clients;
       if (clientConfig.publishTopics) {
         clientConfig.publishTopics.forEach(topic => {
           frameRouter.messaging.addListener(topic, publication => {