Update page registration

extensions/hue-v2/hue-v2.js

@@ -15,6 +15,6 @@ define(['./hue-v2.xml'], function(aPageTemplate) {
     }
   });
 
-  addPageComponent(aVue, true);
+  addPageComponent(aVue);
 
 });

extensions/owm/owm.js

@@ -94,6 +94,6 @@ define(['./owm.xml'], function(owmTemplate) {
     }
   });
 
-  addPageComponent(owmVue, 'umbrella');
+  addPageComponent(owmVue, 'umbrella', true);
 
 });

extensions/share/share.js

@@ -7,6 +7,6 @@ define(['./share.xml', 'engine/configuration/extensions/share/'], function(share
     }
   });
 
-  addPageComponent(shareVue, 'share');
+  addPageComponent(shareVue, 'share', true);
 
 });

extensions/web-base/manifest.json

@@ -48,14 +48,19 @@
               "title": "URL",
               "type": "string"
             },
+            "open": {
+              "title": "Open in a new tab",
+              "type": "boolean",
+              "default": false
+            },
             "icon": {
               "title": "Tile icon",
               "type": "string",
               "enumValues": [
-                {"const": "fa-link", "title": "Link"},
-                {"const": "fa-bookmark", "title": "Bookmark"}
+                {"const": "link", "title": "Link"},
+                {"const": "bookmark", "title": "Bookmark"}
               ],
-              "default": "fa-link"
+              "default": "link"
             }
           }
         }

extensions/web-base/www/app.html

@@ -331,7 +331,7 @@
     <article class="tiles">
       <div class="tile" v-for="tile in sortedTiles" v-on:click="onTile(tile)">
         <span>{{ tile.name }}</span>
-        <p class="tile-value" v-if="tile.icon"><i :class="['fas', tile.icon]"></i></p>
+        <p class="tile-value" v-if="tile.icon"><i :class="['fas', 'fa-' + tile.icon]"></i></p>
       </div>
     </article>
   </app-page>

extensions/web-base/www/app/app.js

@@ -513,7 +513,11 @@ var homePage = new Vue({
         if (tile.id) {
           app.toPage(tile.id);
         } else if (tile.url) {
-          window.open(tile.url, '_blank');
+          if (tile.open) {
+            window.open(tile.url);
+          } else {
+            window.location.assign(tile.url);
+          }
         }
       }
     },
@@ -527,9 +531,6 @@ var homePage = new Vue({
   computed: {
     sortedTiles: function() {
       var tiles = [].concat(this.tiles);
-      if ((typeof webBaseConfig === 'object') && Array.isArray(webBaseConfig.links)) {
-        tiles = tiles.concat(webBaseConfig.links);
-      }
       tiles.sort(compareByName);
       return tiles;
     }
@@ -652,25 +653,29 @@ new Vue({
   el: '#pages'
 });
 
-function registerPageVue(vue, icon) {
+function registerPageVue(vue, icon, showTile, showMenu) {
   var page = getPageFromVue(vue);
   if (page) {
-    menu.pages.push({
-      id: page.id,
-      name: page.title
-    });
-    homePage.tiles.push({
-      id: page.id,
-      name: page.title,
-      icon: icon
-    });
+    if (showTile) {
+      homePage.tiles.push({
+        id: page.id,
+        name: page.title,
+        icon: icon
+      });
+    }
+    if (showMenu) {
+      menu.pages.push({
+        id: page.id,
+        name: page.title
+      });
+    }
   }
 }
 
-function addPageComponent(vue, menuIcon) {
+function addPageComponent(vue, icon, showTile, showMenu) {
   var component = vue.$mount();
   document.getElementById('pages').appendChild(component.$el);
-  if (menuIcon) {
-    registerPageVue(vue, ((typeof menuIcon === 'string') && (menuIcon !== '')) ? 'fa-' + menuIcon : undefined);
+  if (icon !== undefined) {
+    registerPageVue(vue, icon, showTile, showMenu);
   }
 }

extensions/web-base/www/app/boot.js

@@ -84,6 +84,9 @@ Promise.all([
     document.title = webBaseConfig.title;
     homePage.title = webBaseConfig.title;
   }
+  if (Array.isArray(webBaseConfig.links)) {
+    homePage.tiles = homePage.tiles.concat(webBaseConfig.links);
+  }
   app.user = user;
   if (Array.isArray(addons)) {
     return Promise.all(addons.map(function(addon) {

extensions/web-base/www/app/extensions.js

@@ -39,7 +39,7 @@ registerPageVue(new Vue({
       }
     }
   }
-}), 'fa-plus-circle');
+}), 'plus-circle', true, true);
 
 function buildExtensionSchema(manifest, enumsById) {
   if (manifest && manifest.schema) {

extensions/web-base/www/app/properties.js

@@ -54,4 +54,4 @@ registerPageVue(new Vue({
       }
     }
   }
-}), 'fa-list');
+}), 'list', true, true);

extensions/web-base/www/app/things.js

@@ -98,7 +98,7 @@ registerPageVue(new Vue({
       }
     }
   }
-}), 'fa-circle');
+}), 'circle', true, true);
 
 new Vue({
   el: '#thing',

extensions/web-chart/web-chart.js

@@ -342,6 +342,6 @@ define(['./web-chart.xml'], function(pageXml) {
     }
   });
 
-  addPageComponent(vue, 'chart-line');
+  addPageComponent(vue, 'chart-line', true);
 
 });

