@ditojs/admin 2.69.0 → 2.71.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ditojs/admin",
-  "version": "2.69.0",
+  "version": "2.71.0",
   "type": "module",
   "description": "Dito.js Admin is a schema based admin interface for Dito.js Server, featuring auto-generated views and forms and built with Vue.js",
   "repository": "https://github.com/ditojs/dito/tree/master/packages/admin",
@@ -42,8 +42,8 @@
     "not ie_mob > 0"
   ],
   "dependencies": {
-    "@ditojs/ui": "^2.69.0",
-    "@ditojs/utils": "^2.69.0",
+    "@ditojs/ui": "^2.71.0",
+    "@ditojs/utils": "^2.71.0",
     "@kyvg/vue3-notification": "^3.4.2",
     "@lk77/vue3-color": "^3.0.6",
     "@tiptap/core": "^3.14.0",
@@ -89,9 +89,9 @@
     "vue-upload-component": "^3.1.17"
   },
   "devDependencies": {
-    "@ditojs/build": "^2.69.0",
+    "@ditojs/build": "^2.71.0",
     "typescript": "^5.9.3",
     "vite": "^7.3.0"
   },
-  "gitHead": "a2b28ad175cd3280ceadd394c74ba67e12da03af"
+  "gitHead": "e5a095c7c44de8b6c84994d744612f0fce19eae2"
 }

package/src/components/DitoMenu.vue

@@ -7,7 +7,7 @@ ul.dito-menu(
     v-for="item in items"
   )
     template(
-      v-if="shouldRenderSchema(item)"
+      v-if="shouldShowItem(item)"
     )
       a.dito-link(
         :href="getItemHref(item)"
@@ -45,6 +45,15 @@ export default DitoComponent.component('DitoMenu', {
   },
 
   methods: {
+    shouldShowItem(item) {
+      return (
+        this.shouldRenderSchema(item) && (
+          !item.items ||
+          Object.values(item.items).some(this.shouldRenderSchema)
+        )
+      )
+    },
+
     onResize({ contentRect: { width } }) {
       if (width) {
         this.width = width

package/src/components/DitoNotifications.vue

@@ -14,7 +14,7 @@
 
 <script>
 import DitoComponent from '../DitoComponent.js'
-import { asArray, stripTags } from '@ditojs/utils'
+import { asArray, stripHtml } from '@ditojs/utils'
 
 // @vue/component
 export default DitoComponent.component('DitoNotifications', {
@@ -48,7 +48,7 @@ export default DitoComponent.component('DitoNotifications', {
       // eslint-disable-next-line no-console
       console[log](
         ...[
-          stripTags(text),
+          stripHtml(text),
           ...(type === 'error' && error ? [error] : [])
         ]
       )

package/src/components/DitoRoot.vue

@@ -52,7 +52,8 @@ import DitoDialog from './DitoDialog.vue'
 import {
   processView,
   resolveViews,
-  processSchemaComponents
+  processSchemaComponents,
+  shouldRenderSchema
 } from '../utils/schema.js'
 
 // @vue/component
@@ -410,14 +411,18 @@ export default DitoComponent.component('DitoRoot', {
       // new routes, and restore the current path.
       const { fullPath } = this.$route
       this.removeRoutes?.()
-      this.removeRoutes = addRoutes(this.$router, [
-        {
-          name: 'root',
-          path: '/',
-          components: {}
-        },
-        ...routes.flat()
-      ])
+      this.removeRoutes = addRoutes(
+        this.$router,
+        [
+          {
+            name: 'root',
+            path: '/',
+            components: {}
+          },
+          ...routes.flat()
+        ],
+        this.context
+      )
       this.$router.replace(fullPath)
     },
 
@@ -429,13 +434,26 @@ export default DitoComponent.component('DitoRoot', {
 
 let dialogId = 0
 
-function addRoutes(router, routes) {
+function addRoutes(router, routes, context) {
   const removers = []
   for (const route of routes) {
-    const remove = router.addRoute(route)
-    removers.push(remove)
+    removers.push(
+      router.addRoute(route)
+    )
   }
 
+  removers.push(
+    // Add navigation guard to check if: conditions
+    router.beforeEach((to, from, next) => {
+      for (const record of to.matched) {
+        if (!shouldRenderSchema(record.meta.schema, context)) {
+          return next('/')
+        }
+      }
+      next()
+    })
+  )
+
   return () => {
     for (const remove of removers) {
       remove()