Skip to content

Commit a6d206b

Browse files
julenmendietajulenmendieta
authored
Merge pull request #36 from platforma-open/chore/vj-gene-usage-structurer-v3
Migrate vj-gene-usage onto structurer + BlockModelV3
2 parents 1c5d28d + af6a0bd commit a6d206b

42 files changed

Lines changed: 3479 additions & 2139 deletions

Some content is hidden

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

‎.changeset/structurer-v3-migration.md‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
---
2+
"@platforma-open/milaboratories.vj-usage.model": minor
3+
"@platforma-open/milaboratories.vj-usage.ui": minor
4+
"@platforma-open/milaboratories.vj-usage.workflow": patch
5+
"@platforma-open/milaboratories.vj-usage": minor
6+
---
7+
8+
Migrate onto the block-tools structurer (full SDK upgrade: model/ui-vue 1.79.14,
9+
workflow-tengo 6.6.3, tengo-builder 4.0.8) and BlockModelV3.
10+
11+
Persisted state is preserved via the legacy upgrader. UI bindings move to
12+
`app.model.data`. The three plot view states, `weightedFlag`, and the derived
13+
block label are now UI-only and no longer stale the block; only the dataset,
14+
allele/gene toggle, single-cell chain, and custom block label do. Graphs remain
15+
the standard `<GraphMaker>` component.

‎.gitignore‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,8 @@ log/
88
.turbo
99
vite.config.*.timestamp-*
1010
software/**/*.sw.json
11-
software/*.tgz
11+
software/*.tgz
12+
software/**/*.tgz
13+
.DS_Store
14+
.vscode/sftp.json
15+
test-dry-run.json

‎.structure‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"version":1}

‎.vscode/settings.json‎

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,3 @@
11
{
2-
"vitest.disableWorkspaceWarning": true,
3-
"editor.defaultFormatter": "dbaeumer.vscode-eslint",
4-
"[typescript]": {
5-
"editor.defaultFormatter": "dbaeumer.vscode-eslint"
6-
},
7-
"[vue]": {
8-
"editor.defaultFormatter": "dbaeumer.vscode-eslint"
9-
},
10-
"cSpell.words": [
11-
"datasource",
12-
"pframe",
13-
"prerun"
14-
],
15-
"editor.codeActionsOnSave": {
16-
"source.fixAll.eslint": "always"
17-
},
18-
"eslint.enable": true,
19-
"eslint.format.enable": true
2+
"typescript.tsdk": "node_modules/typescript/lib"
203
}

‎block/index.d.ts‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,6 @@
1-
export {};
1+
declare const blockSpec: {
2+
type: "dev-v2";
3+
folder: string;
4+
};
25

6+
export { blockSpec };

‎block/index.js‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,8 @@
1-
export {};
1+
const blockSpec = {
2+
type: "dev-v2",
3+
folder: __dirname,
4+
};
25

6+
module.exports = {
7+
blockSpec,
8+
};

‎block/package.json‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,26 @@
11
{
22
"name": "@platforma-open/milaboratories.vj-usage",
33
"version": "2.1.19",
4+
"files": [
5+
"index.d.ts",
6+
"index.js"
7+
],
48
"scripts": {
59
"build": "shx rm -rf ./block-pack && block-tools pack",
610
"mark-stable": "block-tools mark-stable -r 's3://milab-euce1-prod-pkgs-s3-block-registry/pub/releases/?region=eu-central-1'",
711
"prepublishOnly": "block-tools pack && block-tools publish -r 's3://milab-euce1-prod-pkgs-s3-block-registry/pub/releases/?region=eu-central-1'",
812
"do-pack": "shx rm -f *.tgz && block-tools pack && pnpm pack && shx mv *.tgz package.tgz"
913
},
10-
"files": [
11-
"index.d.ts",
12-
"index.js"
13-
],
1414
"dependencies": {
15-
"@platforma-open/milaboratories.vj-usage.workflow": "workspace:*",
1615
"@platforma-open/milaboratories.vj-usage.model": "workspace:*",
17-
"@platforma-open/milaboratories.vj-usage.ui": "workspace:*"
16+
"@platforma-open/milaboratories.vj-usage.ui": "workspace:*",
17+
"@platforma-open/milaboratories.vj-usage.workflow": "workspace:*"
18+
},
19+
"devDependencies": {
20+
"@platforma-sdk/block-tools": "catalog:",
21+
"shx": "catalog:"
1822
},
23+
"packageManager": "pnpm@9.12.0",
1924
"block": {
2025
"components": {
2126
"workflow": "@platforma-open/milaboratories.vj-usage.workflow/dist/tengo/tpl/main.plj.gz",
@@ -42,9 +47,5 @@
4247
},
4348
"marketplaceRanking": 16300
4449
}
45-
},
46-
"devDependencies": {
47-
"@platforma-sdk/block-tools": "catalog:"
48-
},
49-
"packageManager": "pnpm@9.12.0"
50+
}
5051
}

‎model/.oxfmtrc.json‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"extends": ["node_modules/@milaboratories/ts-builder/configs/oxfmt.json"],
3+
"ignorePatterns": ["dist", "coverage", "CHANGELOG.md"]
4+
}

‎model/.oxlintrc.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"extends": ["node_modules/@milaboratories/ts-builder/dist/configs/oxlint-block-model.json"]
3+
}

‎model/eslint.config.mjs‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

0 commit comments

Comments
 (0)