From c26976a29dfde0c0109b491156f2ff6fcfee7efa Mon Sep 17 00:00:00 2001 From: Ruben Fiszel Date: Tue, 3 Sep 2024 20:21:44 +0200 Subject: [PATCH] use stricter equalities in more palces --- .../src/lib/components/DisplayResult.svelte | 62 ++++++++++--------- 1 file changed, 32 insertions(+), 30 deletions(-) diff --git a/frontend/src/lib/components/DisplayResult.svelte b/frontend/src/lib/components/DisplayResult.svelte index 06c906c5db..12157e78c0 100644 --- a/frontend/src/lib/components/DisplayResult.svelte +++ b/frontend/src/lib/components/DisplayResult.svelte @@ -123,7 +123,7 @@ let download_as_csv = false function inferResultKind(result: any) { try { - if (result == 'WINDMILL_TOO_BIG') { + if (result === 'WINDMILL_TOO_BIG') { largeObject = true return 'json' } @@ -140,7 +140,7 @@ return 'plain' } try { - let keys = result && typeof result == 'object' ? Object.keys(result) : [] + let keys = result && typeof result === 'object' ? Object.keys(result) : [] is_render_all = keys.length == 1 && keys.includes('render_all') && Array.isArray(result['render_all']) @@ -195,18 +195,18 @@ } if (keys.length != 0) { - if (keys.length == 1 && keys[0] == 'html') { + if (keys.length == 1 && keys[0] === 'html') { return 'html' - } else if (keys.length == 1 && keys[0] == 'map') { + } else if (keys.length == 1 && keys[0] === 'map') { return 'map' - } else if (keys.length == 1 && keys[0] == 'file') { + } else if (keys.length == 1 && keys[0] === 'file') { return 'file' } else if ( keys.includes('windmill_content_type') && result['windmill_content_type'].startsWith('text/') ) { return 'plain' - } else if (keys.length == 1 && keys[0] == 'error') { + } else if (keys.length == 1 && keys[0] === 'error') { return 'error' } else if (keys.length === 2 && keys.includes('file') && keys.includes('filename')) { return 'file' @@ -389,7 +389,7 @@ /> {/each} -{:else if resultKind == 'nondisplayable'}
Non displayable object
Non displayable object{:else}
{#if !forceJson && resultKind == 'table-col'} + >{#if !forceJson && resultKind === 'table-col'} {@const data = 'table-col' in result ? result['table-col'] : result} - {:else if !forceJson && resultKind == 'table-row'} + {:else if !forceJson && resultKind === 'table-row'} {@const data = 'table-row' in result ? result['table-row'] : result} - {:else if !forceJson && resultKind == 'table-row-object'} + {:else if !forceJson && resultKind === 'table-row-object'} {@const data = 'table-row-object' in result ? result['table-row-object'] : result} - {:else if !forceJson && resultKind == 'html'} + {:else if !forceJson && resultKind === 'html'}
{#if !requireHtmlApproval || enableHtml} {@html result.html} @@ -484,7 +484,7 @@
{/if}
- {:else if !forceJson && resultKind == 'map'} + {:else if !forceJson && resultKind === 'map'}
- {:else if !forceJson && resultKind == 'png'} + {:else if !forceJson && resultKind === 'png'}
png rendered
- {:else if !forceJson && resultKind == 'jpeg'} + {:else if !forceJson && resultKind === 'jpeg'}
jpeg rendered
- {:else if !forceJson && resultKind == 'svg'} + {:else if !forceJson && resultKind === 'svg'}
Download
{@html result.svg}
- {:else if !forceJson && resultKind == 'gif'} + {:else if !forceJson && resultKind === 'gif'}
gif rendered
- {:else if !forceJson && resultKind == 'plain'}
{typeof result == 'string' ? result : result?.['result']}
{#if !noControls} + {:else if !forceJson && resultKind === 'plain'}
{typeof result === 'string' ? result : result?.['result']}
{#if !noControls}
{/if}
- {:else if !forceJson && resultKind == 'file'} + {:else if !forceJson && resultKind === 'file'}
Download
- {:else if !forceJson && resultKind == 'error' && result?.error} + {:else if !forceJson && resultKind === 'error' && result?.error}
{#if result.error.name || result.error.message}{result.error.name}: {result.error @@ -556,7 +556,7 @@ >
- {#if language == 'bun'} + {#if language === 'bun'}
Bun script are bundled for performance reasons. If you see an odd error that doesn't @@ -565,7 +565,9 @@ team. {/if} - {:else if !forceJson && resultKind == 'approval'}
+ {:else if !forceJson && resultKind === 'approval'}
- {:else if !forceJson && resultKind == 's3object'} + {:else if !forceJson && resultKind === 's3object'}
@@ -658,7 +660,7 @@ {/if} {/if}
- {:else if !forceJson && resultKind == 's3object-list'} + {:else if !forceJson && resultKind === 's3object-list'}