Return Nodes vs. FilterPanel *add* button, allow admin view, show tag…

… editing stubs
basf · Sep 20, 2023 · 2d26253 · 2d26253
1 parent d82c2b1
commit 2d26253
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 6 deletions.
diff --git a/src/components/FilterPanel/FilterPanel.svelte b/src/components/FilterPanel/FilterPanel.svelte
@@ -1,5 +1,10 @@
 <div class="py-2">
 	<Grid>
+		{#if add}
+			<Col col="auto">
+				<IconButton size="lg" {icon} variant="primary" {tooltip} on:click={action} />
+			</Col>
+		{/if}
 		<Col>
 			<InputGroup>
 				<Autocomplete
@@ -29,7 +34,7 @@
 
 <script lang="ts" context="module">
 	import { pattern, query, type Param, type Params } from 'svelte-pathfinder';
-	import { Autocomplete, Col, Grid, InputGroup, Select } from 'svelte-spectre';
+	import { Autocomplete, Col, Grid, IconButton, InputGroup, Select } from 'svelte-spectre';
 
 	import { autoColor } from '@/helpers/style';
 	import { filters, type CollectionDTO } from '@/stores/filters';
@@ -48,6 +53,11 @@
 </script>
 
 <script lang="ts">
+	export let add = true;
+	export let icon = 'plus';
+	export let tooltip = 'Add item';
+	export let action = () => {};
+
 	let selected: Tag[] = [];
 	let predefined: Tag[] = [];
 

diff --git a/src/pages/DataSources.svelte b/src/pages/DataSources.svelte
@@ -1,10 +1,14 @@
 <Main>
-	<Nodes asyncData={$datasourcesAsync}>
+	<Nodes
+		asyncData={$datasourcesAsync}
+		addTooltip="Add data"
+		addAction={() => goto('/import')}
+	>
 		<svelte:fragment let:item>
 			<Col col="12">
 				<DataSource datasource={item}>
 					<TileTags datasourceId={item.id} />
-					{#if $user?.id === item.userId}
+					{#if $user?.id === item.userId || $user.roleSlug === 'admin'}
 						<TileMenu items={tileMenuItems(item.type)} dataId={item.id} />
 					{/if}
 				</DataSource>

diff --git a/src/pages/Tags.svelte b/src/pages/Tags.svelte
@@ -1,8 +1,8 @@
 <Main>
 	<Nodes
 		asyncData={$collectionsAsync}
-		addTooltip="Add collection"
-		addAction={() => openEdit()}
+		addTooltip="Add a new tag"
+		addAction={() => openEdit('new')}
 		bind:width
 	>
 		<svelte:fragment slot="loader">

diff --git a/src/views/tiles/Collection.svelte b/src/views/tiles/Collection.svelte
@@ -31,6 +31,13 @@
 						title="Edit collection"
 						on:click={() => dispatch('edit', { id })}
 					/>
+				{:else}
+					<IconButton
+						icon="edit"
+						size="sm"
+						variant="error"
+						title="Editing disabled"
+					/>
 				{/if}
 			</slot>
 		</svelte:fragment>

diff --git a/src/views/tiles/DataSource.svelte b/src/views/tiles/DataSource.svelte
@@ -16,7 +16,7 @@
 		</svelte:fragment>
 		<svelte:fragment slot="subtitle">
 			<small class="text-gray">
-				{#if $user.roleSlug == 'admin'}
+				{#if $user.roleSlug === 'admin'}
 					Added {showTimestamp(datasource)} by {datasource.userFirstName} {datasource.userLastName}
 				{:else}
 					Added {showTimestamp(datasource)}