fix: disable toggle is more consistently applied on arg inputs

windmill-labs · Feb 21, 2025 · 3188bee · 3188bee
1 parent 03903d0
commit 3188bee
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 23 deletions.
diff --git 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
@@ -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
@@ -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
@@ -448,6 +448,7 @@
 					bind:value
 					currency={extra?.currency}
 					locale={extra?.currencyLocale ?? 'en-US'}
+					{disabled}
 				/>
 			{:else}
 				<div class="relative w-full">
@@ -982,29 +983,33 @@
 			</div>
 		{:else if inputCat == 'date'}
 			{#if format === 'date'}
-				<DateInput {autofocus} bind:value dateFormat={extra?.['dateFormat']} />
+				<DateInput {disabled} {autofocus} bind:value dateFormat={extra?.['dateFormat']} />
 			{:else}
-				<DateTimeInput useDropdown {autofocus} bind:value />
+				<DateTimeInput {disabled} useDropdown {autofocus} bind:value />
 			{/if}
 		{:else if inputCat == 'sql' || inputCat == 'yaml'}
-			<div class="border my-1 mb-4 w-full border-primary">
-				{#await import('$lib/components/SimpleEditor.svelte')}
-					<Loader2 class="animate-spin" />
-				{:then Module}
-					<Module.default
-						on:focus={(e) => {
-							dispatch('focus')
-						}}
-						on:blur={(e) => {
-							dispatch('blur')
-						}}
-						bind:this={editor}
-						lang={inputCat}
-						bind:code={value}
-						autoHeight
-					/>
-				{/await}
-			</div>
+			{#if disabled}
+				<textarea disabled />
+			{:else}
+				<div class="border my-1 mb-4 w-full border-secondary">
+					{#await import('$lib/components/SimpleEditor.svelte')}
+						<Loader2 class="animate-spin" />
+					{:then Module}
+						<Module.default
+							on:focus={(e) => {
+								dispatch('focus')
+							}}
+							on:blur={(e) => {
+								dispatch('blur')
+							}}
+							bind:this={editor}
+							lang={inputCat}
+							bind:code={value}
+							autoHeight
+						/>
+					{/await}
+				</div>
+			{/if}
 		{:else if inputCat == 'base64'}
 			<div class="flex flex-col my-6 w-full">
 				<input