feat: enable optional Diagrams List Index

src/main/kotlin/nl/avisi/structurizr/site/generatr/StructurizrUtilities.kt

@@ -6,6 +6,8 @@ import com.structurizr.model.SoftwareSystem
 import com.structurizr.model.StaticStructureElement
 import com.structurizr.view.ViewSet
 import nl.avisi.structurizr.site.generatr.site.GeneratorContext
+import nl.avisi.structurizr.site.generatr.site.model.DiagramViewModel
+import nl.avisi.structurizr.site.generatr.site.model.ImageViewViewModel
 
 val Workspace.includedSoftwareSystems: List<SoftwareSystem>
     get() = model.softwareSystems.filter {
@@ -17,6 +19,11 @@ fun Workspace.hasImageViews(id: String) = views.imageViews.any { it.elementId ==
 
 fun Workspace.hasComponentDiagrams(container: Container) = views.componentViews.any { it.container == container}
 
+fun Workspace.listIndexViewEnabled(
+    diagrams: List<DiagramViewModel>?,
+    images: List<ImageViewViewModel>?
+) = ((diagrams?.count() ?: 0) + (images?.count() ?: 0)) > 1
+
 val SoftwareSystem.hasContainers
     get() = this.containers.isNotEmpty()
 

src/main/kotlin/nl/avisi/structurizr/site/generatr/site/model/DiagramIndexListViewModel.kt

@@ -0,0 +1,8 @@
+package nl.avisi.structurizr.site.generatr.site.model
+
+
+data class DiagramIndexListViewModel(
+    val diagrams: List<DiagramViewModel>?,
+    val images: List<ImageViewViewModel>?,
+    val showList: Boolean
+)

src/main/kotlin/nl/avisi/structurizr/site/generatr/site/model/DiagramViewModel.kt

@@ -5,6 +5,7 @@ import com.structurizr.view.View
 data class DiagramViewModel(
     val key: String,
     val name: String,
+    val title: String?,
     val description: String?,
     val svg: String?,
     val diagramWidthInPixels: Int?,
@@ -14,19 +15,21 @@ data class DiagramViewModel(
 ) {
     companion object {
         fun forView(pageViewModel: PageViewModel, view: View, svgFactory: (key: String, url: String) -> String?) =
-            forView(pageViewModel, view.key, view.name, view.description.ifBlank { null }, svgFactory)
+            forView(pageViewModel, view.key, view.name, view.title, view.description.ifBlank { null }, svgFactory)
 
         fun forView(
             pageViewModel: PageViewModel,
             key: String,
             name: String,
+            title: String?,
             description: String?,
             svgFactory: (key: String, url: String) -> String?
         ): DiagramViewModel {
             val svg = svgFactory(key, pageViewModel.url)
             return DiagramViewModel(
                 key,
                 name,
+                title,
                 description,
                 svg,
                 extractDiagramWidthInPixels(svg),

src/main/kotlin/nl/avisi/structurizr/site/generatr/site/model/SoftwareSystemContainerComponentCodePageViewModel.kt

@@ -2,6 +2,7 @@ package nl.avisi.structurizr.site.generatr.site.model
 
 import com.structurizr.model.Container
 import com.structurizr.model.Component
+import nl.avisi.structurizr.site.generatr.listIndexViewEnabled
 import nl.avisi.structurizr.site.generatr.normalize
 import nl.avisi.structurizr.site.generatr.site.GeneratorContext
 
@@ -16,7 +17,11 @@ class SoftwareSystemContainerComponentCodePageViewModel(generatorContext: Genera
     val visible = images.isNotEmpty()
     val containerTabs = createContainersCodeTabViewModel(generatorContext, container.softwareSystem)
     val componentTabs = createComponentsTabViewModel(generatorContext, container)
-
+    val diagramIndexListViewModel = DiagramIndexListViewModel(
+        null,
+        images,
+        generatorContext.workspace.listIndexViewEnabled(null, images)
+    )
     companion object {
         fun url(container: Container, component: Component?) = "${url(container.softwareSystem, Tab.CODE)}/${container.name.normalize()}/${component?.name?.normalize()}"
     }

src/main/kotlin/nl/avisi/structurizr/site/generatr/site/model/SoftwareSystemContainerComponentsPageViewModel.kt

@@ -2,6 +2,7 @@ package nl.avisi.structurizr.site.generatr.site.model
 
 import com.structurizr.model.Container
 import nl.avisi.structurizr.site.generatr.includedProperties
+import nl.avisi.structurizr.site.generatr.listIndexViewEnabled
 import nl.avisi.structurizr.site.generatr.normalize
 import nl.avisi.structurizr.site.generatr.site.GeneratorContext
 
@@ -21,6 +22,11 @@ class SoftwareSystemContainerComponentsPageViewModel(generatorContext: Generator
     val propertiesTable = createPropertiesTableViewModel(container.includedProperties)
     val visible = diagrams.isNotEmpty() or images.isNotEmpty() or hasProperties
     val containerTabs = createContainersComponentTabViewModel(generatorContext, container.softwareSystem)
+    val diagramIndexListViewModel = DiagramIndexListViewModel(
+        diagrams,
+        images,
+        generatorContext.workspace.listIndexViewEnabled(diagrams, images)
+    )
     companion object {
         fun url(container: Container) = "${url(container.softwareSystem, Tab.COMPONENT)}/${container.name.normalize()}"
     }

src/main/kotlin/nl/avisi/structurizr/site/generatr/site/model/SoftwareSystemContainerPageViewModel.kt

@@ -2,6 +2,7 @@ package nl.avisi.structurizr.site.generatr.site.model
 
 import com.structurizr.model.SoftwareSystem
 import nl.avisi.structurizr.site.generatr.hasContainerViews
+import nl.avisi.structurizr.site.generatr.listIndexViewEnabled
 import nl.avisi.structurizr.site.generatr.site.GeneratorContext
 
 class SoftwareSystemContainerPageViewModel(generatorContext: GeneratorContext, softwareSystem: SoftwareSystem) :
@@ -15,4 +16,9 @@ class SoftwareSystemContainerPageViewModel(generatorContext: GeneratorContext, s
         .sortedBy { it.key }
         .map { ImageViewViewModel(it) }
     val visible = generatorContext.workspace.views.hasContainerViews(generatorContext.workspace, softwareSystem) || images.isNotEmpty()
+    val diagramIndexListViewModel = DiagramIndexListViewModel(
+        diagrams,
+        images,
+        generatorContext.workspace.listIndexViewEnabled(diagrams, images)
+    )
 }

src/main/kotlin/nl/avisi/structurizr/site/generatr/site/model/SoftwareSystemContextPageViewModel.kt

@@ -2,6 +2,7 @@ package nl.avisi.structurizr.site.generatr.site.model
 
 import com.structurizr.model.SoftwareSystem
 import nl.avisi.structurizr.site.generatr.hasSystemContextViews
+import nl.avisi.structurizr.site.generatr.listIndexViewEnabled
 import nl.avisi.structurizr.site.generatr.site.GeneratorContext
 
 class SoftwareSystemContextPageViewModel(generatorContext: GeneratorContext, softwareSystem: SoftwareSystem) :
@@ -11,4 +12,9 @@ class SoftwareSystemContextPageViewModel(generatorContext: GeneratorContext, sof
         .sortedBy { it.key }
         .map { DiagramViewModel.forView(this, it, generatorContext.svgFactory) }
     val visible = generatorContext.workspace.views.hasSystemContextViews(softwareSystem)
+    val diagramIndexListViewModel = DiagramIndexListViewModel(
+        diagrams,
+        null,
+        generatorContext.workspace.listIndexViewEnabled(diagrams, null)
+    )
 }

src/main/kotlin/nl/avisi/structurizr/site/generatr/site/model/SoftwareSystemDeploymentPageViewModel.kt

@@ -2,6 +2,7 @@ package nl.avisi.structurizr.site.generatr.site.model
 
 import com.structurizr.model.SoftwareSystem
 import nl.avisi.structurizr.site.generatr.hasDeploymentViews
+import nl.avisi.structurizr.site.generatr.listIndexViewEnabled
 import nl.avisi.structurizr.site.generatr.site.GeneratorContext
 
 class SoftwareSystemDeploymentPageViewModel(generatorContext: GeneratorContext, softwareSystem: SoftwareSystem) :
@@ -11,4 +12,9 @@ class SoftwareSystemDeploymentPageViewModel(generatorContext: GeneratorContext,
         .sortedBy { it.key }
         .map { DiagramViewModel.forView(this, it, generatorContext.svgFactory) }
     val visible = generatorContext.workspace.views.hasDeploymentViews(softwareSystem)
+    val diagramIndexListViewModel = DiagramIndexListViewModel(
+        diagrams,
+        null,
+        generatorContext.workspace.listIndexViewEnabled(diagrams, null)
+    )
 }

src/main/kotlin/nl/avisi/structurizr/site/generatr/site/model/SoftwareSystemDynamicPageViewModel.kt

@@ -2,6 +2,7 @@ package nl.avisi.structurizr.site.generatr.site.model
 
 import com.structurizr.model.SoftwareSystem
 import nl.avisi.structurizr.site.generatr.hasDynamicViews
+import nl.avisi.structurizr.site.generatr.listIndexViewEnabled
 import nl.avisi.structurizr.site.generatr.site.GeneratorContext
 
 class SoftwareSystemDynamicPageViewModel(generatorContext: GeneratorContext, softwareSystem: SoftwareSystem) :
@@ -11,4 +12,9 @@ class SoftwareSystemDynamicPageViewModel(generatorContext: GeneratorContext, sof
         .sortedBy { it.key }
         .map { DiagramViewModel.forView(this, it, generatorContext.svgFactory) }
     val visible = generatorContext.workspace.views.hasDynamicViews(softwareSystem)
+    val diagramIndexListViewModel = DiagramIndexListViewModel(
+        diagrams,
+        null,
+        generatorContext.workspace.listIndexViewEnabled(diagrams, null)
+    )
 }

src/main/kotlin/nl/avisi/structurizr/site/generatr/site/model/ToHtml.kt

@@ -168,7 +168,7 @@ fun Element.transformEmbeddedDiagramElements(
         val key = it.attr("src").substring(embedPrefix.length)
         val name = it.attr("alt").ifBlank { key }
         val html = createHTML().div {
-            diagram(DiagramViewModel.forView(pageViewModel, key, name, null, svgFactory))
+            diagram(DiagramViewModel.forView(pageViewModel, key, name, null, null, svgFactory))
         }
 
         it.parent()?.append(html)

src/main/kotlin/nl/avisi/structurizr/site/generatr/site/views/Diagram.kt

@@ -10,7 +10,7 @@ fun FlowContent.diagram(viewModel: DiagramViewModel) {
 
         figure {
             style = "width: min(100%, ${viewModel.diagramWidthInPixels}px);"
-
+            attributes["id"] = viewModel.key
             rawHtml(viewModel.svg)
             figcaption {
                 a {

src/main/kotlin/nl/avisi/structurizr/site/generatr/site/views/DiagramIndexList.kt

@@ -0,0 +1,29 @@
+package nl.avisi.structurizr.site.generatr.site.views
+
+import kotlinx.html.*
+import nl.avisi.structurizr.site.generatr.site.model.DiagramIndexListViewModel
+import nl.avisi.structurizr.site.generatr.site.model.DiagramViewModel
+
+fun FlowContent.diagramIndexList(viewModel: DiagramIndexListViewModel) {
+    if(viewModel.showList) {
+        h5 {
+            +"Jump to: "
+        }
+        ul {
+            viewModel.diagrams?.forEach {
+                li {
+                    a(href = "#${it.key}") {
+                        +(it.title ?: it.name)
+                    }
+                }
+            }
+            viewModel.images?.forEach {
+                li {
+                    a(href = "#${it.key}") {
+                        +(it.title ?: it.name)
+                    }
+                }
+            }
+        }
+    }
+}

src/main/kotlin/nl/avisi/structurizr/site/generatr/site/views/Image.kt

@@ -8,7 +8,8 @@ fun FlowContent.image(viewModel: ImageViewViewModel) {
 
     figure {
         style = "width: fit-content;"
-
+        attributes["id"] = viewModel.key
+
         p(classes = "has-text-weight-bold") { +viewModel.title }
         img { src = viewModel.content }
         figcaption {

src/main/kotlin/nl/avisi/structurizr/site/generatr/site/views/SoftwareSystemContainerComponentCodePage.kt

@@ -29,6 +29,7 @@ fun HTML.softwareSystemContainerComponentCodePage(viewModel: SoftwareSystemConta
                         }
                 }
             }
+            diagramIndexList(viewModel.diagramIndexListViewModel)
             viewModel.images.forEach { image(it) }
         }
     } else

src/main/kotlin/nl/avisi/structurizr/site/generatr/site/views/SoftwareSystemContainerComponentsPage.kt

@@ -16,6 +16,7 @@ fun HTML.softwareSystemContainerComponentsPage(viewModel: SoftwareSystemContaine
                         }
                 }
             }
+            diagramIndexList(viewModel.diagramIndexListViewModel)
             viewModel.diagrams.forEach { diagram(it) }
             viewModel.images.forEach { image(it) }
 

src/main/kotlin/nl/avisi/structurizr/site/generatr/site/views/SoftwareSystemContainerPage.kt

@@ -6,6 +6,7 @@ import nl.avisi.structurizr.site.generatr.site.model.SoftwareSystemContainerPage
 fun HTML.softwareSystemContainerPage(viewModel: SoftwareSystemContainerPageViewModel) {
     if (viewModel.visible)
         softwareSystemPage(viewModel) {
+            diagramIndexList(viewModel.diagramIndexListViewModel)
             viewModel.diagrams.forEach { diagram(it) }
             viewModel.images.forEach { image(it) }
         }

src/main/kotlin/nl/avisi/structurizr/site/generatr/site/views/SoftwareSystemContextPage.kt

@@ -6,9 +6,8 @@ import nl.avisi.structurizr.site.generatr.site.model.SoftwareSystemContextPageVi
 fun HTML.softwareSystemContextPage(viewModel: SoftwareSystemContextPageViewModel) {
     if (viewModel.visible)
         softwareSystemPage(viewModel) {
-            viewModel.diagrams.forEach {
-                diagram(it)
-            }
+            diagramIndexList(viewModel.diagramIndexListViewModel)
+            viewModel.diagrams.forEach { diagram(it) }
         }
     else
         redirectUpPage()

src/main/kotlin/nl/avisi/structurizr/site/generatr/site/views/SoftwareSystemDeploymentPage.kt

@@ -6,6 +6,7 @@ import nl.avisi.structurizr.site.generatr.site.model.SoftwareSystemDeploymentPag
 fun HTML.softwareSystemDeploymentPage(viewModel: SoftwareSystemDeploymentPageViewModel) {
     if (viewModel.visible)
         softwareSystemPage(viewModel) {
+            diagramIndexList(viewModel.diagramIndexListViewModel)
             viewModel.diagrams.forEach {
                 diagram(it)
             }

src/main/kotlin/nl/avisi/structurizr/site/generatr/site/views/SoftwareSystemDynamicPage.kt

@@ -6,6 +6,7 @@ import nl.avisi.structurizr.site.generatr.site.model.SoftwareSystemDynamicPageVi
 fun HTML.softwareSystemDynamicPage(viewModel: SoftwareSystemDynamicPageViewModel) {
     if (viewModel.visible)
         softwareSystemPage(viewModel) {
+            diagramIndexList(viewModel.diagramIndexListViewModel)
             viewModel.diagrams.forEach {
                 diagram(it)
             }

src/test/kotlin/nl/avisi/structurizr/site/generatr/site/model/AsciidocToHtmlTest.kt

@@ -206,7 +206,7 @@ class AsciidocToHtmlTest : ViewModelTest() {
             <div class="imageblock content">
              <div class="content">
               <div>
-               <figure style="width: min(100%, 800px);">
+               <figure style="width: min(100%, 800px);" id="SystemLandscape">
                 <div>
                  <svg viewBox="0 0 800 900"></svg>
                 </div>

src/test/kotlin/nl/avisi/structurizr/site/generatr/site/model/MarkdownToHtmlTest.kt

@@ -288,7 +288,7 @@ class MarkdownToHtmlTest : ViewModelTest() {
             """
                 <p>
                  <div>
-                  <figure style="width: min(100%, 800px);">
+                  <figure style="width: min(100%, 800px);" id="SystemLandscape">
                    <div>
                     <svg viewBox="0 0 800 900"></svg>
                    </div>

src/test/kotlin/nl/avisi/structurizr/site/generatr/site/model/SoftwareSystemContainerComponentsPageViewModelTest.kt

@@ -72,6 +72,7 @@ class SoftwareSystemContainerComponentsPageViewModelTest : ViewModelTest() {
             DiagramViewModel(
                 "component-1-backend",
                 "Software system - Backend - Components",
+                null,
                 "Component view 1 - Backend",
                 """<svg viewBox="0 0 800 900"></svg>""",
                 800,
@@ -82,6 +83,7 @@ class SoftwareSystemContainerComponentsPageViewModelTest : ViewModelTest() {
             DiagramViewModel(
                 "component-2-backend",
                 "Software system - Backend - Components",
+                null,
                 "Component view 2 - Backend",
                 """<svg viewBox="0 0 800 900"></svg>""",
                 800,
@@ -97,6 +99,7 @@ class SoftwareSystemContainerComponentsPageViewModelTest : ViewModelTest() {
             DiagramViewModel(
                 "component-1-frontend",
                 "Software system - Frontend - Components",
+                null,
                 "Component view 1 - Frontend",
                 """<svg viewBox="0 0 800 900"></svg>""",
                 800,
@@ -107,6 +110,7 @@ class SoftwareSystemContainerComponentsPageViewModelTest : ViewModelTest() {
             DiagramViewModel(
                 "component-2-frontend",
                 "Software system - Frontend - Components",
+                null,
                 "Component view 2 - Frontend",
                 """<svg viewBox="0 0 800 900"></svg>""",
                 800,

src/test/kotlin/nl/avisi/structurizr/site/generatr/site/model/SoftwareSystemContainerPageViewModelTest.kt

@@ -35,6 +35,7 @@ class SoftwareSystemContainerPageViewModelTest : ViewModelTest() {
             DiagramViewModel(
                 "container-1",
                 "Software system - Containers",
+                null,
                 "Container view 1",
                 """<svg viewBox="0 0 800 900"></svg>""",
                 800,
@@ -45,6 +46,7 @@ class SoftwareSystemContainerPageViewModelTest : ViewModelTest() {
             DiagramViewModel(
                 "container-2",
                 "Software system - Containers",
+                null,
                 "Container view 2",
                 """<svg viewBox="0 0 800 900"></svg>""",
                 800,

src/test/kotlin/nl/avisi/structurizr/site/generatr/site/model/SoftwareSystemContextPageViewModelTest.kt

@@ -3,6 +3,7 @@ package nl.avisi.structurizr.site.generatr.site.model
 import assertk.assertThat
 import assertk.assertions.containsExactly
 import assertk.assertions.isFalse
+import assertk.assertions.isTrue
 import com.structurizr.model.SoftwareSystem
 import kotlin.test.Test
 
@@ -22,6 +23,7 @@ class SoftwareSystemContextPageViewModelTest : ViewModelTest() {
             DiagramViewModel(
                 "context-1",
                 "Software system - System Context",
+                null,
                 "System context view 1",
                 """<svg viewBox="0 0 800 900"></svg>""",
                 800,
@@ -32,6 +34,7 @@ class SoftwareSystemContextPageViewModelTest : ViewModelTest() {
             DiagramViewModel(
                 "context-2",
                 "Software system - System Context",
+                null,
                 "System context view 2",
                 """<svg viewBox="0 0 800 900"></svg>""",
                 800,
@@ -51,4 +54,10 @@ class SoftwareSystemContextPageViewModelTest : ViewModelTest() {
 
         assertThat(viewModel.visible).isFalse()
     }
+
+    @Test
+    fun `show list is enabled`() {
+        val viewModel = SoftwareSystemContextPageViewModel(generatorContext, softwareSystem)
+        assertThat(viewModel.diagramIndexListViewModel.showList).isTrue()
+    }
 }