Merge pull request #1196 from Kotlin/website_docs_dev

Website docs dev

Author: AndreiKingsley

.github/README_GH_ACTIONS.md

@@ -22,7 +22,7 @@ Anytime the source code changes on [master](https://github.com/Kotlin/dataframe/
 this [GitHub Action](./workflows/generated-sources-master.yml) makes sure
 [`processKDocsMain`](../KDOC_PREPROCESSING.md),
 and `korro` are run. If there have been any changes in either [core/generated-sources](../core/generated-sources) or
-[docs/StardustDocs/snippets](../docs/StardustDocs/snippets), these are auto-committed to the branch, to keep
+[docs/StardustDocs/resources/snippets](../docs/StardustDocs/resources/snippets), these are auto-committed to the branch, to keep
 it up to date.
 
 ### Show generated code in PR

.github/workflows/generated-sources-master.yml

@@ -26,7 +26,7 @@ jobs:
         run: |
           git config --global user.name 'github-actions[bot]'
           git config --global user.email 'github-actions[bot]@users.noreply.github.com'
-          git add './core/generated-sources' './dataframe-csv/generated-sources' './docs/StardustDocs/snippets' './docs/StardustDocs/topics'
+          git add './core/generated-sources' './dataframe-csv/generated-sources' './docs/StardustDocs/resources/snippets' './docs/StardustDocs/topics'
           git diff --staged --quiet || git commit -m "Automated commit of generated code"
           git push
         env:

.github/workflows/generated-sources.yml

@@ -42,14 +42,14 @@ jobs:
 
       - name: Check for changes in generated sources
         id: git-diff
-        run: echo "changed=$(if git diff --quiet './core/generated-sources' './dataframe-csv/generated-sources' './docs/StardustDocs/snippets' './docs/StardustDocs/topics'; then echo 'false'; else echo 'true'; fi)" >> $GITHUB_OUTPUT
+        run: echo "changed=$(if git diff --quiet './core/generated-sources' './dataframe-csv/generated-sources' './docs/StardustDocs/resources/snippets' './docs/StardustDocs/topics'; then echo 'false'; else echo 'true'; fi)" >> $GITHUB_OUTPUT
 
       - name: Commit and push if changes
         id: git-commit
         if: steps.git-diff.outputs.changed == 'true'
         run: |
           git checkout -b generated-sources/docs-update-${{ github.run_number }}
-          git add './core/generated-sources' './dataframe-csv/generated-sources' './docs/StardustDocs/snippets' './docs/StardustDocs/topics'
+          git add './core/generated-sources' './dataframe-csv/generated-sources' './docs/StardustDocs/resources/snippets' './docs/StardustDocs/topics'
           git commit -m "Update generated sources with recent changes"
           git push origin generated-sources/docs-update-${{ github.run_number }}
           echo "commit=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT

KDOC_PREPROCESSING.md

@@ -693,7 +693,7 @@ A fully interactive, single-source-of-truth grammar for the Columns Selection DS
 There's a special annotation, `@ExportAsHtml`, that allows you to export the content of the KDoc of the annotated
 function, interface, or class as HTML.
 The Markdown of the KDoc is rendered to HTML using [JetBrains/markdown](https://github.com/JetBrains/markdown) and, in
-the case of DataFrame, put in [./docs/StardustDocs/snippets/kdocs](./docs/StardustDocs/snippets/kdocs).
+the case of DataFrame, put in [./docs/StardustDocs/resources/snippets/kdocs](docs/StardustDocs/resources/snippets/kdocs).
 From there, the HTML can be included in any WriterSide page as an iFrame.
 This can be done using our custom `<dataFrame src=""/>` tag.
 

README.md

@@ -233,7 +233,7 @@ This table shows the mapping between main library component versions and minimum
 | 0.13.1                   | 8                    | 1.9.22         | 0.12.0-139             | 15.0.0               |
 | 0.14.1                   | 8                    | 2.0.20         | 0.12.0-139             | 17.0.0               |
 | 0.15.0                   | 8                    | 2.0.20         | 0.12.0-139             | 18.1.0               |
-| 1.0.0-Beta1              | 8 / 11               | 2.0.20         | 0.12.0-383             | 18.1.0               |
+| 1.0.0-Beta2              | 8 / 11               | 2.0.20         | 0.12.0-383             | 18.1.0               |
 
 ## Code of Conduct
 

build.gradle.kts

@@ -154,6 +154,7 @@ val modulesUsingJava11 = with(projects) {
         dataframeJupyter,
         dataframeGeo,
         examples.ideaExamples.titanic,
+        tests,
     )
 }.map { it.path }
 

core/README.md

@@ -25,15 +25,15 @@ by [Korro](https://github.com/devcrocod/korro).
 
 Aside from code samples, `@TransformDataFrameExpressions` annotated test functions also generate sample
 dataframe HTML files that can be used as iFrames on the documentation website.
-They are tested, generated, and copied over to [docs/StardustDocs/snippets](../docs/StardustDocs/snippets) by
+They are tested, generated, and copied over to [docs/StardustDocs/resources/snippets](../docs/StardustDocs/resources/snippets) by
 our "explainer" [plugin callback proxy](./src/test/kotlin/org/jetbrains/kotlinx/dataframe/explainer),
 which hooks into [the TestBase class](./src/test/kotlin/org/jetbrains/kotlinx/dataframe/samples/api/TestBase.kt) and
 retrieves the intermediate DataFrame expressions thanks to our "explainer" compiler plugin
 [:plugins:expressions-converter](../plugins/expressions-converter).
 
 We can also generate "normal" DataFrame samples for the website. This can be done using the
 [OtherSamples class](./src/test/kotlin/org/jetbrains/kotlinx/dataframe/samples/api/OtherSamples.kt). Generated
-HTML files will be stored in [docs/StardustDocs/snippets/manual](../docs/StardustDocs/snippets/manual).
+HTML files will be stored in [docs/StardustDocs/resources/snippets/manual](../docs/StardustDocs/resources/snippets/manual).
 
 ### KoDEx
 
@@ -45,4 +45,4 @@ See the [KDoc Preprocessing Guide](../KDOC_PREPROCESSING.md) for more informatio
 
 KDocs can also be exported to HTML, for them to be reused on the website.
 Elements annotated with `@ExportAsHtml` will have their generated content be copied over to
-[docs/StardustDocs/snippets/kdocs](../docs/StardustDocs/snippets/kdocs).
+[docs/StardustDocs/resources/snippets/kdocs](../docs/StardustDocs/resources/snippets/kdocs).

core/build.gradle.kts

@@ -145,7 +145,7 @@ val clearSamplesOutputs by tasks.creating {
 
     doFirst {
         delete {
-            val generatedSnippets = fileTree(file("../docs/StardustDocs/snippets"))
+            val generatedSnippets = fileTree(file("../docs/StardustDocs/resources/snippets"))
                 .exclude("**/manual/**", "**/kdocs/**")
             delete(generatedSnippets)
         }
@@ -155,7 +155,7 @@ val clearSamplesOutputs by tasks.creating {
 val addSamplesToGit by tasks.creating(GitTask::class) {
     directory = file(".")
     command = "add"
-    args = listOf("-A", "../docs/StardustDocs/snippets")
+    args = listOf("-A", "../docs/StardustDocs/resources/snippets")
 }
 
 val copySamplesOutputs = tasks.register<JavaExec>("copySamplesOutputs") {
@@ -218,7 +218,7 @@ val processKDocsMain by creatingRunKodexTask(processKDocsMainSources) {
     outputReadOnly = false
 
     exportAsHtml {
-        dir = file("../docs/StardustDocs/snippets/kdocs")
+        dir = file("../docs/StardustDocs/resources/snippets/kdocs")
     }
     finalizedBy("runKtlintFormatOverGeneratedSourcesSourceSet")
 }

core/src/test/kotlin/org/jetbrains/kotlinx/dataframe/explainer/PluginCallbackProxy.kt

@@ -131,7 +131,7 @@ object PluginCallbackProxy : PluginCallback {
         File(korro, group).writeText(
             """
             
-            <dataFrame src="$group.html"/>
+            <inline-frame src="resources/$group.html" width="100%"/>
             """.trimIndent(),
         )
     }

core/src/test/kotlin/org/jetbrains/kotlinx/dataframe/explainer/SampleAggregator.kt

@@ -13,7 +13,7 @@ fun main() {
         .groupBy {
             it.nameWithoutExtension.substringBefore("_")
         }.mapValues { (name, files) ->
-            val target = File("../docs/StardustDocs/snippets")
+            val target = File("../docs/StardustDocs/resources/snippets")
             val original = files
                 .firstOrNull { it.nameWithoutExtension.contains("properties") }
                 ?: files.first()