Refactor container & component page filtering on element

avisi-cloud · May 16, 2024 · 82b55d3 · 82b55d3
1 parent 66b99aa
commit 82b55d3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/...si/structurizr/site/generatr/site/model/SoftwareSystemContainerComponentsPageViewModel.kt b/...si/structurizr/site/generatr/site/model/SoftwareSystemContainerComponentsPageViewModel.kt
@@ -12,7 +12,7 @@ class SoftwareSystemContainerComponentsPageViewModel(generatorContext: Generator
         .sortedBy { it.key }
         .map { DiagramViewModel.forView(this, it, generatorContext.svgFactory) }
     val images = generatorContext.workspace.views.imageViews
-        .filter { it.elementId in container.id }
+        .filter { it.element == container }
         .sortedBy { it.key }
         .map { ImageViewViewModel(it) }
 

diff --git a/...lin/nl/avisi/structurizr/site/generatr/site/model/SoftwareSystemContainerPageViewModel.kt b/...lin/nl/avisi/structurizr/site/generatr/site/model/SoftwareSystemContainerPageViewModel.kt
@@ -11,7 +11,7 @@ class SoftwareSystemContainerPageViewModel(generatorContext: GeneratorContext, s
         .sortedBy { it.key }
         .map { DiagramViewModel.forView(this, it, generatorContext.svgFactory) }
     val images = generatorContext.workspace.views.imageViews
-        .filter { it.elementId == softwareSystem.id }
+        .filter { it.element == softwareSystem }
         .sortedBy { it.key }
         .map { ImageViewViewModel(it) }
     val visible = generatorContext.workspace.views.hasContainerViews(generatorContext.workspace, softwareSystem) || images.isNotEmpty()