Merge branch 'feature/stock-item-link' into dev

This commit is contained in:
2026-02-11 14:45:28 +01:00
4 changed files with 45 additions and 5 deletions

View File

@@ -103,7 +103,8 @@
<Route path="/search" component={Search} /> <Route path="/search" component={Search} />
<Route path="/stock" component={Stock} /> <Route path="/stock" component={Stock} />
<Route path="/stock/location/:location_id" component={Stock} /> <Route path="/stock/location/:location_id" component={Stock} />
<Route path="/stock/:owner/:owner_id/item/:item_id" component={Stock} /> <Route path="/stock/item/:item_id/view" component={Stock} />
<Route path="/stock/:owner/:owner_id/item/:owner_number" component={Stock} />
<Route path="/tags" component={TagList} /> <Route path="/tags" component={TagList} />
<Route path="/tags/use/:tag" component={TagUses} /> <Route path="/tags/use/:tag" component={TagUses} />
<Route path="/task" component={TaskList} /> <Route path="/task" component={TaskList} />

View File

@@ -1,5 +1,6 @@
<script> <script>
import { onMount } from 'svelte'; import { onMount } from 'svelte';
import { useTinyRouter } from 'svelte-tiny-router';
import { api, drop, get, patch } from '../../urls.svelte'; import { api, drop, get, patch } from '../../urls.svelte';
import { error, yikes } from '../../warn.svelte'; import { error, yikes } from '../../warn.svelte';
import { t } from '../../translations.svelte'; import { t } from '../../translations.svelte';
@@ -17,8 +18,9 @@
let location = $state(null); let location = $state(null);
let draggedItem = $state(null) let draggedItem = $state(null)
let draggedLocation = $state(null) let draggedLocation = $state(null)
let { item_id, location_id, owner, owner_id } = $props(); let { item_id, location_id, owner, owner_id, owner_number } = $props();
let skip_location = false; // disable effect on setting location within loadItem() let skip_location = false; // disable effect on setting location within loadItem()
let router = useTinyRouter();
$effect(() => { $effect(() => {
// This effect runs whenever `location` changes // This effect runs whenever `location` changes
@@ -98,8 +100,8 @@
} }
async function loadItem(){ async function loadItem(){
if (!item_id) return; if (!owner_number) return;
const url = api(`stock/${owner}/${owner_id}/item/${item_id}`); const url = api(`stock/${owner}/${owner_id}/item/${owner_number}`);
const res = await get(url); const res = await get(url);
if (res.ok){ if (res.ok){
yikes(); yikes();
@@ -116,7 +118,7 @@
} }
} }
for (let i of json.items){ for (let i of json.items){
if (i.owner_number == +item_id) item = i; if (i.owner_number == +owner_number) item = i;
} }
} else { } else {
error(res); error(res);
@@ -170,12 +172,27 @@
} }
async function load(){ async function load(){
await preload();
await loadUserLocations(); await loadUserLocations();
await loadPath(); await loadPath();
await loadProperties(); await loadProperties();
await loadItem(); await loadItem();
} }
async function preload(){
if (item_id) {
let url = api(`stock/item/${item_id}`);
const res = await get(url);
if (res.ok){
const json = await res.json();
owner = json.owner.type;
owner_id = json.owner.id;
owner_number = json.owner_number;
location_id = json.location.id;
}
}
}
function moveToTop(loc){ function moveToTop(loc){
if (patchLocation(location,'parent_location_id',0)){ if (patchLocation(location,'parent_location_id',0)){
loc.parent_location_id = 0; loc.parent_location_id = 0;

View File

@@ -75,6 +75,11 @@
</div> </div>
<table> <table>
<tbody> <tbody>
<tr>
<td>{t('ID')}</td>
<td>{item.id}</td>
</tr>
<tr> <tr>
<td>{t('Code')}:</td> <td>{t('Code')}:</td>
<td> <td>

View File

@@ -120,6 +120,7 @@ public class StockModule extends BaseHandler implements StockService {
yield super.doGet(path,ex); yield super.doGet(path,ex);
} }
} }
case Path.ITEM -> getItemById(user.get(),path,ex);
case Path.LOCATION -> { case Path.LOCATION -> {
try { try {
var location = Location.of(Long.parseLong(path.pop())); var location = Location.of(Long.parseLong(path.pop()));
@@ -162,6 +163,22 @@ public class StockModule extends BaseHandler implements StockService {
} }
} }
private boolean getItemById(UmbrellaUser user, de.srsoftware.tools.Path path, HttpExchange ex) throws IOException {
var head = path.pop();
if (head == null) throw missingField(Field.ID);
try {
var itemId = Long.parseLong(head);
var item = stockDb.loadItem(itemId);
var owner = item.location().resolve().owner().resolve();
boolean allowed = owner instanceof UmbrellaUser u && user.equals(u);
allowed = allowed || owner instanceof Company c && companyService().membership(c.id(),user.id());
if (!allowed) throw forbidden("You are not allowed to access item {id}",ID,itemId);
return sendContent(ex,item);
} catch (NumberFormatException e) {
throw invalidField(Field.ID, Text.NUMBER);
}
}
@Override @Override
public boolean doPatch(de.srsoftware.tools.Path path, HttpExchange ex) throws IOException { public boolean doPatch(de.srsoftware.tools.Path path, HttpExchange ex) throws IOException {
addCors(ex); addCors(ex);