extensions/web-dashboard/web-dashboard.js

@@ -290,6 +290,6 @@ define(['./web-dashboard.xml'], function(dashboardTemplate) {
     }
   });
 
-  addPageComponent(dashboardVue, 'columns');
+  addPageComponent(dashboardVue, 'columns', true);
 
 });

extensions/web-example/web-example.js

@@ -4,6 +4,6 @@ define(['./web-example.xml'], function(aPageTemplate) {
     template: aPageTemplate
   });
 
-  addPageComponent(aVue, true);
+  addPageComponent(aVue, 'flask', true);
 
 });

extensions/web-notes/web-notes.js

@@ -202,7 +202,7 @@ define(['./web-notes.xml', './web-note.xml', './web-draw.xml'], function(notesTe
     }
   });
 
-  addPageComponent(notesVue, 'sticky-note');
+  addPageComponent(notesVue, 'sticky-note', true, true);
   addPageComponent(noteVue);
   addPageComponent(drawVue);
 

extensions/web-scripts/view-loader.js

@@ -110,7 +110,7 @@ define(function() {
       fn.call(this, options, config);
     }
     var vue = new Vue(options);
-    addPageComponent(vue, config.icon);
+    addPageComponent(vue, config.icon || undefined, config.tile, config.menu);
   }
 
   return {

extensions/web-scripts/view-schema.json

@@ -15,9 +15,20 @@
     },
     "icon": {
       "title": "Icon",
-      "description": "The fontawesome icon to use for the view tile and menu entry, such as 'home'",
+      "description": "The icon to use for the view tile, such as 'home'",
+      "default": "flask",
       "type": "string"
     },
+    "tile": {
+      "title": "Show in the tiles",
+      "type": "boolean",
+      "default": false
+    },
+    "menu": {
+      "title": "Show in the menu",
+      "type": "boolean",
+      "default": false
+    },
     "properties": {
       "title": "Properties",
       "type": "array",

extensions/web-scripts/web-scripts.js

@@ -524,6 +524,6 @@ define(['./scripts.xml', './scripts-add.xml',
   addPageComponent(scriptsViewVue);
   addPageComponent(scriptsViewConfigVue);
   addPageComponent(scriptsEditorVue);
-  addPageComponent(scriptsVue, 'scroll');
+  addPageComponent(scriptsVue, 'scroll', true, true);
 
 });

extensions/web-time/web-time.js

@@ -46,6 +46,6 @@ define(['./web-time.xml'], function(timeTemplate) {
     }
   });
 
-  addPageComponent(timeVue, 'clock');
+  addPageComponent(timeVue, 'clock', true);
 
 });

extensions/web-tools/web-tools.js

@@ -111,7 +111,7 @@ define(['./web-tools.xml'], function(toolsTemplate) {
   });
 
   if (app.canAdminister) {
-    addPageComponent(toolsVue, 'tools');
+    addPageComponent(toolsVue, 'tools', true);
   }
 
 });