This commit is contained in:
@@ -5,6 +5,7 @@ const upload = require('../services/storage');
|
||||
|
||||
const Campaign = require('../models/Campaign');
|
||||
const Map = require('../models/Map');
|
||||
const Folder = require('../models/Folder');
|
||||
const Note = require('../models/Note');
|
||||
const Actor = require('../models/Actor');
|
||||
|
||||
@@ -13,6 +14,15 @@ async function userOwnsCampaign(campaignId, userId) {
|
||||
return Boolean(campaign);
|
||||
}
|
||||
|
||||
// Folders the campaign's maps are grouped into, in the shape the sidebar groups by
|
||||
// (the notes, actors and items each keep a tree of their own, see models/Folder.js).
|
||||
async function mapFolders(campaignId) {
|
||||
return Folder.find({ campaign: campaignId, target: 'map' })
|
||||
.select('_id name parentFolder date color')
|
||||
.sort({ date: -1 })
|
||||
.lean();
|
||||
}
|
||||
|
||||
// Grid values arrive as strings when the request is a multipart form upload.
|
||||
function toNumber(value, fallback) {
|
||||
if (value === undefined || value === null || value === '') return fallback;
|
||||
@@ -27,7 +37,7 @@ router.get('/list', async (req, res) => {
|
||||
if (!(await userOwnsCampaign(campaign, req.user.id))) return res.json({ status: 'error', msg: 'unauthorized' });
|
||||
|
||||
const maps = await Map.find({ campaign }).sort({ name: 1 }).lean();
|
||||
res.json({ status: 'ok', maps });
|
||||
res.json({ status: 'ok', maps, folders: await mapFolders(campaign) });
|
||||
} catch (err) {
|
||||
console.error(err);
|
||||
res.json({ status: 'error', msg: 'errors.internal' });
|
||||
@@ -57,13 +67,22 @@ router.post('/create', upload.single('image'), async (req, res) => {
|
||||
|
||||
router.post('/update', upload.single('image'), async (req, res) => {
|
||||
try {
|
||||
const { id, name, gridSize, offsetX, offsetY, scale } = req.body;
|
||||
const { id, name, gridSize, offsetX, offsetY, scale, folder } = req.body;
|
||||
if (!id) return res.json({ status: 'error', msg: 'errors.missing-data' });
|
||||
|
||||
const map = await Map.findById(id);
|
||||
if (!map) return res.json({ status: 'error', msg: 'errors.notfound' });
|
||||
if (!(await userOwnsCampaign(map.campaign, req.user.id))) return res.json({ status: 'error', msg: 'unauthorized' });
|
||||
|
||||
// `null` moves the map to the root of the map list, an id files it in one of this
|
||||
// campaign's map folders; anything else is refused.
|
||||
if (folder !== undefined) {
|
||||
if (!(await Folder.belongsToSection(folder || null, map.campaign, 'map'))) {
|
||||
return res.json({ status: 'error', msg: 'errors.notfound' });
|
||||
}
|
||||
map.folder = folder || null;
|
||||
}
|
||||
|
||||
if (name !== undefined) map.name = String(name).trim();
|
||||
if (gridSize !== undefined) map.gridSize = toNumber(gridSize, map.gridSize);
|
||||
if (offsetX !== undefined) map.offsetX = toNumber(offsetX, map.offsetX);
|
||||
|
||||
Reference in New Issue
Block a user