starred/windmill
1
0
Fork 0
mirror of https://github.com/windmill-labs/windmill.git synced 2026-09-12 16:05:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

update highlight + fix transform editor suggestions

Browse Source
This commit is contained in:
Ruben Fiszel
2023-04-02 17:41:43 +02:00
parent 4127ffe00c
commit 7eed0b4666
9 changed files with 26 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/package-lock.json
Generated
+9 -26
View File
@@ -71,7 +71,7 @@
"svelte-awesome": "^3.2.0",
"svelte-awesome-color-picker": "^2.4.1",
"svelte-check": "^3.0.2",
"svelte-highlight": "^6.2.1",
"svelte-highlight": "^7.2.1",
"svelte-overlay": "^1.4.1",
"svelte-popperjs": "^1.3.2",
"svelte-preprocess": "^5.0.1",
@@ -6405,21 +6405,12 @@
}
},
"node_modules/svelte-highlight": {
"version": "6.2.1",
"resolved": "https://registry.npmjs.org/svelte-highlight/-/svelte-highlight-6.2.1.tgz",
"integrity": "sha512-nZoweg5atreJHAJPaB0nca+r6YhDzbEJQrtKDO2mR/muEzsRKxMeSF3Q8BV0Au+T2jMWGBPwlBzA/tqv9yG9UQ==",
"version": "7.2.1",
"resolved": "https://registry.npmjs.org/svelte-highlight/-/svelte-highlight-7.2.1.tgz",
"integrity": "sha512-Qyxd4CFbvufKo661AmtIFLFh7bW8BZ6G5vUGYdRlyhaoWEOCyCgKimdKW8/8aJ4/kKidSFbgY/2/fyzwYDEjWg==",
"dev": true,
"dependencies": {
"highlight.js": "11.6.0"
}
},
"node_modules/svelte-highlight/node_modules/highlight.js": {
"version": "11.6.0",
"resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-11.6.0.tgz",
"integrity": "sha512-ig1eqDzJaB0pqEvlPVIpSSyMaO92bH1N2rJpLMN/nX396wTpDA4Eq0uK+7I/2XG17pFaaKE0kjV/XPeGt7Evjw==",
"dev": true,
"engines": {
"node": ">=12.0.0"
"highlight.js": "11.7.0"
}
},
"node_modules/svelte-hmr": {
@@ -11865,20 +11856,12 @@
}
},
"svelte-highlight": {
"version": "6.2.1",
"resolved": "https://registry.npmjs.org/svelte-highlight/-/svelte-highlight-6.2.1.tgz",
"integrity": "sha512-nZoweg5atreJHAJPaB0nca+r6YhDzbEJQrtKDO2mR/muEzsRKxMeSF3Q8BV0Au+T2jMWGBPwlBzA/tqv9yG9UQ==",
"version": "7.2.1",
"resolved": "https://registry.npmjs.org/svelte-highlight/-/svelte-highlight-7.2.1.tgz",
"integrity": "sha512-Qyxd4CFbvufKo661AmtIFLFh7bW8BZ6G5vUGYdRlyhaoWEOCyCgKimdKW8/8aJ4/kKidSFbgY/2/fyzwYDEjWg==",
"dev": true,
"requires": {
"highlight.js": "11.6.0"
},
"dependencies": {
"highlight.js": {
"version": "11.6.0",
"resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-11.6.0.tgz",
"integrity": "sha512-ig1eqDzJaB0pqEvlPVIpSSyMaO92bH1N2rJpLMN/nX396wTpDA4Eq0uK+7I/2XG17pFaaKE0kjV/XPeGt7Evjw==",
"dev": true
}
"highlight.js": "11.7.0"
}
},
"svelte-hmr": {
frontend/package.json
+1 -1
View File
@@ -51,7 +51,7 @@
"svelte-awesome": "^3.2.0",
"svelte-awesome-color-picker": "^2.4.1",
"svelte-check": "^3.0.2",
"svelte-highlight": "^6.2.1",
"svelte-highlight": "^7.2.1",
"svelte-overlay": "^1.4.1",
"svelte-popperjs": "^1.3.2",
"svelte-preprocess": "^5.0.1",
frontend/src/lib/components/FlowGraphViewer.svelte
+1 -5
View File
@@ -153,11 +153,7 @@
json={stepDetail.value.iterator.value}
/>{:else}
<span class="text-xs">
<Highlight
offsetTop={0}
language={typescript}
code={cleanExpr(stepDetail.value.iterator.expr)}
/>
<Highlight language={typescript} code={cleanExpr(stepDetail.value.iterator.expr)} />
</span>
{/if}</p
>
frontend/src/lib/components/HighlightCode.svelte
+1 -1
View File
@@ -27,7 +27,7 @@
</script>
{#if code?.length < 5000}
<Highlight className="nowrap {$$props.class}" language={lang} {code} />
<Highlight class="nowrap {$$props.class}" language={lang} {code} />
{:else}
<pre class="overflow-auto max-h-screen {$$props.class}"
><code class="language-{language}">{code}</code></pre
frontend/src/lib/components/InputTransformForm.svelte
+2 -2
View File
@@ -166,9 +166,9 @@
}
if (arg) {
arg.value = undefined
arg.type = 'javascript'
}
propertyType = 'javascript'
arg.type = 'javascript'
} else {
if (staticTemplate) {
if (arg) {
@@ -227,7 +227,7 @@
</div>
<div class="max-w-xs" />
{JSON.stringify(arg)}
<div
class="relative mb-6 {$propPickerConfig?.propName == argName
? 'outline outline-offset-0 outline-2 outline-blue-500 rounded-md'
frontend/src/lib/components/InputTransformsViewer.svelte
+1 -1
View File
@@ -15,7 +15,7 @@
json={val.value}
/>{:else}
<span class="text-xs">
<Highlight offsetTop={0} language={typescript} code={cleanExpr(val.expr)} />
<Highlight language={typescript} code={cleanExpr(val.expr)} />
</span>
{/if}
</li>
frontend/src/lib/components/SimpleEditor.svelte
+6 -4
View File
@@ -90,11 +90,13 @@
model = meditor.createModel(code, lang, mUri.parse(uri))
model.updateOptions(updateOptions)
let widgets: HTMLElement | undefined =
document.getElementById('monaco-widgets-root') ?? undefined
editor = meditor.create(
divEl as HTMLDivElement,
editorConfig(model, code, lang, automaticLayout, fixedOverflowWidgets)
)
editor = meditor.create(divEl as HTMLDivElement, {
...editorConfig(model, code, lang, automaticLayout, fixedOverflowWidgets),
overflowWidgetsDomNode: widgets
})
let timeoutModel: NodeJS.Timeout | undefined = undefined
editor.onDidChangeModelContent((event) => {
frontend/src/lib/components/TemplateEditor.svelte
+3
View File
@@ -412,6 +412,8 @@
let extraModel
let width = 0
let widgets: HTMLElement | undefined = document.getElementById('monaco-widgets-root') ?? undefined
async function loadMonaco() {
model = meditor.createModel(code, lang, mUri.parse(uri))
@@ -419,6 +421,7 @@
editor = meditor.create(divEl as HTMLDivElement, {
...editorConfig(model, code, lang, automaticLayout, fixedOverflowWidgets),
overflowWidgetsDomNode: widgets,
lineNumbers: 'off',
fontSize,
suggestOnTriggerCharacters: true,
frontend/src/lib/components/flows/utils.ts
+2 -1
View File
@@ -150,11 +150,12 @@ export function codeToStaticTemplate(code?: string): string | undefined {
if (!code || typeof code != 'string') return undefined
const lines = code.split('\n')
if (lines.length == 1) {
const line = lines[0].trim()
if (line[0] == '`' && line.charAt(line.length - 1) == '`') {
return line.slice(1, line.length - 1).replaceAll('\\`', '`')
} else {
return `\$\{${line}\}`
}
}
return undefined