Import treeview items locally & Clean-up sitemap page components (#2915)

See #2904 (comment)
and #2904 (comment)

This moves the import from the treeview items for model and sitemap out
of app.js and removes the sitemap page elements as this was never used.

Signed-off-by: Mark Herwege <mark.herwege@telenet.be>

bundles/org.openhab.ui/web/src/components/app.vue

@@ -17,12 +17,6 @@
           <f7-list-item v-if="$store.getters.apiEndpoint('ui') && (!pages || !pages.length)">
             <span><em>{{ $t('sidebar.noPages') }}</em></span>
           </f7-list-item>
-          <!-- <f7-list-item v-for="sitemap in sitemaps" :animate="false" :key="sitemap.name"
-                :class="{ currentsection: currentUrl.indexOf('/sitemap/' + sitemap.name) >= 0 }"
-                :link="'/sitemap/' + sitemap.name + '/' + sitemap.name"
-                :title="sitemap.label" view=".view-main" panel-close>
-          <f7-icon slot="media" ios="f7:menu" aurora="f7:menu" md="material:list"></f7-icon>
-        </f7-list-item> -->
           <f7-list-item v-for="page in pages" :animate="false" :key="page.uid"
                         :class="{ currentsection: currentUrl === '/page/' + page.uid || currentUrl.indexOf('/page/' + page.uid + '/') === 0 }"
                         :link="'/page/' + page.uid"
@@ -373,7 +367,6 @@ export default {
 
       user: null,
 
-      sitemaps: null,
       pages: null,
       showSidebar: true,
       visibleBreakpointDisabled: false,
@@ -538,8 +531,6 @@ export default {
     pageIcon (page) {
       if (page.config && page.config.icon) return page.config.icon
       switch (page.component) {
-        case 'Sitemap':
-          return 'f7:menu'
         case 'oh-layout-page':
           return 'f7:rectangle_grid_2x2'
         case 'oh-tabs-page':

bundles/org.openhab.ui/web/src/components/model/model-treeview.vue

@@ -21,8 +21,13 @@
 </style>
 
 <script>
+import ModelTreeviewItem from '@/components/model/treeview-item.vue'
+
 export default {
   props: ['rootNodes', 'selectedItem', 'includeItemName', 'includeItemTags'],
+  components: {
+    ModelTreeviewItem
+  },
   methods: {
     nodeSelected (node) {
       this.$emit('selected', node)

bundles/org.openhab.ui/web/src/components/model/treeview-item.vue

@@ -36,8 +36,12 @@
 import ItemMixin from '@/components/item/item-mixin'
 
 export default {
+  name: 'model-treeview-item',
   mixins: [ItemMixin],
   props: ['model', 'selected', 'includeItemName', 'includeItemTags'],
+  components: {
+    ModelTreeviewItem: 'model-treeview-item'
+  },
   computed: {
     children () {
       return [this.model.children.locations,

bundles/org.openhab.ui/web/src/components/pagedesigner/sitemap/treeview-item.vue

@@ -32,8 +32,12 @@
 import SitemapMixin from '@/components/pagedesigner/sitemap/sitemap-mixin'
 
 export default {
+  name: 'sitemap-treeview-item',
   mixins: [SitemapMixin],
   props: ['includeItemName', 'widget', 'parentWidget', 'itemsList', 'selected'],
+  components: {
+    SitemapTreeviewItem: 'sitemap-treeview-item'
+  },
   methods: {
     subtitle () {
       return this.widgetTypeLabel() + this.widgetConfigDescription(this.includeItemName)

bundles/org.openhab.ui/web/src/js/app.js

@@ -4,10 +4,7 @@ import './compatibility'
 import Vue from 'vue'
 
 // Import globally registered components
-import SitemapWidgetGeneric from '../components/sitemap/widget-generic.vue'
 import OHIconComponent from '../components/widgets/system/oh-icon.vue'
-import ModelTreeviewItem from '../components/model/treeview-item.vue'
-import SitemapTreeviewItem from '../components/pagedesigner/sitemap/treeview-item.vue'
 import GenericWidgetComponent from '../components/widgets/generic-widget-component.vue'
 import DeveloperDockIcon from '../components/developer/developer-dock-icon.vue'
 
@@ -77,9 +74,6 @@ const app = new Vue({
   }
 })
 
-Vue.component('sitemap-widget-generic', SitemapWidgetGeneric)
 Vue.component('oh-icon', OHIconComponent)
-Vue.component('model-treeview-item', ModelTreeviewItem)
-Vue.component('sitemap-treeview-item', SitemapTreeviewItem)
 Vue.component('generic-widget-component', GenericWidgetComponent)
 Vue.component('developer-dock-icon', DeveloperDockIcon)

bundles/org.openhab.ui/web/src/pages/settings/model/model.vue

@@ -241,6 +241,7 @@ import ItemStatePreview from '@/components/item/item-state-preview.vue'
 import ItemDetails from '@/components/model/item-details.vue'
 import MetadataMenu from '@/components/item/metadata/item-metadata-menu.vue'
 import LinkDetails from '@/components/model/link-details.vue'
+import ModelTreeviewItem from '@/components/model/treeview-item.vue'
 
 import ModelMixin from '@/pages/settings/model/model-mixin'
 
@@ -252,7 +253,8 @@ export default {
     ItemStatePreview,
     ItemDetails,
     MetadataMenu,
-    LinkDetails
+    LinkDetails,
+    ModelTreeviewItem
   },
   data () {
     if (!this.$f7.data.model) this.$f7.data.model = {}

bundles/org.openhab.ui/web/src/pages/settings/pages/sitemap/sitemap-edit.vue

@@ -282,6 +282,7 @@
 import SitemapCode from '@/components/pagedesigner/sitemap/sitemap-code.vue'
 import WidgetDetails from '@/components/pagedesigner/sitemap/widget-details.vue'
 import AttributeDetails from '@/components/pagedesigner/sitemap/attribute-details.vue'
+import SitemapTreeviewItem from '@/components/pagedesigner/sitemap/treeview-item.vue'
 import SitemapMixin from '@/components/pagedesigner/sitemap/sitemap-mixin'
 import DirtyMixin from '../../dirty-mixin'
 
@@ -290,7 +291,8 @@ export default {
   components: {
     SitemapCode,
     WidgetDetails,
-    AttributeDetails
+    AttributeDetails,
+    SitemapTreeviewItem
   },
   props: ['createMode', 'uid', 'itemsList'],
   data () {