Skip to content

Commit 8b88177

Browse files
authored
Merge pull request #518 from fractal-analytics-platform/jschema-refactor
Refactor of JSchema component; moved Sandbox pages to docs
2 parents a1e8cd2 + 3c481bb commit 8b88177

File tree

118 files changed

+12549
-4368
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

118 files changed

+12549
-4368
lines changed

.eslintignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
.DS_Store
22
node_modules
33
/build
4+
/jschema/build
5+
/sandbox
6+
/site
47
/.svelte-kit
58
/package
69
.env

.github/workflows/documentation.yaml

Lines changed: 32 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -9,23 +9,8 @@ on:
99
jobs:
1010

1111
docs:
12-
name: "Deploy docs"
12+
name: "Generate docs"
1313
runs-on: ubuntu-latest
14-
if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }}
15-
16-
steps:
17-
- uses: actions/checkout@v4
18-
19-
- name: Deploy docs
20-
uses: mhausenblas/mkdocs-deploy-gh-pages@master
21-
env:
22-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
23-
REQUIREMENTS: docs/doc-requirements.txt
24-
25-
docs-build:
26-
name: "Test docs build"
27-
runs-on: ubuntu-latest
28-
if: ${{ github.event_name != 'push' || github.ref != 'refs/heads/main' }}
2914

3015
steps:
3116
- uses: actions/checkout@v4
@@ -40,3 +25,34 @@ jobs:
4025

4126
- name: MKDocs build
4227
run: mkdocs build --config-file mkdocs.yml --strict
28+
29+
- name: Set up node
30+
uses: actions/setup-node@v4
31+
with:
32+
node-version: 20
33+
cache: npm
34+
35+
- name: Install jschema dependencies
36+
run: |
37+
cd jschema
38+
npm install
39+
40+
- name: Install sandbox dependencies
41+
run: |
42+
cd sandbox
43+
npm install
44+
45+
- name: Build sandbox
46+
run: |
47+
cd sandbox
48+
npm run build
49+
50+
- name: Move sandbox built files in docs site
51+
run: mv sandbox/build/ site/sandbox
52+
53+
- name: Deploy docs
54+
if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }}
55+
uses: peaceiris/actions-gh-pages@v4
56+
with:
57+
github_token: ${{ secrets.GITHUB_TOKEN }}
58+
publish_dir: ./site

.github/workflows/lint_and_build.yaml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,16 @@ jobs:
2929
- name: Install dependencies
3030
run: npm install
3131

32+
- name: Install jschema dependencies
33+
run: |
34+
cd jschema
35+
npm install
36+
37+
- name: Run static code analysis on jschema module
38+
run: |
39+
cd jschema
40+
npx eslint .
41+
3242
- name: Run static code analysis
3343
run: npx eslint .
3444

.github/workflows/unit_tests.yaml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,16 @@ jobs:
2929
- name: Install dependencies
3030
run: npm install
3131

32+
- name: Install jschema dependencies
33+
run: |
34+
cd jschema
35+
npm install
36+
37+
- name: Run vitest tests on jschema module
38+
run: |
39+
cd jschema
40+
npm run test
41+
3242
- name: Run vitest tests
3343
run: npx vitest run
3444
env:

.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
.DS_Store
22
node_modules
33
/build
4-
/.svelte-kit
4+
/jschema/build
5+
/sandbox/build
6+
.svelte-kit
57
/package
68
.env.*local
79
!.env.example

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
*Note: Numbers like (\#123) point to closed Pull Requests on the fractal-web repository.*
22

3+
# Unreleased
4+
5+
> Starting from this release the Sandbox pages are not included in fractal-web anymore, instead they are static pages published together with the documentation.
6+
7+
* Moved JSON Schema components to a separated component (\#518);
8+
* Moved Sandbox pages to a separated component (\#518);
9+
310
# 1.2.0
411

512
* Conditionally included V1 pages (\#514);

0 commit comments

Comments
 (0)