Implement upsert label flow and use-based mark gone handling
ci/woodpecker/push/woodpecker Pipeline was successful
ci/woodpecker/push/woodpecker Pipeline was successful
This commit is contained in:
+9
-14
@@ -20,7 +20,7 @@ function isSameOriginBaseUrl(baseUrl) {
|
||||
}
|
||||
}
|
||||
|
||||
function buildPathname({ database, kitchenId, path, includeKitchen = true }) {
|
||||
function buildPathname({ database, path }) {
|
||||
const encodedDatabase = encodeURIComponent(database);
|
||||
const rawPath = String(path || '').replace(/^\/+/, '');
|
||||
const keepTrailingSlash = rawPath.endsWith('/');
|
||||
@@ -30,23 +30,17 @@ function buildPathname({ database, kitchenId, path, includeKitchen = true }) {
|
||||
.map((segment) => encodeURIComponent(segment));
|
||||
const segments = [encodedDatabase];
|
||||
|
||||
if (includeKitchen && kitchenId) {
|
||||
segments.push('kitchen', encodeURIComponent(String(kitchenId)));
|
||||
}
|
||||
|
||||
segments.push(...encodedPathSegments);
|
||||
|
||||
const pathname = `/${segments.join('/')}`;
|
||||
return keepTrailingSlash ? `${pathname}/` : pathname;
|
||||
}
|
||||
|
||||
function buildUrl({ baseUrl, database, kitchenId, path, query = {}, includeKitchen = true }) {
|
||||
function buildUrl({ baseUrl, database, path, query = {} }) {
|
||||
const cleanBaseUrl = normalizeBaseUrl(baseUrl);
|
||||
const pathname = buildPathname({
|
||||
database,
|
||||
kitchenId,
|
||||
path,
|
||||
includeKitchen,
|
||||
});
|
||||
const searchParams = new URLSearchParams();
|
||||
|
||||
@@ -191,6 +185,10 @@ function isKitchensPath(path) {
|
||||
return String(path || '').replace(/^\/+/, '').replace(/\/+$/, '') === API_PATHS.kitchens;
|
||||
}
|
||||
|
||||
function isKitchenApiPath(path) {
|
||||
return String(path || '').replace(/^\/+/, '').startsWith('kitchen/');
|
||||
}
|
||||
|
||||
function shouldInvalidateValidatedSession(store, path, options = {}) {
|
||||
if (options.skipAuthFailureHandler) {
|
||||
return false;
|
||||
@@ -202,15 +200,16 @@ function shouldInvalidateValidatedSession(store, path, options = {}) {
|
||||
|
||||
return (
|
||||
isKitchensPath(path) ||
|
||||
options.includeKitchen !== false ||
|
||||
isKitchenApiPath(path) ||
|
||||
path === API_PATHS.items ||
|
||||
path === API_PATHS.locations ||
|
||||
path === API_PATHS.changes ||
|
||||
String(path || '').startsWith(`${API_PATHS.items}/`)
|
||||
);
|
||||
}
|
||||
|
||||
export async function apiRequest(store, path, options = {}) {
|
||||
const { config, session, activeKitchen } = store;
|
||||
const { config, session } = store;
|
||||
|
||||
if (!config.database) {
|
||||
throw new Error('Database name is required.');
|
||||
@@ -220,10 +219,8 @@ export async function apiRequest(store, path, options = {}) {
|
||||
const url = buildUrl({
|
||||
baseUrl: config.baseUrl,
|
||||
database: config.database,
|
||||
kitchenId: activeKitchen?.id,
|
||||
path,
|
||||
query: options.query,
|
||||
includeKitchen: options.includeKitchen !== false,
|
||||
});
|
||||
const headers = new Headers(options.headers || {});
|
||||
headers.set('Accept', options.accept || 'application/json');
|
||||
@@ -304,9 +301,7 @@ export function buildKitchenApiUrl(store, path, query = {}) {
|
||||
return buildUrl({
|
||||
baseUrl: store.config.baseUrl,
|
||||
database: store.config.database,
|
||||
kitchenId: store.activeKitchen?.id,
|
||||
path,
|
||||
query,
|
||||
includeKitchen: true,
|
||||
});
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user