windmill-components 1.665.0 → 1.677.0

package/package/components/AppConnectInner.svelte

@@ -1,5 +1,6 @@
 <script lang="ts">import { run } from 'svelte/legacy';
 import { userStore, workspaceStore } from '../stores';
+import LabelsInput from './LabelsInput.svelte';
 import IconedResourceType from './IconedResourceType.svelte';
 import { OauthService, ResourceService, VariableService } from '../gen';
 import { emptyString, truncateRev, urlize } from '../utils';
@@ -64,6 +65,7 @@ let extra_params = [];
 let responseExtra = $state({});
 let path = $state('');
 let description = $state('');
+let labels = $state(undefined);
 /**
  * Client credentials OAuth flow support
  * @description Determines if the selected OAuth provider supports client_credentials grant type
@@ -93,6 +95,7 @@ export async function open(rt) {
     step = 1; //express && !manual ? 3 : 1
     value = '';
     description = '';
+    labels = undefined;
     resourceType = rt ?? '';
     valueToken = undefined;
     // Reset client credentials state
@@ -480,7 +483,8 @@ export async function next() {
                 resource_type: resourceType,
                 path,
                 value: resourceValue,
-                description
+                description,
+                labels
             }
         });
         dispatch('refresh', path);
@@ -641,6 +645,7 @@ let editScopes = $state(false);
 				namePlaceholder={resourceType}
 				kind="resource"
 			/>
+			<LabelsInput bind:labels class="-mt-5" />
 
 			{#if apiTokenApps[resourceType]}
 				<h2 class="mt-4 mb-2">Instructions</h2>
@@ -743,6 +748,8 @@ let editScopes = $state(false);
 					</div>
 				{/if}
 
+				<LabelsInput bind:labels class="-mt-5" />
+
 				{#if supportsClientCredentials}
 					<div>
 						<h3 class="text-sm font-semibold text-emphasis mb-1">Authentication Method</h3>
@@ -839,6 +846,7 @@ let editScopes = $state(false);
 			bind:path
 			kind="resource"
 		/>
+		<LabelsInput bind:labels class="-mt-5" />
 		{#if apiTokenApps[resourceType] || !manual}
 			<ul class="mt-6">
 				<li class="text-xs text-primary font-normal">

package/package/components/ArgInfo.svelte

@@ -65,7 +65,15 @@ async function getVariable(path) {
 	<button
 		class="text-xs text-accent"
 		onclick={async () => {
-			await getVariable(value.substring('$res:'.length))
+			await getVariable(value.substring('$var:'.length))
+			jsonViewer?.toggleDrawer()
+		}}>{value}</button
+	>
+{:else if isString(value) && value.startsWith('$jsonvar:')}
+	<button
+		class="text-xs text-accent"
+		onclick={async () => {
+			await getVariable(value.substring('$jsonvar:'.length))
 			jsonViewer?.toggleDrawer()
 		}}>{value}</button
 	>

package/package/components/ArgInput.svelte

@@ -320,6 +320,7 @@ function compareValues(value) {
 }
 let { debounced, clearDebounce } = debounce(() => compareValues(value), 50);
 let inputCat = $derived(computeInputCat(type, format, itemsType?.type, enum_, contentEncoding));
+let isNonStringSecret = $derived((password || extra?.['password'] == true) && type === 'object');
 let displayJsonToggleHeader = $derived(displayHeader &&
     inputCat === 'list' &&
     !(itemsType?.resourceType === 's3_object' || itemsType?.resourceType === 's3object'));
@@ -379,6 +380,12 @@ onDestroy(() => {
 					class="text-accent underline font-normal"
 					onclick={() => variableEditor?.editVariable?.(value.slice(5))}>{value.slice(5)}</button
 				>
+			{:else if value && typeof value == 'string' && value?.startsWith('$jsonvar:')}
+				Linked to variable <button
+					class="text-accent underline font-normal"
+					onclick={() => variableEditor?.editVariable?.(value.slice('$jsonvar:'.length))}
+					>{value.slice('$jsonvar:'.length)}</button
+				>
 			{/if}
 		</div>
 	{/if}
@@ -1257,12 +1264,13 @@ onDestroy(() => {
 							{:else}
 								<Password
 									{disabled}
+									minRows={extra?.['minRows']}
 									bind:password={value}
 									placeholder={placeholder ?? defaultValue ?? ''}
 								/>
 							{/if}
 						{:else}
-							<PasswordArgInput {disabled} bind:value />
+							<PasswordArgInput {disabled} minRows={extra?.['minRows']} bind:value />
 						{/if}
 					{:else}
 						{#key extra?.['minRows']}
@@ -1308,6 +1316,18 @@ onDestroy(() => {
 		{@render actions?.()}
 	</div>
 
+	{#if isNonStringSecret}
+		{#if typeof value === 'string' && value.startsWith('$jsonvar:')}
+			<div class="text-2xs text-tertiary">
+				Sensitive — stored as secret: <code class="text-2xs">{value.slice('$jsonvar:'.length)}</code
+				>
+			</div>
+		{:else}
+			<div class="text-2xs text-tertiary italic">Sensitive — will be stored as secret on submit</div
+			>
+		{/if}
+	{/if}
+
 	{#if !compact || (error && error != '')}
 		<div class="text-right text-xs leading-3 text-red-600 dark:text-red-400 mb-2">
 			{#if disabled || error === ''}

package/package/components/CompareWorkspaces.svelte

@@ -74,7 +74,7 @@ async function fetchSummary(kind, path, workspace) {
             return app.summary;
         }
         else if (kind === 'folder') {
-            const folder = await FolderService.getFolder({ workspace, name: path.slice(2) });
+            const folder = await FolderService.getFolder({ workspace, name: path.replace(/^f\//, '') });
             return folder.summary;
         }
     }
@@ -245,7 +245,16 @@ async function deployChanges() {
     }
     const parent = parentWorkspaceId;
     const current = currentWorkspaceId;
-    for (const itemKey of selectedItems) {
+    const sortedItems = [...selectedItems].sort((a, b) => {
+        const aIsFolder = a.startsWith('folder:');
+        const bIsFolder = b.startsWith('folder:');
+        if (aIsFolder && !bIsFolder)
+            return -1;
+        if (!aIsFolder && bIsFolder)
+            return 1;
+        return 0;
+    });
+    for (const itemKey of sortedItems) {
         const diff = selectableDiffs.find((d) => itemKey == getItemKey(d));
         if (!diff) {
             sendUserToast(`Undeployable item: ${itemKey}`, true);