mirror of
https://github.com/mauriceboe/TREK.git
synced 2026-06-20 13:51:45 +00:00
fix: miscellaneous bug fixes (#1139)
* fix(share): serve place thumbnails in shared trip links (#1100) Google-sourced place photos are stored as image_url pointing at the JWT-guarded /api/maps/place-photo/:placeId/bytes endpoint, so they 401 for an unauthenticated shared-trip viewer and render as broken images. Rewrite place image_url values in the shared payload to a public, token-scoped proxy (/api/shared/:token/place-photo/:placeId/bytes) and add an unguarded SharedController route that validates the token and that the place belongs to its trip before streaming the cached bytes. Mirrors the existing JourneyPublicController precedent. No client changes needed. * fix(atlas): replace Natural Earth with geoBoundaries for up-to-date regions (#1119) Atlas sourced country and sub-national boundaries from Natural Earth's GitHub `master` at runtime. That data is stale (e.g. it still shows Norway's pre-2020 counties such as Oppland/Hordaland) and depicts some contested territory in unwanted ways (nvkelso/natural-earth-vector#391), so Natural Earth is dropped entirely. - Country borders (admin0) now come from the geoBoundaries CGAZ composite; sub-national regions (admin1) from per-country gbOpen, which carries ISO 3166-2 codes. A new script (server/scripts/build-atlas-geo.mjs) normalizes and quantizes them into committed gzipped bundles under server/assets/atlas, read server-side at runtime (no network at boot, no GitHub CSP allowlist entry). - New GET /addons/atlas/countries/geo serves the country layer; the client fetches it from the API instead of GitHub. - A migration reconciles manually-marked visited_regions against the new bundle (valid code -> keep; region name still matches -> re-code; curated merge crosswalk for renamed reforms; else leave intact), with UNIQUE-safe dedup. bucket_list and visited_countries hold only invariant alpha-2 country codes, so they are untouched. - Attribution added (NOTICE.md + README) per geoBoundaries CC BY 4.0. Closes #1119 * fix(packing): make templates admin-only to create, usable by members Creating a packing-list template was gated only by trip access, so any trip member could create one from the Lists feature, while applying a template silently failed for non-admins because the apply dropdown was populated from the AdminGuard-protected /api/admin/packing-templates endpoint. - save-as-template now returns 403 for non-admins; the Save-as-Template button is hidden unless the user is an admin (both the TripPlanner toolbar and the inline packing header). - add member-accessible GET /api/trips/:tripId/packing/templates so the apply dropdown lists templates for any trip member; client fetches from it instead of the admin endpoint. Closes #1120 Closes #1121 * fix(packing): show bag tracking to non-admin members The global Bag Tracking toggle was only readable via the admin-gated GET /api/admin/bag-tracking, so non-admin trip members got 403 and the weight fields, bag circles, and BAGS sidebar never rendered (#1124). Surface the flag through the already-authenticated GET /api/addons (loaded into the client addon store on app start for every user); the packing hook reads it from the store instead of the admin endpoint. The admin write path stays admin-gated and unchanged.
This commit is contained in:
jubnl
@@ -7,7 +7,7 @@ import { server } from '../../../tests/helpers/msw/server';
|
||||
import { useAuthStore } from '../../store/authStore';
|
||||
import { useTripStore } from '../../store/tripStore';
|
||||
import { resetAllStores, seedStore } from '../../../tests/helpers/store';
|
||||
import { buildUser, buildTrip, buildPackingItem } from '../../../tests/helpers/factories';
|
||||
import { buildUser, buildAdmin, buildTrip, buildPackingItem } from '../../../tests/helpers/factories';
|
||||
import PackingListPanel, { itemWeight } from './PackingListPanel';
|
||||
|
||||
describe('itemWeight (bag total weight calc)', () => {
|
||||
@@ -34,10 +34,10 @@ beforeEach(() => {
|
||||
http.get('/api/trips/:id/packing/category-assignees', () =>
|
||||
HttpResponse.json({ assignees: {} })
|
||||
),
|
||||
http.get('/api/admin/bag-tracking', () =>
|
||||
HttpResponse.json({ enabled: false })
|
||||
http.get('/api/addons', () =>
|
||||
HttpResponse.json({ bagTracking: false, addons: [] })
|
||||
),
|
||||
http.get('/api/admin/packing-templates', () =>
|
||||
http.get('/api/trips/:id/packing/templates', () =>
|
||||
HttpResponse.json({ templates: [] })
|
||||
),
|
||||
);
|
||||
@@ -381,7 +381,7 @@ describe('PackingListPanel', () => {
|
||||
|
||||
it('FE-COMP-PACKING-030: packing template button present when templates available', async () => {
|
||||
server.use(
|
||||
http.get('/api/admin/packing-templates', () =>
|
||||
http.get('/api/trips/:id/packing/templates', () =>
|
||||
HttpResponse.json({ templates: [{ id: 1, name: 'Beach Trip', item_count: 5 }] })
|
||||
)
|
||||
);
|
||||
@@ -457,8 +457,8 @@ describe('PackingListPanel', () => {
|
||||
|
||||
it('FE-COMP-PACKING-034: bag tracking enabled shows Bags button and bag sidebar', async () => {
|
||||
server.use(
|
||||
http.get('/api/admin/bag-tracking', () =>
|
||||
HttpResponse.json({ enabled: true })
|
||||
http.get('/api/addons', () =>
|
||||
HttpResponse.json({ bagTracking: true, addons: [] })
|
||||
),
|
||||
http.get('/api/trips/:id/packing/bags', () =>
|
||||
HttpResponse.json({ bags: [{ id: 1, name: 'Carry-on', color: '#6366f1', weight_limit_grams: null, members: [] }] })
|
||||
@@ -556,8 +556,8 @@ describe('PackingListPanel', () => {
|
||||
it('FE-COMP-PACKING-039: bag modal opens when Bags button clicked with bag tracking enabled', async () => {
|
||||
const user = userEvent.setup();
|
||||
server.use(
|
||||
http.get('/api/admin/bag-tracking', () =>
|
||||
HttpResponse.json({ enabled: true })
|
||||
http.get('/api/addons', () =>
|
||||
HttpResponse.json({ bagTracking: true, addons: [] })
|
||||
),
|
||||
http.get('/api/trips/:id/packing/bags', () =>
|
||||
HttpResponse.json({ bags: [{ id: 1, name: 'Main Bag', color: '#6366f1', weight_limit_grams: null, members: [] }] })
|
||||
@@ -585,8 +585,8 @@ describe('PackingListPanel', () => {
|
||||
|
||||
it('FE-COMP-PACKING-040: bag sidebar renders BagCard with bag name when enabled and bags exist', async () => {
|
||||
server.use(
|
||||
http.get('/api/admin/bag-tracking', () =>
|
||||
HttpResponse.json({ enabled: true })
|
||||
http.get('/api/addons', () =>
|
||||
HttpResponse.json({ bagTracking: true, addons: [] })
|
||||
),
|
||||
http.get('/api/trips/:id/packing/bags', () =>
|
||||
HttpResponse.json({ bags: [{ id: 5, name: 'Backpack', color: '#10b981', weight_limit_grams: 10000, members: [] }] })
|
||||
@@ -601,26 +601,36 @@ describe('PackingListPanel', () => {
|
||||
});
|
||||
});
|
||||
|
||||
it('FE-COMP-PACKING-041: save-as-template button present when items exist', async () => {
|
||||
it('FE-COMP-PACKING-041: save-as-template button present for admins when items exist', async () => {
|
||||
seedStore(useAuthStore, { user: buildAdmin(), isAuthenticated: true });
|
||||
const user = userEvent.setup();
|
||||
const items = [buildPackingItem({ name: 'Sunscreen', category: 'Toiletries' })];
|
||||
const { container } = render(<PackingListPanel tripId={1} items={items} />);
|
||||
render(<PackingListPanel tripId={1} items={items} />);
|
||||
|
||||
// Save-as-template button uses FolderPlus icon and "Save as template" text
|
||||
const folderPlusBtn = container.querySelector('svg.lucide-folder-plus')?.closest('button');
|
||||
expect(folderPlusBtn).toBeTruthy();
|
||||
// Save-as-template button shows its label "Save as template"
|
||||
const saveBtn = screen.getByText('Save as template').closest('button');
|
||||
expect(saveBtn).toBeTruthy();
|
||||
|
||||
// Click to show the name input
|
||||
await user.click(folderPlusBtn!);
|
||||
await user.click(saveBtn!);
|
||||
|
||||
// Template name input appears
|
||||
expect(await screen.findByPlaceholderText('Template name')).toBeInTheDocument();
|
||||
});
|
||||
|
||||
it('FE-COMP-PACKING-041b: save-as-template button hidden for non-admins', () => {
|
||||
// Default seeded user (beforeEach) is a non-admin trip owner with edit rights.
|
||||
const items = [buildPackingItem({ name: 'Sunscreen', category: 'Toiletries' })];
|
||||
render(<PackingListPanel tripId={1} items={items} />);
|
||||
|
||||
// The "Save as template" action must not be available to normal users.
|
||||
expect(screen.queryByText('Save as template')).not.toBeInTheDocument();
|
||||
});
|
||||
|
||||
it('FE-COMP-PACKING-042: apply template dropdown opens when template button clicked', async () => {
|
||||
const user = userEvent.setup();
|
||||
server.use(
|
||||
http.get('/api/admin/packing-templates', () =>
|
||||
http.get('/api/trips/:id/packing/templates', () =>
|
||||
HttpResponse.json({ templates: [{ id: 2, name: 'Summer Packing', item_count: 10 }] })
|
||||
)
|
||||
);
|
||||
@@ -658,8 +668,8 @@ describe('PackingListPanel', () => {
|
||||
|
||||
it('FE-COMP-PACKING-044: bag item row shows weight input and bag button when bag tracking enabled', async () => {
|
||||
server.use(
|
||||
http.get('/api/admin/bag-tracking', () =>
|
||||
HttpResponse.json({ enabled: true })
|
||||
http.get('/api/addons', () =>
|
||||
HttpResponse.json({ bagTracking: true, addons: [] })
|
||||
),
|
||||
http.get('/api/trips/:id/packing/bags', () =>
|
||||
HttpResponse.json({ bags: [] })
|
||||
@@ -706,6 +716,7 @@ describe('PackingListPanel', () => {
|
||||
});
|
||||
|
||||
it('FE-COMP-PACKING-046: save-as-template form submission calls saveAsTemplate API', async () => {
|
||||
seedStore(useAuthStore, { user: buildAdmin(), isAuthenticated: true });
|
||||
const user = userEvent.setup();
|
||||
let savedTemplateName = '';
|
||||
server.use(
|
||||
@@ -714,16 +725,16 @@ describe('PackingListPanel', () => {
|
||||
savedTemplateName = String(body.name);
|
||||
return HttpResponse.json({ success: true });
|
||||
}),
|
||||
http.get('/api/admin/packing-templates', () =>
|
||||
http.get('/api/trips/:id/packing/templates', () =>
|
||||
HttpResponse.json({ templates: [] })
|
||||
)
|
||||
);
|
||||
const items = [buildPackingItem({ name: 'Item', category: 'Test' })];
|
||||
const { container } = render(<PackingListPanel tripId={1} items={items} />);
|
||||
render(<PackingListPanel tripId={1} items={items} />);
|
||||
|
||||
// Click the FolderPlus "Save as template" button
|
||||
const folderPlusBtn = container.querySelector('svg.lucide-folder-plus')?.closest('button');
|
||||
await user.click(folderPlusBtn!);
|
||||
// Click the "Save as template" button
|
||||
const saveBtn = screen.getByText('Save as template').closest('button');
|
||||
await user.click(saveBtn!);
|
||||
|
||||
// Type template name
|
||||
const nameInput = await screen.findByPlaceholderText('Template name');
|
||||
@@ -736,8 +747,8 @@ describe('PackingListPanel', () => {
|
||||
it('FE-COMP-PACKING-047: bag picker in item row opens when clicked with bag tracking enabled', async () => {
|
||||
const user = userEvent.setup();
|
||||
server.use(
|
||||
http.get('/api/admin/bag-tracking', () =>
|
||||
HttpResponse.json({ enabled: true })
|
||||
http.get('/api/addons', () =>
|
||||
HttpResponse.json({ bagTracking: true, addons: [] })
|
||||
),
|
||||
http.get('/api/trips/:id/packing/bags', () =>
|
||||
HttpResponse.json({ bags: [{ id: 3, name: 'Carry-on', color: '#ec4899', weight_limit_grams: null, members: [] }] })
|
||||
@@ -765,8 +776,8 @@ describe('PackingListPanel', () => {
|
||||
it('FE-COMP-PACKING-048: add bag in bag modal opens form when "Add bag" clicked', async () => {
|
||||
const user = userEvent.setup();
|
||||
server.use(
|
||||
http.get('/api/admin/bag-tracking', () =>
|
||||
HttpResponse.json({ enabled: true })
|
||||
http.get('/api/addons', () =>
|
||||
HttpResponse.json({ bagTracking: true, addons: [] })
|
||||
),
|
||||
http.get('/api/trips/:id/packing/bags', () =>
|
||||
HttpResponse.json({ bags: [{ id: 1, name: 'Main Bag', color: '#6366f1', weight_limit_grams: null, members: [] }] })
|
||||
@@ -805,8 +816,8 @@ describe('PackingListPanel', () => {
|
||||
let putBody: Record<string, unknown> | null = null;
|
||||
const itemId = 120;
|
||||
server.use(
|
||||
http.get('/api/admin/bag-tracking', () =>
|
||||
HttpResponse.json({ enabled: true })
|
||||
http.get('/api/addons', () =>
|
||||
HttpResponse.json({ bagTracking: true, addons: [] })
|
||||
),
|
||||
http.get('/api/trips/:id/packing/bags', () =>
|
||||
HttpResponse.json({ bags: [] })
|
||||
@@ -861,8 +872,8 @@ describe('PackingListPanel', () => {
|
||||
const itemId = 130;
|
||||
let putBody: Record<string, unknown> | null = null;
|
||||
server.use(
|
||||
http.get('/api/admin/bag-tracking', () =>
|
||||
HttpResponse.json({ enabled: true })
|
||||
http.get('/api/addons', () =>
|
||||
HttpResponse.json({ bagTracking: true, addons: [] })
|
||||
),
|
||||
http.get('/api/trips/:id/packing/bags', () =>
|
||||
HttpResponse.json({ bags: [{ id: 7, name: 'Trolley', color: '#10b981', weight_limit_grams: null, members: [] }] })
|
||||
@@ -930,8 +941,8 @@ describe('PackingListPanel', () => {
|
||||
it('FE-COMP-PACKING-054: item with assigned bag shows "Unassigned" option in bag picker', async () => {
|
||||
const itemId = 140;
|
||||
server.use(
|
||||
http.get('/api/admin/bag-tracking', () =>
|
||||
HttpResponse.json({ enabled: true })
|
||||
http.get('/api/addons', () =>
|
||||
HttpResponse.json({ bagTracking: true, addons: [] })
|
||||
),
|
||||
http.get('/api/trips/:id/packing/bags', () =>
|
||||
HttpResponse.json({ bags: [{ id: 5, name: 'MyBag', color: '#ec4899', weight_limit_grams: null, members: [] }] })
|
||||
@@ -957,7 +968,7 @@ describe('PackingListPanel', () => {
|
||||
it('FE-COMP-PACKING-055: apply template button click opens template dropdown and shows template', async () => {
|
||||
const user = userEvent.setup();
|
||||
server.use(
|
||||
http.get('/api/admin/packing-templates', () =>
|
||||
http.get('/api/trips/:id/packing/templates', () =>
|
||||
HttpResponse.json({ templates: [{ id: 3, name: 'Weekend Pack', item_count: 8 }] })
|
||||
)
|
||||
);
|
||||
@@ -1124,7 +1135,7 @@ describe('PackingListPanel', () => {
|
||||
const user = userEvent.setup();
|
||||
let applyCalled = false;
|
||||
server.use(
|
||||
http.get('/api/admin/packing-templates', () =>
|
||||
http.get('/api/trips/:id/packing/templates', () =>
|
||||
HttpResponse.json({ templates: [{ id: 5, name: 'Beach Trip', item_count: 12 }] })
|
||||
),
|
||||
http.post('/api/trips/1/packing/apply-template/5', () => {
|
||||
@@ -1177,7 +1188,7 @@ describe('PackingListPanel', () => {
|
||||
const user = userEvent.setup();
|
||||
let createBody: Record<string, unknown> | null = null;
|
||||
server.use(
|
||||
http.get('/api/admin/bag-tracking', () => HttpResponse.json({ enabled: true })),
|
||||
http.get('/api/addons', () => HttpResponse.json({ bagTracking: true, addons: [] })),
|
||||
// Start with one bag so the sidebar renders (sidebar requires bags.length > 0)
|
||||
http.get('/api/trips/:id/packing/bags', () =>
|
||||
HttpResponse.json({ bags: [{ id: 1, name: 'Existing Bag', color: '#6366f1', weight_limit_grams: null, members: [] }] })
|
||||
@@ -1207,7 +1218,7 @@ describe('PackingListPanel', () => {
|
||||
const user = userEvent.setup();
|
||||
let deleteCalled = false;
|
||||
server.use(
|
||||
http.get('/api/admin/bag-tracking', () => HttpResponse.json({ enabled: true })),
|
||||
http.get('/api/addons', () => HttpResponse.json({ bagTracking: true, addons: [] })),
|
||||
http.get('/api/trips/:id/packing/bags', () =>
|
||||
HttpResponse.json({ bags: [{ id: 9, name: 'Old Bag', color: '#6366f1', weight_limit_grams: null, members: [] }] })
|
||||
),
|
||||
@@ -1235,7 +1246,7 @@ describe('PackingListPanel', () => {
|
||||
const user = userEvent.setup();
|
||||
let updateBody: Record<string, unknown> | null = null;
|
||||
server.use(
|
||||
http.get('/api/admin/bag-tracking', () => HttpResponse.json({ enabled: true })),
|
||||
http.get('/api/addons', () => HttpResponse.json({ bagTracking: true, addons: [] })),
|
||||
http.get('/api/trips/:id/packing/bags', () =>
|
||||
HttpResponse.json({ bags: [{ id: 11, name: 'Carry-on', color: '#10b981', weight_limit_grams: null, members: [] }] })
|
||||
),
|
||||
@@ -1273,7 +1284,7 @@ describe('PackingListPanel', () => {
|
||||
current_user_id: 1,
|
||||
})
|
||||
),
|
||||
http.get('/api/admin/bag-tracking', () => HttpResponse.json({ enabled: true })),
|
||||
http.get('/api/addons', () => HttpResponse.json({ bagTracking: true, addons: [] })),
|
||||
http.get('/api/trips/:id/packing/bags', () =>
|
||||
HttpResponse.json({ bags: [{ id: 12, name: 'Day Pack', color: '#ec4899', weight_limit_grams: null, members: [] }] })
|
||||
)
|
||||
@@ -1314,7 +1325,7 @@ describe('PackingListPanel', () => {
|
||||
current_user_id: 1,
|
||||
})
|
||||
),
|
||||
http.get('/api/admin/bag-tracking', () => HttpResponse.json({ enabled: true })),
|
||||
http.get('/api/addons', () => HttpResponse.json({ bagTracking: true, addons: [] })),
|
||||
http.get('/api/trips/:id/packing/bags', () =>
|
||||
HttpResponse.json({ bags: [{ id: 13, name: 'Weekend Bag', color: '#f97316', weight_limit_grams: null, members: [] }] })
|
||||
),
|
||||
@@ -1352,7 +1363,7 @@ describe('PackingListPanel', () => {
|
||||
it('FE-COMP-PACKING-068: inline bag create in item row picker creates bag and assigns it', async () => {
|
||||
let createBody: Record<string, unknown> | null = null;
|
||||
server.use(
|
||||
http.get('/api/admin/bag-tracking', () => HttpResponse.json({ enabled: true })),
|
||||
http.get('/api/addons', () => HttpResponse.json({ bagTracking: true, addons: [] })),
|
||||
http.get('/api/trips/:id/packing/bags', () => HttpResponse.json({ bags: [] })),
|
||||
http.post('/api/trips/1/packing/bags', async ({ request }) => {
|
||||
createBody = await request.json() as Record<string, unknown>;
|
||||
|
||||
Reference in New Issue
Block a user