Skip to content

Commit 72bcbfc

Browse files
feat(ui): introduce patched version of monaco-yaml & yaml-language-server to have better autocompletion
waiting for redhat-developer/yaml-language-server#1048
1 parent 2c1b6ff commit 72bcbfc

File tree

5 files changed

+407
-12
lines changed

5 files changed

+407
-12
lines changed

core/src/main/java/io/kestra/core/docs/JsonSchemaGenerator.java

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@ public <T> Map<String, Object> schemas(Class<? extends T> cls, boolean arrayOf)
8080
if (arrayOf) {
8181
objectNode.put("type", "array");
8282
}
83-
replaceAnyOfWithOneOf(objectNode);
8483
pullDocumentationAndDefaultFromOneOf(objectNode);
8584
removeRequiredOnPropsWithDefaults(objectNode);
8685

@@ -111,14 +110,6 @@ private void removeRequiredOnPropsWithDefaults(ObjectNode objectNode) {
111110
});
112111
}
113112

114-
private void replaceAnyOfWithOneOf(ObjectNode objectNode) {
115-
objectNode.findParents("anyOf").forEach(jsonNode -> {
116-
if (jsonNode instanceof ObjectNode oNode) {
117-
oNode.set("oneOf", oNode.remove("anyOf"));
118-
}
119-
});
120-
}
121-
122113
// This hack exists because for Property we generate a oneOf for properties that are not strings.
123114
// By default, the 'default' is in each oneOf which Monaco editor didn't take into account.
124115
// So, we pull off the 'default' from any of the oneOf to the parent.
@@ -641,7 +632,6 @@ protected <T> Map<String, Object> generate(Class<? extends T> cls, @Nullable Cla
641632
SchemaGenerator generator = new SchemaGenerator(schemaGeneratorConfig);
642633
try {
643634
ObjectNode objectNode = generator.generateSchema(cls);
644-
replaceAnyOfWithOneOf(objectNode);
645635
pullDocumentationAndDefaultFromOneOf(objectNode);
646636
removeRequiredOnPropsWithDefaults(objectNode);
647637

ui/package-lock.json

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

ui/package.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@
1717
"build-storybook": "storybook build",
1818
"test:storybook": "test-storybook",
1919
"prepare": "cd .. && husky ui/.husky && rm -f .git/hooks/*",
20-
"notes": "node ./scripts/ci/generateReleaseNotes"
20+
"notes": "node ./scripts/ci/generateReleaseNotes",
21+
"postinstall": "patch-package"
2122
},
2223
"dependencies": {
2324
"@js-joda/core": "^5.6.3",
@@ -117,7 +118,8 @@
117118
"typescript": "^5.7.2",
118119
"typescript-eslint": "^8.28.0",
119120
"vite": "^6.2.3",
120-
"vitest": "^3.0.5"
121+
"vitest": "^3.0.5",
122+
"patch-package": "^8.0.0"
121123
},
122124
"optionalDependencies": {
123125
"@esbuild/darwin-arm64": "^0.25.1",

0 commit comments

Comments
 (0)