From 3188bee46e3dc46a699096bd3c2668df0cbdb9a1 Mon Sep 17 00:00:00 2001 From: Ruben Fiszel Date: Fri, 21 Feb 2025 14:05:33 +0100 Subject: [PATCH] fix: disable toggle is more consistently applied on arg inputs --- .../nsjail/run.ansible.config.proto | 6 +++ docker/DockerfileFullEe | 3 +- docker/DockerfileNsjail | 2 +- frontend/src/lib/components/ArgInput.svelte | 45 ++++++++++--------- 4 files changed, 33 insertions(+), 23 deletions(-) diff --git a/backend/windmill-worker/nsjail/run.ansible.config.proto b/backend/windmill-worker/nsjail/run.ansible.config.proto index 463de39770b71..6b03032238967 100644 --- a/backend/windmill-worker/nsjail/run.ansible.config.proto +++ b/backend/windmill-worker/nsjail/run.ansible.config.proto @@ -37,6 +37,12 @@ mount { mandatory: false } +mount { + src: "/root/.local/share/uv/tools/ansible" + dst: "/root/.local/share/uv/tools/ansible" + is_bind: true +} + mount { src: "/usr" dst: "/usr" diff --git a/docker/DockerfileFullEe b/docker/DockerfileFullEe index dd07bda32edb6..9661443f53492 100644 --- a/docker/DockerfileFullEe +++ b/docker/DockerfileFullEe @@ -22,8 +22,7 @@ FROM ghcr.io/windmill-labs/windmill-ee:dev COPY --from=rust:1.81.0 /usr/local/cargo /usr/local/cargo COPY --from=rust:1.81.0 /usr/local/rustup /usr/local/rustup -RUN uv tool install ansible && [ -d "$(uv tool dir)/ansible/bin/" ] && find "$(uv tool dir)/ansible/bin/" -mindepth 1 -maxdepth 1 -type f -executable -regextype posix-extended -regex '^((.+/)?)[^.]+' -print0 | xargs -0 -I {} mv {} "/usr/local/bin/" - +RUN uv tool install ansible && [ -d "$(uv tool dir)/ansible/bin/" ] && find "$(uv tool dir)/ansible/bin/" -mindepth 1 -maxdepth 1 -type f -executable -regextype posix-extended -regex '^((.+/)?)[^.]+' -print0 | xargs -0 ln -s -t "$UV_TOOL_BIN_DIR/" || true # dotnet SDK COPY --from=bitnami/dotnet-sdk:9.0.101-debian-12-r0 /opt/bitnami/dotnet-sdk /opt/dotnet-sdk RUN ln -s /opt/dotnet-sdk/bin/dotnet /usr/bin/dotnet diff --git a/docker/DockerfileNsjail b/docker/DockerfileNsjail index 7e94b3f146da8..bab8f001442e9 100644 --- a/docker/DockerfileNsjail +++ b/docker/DockerfileNsjail @@ -47,7 +47,7 @@ RUN apt-get update && apt-get install -y libprotobuf-dev libnl-route-3-dev COPY --from=rust:1.80.1 /usr/local/cargo /usr/local/cargo COPY --from=rust:1.80.1 /usr/local/rustup /usr/local/rustup -RUN uv tool install ansible && [ -d "$(uv tool dir)/ansible/bin/" ] && find "$(uv tool dir)/ansible/bin/" -mindepth 1 -maxdepth 1 -type f -executable -regextype posix-extended -regex '^((.+/)?)[^.]+' -print0 | xargs -0 -I {} mv {} "/usr/local/bin/" +RUN uv tool install ansible && [ -d "$(uv tool dir)/ansible/bin/" ] && find "$(uv tool dir)/ansible/bin/" -mindepth 1 -maxdepth 1 -type f -executable -regextype posix-extended -regex '^((.+/)?)[^.]+' -print0 | xargs -0 ln -s -t "$UV_TOOL_BIN_DIR/" || true # dotnet SDK COPY --from=bitnami/dotnet-sdk:9.0.101-debian-12-r0 /opt/bitnami/dotnet-sdk /opt/dotnet-sdk diff --git a/frontend/src/lib/components/ArgInput.svelte b/frontend/src/lib/components/ArgInput.svelte index 48b25c7e2020c..7323588ad5261 100644 --- a/frontend/src/lib/components/ArgInput.svelte +++ b/frontend/src/lib/components/ArgInput.svelte @@ -448,6 +448,7 @@ bind:value currency={extra?.currency} locale={extra?.currencyLocale ?? 'en-US'} + {disabled} /> {:else}
@@ -982,29 +983,33 @@
{:else if inputCat == 'date'} {#if format === 'date'} - + {:else} - + {/if} {:else if inputCat == 'sql' || inputCat == 'yaml'} -
- {#await import('$lib/components/SimpleEditor.svelte')} - - {:then Module} - { - dispatch('focus') - }} - on:blur={(e) => { - dispatch('blur') - }} - bind:this={editor} - lang={inputCat} - bind:code={value} - autoHeight - /> - {/await} -
+ {#if disabled} +