move view logic to modal and simplify code.

avisi-cloud · Oct 11, 2023 · 8f7aa35 · 8f7aa35
1 parent eec9cf7
commit 8f7aa35
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 20 deletions.
diff --git a/src/main/kotlin/nl/avisi/structurizr/site/generatr/site/model/CustomStylesheetViewModel.kt b/src/main/kotlin/nl/avisi/structurizr/site/generatr/site/model/CustomStylesheetViewModel.kt
@@ -1,21 +1,23 @@
 package nl.avisi.structurizr.site.generatr.site.model
 
 import nl.avisi.structurizr.site.generatr.site.GeneratorContext
-import nl.avisi.structurizr.site.generatr.site.asUrlToFile
 
-class CustomStylesheetViewModel(generatorContext: GeneratorContext, pageViewModel: PageViewModel) {
-    val url = customStylesheetPath(generatorContext)?.let { "/$it".asUrlToFile(pageViewModel.url) }
-    val type = extractType()
-    val includeCustomStylesheet = url != null
+class CustomStylesheetViewModel(generatorContext: GeneratorContext) {
+    val resourceURI = getResourceURI(generatorContext)
+    val includeCustomStylesheet = resourceURI != null
 
-    private fun customStylesheetPath(generatorContext: GeneratorContext) =
-        generatorContext.workspace.views.configuration.properties
+    private fun getResourceURI(generatorContext: GeneratorContext): String? {
+        val stylesheet = generatorContext.workspace.views.configuration.properties
             .getOrDefault(
-                "generatr.style.customStylesheet",
-                null
-            )
+            "generatr.style.customStylesheet",
+            null
+        )
 
-    private fun extractType(): String {
-        return if (url?.lowercase()?.startsWith("http") == true) "URI" else "FILE"
+        if (stylesheet != null) {
+            return if (stylesheet.lowercase().startsWith("http")) stylesheet else "./$stylesheet"
+        }
+
+        return null
     }
+
 }
diff --git a/src/main/kotlin/nl/avisi/structurizr/site/generatr/site/model/PageViewModel.kt b/src/main/kotlin/nl/avisi/structurizr/site/generatr/site/model/PageViewModel.kt
@@ -12,7 +12,7 @@ abstract class PageViewModel(protected val generatorContext: GeneratorContext) {
             pageSubTitle
     }
     val favicon by lazy { FaviconViewModel(generatorContext, this) }
-    val customStylesheet by lazy { CustomStylesheetViewModel(generatorContext, this) }
+    val customStylesheet by lazy { CustomStylesheetViewModel(generatorContext) }
     val headerBar by lazy { HeaderBarViewModel(this, generatorContext) }
     val menu by lazy { MenuViewModel(generatorContext, this) }
     val includeAutoReloading = generatorContext.serving

diff --git a/src/main/kotlin/nl/avisi/structurizr/site/generatr/site/views/Page.kt b/src/main/kotlin/nl/avisi/structurizr/site/generatr/site/views/Page.kt
@@ -37,13 +37,8 @@ private fun HTML.headFragment(viewModel: PageViewModel) {
         if (viewModel.includeAutoReloading)
             autoReloadScript(viewModel)
 
-        if (viewModel.customStylesheet.includeCustomStylesheet){
-            when (viewModel.customStylesheet.type) {
-                "FILE" -> link(rel = "stylesheet", href = "./" + viewModel.customStylesheet.url)
-                "URI" -> link(rel = "stylesheet", href = viewModel.customStylesheet.url)
-            }
-        }
-
+        if (viewModel.customStylesheet.includeCustomStylesheet)
+            link(rel = "stylesheet", href = "./" + viewModel.customStylesheet.resourceURI)
     }
 }