more subscriptions UI

b1conrad · b1conrad · commit c4492a81fbbb · 2018-03-12T15:39:05.000-06:00
diff --git a/packages/pico-engine/public/index.html b/packages/pico-engine/public/index.html
@@ -345,19 +345,43 @@ <h2>Children</h2>
 {{/if}}
 </script>
 <script id="subscriptions-template" type="text/x-handlebars-template">
-{{#unless subscriptions}}
-Subscriptions
+{{#if disabled}}
+Subscriptions are disabled.
+To enable, add the ruleset "io.picolabs.subscriptions" to this pico.
 {{else}}
-Subscriptions established
+{{#if established}}
+Established subscriptions
 <ul class="subscriptions-list" style="list-style: none;padding:0">
-{{#each subscriptions}}
+{{#each established}}
 <li><input type="checkbox"> to pico "{{name}}" (did:npe:{{Tx}})
 <a class="js-ajax-link" href="/sky/event/{{../eci}}/delete-subscription/wrangler/subscription_cancellation?Rx={{this.Rx}}">del</a>
 <pre>{{this.asString}}</pre>
 </li>
 {{/each}}
 </ul>
-{{/unless}}
+{{/if}}
+{{#if outbound}}
+Outbound subscriptions
+<ul class="subscriptions-list" style="list-style: none;padding:0">
+{{#each outbound}}
+<li><input type="checkbox"> to pico "{{name}}" (did:npe:{{Tx}})
+<a class="js-ajax-link" href="/sky/event/{{../eci}}/cancel-outbound/wrangler/outbound_cancellation?Rx={{this.Rx}}">del</a>
+<pre>{{this.asString}}</pre>
+</li>
+{{/each}}
+</ul>
+{{/if}}
+{{#if inbound}}
+Inbound subscriptions
+<ul class="subscriptions-list" style="list-style: none;padding:0">
+{{#each inbound}}
+<li><input type="checkbox"> from pico "{{name}}" (did:npe:{{Tx}})
+<a class="js-ajax-link" href="/sky/event/{{../eci}}/reject-inbound/wrangler/inbound_rejection?Rx={{this.Rx}}">del</a>
+<pre>{{this.asString}}</pre>
+</li>
+{{/each}}
+</ul>
+{{/if}}
 <p>Propose new subscription</p>
 <form class="js-ajax-form" action="/sky/event/{{eci}}/subscr/wrangler/subscription" method="GET">
 <table>
@@ -378,6 +402,7 @@ <h2>Children</h2>
 </table>
 <button type="submit">wrangler:subscription</button>
 </form>
+{{/if}}
 </script>
 </head>
 <body>
diff --git a/packages/pico-engine/public/js/index.js b/packages/pico-engine/public/js/index.js
@@ -184,19 +184,33 @@ $.getJSON("/api/db-dump?legacy=true", function(db_dump){
       callback({ "pico_id": thePicoInp.id, "id": thePicoInp.id, "eci": thePicoInp.admin_eci, "channel": theChannels });
     } else if (label == "Subscriptions") {
       var theSubscriptions = {};
-      var subscriptionsCount = 0;
-      var subscriptions = get(db_dump.pico,[thePicoInp.id,"io.picolabs.subscription","vars","established"]);
-      if (subscriptions) {
-        Object.keys(subscriptions).forEach(function(id){
-          ++subscriptionsCount;
-          theSubscriptions[id] = subscriptions[id];
-          theSubscriptions[id].asString = JSON.stringify(subscriptions[id],undefined,2);
-          var subs_eci = subscriptions[id].Tx;
+      theSubscriptions.pico_id = thePicoInp.id;
+      theSubscriptions.eci = eci;
+      var subsRID = "io.picolabs.subscription";
+      if (get(db_dump,["pico",thePicoInp.id,"ruleset",subsRID,"on"])) {
+      } else {
+        theSubscriptions.disabled = true;
+      }
+      var theSubsVars = get(db_dump,["pico",thePicoInp.id,subsRID,"vars"]);
+      var recSubs = function(subsType) {
+        if (theSubsVars && theSubsVars[subsType]) {} else return;
+        var someSub = {};
+        var subCount = 0;
+        var theSubs = theSubsVars[subsType];
+        Object.keys(theSubs).forEach(function(id){
+          ++subCount;
+          someSub[id] = theSubs[id];
+          someSub[id].asString = JSON.stringify(theSubs[id],undefined,2);
+          var subs_eci = theSubs[id].Tx;
           var pico = { id: get(db_dump.channel,[subs_eci,"pico_id"])};
-          theSubscriptions[id].name = getV(pico,"dname");
+          someSub[id].name = getV(pico,"dname");
         });
-      }
-      callback({"pico_id": thePicoInp.id, eci:eci,"subscriptions":subscriptionsCount ? theSubscriptions : false});
+        if(subCount) theSubscriptions[subsType] = someSub;
+      };
+      recSubs("established");
+      recSubs("outbound");
+      recSubs("inbound");
+      callback(theSubscriptions);
     } else {
       callback(thePicoInp);
     }
