Skip to content

Commit d18a249

Browse files
Merge branch 'master' into kodex_iframes_fix
2 parents 7fb1499 + fe0373c commit d18a249

File tree

13 files changed

+9714
-1413
lines changed

13 files changed

+9714
-1413
lines changed

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# Default ignored files
22
.idea
3+
!.idea/runConfigurations
4+
!.idea/runConfigurations/*.xml
5+
!.idea/externalDependencies.xml
6+
!.idea/vcs.xml
37
.gradle
48
.kotlin
59
build

.idea/externalDependencies.xml

Lines changed: 13 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/runConfigurations/Build_Docs_Website.xml

Lines changed: 9 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/runConfigurations/Run_Docs_Website_Locally.xml

Lines changed: 17 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/vcs.xml

Lines changed: 18 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ allprojects {
189189
afterEvaluate {
190190
try {
191191
configure<KtlintExtension> {
192-
version = "1.4.1"
192+
version = "1.6.0"
193193
// rules are set up through .editorconfig
194194
}
195195
} catch (_: UnknownDomainObjectException) {

core/generated-sources/src/test/kotlin/org/jetbrains/kotlinx/dataframe/puzzles/DateTests.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package org.jetbrains.kotlinx.dataframe.puzzles
33
import io.kotest.matchers.shouldBe
44
import kotlinx.datetime.LocalDate
55
import kotlinx.datetime.Month
6+
import kotlinx.datetime.isoDayNumber
67
import kotlinx.datetime.toJavaLocalDate
78
import org.jetbrains.kotlinx.dataframe.api.add
89
import org.jetbrains.kotlinx.dataframe.api.aggregate
@@ -113,7 +114,7 @@ class DateTests {
113114

114115
(start..end).toList().toColumn("3thu").filter {
115116
it.toJavaLocalDate()[WeekFields.of(Locale.ENGLISH).weekOfMonth()] == 3 &&
116-
it.dayOfWeek.value == 4
117+
it.dayOfWeek.isoDayNumber == 4
117118
} shouldBe expected
118119
}
119120
}

core/src/test/kotlin/org/jetbrains/kotlinx/dataframe/puzzles/DateTests.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package org.jetbrains.kotlinx.dataframe.puzzles
33
import io.kotest.matchers.shouldBe
44
import kotlinx.datetime.LocalDate
55
import kotlinx.datetime.Month
6+
import kotlinx.datetime.isoDayNumber
67
import kotlinx.datetime.toJavaLocalDate
78
import org.jetbrains.kotlinx.dataframe.api.add
89
import org.jetbrains.kotlinx.dataframe.api.aggregate
@@ -113,7 +114,7 @@ class DateTests {
113114

114115
(start..end).toList().toColumn("3thu").filter {
115116
it.toJavaLocalDate()[WeekFields.of(Locale.ENGLISH).weekOfMonth()] == 3 &&
116-
it.dayOfWeek.value == 4
117+
it.dayOfWeek.isoDayNumber == 4
117118
} shouldBe expected
118119
}
119120
}

docs/README.md

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,32 @@ and included in the [StardustDocs/d.tree](./StardustDocs/d.tree) file.
1212

1313
Images all README files can be stored in [docs/imgs](./imgs).
1414

15+
## Running the Documentation Website Locally
16+
17+
⚠️ IFrames are not displayed when using the Writerside plugin preview. To view them correctly, you need to run the website locally.
18+
19+
### Option 1: Using IntelliJ IDEA Configurations
20+
21+
> Requires: `unzip` utility and **Python 3** installed in the environment. May not work properly on Windows.
22+
23+
1. Run the `Build Docs Website` configuration.
24+
2. Run the `Run Docs Website Locally` configuration.
25+
3. Open [http://localhost:8000/home.html](http://localhost:8000/home.html) in your browser.
26+
4. Shut down the server with Ctrl+C or close the terminal window.
27+
28+
### Option 2: Manual Steps
29+
30+
1. Go to `Writerside > DataFrame(d) > Export To > Build Docs Website` or find Writerside web archive build in IDEA configuration.
31+
2. Unzip the archive located at: `./build/ws/webHelpD2-all.zip`
32+
3. Start a local web server in the extracted folder (e.g., using Python or `http-server` utility):
33+
```bash
34+
python3 -m http.server
35+
# or
36+
http-server
37+
```
38+
4. Open [http://localhost:8000/home.html](http://localhost:8000/home.html) in your browser.
39+
5. Shut down the server with Ctrl+C or close the terminal window.
40+
1541
### Explainer dataframes
1642
`@TransformDataFrameExpressions` annotated test functions generate sample
1743
dataframe HTML files that can be used as iFrames on the documentation website.

0 commit comments

Comments
 (0)