windmill-components 1.309.7 → 1.339.2

package/package/components/graph/svelvet/edges/views/Edges/SimpleBezierEdge.svelte

@@ -4,7 +4,7 @@ import { findStore } from '../../../store/models/store';
 import { getAnchorFromEdge } from '../../../edges/controllers/util';
 function calculateControlOffset(distance, curvature) {
     if (distance >= 0) {
-        return 0.5 * distance;
+        return 0.9 * distance;
     }
     else {
         return curvature * 25 * Math.sqrt(-distance);
@@ -62,6 +62,10 @@ function getSimpleBezierPath({ sourceX, sourceY, sourcePosition = Position.Botto
     });
     return `M${sourceX},${sourceY} C${sourceControlX},${sourceControlY} ${targetControlX},${targetControlY} ${targetX},${targetY}`;
 }
+// returns string to pass into edge 'path' svg d attribute for the straight line
+function getStraightLinePath({ sourceX, sourceY, targetX, targetY }) {
+    return `M${sourceX},${sourceY} L${sourceX},${targetY - 50}`;
+}
 // determining center of the bezier curve to know where to place the bezier edge text label
 function getSimpleBezierCenter({ sourceX, sourceY, sourcePosition = Position.Bottom, targetX, targetY, targetPosition = Position.Top, curvature = 0.25 }) {
     const [sourceControlX, sourceControlY] = getControlWithCurvature({
@@ -94,32 +98,53 @@ const store = findStore(canvasId);
 const { edgesStore } = store;
 let edge;
 $: edge = $edgesStore[edgeId];
-let params;
+let bezierParams, lineParams;
 $: {
     const store = findStore(canvasId);
     const sourceAnchor = getAnchorFromEdge(store, edge.id, 'source');
     const targetAnchor = getAnchorFromEdge(store, edge.id, 'target');
     const mapAngle = { 0: 'right', 90: 'top', 180: 'left', 270: 'bottom' };
-    params = {
-        sourceX: edge.sourceX + (edge.offset ?? 0),
-        sourceY: edge.sourceY,
-        sourcePosition: mapAngle[sourceAnchor.angle],
-        targetX: edge.targetX + (edge.offset ?? 0),
-        targetY: edge.targetY,
-        targetPosition: mapAngle[targetAnchor.angle],
-        curvature: 0.25
-    };
+    if (edge.targetY - edge.sourceY > 100) {
+        bezierParams = {
+            sourceX: edge.sourceX + (edge.offset ?? 0),
+            sourceY: edge.targetY - 100,
+            sourcePosition: mapAngle[sourceAnchor.angle],
+            targetX: edge.targetX + (edge.offset ?? 0),
+            targetY: edge.targetY,
+            targetPosition: mapAngle[targetAnchor.angle],
+            curvature: 0.25
+        };
+        lineParams = {
+            sourceX: edge.sourceX + (edge.offset ?? 0),
+            sourceY: edge.sourceY,
+            targetX: edge.targetX + (edge.offset ?? 0),
+            targetY: edge.targetY - 50
+        };
+    }
+    else {
+        bezierParams = {
+            sourceX: edge.sourceX + (edge.offset ?? 0),
+            sourceY: edge.sourceY,
+            sourcePosition: mapAngle[sourceAnchor.angle],
+            targetX: edge.targetX + (edge.offset ?? 0),
+            targetY: edge.targetY,
+            targetPosition: mapAngle[targetAnchor.angle],
+            curvature: 0.25
+        };
+        lineParams = {};
+    }
 }
 // pass in params to function that returns a string value for SVG path d attribute (where to be drawn)
-$: path = getSimpleBezierPath(params);
-$: [centerX, centerY] = getSimpleBezierCenter(params);
+$: bezierPath = getSimpleBezierPath(bezierParams);
+$: linePath = lineParams ? getStraightLinePath(lineParams) : '';
+$: [bezierCenterX, bezierCenterY] = getSimpleBezierCenter(bezierParams);
 // pass necessary values to BaseEdge component
 // BaseEdge renders a 'base' path that can be customized by parent Edge components
 $: baseEdgeProps = {
     ...edge,
-    path: path,
-    centerX: centerX,
-    centerY: centerY
+    path: `${bezierPath} ${linePath}`,
+    centerX: bezierCenterX,
+    centerY: bezierCenterY
 };
 </script>
 

package/package/components/home/ItemsList.svelte

@@ -3,7 +3,7 @@ import { Button, Skeleton } from '../common';
 import Toggle from '../Toggle.svelte';
 import { AppService, FlowService, ScriptService, RawAppService } from '../../gen';
 import { userStore, workspaceStore } from '../../stores';
-import { Code2, FoldVertical, LayoutDashboard, SearchCode, UnfoldVertical } from 'lucide-svelte';
+import { Code2, FoldVertical, LayoutDashboard, SearchCode, SlidersHorizontal, UnfoldVertical } from 'lucide-svelte';
 export let filter = '';
 export let subtab = 'script';
 import { HOME_SEARCH_SHOW_FLOW, HOME_SEARCH_PLACEHOLDER } from '../../consts';
@@ -22,6 +22,7 @@ import HighlightCode from '../HighlightCode.svelte';
 import DrawerContent from '../common/drawer/DrawerContent.svelte';
 import Item from './Item.svelte';
 import TreeViewRoot from './TreeViewRoot.svelte';
+import { Popup } from '../common';
 let scripts;
 let flows;
 let apps;
@@ -30,10 +31,11 @@ let filteredItems = [];
 let itemKind = $page.url.searchParams.get('kind') ?? 'all';
 let loading = true;
 let nbDisplayed = 15;
-async function loadScripts() {
+async function loadScripts(hideWithoutMain) {
     const loadedScripts = await ScriptService.listScripts({
         workspace: $workspaceStore,
-        showArchived: archived ? true : undefined
+        showArchived: archived ? true : undefined,
+        hideWithoutMain: hideWithoutMain ? true : undefined
     });
     scripts = loadedScripts.map((script) => {
         return {
@@ -129,7 +131,7 @@ $: if ($workspaceStore) {
 }
 $: {
     if ($userStore && $workspaceStore) {
-        loadScripts();
+        loadScripts(hideWithoutMain);
         loadFlows();
         if (!archived) {
             loadApps();
@@ -185,10 +187,13 @@ $: items && resetScroll();
 let archived = false;
 const TREE_VIEW_SETTING_NAME = 'treeView';
 const FILTER_USER_FOLDER_SETTING_NAME = 'filterUserFolders';
+const HIDE_WITHOUT_MAIN_SETTING = 'hideWithoutMain';
 let treeView = getLocalSetting(TREE_VIEW_SETTING_NAME) == 'true';
 let filterUserFolders = getLocalSetting(FILTER_USER_FOLDER_SETTING_NAME) == 'true';
+let hideWithoutMain = getLocalSetting(HIDE_WITHOUT_MAIN_SETTING) == 'true';
 $: storeLocalSetting(TREE_VIEW_SETTING_NAME, treeView ? 'true' : undefined);
 $: storeLocalSetting(FILTER_USER_FOLDER_SETTING_NAME, filterUserFolders ? 'true' : undefined);
+$: storeLocalSetting(HIDE_WITHOUT_MAIN_SETTING, hideWithoutMain ? 'true' : undefined);
 let contentSearch;
 let viewCodeDrawer;
 let viewCodeTitle;
@@ -320,7 +325,37 @@ let collapseAll = true;
 		{/if}
 		{#if !loading}
 			<div class="flex w-full flex-row-reverse gap-2 mt-4 mb-1 items-center h-6">
-				<Toggle size="xs" bind:checked={archived} options={{ right: 'Show archived' }} />
+				<Popup
+					floatingConfig={{ placement: 'bottom-end' }}
+					containerClasses="border rounded-lg shadow-lg p-4 bg-surface"
+				>
+					<svelte:fragment slot="button">
+						<Button
+							startIcon={{
+								icon: SlidersHorizontal
+							}}
+							nonCaptureEvent
+							iconOnly
+							size="xs"
+							color="light"
+							variant="border"
+							spacingSize="xs2"
+						/>
+					</svelte:fragment>
+					<div>
+						<span class="text-sm font-semibold">Filters</span>
+						<div class="flex flex-col gap-2 mt-2">
+							<Toggle size="xs" bind:checked={archived} options={{ right: 'Show archived' }} />
+							{#if $userStore && !$userStore.operator}
+								<Toggle
+									size="xs"
+									bind:checked={hideWithoutMain}
+									options={{ right: 'Hide without main function' }}
+								/>
+							{/if}
+						</div>
+					</div>
+				</Popup>
 				{#if $userStore?.is_super_admin && $userStore.username.includes('@')}
 					<Toggle size="xs" bind:checked={filterUserFolders} options={{ right: 'Only f/*' }} />
 				{:else if $userStore?.is_admin || $userStore?.is_super_admin}
@@ -367,12 +402,12 @@ let collapseAll = true;
 				{nbDisplayed}
 				{collapseAll}
 				isSearching={filter !== ''}
-				on:scriptChanged={loadScripts}
+				on:scriptChanged={() => loadScripts(hideWithoutMain)}
 				on:flowChanged={loadFlows}
 				on:appChanged={loadApps}
 				on:rawAppChanged={loadRawApps}
 				on:reload={() => {
-					loadScripts()
+					loadScripts(hideWithoutMain)
 					loadFlows()
 					loadApps()
 					loadRawApps()
@@ -384,12 +419,12 @@ let collapseAll = true;
 				{#each (items ?? []).slice(0, nbDisplayed) as item (item.type + '/' + item.path)}
 					<Item
 						{item}
-						on:scriptChanged={loadScripts}
+						on:scriptChanged={() => loadScripts(hideWithoutMain)}
 						on:flowChanged={loadFlows}
 						on:appChanged={loadApps}
 						on:rawAppChanged={loadRawApps}
 						on:reload={() => {
-							loadScripts()
+							loadScripts(hideWithoutMain)
 							loadFlows()
 							loadApps()
 							loadRawApps()

package/package/components/home/TreeView.svelte

@@ -70,6 +70,7 @@ let showMax = 15;
 						on:appChanged
 						on:rawAppChanged
 						on:reload
+						{showCode}
 						depth={depth + 1}
 					/>
 				{/each}
@@ -135,6 +136,7 @@ let showMax = 15;
 						on:appChanged
 						on:rawAppChanged
 						on:reload
+						{showCode}
 						depth={depth + 1}
 					/>
 				{/each}

package/package/components/icons/AzureIcon.svelte

@@ -2,4 +2,28 @@
 export let width = '24px';
 </script>
 
-<svg id="svg1035" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 374.5 377.3" width="20" height="20"><style>.st0{fill:#00bef2}.st1{fill:#fff;stroke:#fff;stroke-width:1.2357;stroke-linecap:round;stroke-linejoin:round}</style><g id="layer1" transform="translate(-39.022 -78.115)"><g id="g1016" transform="translate(-63.947 -88.179)"><path id="path1008" class="st0" d="M290 166.3c.4 0 .8.5 1.4 1.4.5.8 42.6 51.3 93.6 112.2 51 60.9 92.6 111 92.4 111.3-.1.3-40.7 33.6-90.2 73.9s-91.6 74.6-93.5 76.2c-3.3 2.7-3.5 2.8-4.7 1.6-.7-.7-42.9-35.2-93.8-76.7S102.8 390.5 103 390c.2-.5 42-50.4 93.1-111s92.9-110.7 93.1-111.5c.2-.8.5-1.2.8-1.2z"/><path id="path923" class="st1" d="M283.1 483.6c-5.8-2.1-12.8-8.1-15.7-13.7-3.6-6.9-3.3-17.7.7-26.3 3.1-6.4 3.1-6.6 1.1-8.1-1.1-.8-14.4-8.2-29.4-16.3-15-8.1-28.1-15.2-29-15.7-1.2-.7-3.2 0-6.8 2.3-11.7 7.4-23.9 6.6-33.5-2.3-6.9-6.4-8.9-10.9-8.9-20.1 0-8.9 1.8-13.5 7.5-19.2 7.7-7.7 18-10.3 27.9-7 5.4 1.8 5.5 1.8 8.9-.8 4-3 36.1-32.3 51.6-47l10.7-10.2-3.2-6.7c-6.5-13.5-3.2-28.5 8.2-37.5 6.2-4.9 10.8-6.4 19.7-6.4 20.8 0 35.3 21.8 27.5 41.3-2.1 5.4-2.1 5.5-.1 8.8 1.7 2.9 30.6 37.8 45.9 55.6 2.7 3.1 5.7 5.6 6.7 5.6s4.4-1 7.6-2.2c14.9-5.9 30.6.7 36.8 15.5 4 9.5.5 22.3-8 30-6 5.4-10.4 7.1-18.4 7.1-5.6 0-7.7-.6-13.6-3.8-4.4-2.4-7.8-3.6-9.2-3.2-2.4.6-39.3 25.9-47.5 32.5-5 4.1-5.4 5.6-2.8 11.7 2.5 6 2.2 15.4-.6 21.3-3.1 6.5-10.8 13-17.5 15-6.8 1.9-10.9 1.9-16.6-.2zm1.7-110.2v-57l-3.2-4.4c-1.8-2.4-3.5-4.4-3.8-4.4-1.3 0-65.9 58.7-65.9 59.9 0 .3 1 3.3 2.2 6.5 1.2 3.3 2.1 8 2 10.7-.1 2.7-.1 5.7-.1 6.7.1 2.3 21.7 16.1 54.1 34.8 8.9 5.2 12 6.5 13.1 5.6 1.3-1.1 1.6-12.2 1.6-58.4zm27.4 50.4c42.8-26.9 50.8-32.3 51.3-34.3.3-1.2.7-5.9.8-10.6l.3-8.4-21.8-25.9c-23.4-27.7-32-37.1-34-37.1-.7 0-4.2 2-7.8 4.4l-6.6 4.4.3 56.9c.3 51 .7 59.6 2.6 59.6.2.1 7-4 14.9-9z"/></g></g></svg>
+<svg id="azure" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 374.5 377.3" width="20" height="20"
+	><style>
+		.st0-azure {
+			fill: #00bef2;
+		}
+		.st1-azure {
+			fill: #fff;
+			stroke: #fff;
+			stroke-width: 1.2357;
+			stroke-linecap: round;
+			stroke-linejoin: round;
+		}</style><g id="layer1" transform="translate(-39.022 -78.115)"
+		><g id="g1016" transform="translate(-63.947 -88.179)"
+			><path
+				id="path1008"
+				class="st0-azure"
+				d="M290 166.3c.4 0 .8.5 1.4 1.4.5.8 42.6 51.3 93.6 112.2 51 60.9 92.6 111 92.4 111.3-.1.3-40.7 33.6-90.2 73.9s-91.6 74.6-93.5 76.2c-3.3 2.7-3.5 2.8-4.7 1.6-.7-.7-42.9-35.2-93.8-76.7S102.8 390.5 103 390c.2-.5 42-50.4 93.1-111s92.9-110.7 93.1-111.5c.2-.8.5-1.2.8-1.2z"
+			/><path
+				id="path923"
+				class="st1-azure"
+				d="M283.1 483.6c-5.8-2.1-12.8-8.1-15.7-13.7-3.6-6.9-3.3-17.7.7-26.3 3.1-6.4 3.1-6.6 1.1-8.1-1.1-.8-14.4-8.2-29.4-16.3-15-8.1-28.1-15.2-29-15.7-1.2-.7-3.2 0-6.8 2.3-11.7 7.4-23.9 6.6-33.5-2.3-6.9-6.4-8.9-10.9-8.9-20.1 0-8.9 1.8-13.5 7.5-19.2 7.7-7.7 18-10.3 27.9-7 5.4 1.8 5.5 1.8 8.9-.8 4-3 36.1-32.3 51.6-47l10.7-10.2-3.2-6.7c-6.5-13.5-3.2-28.5 8.2-37.5 6.2-4.9 10.8-6.4 19.7-6.4 20.8 0 35.3 21.8 27.5 41.3-2.1 5.4-2.1 5.5-.1 8.8 1.7 2.9 30.6 37.8 45.9 55.6 2.7 3.1 5.7 5.6 6.7 5.6s4.4-1 7.6-2.2c14.9-5.9 30.6.7 36.8 15.5 4 9.5.5 22.3-8 30-6 5.4-10.4 7.1-18.4 7.1-5.6 0-7.7-.6-13.6-3.8-4.4-2.4-7.8-3.6-9.2-3.2-2.4.6-39.3 25.9-47.5 32.5-5 4.1-5.4 5.6-2.8 11.7 2.5 6 2.2 15.4-.6 21.3-3.1 6.5-10.8 13-17.5 15-6.8 1.9-10.9 1.9-16.6-.2zm1.7-110.2v-57l-3.2-4.4c-1.8-2.4-3.5-4.4-3.8-4.4-1.3 0-65.9 58.7-65.9 59.9 0 .3 1 3.3 2.2 6.5 1.2 3.3 2.1 8 2 10.7-.1 2.7-.1 5.7-.1 6.7.1 2.3 21.7 16.1 54.1 34.8 8.9 5.2 12 6.5 13.1 5.6 1.3-1.1 1.6-12.2 1.6-58.4zm27.4 50.4c42.8-26.9 50.8-32.3 51.3-34.3.3-1.2.7-5.9.8-10.6l.3-8.4-21.8-25.9c-23.4-27.7-32-37.1-34-37.1-.7 0-4.2 2-7.8 4.4l-6.6 4.4.3 56.9c.3 51 .7 59.6 2.6 59.6.2.1 7-4 14.9-9z"
+			/></g
+		></g
+	></svg
+>

package/package/components/icons/PHPIcon.svelte

@@ -0,0 +1,117 @@
+<script>export let height = '24px';
+export let width = '24px';
+</script>
+
+<svg
+	{height}
+	{width}
+	id="svg3430"
+	version="1.1"
+	viewBox="0 0 711.20123 383.5975"
+	xml:space="preserve"
+	xmlns="http://www.w3.org/2000/svg"
+>
+	<title id="title3510">Official PHP Logo</title>
+	<defs id="defs3434">
+		<clipPath clipPathUnits="userSpaceOnUse" id="clipPath3444">
+			<path
+				d="M 11.52,162 C 11.52,81.677 135.307,16.561 288,16.561 l 0,0 c 152.693,0 276.481,65.116 276.481,145.439 l 0,0 c 0,80.322 -123.788,145.439 -276.481,145.439 l 0,0 C 135.307,307.439 11.52,242.322 11.52,162"
+				id="path3446"
+			/>
+		</clipPath>
+		<radialGradient
+			cx="0"
+			cy="0"
+			fx="0"
+			fy="0"
+			gradientTransform="matrix(363.05789,0,0,-363.05789,177.52002,256.30713)"
+			gradientUnits="userSpaceOnUse"
+			id="radialGradient3452"
+			r="1"
+			spreadMethod="pad"
+		>
+			<stop id="stop3454" offset="0" style="stop-opacity:1;stop-color:#aeb2d5" />
+			<stop id="stop3456" offset="0.3" style="stop-opacity:1;stop-color:#aeb2d5" />
+			<stop id="stop3458" offset="0.75" style="stop-opacity:1;stop-color:#484c89" />
+			<stop id="stop3460" offset="1" style="stop-opacity:1;stop-color:#484c89" />
+		</radialGradient>
+		<clipPath clipPathUnits="userSpaceOnUse" id="clipPath3468">
+			<path d="M 0,324 576,324 576,0 0,0 0,324 Z" id="path3470" />
+		</clipPath>
+		<clipPath clipPathUnits="userSpaceOnUse" id="clipPath3480">
+			<path d="M 0,324 576,324 576,0 0,0 0,324 Z" id="path3482" />
+		</clipPath>
+	</defs>
+	<g id="g3438" transform="matrix(1.25,0,0,-1.25,-4.4,394.29875)">
+		<g id="g3440">
+			<g clip-path="url(#clipPath3444)" id="g3442">
+				<g id="g3448">
+					<g id="g3450">
+						<path
+							d="M 11.52,162 C 11.52,81.677 135.307,16.561 288,16.561 l 0,0 c 152.693,0 276.481,65.116 276.481,145.439 l 0,0 c 0,80.322 -123.788,145.439 -276.481,145.439 l 0,0 C 135.307,307.439 11.52,242.322 11.52,162"
+							id="path3462"
+							style="fill:url(#radialGradient3452);stroke:none"
+						/>
+					</g>
+				</g>
+			</g>
+		</g>
+		<g id="g3464">
+			<g clip-path="url(#clipPath3468)" id="g3466">
+				<g id="g3472" transform="translate(288,27.3594)">
+					<path
+						d="M 0,0 C 146.729,0 265.68,60.281 265.68,134.641 265.68,209 146.729,269.282 0,269.282 -146.729,269.282 -265.68,209 -265.68,134.641 -265.68,60.281 -146.729,0 0,0"
+						id="path3474"
+						style="fill:#777bb3;fill-opacity:1;fill-rule:nonzero;stroke:none"
+					/>
+				</g>
+			</g>
+		</g>
+		<g id="g3476">
+			<g clip-path="url(#clipPath3480)" id="g3478">
+				<g id="g3484" transform="translate(161.7344,145.3066)">
+					<path
+						d="m 0,0 c 12.065,0 21.072,2.225 26.771,6.611 5.638,4.341 9.532,11.862 11.573,22.353 1.903,9.806 1.178,16.653 -2.154,20.348 C 32.783,53.086 25.417,55 14.297,55 L -4.984,55 -15.673,0 0,0 Z m -63.063,-67.75 c -0.895,0 -1.745,0.4 -2.314,1.092 -0.57,0.691 -0.801,1.601 -0.63,2.48 L -37.679,81.573 C -37.405,82.982 -36.17,84 -34.734,84 L 26.32,84 C 45.508,84 59.79,78.79 68.767,68.513 77.792,58.182 80.579,43.741 77.05,25.592 75.614,18.198 73.144,11.331 69.709,5.183 66.27,-0.972 61.725,-6.667 56.198,-11.747 49.582,-17.939 42.094,-22.429 33.962,-25.071 25.959,-27.678 15.681,-29 3.414,-29 l -24.722,0 -7.06,-36.322 c -0.274,-1.41 -1.508,-2.428 -2.944,-2.428 l -31.751,0 z"
+						id="path3486"
+						style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
+					/>
+				</g>
+				<g id="g3488" transform="translate(159.2236,197.3071)">
+					<path
+						d="m 0,0 16.808,0 c 13.421,0 18.083,-2.945 19.667,-4.7 2.628,-2.914 3.124,-9.058 1.435,-17.767 C 36.012,-32.217 32.494,-39.13 27.452,-43.012 22.29,-46.986 13.898,-49 2.511,-49 L -9.523,-49 0,0 Z m 28.831,35 -61.055,0 c -2.872,0 -5.341,-2.036 -5.889,-4.855 l -28.328,-145.751 c -0.342,-1.759 0.12,-3.578 1.259,-4.961 1.14,-1.383 2.838,-2.183 4.63,-2.183 l 31.75,0 c 2.873,0 5.342,2.036 5.89,4.855 l 6.588,33.895 22.249,0 c 12.582,0 23.174,1.372 31.479,4.077 8.541,2.775 16.399,7.48 23.354,13.984 5.752,5.292 10.49,11.232 14.08,17.657 3.591,6.427 6.171,13.594 7.668,21.302 3.715,19.104 0.697,34.402 -8.969,45.466 C 63.965,29.444 48.923,35 28.831,35 m -45.633,-90 19.313,0 c 12.801,0 22.336,2.411 28.601,7.234 6.266,4.824 10.492,12.875 12.688,24.157 2.101,10.832 1.144,18.476 -2.871,22.929 C 36.909,3.773 28.87,6 16.808,6 L -4.946,6 -16.802,-55 M 28.831,29 C 47.198,29 60.597,24.18 69.019,14.539 77.44,4.898 79.976,-8.559 76.616,-25.836 75.233,-32.953 72.894,-39.46 69.601,-45.355 66.304,-51.254 61.999,-56.648 56.679,-61.539 50.339,-67.472 43.296,-71.7 35.546,-74.218 27.796,-76.743 17.925,-78 5.925,-78 l -27.196,0 -7.531,-38.75 -31.75,0 28.328,145.75 61.055,0"
+						id="path3490"
+						style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+					/>
+				</g>
+				<g id="g3492" transform="translate(311.583,116.3066)">
+					<path
+						d="m 0,0 c -0.896,0 -1.745,0.4 -2.314,1.092 -0.571,0.691 -0.802,1.6 -0.631,2.48 L 9.586,68.061 C 10.778,74.194 10.484,78.596 8.759,80.456 7.703,81.593 4.531,83.5 -4.848,83.5 L -27.55,83.5 -43.305,2.428 C -43.579,1.018 -44.814,0 -46.25,0 l -31.5,0 c -0.896,0 -1.745,0.4 -2.315,1.092 -0.57,0.691 -0.801,1.601 -0.63,2.48 l 28.328,145.751 c 0.274,1.409 1.509,2.427 2.945,2.427 l 31.5,0 c 0.896,0 1.745,-0.4 2.315,-1.091 0.57,-0.692 0.801,-1.601 0.63,-2.481 L -21.813,113 2.609,113 c 18.605,0 31.221,-3.28 38.569,-10.028 7.49,-6.884 9.827,-17.891 6.947,-32.719 L 34.945,2.428 C 34.671,1.018 33.437,0 32,0 L 0,0 Z"
+						id="path3494"
+						style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
+					/>
+				</g>
+				<g id="g3496" transform="translate(293.6611,271.0571)">
+					<path
+						d="m 0,0 -31.5,0 c -2.873,0 -5.342,-2.036 -5.89,-4.855 l -28.328,-145.751 c -0.342,-1.759 0.12,-3.578 1.26,-4.961 1.14,-1.383 2.838,-2.183 4.63,-2.183 l 31.5,0 c 2.872,0 5.342,2.036 5.89,4.855 l 15.283,78.645 20.229,0 c 9.363,0 11.328,-2 11.407,-2.086 0.568,-0.611 1.315,-3.441 0.082,-9.781 l -12.531,-64.489 c -0.342,-1.759 0.12,-3.578 1.26,-4.961 1.14,-1.383 2.838,-2.183 4.63,-2.183 l 32,0 c 2.872,0 5.342,2.036 5.89,4.855 l 13.179,67.825 c 3.093,15.921 0.447,27.864 -7.861,35.5 -7.928,7.281 -21.208,10.82 -40.599,10.82 l -20.784,0 6.143,31.605 C 6.231,-5.386 5.77,-3.566 4.63,-2.184 3.49,-0.801 1.792,0 0,0 m 0,-6 -7.531,-38.75 28.062,0 c 17.657,0 29.836,-3.082 36.539,-9.238 6.703,-6.16 8.711,-16.141 6.032,-29.938 l -13.18,-67.824 -32,0 12.531,64.488 c 1.426,7.336 0.902,12.34 -1.574,15.008 -2.477,2.668 -7.746,4.004 -15.805,4.004 l -25.176,0 -16.226,-83.5 -31.5,0 L -31.5,-6 0,-6"
+						id="path3498"
+						style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+					/>
+				</g>
+				<g id="g3500" transform="translate(409.5498,145.3066)">
+					<path
+						d="m 0,0 c 12.065,0 21.072,2.225 26.771,6.611 5.638,4.34 9.532,11.861 11.574,22.353 1.903,9.806 1.178,16.653 -2.155,20.348 C 32.783,53.086 25.417,55 14.297,55 L -4.984,55 -15.673,0 0,0 Z m -63.062,-67.75 c -0.895,0 -1.745,0.4 -2.314,1.092 -0.57,0.691 -0.802,1.601 -0.631,2.48 L -37.679,81.573 C -37.404,82.982 -36.17,84 -34.733,84 L 26.32,84 C 45.509,84 59.79,78.79 68.768,68.513 77.793,58.183 80.579,43.742 77.051,25.592 75.613,18.198 73.144,11.331 69.709,5.183 66.27,-0.972 61.725,-6.667 56.198,-11.747 49.582,-17.939 42.094,-22.429 33.962,-25.071 25.959,-27.678 15.681,-29 3.414,-29 l -24.723,0 -7.057,-36.322 c -0.275,-1.41 -1.509,-2.428 -2.946,-2.428 l -31.75,0 z"
+						id="path3502"
+						style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
+					/>
+				</g>
+				<g id="g3504" transform="translate(407.0391,197.3071)">
+					<path
+						d="M 0,0 16.808,0 C 30.229,0 34.891,-2.945 36.475,-4.7 39.104,-7.614 39.6,-13.758 37.91,-22.466 36.012,-32.217 32.493,-39.13 27.452,-43.012 22.29,-46.986 13.898,-49 2.511,-49 L -9.522,-49 0,0 Z m 28.831,35 -61.054,0 c -2.872,0 -5.341,-2.036 -5.889,-4.855 L -66.44,-115.606 c -0.342,-1.759 0.12,-3.578 1.259,-4.961 1.14,-1.383 2.838,-2.183 4.63,-2.183 l 31.75,0 c 2.872,0 5.342,2.036 5.89,4.855 l 6.587,33.895 22.249,0 c 12.582,0 23.174,1.372 31.479,4.077 8.541,2.775 16.401,7.481 23.356,13.986 5.752,5.291 10.488,11.23 14.078,17.655 3.591,6.427 6.171,13.594 7.668,21.302 3.715,19.105 0.697,34.403 -8.969,45.467 C 63.965,29.444 48.924,35 28.831,35 m -45.632,-90 19.312,0 c 12.801,0 22.336,2.411 28.601,7.234 6.267,4.824 10.492,12.875 12.688,24.157 2.102,10.832 1.145,18.476 -2.871,22.929 C 36.909,3.773 28.87,6 16.808,6 L -4.946,6 -16.801,-55 M 28.831,29 C 47.198,29 60.597,24.18 69.019,14.539 77.441,4.898 79.976,-8.559 76.616,-25.836 75.233,-32.953 72.894,-39.46 69.601,-45.355 66.304,-51.254 61.999,-56.648 56.679,-61.539 50.339,-67.472 43.296,-71.7 35.546,-74.218 27.796,-76.743 17.925,-78 5.925,-78 l -27.196,0 -7.53,-38.75 -31.75,0 28.328,145.75 61.054,0"
+						id="path3506"
+						style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+					/>
+				</g>
+			</g>
+		</g>
+	</g>
+</svg>

package/package/components/icons/PHPIcon.svelte.d.ts

@@ -0,0 +1,17 @@
+import { SvelteComponent } from "svelte";
+declare const __propDef: {
+    props: {
+        height?: string | undefined;
+        width?: string | undefined;
+    };
+    events: {
+        [evt: string]: CustomEvent<any>;
+    };
+    slots: {};
+};
+export type PhpIconProps = typeof __propDef.props;
+export type PhpIconEvents = typeof __propDef.events;
+export type PhpIconSlots = typeof __propDef.slots;
+export default class PhpIcon extends SvelteComponent<PhpIconProps, PhpIconEvents, PhpIconSlots> {
+}
+export {};

package/package/components/instanceSettings.d.ts

@@ -6,7 +6,7 @@ export interface Setting {
     ee_only?: string;
     tooltip?: string;
     key: string;
-    fieldType: 'text' | 'number' | 'boolean' | 'password' | 'select' | 'textarea' | 'seconds' | 'email' | 'license_key' | 'object_store_config';
+    fieldType: 'text' | 'number' | 'boolean' | 'password' | 'select' | 'textarea' | 'seconds' | 'email' | 'license_key' | 'object_store_config' | 'critical_error_channels';
     storage: SettingStorage;
     isValid?: (value: any) => boolean;
     error?: string;

package/package/components/instanceSettings.js

@@ -48,6 +48,14 @@ export const settings = {
             placeholder: 'only needed to prepare upgrade to EE',
             storage: 'setting'
         },
+        {
+            label: 'Non-prod instance',
+            description: 'Whether we should consider the reported usage of this instance as non-prod',
+            key: 'dev_instance',
+            fieldType: 'boolean',
+            storage: 'setting',
+            ee_only: 'This is only relevant for EE'
+        },
         {
             label: 'Retention Period in secs',
             key: 'retention_period_secs',
@@ -67,13 +75,21 @@ export const settings = {
             ee_only: ''
         },
         {
-            label: 'S3/Azure for Python Cache & Large Logs',
-            description: 'Bucket to store large logs and cache for distributed python jobs.',
+            label: 'S3/Azure for Python/Go Cache & Large Logs',
+            description: 'Bucket to store large logs and global cache for Python and Go.',
             key: 'object_store_cache_config',
             fieldType: 'object_store_config',
             storage: 'setting',
             ee_only: ''
         },
+        {
+            label: 'Critical Error Channels',
+            description: 'Channels to send critical errors to. SMTP must be configured for the email channel.',
+            key: 'critical_error_channels',
+            fieldType: 'critical_error_channels',
+            storage: 'setting',
+            ee_only: 'Channels other than tracing are only available in the EE version'
+        },
         {
             label: 'Azure OpenAI base path',
             description: 'All Windmill AI features will run on the specified deployed model. Format: https://{your-resource-name}.openai.azure.com/openai/deployments/{deployment-id}',

package/package/components/jobs/JobPreview.svelte

@@ -97,6 +97,11 @@ onDestroy(() => {
 				{#if job?.['duration_ms']}
 					<DurationMs duration_ms={job?.['duration_ms']} />
 				{/if}
+				{#if job?.['labels'] && Array.isArray(job?.['labels']) && job?.['labels'].length > 0}
+					{#each job?.['labels'] as label}
+						<Badge>Label: {label}</Badge>
+					{/each}
+				{/if}
 			</div>
 			<div class="w-1/2 h-full overflow-auto">
 				<JobArgs args={job?.args} />