Merge branch 'next' into release-2025-02-13

evidence-dev · Feb 13, 2025 · 606f4a4 · 606f4a4
2 parents 88ad902 + 2d50ad0
commit 606f4a4
Show file tree

Hide file tree

Showing 6 changed files with 45 additions and 280 deletions.
diff --git a/.changeset/cool-vans-lick.md b/.changeset/cool-vans-lick.md
@@ -0,0 +1,5 @@
+---
+'@evidence-dev/sdk': patch
+---
+
+Handle malformed source directories when creating new sources
diff --git a/.changeset/nasty-pumas-wait.md b/.changeset/nasty-pumas-wait.md
@@ -0,0 +1,5 @@
+---
+'@evidence-dev/core-components': patch
+---
+
+Dont hide entire kebab menu when neverShowQueries is true
diff --git a/packages/lib/sdk/src/plugins/datasources/writeSourceConfig.js b/packages/lib/sdk/src/plugins/datasources/writeSourceConfig.js
@@ -36,7 +36,11 @@ export const writeSourceConfig = async (options, source, spinner) => {
 		yaml.stringify(encodeBase64Deep(secrets))
 	].join('\n');
 
-	if (!source.dir) {
+	if (
+		!source.dir ||
+		!path.dirname(source.dir).startsWith(sourcesDirectory) ||
+		!path.isAbsolute(source.dir)
+	) {
 		source.dir = path.join(sourcesDirectory, source.name);
 	}
 

diff --git a/packages/ui/core-components/src/lib/organisms/layout/header/Header.svelte b/packages/ui/core-components/src/lib/organisms/layout/header/Header.svelte
@@ -1,5 +1,4 @@
 <script>
-	import { dev } from '$app/environment';
 	import { Icon } from '@steeze-ui/svelte-icon';
 	import { X, Menu2 } from '@steeze-ui/tabler-icons';
 	import { addBasePath } from '@evidence-dev/sdk/utils/svelte';
@@ -118,9 +117,7 @@
 				{/if}
 			</div>
 			<div class="relative">
-				{#if dev || !neverShowQueries}
-					<KebabMenu />
-				{/if}
+				<KebabMenu {neverShowQueries} />
 			</div>
 		</div>
 	</div>

diff --git a/packages/ui/core-components/src/lib/organisms/layout/header/KebabMenu.svelte b/packages/ui/core-components/src/lib/organisms/layout/header/KebabMenu.svelte
@@ -26,6 +26,9 @@
 	}
 
 	const { selectedAppearance, activeAppearance, cycleAppearance, themesConfig } = getThemeStores();
+
+	export let neverShowQueries;
+
 	$: themeLabel =
 		$selectedAppearance === 'system'
 			? 'System'
@@ -47,14 +50,17 @@
 				Print PDF
 				<DropdownMenu.Shortcut>⌘P</DropdownMenu.Shortcut>
 			</DropdownMenu.Item>
-			<DropdownMenu.Item
-				on:click={(e) => {
-					e.preventDefault();
-					showQueries.update((val) => !val);
-				}}
-			>
-				{$showQueries ? 'Hide ' : 'Show '} Queries
-			</DropdownMenu.Item>
+			{#if dev || !neverShowQueries}
+				<DropdownMenu.Item
+					on:click={(e) => {
+						e.preventDefault();
+						showQueries.update((val) => !val);
+					}}
+				>
+					{$showQueries ? 'Hide ' : 'Show '} Queries
+				</DropdownMenu.Item>
+			{/if}
+
 			{#if themesConfig.appearance.switcher}
 				<DropdownMenu.Item
 					on:click={(e) => {