Compare commits
28 Commits
c7d20dd1f7
...
ai/issue-6
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d8900cfb7f | ||
| 20128d195b | |||
| d901385900 | |||
|
|
2add9e7cb8 | ||
| fe63bd15f3 | |||
| 733e7ef193 | |||
| d566388fc6 | |||
| 86e1d34beb | |||
| cd741880ac | |||
| 378e28f703 | |||
|
|
7e1ed4475e | ||
|
|
0c6026aea8 | ||
|
|
844ed006cc | ||
| 4b6200960f | |||
| 1e0d81ecc4 | |||
|
|
cd92a2d112 | ||
| a314b935bd | |||
| 42027ff3fa | |||
|
|
adb29d3ef6 | ||
| 0106c13835 | |||
| a42a11cf53 | |||
|
|
8c4310e771 | ||
| 4faa585874 | |||
| 69e0181b66 | |||
| f29bbd45a3 | |||
| 5643031a70 | |||
|
|
1f9ab330b9 | ||
|
|
c6656fad3a |
@@ -35,6 +35,13 @@ const ActorSchema = new Schema({
|
|||||||
ref: 'Campaign',
|
ref: 'Campaign',
|
||||||
required: true
|
required: true
|
||||||
},
|
},
|
||||||
|
// The folder this actor stands in: a Folder of the same campaign whose target is
|
||||||
|
// 'actor' (null = the root of the actor list).
|
||||||
|
folder: {
|
||||||
|
type: Schema.Types.ObjectId,
|
||||||
|
ref: 'Folder',
|
||||||
|
default: null
|
||||||
|
},
|
||||||
foundryActorId: { type: String },
|
foundryActorId: { type: String },
|
||||||
date: { type: Date, default: Date.now }
|
date: { type: Date, default: Date.now }
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -1,6 +1,12 @@
|
|||||||
const mongoose = require('mongoose');
|
const mongoose = require('mongoose');
|
||||||
const Schema = mongoose.Schema;
|
const Schema = mongoose.Schema;
|
||||||
|
|
||||||
|
// Which campaign list a folder belongs to. Every sidebar section files its rows into
|
||||||
|
// folders of its own, and all of them share this model: note folders are what it has
|
||||||
|
// always held, and their rows carry no target at all, so anything reading the note tree
|
||||||
|
// asks with `filterForTarget('note')` and keeps finding them.
|
||||||
|
const FOLDER_TARGETS = ['note', 'actor', 'item', 'map'];
|
||||||
|
|
||||||
const FolderSchema = new Schema({
|
const FolderSchema = new Schema({
|
||||||
name: { type: String, required: true },
|
name: { type: String, required: true },
|
||||||
campaign: {
|
campaign: {
|
||||||
@@ -12,8 +18,46 @@ const FolderSchema = new Schema({
|
|||||||
type: Schema.Types.ObjectId,
|
type: Schema.Types.ObjectId,
|
||||||
ref: 'Folder'
|
ref: 'Folder'
|
||||||
},
|
},
|
||||||
|
target: { type: String, enum: FOLDER_TARGETS, default: 'note' },
|
||||||
|
// The Foundry item folder this row mirrors, set by the item sync only
|
||||||
|
// (see routes/foundry-link.js).
|
||||||
|
foundryFolderId: { type: String },
|
||||||
color: { type: String },
|
color: { type: String },
|
||||||
date: { type: Date, default: Date.now }
|
date: { type: Date, default: Date.now }
|
||||||
});
|
});
|
||||||
|
|
||||||
|
FolderSchema.index(
|
||||||
|
{ campaign: 1, foundryFolderId: 1 },
|
||||||
|
{ unique: true, partialFilterExpression: { foundryFolderId: { $type: 'string' } } }
|
||||||
|
);
|
||||||
|
|
||||||
|
// The sections a folder can file rows of, and whether a request names one of them.
|
||||||
|
FolderSchema.statics.isTarget = function isTarget(target) {
|
||||||
|
return FOLDER_TARGETS.includes(target);
|
||||||
|
};
|
||||||
|
|
||||||
|
// The filter matching one section's folders, to spread into a `find` along with whatever
|
||||||
|
// else the listing asks for. The notes ask for "none of the other sections" because the
|
||||||
|
// rows saved before `target` existed carry none at all and are all note folders.
|
||||||
|
FolderSchema.statics.filterForTarget = function filterForTarget(target) {
|
||||||
|
if (target === 'note') {
|
||||||
|
return { target: { $nin: FOLDER_TARGETS.filter((other) => other !== 'note') } };
|
||||||
|
}
|
||||||
|
return { target };
|
||||||
|
};
|
||||||
|
|
||||||
|
// The folder an entry of a section may stand in: `null` is the root of that list, and
|
||||||
|
// anything else has to be a folder of the same campaign *and* the same section, so a
|
||||||
|
// move never files an entry where its own list would not show it again. Answers whether
|
||||||
|
// it does — an id that is none of those says `false` rather than throwing.
|
||||||
|
FolderSchema.statics.belongsToSection = async function belongsToSection(folderId, campaignId, target) {
|
||||||
|
if (folderId === null || folderId === undefined || folderId === '') return true;
|
||||||
|
if (!mongoose.isValidObjectId(folderId)) return false;
|
||||||
|
|
||||||
|
const folder = await this
|
||||||
|
.findOne({ _id: folderId, campaign: campaignId, ...this.filterForTarget(target) })
|
||||||
|
.lean();
|
||||||
|
return Boolean(folder);
|
||||||
|
};
|
||||||
|
|
||||||
module.exports = mongoose.model('Folder', FolderSchema);
|
module.exports = mongoose.model('Folder', FolderSchema);
|
||||||
|
|||||||
@@ -28,6 +28,13 @@ const ItemSchema = new Schema({
|
|||||||
ref: 'Campaign',
|
ref: 'Campaign',
|
||||||
required: true
|
required: true
|
||||||
},
|
},
|
||||||
|
// The folder this item stands in: a Folder of the same campaign whose target is
|
||||||
|
// 'item' (null = the root of the item list).
|
||||||
|
folder: {
|
||||||
|
type: Schema.Types.ObjectId,
|
||||||
|
ref: 'Folder',
|
||||||
|
default: null
|
||||||
|
},
|
||||||
foundryItemId: { type: String },
|
foundryItemId: { type: String },
|
||||||
// Names Foundry uses for this item. Dragonroll may rename it, and the copies
|
// Names Foundry uses for this item. Dragonroll may rename it, and the copies
|
||||||
// Foundry keeps sending still have to fold into this row instead of
|
// Foundry keeps sending still have to fold into this row instead of
|
||||||
|
|||||||
@@ -32,6 +32,13 @@ const MapSchema = new Schema({
|
|||||||
ref: 'Campaign',
|
ref: 'Campaign',
|
||||||
required: true
|
required: true
|
||||||
},
|
},
|
||||||
|
// The folder this map stands in: a Folder of the same campaign whose target is
|
||||||
|
// 'map' (null = the root of the map list).
|
||||||
|
folder: {
|
||||||
|
type: Schema.Types.ObjectId,
|
||||||
|
ref: 'Folder',
|
||||||
|
default: null
|
||||||
|
},
|
||||||
date: { type: Date, default: Date.now }
|
date: { type: Date, default: Date.now }
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ const upload = require('../services/storage');
|
|||||||
|
|
||||||
const Campaign = require('../models/Campaign');
|
const Campaign = require('../models/Campaign');
|
||||||
const Actor = require('../models/Actor');
|
const Actor = require('../models/Actor');
|
||||||
|
const Folder = require('../models/Folder');
|
||||||
const Map = require('../models/Map');
|
const Map = require('../models/Map');
|
||||||
|
|
||||||
async function userOwnsCampaign(campaignId, userId) {
|
async function userOwnsCampaign(campaignId, userId) {
|
||||||
@@ -12,6 +13,15 @@ async function userOwnsCampaign(campaignId, userId) {
|
|||||||
return Boolean(campaign);
|
return Boolean(campaign);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Folders the campaign's actors are grouped into, in the shape the sidebar groups by
|
||||||
|
// (the notes, items and maps each keep a tree of their own, see models/Folder.js).
|
||||||
|
async function actorFolders(campaignId) {
|
||||||
|
return Folder.find({ campaign: campaignId, target: 'actor' })
|
||||||
|
.select('_id name parentFolder date color')
|
||||||
|
.sort({ date: -1 })
|
||||||
|
.lean();
|
||||||
|
}
|
||||||
|
|
||||||
router.get('/list', async (req, res) => {
|
router.get('/list', async (req, res) => {
|
||||||
try {
|
try {
|
||||||
const { campaign } = req.query;
|
const { campaign } = req.query;
|
||||||
@@ -19,7 +29,7 @@ router.get('/list', async (req, res) => {
|
|||||||
if (!(await userOwnsCampaign(campaign, req.user.id))) return res.json({ status: 'error', msg: 'unauthorized' });
|
if (!(await userOwnsCampaign(campaign, req.user.id))) return res.json({ status: 'error', msg: 'unauthorized' });
|
||||||
|
|
||||||
const actors = await Actor.find({ campaign }).sort({ name: 1 }).lean();
|
const actors = await Actor.find({ campaign }).sort({ name: 1 }).lean();
|
||||||
res.json({ status: 'ok', actors });
|
res.json({ status: 'ok', actors, folders: await actorFolders(campaign) });
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
console.error(err);
|
console.error(err);
|
||||||
res.json({ status: 'error', msg: 'errors.internal' });
|
res.json({ status: 'error', msg: 'errors.internal' });
|
||||||
@@ -46,13 +56,22 @@ router.post('/create', async (req, res) => {
|
|||||||
|
|
||||||
router.post('/update', async (req, res) => {
|
router.post('/update', async (req, res) => {
|
||||||
try {
|
try {
|
||||||
const { id, name, species, className, subclass, level, abilityScores, armorClass, speed, proficiencies, inventory, traits, spells, image } = req.body;
|
const { id, name, species, className, subclass, level, abilityScores, armorClass, speed, proficiencies, inventory, traits, spells, image, folder } = req.body;
|
||||||
if (!id) return res.json({ status: 'error', msg: 'errors.missing-data' });
|
if (!id) return res.json({ status: 'error', msg: 'errors.missing-data' });
|
||||||
|
|
||||||
const actor = await Actor.findById(id);
|
const actor = await Actor.findById(id);
|
||||||
if (!actor) return res.json({ status: 'error', msg: 'errors.notfound' });
|
if (!actor) return res.json({ status: 'error', msg: 'errors.notfound' });
|
||||||
if (!(await userOwnsCampaign(actor.campaign, req.user.id))) return res.json({ status: 'error', msg: 'unauthorized' });
|
if (!(await userOwnsCampaign(actor.campaign, req.user.id))) return res.json({ status: 'error', msg: 'unauthorized' });
|
||||||
|
|
||||||
|
// `null` moves the actor to the root of the actor list, an id files it in one of
|
||||||
|
// this campaign's actor folders; anything else is refused.
|
||||||
|
if (folder !== undefined) {
|
||||||
|
if (!(await Folder.belongsToSection(folder || null, actor.campaign, 'actor'))) {
|
||||||
|
return res.json({ status: 'error', msg: 'errors.notfound' });
|
||||||
|
}
|
||||||
|
actor.folder = folder || null;
|
||||||
|
}
|
||||||
|
|
||||||
if (name !== undefined) actor.name = String(name).trim();
|
if (name !== undefined) actor.name = String(name).trim();
|
||||||
if (species !== undefined) actor.species = species;
|
if (species !== undefined) actor.species = species;
|
||||||
if (className !== undefined) actor.className = className;
|
if (className !== undefined) actor.className = className;
|
||||||
|
|||||||
@@ -2,8 +2,11 @@ const express = require('express');
|
|||||||
const router = express.Router();
|
const router = express.Router();
|
||||||
|
|
||||||
const Campaign = require('../models/Campaign');
|
const Campaign = require('../models/Campaign');
|
||||||
|
const Actor = require('../models/Actor');
|
||||||
const Folder = require('../models/Folder');
|
const Folder = require('../models/Folder');
|
||||||
|
const Map = require('../models/Map');
|
||||||
const Note = require('../models/Note');
|
const Note = require('../models/Note');
|
||||||
|
const Item = require('../models/Item');
|
||||||
|
|
||||||
async function userOwnsCampaign(campaignId, userId) {
|
async function userOwnsCampaign(campaignId, userId) {
|
||||||
const campaign = await Campaign.findOne({ _id: campaignId, createdBy: userId }).lean();
|
const campaign = await Campaign.findOne({ _id: campaignId, createdBy: userId }).lean();
|
||||||
@@ -12,14 +15,16 @@ async function userOwnsCampaign(campaignId, userId) {
|
|||||||
|
|
||||||
router.get('/list', async (req, res) => {
|
router.get('/list', async (req, res) => {
|
||||||
try {
|
try {
|
||||||
const { campaign } = req.query;
|
// Every sidebar section has its own folders; a request that names none means the
|
||||||
if (!campaign) return res.json({ status: 'error', msg: 'errors.missing-data' });
|
// notes, like every caller of this route has until the other sections got theirs.
|
||||||
|
const { campaign, target = 'note' } = req.query;
|
||||||
|
if (!campaign || !Folder.isTarget(target)) return res.json({ status: 'error', msg: 'errors.missing-data' });
|
||||||
|
|
||||||
const hasAccess = await userOwnsCampaign(campaign, req.user.id);
|
const hasAccess = await userOwnsCampaign(campaign, req.user.id);
|
||||||
if (!hasAccess) return res.json({ status: 'error', msg: 'unauthorized' });
|
if (!hasAccess) return res.json({ status: 'error', msg: 'unauthorized' });
|
||||||
|
|
||||||
const folders = await Folder.find({ campaign })
|
const folders = await Folder.find({ campaign, ...Folder.filterForTarget(target) })
|
||||||
.select('_id name date color')
|
.select('_id name parentFolder date color')
|
||||||
.sort({ date: -1 })
|
.sort({ date: -1 })
|
||||||
.lean();
|
.lean();
|
||||||
|
|
||||||
@@ -32,15 +37,16 @@ router.get('/list', async (req, res) => {
|
|||||||
|
|
||||||
router.post('/create', async (req, res) => {
|
router.post('/create', async (req, res) => {
|
||||||
try {
|
try {
|
||||||
const { name, campaign } = req.body;
|
const { name, campaign, target = 'note' } = req.body;
|
||||||
if (!name || !campaign) return res.json({ status: 'error', msg: 'errors.missing-data' });
|
if (!name || !campaign || !Folder.isTarget(target)) return res.json({ status: 'error', msg: 'errors.missing-data' });
|
||||||
|
|
||||||
const hasAccess = await userOwnsCampaign(campaign, req.user.id);
|
const hasAccess = await userOwnsCampaign(campaign, req.user.id);
|
||||||
if (!hasAccess) return res.json({ status: 'error', msg: 'unauthorized' });
|
if (!hasAccess) return res.json({ status: 'error', msg: 'unauthorized' });
|
||||||
|
|
||||||
const newFolder = new Folder({
|
const newFolder = new Folder({
|
||||||
name: name.trim(),
|
name: name.trim(),
|
||||||
campaign
|
campaign,
|
||||||
|
target
|
||||||
});
|
});
|
||||||
await newFolder.save();
|
await newFolder.save();
|
||||||
res.json({ status: 'ok', folder: newFolder });
|
res.json({ status: 'ok', folder: newFolder });
|
||||||
@@ -50,6 +56,7 @@ router.post('/create', async (req, res) => {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// Renaming and colouring works the same for the folders of every campaign section.
|
||||||
router.post('/update', async (req, res) => {
|
router.post('/update', async (req, res) => {
|
||||||
try {
|
try {
|
||||||
const { id, name, color } = req.body;
|
const { id, name, color } = req.body;
|
||||||
@@ -85,10 +92,25 @@ router.post('/delete', async (req, res) => {
|
|||||||
|
|
||||||
async function moveRecursive(folderId) {
|
async function moveRecursive(folderId) {
|
||||||
const subfolders = await Folder.find({ parentFolder: folderId }).select('_id').lean();
|
const subfolders = await Folder.find({ parentFolder: folderId }).select('_id').lean();
|
||||||
|
// Every section files rows into a folder of its own, so each of them moves what
|
||||||
|
// stands in this one to the root of its own list instead of leaving it pointing
|
||||||
|
// at a folder that is gone.
|
||||||
await Note.updateMany(
|
await Note.updateMany(
|
||||||
{ folder: folderId },
|
{ folder: folderId },
|
||||||
{ $set: { folder: null, date: Date.now() } }
|
{ $set: { folder: null, date: Date.now() } }
|
||||||
);
|
);
|
||||||
|
await Actor.updateMany(
|
||||||
|
{ folder: folderId },
|
||||||
|
{ $set: { folder: null } }
|
||||||
|
);
|
||||||
|
await Item.updateMany(
|
||||||
|
{ folder: folderId },
|
||||||
|
{ $set: { folder: null } }
|
||||||
|
);
|
||||||
|
await Map.updateMany(
|
||||||
|
{ folder: folderId },
|
||||||
|
{ $set: { folder: null } }
|
||||||
|
);
|
||||||
await Folder.deleteOne({ _id: folderId });
|
await Folder.deleteOne({ _id: folderId });
|
||||||
for (const sub of subfolders) {
|
for (const sub of subfolders) {
|
||||||
await moveRecursive(sub._id);
|
await moveRecursive(sub._id);
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ const router = express.Router();
|
|||||||
const Campaign = require('../models/Campaign');
|
const Campaign = require('../models/Campaign');
|
||||||
const Actor = require('../models/Actor');
|
const Actor = require('../models/Actor');
|
||||||
const Item = require('../models/Item');
|
const Item = require('../models/Item');
|
||||||
|
const Folder = require('../models/Folder');
|
||||||
const { foundryActorToCharacter } = require('../services/actor-foundry');
|
const { foundryActorToCharacter } = require('../services/actor-foundry');
|
||||||
const { foundryItemToItemData } = require('../services/item-foundry');
|
const { foundryItemToItemData } = require('../services/item-foundry');
|
||||||
|
|
||||||
@@ -81,7 +82,7 @@ function snapshotItemSources(body) {
|
|||||||
return sources;
|
return sources;
|
||||||
}
|
}
|
||||||
|
|
||||||
async function saveFoundryItem(campaign, source, fullSync = false) {
|
async function saveFoundryItem(campaign, source, fullSync = false, folders = null) {
|
||||||
const foundryItemId = String(source?._id || source?.id || '').trim().slice(0, 120);
|
const foundryItemId = String(source?._id || source?.id || '').trim().slice(0, 120);
|
||||||
const fields = foundryItemToItemData(source || {});
|
const fields = foundryItemToItemData(source || {});
|
||||||
if (!foundryItemId || !fields) return null;
|
if (!foundryItemId || !fields) return null;
|
||||||
@@ -115,19 +116,113 @@ async function saveFoundryItem(campaign, source, fullSync = false) {
|
|||||||
if (!item.foundryNames.includes(fields.name)) {
|
if (!item.foundryNames.includes(fields.name)) {
|
||||||
item.foundryNames = [...item.foundryNames, fields.name].slice(-MAX_FOUNDRY_NAMES);
|
item.foundryNames = [...item.foundryNames, fields.name].slice(-MAX_FOUNDRY_NAMES);
|
||||||
}
|
}
|
||||||
|
// Which folder of the campaign's item tree the world says this item stands in.
|
||||||
|
// `undefined` means the push says nothing about folders — an item embedded in an
|
||||||
|
// actor, or a module that knows nothing about them — and the item stays where it
|
||||||
|
// is. The world owns the folder of its own directory, so a move it reports lands on
|
||||||
|
// a full snapshot too and wins over one a campaign made from its item list.
|
||||||
|
const folder = resolveFoundryItemFolder(source, folders);
|
||||||
|
if (folder !== undefined) item.folder = folder;
|
||||||
await item.save();
|
await item.save();
|
||||||
return { foundryItemId, itemId: item.id };
|
return { foundryItemId, itemId: item.id };
|
||||||
}
|
}
|
||||||
|
|
||||||
async function syncFoundryItems(campaign, sources, fullSync = false) {
|
async function syncFoundryItems(campaign, sources, fullSync = false, folders = null) {
|
||||||
const items = [];
|
const items = [];
|
||||||
for (const source of sources) {
|
for (const source of sources) {
|
||||||
const mapping = await saveFoundryItem(campaign, source, fullSync);
|
const mapping = await saveFoundryItem(campaign, source, fullSync, folders);
|
||||||
if (mapping) items.push(mapping);
|
if (mapping) items.push(mapping);
|
||||||
}
|
}
|
||||||
return items;
|
return items;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// --- Item folders ------------------------------------------------------------
|
||||||
|
// A Foundry world groups its item directory into folders; the campaign mirrors that
|
||||||
|
// tree as Folders of target 'item' so its item list reads like the world's. Every
|
||||||
|
// push from a module that knows about folders carries the whole world tree, and
|
||||||
|
// names the folder each world item it sends stands in. Items embedded in an actor
|
||||||
|
// say nothing: the folders they carry belong to that actor's own inventory, and
|
||||||
|
// Dragonroll keeps one item per piece of gear anyway.
|
||||||
|
|
||||||
|
// Parents before children, so a folder is mapped before the one nested in it.
|
||||||
|
// A folder whose parent is missing, or caught in a cycle, becomes a root.
|
||||||
|
function orderFoundryFolderSources(sources) {
|
||||||
|
const byId = new Map();
|
||||||
|
for (const source of sources) {
|
||||||
|
const id = String(source?.id || '').trim().slice(0, 120);
|
||||||
|
const name = String(source?.name || '').trim();
|
||||||
|
if (!id || !name) continue;
|
||||||
|
byId.set(id, { id, name, parent: String(source?.parent || '').trim().slice(0, 120) });
|
||||||
|
}
|
||||||
|
|
||||||
|
const ordered = [];
|
||||||
|
const placed = new Set();
|
||||||
|
const visiting = new Set();
|
||||||
|
function place(id) {
|
||||||
|
if (!byId.has(id) || placed.has(id) || visiting.has(id)) return;
|
||||||
|
visiting.add(id);
|
||||||
|
place(byId.get(id).parent);
|
||||||
|
visiting.delete(id);
|
||||||
|
placed.add(id);
|
||||||
|
ordered.push(byId.get(id));
|
||||||
|
}
|
||||||
|
for (const id of byId.keys()) place(id);
|
||||||
|
return ordered;
|
||||||
|
}
|
||||||
|
|
||||||
|
// The campaign folders mirroring the world's item folder tree, keyed by the Foundry
|
||||||
|
// folder id so pushing the same tree again neither doubles a folder nor loses the
|
||||||
|
// items filed in it. Rows the campaign made for its own items (no foundryFolderId)
|
||||||
|
// are left alone: the world does not know them.
|
||||||
|
async function syncFoundryItemFolders(campaign, folderSources) {
|
||||||
|
const folders = new Map();
|
||||||
|
for (const folder of await Folder.find({ campaign: campaign._id, target: 'item' })) {
|
||||||
|
if (folder.foundryFolderId) folders.set(String(folder.foundryFolderId), folder);
|
||||||
|
}
|
||||||
|
|
||||||
|
const ordered = orderFoundryFolderSources(folderSources);
|
||||||
|
const inTree = new Set(ordered.map((source) => source.id));
|
||||||
|
for (const source of ordered) {
|
||||||
|
let folder = folders.get(source.id);
|
||||||
|
if (!folder) {
|
||||||
|
folder = new Folder({
|
||||||
|
campaign: campaign._id,
|
||||||
|
target: 'item',
|
||||||
|
foundryFolderId: source.id,
|
||||||
|
name: source.name
|
||||||
|
});
|
||||||
|
}
|
||||||
|
// The world owns this tree, so unlike an item's fields a rename or a move
|
||||||
|
// lands whatever kind of push carried it: the whole tree arrives with each.
|
||||||
|
folder.name = source.name;
|
||||||
|
const parent = inTree.has(source.parent) ? folders.get(source.parent) : null;
|
||||||
|
folder.parentFolder = parent ? parent._id : null;
|
||||||
|
await folder.save();
|
||||||
|
folders.set(source.id, folder);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Folders the world no longer has go with it, and the items standing in them
|
||||||
|
// move to the root instead of pointing at a folder that is not there.
|
||||||
|
const staleIds = [...folders.values()]
|
||||||
|
.filter((folder) => folder.foundryFolderId && !inTree.has(String(folder.foundryFolderId)))
|
||||||
|
.map((folder) => folder._id);
|
||||||
|
if (staleIds.length) {
|
||||||
|
await Item.updateMany({ campaign: campaign._id, folder: { $in: staleIds } }, { $set: { folder: null } });
|
||||||
|
await Folder.deleteMany({ campaign: campaign._id, _id: { $in: staleIds } });
|
||||||
|
}
|
||||||
|
return folders;
|
||||||
|
}
|
||||||
|
|
||||||
|
// The folder of a pushed item: undefined when the push says nothing about folders,
|
||||||
|
// null for the root of the item directory, and the campaign folder otherwise. An
|
||||||
|
// id the tree does not know puts the item at the root rather than nowhere.
|
||||||
|
function resolveFoundryItemFolder(source, folders) {
|
||||||
|
const foundryFolderId = source?.dragonroll?.folder;
|
||||||
|
if (!folders || typeof foundryFolderId !== 'string') return undefined;
|
||||||
|
return folders.get(foundryFolderId.trim())?._id || null;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
// Linking a world to a campaign happens through the sign-up link every service
|
// Linking a world to a campaign happens through the sign-up link every service
|
||||||
// uses (routes/service-link.js); what stays here is the sync that world keeps up
|
// uses (routes/service-link.js); what stays here is the sync that world keeps up
|
||||||
// with the campaign once that link has handed it its token.
|
// with the campaign once that link has handed it its token.
|
||||||
@@ -163,12 +258,16 @@ router.post('/sync/snapshot', async (req, res) => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const fullSync = req.body.fullSync === true;
|
const fullSync = req.body.fullSync === true;
|
||||||
|
// A module that knows nothing about item folders sends neither the tree
|
||||||
|
// nor the folder of an item, and then nothing here touches the folders.
|
||||||
|
const folderSources = Array.isArray(req.body.folders) ? req.body.folders : null;
|
||||||
const actors = [];
|
const actors = [];
|
||||||
for (const source of actorSources || []) {
|
for (const source of actorSources || []) {
|
||||||
const mapping = await saveFoundryActor(campaign, source, fullSync);
|
const mapping = await saveFoundryActor(campaign, source, fullSync);
|
||||||
if (mapping) actors.push(mapping);
|
if (mapping) actors.push(mapping);
|
||||||
}
|
}
|
||||||
const items = await syncFoundryItems(campaign, snapshotItemSources(req.body), fullSync);
|
const itemFolders = folderSources ? await syncFoundryItemFolders(campaign, folderSources) : null;
|
||||||
|
const items = await syncFoundryItems(campaign, snapshotItemSources(req.body), fullSync, itemFolders);
|
||||||
|
|
||||||
if (fullSync && actorSources) {
|
if (fullSync && actorSources) {
|
||||||
const currentIds = actorSources
|
const currentIds = actorSources
|
||||||
@@ -197,17 +296,21 @@ router.post('/sync/snapshot', async (req, res) => {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
// Live Foundry item edits: upserts only, never prunes. Removing items that no
|
// Live Foundry item edits: upserts only, never prunes items. Removing items that no
|
||||||
// longer exist is left to the full snapshot sent with the actors.
|
// longer exist is left to the full snapshot sent with the actors. Item folders are
|
||||||
|
// the exception: every request carries the world's whole folder tree, so a folder
|
||||||
|
// the world dropped is dropped here too, and a push may carry folders only.
|
||||||
router.post('/sync/item-snapshot', async (req, res) => {
|
router.post('/sync/item-snapshot', async (req, res) => {
|
||||||
try {
|
try {
|
||||||
const campaign = await syncCampaign(req, res);
|
const campaign = await syncCampaign(req, res);
|
||||||
if (!campaign) return;
|
if (!campaign) return;
|
||||||
|
const folderSources = Array.isArray(req.body.folders) ? req.body.folders : null;
|
||||||
if (!requestMatchesWorld(campaign, req.body.worldId) || !Array.isArray(req.body.items)) {
|
if (!requestMatchesWorld(campaign, req.body.worldId) || !Array.isArray(req.body.items)) {
|
||||||
return res.json({ status: 'error', msg: 'errors.missing-data' });
|
return res.json({ status: 'error', msg: 'errors.missing-data' });
|
||||||
}
|
}
|
||||||
|
|
||||||
res.json({ status: 'ok', items: await syncFoundryItems(campaign, req.body.items) });
|
const folders = folderSources ? await syncFoundryItemFolders(campaign, folderSources) : null;
|
||||||
|
res.json({ status: 'ok', items: await syncFoundryItems(campaign, req.body.items, false, folders) });
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
console.error(err);
|
console.error(err);
|
||||||
res.json({ status: 'error', msg: 'errors.internal' });
|
res.json({ status: 'error', msg: 'errors.internal' });
|
||||||
|
|||||||
@@ -5,12 +5,22 @@ const upload = require('../services/storage');
|
|||||||
|
|
||||||
const Campaign = require('../models/Campaign');
|
const Campaign = require('../models/Campaign');
|
||||||
const Item = require('../models/Item');
|
const Item = require('../models/Item');
|
||||||
|
const Folder = require('../models/Folder');
|
||||||
|
|
||||||
async function userOwnsCampaign(campaignId, userId) {
|
async function userOwnsCampaign(campaignId, userId) {
|
||||||
const campaign = await Campaign.findOne({ _id: campaignId, createdBy: userId }).lean();
|
const campaign = await Campaign.findOne({ _id: campaignId, createdBy: userId }).lean();
|
||||||
return Boolean(campaign);
|
return Boolean(campaign);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Folders the campaign's items are grouped into, in the shape the sidebar groups by
|
||||||
|
// (the world's own item folders arrive through the sync, see routes/foundry-link.js).
|
||||||
|
async function itemFolders(campaignId) {
|
||||||
|
return Folder.find({ campaign: campaignId, target: 'item' })
|
||||||
|
.select('_id name parentFolder date color')
|
||||||
|
.sort({ date: -1 })
|
||||||
|
.lean();
|
||||||
|
}
|
||||||
|
|
||||||
router.get('/list', async (req, res) => {
|
router.get('/list', async (req, res) => {
|
||||||
try {
|
try {
|
||||||
const { campaign } = req.query;
|
const { campaign } = req.query;
|
||||||
@@ -18,7 +28,7 @@ router.get('/list', async (req, res) => {
|
|||||||
if (!(await userOwnsCampaign(campaign, req.user.id))) return res.json({ status: 'error', msg: 'unauthorized' });
|
if (!(await userOwnsCampaign(campaign, req.user.id))) return res.json({ status: 'error', msg: 'unauthorized' });
|
||||||
|
|
||||||
const items = await Item.find({ campaign }).sort({ name: 1 }).lean();
|
const items = await Item.find({ campaign }).sort({ name: 1 }).lean();
|
||||||
res.json({ status: 'ok', items });
|
res.json({ status: 'ok', items, folders: await itemFolders(campaign) });
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
console.error(err);
|
console.error(err);
|
||||||
res.json({ status: 'error', msg: 'errors.internal' });
|
res.json({ status: 'error', msg: 'errors.internal' });
|
||||||
@@ -46,13 +56,23 @@ router.post('/create', async (req, res) => {
|
|||||||
|
|
||||||
router.post('/update', async (req, res) => {
|
router.post('/update', async (req, res) => {
|
||||||
try {
|
try {
|
||||||
const { id, name, category, rarity, quantity, weight, properties, description, image } = req.body;
|
const { id, name, category, rarity, quantity, weight, properties, description, image, folder } = req.body;
|
||||||
if (!id) return res.json({ status: 'error', msg: 'errors.missing-data' });
|
if (!id) return res.json({ status: 'error', msg: 'errors.missing-data' });
|
||||||
|
|
||||||
const item = await Item.findById(id);
|
const item = await Item.findById(id);
|
||||||
if (!item) return res.json({ status: 'error', msg: 'errors.notfound' });
|
if (!item) return res.json({ status: 'error', msg: 'errors.notfound' });
|
||||||
if (!(await userOwnsCampaign(item.campaign, req.user.id))) return res.json({ status: 'error', msg: 'unauthorized' });
|
if (!(await userOwnsCampaign(item.campaign, req.user.id))) return res.json({ status: 'error', msg: 'unauthorized' });
|
||||||
|
|
||||||
|
// `null` moves the item to the root of the item list, an id files it in one of
|
||||||
|
// this campaign's item folders; anything else is refused. The linked world owns
|
||||||
|
// its own folder tree, so a move it reports later wins over one made here.
|
||||||
|
if (folder !== undefined) {
|
||||||
|
if (!(await Folder.belongsToSection(folder || null, item.campaign, 'item'))) {
|
||||||
|
return res.json({ status: 'error', msg: 'errors.notfound' });
|
||||||
|
}
|
||||||
|
item.folder = folder || null;
|
||||||
|
}
|
||||||
|
|
||||||
if (name !== undefined) item.name = String(name).trim();
|
if (name !== undefined) item.name = String(name).trim();
|
||||||
if (category !== undefined) item.category = category;
|
if (category !== undefined) item.category = category;
|
||||||
if (rarity !== undefined) item.rarity = rarity;
|
if (rarity !== undefined) item.rarity = rarity;
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ const upload = require('../services/storage');
|
|||||||
|
|
||||||
const Campaign = require('../models/Campaign');
|
const Campaign = require('../models/Campaign');
|
||||||
const Map = require('../models/Map');
|
const Map = require('../models/Map');
|
||||||
|
const Folder = require('../models/Folder');
|
||||||
const Note = require('../models/Note');
|
const Note = require('../models/Note');
|
||||||
const Actor = require('../models/Actor');
|
const Actor = require('../models/Actor');
|
||||||
|
|
||||||
@@ -13,6 +14,15 @@ async function userOwnsCampaign(campaignId, userId) {
|
|||||||
return Boolean(campaign);
|
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.
|
// Grid values arrive as strings when the request is a multipart form upload.
|
||||||
function toNumber(value, fallback) {
|
function toNumber(value, fallback) {
|
||||||
if (value === undefined || value === null || value === '') return 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' });
|
if (!(await userOwnsCampaign(campaign, req.user.id))) return res.json({ status: 'error', msg: 'unauthorized' });
|
||||||
|
|
||||||
const maps = await Map.find({ campaign }).sort({ name: 1 }).lean();
|
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) {
|
} catch (err) {
|
||||||
console.error(err);
|
console.error(err);
|
||||||
res.json({ status: 'error', msg: 'errors.internal' });
|
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) => {
|
router.post('/update', upload.single('image'), async (req, res) => {
|
||||||
try {
|
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' });
|
if (!id) return res.json({ status: 'error', msg: 'errors.missing-data' });
|
||||||
|
|
||||||
const map = await Map.findById(id);
|
const map = await Map.findById(id);
|
||||||
if (!map) return res.json({ status: 'error', msg: 'errors.notfound' });
|
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' });
|
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 (name !== undefined) map.name = String(name).trim();
|
||||||
if (gridSize !== undefined) map.gridSize = toNumber(gridSize, map.gridSize);
|
if (gridSize !== undefined) map.gridSize = toNumber(gridSize, map.gridSize);
|
||||||
if (offsetX !== undefined) map.offsetX = toNumber(offsetX, map.offsetX);
|
if (offsetX !== undefined) map.offsetX = toNumber(offsetX, map.offsetX);
|
||||||
|
|||||||
@@ -19,7 +19,9 @@ router.get('/list', async (req, res) => {
|
|||||||
const hasAccess = await userOwnsCampaign(campaign, req.user.id);
|
const hasAccess = await userOwnsCampaign(campaign, req.user.id);
|
||||||
if (!hasAccess) return res.json({ status: 'error', msg: 'unauthorized' });
|
if (!hasAccess) return res.json({ status: 'error', msg: 'unauthorized' });
|
||||||
|
|
||||||
const folders = await Folder.find({ campaign })
|
// The note tree only: the folders of the actors, items and maps share this model
|
||||||
|
// and would otherwise turn up as empty folders between the notes.
|
||||||
|
const folders = await Folder.find({ campaign, ...Folder.filterForTarget('note') })
|
||||||
.select('_id name parentFolder date color')
|
.select('_id name parentFolder date color')
|
||||||
.sort({ date: -1 })
|
.sort({ date: -1 })
|
||||||
.lean();
|
.lean();
|
||||||
@@ -48,7 +50,7 @@ router.get('/subfolder/list', async (req, res) => {
|
|||||||
const folderDoc = await Folder.findOne({ _id: folder, campaign }).lean();
|
const folderDoc = await Folder.findOne({ _id: folder, campaign }).lean();
|
||||||
if (!folderDoc) return res.json({ status: 'error', msg: 'errors.notfound' });
|
if (!folderDoc) return res.json({ status: 'error', msg: 'errors.notfound' });
|
||||||
|
|
||||||
const subfolders = await Folder.find({ campaign, parentFolder: folder })
|
const subfolders = await Folder.find({ campaign, parentFolder: folder, ...Folder.filterForTarget('note') })
|
||||||
.select('_id name date color')
|
.select('_id name date color')
|
||||||
.sort({ date: -1 })
|
.sort({ date: -1 })
|
||||||
.lean();
|
.lean();
|
||||||
@@ -80,7 +82,7 @@ router.get('/all', async (req, res) => {
|
|||||||
.sort({ title: 1 })
|
.sort({ title: 1 })
|
||||||
.lean();
|
.lean();
|
||||||
|
|
||||||
const folders = await Folder.find({ campaign })
|
const folders = await Folder.find({ campaign, ...Folder.filterForTarget('note') })
|
||||||
.select('_id name parentFolder')
|
.select('_id name parentFolder')
|
||||||
.lean();
|
.lean();
|
||||||
|
|
||||||
|
|||||||
@@ -105,7 +105,7 @@ router.post('/setup', rateLimitMiddleware, async (req, res) => {
|
|||||||
|
|
||||||
// Login post
|
// Login post
|
||||||
router.post('/login', rateLimitMiddleware, async (req, res) => {
|
router.post('/login', rateLimitMiddleware, async (req, res) => {
|
||||||
const { usermail, password } = req.body;
|
const { usermail, password, remember } = req.body;
|
||||||
|
|
||||||
if (!(usermail && password)) {
|
if (!(usermail && password)) {
|
||||||
return res.json({ status: "error", msg: "login.errors.params" });
|
return res.json({ status: "error", msg: "login.errors.params" });
|
||||||
@@ -132,7 +132,8 @@ router.post('/login', rateLimitMiddleware, async (req, res) => {
|
|||||||
};
|
};
|
||||||
|
|
||||||
const token = await new Promise((resolve, reject) => {
|
const token = await new Promise((resolve, reject) => {
|
||||||
jwt.sign(payload, secret, { expiresIn: 172800 }, (err, token) => {
|
// "Remember me" keeps the session alive on the device for 30 days, a plain login lasts 48 h
|
||||||
|
jwt.sign(payload, secret, { expiresIn: remember ? 2592000 : 172800 }, (err, token) => {
|
||||||
if (err) reject(err);
|
if (err) reject(err);
|
||||||
else resolve(token);
|
else resolve(token);
|
||||||
});
|
});
|
||||||
@@ -192,4 +193,113 @@ router.get('/get-settings', passport.authenticate('jwt', {session: false}), asyn
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// -- Account management (the "Manage accounts" window of the site settings) ----
|
||||||
|
// /api/user is mounted before the JWT guard, so every route below authenticates
|
||||||
|
// inline; and only an administrator gets past isAdmin (services/middleware.js).
|
||||||
|
|
||||||
|
router.get('/list', passport.authenticate('jwt', {session: false}), isAdmin, async (req, res) => {
|
||||||
|
try {
|
||||||
|
// No account gets out with its password or an unfinished setup code.
|
||||||
|
const users = await User.find().select('-password -setupCode').sort({ date: 1 });
|
||||||
|
res.json({ status: "ok", users });
|
||||||
|
} catch (err) {
|
||||||
|
console.error(err);
|
||||||
|
res.json({ status: "error", msg: "errors.internal" });
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
// The admin creates the account with the password its user logs in with; the
|
||||||
|
// setupCode flow above stays as it is, nothing on the frontend completes it.
|
||||||
|
router.post('/create', passport.authenticate('jwt', {session: false}), isAdmin, async (req, res) => {
|
||||||
|
try {
|
||||||
|
const { name, username, email, password } = req.body;
|
||||||
|
if (!(name && username && email && password)) {
|
||||||
|
return res.json({ status: "error", msg: "errors.missing-data" });
|
||||||
|
}
|
||||||
|
|
||||||
|
const existingUser = await User.findOne({
|
||||||
|
$or: [
|
||||||
|
{ email: email },
|
||||||
|
{ username: username }
|
||||||
|
]
|
||||||
|
});
|
||||||
|
if (existingUser) {
|
||||||
|
return res.json({
|
||||||
|
status: "error",
|
||||||
|
msg: "register.errors.email-username-exists"
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
const salt = await bcrypt.genSalt(10);
|
||||||
|
let user = new User({
|
||||||
|
name: name,
|
||||||
|
username: username,
|
||||||
|
email: email,
|
||||||
|
password: await bcrypt.hash(password, salt)
|
||||||
|
});
|
||||||
|
await user.save();
|
||||||
|
res.json({
|
||||||
|
status: "ok",
|
||||||
|
user: {
|
||||||
|
_id: user._id,
|
||||||
|
name: user.name,
|
||||||
|
username: user.username,
|
||||||
|
email: user.email,
|
||||||
|
admin: user.admin,
|
||||||
|
date: user.date
|
||||||
|
}
|
||||||
|
});
|
||||||
|
} catch (err) {
|
||||||
|
console.error(err);
|
||||||
|
res.json({ status: "error", msg: "errors.internal" });
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
router.post('/set-admin', passport.authenticate('jwt', {session: false}), isAdmin, async (req, res) => {
|
||||||
|
try {
|
||||||
|
const { id, admin } = req.body;
|
||||||
|
if (!id || typeof admin !== 'boolean') {
|
||||||
|
return res.json({ status: "error", msg: "errors.missing-data" });
|
||||||
|
}
|
||||||
|
|
||||||
|
// Switching one's own rights off could leave an instance with nobody who
|
||||||
|
// can manage accounts at all, so the row for yourself stays closed.
|
||||||
|
if (String(req.user._id) === String(id)) {
|
||||||
|
return res.json({ status: "error", msg: "settings.site-administration.accounts.errors.self-admin" });
|
||||||
|
}
|
||||||
|
|
||||||
|
const user = await User.findOne({ _id: id });
|
||||||
|
if (!user) return res.json({ status: "error", msg: "errors.notfound" });
|
||||||
|
|
||||||
|
user.admin = admin;
|
||||||
|
await user.save();
|
||||||
|
res.json({ status: "ok", user: { _id: user._id, admin: user.admin } });
|
||||||
|
} catch (err) {
|
||||||
|
console.error(err);
|
||||||
|
res.json({ status: "error", msg: "errors.internal" });
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
// Only the account itself goes; what it created stays as it is.
|
||||||
|
router.post('/delete', passport.authenticate('jwt', {session: false}), isAdmin, async (req, res) => {
|
||||||
|
try {
|
||||||
|
const { id } = req.body;
|
||||||
|
if (!id) return res.json({ status: "error", msg: "errors.missing-data" });
|
||||||
|
|
||||||
|
// Same guard as the admin switch: nobody locks themselves out on the way out.
|
||||||
|
if (String(req.user._id) === String(id)) {
|
||||||
|
return res.json({ status: "error", msg: "settings.site-administration.accounts.errors.self-delete" });
|
||||||
|
}
|
||||||
|
|
||||||
|
const user = await User.findOne({ _id: id });
|
||||||
|
if (!user) return res.json({ status: "error", msg: "errors.notfound" });
|
||||||
|
|
||||||
|
await user.deleteOne();
|
||||||
|
res.json({ status: "ok" });
|
||||||
|
} catch (err) {
|
||||||
|
console.error(err);
|
||||||
|
res.json({ status: "error", msg: "errors.internal" });
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
module.exports = router;
|
module.exports = router;
|
||||||
@@ -1,5 +1,28 @@
|
|||||||
const { numberOr, asText, plainText, stringList } = require('./foundry-fields');
|
const { numberOr, asText, plainText, stringList } = require('./foundry-fields');
|
||||||
|
|
||||||
|
// D&D 5e keeps an actor's background, species, class and subclass as a reference to an
|
||||||
|
// embedded item: `system.details.background` and friends hold that item's id, and the
|
||||||
|
// field's `fallback` option hands back the bare id when the item is gone. Dragonroll
|
||||||
|
// holds names, so a reference is read through the actor's items and an id that resolves
|
||||||
|
// to nothing is dropped. An id travelling back as a name is how Foundry ends up with a
|
||||||
|
// background item — and a details reference — that does not exist (Syndria98/dragonroll#54).
|
||||||
|
const FOUNDRY_DOCUMENT_ID = /^[A-Za-z0-9_-]{16}$/;
|
||||||
|
|
||||||
|
function looksLikeFoundryId(value) {
|
||||||
|
// Sixteen plain letters is a name; the ids Foundry generates carry a digit.
|
||||||
|
return FOUNDRY_DOCUMENT_ID.test(value) && /[0-9]/.test(value) && /[A-Za-z]/.test(value);
|
||||||
|
}
|
||||||
|
|
||||||
|
// The name a `system.details` entry stands for: an embedded item's id resolves to that
|
||||||
|
// item's name, and plain text (older system releases store the name here) is the name.
|
||||||
|
function detailsName(value, items) {
|
||||||
|
const text = asText(value).trim();
|
||||||
|
if (!text) return '';
|
||||||
|
const referenced = items.find((item) => asText(item?._id ?? item?.id).trim() === text);
|
||||||
|
if (referenced) return asText(referenced.name).trim();
|
||||||
|
return looksLikeFoundryId(text) ? '' : text;
|
||||||
|
}
|
||||||
|
|
||||||
function foundryActorToCharacter(foundryActor) {
|
function foundryActorToCharacter(foundryActor) {
|
||||||
const system = foundryActor.system || {};
|
const system = foundryActor.system || {};
|
||||||
const details = system.details || {};
|
const details = system.details || {};
|
||||||
@@ -25,11 +48,11 @@ function foundryActorToCharacter(foundryActor) {
|
|||||||
type: ['character', 'npc', 'creature'].includes(savedDragonrollType)
|
type: ['character', 'npc', 'creature'].includes(savedDragonrollType)
|
||||||
? savedDragonrollType
|
? savedDragonrollType
|
||||||
: (['character', 'npc', 'creature'].includes(foundryActor.type) ? foundryActor.type : 'character'),
|
: (['character', 'npc', 'creature'].includes(foundryActor.type) ? foundryActor.type : 'character'),
|
||||||
species: asText(details.race || details.species),
|
species: detailsName(details.race || details.species, items),
|
||||||
className: asText(details.class || classItem?.name),
|
className: detailsName(details.class, items) || asText(classItem?.name),
|
||||||
subclass: asText(details.subclass || subclassItem?.name),
|
subclass: detailsName(details.subclass, items) || asText(subclassItem?.name),
|
||||||
level: numberOr(details.level ?? classItem?.system?.levels, 1),
|
level: numberOr(details.level ?? classItem?.system?.levels, 1),
|
||||||
background: asText(details.background || backgroundItem?.name),
|
background: detailsName(details.background, items) || asText(backgroundItem?.name),
|
||||||
challengeRating: String(details.cr ?? ''),
|
challengeRating: String(details.cr ?? ''),
|
||||||
description: plainText(details.biography?.value || details.biography),
|
description: plainText(details.biography?.value || details.biography),
|
||||||
image: asText(foundryActor.img || foundryActor.image),
|
image: asText(foundryActor.img || foundryActor.image),
|
||||||
|
|||||||
@@ -23,6 +23,7 @@ let updatingPairingStatus = false;
|
|||||||
let linkedCampaignName = "";
|
let linkedCampaignName = "";
|
||||||
let linkProblem = "";
|
let linkProblem = "";
|
||||||
let actorSyncTimeout;
|
let actorSyncTimeout;
|
||||||
|
let characterSyncRetryTimeout;
|
||||||
let characterSyncRunning = false;
|
let characterSyncRunning = false;
|
||||||
let actorSyncErrorLogged = false;
|
let actorSyncErrorLogged = false;
|
||||||
const syncingActorIds = new Set();
|
const syncingActorIds = new Set();
|
||||||
@@ -30,6 +31,8 @@ const queuedActorChanges = new Map();
|
|||||||
let itemSyncTimeout;
|
let itemSyncTimeout;
|
||||||
let itemSyncRunning = false;
|
let itemSyncRunning = false;
|
||||||
let itemSyncErrorLogged = false;
|
let itemSyncErrorLogged = false;
|
||||||
|
let folderSyncTimeout;
|
||||||
|
let folderSyncRunning = false;
|
||||||
const syncingItemIds = new Set();
|
const syncingItemIds = new Set();
|
||||||
const queuedItemChanges = new Map();
|
const queuedItemChanges = new Map();
|
||||||
|
|
||||||
@@ -436,6 +439,7 @@ function handleAutoSyncChange(value) {
|
|||||||
if (value === false) {
|
if (value === false) {
|
||||||
clearTimeout(actorSyncTimeout);
|
clearTimeout(actorSyncTimeout);
|
||||||
clearTimeout(itemSyncTimeout);
|
clearTimeout(itemSyncTimeout);
|
||||||
|
clearTimeout(folderSyncTimeout);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (!game.user?.isGM || !getSyncToken()) return;
|
if (!game.user?.isGM || !getSyncToken()) return;
|
||||||
@@ -444,6 +448,7 @@ function handleAutoSyncChange(value) {
|
|||||||
// while autosync was off are pushed so this world's state wins over them.
|
// while autosync was off are pushed so this world's state wins over them.
|
||||||
initializeCharacterSync();
|
initializeCharacterSync();
|
||||||
reconcileDragonrollItems();
|
reconcileDragonrollItems();
|
||||||
|
queueFoundryItemFolders(400);
|
||||||
if (queuedActorChanges.size) {
|
if (queuedActorChanges.size) {
|
||||||
clearTimeout(actorSyncTimeout);
|
clearTimeout(actorSyncTimeout);
|
||||||
actorSyncTimeout = setTimeout(flushActorChanges, 400);
|
actorSyncTimeout = setTimeout(flushActorChanges, 400);
|
||||||
@@ -527,6 +532,8 @@ async function pushFoundryActors(actors, fullSync = false) {
|
|||||||
// Dragonroll deduplicates by name, so sending the world directory next to
|
// Dragonroll deduplicates by name, so sending the world directory next to
|
||||||
// the actor copies keeps a single Item per piece of gear.
|
// the actor copies keeps a single Item per piece of gear.
|
||||||
items: getWorldItemSnapshots(),
|
items: getWorldItemSnapshots(),
|
||||||
|
// The folder tree those world items stand in (see worldItemFolderSnapshots).
|
||||||
|
folders: worldItemFolderSnapshots(),
|
||||||
fullSync,
|
fullSync,
|
||||||
}, token);
|
}, token);
|
||||||
|
|
||||||
@@ -644,8 +651,60 @@ function serializeFoundryItem(item) {
|
|||||||
return data;
|
return data;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// --- Item folders ------------------------------------------------------------
|
||||||
|
// Dragonroll mirrors the folders the world's item directory is grouped into, so its
|
||||||
|
// item list reads like Foundry's. `game.folders` also holds the folders an actor
|
||||||
|
// keeps for its own inventory: those hang off the actor instead of the world, and
|
||||||
|
// the campaign has no use for them, so only folders rooted in the world go over.
|
||||||
|
|
||||||
|
// The folder a folder is nested in, or null when it is not nested in a folder.
|
||||||
|
function itemFolderParent(folder) {
|
||||||
|
const parent = typeof folder.parent === "string" ? game.folders?.get(folder.parent) : folder.parent;
|
||||||
|
return parent?.documentName === "Folder" ? parent : null;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Whether a folder belongs to the world's item directory: its whole ancestry has
|
||||||
|
// to be folders, ending in one that nothing is above.
|
||||||
|
function isWorldItemFolder(folder, seen = new Set()) {
|
||||||
|
if (folder.type !== "Item" || seen.has(folder.id)) return false;
|
||||||
|
seen.add(folder.id);
|
||||||
|
const rawParent = folder.parent;
|
||||||
|
const rawParentId = typeof rawParent === "string" ? rawParent : rawParent?.id;
|
||||||
|
if (!rawParentId) return true;
|
||||||
|
const parent = typeof rawParent === "string" ? game.folders?.get(rawParentId) : rawParent;
|
||||||
|
if (parent?.documentName !== "Folder") return false;
|
||||||
|
return isWorldItemFolder(parent, seen);
|
||||||
|
}
|
||||||
|
|
||||||
|
function worldItemFolderSnapshots() {
|
||||||
|
return (game.folders?.contents || [])
|
||||||
|
.filter((folder) => isWorldItemFolder(folder))
|
||||||
|
.map((folder) => ({ id: folder.id, name: folder.name, parent: itemFolderParent(folder)?.id || null }));
|
||||||
|
}
|
||||||
|
|
||||||
|
// A world item travels with the folder it stands in, so Dragonroll can file it the
|
||||||
|
// same way; `""` says the world keeps it at the root of the item directory. Items
|
||||||
|
// embedded in an actor use serializeFoundryItem instead: their folders are the
|
||||||
|
// actor's own, and the campaign's item list is deduplicated by name anyway.
|
||||||
|
function serializeFoundryWorldItem(item) {
|
||||||
|
const data = serializeFoundryItem(item);
|
||||||
|
if (!data) return null;
|
||||||
|
|
||||||
|
data.dragonroll = { ...data.dragonroll, folder: worldItemFolderId(item) };
|
||||||
|
return data;
|
||||||
|
}
|
||||||
|
|
||||||
|
// The folder id an item data carries is either the id or the Folder document
|
||||||
|
// itself, depending on the Foundry version.
|
||||||
|
function worldItemFolderId(item) {
|
||||||
|
const folder = item?.folder;
|
||||||
|
if (!folder) return "";
|
||||||
|
if (typeof folder === "string") return game.folders?.get(folder)?.documentName === "Folder" ? folder : "";
|
||||||
|
return folder.documentName === "Folder" ? String(folder.id || "") : "";
|
||||||
|
}
|
||||||
|
|
||||||
function getWorldItemSnapshots() {
|
function getWorldItemSnapshots() {
|
||||||
return (game.items?.contents || []).map(serializeFoundryItem).filter(Boolean);
|
return (game.items?.contents || []).map(serializeFoundryWorldItem).filter(Boolean);
|
||||||
}
|
}
|
||||||
|
|
||||||
function dragonrollItemIdOf(item) {
|
function dragonrollItemIdOf(item) {
|
||||||
@@ -693,7 +752,10 @@ async function pushFoundryItems(items) {
|
|||||||
|
|
||||||
const result = await postDragonroll("foundry/sync/item-snapshot", {
|
const result = await postDragonroll("foundry/sync/item-snapshot", {
|
||||||
worldId: game.world.id,
|
worldId: game.world.id,
|
||||||
items: items.map(serializeFoundryItem).filter(Boolean),
|
items: items.map(serializeFoundryWorldItem).filter(Boolean),
|
||||||
|
// The folder tree goes along, so an item that moved into or out of a folder
|
||||||
|
// arrives with the folder it names.
|
||||||
|
folders: worldItemFolderSnapshots(),
|
||||||
}, token);
|
}, token);
|
||||||
await rememberItemMappings(result.items);
|
await rememberItemMappings(result.items);
|
||||||
itemSyncErrorLogged = false;
|
itemSyncErrorLogged = false;
|
||||||
@@ -717,6 +779,34 @@ function queueFoundryItemChange(kind, item) {
|
|||||||
itemSyncTimeout = setTimeout(flushItemChanges, 400);
|
itemSyncTimeout = setTimeout(flushItemChanges, 400);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// A folder the GM made, renamed or nested has to reach the campaign even though no
|
||||||
|
// item changed, so the tree goes over on its own without pushing the items in it.
|
||||||
|
function queueFoundryItemFolders(delay = 400) {
|
||||||
|
clearTimeout(folderSyncTimeout);
|
||||||
|
folderSyncTimeout = setTimeout(pushFoundryItemFolders, delay);
|
||||||
|
}
|
||||||
|
|
||||||
|
async function pushFoundryItemFolders() {
|
||||||
|
// Autosync off: folder changes wait, like the item edits do.
|
||||||
|
if (!isAutoSyncEnabled()) return;
|
||||||
|
const token = getSyncToken();
|
||||||
|
if (!token || !game.user?.isGM || !game.world || folderSyncRunning) return;
|
||||||
|
folderSyncRunning = true;
|
||||||
|
try {
|
||||||
|
await postDragonroll("foundry/sync/item-snapshot", {
|
||||||
|
worldId: game.world.id,
|
||||||
|
items: [],
|
||||||
|
folders: worldItemFolderSnapshots(),
|
||||||
|
}, token);
|
||||||
|
itemSyncErrorLogged = false;
|
||||||
|
} catch (error) {
|
||||||
|
reportItemSyncError(error);
|
||||||
|
queueFoundryItemFolders(5000);
|
||||||
|
} finally {
|
||||||
|
folderSyncRunning = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
async function flushItemChanges() {
|
async function flushItemChanges() {
|
||||||
// Autosync off: the queued edits wait here, like the actor changes do.
|
// Autosync off: the queued edits wait here, like the actor changes do.
|
||||||
if (!isAutoSyncEnabled()) return;
|
if (!isAutoSyncEnabled()) return;
|
||||||
@@ -911,10 +1001,10 @@ function makeFoundryCharacterData(entry) {
|
|||||||
type: entry.type === "character" ? "character" : "npc",
|
type: entry.type === "character" ? "character" : "npc",
|
||||||
img: getDragonrollImageUrl(entry.image) || undefined,
|
img: getDragonrollImageUrl(entry.image) || undefined,
|
||||||
system: {
|
system: {
|
||||||
|
// `details.race` and `details.background` are left out on purpose: they reference
|
||||||
|
// embedded items and are linked once the actor stands with its items made.
|
||||||
details: {
|
details: {
|
||||||
race: entry.species || "",
|
|
||||||
level: Number(entry.level) || 1,
|
level: Number(entry.level) || 1,
|
||||||
background: entry.background || "",
|
|
||||||
biography: { value: entry.description || "" },
|
biography: { value: entry.description || "" },
|
||||||
cr: entry.challengeRating || "",
|
cr: entry.challengeRating || "",
|
||||||
},
|
},
|
||||||
@@ -947,9 +1037,7 @@ function characterUpdateData(entry) {
|
|||||||
const updates = {
|
const updates = {
|
||||||
name: entry.name,
|
name: entry.name,
|
||||||
img: getDragonrollImageUrl(entry.image) || "icons/svg/mystery-man.svg",
|
img: getDragonrollImageUrl(entry.image) || "icons/svg/mystery-man.svg",
|
||||||
"system.details.race": entry.species || "",
|
|
||||||
"system.details.level": Number(entry.level) || 1,
|
"system.details.level": Number(entry.level) || 1,
|
||||||
"system.details.background": entry.background || "",
|
|
||||||
"system.details.biography.value": entry.description || "",
|
"system.details.biography.value": entry.description || "",
|
||||||
"system.details.cr": entry.challengeRating || "",
|
"system.details.cr": entry.challengeRating || "",
|
||||||
[`flags.${MODULE_ID}.traits`]: entry.traits || "",
|
[`flags.${MODULE_ID}.traits`]: entry.traits || "",
|
||||||
@@ -963,6 +1051,40 @@ function characterUpdateData(entry) {
|
|||||||
return updates;
|
return updates;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// `system.details.background` and `system.details.race` are LocalDocumentFields in
|
||||||
|
// D&D 5e: they hold the id of an item embedded in the actor, never its name. A name
|
||||||
|
// written into one is a reference that resolves to nothing, and adding that item in
|
||||||
|
// Foundry then fails, so each of these follows the actor's own item for it instead.
|
||||||
|
const EMBEDDED_DETAILS = [
|
||||||
|
// Dragonroll owns the background item it lists, so its reference follows it always and
|
||||||
|
// a background taken off in the campaign leaves no reference behind.
|
||||||
|
{ field: "background", path: "system.details.background", types: ["background"], clearWhenMissing: true },
|
||||||
|
// The species item belongs to the world: point at it when it carries the name, and
|
||||||
|
// leave the reference to the GM when it does not.
|
||||||
|
{ field: "species", path: "system.details.race", types: ["race", "species"] },
|
||||||
|
];
|
||||||
|
|
||||||
|
function localDocumentId(value) {
|
||||||
|
// The field resolves to the referenced document when it can and to the stored id
|
||||||
|
// when the document is gone (its `fallback` option).
|
||||||
|
if (typeof value === "string") return value;
|
||||||
|
return value?._id || "";
|
||||||
|
}
|
||||||
|
|
||||||
|
function embeddedDetailReferenceData(actor, entry) {
|
||||||
|
const updates = {};
|
||||||
|
for (const detail of EMBEDDED_DETAILS) {
|
||||||
|
const wanted = String(entry[detail.field] || "").trim();
|
||||||
|
const item = wanted
|
||||||
|
? actor.items?.contents?.find((candidate) => detail.types.includes(candidate.type) && candidate.name === wanted)
|
||||||
|
: null;
|
||||||
|
const reference = item?.id || "";
|
||||||
|
if (!reference && !detail.clearWhenMissing) continue;
|
||||||
|
if (localDocumentId(documentValue(actor, detail.path)) !== reference) updates[detail.path] = reference;
|
||||||
|
}
|
||||||
|
return updates;
|
||||||
|
}
|
||||||
|
|
||||||
async function reconcileEmbeddedItems(actor, entry) {
|
async function reconcileEmbeddedItems(actor, entry) {
|
||||||
const desired = [];
|
const desired = [];
|
||||||
if (entry.className) desired.push({ type: "class", name: entry.className, system: { levels: Number(entry.level) || 1 } });
|
if (entry.className) desired.push({ type: "class", name: entry.className, system: { levels: Number(entry.level) || 1 } });
|
||||||
@@ -1021,6 +1143,9 @@ async function applyDragonrollCharacter(actor, entry) {
|
|||||||
await withActorSyncSuppressed(actor, async () => {
|
await withActorSyncSuppressed(actor, async () => {
|
||||||
if (changed) await actor.update(updates);
|
if (changed) await actor.update(updates);
|
||||||
await reconcileEmbeddedItems(actor, entry);
|
await reconcileEmbeddedItems(actor, entry);
|
||||||
|
// The item references are written after the reconcile that makes the items they point at.
|
||||||
|
const references = embeddedDetailReferenceData(actor, entry);
|
||||||
|
if (Object.keys(references).length) await actor.update(references);
|
||||||
if (dragonrollActorId(actor) !== String(entry._id)
|
if (dragonrollActorId(actor) !== String(entry._id)
|
||||||
|| actor.getFlag?.(MODULE_ID, "actorType") !== entry.type) {
|
|| actor.getFlag?.(MODULE_ID, "actorType") !== entry.type) {
|
||||||
await actor.update({
|
await actor.update({
|
||||||
@@ -1048,7 +1173,12 @@ async function createFoundryCharacter(entry) {
|
|||||||
if (!actor) return;
|
if (!actor) return;
|
||||||
|
|
||||||
await withActorSyncSuppressed(actor, async () => {
|
await withActorSyncSuppressed(actor, async () => {
|
||||||
await actor.update({ [`flags.${MODULE_ID}.syncMutation`]: false });
|
await actor.update({
|
||||||
|
// The actor was made with its items, so its background and species references
|
||||||
|
// can point at them right away.
|
||||||
|
...embeddedDetailReferenceData(actor, entry),
|
||||||
|
[`flags.${MODULE_ID}.syncMutation`]: false,
|
||||||
|
});
|
||||||
});
|
});
|
||||||
await mapDragonrollActor(entry._id, actor.id);
|
await mapDragonrollActor(entry._id, actor.id);
|
||||||
}
|
}
|
||||||
@@ -1094,6 +1224,14 @@ async function reconcileDragonrollCharacters() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Both sides converge on a timer that only runs while the world is open, so a
|
||||||
|
// round that could not reach Dragonroll is asked for again in a while instead of
|
||||||
|
// leaving the campaign with whatever it happened to receive.
|
||||||
|
function scheduleDragonrollCharacterSync(delay = 15000) {
|
||||||
|
clearTimeout(characterSyncRetryTimeout);
|
||||||
|
characterSyncRetryTimeout = setTimeout(reconcileDragonrollCharacters, delay);
|
||||||
|
}
|
||||||
|
|
||||||
async function initializeCharacterSync() {
|
async function initializeCharacterSync() {
|
||||||
if (!getSyncToken() || !game.user?.isGM || !game.world || !isAutoSyncEnabled()) return;
|
if (!getSyncToken() || !game.user?.isGM || !game.world || !isAutoSyncEnabled()) return;
|
||||||
try {
|
try {
|
||||||
@@ -1206,6 +1344,7 @@ Hooks.once("ready", () => {
|
|||||||
for (const event of [
|
for (const event of [
|
||||||
"createActor", "updateActor", "deleteActor",
|
"createActor", "updateActor", "deleteActor",
|
||||||
"createItem", "updateItem", "deleteItem",
|
"createItem", "updateItem", "deleteItem",
|
||||||
|
"createFolder", "updateFolder", "deleteFolder",
|
||||||
]) {
|
]) {
|
||||||
Hooks.on(event, (document) => {
|
Hooks.on(event, (document) => {
|
||||||
scheduleSnapshotSync();
|
scheduleSnapshotSync();
|
||||||
@@ -1215,6 +1354,12 @@ Hooks.once("ready", () => {
|
|||||||
queueFoundryActorChange(isDelete ? "delete" : "upsert", document);
|
queueFoundryActorChange(isDelete ? "delete" : "upsert", document);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
// An item folder the GM made, renamed or nested changes the tree the campaign
|
||||||
|
// mirrors; nothing about the items themselves changed, so only the tree goes.
|
||||||
|
if (document.documentName === "Folder") {
|
||||||
|
if (document.type === "Item" && isWorldItemFolder(document)) queueFoundryItemFolders();
|
||||||
|
return;
|
||||||
|
}
|
||||||
if (document.documentName !== "Item") return;
|
if (document.documentName !== "Item") return;
|
||||||
|
|
||||||
// Items embedded in an actor travel with that actor's snapshot: adding or
|
// Items embedded in an actor travel with that actor's snapshot: adding or
|
||||||
|
|||||||
@@ -5,10 +5,13 @@ import { useI18n } from 'vue-i18n';
|
|||||||
import { useCampaignService } from '~/services/Campaign.js';
|
import { useCampaignService } from '~/services/Campaign.js';
|
||||||
import { AnchorMap, AnchoredMap, ClearAnchoredMap, SetActivePane } from '~/services/Content.js';
|
import { AnchorMap, AnchoredMap, ClearAnchoredMap, SetActivePane } from '~/services/Content.js';
|
||||||
import { emitter } from '~/services/Emitter';
|
import { emitter } from '~/services/Emitter';
|
||||||
import Server from '~/services/Server';
|
import { BuildColorMenu } from '~/services/EntryColors';
|
||||||
|
import { BuildItemRows } from '~/services/ItemFolders';
|
||||||
|
import Server, { getBaseUrl } from '~/services/Server';
|
||||||
import { ClearWindow, CreateWindow, GetFirstWindowId } from '~/services/Windows';
|
import { ClearWindow, CreateWindow, GetFirstWindowId } from '~/services/Windows';
|
||||||
import { HideContextMenu, ShowContextMenu } from '~/services/ContextMenu';
|
import { HideContextMenu, ShowContextMenu } from '~/services/ContextMenu';
|
||||||
import { ACTOR_DRAG_TYPE } from '~/services/MapTokens';
|
import { ACTOR_DRAG_TYPE } from '~/services/MapTokens';
|
||||||
|
import EntryFolderRow from './EntryFolderRow.vue';
|
||||||
import NestedNoteList from './NestedNoteList.vue';
|
import NestedNoteList from './NestedNoteList.vue';
|
||||||
|
|
||||||
const { Campaign } = useCampaignService();
|
const { Campaign } = useCampaignService();
|
||||||
@@ -19,6 +22,11 @@ const actors = ref([]);
|
|||||||
const items = ref([]);
|
const items = ref([]);
|
||||||
const maps = ref([]);
|
const maps = ref([]);
|
||||||
const entryLists = { actor: actors, item: items, map: maps };
|
const entryLists = { actor: actors, item: items, map: maps };
|
||||||
|
// Every sidebar section files its rows into folders of its own (see models/Folder.js), so
|
||||||
|
// each entry list keeps the tree `/actor|item|map/list` sends along. Folders are open by
|
||||||
|
// default: a folder synced from Foundry should show what stands in it, not hide it.
|
||||||
|
const entryFolders = { actor: ref([]), item: ref([]), map: ref([]) };
|
||||||
|
const collapsedFolderIds = ref([]);
|
||||||
const loadingNotes = ref(false);
|
const loadingNotes = ref(false);
|
||||||
const loadingEntries = ref(false);
|
const loadingEntries = ref(false);
|
||||||
const notesError = ref('');
|
const notesError = ref('');
|
||||||
@@ -106,12 +114,27 @@ function handleNoteDeleted(noteKey) {
|
|||||||
notes.value = notes.value.filter(n => n.key !== noteKey);
|
notes.value = notes.value.filter(n => n.key !== noteKey);
|
||||||
}
|
}
|
||||||
|
|
||||||
function handleFolderSaved() {
|
function sectionForTarget(target) {
|
||||||
fetchCampaignNotes();
|
if (target === 'actor') return 'actors';
|
||||||
|
if (target === 'item') return 'items';
|
||||||
|
if (target === 'map') return 'maps';
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
function handleFolderSaved(folder) {
|
||||||
|
// A folder only shows up once the list it belongs to reads it back: the notes refetch
|
||||||
|
// their tree, an entry list refetches its own (silently, its rows are already there).
|
||||||
|
const section = sectionForTarget(folder?.target ?? 'note');
|
||||||
|
if (!section) {
|
||||||
|
fetchCampaignNotes();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
fetchCampaignEntries(section, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
function handleFolderDeleted(folderId) {
|
function handleFolderDeleted(folderId) {
|
||||||
expandedFolderIds.value = expandedFolderIds.value.filter((id) => id !== folderId);
|
expandedFolderIds.value = expandedFolderIds.value.filter((id) => id !== folderId);
|
||||||
|
collapsedFolderIds.value = collapsedFolderIds.value.filter((id) => id !== folderId);
|
||||||
}
|
}
|
||||||
|
|
||||||
function handleCampaignEntryCreated({ entityType, entry }) {
|
function handleCampaignEntryCreated({ entityType, entry }) {
|
||||||
@@ -202,6 +225,10 @@ async function fetchCampaignEntries(entityType = activeSection.value, silent = f
|
|||||||
|
|
||||||
const previousById = new Map(list.value.map((entry) => [entry._id, entry]));
|
const previousById = new Map(list.value.map((entry) => [entry._id, entry]));
|
||||||
list.value = response.data[entityType] ?? [];
|
list.value = response.data[entityType] ?? [];
|
||||||
|
// Every entry list comes with the folders its rows stand in, so the sidebar can
|
||||||
|
// group them the way the note tree does (and the way the Foundry item directory
|
||||||
|
// arrives for items).
|
||||||
|
entryFolders[kind].value = response.data.folders ?? [];
|
||||||
// Tell open windows about Foundry changes landing behind them.
|
// Tell open windows about Foundry changes landing behind them.
|
||||||
for (const entry of list.value) {
|
for (const entry of list.value) {
|
||||||
const previous = previousById.get(entry._id);
|
const previous = previousById.get(entry._id);
|
||||||
@@ -235,6 +262,14 @@ function createEntry(entityType) {
|
|||||||
CreateWindow('create_campaign_entry', { entityType, campaign: campaignId.value });
|
CreateWindow('create_campaign_entry', { entityType, campaign: campaignId.value });
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Every section files its rows into folders of its own: the window passes along which
|
||||||
|
// list the folder belongs to, so the notes, the actors, the items and the maps each keep
|
||||||
|
// a tree the others never show.
|
||||||
|
function createFolder(target = 'note') {
|
||||||
|
if (!campaignId.value) return;
|
||||||
|
CreateWindow('new_folder', { campaign: campaignId.value, target });
|
||||||
|
}
|
||||||
|
|
||||||
function entrySummary(actor) {
|
function entrySummary(actor) {
|
||||||
const bits = [t(`campaigns.actor.types.${actor.type}`)];
|
const bits = [t(`campaigns.actor.types.${actor.type}`)];
|
||||||
if (actor.species) bits.push(actor.species);
|
if (actor.species) bits.push(actor.species);
|
||||||
@@ -248,6 +283,13 @@ function itemSummary(item) {
|
|||||||
return `${t(`campaigns.item.categories.${item.category}`)} · ${t(`campaigns.item.rarities.${item.rarity}`)} · ${t('campaigns.item.quantity-short')} ${item.quantity}`;
|
return `${t(`campaigns.item.categories.${item.category}`)} · ${t(`campaigns.item.rarities.${item.rarity}`)} · ${t('campaigns.item.quantity-short')} ${item.quantity}`;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// An item's icon in the sidebar: an uploaded filename served from /api/public, or a full URL
|
||||||
|
// (Foundry sends its own icon as one) — the same rule the item window uses.
|
||||||
|
function itemImageUrl(image) {
|
||||||
|
if (!image) return '';
|
||||||
|
return /^(https?:|data:|\/\/)/i.test(image) ? image : `${getBaseUrl()}/public/${image}`;
|
||||||
|
}
|
||||||
|
|
||||||
function mapSummary(map) {
|
function mapSummary(map) {
|
||||||
return t('campaigns.map.summary', { size: map.gridSize, scale: map.scale });
|
return t('campaigns.map.summary', { size: map.gridSize, scale: map.scale });
|
||||||
}
|
}
|
||||||
@@ -281,6 +323,14 @@ function showEntryMenu(entry, entityType) {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Rows of every section can be filed into a folder of their own list, like a note
|
||||||
|
// into a folder of the note tree.
|
||||||
|
menuItems.push({
|
||||||
|
name: t('campaigns.folders.move-to'),
|
||||||
|
icon: '/icons/iconoir/regular/folder.svg',
|
||||||
|
context: moveToFolderMenu(entityType, entry)
|
||||||
|
});
|
||||||
|
|
||||||
menuItems.push({
|
menuItems.push({
|
||||||
name: t('campaigns.actions.delete'),
|
name: t('campaigns.actions.delete'),
|
||||||
icon: '/icons/iconoir/regular/trash.svg',
|
icon: '/icons/iconoir/regular/trash.svg',
|
||||||
@@ -297,6 +347,74 @@ function showEntryMenu(entry, entityType) {
|
|||||||
ShowContextMenu(menuItems);
|
ShowContextMenu(menuItems);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// The menu of a folder row: rename it, colour it, delete it. The notes' folders are
|
||||||
|
// renamed and coloured the same way, through the same `/folder/*` routes.
|
||||||
|
function folderMenuItems(folder) {
|
||||||
|
return [
|
||||||
|
{
|
||||||
|
name: t('campaigns.folders.rename'), icon: '/icons/iconoir/regular/edit-pencil.svg',
|
||||||
|
action: () => {
|
||||||
|
HideContextMenu();
|
||||||
|
CreateWindow('new_folder', { folderId: folder._id, campaign: campaignId.value, name: folder.name });
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: t('campaigns.folders.color'), icon: '/icons/iconoir/regular/palette.svg',
|
||||||
|
context: BuildColorMenu((color) => setFolderColor(folder, color), { defaultLabel: t('campaigns.folders.default') })
|
||||||
|
},
|
||||||
|
{ divider: true },
|
||||||
|
{ name: t('campaigns.folders.delete'), icon: '/icons/iconoir/regular/trash.svg', action: () => deleteEntryFolder(folder) }
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
async function setFolderColor(folder, color) {
|
||||||
|
try {
|
||||||
|
const response = await Server().post('/folder/update', { id: folder._id, color });
|
||||||
|
if (response.data.status === 'ok') folder.color = color;
|
||||||
|
} catch (error) {} finally {
|
||||||
|
HideContextMenu();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function deleteEntryFolder(folder) {
|
||||||
|
try {
|
||||||
|
const response = await Server().post('/folder/delete', { id: folder._id });
|
||||||
|
if (response.data.status !== 'ok') return;
|
||||||
|
collapsedFolderIds.value = collapsedFolderIds.value.filter((id) => id !== folder._id);
|
||||||
|
// Whatever stood in the folder moved to the root of the list along with it.
|
||||||
|
await fetchCampaignEntries(activeSection.value, true);
|
||||||
|
} catch (error) {} finally {
|
||||||
|
HideContextMenu();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// The 'move to folder' submenu of an entry: the folders of its own list and its root.
|
||||||
|
function moveToFolderMenu(entityType, entry) {
|
||||||
|
const menuItems = entryFolders[entityType].value.map((folder) => ({
|
||||||
|
name: folder.name, icon: '/icons/iconoir/regular/folder.svg',
|
||||||
|
action: () => moveEntryToFolder(entityType, entry, folder._id)
|
||||||
|
}));
|
||||||
|
|
||||||
|
if (menuItems.length > 0) menuItems.push({ divider: true });
|
||||||
|
menuItems.push({
|
||||||
|
name: t('campaigns.folders.root'), icon: '/icons/iconoir/regular/xmark-circle.svg',
|
||||||
|
action: () => moveEntryToFolder(entityType, entry, null)
|
||||||
|
});
|
||||||
|
return menuItems;
|
||||||
|
}
|
||||||
|
|
||||||
|
async function moveEntryToFolder(entityType, entry, folderId) {
|
||||||
|
try {
|
||||||
|
const response = await Server().post(`/${entityType}/update`, { id: entry._id, folder: folderId });
|
||||||
|
if (response.data.status !== 'ok') return;
|
||||||
|
// The row walks over to its new folder. This is the event a Foundry sync of the
|
||||||
|
// entry sends, so the list regroups and a window open on it sees the change.
|
||||||
|
emitter.emit('campaign-entry-updated', { entityType, entry: response.data[entityType] });
|
||||||
|
} catch (error) {} finally {
|
||||||
|
HideContextMenu();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
async function openCharacterSheet(actor) {
|
async function openCharacterSheet(actor) {
|
||||||
const existingWindowId = GetFirstWindowId('character_sheet');
|
const existingWindowId = GetFirstWindowId('character_sheet');
|
||||||
if (existingWindowId !== undefined) {
|
if (existingWindowId !== undefined) {
|
||||||
@@ -335,21 +453,41 @@ function createNote() {
|
|||||||
CreateWindow('new_note', { campaign: campaignId.value });
|
CreateWindow('new_note', { campaign: campaignId.value });
|
||||||
}
|
}
|
||||||
|
|
||||||
function createFolder() {
|
|
||||||
CreateWindow('new_folder', { campaign: campaignId.value });
|
|
||||||
}
|
|
||||||
|
|
||||||
function toggleSidebar() {
|
function toggleSidebar() {
|
||||||
sidebarCollapsed.value = !sidebarCollapsed.value;
|
sidebarCollapsed.value = !sidebarCollapsed.value;
|
||||||
}
|
}
|
||||||
|
|
||||||
const rootNotes = computed(() => notes.value.filter(n => !n._folder));
|
const rootNotes = computed(() => notes.value.filter(n => !n._folder));
|
||||||
|
|
||||||
|
// The rows of each entry list: every folder followed by what stands in it, deeper and
|
||||||
|
// deeper, the way the item list has done since its folders arrived from the linked world
|
||||||
|
// (services/ItemFolders.js builds them from the list and the folders the API sends).
|
||||||
|
// Without any folder this is the plain list, and `row.item` is the entry of the section
|
||||||
|
// the row belongs to: its actor, item or map.
|
||||||
|
const entryRows = {
|
||||||
|
actor: computed(() => BuildItemRows(actors.value, entryFolders.actor.value, collapsedFolderIds.value)),
|
||||||
|
item: computed(() => BuildItemRows(items.value, entryFolders.item.value, collapsedFolderIds.value)),
|
||||||
|
map: computed(() => BuildItemRows(maps.value, entryFolders.map.value, collapsedFolderIds.value))
|
||||||
|
};
|
||||||
|
|
||||||
|
// Rows one step deeper per folder level; the sidebar list's own padding is the base.
|
||||||
|
function rowIndent(depth) {
|
||||||
|
return { paddingLeft: `${10 + depth * 14}px` };
|
||||||
|
}
|
||||||
|
|
||||||
|
function toggleFolder(folderId) {
|
||||||
|
collapsedFolderIds.value = collapsedFolderIds.value.includes(folderId)
|
||||||
|
? collapsedFolderIds.value.filter((id) => id !== folderId)
|
||||||
|
: [...collapsedFolderIds.value, folderId];
|
||||||
|
}
|
||||||
|
|
||||||
watch(campaignId, (newVal) => {
|
watch(campaignId, (newVal) => {
|
||||||
if (newVal) {
|
if (newVal) {
|
||||||
actors.value = [];
|
actors.value = [];
|
||||||
items.value = [];
|
items.value = [];
|
||||||
maps.value = [];
|
maps.value = [];
|
||||||
|
for (const sectionFolders of Object.values(entryFolders)) sectionFolders.value = [];
|
||||||
|
collapsedFolderIds.value = [];
|
||||||
ClearAnchoredMap();
|
ClearAnchoredMap();
|
||||||
fetchCampaignNotes();
|
fetchCampaignNotes();
|
||||||
if (isEntrySection(activeSection.value)) fetchCampaignEntries(activeSection.value);
|
if (isEntrySection(activeSection.value)) fetchCampaignEntries(activeSection.value);
|
||||||
@@ -359,6 +497,8 @@ watch(campaignId, (newVal) => {
|
|||||||
actors.value = [];
|
actors.value = [];
|
||||||
items.value = [];
|
items.value = [];
|
||||||
maps.value = [];
|
maps.value = [];
|
||||||
|
for (const sectionFolders of Object.values(entryFolders)) sectionFolders.value = [];
|
||||||
|
collapsedFolderIds.value = [];
|
||||||
notesError.value = '';
|
notesError.value = '';
|
||||||
entriesError.value = '';
|
entriesError.value = '';
|
||||||
ClearAnchoredMap();
|
ClearAnchoredMap();
|
||||||
@@ -469,7 +609,7 @@ onBeforeUnmount(() => {
|
|||||||
<button class="sidebar-action" type="button" @click="createNote" :disabled="!Campaign" :title="t('campaigns.actions.new-note')" :aria-label="t('campaigns.actions.new-note')">
|
<button class="sidebar-action" type="button" @click="createNote" :disabled="!Campaign" :title="t('campaigns.actions.new-note')" :aria-label="t('campaigns.actions.new-note')">
|
||||||
<img class="sidebar-action-icon" src="/icons/iconoir/regular/plus.svg" alt="" aria-hidden="true">
|
<img class="sidebar-action-icon" src="/icons/iconoir/regular/plus.svg" alt="" aria-hidden="true">
|
||||||
</button>
|
</button>
|
||||||
<button class="sidebar-action" type="button" @click="createFolder" :disabled="!Campaign" :title="t('campaigns.actions.new-folder')" :aria-label="t('campaigns.actions.new-folder')">
|
<button class="sidebar-action" type="button" @click="createFolder()" :disabled="!Campaign" :title="t('campaigns.actions.new-folder')" :aria-label="t('campaigns.actions.new-folder')">
|
||||||
<img class="sidebar-action-icon" src="/icons/iconoir/regular/folder.svg" alt="" aria-hidden="true">
|
<img class="sidebar-action-icon" src="/icons/iconoir/regular/folder.svg" alt="" aria-hidden="true">
|
||||||
</button>
|
</button>
|
||||||
<button class="sidebar-action" type="button" @click="fetchCampaignNotes" :disabled="!Campaign || loadingNotes" :title="t('campaigns.actions.refresh')" :aria-label="t('campaigns.actions.refresh')">
|
<button class="sidebar-action" type="button" @click="fetchCampaignNotes" :disabled="!Campaign || loadingNotes" :title="t('campaigns.actions.refresh')" :aria-label="t('campaigns.actions.refresh')">
|
||||||
@@ -480,6 +620,9 @@ onBeforeUnmount(() => {
|
|||||||
<button class="sidebar-action" type="button" @click="createEntry(entryEntityType(activeSection))" :disabled="!Campaign" :title="t('campaigns.actions.create', { section: t(`campaigns.sections.${activeSection}`).toLowerCase() })" :aria-label="t('campaigns.actions.create', { section: t(`campaigns.sections.${activeSection}`).toLowerCase() })">
|
<button class="sidebar-action" type="button" @click="createEntry(entryEntityType(activeSection))" :disabled="!Campaign" :title="t('campaigns.actions.create', { section: t(`campaigns.sections.${activeSection}`).toLowerCase() })" :aria-label="t('campaigns.actions.create', { section: t(`campaigns.sections.${activeSection}`).toLowerCase() })">
|
||||||
<img class="sidebar-action-icon" src="/icons/iconoir/regular/plus.svg" alt="" aria-hidden="true">
|
<img class="sidebar-action-icon" src="/icons/iconoir/regular/plus.svg" alt="" aria-hidden="true">
|
||||||
</button>
|
</button>
|
||||||
|
<button class="sidebar-action" type="button" @click="createFolder(entryEntityType(activeSection))" :disabled="!Campaign" :title="t('campaigns.actions.new-folder')" :aria-label="t('campaigns.actions.new-folder')">
|
||||||
|
<img class="sidebar-action-icon" src="/icons/iconoir/regular/folder.svg" alt="" aria-hidden="true">
|
||||||
|
</button>
|
||||||
<button class="sidebar-action" type="button" @click="fetchCampaignEntries(activeSection)" :disabled="!Campaign || loadingEntries" :title="t('campaigns.actions.refresh')" :aria-label="t('campaigns.actions.refresh')">
|
<button class="sidebar-action" type="button" @click="fetchCampaignEntries(activeSection)" :disabled="!Campaign || loadingEntries" :title="t('campaigns.actions.refresh')" :aria-label="t('campaigns.actions.refresh')">
|
||||||
<img class="sidebar-action-icon" src="/icons/iconoir/regular/refresh.svg" alt="" aria-hidden="true">
|
<img class="sidebar-action-icon" src="/icons/iconoir/regular/refresh.svg" alt="" aria-hidden="true">
|
||||||
</button>
|
</button>
|
||||||
@@ -501,38 +644,73 @@ onBeforeUnmount(() => {
|
|||||||
<template v-else-if="activeSection === 'actors'">
|
<template v-else-if="activeSection === 'actors'">
|
||||||
<div v-if="loadingEntries" class="sidebar-state">{{ t('campaigns.states.loading') }}</div>
|
<div v-if="loadingEntries" class="sidebar-state">{{ t('campaigns.states.loading') }}</div>
|
||||||
<div v-else-if="entriesError" class="sidebar-state error">{{ entriesError }}</div>
|
<div v-else-if="entriesError" class="sidebar-state error">{{ entriesError }}</div>
|
||||||
<div v-else-if="actors.length === 0" class="sidebar-state">{{ t('campaigns.states.empty-actors') }}</div>
|
<div v-else-if="actors.length === 0 && entryFolders.actor.value.length === 0" class="sidebar-state">{{ t('campaigns.states.empty-actors') }}</div>
|
||||||
<div v-for="actor in actors" :key="actor._id" class="entity-entry" role="button" tabindex="0" draggable="true" :title="t('campaigns.map.tokens.drag')" @click="openCharacterSheet(actor)" @keydown.enter="openCharacterSheet(actor)" @keydown.space.prevent="openCharacterSheet(actor)" @dragstart="startActorDrag($event, actor)" @contextmenu.prevent="showEntryMenu(actor, 'actor')">
|
<template v-for="row in entryRows.actor.value" :key="row.key">
|
||||||
<span class="entity-entry-name">{{ actor.name }}</span>
|
<EntryFolderRow
|
||||||
<span class="entity-entry-meta">{{ entrySummary(actor) }}</span>
|
v-if="row.kind === 'folder'"
|
||||||
</div>
|
:folder="row.folder"
|
||||||
|
:collapsed="collapsedFolderIds.includes(row.folder._id)"
|
||||||
|
:indent="rowIndent(row.depth)"
|
||||||
|
:menu="folderMenuItems(row.folder)"
|
||||||
|
:toggle-label="t('campaigns.folders.toggle', { name: row.folder.name })"
|
||||||
|
@toggle="toggleFolder(row.folder._id)"
|
||||||
|
/>
|
||||||
|
<div v-else class="entity-entry" :style="rowIndent(row.depth)" role="button" tabindex="0" draggable="true" :title="t('campaigns.map.tokens.drag')" @click="openCharacterSheet(row.item)" @keydown.enter="openCharacterSheet(row.item)" @keydown.space.prevent="openCharacterSheet(row.item)" @dragstart="startActorDrag($event, row.item)" @contextmenu.prevent="showEntryMenu(row.item, 'actor')">
|
||||||
|
<span class="entity-entry-name">{{ row.item.name }}</span>
|
||||||
|
<span class="entity-entry-meta">{{ entrySummary(row.item) }}</span>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<template v-else-if="activeSection === 'items'">
|
<template v-else-if="activeSection === 'items'">
|
||||||
<div v-if="loadingEntries" class="sidebar-state">{{ t('campaigns.states.loading') }}</div>
|
<div v-if="loadingEntries" class="sidebar-state">{{ t('campaigns.states.loading') }}</div>
|
||||||
<div v-else-if="entriesError" class="sidebar-state error">{{ entriesError }}</div>
|
<div v-else-if="entriesError" class="sidebar-state error">{{ entriesError }}</div>
|
||||||
<div v-else-if="items.length === 0" class="sidebar-state">{{ t('campaigns.states.empty-items') }}</div>
|
<div v-else-if="items.length === 0 && entryFolders.item.value.length === 0" class="sidebar-state">{{ t('campaigns.states.empty-items') }}</div>
|
||||||
<div v-for="item in items" :key="item._id" class="entity-entry" role="button" tabindex="0" @click="openItemSheet(item)" @keydown.enter="openItemSheet(item)" @keydown.space.prevent="openItemSheet(item)" @contextmenu.prevent="showEntryMenu(item, 'item')">
|
<template v-for="row in entryRows.item.value" :key="row.key">
|
||||||
<span class="entity-entry-name-row">
|
<EntryFolderRow
|
||||||
<span class="entity-entry-name">{{ item.name }}</span>
|
v-if="row.kind === 'folder'"
|
||||||
<span v-if="item.foundryItemId" class="entity-entry-sync">{{ t('campaigns.synced') }}</span>
|
:folder="row.folder"
|
||||||
</span>
|
:collapsed="collapsedFolderIds.includes(row.folder._id)"
|
||||||
<span class="entity-entry-meta">{{ itemSummary(item) }}</span>
|
:indent="rowIndent(row.depth)"
|
||||||
</div>
|
:menu="folderMenuItems(row.folder)"
|
||||||
|
:toggle-label="t('campaigns.folders.toggle', { name: row.folder.name })"
|
||||||
|
@toggle="toggleFolder(row.folder._id)"
|
||||||
|
/>
|
||||||
|
<div v-else class="entity-entry" :style="rowIndent(row.depth)" role="button" tabindex="0" @click="openItemSheet(row.item)" @keydown.enter="openItemSheet(row.item)" @keydown.space.prevent="openItemSheet(row.item)" @contextmenu.prevent="showEntryMenu(row.item, 'item')">
|
||||||
|
<span class="entity-entry-title">
|
||||||
|
<span v-if="row.item.image" class="entity-entry-image" aria-hidden="true">
|
||||||
|
<img :src="itemImageUrl(row.item.image)" alt="">
|
||||||
|
</span>
|
||||||
|
<span class="entity-entry-name">{{ row.item.name }}</span>
|
||||||
|
</span>
|
||||||
|
<span class="entity-entry-meta">{{ itemSummary(row.item) }}</span>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<template v-else>
|
<template v-else>
|
||||||
<div v-if="loadingEntries" class="sidebar-state">{{ t('campaigns.states.loading') }}</div>
|
<div v-if="loadingEntries" class="sidebar-state">{{ t('campaigns.states.loading') }}</div>
|
||||||
<div v-else-if="entriesError" class="sidebar-state error">{{ entriesError }}</div>
|
<div v-else-if="entriesError" class="sidebar-state error">{{ entriesError }}</div>
|
||||||
<div v-else-if="maps.length === 0" class="sidebar-state">{{ t('campaigns.states.empty-maps') }}</div>
|
<div v-else-if="maps.length === 0 && entryFolders.map.value.length === 0" class="sidebar-state">{{ t('campaigns.states.empty-maps') }}</div>
|
||||||
<div v-for="map in maps" :key="map._id" class="entity-entry" :class="{ anchored: isAnchoredMap(map) }" role="button" tabindex="0" @click="openMapViewer(map)" @keydown.enter="openMapViewer(map)" @keydown.space.prevent="openMapViewer(map)" @contextmenu.prevent="showEntryMenu(map, 'map')">
|
<template v-for="row in entryRows.map.value" :key="row.key">
|
||||||
<span class="entity-entry-name-row">
|
<EntryFolderRow
|
||||||
<span class="entity-entry-name">{{ map.name }}</span>
|
v-if="row.kind === 'folder'"
|
||||||
<span v-if="isAnchoredMap(map)" class="entity-entry-sync">{{ t('campaigns.map.anchored') }}</span>
|
:folder="row.folder"
|
||||||
</span>
|
:collapsed="collapsedFolderIds.includes(row.folder._id)"
|
||||||
<span class="entity-entry-meta">{{ mapSummary(map) }}</span>
|
:indent="rowIndent(row.depth)"
|
||||||
<span v-if="!map.image" class="entity-entry-description">{{ t('campaigns.map.no-image') }}</span>
|
:menu="folderMenuItems(row.folder)"
|
||||||
</div>
|
:toggle-label="t('campaigns.folders.toggle', { name: row.folder.name })"
|
||||||
|
@toggle="toggleFolder(row.folder._id)"
|
||||||
|
/>
|
||||||
|
<div v-else class="entity-entry" :style="rowIndent(row.depth)" :class="{ anchored: isAnchoredMap(row.item) }" role="button" tabindex="0" @click="openMapViewer(row.item)" @keydown.enter="openMapViewer(row.item)" @keydown.space.prevent="openMapViewer(row.item)" @contextmenu.prevent="showEntryMenu(row.item, 'map')">
|
||||||
|
<span class="entity-entry-name-row">
|
||||||
|
<span class="entity-entry-name">{{ row.item.name }}</span>
|
||||||
|
<span v-if="isAnchoredMap(row.item)" class="entity-entry-sync">{{ t('campaigns.map.anchored') }}</span>
|
||||||
|
</span>
|
||||||
|
<span class="entity-entry-meta">{{ mapSummary(row.item) }}</span>
|
||||||
|
<span v-if="!row.item.image" class="entity-entry-description">{{ t('campaigns.map.no-image') }}</span>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
</template>
|
</template>
|
||||||
</div>
|
</div>
|
||||||
</aside>
|
</aside>
|
||||||
@@ -696,6 +874,15 @@ onBeforeUnmount(() => {
|
|||||||
}
|
}
|
||||||
.entity-entry-meta, .entity-entry-description { font-size: 12px; opacity: 0.72; }
|
.entity-entry-meta, .entity-entry-description { font-size: 12px; opacity: 0.72; }
|
||||||
.entity-entry-description { display: -webkit-box; -webkit-box-orient: vertical; -webkit-line-clamp: 2; overflow: hidden; }
|
.entity-entry-description { display: -webkit-box; -webkit-box-orient: vertical; -webkit-line-clamp: 2; overflow: hidden; }
|
||||||
|
/* An item row leads with the item's own icon on the left of its name, standing in for the
|
||||||
|
"SYNCED" text it used to show (Syndria98/dragonroll#53). */
|
||||||
|
.entity-entry-title { display: flex; align-items: center; gap: 9px; min-width: 0; }
|
||||||
|
.entity-entry-image {
|
||||||
|
flex: 0 0 30px; width: 30px; height: 30px; box-sizing: border-box;
|
||||||
|
display: grid; place-items: center; overflow: hidden;
|
||||||
|
border: 1px solid var(--color-border); border-radius: 6px; background: var(--color-background-soft);
|
||||||
|
}
|
||||||
|
.entity-entry-image img { width: 100%; height: 100%; object-fit: contain; }
|
||||||
|
|
||||||
@media (max-width: 900px) {
|
@media (max-width: 900px) {
|
||||||
.notes-sidebar {
|
.notes-sidebar {
|
||||||
|
|||||||
57
frontend/app/components/partials/EntryFolderRow.vue
Normal file
57
frontend/app/components/partials/EntryFolderRow.vue
Normal file
@@ -0,0 +1,57 @@
|
|||||||
|
<script setup>
|
||||||
|
// One folder row of a campaign entry list (actors, items or maps), nested by the depth the
|
||||||
|
// folder stands at. Toggling it collapses what is inside; its context menu renames the
|
||||||
|
// folder, colours it, and deletes it. Note folders have their own tree (NestedNoteList),
|
||||||
|
// which loads its contents one folder at a time.
|
||||||
|
import { ShowContextMenu } from '~/services/ContextMenu';
|
||||||
|
|
||||||
|
const props = defineProps({
|
||||||
|
folder: { type: Object, required: true },
|
||||||
|
collapsed: { type: Boolean, default: false },
|
||||||
|
// The padding of the level this folder stands at, from the sidebar's `rowIndent`.
|
||||||
|
indent: { type: Object, default: () => ({}) },
|
||||||
|
menu: { type: Array, default: () => [] },
|
||||||
|
toggleLabel: { type: String, default: '' }
|
||||||
|
});
|
||||||
|
|
||||||
|
const emit = defineEmits(['toggle']);
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<button
|
||||||
|
class="entry-folder-row"
|
||||||
|
:class="{ 'has-color': !!folder.color }"
|
||||||
|
:style="[indent, folder.color ? { '--entry-color': folder.color } : null]"
|
||||||
|
type="button"
|
||||||
|
:aria-expanded="(!collapsed).toString()"
|
||||||
|
:aria-label="toggleLabel"
|
||||||
|
@click="emit('toggle')"
|
||||||
|
@contextmenu.prevent="ShowContextMenu(menu)"
|
||||||
|
>
|
||||||
|
<img
|
||||||
|
class="entry-folder-arrow"
|
||||||
|
:src="collapsed ? '/icons/iconoir/regular/nav-arrow-right.svg' : '/icons/iconoir/regular/nav-arrow-down.svg'"
|
||||||
|
alt=""
|
||||||
|
aria-hidden="true"
|
||||||
|
>
|
||||||
|
<img class="entry-folder-icon" src="/icons/iconoir/regular/folder.svg" alt="" aria-hidden="true">
|
||||||
|
<span class="entry-folder-name">{{ folder.name }}</span>
|
||||||
|
</button>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<style scoped>
|
||||||
|
/* The same row box as an entry, since folders and entries share the sidebar list and its
|
||||||
|
width rules. */
|
||||||
|
.entry-folder-row {
|
||||||
|
width: 100%; min-width: 0; box-sizing: border-box; margin: 0; padding: 8px 10px; border: 1px solid transparent;
|
||||||
|
border-radius: 8px; background: transparent; color: var(--color-text); text-align: left; display: flex;
|
||||||
|
align-items: center; gap: 6px; cursor: pointer; font: inherit;
|
||||||
|
}
|
||||||
|
.entry-folder-row:hover { background: var(--color-background-soft); }
|
||||||
|
.entry-folder-row:focus-visible { outline: 1px solid var(--color-link); }
|
||||||
|
.entry-folder-row.has-color { background: color-mix(in srgb, var(--entry-color) 32%, transparent); }
|
||||||
|
.entry-folder-row.has-color:hover { background: color-mix(in srgb, var(--entry-color) 50%, transparent); }
|
||||||
|
.entry-folder-arrow { width: 12px; height: 12px; flex: 0 0 12px; filter: invert(var(--color-icon-invert)); opacity: 0.6; }
|
||||||
|
.entry-folder-icon { width: 15px; height: 15px; flex: 0 0 15px; filter: invert(var(--color-icon-invert)); }
|
||||||
|
.entry-folder-name { min-width: 0; font-weight: bold; word-break: break-word; }
|
||||||
|
</style>
|
||||||
@@ -1,6 +1,7 @@
|
|||||||
<script setup>
|
<script setup>
|
||||||
import { ref, onBeforeUnmount, onMounted, watch } from 'vue';
|
import { ref, onBeforeUnmount, onMounted, watch } from 'vue';
|
||||||
import { emitter } from '~/services/Emitter';
|
import { emitter } from '~/services/Emitter';
|
||||||
|
import { BuildColorMenu } from '~/services/EntryColors';
|
||||||
import Server from '~/services/Server';
|
import Server from '~/services/Server';
|
||||||
import { CreateWindow } from '~/services/Windows';
|
import { CreateWindow } from '~/services/Windows';
|
||||||
import { ShowContextMenu, HideContextMenu } from '~/services/ContextMenu';
|
import { ShowContextMenu, HideContextMenu } from '~/services/ContextMenu';
|
||||||
@@ -20,18 +21,6 @@ const emit = defineEmits(['open-note', 'reload-notes']);
|
|||||||
const loadingFolders = new Set();
|
const loadingFolders = new Set();
|
||||||
const dragHoveredFolderId = ref(null);
|
const dragHoveredFolderId = ref(null);
|
||||||
|
|
||||||
// Preset colors for notes and folders (shown as swatches in the context menu)
|
|
||||||
const entryColors = [
|
|
||||||
{ name: 'Red', value: '#e74c3c' },
|
|
||||||
{ name: 'Orange', value: '#e67e22' },
|
|
||||||
{ name: 'Yellow', value: '#f1c40f' },
|
|
||||||
{ name: 'Green', value: '#2ecc71' },
|
|
||||||
{ name: 'Teal', value: '#1abc9c' },
|
|
||||||
{ name: 'Blue', value: '#3498db' },
|
|
||||||
{ name: 'Purple', value: '#9b59b6' },
|
|
||||||
{ name: 'Pink', value: '#fd79a8' }
|
|
||||||
];
|
|
||||||
|
|
||||||
// Cache of loaded folder contents — persists across reloads until cleared
|
// Cache of loaded folder contents — persists across reloads until cleared
|
||||||
// Each entry: { [folderId]: { notes: [], subfolders: [] } }
|
// Each entry: { [folderId]: { notes: [], subfolders: [] } }
|
||||||
const folderContentCache = ref({});
|
const folderContentCache = ref({});
|
||||||
@@ -216,13 +205,7 @@ function buildFolderContextMenu(folder) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function buildColorMenu(kind, item) {
|
function buildColorMenu(kind, item) {
|
||||||
const colorItems = entryColors.map((color) => ({
|
return BuildColorMenu((color) => setEntryColor(kind, item, color));
|
||||||
name: color.name, color: color.value, action: () => setEntryColor(kind, item, color.value)
|
|
||||||
}));
|
|
||||||
|
|
||||||
colorItems.push({ divider: true });
|
|
||||||
colorItems.push({ name: 'Default', icon: '/icons/iconoir/regular/xmark-circle.svg', action: () => setEntryColor(kind, item, null) });
|
|
||||||
return colorItems;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
async function setEntryColor(kind, item, color) {
|
async function setEntryColor(kind, item, color) {
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
<script setup>
|
<script setup>
|
||||||
defineProps({
|
const props = defineProps({
|
||||||
title: { type: String, default: '' },
|
title: { type: String, default: '' },
|
||||||
subtitle: { type: String, default: '' },
|
subtitle: { type: String, default: '' },
|
||||||
link: { type: String, default: '' },
|
link: { type: String, default: '' },
|
||||||
|
|||||||
@@ -1,24 +1,42 @@
|
|||||||
<script setup>
|
<script setup>
|
||||||
import { ref, onMounted, onUnmounted } from 'vue';
|
import { computed, nextTick, onMounted, onUnmounted, ref, watch } from 'vue';
|
||||||
|
import { useI18n } from 'vue-i18n';
|
||||||
import SearchIcon from 'pixelarticons/svg/search.svg'
|
import SearchIcon from 'pixelarticons/svg/search.svg'
|
||||||
import PlusIcon from 'pixelarticons/svg/plus.svg'
|
import PlusIcon from 'pixelarticons/svg/plus.svg'
|
||||||
import NoteSearchResult from './SearchResult.vue';
|
import NoteSearchResult from './SearchResult.vue';
|
||||||
import Server from '~/services/Server';
|
import Server from '~/services/Server';
|
||||||
import { emitter } from '~/services/Emitter';
|
import { emitter } from '~/services/Emitter';
|
||||||
import { CreateWindow } from '~/services/Windows';
|
import { AnchorMap } from '~/services/Content.js';
|
||||||
|
import { ClearWindow, CreateWindow, GetFirstWindowId } from '~/services/Windows';
|
||||||
import { register, search as searchActions, execute as executeAction } from '~/services/ActionRegistry';
|
import { register, search as searchActions, execute as executeAction } from '~/services/ActionRegistry';
|
||||||
import { useCampaignService } from '~/services/Campaign.js';
|
import { useCampaignService } from '~/services/Campaign.js';
|
||||||
|
|
||||||
const { Campaign } = useCampaignService();
|
const { Campaign } = useCampaignService();
|
||||||
|
const { t } = useI18n();
|
||||||
|
|
||||||
const inputText = ref('');
|
const inputText = ref('');
|
||||||
|
|
||||||
|
// Everything the palette searches: the campaign's notes, actors, items and maps.
|
||||||
const notes = ref([]);
|
const notes = ref([]);
|
||||||
|
const actors = ref([]);
|
||||||
|
const items = ref([]);
|
||||||
|
const maps = ref([]);
|
||||||
|
|
||||||
const showResults = ref(false);
|
const showResults = ref(false);
|
||||||
const selectedIndex = ref(-1);
|
const selectedIndex = ref(-1);
|
||||||
|
|
||||||
const focusInput = ref(null);
|
const focusInput = ref(null);
|
||||||
|
|
||||||
|
const campaignId = computed(() => Campaign.value?._id ?? Campaign.value?.id ?? null);
|
||||||
|
|
||||||
|
// The lists belong to one campaign; when another one opens they are dropped and refetched.
|
||||||
|
watch(campaignId, () => {
|
||||||
|
notes.value = [];
|
||||||
|
actors.value = [];
|
||||||
|
items.value = [];
|
||||||
|
maps.value = [];
|
||||||
|
});
|
||||||
|
|
||||||
// ---- Keyboard shortcut to open search ----
|
// ---- Keyboard shortcut to open search ----
|
||||||
function globalKeydown(e) {
|
function globalKeydown(e) {
|
||||||
const modKey = e.metaKey || e.ctrlKey;
|
const modKey = e.metaKey || e.ctrlKey;
|
||||||
@@ -51,100 +69,166 @@ function registerCreateNoteAction() {
|
|||||||
register(action);
|
register(action);
|
||||||
}
|
}
|
||||||
|
|
||||||
// ---- Note search ----
|
// ---- Campaign entries to search ----
|
||||||
async function fetchNotes() {
|
// The same accent- and case-insensitive normalisation the action filter uses, so a match is
|
||||||
if (!Campaign.value) return;
|
// never hidden by how the name was written.
|
||||||
|
function normalize(text) {
|
||||||
const campaignId = Campaign.value?._id ?? Campaign.value?.id;
|
return (text || '').normalize("NFD").replace(/[\u0300-\u036f]/g, "").toLowerCase().trim();
|
||||||
|
}
|
||||||
|
|
||||||
|
async function fetchList(path, key) {
|
||||||
try {
|
try {
|
||||||
const response = await Server().get('/note/list', { params: { campaign: campaignId } });
|
const response = await Server().get(path, { params: { campaign: campaignId.value } });
|
||||||
if (response.data.status !== 'ok') {
|
if (response.data.status !== 'ok') return [];
|
||||||
notes.value = [];
|
return response.data[key] ?? [];
|
||||||
return;
|
|
||||||
}
|
|
||||||
notes.value = response.data.notes.map(n => ({
|
|
||||||
key: n._id,
|
|
||||||
title: n.title || 'Untitled',
|
|
||||||
date: n.date
|
|
||||||
}));
|
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
notes.value = [];
|
return [];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function openNote(note) {
|
async function fetchSearchEntries() {
|
||||||
emitter.emit('push-note', note);
|
if (!campaignId.value) return;
|
||||||
closeResults();
|
// /note/all covers notes nested in folders too, unlike the sidebar's /note/list.
|
||||||
|
const [allNotes, fetchedActors, fetchedItems, fetchedMaps] = await Promise.all([
|
||||||
|
fetchList('/note/all', 'notes'),
|
||||||
|
fetchList('/actor/list', 'actors'),
|
||||||
|
fetchList('/item/list', 'items'),
|
||||||
|
fetchList('/map/list', 'maps')
|
||||||
|
]);
|
||||||
|
|
||||||
|
notes.value = allNotes.map(n => ({
|
||||||
|
key: n._id,
|
||||||
|
title: n.title || 'Untitled',
|
||||||
|
date: n.date
|
||||||
|
}));
|
||||||
|
actors.value = fetchedActors;
|
||||||
|
items.value = fetchedItems;
|
||||||
|
maps.value = fetchedMaps;
|
||||||
}
|
}
|
||||||
|
|
||||||
// ---- Unified results: notes + command actions ----
|
// ---- Unified results: notes, actors, items, maps + command actions ----
|
||||||
function getCombinedResults(query) {
|
function getCombinedResults(query) {
|
||||||
const combined = [];
|
const combined = [];
|
||||||
|
const q = normalize(query);
|
||||||
|
|
||||||
if (query && query.trim().length > 0) {
|
function pushMatches(list, type, getName) {
|
||||||
const q = query.normalize("NFD").replace(/[\u036f]/g, "").toLowerCase().trim();
|
for (const data of list) {
|
||||||
|
if (q && !normalize(getName(data)).includes(q)) continue;
|
||||||
|
combined.push({ type, data });
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// Filter notes that match the query text
|
pushMatches(notes.value, 'note', n => n.title);
|
||||||
const matchingNotes = notes.value.filter(note => {
|
pushMatches(actors.value, 'actor', a => a.name);
|
||||||
const title = (note.title || '').normalize("NFD").replace(/[\u036f]/g, "").toLowerCase();
|
pushMatches(items.value, 'item', i => i.name);
|
||||||
return title.includes(q);
|
pushMatches(maps.value, 'map', m => m.name);
|
||||||
});
|
|
||||||
|
|
||||||
for (const note of matchingNotes) {
|
// Command actions match on their label and description themselves.
|
||||||
combined.push({ type: 'note', data: note });
|
for (const action of searchActions(query ?? '')) {
|
||||||
}
|
combined.push({ type: 'action', data: action });
|
||||||
|
|
||||||
// Search command actions
|
|
||||||
const matchedActions = searchActions(query);
|
|
||||||
for (const action of matchedActions) {
|
|
||||||
combined.push({ type: 'action', data: action });
|
|
||||||
}
|
|
||||||
} else if (query === '' || query === null) {
|
|
||||||
// Empty query - show all notes + all actions
|
|
||||||
for (const note of notes.value) {
|
|
||||||
combined.push({ type: 'note', data: note });
|
|
||||||
}
|
|
||||||
const allActions = searchActions('');
|
|
||||||
for (const action of allActions) {
|
|
||||||
combined.push({ type: 'action', data: action });
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return combined;
|
return combined;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Each result type renders like the sidebar row of that entry: the section's icon and name.
|
||||||
|
const resultIcons = {
|
||||||
|
note: '/icons/iconoir/regular/book.svg',
|
||||||
|
actor: '/icons/iconoir/regular/user.svg',
|
||||||
|
item: '/icons/iconoir/regular/box.svg',
|
||||||
|
map: '/icons/iconoir/regular/map.svg'
|
||||||
|
};
|
||||||
|
|
||||||
|
function resultTitle(item) {
|
||||||
|
if (item.type === 'action') return item.data.label;
|
||||||
|
return item.data.title || item.data.name || 'Untitled';
|
||||||
|
}
|
||||||
|
|
||||||
|
function resultSubtitle(item) {
|
||||||
|
if (item.type === 'action') return item.data.description;
|
||||||
|
return t(`campaigns.sections.${item.type}s`);
|
||||||
|
}
|
||||||
|
|
||||||
|
function resultIcon(item) {
|
||||||
|
return item.type === 'action' ? PlusIcon : resultIcons[item.type];
|
||||||
|
}
|
||||||
|
|
||||||
|
// ---- Opening a result, the way the sidebar opens that kind of entry ----
|
||||||
|
async function openNote(note) {
|
||||||
|
closeResults();
|
||||||
|
// /note/all never carries content; retrieve the note to open it with its text.
|
||||||
|
try {
|
||||||
|
const response = await Server().get(`/note/retrieve/${note.key}`);
|
||||||
|
if (response.data.status !== 'ok' || !response.data.note) return;
|
||||||
|
const full = response.data.note;
|
||||||
|
emitter.emit('push-note', { key: full._id, title: full.title, text: full.content ?? '', date: full.date });
|
||||||
|
} catch (err) {}
|
||||||
|
}
|
||||||
|
|
||||||
|
// A character or an item replaces the sheet window that is already open.
|
||||||
|
async function openActor(actor) {
|
||||||
|
closeResults();
|
||||||
|
const existingWindowId = GetFirstWindowId('character_sheet');
|
||||||
|
if (existingWindowId !== undefined) {
|
||||||
|
ClearWindow({ id: existingWindowId });
|
||||||
|
await nextTick();
|
||||||
|
}
|
||||||
|
CreateWindow('character_sheet', { actor });
|
||||||
|
}
|
||||||
|
|
||||||
|
async function openItem(item) {
|
||||||
|
closeResults();
|
||||||
|
const existingWindowId = GetFirstWindowId('item_sheet');
|
||||||
|
if (existingWindowId !== undefined) {
|
||||||
|
ClearWindow({ id: existingWindowId });
|
||||||
|
await nextTick();
|
||||||
|
}
|
||||||
|
CreateWindow('item_sheet', { item });
|
||||||
|
}
|
||||||
|
|
||||||
|
// Maps anchor on the note container instead of opening a window, like from the sidebar.
|
||||||
|
function openMap(map) {
|
||||||
|
closeResults();
|
||||||
|
const floatingViewer = GetFirstWindowId('map_viewer');
|
||||||
|
if (floatingViewer !== undefined) ClearWindow({ id: floatingViewer });
|
||||||
|
AnchorMap(map);
|
||||||
|
}
|
||||||
|
|
||||||
|
function openResult(item) {
|
||||||
|
if (!item) return;
|
||||||
|
|
||||||
|
if (item.type === 'note') openNote(item.data);
|
||||||
|
else if (item.type === 'actor') openActor(item.data);
|
||||||
|
else if (item.type === 'item') openItem(item.data);
|
||||||
|
else if (item.type === 'map') openMap(item.data);
|
||||||
|
else {
|
||||||
|
executeAction(item.data.id);
|
||||||
|
closeResults();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// ---- Input handling ----
|
// ---- Input handling ----
|
||||||
function onInput(event) {
|
function onInput(event) {
|
||||||
const query = event.target.value;
|
inputText.value = event.target.value;
|
||||||
inputText.value = query;
|
|
||||||
selectedIndex.value = -1;
|
selectedIndex.value = -1;
|
||||||
|
|
||||||
if (!query || query.trim() === '') {
|
|
||||||
showResults.value = false;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
showResults.value = true;
|
showResults.value = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
function onFocus() {
|
function onFocus() {
|
||||||
if (notes.value.length === 0) {
|
showResults.value = true;
|
||||||
fetchNotes().then(() => {
|
// Foundry keeps syncing entries into the campaign in the background: refresh every time the
|
||||||
showResults.value = true;
|
// palette is opened so it never offers stale results.
|
||||||
});
|
if (campaignId.value) fetchSearchEntries();
|
||||||
} else {
|
|
||||||
showResults.value = true;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function onBlur(event) {
|
function onBlur() {
|
||||||
// Delay closing to allow click on results
|
// Delay closing to allow click on results
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
closeResults();
|
closeResults();
|
||||||
}, 150);
|
}, 150);
|
||||||
}
|
}
|
||||||
|
|
||||||
async function onKeydown(event) {
|
function onKeydown(event) {
|
||||||
const combined = getCombinedResults(inputText.value);
|
const combined = getCombinedResults(inputText.value);
|
||||||
|
|
||||||
if (event.key === 'ArrowDown') {
|
if (event.key === 'ArrowDown') {
|
||||||
@@ -162,16 +246,9 @@ async function onKeydown(event) {
|
|||||||
if (event.key === 'Enter') {
|
if (event.key === 'Enter') {
|
||||||
event.preventDefault();
|
event.preventDefault();
|
||||||
if (selectedIndex.value >= 0) {
|
if (selectedIndex.value >= 0) {
|
||||||
const item = combined[selectedIndex.value];
|
openResult(combined[selectedIndex.value]);
|
||||||
if (!item) return;
|
|
||||||
|
|
||||||
if (item.type === 'note') {
|
|
||||||
openNote(item.data);
|
|
||||||
} else if (item.type === 'action') {
|
|
||||||
executeAction(item.data.id);
|
|
||||||
closeResults();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (event.key === 'Escape') {
|
if (event.key === 'Escape') {
|
||||||
@@ -179,21 +256,6 @@ async function onKeydown(event) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function onSelect(result) {
|
|
||||||
if (!result) return;
|
|
||||||
|
|
||||||
if (result.link) {
|
|
||||||
const note = notes.value.find(n => n.key === result.link);
|
|
||||||
if (note) openNote(note);
|
|
||||||
}
|
|
||||||
closeResults();
|
|
||||||
}
|
|
||||||
|
|
||||||
function handleActionSelect(actionData) {
|
|
||||||
executeAction(actionData.id);
|
|
||||||
closeResults();
|
|
||||||
}
|
|
||||||
|
|
||||||
function closeResults() {
|
function closeResults() {
|
||||||
showResults.value = false;
|
showResults.value = false;
|
||||||
selectedIndex.value = -1;
|
selectedIndex.value = -1;
|
||||||
@@ -231,21 +293,19 @@ onUnmounted(() => {
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="search-container" v-if="showResults">
|
<div class="search-container" v-if="showResults">
|
||||||
<template v-if="getCombinedResults(inputText).length === 0 && inputText.trim()">
|
<template v-if="getCombinedResults(inputText).length === 0">
|
||||||
<div class="search-empty">No results found</div>
|
<div class="search-empty">No results found</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<div class="search-container-list">
|
<div class="search-container-list">
|
||||||
<NoteSearchResult
|
<NoteSearchResult
|
||||||
v-for="(item, index) in getCombinedResults(inputText)"
|
v-for="(item, index) in getCombinedResults(inputText)"
|
||||||
:key="(item.data.key || item.data.id) + '-' + index"
|
:key="item.type + '-' + (item.data.key || item.data._id || item.data.id) + '-' + index"
|
||||||
:title="item.type === 'note' ? item.data.title : item.data.label"
|
:title="resultTitle(item)"
|
||||||
:subtitle="item.type === 'action' ? item.data.description : ''"
|
:subtitle="resultSubtitle(item)"
|
||||||
:link="item.type === 'note' ? item.data.key : null"
|
:icon="resultIcon(item)"
|
||||||
:icon="item.type === 'action' ? PlusIcon : ''"
|
|
||||||
:class="{ selected: index === selectedIndex }"
|
:class="{ selected: index === selectedIndex }"
|
||||||
@select="onSelect"
|
@click.stop.prevent="openResult(item)"
|
||||||
@click.stop.prevent="() => { if (item.type === 'note') openNote(item.data); else handleActionSelect(item.data); }"
|
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -115,7 +115,7 @@ async function SignIn() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// El token passa al servei d'usuari perquè el client el reutilitzi en connectar.
|
// El token passa al servei d'usuari perquè el client el reutilitzi en connectar.
|
||||||
SetUser(response.data.token);
|
SetUser(response.data.token, true);
|
||||||
password.value = '';
|
password.value = '';
|
||||||
AskForLogin();
|
AskForLogin();
|
||||||
} catch {
|
} catch {
|
||||||
|
|||||||
289
frontend/app/components/windows/AccountManagementWindow.vue
Normal file
289
frontend/app/components/windows/AccountManagementWindow.vue
Normal file
@@ -0,0 +1,289 @@
|
|||||||
|
<script setup>
|
||||||
|
import { onMounted, ref } from 'vue';
|
||||||
|
|
||||||
|
import WindowHandle from './partials/WindowHandle.vue';
|
||||||
|
import Server from '~/services/Server';
|
||||||
|
import { DisplayToast } from '~/services/Toaster';
|
||||||
|
import { GetUser } from '@/services/User';
|
||||||
|
import { SetupHandle, SetSize, ResetPosition, Top, SetResizable, SetMinSize } from '@/services/Windows';
|
||||||
|
|
||||||
|
const handle = ref(null);
|
||||||
|
const wrapper = ref(null);
|
||||||
|
|
||||||
|
const props = defineProps(['data']);
|
||||||
|
const data = props.data;
|
||||||
|
|
||||||
|
const id = data.id;
|
||||||
|
|
||||||
|
// The admin standing in front of the window: their own row keeps the switches closed,
|
||||||
|
// the server answers the same to anybody who still tries (routes/user.js).
|
||||||
|
const currentUserId = GetUser()?._id;
|
||||||
|
|
||||||
|
const users = ref([]);
|
||||||
|
const busy = ref("");
|
||||||
|
|
||||||
|
const creating = ref(false);
|
||||||
|
const name = ref("");
|
||||||
|
const username = ref("");
|
||||||
|
const email = ref("");
|
||||||
|
const password = ref("");
|
||||||
|
|
||||||
|
onMounted(() => {
|
||||||
|
Top(wrapper);
|
||||||
|
SetupHandle(id, handle);
|
||||||
|
SetSize(id, {width: 620, height: 520});
|
||||||
|
ResetPosition(id, "center");
|
||||||
|
SetResizable(id, true);
|
||||||
|
SetMinSize(id, {width: 460, height: 360});
|
||||||
|
|
||||||
|
LoadUsers();
|
||||||
|
});
|
||||||
|
|
||||||
|
async function LoadUsers(){
|
||||||
|
try {
|
||||||
|
const response = await Server().get('/user/list');
|
||||||
|
if(response.data.status !== 'ok') return;
|
||||||
|
users.value = response.data.users || [];
|
||||||
|
} catch {
|
||||||
|
DisplayToast('red', $t('errors.internal'), 3000);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function ClearForm(){
|
||||||
|
name.value = "";
|
||||||
|
username.value = "";
|
||||||
|
email.value = "";
|
||||||
|
password.value = "";
|
||||||
|
}
|
||||||
|
|
||||||
|
async function CreateAccount(){
|
||||||
|
// The checks the register window makes before it asks the server for an account
|
||||||
|
if(username.value.length < 3){
|
||||||
|
DisplayToast('red', $t('settings.site-administration.accounts.errors.username-empty'), 3000);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if(email.value.length < 5 || !email.value.includes('@')){
|
||||||
|
DisplayToast('red', $t('settings.site-administration.accounts.errors.email-empty'), 3000);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if(name.value.length == 0){
|
||||||
|
DisplayToast('red', $t('settings.site-administration.accounts.errors.name-empty'), 3000);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if(password.value.length == 0){
|
||||||
|
DisplayToast('red', $t('settings.site-administration.accounts.errors.password-empty'), 3000);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
creating.value = true;
|
||||||
|
try {
|
||||||
|
const response = await Server().post('/user/create', {
|
||||||
|
name: name.value,
|
||||||
|
username: username.value,
|
||||||
|
email: email.value,
|
||||||
|
password: password.value
|
||||||
|
});
|
||||||
|
if(response.data.status !== 'ok'){
|
||||||
|
DisplayToast('red', $t(response.data.msg || 'errors.internal'), 3000);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
users.value.push(response.data.user);
|
||||||
|
ClearForm();
|
||||||
|
DisplayToast('green', $t('settings.site-administration.accounts.created'), 3000);
|
||||||
|
} catch {
|
||||||
|
DisplayToast('red', $t('errors.internal'), 3000);
|
||||||
|
} finally {
|
||||||
|
creating.value = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function ToggleAdmin(user){
|
||||||
|
busy.value = user._id;
|
||||||
|
try {
|
||||||
|
const response = await Server().post('/user/set-admin', { id: user._id, admin: !user.admin });
|
||||||
|
if(response.data.status !== 'ok'){
|
||||||
|
DisplayToast('red', $t(response.data.msg || 'errors.internal'), 3000);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
user.admin = response.data.user.admin;
|
||||||
|
DisplayToast('green', $t('settings.site-administration.accounts.updated'), 3000);
|
||||||
|
} catch {
|
||||||
|
DisplayToast('red', $t('errors.internal'), 3000);
|
||||||
|
} finally {
|
||||||
|
busy.value = "";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function DeleteAccount(user){
|
||||||
|
busy.value = user._id;
|
||||||
|
try {
|
||||||
|
const response = await Server().post('/user/delete', { id: user._id });
|
||||||
|
if(response.data.status !== 'ok'){
|
||||||
|
DisplayToast('red', $t(response.data.msg || 'errors.internal'), 3000);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
users.value = users.value.filter((account) => account._id !== user._id);
|
||||||
|
DisplayToast('green', $t('settings.site-administration.accounts.deleted'), 3000);
|
||||||
|
} catch {
|
||||||
|
DisplayToast('red', $t('errors.internal'), 3000);
|
||||||
|
} finally {
|
||||||
|
busy.value = "";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function IsSelf(user){
|
||||||
|
return user._id === currentUserId;
|
||||||
|
}
|
||||||
|
</script>
|
||||||
|
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<div class="window-wrapper" :id="'window-wrapper-' + id" ref="wrapper">
|
||||||
|
<WindowHandle :window="id" ref="handle"></WindowHandle>
|
||||||
|
|
||||||
|
<!-- Body -->
|
||||||
|
<div class="accounts-body">
|
||||||
|
<div class="accounts-list">
|
||||||
|
<div v-for="user in users" :key="user._id" class="account-row">
|
||||||
|
<div class="account-info">
|
||||||
|
<span class="account-name">{{ user.name }} <span v-if="IsSelf(user)" class="account-self">({{ $t('settings.site-administration.accounts.you') }})</span></span>
|
||||||
|
<span class="account-line">@{{ user.username }}</span>
|
||||||
|
<span class="account-line">{{ user.email }}</span>
|
||||||
|
<span v-if="user.admin" class="account-admin">{{ $t('settings.site-administration.accounts.admin') }}</span>
|
||||||
|
</div>
|
||||||
|
<div class="account-actions" v-if="!IsSelf(user)">
|
||||||
|
<button class="btn-primary button-small sound-click" type="button" :disabled="busy !== ''" v-on:click.prevent="ToggleAdmin(user)">
|
||||||
|
{{ user.admin ? $t('settings.site-administration.accounts.remove-admin') : $t('settings.site-administration.accounts.make-admin') }}
|
||||||
|
</button>
|
||||||
|
<button class="btn-primary button-small danger sound-click" type="button" :disabled="busy !== ''" v-on:click.prevent="DeleteAccount(user)">
|
||||||
|
{{ $t('settings.site-administration.accounts.delete') }}
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<form class="new-account" v-on:submit.prevent="CreateAccount">
|
||||||
|
<h3>{{ $t('settings.site-administration.accounts.new-account') }}</h3>
|
||||||
|
<div class="form-field">
|
||||||
|
<label for="account-name-field">{{$t('settings.site-administration.accounts.name')}}</label>
|
||||||
|
<input id="account-name-field" type="text" name="name" v-model="name" autocomplete="off">
|
||||||
|
</div>
|
||||||
|
<div class="form-field">
|
||||||
|
<label for="account-username-field">{{$t('settings.site-administration.accounts.username')}}</label>
|
||||||
|
<input id="account-username-field" type="text" name="username" v-model="username" autocomplete="off">
|
||||||
|
</div>
|
||||||
|
<div class="form-field">
|
||||||
|
<label for="account-email-field">{{$t('settings.site-administration.accounts.email')}}</label>
|
||||||
|
<input id="account-email-field" type="email" name="email" v-model="email" autocomplete="off">
|
||||||
|
</div>
|
||||||
|
<div class="form-field">
|
||||||
|
<label for="account-password-field">{{$t('settings.site-administration.accounts.password')}}</label>
|
||||||
|
<input id="account-password-field" type="password" name="password" v-model="password" autocomplete="off">
|
||||||
|
</div>
|
||||||
|
<div class="form-field">
|
||||||
|
<button class="btn-primary sound-click" type="submit" :disabled="creating">
|
||||||
|
{{ $t('settings.site-administration.accounts.create') }}
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</form>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
|
||||||
|
<style scoped>
|
||||||
|
.window-wrapper {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
align-items: center;
|
||||||
|
user-select: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.accounts-body {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
flex: 1;
|
||||||
|
width: 100%;
|
||||||
|
min-height: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.accounts-list {
|
||||||
|
flex: 1;
|
||||||
|
overflow-y: auto;
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
gap: 8px;
|
||||||
|
padding: 16px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.account-row {
|
||||||
|
display: flex;
|
||||||
|
justify-content: space-between;
|
||||||
|
align-items: center;
|
||||||
|
gap: 10px;
|
||||||
|
padding: 10px 12px;
|
||||||
|
border: 1px solid var(--color-border);
|
||||||
|
border-radius: 6px;
|
||||||
|
background-color: var(--color-background-soft);
|
||||||
|
}
|
||||||
|
|
||||||
|
.account-info {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
min-width: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.account-name {
|
||||||
|
font-weight: bold;
|
||||||
|
}
|
||||||
|
|
||||||
|
.account-line {
|
||||||
|
font-size: 13px;
|
||||||
|
opacity: 0.75;
|
||||||
|
overflow-wrap: anywhere;
|
||||||
|
}
|
||||||
|
|
||||||
|
.account-self {
|
||||||
|
font-weight: normal;
|
||||||
|
opacity: 0.75;
|
||||||
|
}
|
||||||
|
|
||||||
|
.account-admin {
|
||||||
|
color: var(--color-green);
|
||||||
|
font-size: 13px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.account-actions {
|
||||||
|
display: flex;
|
||||||
|
gap: 8px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.danger {
|
||||||
|
color: var(--color-red);
|
||||||
|
}
|
||||||
|
|
||||||
|
.new-account {
|
||||||
|
padding: 0 16px 16px 16px;
|
||||||
|
border-top: 1px solid var(--color-border);
|
||||||
|
}
|
||||||
|
|
||||||
|
.new-account h3 {
|
||||||
|
font-family: MrEavesRemake;
|
||||||
|
}
|
||||||
|
|
||||||
|
.form-field {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
gap: 4px;
|
||||||
|
margin-bottom: 10px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.form-field input {
|
||||||
|
width: 100%;
|
||||||
|
box-sizing: border-box;
|
||||||
|
}
|
||||||
|
|
||||||
|
label {
|
||||||
|
text-align: left;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
@@ -24,6 +24,16 @@ const abilityStats = [
|
|||||||
{ key: 'int', label: 'INT' }, { key: 'wis', label: 'WIS' }, { key: 'cha', label: 'CHA' }
|
{ key: 'int', label: 'INT' }, { key: 'wis', label: 'WIS' }, { key: 'cha', label: 'CHA' }
|
||||||
];
|
];
|
||||||
|
|
||||||
|
// Les pestanyes del lateral dret reparteixen la fitxa: característiques i combat,
|
||||||
|
// inventari, trets i conjurs. Són pestanyes de marcadors, no una pàgina nova.
|
||||||
|
const tabs = [
|
||||||
|
{ key: 'abilities', label: 'campaigns.character-sheet.tabs.abilities' },
|
||||||
|
{ key: 'inventory', label: 'campaigns.character-sheet.tabs.inventory' },
|
||||||
|
{ key: 'traits', label: 'campaigns.character-sheet.tabs.traits' },
|
||||||
|
{ key: 'spells', label: 'campaigns.character-sheet.tabs.spells' }
|
||||||
|
];
|
||||||
|
const activeTab = ref('abilities');
|
||||||
|
|
||||||
function normalizeActor(actor) {
|
function normalizeActor(actor) {
|
||||||
return {
|
return {
|
||||||
name: actor?.name ?? '',
|
name: actor?.name ?? '',
|
||||||
@@ -207,101 +217,124 @@ async function saveSheet() {
|
|||||||
|
|
||||||
<div v-if="error" class="sheet-error">{{ error }}</div>
|
<div v-if="error" class="sheet-error">{{ error }}</div>
|
||||||
|
|
||||||
<main class="sheet-grid">
|
<div class="sheet-layout">
|
||||||
<div v-if="form.image || editing" class="sheet-portrait" :class="{ empty: !form.image }">
|
<div class="sheet-content">
|
||||||
<img v-if="form.image" :src="imageUrl" :alt="$t('campaigns.character-sheet.photo')">
|
<main v-show="activeTab === 'abilities'" class="sheet-grid">
|
||||||
<button v-if="editing && !form.image" class="portrait-upload" type="button" :disabled="uploadingPhoto" @click="pickPhoto">
|
<div v-if="form.image || editing" class="sheet-portrait" :class="{ empty: !form.image }">
|
||||||
{{ uploadingPhoto ? $t('campaigns.character-sheet.uploading-photo') : $t('campaigns.character-sheet.upload-photo') }}
|
<img v-if="form.image" :src="imageUrl" :alt="$t('campaigns.character-sheet.photo')">
|
||||||
</button>
|
<button v-if="editing && !form.image" class="portrait-upload" type="button" :disabled="uploadingPhoto" @click="pickPhoto">
|
||||||
<div v-if="editing && form.image" class="portrait-controls">
|
{{ uploadingPhoto ? $t('campaigns.character-sheet.uploading-photo') : $t('campaigns.character-sheet.upload-photo') }}
|
||||||
<button type="button" :disabled="uploadingPhoto" @click="pickPhoto">
|
</button>
|
||||||
{{ uploadingPhoto ? $t('campaigns.character-sheet.uploading-photo') : $t('campaigns.character-sheet.change-photo') }}
|
<div v-if="editing && form.image" class="portrait-controls">
|
||||||
</button>
|
<button type="button" :disabled="uploadingPhoto" @click="pickPhoto">
|
||||||
<button type="button" :disabled="uploadingPhoto" :aria-label="$t('campaigns.character-sheet.remove-photo')" @click="removePhoto">×</button>
|
{{ uploadingPhoto ? $t('campaigns.character-sheet.uploading-photo') : $t('campaigns.character-sheet.change-photo') }}
|
||||||
</div>
|
</button>
|
||||||
<input ref="photoInput" class="photo-input" type="file" accept="image/*" @change="onPhotoSelected">
|
<button type="button" :disabled="uploadingPhoto" :aria-label="$t('campaigns.character-sheet.remove-photo')" @click="removePhoto">×</button>
|
||||||
|
</div>
|
||||||
|
<input ref="photoInput" class="photo-input" type="file" accept="image/*" @change="onPhotoSelected">
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<section class="sheet-panel abilities-panel">
|
||||||
|
<h2>{{ $t('campaigns.character-sheet.ability-scores') }}</h2>
|
||||||
|
<div class="ability-grid">
|
||||||
|
<div v-for="stat in abilityStats" :key="stat.key" class="ability-card">
|
||||||
|
<span class="ability-label">{{ stat.label }}</span>
|
||||||
|
<input v-if="editing" v-model.number="form.abilityScores[stat.key]" type="number" min="1" max="30" :aria-label="stat.label">
|
||||||
|
<strong v-else class="ability-score">{{ form.abilityScores[stat.key] }}</strong>
|
||||||
|
<span class="ability-modifier">{{ abilityModifier(form.abilityScores[stat.key]) }}</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="proficiency-badge">
|
||||||
|
<span>{{ $t('campaigns.character-sheet.proficiency-bonus') }}</span>
|
||||||
|
<strong>+{{ proficiencyBonus }}</strong>
|
||||||
|
</div>
|
||||||
|
</section>
|
||||||
|
|
||||||
|
<section class="sheet-panel combat-panel">
|
||||||
|
<h2>{{ $t('campaigns.character-sheet.combat') }}</h2>
|
||||||
|
<div class="combat-stats">
|
||||||
|
<div class="combat-stat">
|
||||||
|
<span>{{ $t('campaigns.character-sheet.armor-class') }}</span>
|
||||||
|
<input v-if="editing" v-model.number="form.armorClass" type="number" min="0">
|
||||||
|
<strong v-else>{{ form.armorClass }}</strong>
|
||||||
|
</div>
|
||||||
|
<div class="combat-stat">
|
||||||
|
<span>{{ $t('campaigns.character-sheet.speed') }}</span>
|
||||||
|
<label v-if="editing" class="number-with-unit"><input v-model.number="form.speed" type="number" min="0"><small>ft</small></label>
|
||||||
|
<strong v-else>{{ form.speed }} <small>ft</small></strong>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<h3>{{ $t('campaigns.character-sheet.proficiencies') }}</h3>
|
||||||
|
<textarea v-if="editing" v-model="form.proficiencies" rows="5" :placeholder="$t('campaigns.character-sheet.proficiencies-placeholder')" />
|
||||||
|
<p v-else class="sheet-copy">{{ form.proficiencies || $t('campaigns.character-sheet.empty-proficiencies') }}</p>
|
||||||
|
</section>
|
||||||
|
</main>
|
||||||
|
|
||||||
|
<main v-show="activeTab === 'inventory'" class="sheet-tab-body">
|
||||||
|
<section class="sheet-panel inventory-panel">
|
||||||
|
<div class="panel-title-row">
|
||||||
|
<h2>{{ $t('campaigns.character-sheet.inventory') }}</h2>
|
||||||
|
<button v-if="editing" class="sheet-button secondary compact" type="button" @click="addInventoryItem">{{ $t('campaigns.character-sheet.add-item') }}</button>
|
||||||
|
</div>
|
||||||
|
<div class="weight-summary">
|
||||||
|
<span>{{ $t('campaigns.character-sheet.carried-weight') }}</span>
|
||||||
|
<strong>{{ carriedWeight.toFixed(1) }} / {{ carryingCapacity }} lb</strong>
|
||||||
|
</div>
|
||||||
|
<div class="weight-track"><div class="weight-fill" :style="{ width: `${carryPercent}%` }" /></div>
|
||||||
|
<div class="inventory-table-wrap">
|
||||||
|
<table class="inventory-table">
|
||||||
|
<thead><tr>
|
||||||
|
<th>{{ $t('campaigns.character-sheet.item-name') }}</th>
|
||||||
|
<th>{{ $t('campaigns.character-sheet.quantity') }}</th>
|
||||||
|
<th>{{ $t('campaigns.character-sheet.weight-each') }}</th>
|
||||||
|
<th>{{ $t('campaigns.character-sheet.total-weight') }}</th>
|
||||||
|
<th v-if="editing"><span class="sr-only">{{ $t('campaigns.character-sheet.actions') }}</span></th>
|
||||||
|
</tr></thead>
|
||||||
|
<tbody>
|
||||||
|
<tr v-for="(item, index) in form.inventory" :key="index">
|
||||||
|
<td><input v-if="editing" v-model="item.name" :aria-label="$t('campaigns.character-sheet.item-name')"><span v-else>{{ item.name }}</span></td>
|
||||||
|
<td><input v-if="editing" v-model.number="item.quantity" type="number" min="1" :aria-label="$t('campaigns.character-sheet.quantity')"><span v-else>{{ item.quantity }}</span></td>
|
||||||
|
<td><input v-if="editing" v-model.number="item.weight" type="number" min="0" step="0.1" :aria-label="$t('campaigns.character-sheet.weight-each')"><span v-else>{{ Number(item.weight).toFixed(1) }} lb</span></td>
|
||||||
|
<td>{{ ((Number(item.quantity) || 0) * (Number(item.weight) || 0)).toFixed(1) }} lb</td>
|
||||||
|
<td v-if="editing"><button class="remove-item" type="button" @click="removeInventoryItem(index)">×</button></td>
|
||||||
|
</tr>
|
||||||
|
<tr v-if="form.inventory.length === 0"><td :colspan="editing ? 5 : 4" class="empty-inventory">{{ $t('campaigns.character-sheet.empty-inventory') }}</td></tr>
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
|
</section>
|
||||||
|
</main>
|
||||||
|
|
||||||
|
<main v-show="activeTab === 'traits'" class="sheet-tab-body">
|
||||||
|
<section class="sheet-panel traits-panel">
|
||||||
|
<h2>{{ $t('campaigns.character-sheet.traits') }}</h2>
|
||||||
|
<textarea v-if="editing" v-model="form.traits" rows="12" :placeholder="$t('campaigns.character-sheet.traits-placeholder')" />
|
||||||
|
<p v-else class="sheet-copy">{{ form.traits || $t('campaigns.character-sheet.empty-traits') }}</p>
|
||||||
|
</section>
|
||||||
|
</main>
|
||||||
|
|
||||||
|
<main v-show="activeTab === 'spells'" class="sheet-tab-body">
|
||||||
|
<section class="sheet-panel spells-panel">
|
||||||
|
<h2>{{ $t('campaigns.character-sheet.spells') }}</h2>
|
||||||
|
<textarea v-if="editing" v-model="form.spells" rows="12" :placeholder="$t('campaigns.character-sheet.spells-placeholder')" />
|
||||||
|
<p v-else class="sheet-copy">{{ form.spells || $t('campaigns.character-sheet.empty-spells') }}</p>
|
||||||
|
</section>
|
||||||
|
</main>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<section class="sheet-panel abilities-panel">
|
<nav class="sheet-tabs" role="tablist" aria-orientation="vertical">
|
||||||
<h2>{{ $t('campaigns.character-sheet.ability-scores') }}</h2>
|
<button
|
||||||
<div class="ability-grid">
|
v-for="tab in tabs"
|
||||||
<div v-for="stat in abilityStats" :key="stat.key" class="ability-card">
|
:key="tab.key"
|
||||||
<span class="ability-label">{{ stat.label }}</span>
|
class="sheet-tab"
|
||||||
<input v-if="editing" v-model.number="form.abilityScores[stat.key]" type="number" min="1" max="30" :aria-label="stat.label">
|
:class="{ active: activeTab === tab.key }"
|
||||||
<strong v-else class="ability-score">{{ form.abilityScores[stat.key] }}</strong>
|
type="button"
|
||||||
<span class="ability-modifier">{{ abilityModifier(form.abilityScores[stat.key]) }}</span>
|
role="tab"
|
||||||
</div>
|
:aria-selected="activeTab === tab.key"
|
||||||
</div>
|
@click="activeTab = tab.key"
|
||||||
<div class="proficiency-badge">
|
>{{ $t(tab.label) }}</button>
|
||||||
<span>{{ $t('campaigns.character-sheet.proficiency-bonus') }}</span>
|
</nav>
|
||||||
<strong>+{{ proficiencyBonus }}</strong>
|
</div>
|
||||||
</div>
|
|
||||||
</section>
|
|
||||||
|
|
||||||
<section class="sheet-panel combat-panel">
|
|
||||||
<h2>{{ $t('campaigns.character-sheet.combat') }}</h2>
|
|
||||||
<div class="combat-stats">
|
|
||||||
<div class="combat-stat">
|
|
||||||
<span>{{ $t('campaigns.character-sheet.armor-class') }}</span>
|
|
||||||
<input v-if="editing" v-model.number="form.armorClass" type="number" min="0">
|
|
||||||
<strong v-else>{{ form.armorClass }}</strong>
|
|
||||||
</div>
|
|
||||||
<div class="combat-stat">
|
|
||||||
<span>{{ $t('campaigns.character-sheet.speed') }}</span>
|
|
||||||
<label v-if="editing" class="number-with-unit"><input v-model.number="form.speed" type="number" min="0"><small>ft</small></label>
|
|
||||||
<strong v-else>{{ form.speed }} <small>ft</small></strong>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<h3>{{ $t('campaigns.character-sheet.proficiencies') }}</h3>
|
|
||||||
<textarea v-if="editing" v-model="form.proficiencies" rows="5" :placeholder="$t('campaigns.character-sheet.proficiencies-placeholder')" />
|
|
||||||
<p v-else class="sheet-copy">{{ form.proficiencies || $t('campaigns.character-sheet.empty-proficiencies') }}</p>
|
|
||||||
</section>
|
|
||||||
|
|
||||||
<section class="sheet-panel traits-panel">
|
|
||||||
<h2>{{ $t('campaigns.character-sheet.traits') }}</h2>
|
|
||||||
<textarea v-if="editing" v-model="form.traits" rows="5" :placeholder="$t('campaigns.character-sheet.traits-placeholder')" />
|
|
||||||
<p v-else class="sheet-copy">{{ form.traits || $t('campaigns.character-sheet.empty-traits') }}</p>
|
|
||||||
</section>
|
|
||||||
|
|
||||||
<section class="sheet-panel spells-panel">
|
|
||||||
<h2>{{ $t('campaigns.character-sheet.spells') }}</h2>
|
|
||||||
<textarea v-if="editing" v-model="form.spells" rows="5" :placeholder="$t('campaigns.character-sheet.spells-placeholder')" />
|
|
||||||
<p v-else class="sheet-copy">{{ form.spells || $t('campaigns.character-sheet.empty-spells') }}</p>
|
|
||||||
</section>
|
|
||||||
|
|
||||||
<section class="sheet-panel inventory-panel">
|
|
||||||
<div class="panel-title-row">
|
|
||||||
<h2>{{ $t('campaigns.character-sheet.inventory') }}</h2>
|
|
||||||
<button v-if="editing" class="sheet-button secondary compact" type="button" @click="addInventoryItem">{{ $t('campaigns.character-sheet.add-item') }}</button>
|
|
||||||
</div>
|
|
||||||
<div class="weight-summary">
|
|
||||||
<span>{{ $t('campaigns.character-sheet.carried-weight') }}</span>
|
|
||||||
<strong>{{ carriedWeight.toFixed(1) }} / {{ carryingCapacity }} lb</strong>
|
|
||||||
</div>
|
|
||||||
<div class="weight-track"><div class="weight-fill" :style="{ width: `${carryPercent}%` }" /></div>
|
|
||||||
<div class="inventory-table-wrap">
|
|
||||||
<table class="inventory-table">
|
|
||||||
<thead><tr>
|
|
||||||
<th>{{ $t('campaigns.character-sheet.item-name') }}</th>
|
|
||||||
<th>{{ $t('campaigns.character-sheet.quantity') }}</th>
|
|
||||||
<th>{{ $t('campaigns.character-sheet.weight-each') }}</th>
|
|
||||||
<th>{{ $t('campaigns.character-sheet.total-weight') }}</th>
|
|
||||||
<th v-if="editing"><span class="sr-only">{{ $t('campaigns.character-sheet.actions') }}</span></th>
|
|
||||||
</tr></thead>
|
|
||||||
<tbody>
|
|
||||||
<tr v-for="(item, index) in form.inventory" :key="index">
|
|
||||||
<td><input v-if="editing" v-model="item.name" :aria-label="$t('campaigns.character-sheet.item-name')"><span v-else>{{ item.name }}</span></td>
|
|
||||||
<td><input v-if="editing" v-model.number="item.quantity" type="number" min="1" :aria-label="$t('campaigns.character-sheet.quantity')"><span v-else>{{ item.quantity }}</span></td>
|
|
||||||
<td><input v-if="editing" v-model.number="item.weight" type="number" min="0" step="0.1" :aria-label="$t('campaigns.character-sheet.weight-each')"><span v-else>{{ Number(item.weight).toFixed(1) }} lb</span></td>
|
|
||||||
<td>{{ ((Number(item.quantity) || 0) * (Number(item.weight) || 0)).toFixed(1) }} lb</td>
|
|
||||||
<td v-if="editing"><button class="remove-item" type="button" @click="removeInventoryItem(index)">×</button></td>
|
|
||||||
</tr>
|
|
||||||
<tr v-if="form.inventory.length === 0"><td :colspan="editing ? 5 : 4" class="empty-inventory">{{ $t('campaigns.character-sheet.empty-inventory') }}</td></tr>
|
|
||||||
</tbody>
|
|
||||||
</table>
|
|
||||||
</div>
|
|
||||||
</section>
|
|
||||||
</main>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
@@ -325,7 +358,27 @@ async function saveSheet() {
|
|||||||
.sheet-button.primary { background: var(--color-link); color: var(--color-background); border-color: var(--color-link); }
|
.sheet-button.primary { background: var(--color-link); color: var(--color-background); border-color: var(--color-link); }
|
||||||
.sheet-button:disabled { opacity: .55; cursor: wait; }
|
.sheet-button:disabled { opacity: .55; cursor: wait; }
|
||||||
.sheet-button.compact { padding: 5px 9px; font-size: 12px; }
|
.sheet-button.compact { padding: 5px 9px; font-size: 12px; }
|
||||||
.sheet-grid { display: grid; grid-template-columns: minmax(200px, 34%) minmax(0, 1fr) minmax(0, 1fr); grid-template-rows: auto auto auto auto; gap: 11px; align-items: start; }
|
.sheet-grid { display: grid; grid-template-columns: minmax(200px, 34%) minmax(0, 1fr) minmax(0, 1fr); grid-template-rows: auto auto; gap: 11px; align-items: start; }
|
||||||
|
.sheet-layout { display: flex; align-items: flex-start; gap: 10px; }
|
||||||
|
.sheet-content { flex: 1 1 auto; min-width: 0; }
|
||||||
|
.sheet-tab-body { display: block; }
|
||||||
|
.sheet-tabs { flex: 0 0 auto; display: flex; flex-direction: column; gap: 6px; position: sticky; top: 0; align-self: flex-start; }
|
||||||
|
.sheet-tab {
|
||||||
|
text-align: left;
|
||||||
|
padding: 9px 14px 9px 11px;
|
||||||
|
border: 1px solid var(--color-border);
|
||||||
|
border-left-width: 3px;
|
||||||
|
border-radius: 0 9px 9px 0;
|
||||||
|
background: var(--color-background-soft);
|
||||||
|
color: var(--color-text);
|
||||||
|
font: 13px MrEavesRemake;
|
||||||
|
letter-spacing: .02em;
|
||||||
|
white-space: nowrap;
|
||||||
|
cursor: pointer;
|
||||||
|
transition: background .15s ease, border-color .15s ease, color .15s ease;
|
||||||
|
}
|
||||||
|
.sheet-tab:hover { background: var(--color-button-hover); }
|
||||||
|
.sheet-tab.active { background: var(--color-background-light); color: var(--color-link); border-left-color: var(--color-link); box-shadow: 0 3px 12px var(--color-window-shadow); }
|
||||||
.sheet-panel { min-width: 0; padding: 13px; border: 1px solid var(--color-border); border-radius: 10px; background: var(--color-background-light); box-shadow: 0 3px 12px var(--color-window-shadow); }
|
.sheet-panel { min-width: 0; padding: 13px; border: 1px solid var(--color-border); border-radius: 10px; background: var(--color-background-light); box-shadow: 0 3px 12px var(--color-window-shadow); }
|
||||||
.sheet-panel h2 { margin: 0 0 12px; padding-bottom: 7px; border-bottom: 1px solid var(--color-border); font: 17px MrEavesRemake; letter-spacing: .03em; }
|
.sheet-panel h2 { margin: 0 0 12px; padding-bottom: 7px; border-bottom: 1px solid var(--color-border); font: 17px MrEavesRemake; letter-spacing: .03em; }
|
||||||
.sheet-panel h3 { margin: 13px 0 7px; font: 14px MrEavesRemake; }
|
.sheet-panel h3 { margin: 13px 0 7px; font: 14px MrEavesRemake; }
|
||||||
@@ -340,9 +393,7 @@ async function saveSheet() {
|
|||||||
.portrait-controls button:disabled { opacity: .55; cursor: wait; }
|
.portrait-controls button:disabled { opacity: .55; cursor: wait; }
|
||||||
.photo-input { display: none; }
|
.photo-input { display: none; }
|
||||||
.abilities-panel { grid-column: 2 / -1; grid-row: 1; }
|
.abilities-panel { grid-column: 2 / -1; grid-row: 1; }
|
||||||
.combat-panel { grid-column: 2; grid-row: 2; }
|
.combat-panel { grid-column: 2 / -1; grid-row: 2; }
|
||||||
.traits-panel { grid-column: 3; grid-row: 2; }
|
|
||||||
.spells-panel { grid-column: 2 / -1; grid-row: 3; }
|
|
||||||
.ability-grid { display: grid; grid-template-columns: repeat(6, minmax(0, 1fr)); gap: 7px; }
|
.ability-grid { display: grid; grid-template-columns: repeat(6, minmax(0, 1fr)); gap: 7px; }
|
||||||
.ability-card { min-height: 83px; padding: 8px 5px; display: flex; flex-direction: column; align-items: center; justify-content: center; gap: 3px; border: 1px solid var(--color-border); border-radius: 8px; background: var(--color-background-soft); }
|
.ability-card { min-height: 83px; padding: 8px 5px; display: flex; flex-direction: column; align-items: center; justify-content: center; gap: 3px; border: 1px solid var(--color-border); border-radius: 8px; background: var(--color-background-soft); }
|
||||||
.ability-label { font-size: 11px; font-weight: 700; letter-spacing: .08em; opacity: .75; }
|
.ability-label { font-size: 11px; font-weight: 700; letter-spacing: .08em; opacity: .75; }
|
||||||
@@ -369,7 +420,6 @@ textarea { resize: vertical; width: 100%; min-height: 88px; font-size: 12px; }
|
|||||||
.weight-summary strong { white-space: nowrap; }
|
.weight-summary strong { white-space: nowrap; }
|
||||||
.weight-track { height: 5px; margin-bottom: 10px; overflow: hidden; border-radius: 999px; background: var(--color-background-soft); }
|
.weight-track { height: 5px; margin-bottom: 10px; overflow: hidden; border-radius: 999px; background: var(--color-background-soft); }
|
||||||
.weight-fill { height: 100%; border-radius: inherit; background: var(--color-link); transition: width .2s ease; }
|
.weight-fill { height: 100%; border-radius: inherit; background: var(--color-link); transition: width .2s ease; }
|
||||||
.inventory-panel { grid-column: 2 / -1; grid-row: 4; }
|
|
||||||
.inventory-table-wrap { overflow-x: auto; }
|
.inventory-table-wrap { overflow-x: auto; }
|
||||||
.inventory-table { width: 100%; border-collapse: collapse; font-size: 12px; }
|
.inventory-table { width: 100%; border-collapse: collapse; font-size: 12px; }
|
||||||
.inventory-table th { padding: 6px 7px; text-align: left; font-weight: 600; opacity: .7; }
|
.inventory-table th { padding: 6px 7px; text-align: left; font-weight: 600; opacity: .7; }
|
||||||
@@ -383,17 +433,17 @@ textarea { resize: vertical; width: 100%; min-height: 88px; font-size: 12px; }
|
|||||||
.sheet-error { padding: 7px 10px; margin-bottom: 10px; border-radius: 6px; color: var(--color-red); background: var(--color-background-soft); font-size: 12px; }
|
.sheet-error { padding: 7px 10px; margin-bottom: 10px; border-radius: 6px; color: var(--color-red); background: var(--color-background-soft); font-size: 12px; }
|
||||||
.sr-only { position: absolute; width: 1px; height: 1px; padding: 0; margin: -1px; overflow: hidden; clip: rect(0, 0, 0, 0); white-space: nowrap; border: 0; }
|
.sr-only { position: absolute; width: 1px; height: 1px; padding: 0; margin: -1px; overflow: hidden; clip: rect(0, 0, 0, 0); white-space: nowrap; border: 0; }
|
||||||
@media (max-width: 760px) {
|
@media (max-width: 760px) {
|
||||||
.sheet-grid { grid-template-columns: 1fr 1fr; grid-template-rows: none; }
|
.sheet-grid { grid-template-columns: 1fr; grid-template-rows: none; }
|
||||||
.sheet-portrait { grid-column: 1 / -1; grid-row: auto; }
|
.sheet-portrait, .abilities-panel, .combat-panel { grid-column: 1 / -1; grid-row: auto; }
|
||||||
.abilities-panel { grid-column: 1 / -1; grid-row: auto; }
|
|
||||||
.combat-panel, .traits-panel { grid-column: auto; grid-row: auto; }
|
|
||||||
.spells-panel, .inventory-panel { grid-column: 1 / -1; grid-row: auto; }
|
|
||||||
}
|
}
|
||||||
@media (max-width: 520px) {
|
@media (max-width: 520px) {
|
||||||
.sheet-body { padding: 10px; }
|
.sheet-body { padding: 10px; }
|
||||||
.sheet-hero { align-items: flex-start; flex-wrap: wrap; }
|
.sheet-hero { align-items: flex-start; flex-wrap: wrap; }
|
||||||
.sheet-actions { margin-left: auto; }
|
.sheet-actions { margin-left: auto; }
|
||||||
.sheet-grid { grid-template-columns: 1fr; }
|
|
||||||
.ability-grid { grid-template-columns: repeat(3, minmax(0, 1fr)); }
|
.ability-grid { grid-template-columns: repeat(3, minmax(0, 1fr)); }
|
||||||
|
.sheet-layout { flex-direction: column; }
|
||||||
|
.sheet-tabs { flex-direction: row; flex-wrap: wrap; order: -1; }
|
||||||
|
.sheet-tab { flex: 1 1 auto; text-align: center; border-radius: 7px; border-left-width: 1px; border-top-width: 3px; }
|
||||||
|
.sheet-tab.active { border-left-color: var(--color-border); border-top-color: var(--color-link); }
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|||||||
@@ -26,6 +26,7 @@ let id = data.id;
|
|||||||
|
|
||||||
const username = ref("");
|
const username = ref("");
|
||||||
const password = ref("");
|
const password = ref("");
|
||||||
|
const remember = ref(true);
|
||||||
|
|
||||||
const loading = ref(false);
|
const loading = ref(false);
|
||||||
|
|
||||||
@@ -44,14 +45,14 @@ function ShowMainMenu(){
|
|||||||
|
|
||||||
function login() {
|
function login() {
|
||||||
loading.value = true;
|
loading.value = true;
|
||||||
Server().post('/user/login', { usermail: username.value, password: password.value }).then((response) => {
|
Server().post('/user/login', { usermail: username.value, password: password.value, remember: remember.value }).then((response) => {
|
||||||
loading.value = false;
|
loading.value = false;
|
||||||
const data = response.data;
|
const data = response.data;
|
||||||
|
|
||||||
if(data.status == "error"){
|
if(data.status == "error"){
|
||||||
DisplayToast('red', $t(data.msg), 3000)
|
DisplayToast('red', $t(data.msg), 3000)
|
||||||
} else {
|
} else {
|
||||||
SetUser(data.token);
|
SetUser(data.token, remember.value);
|
||||||
DisplayToast('green', $t('login.success'), 3000);
|
DisplayToast('green', $t('login.success'), 3000);
|
||||||
ShowMainMenu();
|
ShowMainMenu();
|
||||||
}
|
}
|
||||||
@@ -89,6 +90,12 @@ function toRegister(){
|
|||||||
<label for="password">{{$t('login.password')}}</label>
|
<label for="password">{{$t('login.password')}}</label>
|
||||||
<input id="password-field" type="password" :placeholder="$t('login.password-placeholder')" name="password" v-model="password" autocomplete="off" >
|
<input id="password-field" type="password" :placeholder="$t('login.password-placeholder')" name="password" v-model="password" autocomplete="off" >
|
||||||
</div>
|
</div>
|
||||||
|
<div class="form-field">
|
||||||
|
<label class="remember-me-label">
|
||||||
|
<input type="checkbox" name="remember" v-model="remember">
|
||||||
|
<span>{{$t('login.remember-me')}}</span>
|
||||||
|
</label>
|
||||||
|
</div>
|
||||||
<div class="form-field">
|
<div class="form-field">
|
||||||
<button class="btn-primary sound-click">
|
<button class="btn-primary sound-click">
|
||||||
<span v-if="loading">
|
<span v-if="loading">
|
||||||
@@ -146,6 +153,14 @@ label {
|
|||||||
text-align: center;
|
text-align: center;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.remember-me-label {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: row;
|
||||||
|
align-items: center;
|
||||||
|
gap: 8px;
|
||||||
|
cursor: pointer;
|
||||||
|
}
|
||||||
|
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -40,6 +40,10 @@ function confirmSave() {
|
|||||||
const url = creating ? '/folder/rename' : '/folder/create';
|
const url = creating ? '/folder/rename' : '/folder/create';
|
||||||
if (creating) {
|
if (creating) {
|
||||||
folderData.id = data.folderId;
|
folderData.id = data.folderId;
|
||||||
|
} else {
|
||||||
|
// Which campaign list the folder belongs to: the notes when the caller says
|
||||||
|
// nothing, one of the entry lists when their sidebar button opens this window.
|
||||||
|
folderData.target = data.target ?? 'note';
|
||||||
}
|
}
|
||||||
|
|
||||||
Server().post(url, folderData).then((response) => {
|
Server().post(url, folderData).then((response) => {
|
||||||
|
|||||||
@@ -16,13 +16,6 @@ const data = props.data;
|
|||||||
|
|
||||||
const { locale } = useI18n();
|
const { locale } = useI18n();
|
||||||
|
|
||||||
|
|
||||||
const changeLocale = (lang) => {
|
|
||||||
console.log(lang);
|
|
||||||
locale.value = lang.code;
|
|
||||||
SetUserSetting('lang', lang.code);
|
|
||||||
}
|
|
||||||
|
|
||||||
const id = data.id;
|
const id = data.id;
|
||||||
|
|
||||||
const rows = ref([{id: "account-settings", value: "settings.tabs.account-settings"}]);
|
const rows = ref([{id: "account-settings", value: "settings.tabs.account-settings"}]);
|
||||||
@@ -37,13 +30,40 @@ function getLocaleFromCode(code){
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
const selectedLocale = ref("");
|
// The language to show in the dropdown: always one Dragonroll offers, because a
|
||||||
|
// user that never picked one has none stored.
|
||||||
|
function localeToShow(code){
|
||||||
|
return getLocaleFromCode(code) || locales[0];
|
||||||
|
}
|
||||||
|
|
||||||
|
// vue-i18n answers every translation with `SyntaxError: cannot support locale type`
|
||||||
|
// once it is given a locale it has no messages for, and the locale is global: putting
|
||||||
|
// a language that is not stored (the server answers `settings: undefined` for a user
|
||||||
|
// that never picked one) or one no longer offered took the settings window and the
|
||||||
|
// main menu behind it down (issue #47). Only known codes go into `locale`.
|
||||||
|
function applyLanguage(code){
|
||||||
|
const stored = getLocaleFromCode(code);
|
||||||
|
if(!stored) return false;
|
||||||
|
locale.value = stored.code;
|
||||||
|
selectedLocale.value = stored;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
const selectedLocale = ref(localeToShow(locale.value));
|
||||||
|
|
||||||
|
const changeLocale = (lang) => {
|
||||||
|
if(!applyLanguage(lang?.code)) return;
|
||||||
|
SetUserSetting('lang', lang.code);
|
||||||
|
}
|
||||||
|
|
||||||
onBeforeMount(() => {
|
onBeforeMount(() => {
|
||||||
GetUserSetting('lang').then(value => {
|
// Set selected in dropdown. Without settings to read from the server the language
|
||||||
locale.value = value;
|
// Dragonroll is already showing stays the one on screen.
|
||||||
selectedLocale.value = getLocaleFromCode(value); // Set selected in dropdown
|
GetUserSetting('lang')
|
||||||
});
|
.then((value) => applyLanguage(value))
|
||||||
if(GetUser().admin) rows.value.push({
|
.catch(() => {});
|
||||||
|
|
||||||
|
if(GetUser()?.admin) rows.value.push({
|
||||||
id: "site-administration",
|
id: "site-administration",
|
||||||
value: "settings.tabs.site-administration"
|
value: "settings.tabs.site-administration"
|
||||||
});
|
});
|
||||||
@@ -60,25 +80,19 @@ onMounted(() => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
function OpenManageAccounts(){
|
function OpenManageAccounts(){
|
||||||
ClearWindow('settings');
|
ClearWindow({ type: 'settings' });
|
||||||
CreateWindow('account_management', {
|
CreateWindow('account_management', {
|
||||||
type: 'account_management',
|
// Back returns to the settings tab this button sits on; CreateWindow leaves
|
||||||
title: 'settings.site-administration.manage-accounts.title',
|
// a window that is already open alone.
|
||||||
id: 'account-management',
|
|
||||||
back: () => {
|
back: () => {
|
||||||
ClearWindow('account-management')
|
ClearWindow({ type: 'account_management' });
|
||||||
CreateWindow('settings', {
|
CreateWindow('settings');
|
||||||
id: 'settings',
|
|
||||||
type: 'settings',
|
|
||||||
title: 'settings.title',
|
|
||||||
back: () => { ClearWindow('settings'); CreateWindow('main_menu'); }
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
})
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
const getLocaleName = (locale) => {
|
const getLocaleName = (locale) => {
|
||||||
return locale.name;
|
return locale ? locale.name : "";
|
||||||
}
|
}
|
||||||
|
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
27
frontend/app/services/EntryColors.js
Normal file
27
frontend/app/services/EntryColors.js
Normal file
@@ -0,0 +1,27 @@
|
|||||||
|
// The colours a note, a folder or an entry row can be given, and shown as swatches in the
|
||||||
|
// sidebar's colour menus. The list lives here because every campaign section colours its
|
||||||
|
// rows the same way; nothing in it talks to the API or holds state.
|
||||||
|
const ENTRY_COLORS = [
|
||||||
|
{ name: 'Red', value: '#e74c3c' },
|
||||||
|
{ name: 'Orange', value: '#e67e22' },
|
||||||
|
{ name: 'Yellow', value: '#f1c40f' },
|
||||||
|
{ name: 'Green', value: '#2ecc71' },
|
||||||
|
{ name: 'Teal', value: '#1abc9c' },
|
||||||
|
{ name: 'Blue', value: '#3498db' },
|
||||||
|
{ name: 'Purple', value: '#9b59b6' },
|
||||||
|
{ name: 'Pink', value: '#fd79a8' }
|
||||||
|
];
|
||||||
|
|
||||||
|
// The 'Color' submenu: one swatch per preset colour, and a way back to no colour at all.
|
||||||
|
// `pick` is called with the colour, or null for the default.
|
||||||
|
function BuildColorMenu(pick, { defaultLabel = 'Default' } = {}) {
|
||||||
|
const items = ENTRY_COLORS.map((color) => ({
|
||||||
|
name: color.name, color: color.value, action: () => pick(color.value)
|
||||||
|
}));
|
||||||
|
|
||||||
|
items.push({ divider: true });
|
||||||
|
items.push({ name: defaultLabel, icon: '/icons/iconoir/regular/xmark-circle.svg', action: () => pick(null) });
|
||||||
|
return items;
|
||||||
|
}
|
||||||
|
|
||||||
|
export { ENTRY_COLORS, BuildColorMenu };
|
||||||
68
frontend/app/services/ItemFolders.js
Normal file
68
frontend/app/services/ItemFolders.js
Normal file
@@ -0,0 +1,68 @@
|
|||||||
|
// The rules behind grouping the campaign's items under the folders they stand in.
|
||||||
|
// Item folders arrive from the linked Foundry world (routes/foundry-link.js mirrors
|
||||||
|
// its item directory), so the campaign only reads this tree: the helper holds no
|
||||||
|
// state, talks to no API and builds rows from what `/item/list` already returns.
|
||||||
|
|
||||||
|
function ByName(a, b) {
|
||||||
|
return String(a?.name ?? '').localeCompare(String(b?.name ?? ''));
|
||||||
|
}
|
||||||
|
|
||||||
|
// The folder a folder hangs under. A parent the campaign does not know puts it at
|
||||||
|
// the root, and so does a parent chain that leads back to the folder itself: a
|
||||||
|
// broken tree must not hide everything below it.
|
||||||
|
function ParentKey(folder, knownFolders) {
|
||||||
|
let parentKey = String(folder.parentFolder ?? '');
|
||||||
|
if (!parentKey || !knownFolders.has(parentKey)) return '';
|
||||||
|
|
||||||
|
const seen = new Set([String(folder._id)]);
|
||||||
|
while (parentKey) {
|
||||||
|
if (seen.has(parentKey)) return '';
|
||||||
|
seen.add(parentKey);
|
||||||
|
const parent = knownFolders.get(parentKey);
|
||||||
|
parentKey = knownFolders.has(String(parent?.parentFolder ?? '')) ? String(parent.parentFolder) : '';
|
||||||
|
}
|
||||||
|
return String(folder.parentFolder);
|
||||||
|
}
|
||||||
|
|
||||||
|
// The rows of the item list in the order they are shown: every folder followed by
|
||||||
|
// what stands in it, deeper and deeper, with the items standing at that level last.
|
||||||
|
// `collapsedFolderIds` hides a folder's whole subtree; folders start open so a
|
||||||
|
// synced item is never hidden behind a click. Rows are `{ kind: 'folder', key,
|
||||||
|
// depth, folder }` or `{ kind: 'item', key, depth, item }`. An item whose folder the
|
||||||
|
// campaign does not know reads as a root item instead of vanishing from the list.
|
||||||
|
function BuildItemRows(items, folders, collapsedFolderIds = []) {
|
||||||
|
const knownFolders = new Map((folders ?? []).map((folder) => [String(folder._id), folder]));
|
||||||
|
const collapsed = new Set((collapsedFolderIds ?? []).map(String));
|
||||||
|
const childFolders = new Map([['', []]]);
|
||||||
|
const itemsByFolder = new Map([['', []]]);
|
||||||
|
|
||||||
|
for (const folder of knownFolders.values()) {
|
||||||
|
const parentKey = ParentKey(folder, knownFolders);
|
||||||
|
if (!childFolders.has(parentKey)) childFolders.set(parentKey, []);
|
||||||
|
childFolders.get(parentKey).push(folder);
|
||||||
|
}
|
||||||
|
for (const item of items ?? []) {
|
||||||
|
const folderKey = item?.folder && knownFolders.has(String(item.folder)) ? String(item.folder) : '';
|
||||||
|
if (!itemsByFolder.has(folderKey)) itemsByFolder.set(folderKey, []);
|
||||||
|
itemsByFolder.get(folderKey).push(item);
|
||||||
|
}
|
||||||
|
|
||||||
|
const rows = [];
|
||||||
|
const visitedFolders = new Set();
|
||||||
|
function walk(folderKey, depth) {
|
||||||
|
for (const folder of (childFolders.get(folderKey) ?? []).slice().sort(ByName)) {
|
||||||
|
if (visitedFolders.has(String(folder._id))) continue;
|
||||||
|
visitedFolders.add(String(folder._id));
|
||||||
|
rows.push({ kind: 'folder', key: `folder-${folder._id}`, depth, folder });
|
||||||
|
if (!collapsed.has(String(folder._id))) walk(String(folder._id), depth + 1);
|
||||||
|
}
|
||||||
|
for (const item of (itemsByFolder.get(folderKey) ?? []).slice().sort(ByName)) {
|
||||||
|
rows.push({ kind: 'item', key: `item-${item._id}`, depth, item });
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
walk('', 0);
|
||||||
|
return rows;
|
||||||
|
}
|
||||||
|
|
||||||
|
export { BuildItemRows };
|
||||||
@@ -1,4 +1,5 @@
|
|||||||
import axios from 'axios';
|
import axios from 'axios';
|
||||||
|
import { GetToken } from './TokenStore';
|
||||||
|
|
||||||
const server = axios.create({
|
const server = axios.create({
|
||||||
baseURL: 'http://localhost:5000/api', // fallback only
|
baseURL: 'http://localhost:5000/api', // fallback only
|
||||||
@@ -12,7 +13,7 @@ export const initApi = (baseURL) => {
|
|||||||
};
|
};
|
||||||
|
|
||||||
server.interceptors.request.use((config) => {
|
server.interceptors.request.use((config) => {
|
||||||
const token = localStorage.getItem('token');
|
const token = GetToken();
|
||||||
if (token) {
|
if (token) {
|
||||||
config.headers.Authorization = `Bearer ${token}`;
|
config.headers.Authorization = `Bearer ${token}`;
|
||||||
}
|
}
|
||||||
|
|||||||
24
frontend/app/services/TokenStore.js
Normal file
24
frontend/app/services/TokenStore.js
Normal file
@@ -0,0 +1,24 @@
|
|||||||
|
// The login token lives in one of two browser stores: a "remember me" login keeps it in localStorage
|
||||||
|
// so the session survives on this device, a plain login keeps it in sessionStorage so it ends with the
|
||||||
|
// browser. Everything that reads the token (Server.js, User.js) goes through GetToken.
|
||||||
|
|
||||||
|
function GetToken() {
|
||||||
|
return sessionStorage.getItem('token') ?? localStorage.getItem('token');
|
||||||
|
}
|
||||||
|
|
||||||
|
function SetToken(token, remember) {
|
||||||
|
ClearToken();
|
||||||
|
if (remember) localStorage.setItem('token', token);
|
||||||
|
else sessionStorage.setItem('token', token);
|
||||||
|
}
|
||||||
|
|
||||||
|
function ClearToken() {
|
||||||
|
localStorage.removeItem('token');
|
||||||
|
sessionStorage.removeItem('token');
|
||||||
|
}
|
||||||
|
|
||||||
|
export {
|
||||||
|
GetToken,
|
||||||
|
SetToken,
|
||||||
|
ClearToken
|
||||||
|
}
|
||||||
@@ -1,5 +1,6 @@
|
|||||||
import { ref } from 'vue';
|
import { ref } from 'vue';
|
||||||
import Server from './Server';
|
import Server from './Server';
|
||||||
|
import { GetToken, SetToken, ClearToken } from './TokenStore';
|
||||||
|
|
||||||
const UserStatus = ref(0);
|
const UserStatus = ref(0);
|
||||||
|
|
||||||
@@ -7,8 +8,8 @@ function parseJwt(token) {
|
|||||||
return JSON.parse(atob(token.split('.')[1]));
|
return JSON.parse(atob(token.split('.')[1]));
|
||||||
}
|
}
|
||||||
|
|
||||||
function SetUser(token){
|
function SetUser(token, remember){
|
||||||
localStorage.setItem('token', token);
|
SetToken(token, remember);
|
||||||
UserStatus.value = 1;
|
UserStatus.value = 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -33,7 +34,7 @@ async function GetUserSetting(key){
|
|||||||
}
|
}
|
||||||
|
|
||||||
function GetUser(){
|
function GetUser(){
|
||||||
const token = localStorage.getItem('token');
|
const token = GetToken();
|
||||||
|
|
||||||
if(token){
|
if(token){
|
||||||
const data = parseJwt(token);
|
const data = parseJwt(token);
|
||||||
@@ -58,12 +59,11 @@ function IsAdmin(){
|
|||||||
}
|
}
|
||||||
|
|
||||||
function LoadUser(){
|
function LoadUser(){
|
||||||
const token = localStorage.getItem('token');
|
if(GetToken()) UserStatus.value = 1;
|
||||||
if(token) UserStatus.value = 1;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function LogoutUser(){
|
function LogoutUser(){
|
||||||
localStorage.removeItem("token");
|
ClearToken();
|
||||||
localStorage.removeItem("selectedCampaignId");
|
localStorage.removeItem("selectedCampaignId");
|
||||||
UserStatus.value = 0;
|
UserStatus.value = 0;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import { ClearWindow, GetFirstWindowId } from './Windows'
|
import { ClearWindow, CreateWindow, GetFirstWindowId } from './Windows'
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Put here all dragonroll windows
|
Put here all dragonroll windows
|
||||||
@@ -26,7 +26,18 @@ const defWindows = {
|
|||||||
settings: {
|
settings: {
|
||||||
title: "windows.settings",
|
title: "windows.settings",
|
||||||
component: () => import('~/components/windows/SettingsWindow.vue'),
|
component: () => import('~/components/windows/SettingsWindow.vue'),
|
||||||
close: () => ClearWindow({type: 'settings'}),
|
// The settings window is only opened from the main menu, so closing it goes back
|
||||||
|
// there: CreateWindow leaves a window that is already open alone.
|
||||||
|
close: () => {
|
||||||
|
ClearWindow({ type: 'settings' });
|
||||||
|
CreateWindow('main_menu');
|
||||||
|
},
|
||||||
|
movable: true
|
||||||
|
},
|
||||||
|
account_management: {
|
||||||
|
title: 'windows.account-management',
|
||||||
|
component: () => import('~/components/windows/AccountManagementWindow.vue'),
|
||||||
|
close: () => ClearWindow({type: 'account_management'}),
|
||||||
movable: true
|
movable: true
|
||||||
},
|
},
|
||||||
create_campaign: {
|
create_campaign: {
|
||||||
|
|||||||
@@ -44,6 +44,11 @@
|
|||||||
"create": "Crea {section}", "submit": "Crea", "edit": "Edita", "save": "Desa", "delete": "Suprimeix", "saving": "Desant...",
|
"create": "Crea {section}", "submit": "Crea", "edit": "Edita", "save": "Desa", "delete": "Suprimeix", "saving": "Desant...",
|
||||||
"collapse-sidebar": "Redueix la barra lateral", "expand-sidebar": "Expandeix la barra lateral"
|
"collapse-sidebar": "Redueix la barra lateral", "expand-sidebar": "Expandeix la barra lateral"
|
||||||
},
|
},
|
||||||
|
"folders": {
|
||||||
|
"toggle": "Mostra o amaga la carpeta {name}",
|
||||||
|
"rename": "Canvia el nom", "color": "Color", "default": "Per defecte", "delete": "Suprimeix la carpeta",
|
||||||
|
"move-to": "Mou a carpeta...", "root": "Arrel"
|
||||||
|
},
|
||||||
"states": {
|
"states": {
|
||||||
"loading": "Carregant...", "loading-notes": "Carregant notes...", "empty-notes": "Encara no hi ha notes en aquesta campanya.",
|
"loading": "Carregant...", "loading-notes": "Carregant notes...", "empty-notes": "Encara no hi ha notes en aquesta campanya.",
|
||||||
"empty-actors": "Encara no hi ha actors ni personatges.", "empty-items": "Encara no hi ha objectes en aquesta campanya.",
|
"empty-actors": "Encara no hi ha actors ni personatges.", "empty-items": "Encara no hi ha objectes en aquesta campanya.",
|
||||||
@@ -100,6 +105,7 @@
|
|||||||
},
|
},
|
||||||
"character-sheet": {
|
"character-sheet": {
|
||||||
"title": "Fitxa de personatge", "name": "Nom del personatge", "class": "Classe", "subclass": "Subclasse", "unset-class": "Classe sense definir",
|
"title": "Fitxa de personatge", "name": "Nom del personatge", "class": "Classe", "subclass": "Subclasse", "unset-class": "Classe sense definir",
|
||||||
|
"tabs": { "abilities": "Característiques", "inventory": "Inventari", "traits": "Trets", "spells": "Conjurs" },
|
||||||
"level": "Nivell", "species": "Espècie", "unset-species": "Espècie sense definir", "edit": "Edita la fitxa", "cancel": "Cancel·la",
|
"level": "Nivell", "species": "Espècie", "unset-species": "Espècie sense definir", "edit": "Edita la fitxa", "cancel": "Cancel·la",
|
||||||
"saving": "Desant...", "save": "Desa la fitxa", "save-error": "No s'ha pogut desar aquesta fitxa de personatge.", "photo": "Foto", "upload-photo": "Pujar foto", "change-photo": "Canviar foto", "remove-photo": "Treure foto", "uploading-photo": "Pujant...", "photo-error": "No s'ha pogut pujar aquesta foto.", "ability-scores": "Característiques", "proficiency-bonus": "Bonificador de competència",
|
"saving": "Desant...", "save": "Desa la fitxa", "save-error": "No s'ha pogut desar aquesta fitxa de personatge.", "photo": "Foto", "upload-photo": "Pujar foto", "change-photo": "Canviar foto", "remove-photo": "Treure foto", "uploading-photo": "Pujant...", "photo-error": "No s'ha pogut pujar aquesta foto.", "ability-scores": "Característiques", "proficiency-bonus": "Bonificador de competència",
|
||||||
"combat": "Combat", "armor-class": "Classe d'armadura", "speed": "Velocitat", "proficiencies": "Competències",
|
"combat": "Combat", "armor-class": "Classe d'armadura", "speed": "Velocitat", "proficiencies": "Competències",
|
||||||
|
|||||||
@@ -3,6 +3,7 @@
|
|||||||
"username-placeholder": "Introdueix el teu usuari o correu electrònic...",
|
"username-placeholder": "Introdueix el teu usuari o correu electrònic...",
|
||||||
"password": "Contrasenya",
|
"password": "Contrasenya",
|
||||||
"password-placeholder": "Introdueix la teva contrasenya...",
|
"password-placeholder": "Introdueix la teva contrasenya...",
|
||||||
|
"remember-me": "Recorda'm en aquest dispositiu",
|
||||||
"log-in": "Inicia sessió",
|
"log-in": "Inicia sessió",
|
||||||
"no-account": "No tens un compte?",
|
"no-account": "No tens un compte?",
|
||||||
"register": "Registra't",
|
"register": "Registra't",
|
||||||
|
|||||||
@@ -8,6 +8,30 @@
|
|||||||
"language": "Idioma"
|
"language": "Idioma"
|
||||||
},
|
},
|
||||||
"site-administration": {
|
"site-administration": {
|
||||||
"manage-accounts": "Gestiona els comptes"
|
"manage-accounts": "Gestiona els comptes",
|
||||||
|
"accounts": {
|
||||||
|
"you": "tu",
|
||||||
|
"admin": "Administrador",
|
||||||
|
"make-admin": "Fes-lo administrador",
|
||||||
|
"remove-admin": "Treu-li l'administrador",
|
||||||
|
"delete": "Elimina",
|
||||||
|
"new-account": "Nou compte",
|
||||||
|
"name": "Nom",
|
||||||
|
"username": "Nom d'usuari",
|
||||||
|
"email": "Correu electrònic",
|
||||||
|
"password": "Contrasenya",
|
||||||
|
"create": "Crea el compte",
|
||||||
|
"created": "Compte creat",
|
||||||
|
"updated": "Compte actualitzat",
|
||||||
|
"deleted": "Compte eliminat",
|
||||||
|
"errors": {
|
||||||
|
"name-empty": "Si us plau, introdueix un nom.",
|
||||||
|
"username-empty": "Si us plau, introdueix un nom d'usuari.",
|
||||||
|
"email-empty": "Si us plau, introdueix un correu electrònic vàlid.",
|
||||||
|
"password-empty": "Si us plau, introdueix una contrasenya.",
|
||||||
|
"self-admin": "No pots canviar els teus propis privilegis d'administrador.",
|
||||||
|
"self-delete": "No pots eliminar el teu propi compte."
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -5,6 +5,7 @@
|
|||||||
"example": "Finestra d'exemple",
|
"example": "Finestra d'exemple",
|
||||||
"edit-profile": "Editar perfil",
|
"edit-profile": "Editar perfil",
|
||||||
"settings": "Configuració",
|
"settings": "Configuració",
|
||||||
|
"account-management": "Gestió dels comptes",
|
||||||
"create-campaign": "Crear campanya",
|
"create-campaign": "Crear campanya",
|
||||||
"create-map": "Crear mapa",
|
"create-map": "Crear mapa",
|
||||||
"map-viewer": "Mapa",
|
"map-viewer": "Mapa",
|
||||||
|
|||||||
@@ -48,6 +48,11 @@
|
|||||||
"create": "Create {section}", "submit": "Create", "edit": "Edit", "save": "Save", "delete": "Delete", "saving": "Saving...",
|
"create": "Create {section}", "submit": "Create", "edit": "Edit", "save": "Save", "delete": "Delete", "saving": "Saving...",
|
||||||
"collapse-sidebar": "Collapse sidebar", "expand-sidebar": "Expand sidebar"
|
"collapse-sidebar": "Collapse sidebar", "expand-sidebar": "Expand sidebar"
|
||||||
},
|
},
|
||||||
|
"folders": {
|
||||||
|
"toggle": "Toggle the {name} folder",
|
||||||
|
"rename": "Rename", "color": "Color", "default": "Default", "delete": "Delete folder",
|
||||||
|
"move-to": "Move to folder...", "root": "Root"
|
||||||
|
},
|
||||||
"states": {
|
"states": {
|
||||||
"loading": "Loading...", "loading-notes": "Loading notes...", "empty-notes": "No notes in this campaign yet.",
|
"loading": "Loading...", "loading-notes": "Loading notes...", "empty-notes": "No notes in this campaign yet.",
|
||||||
"empty-actors": "No actors or characters yet.", "empty-items": "No items in this campaign yet.",
|
"empty-actors": "No actors or characters yet.", "empty-items": "No items in this campaign yet.",
|
||||||
@@ -104,6 +109,7 @@
|
|||||||
},
|
},
|
||||||
"character-sheet": {
|
"character-sheet": {
|
||||||
"title": "Character Sheet", "name": "Character name", "class": "Class", "subclass": "Subclass", "unset-class": "Class not set",
|
"title": "Character Sheet", "name": "Character name", "class": "Class", "subclass": "Subclass", "unset-class": "Class not set",
|
||||||
|
"tabs": { "abilities": "Ability Scores", "inventory": "Inventory", "traits": "Traits", "spells": "Spells" },
|
||||||
"level": "Level", "species": "Species", "unset-species": "Species not set", "edit": "Edit sheet", "cancel": "Cancel",
|
"level": "Level", "species": "Species", "unset-species": "Species not set", "edit": "Edit sheet", "cancel": "Cancel",
|
||||||
"saving": "Saving...", "save": "Save sheet", "save-error": "Unable to save this character sheet.",
|
"saving": "Saving...", "save": "Save sheet", "save-error": "Unable to save this character sheet.",
|
||||||
"photo": "Photo", "upload-photo": "Upload photo", "change-photo": "Change photo", "remove-photo": "Remove photo",
|
"photo": "Photo", "upload-photo": "Upload photo", "change-photo": "Change photo", "remove-photo": "Remove photo",
|
||||||
|
|||||||
@@ -4,6 +4,7 @@
|
|||||||
"username-placeholder": "Enter your username or email here...",
|
"username-placeholder": "Enter your username or email here...",
|
||||||
"password": "Password",
|
"password": "Password",
|
||||||
"password-placeholder": "Enter your password...",
|
"password-placeholder": "Enter your password...",
|
||||||
|
"remember-me": "Remember me on this device",
|
||||||
"log-in": "Log in",
|
"log-in": "Log in",
|
||||||
"no-account": "You don't have an account?",
|
"no-account": "You don't have an account?",
|
||||||
"register": "Register",
|
"register": "Register",
|
||||||
|
|||||||
@@ -8,6 +8,30 @@
|
|||||||
"language": "Language"
|
"language": "Language"
|
||||||
},
|
},
|
||||||
"site-administration": {
|
"site-administration": {
|
||||||
"manage-accounts": "Manage accounts"
|
"manage-accounts": "Manage accounts",
|
||||||
|
"accounts": {
|
||||||
|
"you": "you",
|
||||||
|
"admin": "Administrator",
|
||||||
|
"make-admin": "Make administrator",
|
||||||
|
"remove-admin": "Remove administrator",
|
||||||
|
"delete": "Delete",
|
||||||
|
"new-account": "New account",
|
||||||
|
"name": "Name",
|
||||||
|
"username": "Username",
|
||||||
|
"email": "Email",
|
||||||
|
"password": "Password",
|
||||||
|
"create": "Create account",
|
||||||
|
"created": "Account created",
|
||||||
|
"updated": "Account updated",
|
||||||
|
"deleted": "Account deleted",
|
||||||
|
"errors": {
|
||||||
|
"name-empty": "Please enter a name.",
|
||||||
|
"username-empty": "Please enter a username.",
|
||||||
|
"email-empty": "Please enter a valid email address.",
|
||||||
|
"password-empty": "Please enter a password.",
|
||||||
|
"self-admin": "You cannot change your own administrator rights.",
|
||||||
|
"self-delete": "You cannot delete your own account."
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -5,6 +5,7 @@
|
|||||||
"example": "Example Window",
|
"example": "Example Window",
|
||||||
"edit-profile": "Edit Profile",
|
"edit-profile": "Edit Profile",
|
||||||
"settings": "Settings",
|
"settings": "Settings",
|
||||||
|
"account-management": "Manage accounts",
|
||||||
"create-campaign": "Create Campaign",
|
"create-campaign": "Create Campaign",
|
||||||
"create-map": "Create Map",
|
"create-map": "Create Map",
|
||||||
"map-viewer": "Map",
|
"map-viewer": "Map",
|
||||||
|
|||||||
@@ -44,6 +44,11 @@
|
|||||||
"create": "Crear {section}", "submit": "Crear", "edit": "Editar", "save": "Guardar", "delete": "Eliminar", "saving": "Guardando...",
|
"create": "Crear {section}", "submit": "Crear", "edit": "Editar", "save": "Guardar", "delete": "Eliminar", "saving": "Guardando...",
|
||||||
"collapse-sidebar": "Contraer barra lateral", "expand-sidebar": "Expandir barra lateral"
|
"collapse-sidebar": "Contraer barra lateral", "expand-sidebar": "Expandir barra lateral"
|
||||||
},
|
},
|
||||||
|
"folders": {
|
||||||
|
"toggle": "Muestra o oculta la carpeta {name}",
|
||||||
|
"rename": "Renombrar", "color": "Color", "default": "Por defecto", "delete": "Eliminar carpeta",
|
||||||
|
"move-to": "Mover a carpeta...", "root": "Raíz"
|
||||||
|
},
|
||||||
"states": {
|
"states": {
|
||||||
"loading": "Cargando...", "loading-notes": "Cargando notas...", "empty-notes": "Aún no hay notas en esta campaña.",
|
"loading": "Cargando...", "loading-notes": "Cargando notas...", "empty-notes": "Aún no hay notas en esta campaña.",
|
||||||
"empty-actors": "Aún no hay actores ni personajes.", "empty-items": "Aún no hay objetos en esta campaña.",
|
"empty-actors": "Aún no hay actores ni personajes.", "empty-items": "Aún no hay objetos en esta campaña.",
|
||||||
@@ -100,6 +105,7 @@
|
|||||||
},
|
},
|
||||||
"character-sheet": {
|
"character-sheet": {
|
||||||
"title": "Hoja de personaje", "name": "Nombre del personaje", "class": "Clase", "subclass": "Subclase", "unset-class": "Clase sin definir",
|
"title": "Hoja de personaje", "name": "Nombre del personaje", "class": "Clase", "subclass": "Subclase", "unset-class": "Clase sin definir",
|
||||||
|
"tabs": { "abilities": "Características", "inventory": "Inventario", "traits": "Rasgos", "spells": "Conjuros" },
|
||||||
"level": "Nivel", "species": "Especie", "unset-species": "Especie sin definir", "edit": "Editar hoja", "cancel": "Cancelar",
|
"level": "Nivel", "species": "Especie", "unset-species": "Especie sin definir", "edit": "Editar hoja", "cancel": "Cancelar",
|
||||||
"saving": "Guardando...", "save": "Guardar hoja", "save-error": "No se pudo guardar esta hoja de personaje.", "photo": "Foto", "upload-photo": "Subir foto", "change-photo": "Cambiar foto", "remove-photo": "Quitar foto", "uploading-photo": "Subiendo...", "photo-error": "No se pudo subir esta foto.", "ability-scores": "Características", "proficiency-bonus": "Bonificador por competencia",
|
"saving": "Guardando...", "save": "Guardar hoja", "save-error": "No se pudo guardar esta hoja de personaje.", "photo": "Foto", "upload-photo": "Subir foto", "change-photo": "Cambiar foto", "remove-photo": "Quitar foto", "uploading-photo": "Subiendo...", "photo-error": "No se pudo subir esta foto.", "ability-scores": "Características", "proficiency-bonus": "Bonificador por competencia",
|
||||||
"combat": "Combate", "armor-class": "Clase de armadura", "speed": "Velocidad", "proficiencies": "Competencias",
|
"combat": "Combate", "armor-class": "Clase de armadura", "speed": "Velocidad", "proficiencies": "Competencias",
|
||||||
|
|||||||
@@ -3,6 +3,7 @@
|
|||||||
"username-placeholder": "Introduce tu usuario o correo electrónico...",
|
"username-placeholder": "Introduce tu usuario o correo electrónico...",
|
||||||
"password": "Contraseña",
|
"password": "Contraseña",
|
||||||
"password-placeholder": "Introduce tu contraseña...",
|
"password-placeholder": "Introduce tu contraseña...",
|
||||||
|
"remember-me": "Recordarme en este dispositivo",
|
||||||
"log-in": "Iniciar sesión",
|
"log-in": "Iniciar sesión",
|
||||||
"no-account": "¿No tienes una cuenta?",
|
"no-account": "¿No tienes una cuenta?",
|
||||||
"register": "Registrarse",
|
"register": "Registrarse",
|
||||||
|
|||||||
@@ -8,6 +8,30 @@
|
|||||||
"language": "Idioma"
|
"language": "Idioma"
|
||||||
},
|
},
|
||||||
"site-administration": {
|
"site-administration": {
|
||||||
"manage-accounts": "Gestionar cuentas"
|
"manage-accounts": "Gestionar cuentas",
|
||||||
|
"accounts": {
|
||||||
|
"you": "tú",
|
||||||
|
"admin": "Administrador",
|
||||||
|
"make-admin": "Nombrar administrador",
|
||||||
|
"remove-admin": "Quitar administrador",
|
||||||
|
"delete": "Eliminar",
|
||||||
|
"new-account": "Nueva cuenta",
|
||||||
|
"name": "Nombre",
|
||||||
|
"username": "Nombre de usuario",
|
||||||
|
"email": "Correo electrónico",
|
||||||
|
"password": "Contraseña",
|
||||||
|
"create": "Crear cuenta",
|
||||||
|
"created": "Cuenta creada",
|
||||||
|
"updated": "Cuenta actualizada",
|
||||||
|
"deleted": "Cuenta eliminada",
|
||||||
|
"errors": {
|
||||||
|
"name-empty": "Por favor, introduce un nombre.",
|
||||||
|
"username-empty": "Por favor, introduce un nombre de usuario.",
|
||||||
|
"email-empty": "Por favor, introduce un correo electrónico válido.",
|
||||||
|
"password-empty": "Por favor, introduce una contraseña.",
|
||||||
|
"self-admin": "No puedes cambiar tus propios privilegios de administrador.",
|
||||||
|
"self-delete": "No puedes eliminar tu propia cuenta."
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -5,6 +5,7 @@
|
|||||||
"example": "Ventana de ejemplo",
|
"example": "Ventana de ejemplo",
|
||||||
"edit-profile": "Editar perfil",
|
"edit-profile": "Editar perfil",
|
||||||
"settings": "Configuración",
|
"settings": "Configuración",
|
||||||
|
"account-management": "Gestionar cuentas",
|
||||||
"create-campaign": "Crear campanya",
|
"create-campaign": "Crear campanya",
|
||||||
"create-map": "Crear mapa",
|
"create-map": "Crear mapa",
|
||||||
"map-viewer": "Mapa",
|
"map-viewer": "Mapa",
|
||||||
|
|||||||
89
tests/character-sheet-tabs.test.js
Normal file
89
tests/character-sheet-tabs.test.js
Normal file
@@ -0,0 +1,89 @@
|
|||||||
|
// Tests for Syndria98/dragonroll#55: the character sheet splits its contents across bookmarks down
|
||||||
|
// the right edge (ability scores, inventory, traits, spells) instead of stacking every panel on one
|
||||||
|
// long page.
|
||||||
|
//
|
||||||
|
// The repository root installs no dependencies, so the window wiring is read from the sources the way
|
||||||
|
// tests/item-sheet-window.test.js and tests/settings-window.test.js do it.
|
||||||
|
//
|
||||||
|
// Run with `npm test` from the repository root, or `node --test tests/`.
|
||||||
|
|
||||||
|
const { test } = require("node:test");
|
||||||
|
const assert = require("node:assert/strict");
|
||||||
|
const fs = require("node:fs");
|
||||||
|
const path = require("node:path");
|
||||||
|
|
||||||
|
const read = (...parts) => fs.readFileSync(path.join(__dirname, "..", ...parts), "utf8");
|
||||||
|
|
||||||
|
const sheetSource = read("frontend", "app", "components", "windows", "CharacterSheetWindow.vue");
|
||||||
|
const script = /<script setup>([\s\S]*?)<\/script>/.exec(sheetSource)?.[1] ?? "";
|
||||||
|
const template = /<template>([\s\S]*)<\/template>/.exec(sheetSource)?.[1] ?? "";
|
||||||
|
|
||||||
|
// The four bookmarks the issue asks for, in order.
|
||||||
|
test("the sheet declares the four tabs the issue splits the contents into", () => {
|
||||||
|
const array = /const tabs = \[([\s\S]*?)\];/.exec(script)?.[1] ?? "";
|
||||||
|
const keys = [...array.matchAll(/key:\s*['"](\w+)['"]/g)].map((m) => m[1]);
|
||||||
|
assert.deepEqual(keys, ["abilities", "inventory", "traits", "spells"]);
|
||||||
|
for (const key of keys) {
|
||||||
|
assert.ok(
|
||||||
|
new RegExp(`label:\\s*['"]campaigns\\.character-sheet\\.tabs\\.${key}['"]`).test(array),
|
||||||
|
`the ${key} tab must point at its own i18n key`
|
||||||
|
);
|
||||||
|
}
|
||||||
|
assert.match(script, /const activeTab = ref\(['"]abilities['"]\)/, "the sheet opens on the ability scores tab");
|
||||||
|
});
|
||||||
|
|
||||||
|
test("the tabs sit on the right as a vertical bookmark rail", () => {
|
||||||
|
assert.match(template, /<nav class="sheet-tabs"[^>]*role="tablist"[^>]*aria-orientation="vertical"/);
|
||||||
|
assert.match(template, /v-for="tab in tabs"[\s\S]*?:aria-selected="activeTab === tab\.key"/);
|
||||||
|
const rail = /\.sheet-tabs\s*\{[^}]*\}/.exec(sheetSource)?.[0] ?? "";
|
||||||
|
assert.match(rail, /flex-direction:\s*column/, "the bookmarks stack down the right edge");
|
||||||
|
// content column and rail sit side by side, the rail hugging the right
|
||||||
|
assert.match(sheetSource, /\.sheet-layout\s*\{[^}]*display:\s*flex[^}]*\}/, "content and rail share a row");
|
||||||
|
assert.match(sheetSource, /\.sheet-content\s*\{[^}]*flex:\s*1[^}]*\}/, "the content takes the room, the rail stays slim");
|
||||||
|
});
|
||||||
|
|
||||||
|
// Each tab shows only its own panels; the rest are hidden with v-show so an in-progress edit is
|
||||||
|
// not thrown away when hopping between tabs.
|
||||||
|
function tabBody(key) {
|
||||||
|
const block = new RegExp(`<main v-show="activeTab === '${key}'"[\\s\\S]*?</main>`).exec(template)?.[0];
|
||||||
|
assert.ok(block, `expected a body for the ${key} tab`);
|
||||||
|
return block;
|
||||||
|
}
|
||||||
|
|
||||||
|
test("every tab shows only its own content and hides the others", () => {
|
||||||
|
const abilities = tabBody("abilities");
|
||||||
|
assert.match(abilities, /class="sheet-portrait"/, "the portrait stays with ability scores");
|
||||||
|
assert.match(abilities, /class="sheet-panel abilities-panel"/);
|
||||||
|
assert.match(abilities, /class="sheet-panel combat-panel"/, "combat rides with the ability scores");
|
||||||
|
for (const other of ["inventory-panel", "traits-panel", "spells-panel"]) {
|
||||||
|
assert.doesNotMatch(abilities, new RegExp(other));
|
||||||
|
}
|
||||||
|
|
||||||
|
for (const [key, panel] of [["inventory", "inventory-panel"], ["traits", "traits-panel"], ["spells", "spells-panel"]]) {
|
||||||
|
const body = tabBody(key);
|
||||||
|
assert.ok(body.includes(panel), `the ${key} tab shows the ${panel}`);
|
||||||
|
assert.doesNotMatch(body, /class="sheet-portrait"/);
|
||||||
|
}
|
||||||
|
|
||||||
|
// the panels are toggled, not unmounted, so editing on one tab and flipping away keeps the draft
|
||||||
|
assert.match(template, /v-show="activeTab === 'inventory'"/);
|
||||||
|
assert.match(template, /v-show="activeTab === 'traits'"/);
|
||||||
|
assert.match(template, /v-show="activeTab === 'spells'"/);
|
||||||
|
});
|
||||||
|
|
||||||
|
test("the tabs still edit and save through the existing sheet form", () => {
|
||||||
|
assert.match(tabBody("inventory"), /@click="addInventoryItem"/);
|
||||||
|
assert.match(tabBody("inventory"), /removeInventoryItem\(index\)/);
|
||||||
|
assert.match(tabBody("traits"), /v-model="form\.traits"/);
|
||||||
|
assert.match(tabBody("spells"), /v-model="form\.spells"/);
|
||||||
|
assert.match(tabBody("abilities"), /v-model\.number="form\.abilityScores\[stat\.key\]"/);
|
||||||
|
});
|
||||||
|
|
||||||
|
test("every locale names the four tabs", () => {
|
||||||
|
for (const locale of ["en", "es", "ca"]) {
|
||||||
|
const sheet = JSON.parse(read("frontend", "i18n", "locales", locale, "campaigns.json"))["character-sheet"];
|
||||||
|
for (const key of ["abilities", "inventory", "traits", "spells"]) {
|
||||||
|
assert.ok(sheet.tabs?.[key], `${locale} is missing campaigns.character-sheet.tabs.${key}`);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
444
tests/entry-folders.test.js
Normal file
444
tests/entry-folders.test.js
Normal file
@@ -0,0 +1,444 @@
|
|||||||
|
// Tests for the folder system shared by every campaign list (Syndria98/dragonroll#49):
|
||||||
|
// folders are created, renamed, coloured and deleted for the actors, the items and the
|
||||||
|
// maps as well as for the notes, and each list only ever shows the folders of its own.
|
||||||
|
//
|
||||||
|
// The repository root installs no dependencies, so each side is loaded the way the other
|
||||||
|
// tests do it. The routes run against a stubbed `require` (express and the models answer
|
||||||
|
// with plain objects and a small filter matcher) — except the Folder model's own logic,
|
||||||
|
// which is read out of the real model file so its target filter is the one under test. The
|
||||||
|
// frontend services are plain ES modules and are read as text, and the sidebar is read as
|
||||||
|
// text too, the way tests/sidebar-entity-entry.test.js reads it.
|
||||||
|
//
|
||||||
|
// Run with `npm test` from the repository root, or `node --test tests/`.
|
||||||
|
|
||||||
|
const { test } = require("node:test");
|
||||||
|
const assert = require("node:assert/strict");
|
||||||
|
const fs = require("node:fs");
|
||||||
|
const path = require("node:path");
|
||||||
|
const vm = require("node:vm");
|
||||||
|
|
||||||
|
const read = (...parts) => fs.readFileSync(path.join(__dirname, "..", ...parts), "utf8");
|
||||||
|
|
||||||
|
// --- Enough of the query language the folder routes use --------------------------
|
||||||
|
|
||||||
|
function matches(document, filter = {}) {
|
||||||
|
return Object.entries(filter).every(([key, expected]) => {
|
||||||
|
if (key === "$or") return expected.some((part) => matches(document, part));
|
||||||
|
const value = document?.[key];
|
||||||
|
if (expected && typeof expected === "object" && !Array.isArray(expected) && !(expected instanceof Date)) {
|
||||||
|
return Object.entries(expected).every(([operator, wanted]) => {
|
||||||
|
// A row without the field at all counts as "not one of these", which is
|
||||||
|
// how MongoDB's $nin keeps the note folders saved before `target` existed.
|
||||||
|
if (operator === "$ne") return String(value ?? "") !== String(wanted ?? "");
|
||||||
|
if (operator === "$in") return wanted.some((entry) => String(value ?? "") === String(entry ?? ""));
|
||||||
|
if (operator === "$nin") return !wanted.some((entry) => String(value ?? "") === String(entry ?? ""));
|
||||||
|
if (operator === "$exists") return (value !== undefined && value !== null) === wanted;
|
||||||
|
throw new Error(`filter operator "${key}.${operator}" is not stubbed`);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
return String(value ?? "") === String(expected ?? "");
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
function mongooseQuery(rows) {
|
||||||
|
const result = {
|
||||||
|
select: () => result,
|
||||||
|
sort: () => result,
|
||||||
|
limit: (count) => mongooseQuery(rows.slice(0, count)),
|
||||||
|
lean: () => Promise.resolve(rows),
|
||||||
|
then: (onFulfilled, onRejected) => Promise.resolve(rows).then(onFulfilled, onRejected),
|
||||||
|
};
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
function fakeCollection(name, seed = []) {
|
||||||
|
const rows = [];
|
||||||
|
let counter = 0;
|
||||||
|
|
||||||
|
function Document(data = {}) {
|
||||||
|
counter += 1;
|
||||||
|
this._id = `${name}-${counter}`;
|
||||||
|
this.isNew = true;
|
||||||
|
Object.assign(this, data);
|
||||||
|
}
|
||||||
|
Document.prototype.save = async function save() {
|
||||||
|
if (this.isNew) rows.push(this);
|
||||||
|
this.isNew = false;
|
||||||
|
return this;
|
||||||
|
};
|
||||||
|
Object.defineProperty(Document.prototype, "id", { get() { return this._id; } });
|
||||||
|
|
||||||
|
function seedRow(data) {
|
||||||
|
const row = new Document(data);
|
||||||
|
row.isNew = false;
|
||||||
|
rows.push(row);
|
||||||
|
return row;
|
||||||
|
}
|
||||||
|
for (const data of seed) seedRow(data);
|
||||||
|
|
||||||
|
const model = function Model(data) { return new Document(data); };
|
||||||
|
model.rows = rows;
|
||||||
|
model.seed = seedRow;
|
||||||
|
model.find = (filter) => mongooseQuery(rows.filter((row) => matches(row, filter)));
|
||||||
|
// A row that answers both when awaited and through `.lean()`, because the routes read
|
||||||
|
// some of their lookups one way and some the other.
|
||||||
|
const one = (row) => Object.assign(Promise.resolve(row ?? null), { lean: () => Promise.resolve(row ?? null) });
|
||||||
|
model.findOne = (filter) => one(rows.find((document) => matches(document, filter)));
|
||||||
|
model.findById = (id) => one(rows.find((document) => String(document._id) === String(id)));
|
||||||
|
model.deleteOne = async (filter) => {
|
||||||
|
const hit = rows.filter((row) => matches(row, filter));
|
||||||
|
for (const row of hit) rows.splice(rows.indexOf(row), 1);
|
||||||
|
return { deletedCount: hit.length };
|
||||||
|
};
|
||||||
|
model.updateMany = async (filter, update) => {
|
||||||
|
const hit = rows.filter((row) => matches(row, filter));
|
||||||
|
for (const row of hit) Object.assign(row, update.$set ?? {});
|
||||||
|
return { modifiedCount: hit.length };
|
||||||
|
};
|
||||||
|
return model;
|
||||||
|
}
|
||||||
|
|
||||||
|
// --- The real Folder model's own logic, over a stubbed mongoose -------------------
|
||||||
|
|
||||||
|
// The model file's statics (`filterForTarget`, `isTarget`, `belongsToSection`) and the
|
||||||
|
// `target` enum, read out of the file with a mongoose that only builds a schema. What the
|
||||||
|
// routes ask for is therefore the code under test, not a copy of it.
|
||||||
|
function realFolderModel(seed = []) {
|
||||||
|
let definition = null;
|
||||||
|
function Schema(schemaDefinition) {
|
||||||
|
definition = schemaDefinition;
|
||||||
|
this.statics = {};
|
||||||
|
}
|
||||||
|
Schema.prototype.index = function index() {};
|
||||||
|
Schema.Types = { ObjectId: "ObjectId" };
|
||||||
|
|
||||||
|
const mongoose = {
|
||||||
|
Schema,
|
||||||
|
isValidObjectId: (value) => typeof value === "string" && value.length > 0,
|
||||||
|
model: (name, schema) => Object.assign(function Model() {}, schema.statics),
|
||||||
|
};
|
||||||
|
|
||||||
|
const moduleStub = { exports: {} };
|
||||||
|
vm.compileFunction(read("backend", "src", "models", "Folder.js"), ["require", "module"])(
|
||||||
|
(id) => {
|
||||||
|
if (id === "mongoose") return mongoose;
|
||||||
|
throw new Error(`require("${id}") is not stubbed`);
|
||||||
|
},
|
||||||
|
moduleStub
|
||||||
|
);
|
||||||
|
|
||||||
|
const collection = fakeCollection("folder", seed);
|
||||||
|
const model = Object.assign(collection, moduleStub.exports);
|
||||||
|
model.definition = () => definition;
|
||||||
|
return model;
|
||||||
|
}
|
||||||
|
|
||||||
|
// --- Routes against stubbed models ----------------------------------------------
|
||||||
|
|
||||||
|
function loadRoute(file, models) {
|
||||||
|
const routes = new Map();
|
||||||
|
const router = {
|
||||||
|
get: (route, ...handlers) => routes.set(`GET ${route}`, handlers),
|
||||||
|
post: (route, ...handlers) => routes.set(`POST ${route}`, handlers),
|
||||||
|
};
|
||||||
|
|
||||||
|
const requireStub = (id) => {
|
||||||
|
if (id === "express") return { Router: () => router };
|
||||||
|
// The image upload middleware: the folder routes never see a file.
|
||||||
|
if (id === "../services/storage") return { single: () => (req, res, next) => next() };
|
||||||
|
if (models[id]) return models[id];
|
||||||
|
throw new Error(`require("${id}") is not stubbed`);
|
||||||
|
};
|
||||||
|
|
||||||
|
const moduleStub = { exports: {} };
|
||||||
|
vm.compileFunction(read("backend", "src", "routes", file), ["require", "module", "exports"])(
|
||||||
|
requireStub, moduleStub, moduleStub.exports
|
||||||
|
);
|
||||||
|
|
||||||
|
return async function call(route, { body = {}, query = {} } = {}) {
|
||||||
|
const handlers = routes.get(route);
|
||||||
|
assert.ok(handlers, `${route} is not mounted`);
|
||||||
|
const res = { payload: null, json(payload) { this.payload = payload; } };
|
||||||
|
await handlers[handlers.length - 1]({ body, query, user: { id: "user-1" } }, res);
|
||||||
|
return res.payload;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
// The routes share one set of tables, the way the API does: a folder deleted through
|
||||||
|
// `/folder/delete` has to empty the rows pointing at it in each of them.
|
||||||
|
function campaign({ folders = [], notes = [], actors = [], items = [], maps = [] } = {}) {
|
||||||
|
const campaignDoc = { _id: "campaign-1", id: "campaign-1", createdBy: "user-1" };
|
||||||
|
const collections = {
|
||||||
|
// Folders belong to the campaign the tests run their requests against unless a
|
||||||
|
// seed says otherwise.
|
||||||
|
Folder: realFolderModel(folders.map((folder) => ({ campaign: "campaign-1", ...folder }))),
|
||||||
|
Note: fakeCollection("note", notes),
|
||||||
|
Actor: fakeCollection("actor", actors),
|
||||||
|
Item: fakeCollection("item", items),
|
||||||
|
Map: fakeCollection("map", maps),
|
||||||
|
};
|
||||||
|
const models = {
|
||||||
|
// `userOwnsCampaign` reads the campaign through `findOne(...).lean()`.
|
||||||
|
"../models/Campaign": { findOne: () => ({ lean: async () => campaignDoc }) },
|
||||||
|
"../models/Folder": collections.Folder,
|
||||||
|
"../models/Note": collections.Note,
|
||||||
|
"../models/Actor": collections.Actor,
|
||||||
|
"../models/Item": collections.Item,
|
||||||
|
"../models/Map": collections.Map,
|
||||||
|
};
|
||||||
|
return { call: (file) => loadRoute(file, models), collections };
|
||||||
|
}
|
||||||
|
|
||||||
|
// --- Every list gets a folder of its own ----------------------------------------
|
||||||
|
|
||||||
|
test("a folder is made for the campaign list the sidebar names", async () => {
|
||||||
|
const { collections, call } = campaign();
|
||||||
|
const create = await call("folder.js");
|
||||||
|
|
||||||
|
for (const target of ["actor", "item", "map"]) {
|
||||||
|
const response = await create("POST /create", { body: { name: `${target} folder`, campaign: "campaign-1", target } });
|
||||||
|
assert.equal(response.status, "ok");
|
||||||
|
assert.equal(response.folder.target, target, `${target} folders are filed as such`);
|
||||||
|
}
|
||||||
|
|
||||||
|
assert.deepEqual(collections.Folder.rows.map((folder) => folder.target), ["actor", "item", "map"]);
|
||||||
|
});
|
||||||
|
|
||||||
|
test("a folder made without a target belongs to the notes, as it always did", async () => {
|
||||||
|
const { collections, call } = campaign();
|
||||||
|
|
||||||
|
const response = await call("folder.js")("POST /create", { body: { name: "Lore", campaign: "campaign-1" } });
|
||||||
|
|
||||||
|
assert.equal(response.status, "ok");
|
||||||
|
assert.equal(collections.Folder.rows[0].target, "note");
|
||||||
|
});
|
||||||
|
|
||||||
|
test("the notes keep the folders saved before the model knew about targets", async () => {
|
||||||
|
const legacy = { _id: "folder-legacy", name: "Old lore" };
|
||||||
|
const { collections, call } = campaign({
|
||||||
|
folders: [legacy, { _id: "folder-actors", name: "Adventurers", target: "actor" }],
|
||||||
|
});
|
||||||
|
|
||||||
|
const notes = await call("note.js")("GET /list", { query: { campaign: "campaign-1" } });
|
||||||
|
const listed = await call("folder.js")("GET /list", { query: { campaign: "campaign-1" } });
|
||||||
|
|
||||||
|
assert.equal(notes.status, "ok");
|
||||||
|
assert.deepEqual(notes.folders.map((folder) => folder._id), ["folder-legacy"], "the notes tree shows its own folders only");
|
||||||
|
assert.deepEqual(listed.folders.map((folder) => folder._id), ["folder-legacy"], "and a request naming no target means the notes");
|
||||||
|
assert.deepEqual(collections.Folder.rows.length, 2, "the actor folder is left alone, it is another list's");
|
||||||
|
});
|
||||||
|
|
||||||
|
test("a list answers with the folders of its own section", async () => {
|
||||||
|
const { call } = campaign({
|
||||||
|
folders: [
|
||||||
|
{ _id: "folder-note", name: "Lore", target: "note" },
|
||||||
|
{ _id: "folder-actor", name: "Adventurers", target: "actor" },
|
||||||
|
{ _id: "folder-item", name: "Gear", target: "item" },
|
||||||
|
{ _id: "folder-map", name: "Regions", target: "map" },
|
||||||
|
],
|
||||||
|
});
|
||||||
|
|
||||||
|
for (const [target, ids] of [["note", ["folder-note"]], ["actor", ["folder-actor"]], ["item", ["folder-item"]], ["map", ["folder-map"]]]) {
|
||||||
|
const response = await call("folder.js")("GET /list", { query: { campaign: "campaign-1", target } });
|
||||||
|
assert.deepEqual(response.folders.map((folder) => folder._id), ids, `${target} folders only`);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
test("a folder is not made for a list that does not exist", async () => {
|
||||||
|
const { collections, call } = campaign();
|
||||||
|
|
||||||
|
const response = await call("folder.js")("POST /create", { body: { name: "Nowhere", campaign: "campaign-1", target: "spell" } });
|
||||||
|
|
||||||
|
assert.equal(response.status, "error");
|
||||||
|
assert.equal(response.msg, "errors.missing-data");
|
||||||
|
assert.deepEqual(collections.Folder.rows, []);
|
||||||
|
});
|
||||||
|
|
||||||
|
test("the actor, item and map lists send the tree their rows stand in", async () => {
|
||||||
|
const { call } = campaign({
|
||||||
|
folders: [{ _id: "folder-actor", name: "Adventurers", target: "actor", color: "#e74c3c" }],
|
||||||
|
actors: [{ _id: "actor-1", name: "Thalia", campaign: "campaign-1" }],
|
||||||
|
items: [{ _id: "item-1", name: "Longsword", campaign: "campaign-1" }],
|
||||||
|
maps: [{ _id: "map-1", name: "Crossroads", campaign: "campaign-1" }],
|
||||||
|
});
|
||||||
|
|
||||||
|
for (const [file, key] of [["actor.js", "actors"], ["item.js", "items"], ["map.js", "maps"]]) {
|
||||||
|
const response = await call(file)("GET /list", { query: { campaign: "campaign-1" } });
|
||||||
|
assert.equal(response.status, "ok");
|
||||||
|
assert.equal(response[key].length, 1);
|
||||||
|
assert.ok(Array.isArray(response.folders), `${file} sends its folders along`);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
// --- Filing rows, and emptying a folder that goes away ---------------------------
|
||||||
|
|
||||||
|
test("an actor, an item and a map each move into a folder of their own list", async () => {
|
||||||
|
const { collections, call } = campaign({
|
||||||
|
folders: [
|
||||||
|
{ _id: "folder-actor", name: "Adventurers", target: "actor" },
|
||||||
|
{ _id: "folder-item", name: "Gear", target: "item" },
|
||||||
|
{ _id: "folder-map", name: "Regions", target: "map" },
|
||||||
|
],
|
||||||
|
actors: [{ _id: "actor-1", name: "Thalia", campaign: "campaign-1" }],
|
||||||
|
items: [{ _id: "item-1", name: "Longsword", campaign: "campaign-1" }],
|
||||||
|
maps: [{ _id: "map-1", name: "Crossroads", campaign: "campaign-1" }],
|
||||||
|
});
|
||||||
|
|
||||||
|
const actor = await call("actor.js")("POST /update", { body: { id: "actor-1", folder: "folder-actor" } });
|
||||||
|
const item = await call("item.js")("POST /update", { body: { id: "item-1", folder: "folder-item" } });
|
||||||
|
const map = await call("map.js")("POST /update", { body: { id: "map-1", folder: "folder-map" } });
|
||||||
|
|
||||||
|
assert.equal(actor.status, "ok");
|
||||||
|
assert.equal(String(actor.actor.folder), "folder-actor");
|
||||||
|
assert.equal(String(collections.Actor.rows[0].folder), "folder-actor");
|
||||||
|
assert.equal(String(item.item.folder), "folder-item");
|
||||||
|
assert.equal(String(map.map.folder), "folder-map");
|
||||||
|
});
|
||||||
|
|
||||||
|
test("a move refuses a folder of another list, or of another campaign", async () => {
|
||||||
|
const { collections, call } = campaign({
|
||||||
|
folders: [
|
||||||
|
{ _id: "folder-actor", name: "Adventurers", target: "actor" },
|
||||||
|
{ _id: "folder-item", name: "Gear", target: "item" },
|
||||||
|
{ _id: "folder-other", name: "Somebody else's", target: "actor", campaign: "campaign-2" },
|
||||||
|
],
|
||||||
|
actors: [{ _id: "actor-1", name: "Thalia", campaign: "campaign-1" }],
|
||||||
|
});
|
||||||
|
|
||||||
|
const update = await call("actor.js");
|
||||||
|
const wrongList = await update("POST /update", { body: { id: "actor-1", folder: "folder-item" } });
|
||||||
|
const wrongCampaign = await update("POST /update", { body: { id: "actor-1", folder: "folder-other" } });
|
||||||
|
|
||||||
|
assert.equal(wrongList.status, "error");
|
||||||
|
assert.equal(wrongList.msg, "errors.notfound");
|
||||||
|
assert.equal(wrongCampaign.status, "error");
|
||||||
|
assert.equal(collections.Actor.rows[0].folder, undefined, "the actor stays where it was");
|
||||||
|
|
||||||
|
const toRoot = await update("POST /update", { body: { id: "actor-1", folder: null } });
|
||||||
|
assert.equal(toRoot.status, "ok");
|
||||||
|
assert.equal(toRoot.actor.folder, null, "and the root of the list is always a valid target");
|
||||||
|
});
|
||||||
|
|
||||||
|
test("updating an entry that says nothing about folders leaves it where it stands", async () => {
|
||||||
|
const { collections, call } = campaign({
|
||||||
|
folders: [{ _id: "folder-actor", name: "Adventurers", target: "actor" }],
|
||||||
|
actors: [{ _id: "actor-1", name: "Thalia", campaign: "campaign-1", folder: "folder-actor" }],
|
||||||
|
});
|
||||||
|
|
||||||
|
const response = await call("actor.js")("POST /update", { body: { id: "actor-1", level: 3 } });
|
||||||
|
|
||||||
|
assert.equal(response.status, "ok");
|
||||||
|
assert.equal(String(collections.Actor.rows[0].folder), "folder-actor", "a sheet save does not file the actor away");
|
||||||
|
});
|
||||||
|
|
||||||
|
test("deleting a folder moves what stood in it to the root of every list", async () => {
|
||||||
|
const { collections, call } = campaign({
|
||||||
|
folders: [
|
||||||
|
{ _id: "folder-actor", name: "Adventurers", target: "actor" },
|
||||||
|
{ _id: "folder-actor-sub", name: "Family", target: "actor", parentFolder: "folder-actor" },
|
||||||
|
],
|
||||||
|
notes: [{ _id: "note-1", title: "Lore", campaign: "campaign-1", folder: "folder-actor-sub" }],
|
||||||
|
actors: [{ _id: "actor-1", name: "Thalia", campaign: "campaign-1", folder: "folder-actor" }],
|
||||||
|
items: [{ _id: "item-1", name: "Longsword", campaign: "campaign-1", folder: "folder-actor" }],
|
||||||
|
maps: [{ _id: "map-1", name: "Crossroads", campaign: "campaign-1", folder: "folder-actor-sub" }],
|
||||||
|
});
|
||||||
|
|
||||||
|
const response = await call("folder.js")("POST /delete", { body: { id: "folder-actor" } });
|
||||||
|
|
||||||
|
assert.equal(response.status, "ok");
|
||||||
|
assert.deepEqual(collections.Folder.rows, [], "the folder and the one nested in it are gone");
|
||||||
|
assert.equal(collections.Actor.rows[0].folder, null);
|
||||||
|
assert.equal(collections.Item.rows[0].folder, null);
|
||||||
|
assert.equal(collections.Map.rows[0].folder, null);
|
||||||
|
assert.equal(collections.Note.rows[0].folder, null);
|
||||||
|
});
|
||||||
|
|
||||||
|
// --- The frontend: one folder row, and a menu that works everywhere --------------
|
||||||
|
|
||||||
|
function loadEntryColorsService() {
|
||||||
|
const source = read("frontend", "app", "services", "EntryColors.js").replace(
|
||||||
|
"export { ENTRY_COLORS, BuildColorMenu };", "return { ENTRY_COLORS, BuildColorMenu };"
|
||||||
|
);
|
||||||
|
return vm.compileFunction(source)();
|
||||||
|
}
|
||||||
|
|
||||||
|
test("the colour menu offers the palette once, to every section", () => {
|
||||||
|
const { ENTRY_COLORS, BuildColorMenu } = loadEntryColorsService();
|
||||||
|
const picked = [];
|
||||||
|
const menu = BuildColorMenu((color) => picked.push(color), { defaultLabel: "No colour" });
|
||||||
|
|
||||||
|
assert.equal(menu.filter((item) => item.color).length, ENTRY_COLORS.length, "one swatch per preset colour");
|
||||||
|
assert.deepEqual(menu.at(-1).name, "No colour");
|
||||||
|
menu.at(-1).action();
|
||||||
|
assert.deepEqual(picked, [null], "and the last item takes the colour off");
|
||||||
|
|
||||||
|
menu[0].action();
|
||||||
|
assert.deepEqual(picked, [null, ENTRY_COLORS[0].value]);
|
||||||
|
|
||||||
|
// The notes' tree shares the palette instead of keeping its own copy.
|
||||||
|
const noteTree = read("frontend", "app", "components", "partials", "NestedNoteList.vue");
|
||||||
|
assert.match(noteTree, /import \{ BuildColorMenu \} from '~\/services\/EntryColors'/);
|
||||||
|
assert.doesNotMatch(noteTree, /const entryColors = /, "the note tree has no palette of its own");
|
||||||
|
});
|
||||||
|
|
||||||
|
test("every entry section files its rows under folder rows", () => {
|
||||||
|
const sidebar = read("frontend", "app", "components", "partials", "ContentSidebar.vue");
|
||||||
|
|
||||||
|
// The three entry lists are each built from their own folders and rendered with the
|
||||||
|
// folder row, which is how the item list already did it.
|
||||||
|
for (const kind of ["actor", "item", "map"]) {
|
||||||
|
assert.match(sidebar, new RegExp(`${kind}: computed\\(\\(\\) => BuildItemRows\\(${kind}s\\.value, entryFolders\\.${kind}\\.value, collapsedFolderIds\\.value\\)\\)`));
|
||||||
|
}
|
||||||
|
assert.equal(sidebar.match(/<EntryFolderRow/g)?.length, 3, "each entry section renders folder rows");
|
||||||
|
assert.match(sidebar, /entryFolders\[kind\]\.value = response\.data\.folders/, "each list reads the tree it is sent");
|
||||||
|
});
|
||||||
|
|
||||||
|
test("every entry section can create, rename, colour and delete a folder", () => {
|
||||||
|
const sidebar = read("frontend", "app", "components", "partials", "ContentSidebar.vue");
|
||||||
|
|
||||||
|
// The header's folder button names the list the folder belongs to; the notes ask for
|
||||||
|
// their own, and a click event must not slip in as the target.
|
||||||
|
assert.match(sidebar, /@click="createFolder\(\)"/);
|
||||||
|
assert.match(sidebar, /@click="createFolder\(entryEntityType\(activeSection\)\)"/);
|
||||||
|
assert.match(sidebar, /function createFolder\(target = 'note'\)/);
|
||||||
|
assert.match(sidebar, /CreateWindow\('new_folder', \{ campaign: campaignId\.value, target \}\)/);
|
||||||
|
|
||||||
|
// Rename, colour, delete: the same routes the note tree uses, so the same window and
|
||||||
|
// the same `/folder/*` calls serve every section.
|
||||||
|
assert.match(sidebar, /CreateWindow\('new_folder', \{ folderId: folder\._id, campaign: campaignId\.value, name: folder\.name \}\)/);
|
||||||
|
assert.match(sidebar, /Server\(\)\.post\('\/folder\/update', \{ id: folder\._id, color \}\)/);
|
||||||
|
assert.match(sidebar, /Server\(\)\.post\('\/folder\/delete', \{ id: folder\._id \}\)/);
|
||||||
|
|
||||||
|
// And an entry of any list can be filed into a folder, or back to the root.
|
||||||
|
assert.match(sidebar, /Server\(\)\.post\(`\/\$\{entityType\}\/update`, \{ id: entry\._id, folder: folderId \}\)/);
|
||||||
|
|
||||||
|
// The window hands the target to the API when making a folder.
|
||||||
|
const window = read("frontend", "app", "components", "windows", "NewFolderWindow.vue");
|
||||||
|
assert.match(window, /folderData\.target = data\.target \?\? 'note'/);
|
||||||
|
|
||||||
|
// A saved folder only appears in the list it belongs to.
|
||||||
|
assert.match(sidebar, /fetchCampaignEntries\(section, true\)/);
|
||||||
|
});
|
||||||
|
|
||||||
|
test("a folder row says what it is and shows the colour it was given", () => {
|
||||||
|
const row = read("frontend", "app", "components", "partials", "EntryFolderRow.vue");
|
||||||
|
|
||||||
|
assert.match(row, /:aria-expanded="\(!collapsed\)\.toString\(\)"/);
|
||||||
|
assert.match(row, /@click="emit\('toggle'\)"/);
|
||||||
|
assert.match(row, /@contextmenu\.prevent="ShowContextMenu\(menu\)"/);
|
||||||
|
assert.match(row, /folder\.color \? \{ '--entry-color': folder\.color \} : null/);
|
||||||
|
// The colour tints the row instead of replacing its text colours, the way notes and
|
||||||
|
// note folders do.
|
||||||
|
assert.match(row, /\.entry-folder-row\.has-color \{ background: color-mix\(in srgb, var\(--entry-color\)/);
|
||||||
|
});
|
||||||
|
|
||||||
|
test("every locale says what the folder menus do", () => {
|
||||||
|
const keys = ["toggle", "rename", "color", "default", "delete", "move-to", "root"];
|
||||||
|
|
||||||
|
for (const locale of ["en", "es", "ca"]) {
|
||||||
|
const campaigns = JSON.parse(read("frontend", "i18n", "locales", locale, "campaigns.json"));
|
||||||
|
for (const key of keys) {
|
||||||
|
assert.ok(campaigns.folders?.[key], `${locale} is missing campaigns.folders.${key}`);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
417
tests/foundry-actor-details.test.js
Normal file
417
tests/foundry-actor-details.test.js
Normal file
@@ -0,0 +1,417 @@
|
|||||||
|
// Tests for the D&D 5e details the system keeps as a reference to an embedded item
|
||||||
|
// (Syndria98/dragonroll#54). `system.details.background` and `system.details.race` are
|
||||||
|
// LocalDocumentFields: they hold the id of the actor's background / race item and never
|
||||||
|
// its name, and their `fallback` option hands the bare id back when that item is gone.
|
||||||
|
// Dragonroll holds names, so reading the id as a name and writing it back gave Foundry a
|
||||||
|
// background item that does not exist and a details reference resolving to nothing —
|
||||||
|
// adding a background in Foundry then failed.
|
||||||
|
//
|
||||||
|
// The backend mapper is plain CommonJS and is required directly. The Foundry module is
|
||||||
|
// loaded into a `node:vm` context holding stubbed Foundry globals with fake timers, like
|
||||||
|
// tests/foundry-sync-toggle.test.js: the characters Dragonroll answers with are applied
|
||||||
|
// to a stubbed actor, so the references it writes are observable.
|
||||||
|
//
|
||||||
|
// Run with `npm test` from the repository root, or `node --test tests/`.
|
||||||
|
|
||||||
|
const { test } = require("node:test");
|
||||||
|
const assert = require("node:assert/strict");
|
||||||
|
const fs = require("node:fs");
|
||||||
|
const path = require("node:path");
|
||||||
|
const vm = require("node:vm");
|
||||||
|
|
||||||
|
const MODULE_ID = "dragonroll-foundry";
|
||||||
|
const read = (...parts) => fs.readFileSync(path.join(__dirname, "..", ...parts), "utf8");
|
||||||
|
|
||||||
|
const { foundryActorToCharacter } = require(path.join(__dirname, "..", "backend", "src", "services", "actor-foundry.js"));
|
||||||
|
|
||||||
|
// Foundry generates document ids as sixteen characters of its alphabet, digits included.
|
||||||
|
const ID_GONE = "aB3cD9eF1gH2iJ4k";
|
||||||
|
const ID_SOLDIER = "Kx7pQ2mR9vT4wZ8n";
|
||||||
|
const ID_HUMAN = "7QcL2fYh5Bd0Mn3s";
|
||||||
|
|
||||||
|
function foundryActor(details = {}, items = []) {
|
||||||
|
return { _id: "actor-1", name: "Thalia", type: "character", system: { details }, items };
|
||||||
|
}
|
||||||
|
|
||||||
|
test("a background carried as an item arrives by its name, not its id", () => {
|
||||||
|
const character = foundryActor(
|
||||||
|
{ background: ID_SOLDIER },
|
||||||
|
[{ _id: ID_SOLDIER, name: "Soldier", type: "background" }],
|
||||||
|
);
|
||||||
|
|
||||||
|
assert.equal(foundryActorToCharacter(character).background, "Soldier");
|
||||||
|
});
|
||||||
|
|
||||||
|
test("a background reference whose item is gone does not become a background", () => {
|
||||||
|
// The item was deleted, and `fallback: true` gives the id back instead.
|
||||||
|
const character = foundryActor({ background: ID_GONE }, []);
|
||||||
|
|
||||||
|
assert.equal(foundryActorToCharacter(character).background, "");
|
||||||
|
});
|
||||||
|
|
||||||
|
test("a background item takes the place of a reference that resolves to nothing", () => {
|
||||||
|
const character = foundryActor(
|
||||||
|
{ background: ID_GONE },
|
||||||
|
[{ _id: ID_SOLDIER, name: "Soldier", type: "background" }],
|
||||||
|
);
|
||||||
|
|
||||||
|
assert.equal(foundryActorToCharacter(character).background, "Soldier");
|
||||||
|
});
|
||||||
|
|
||||||
|
test("a plain-text background from an older system release is still a name", () => {
|
||||||
|
const character = foundryActor({ background: "Sailor" }, []);
|
||||||
|
|
||||||
|
assert.equal(foundryActorToCharacter(character).background, "Sailor");
|
||||||
|
});
|
||||||
|
|
||||||
|
test("the class, subclass and species references resolve the same way", () => {
|
||||||
|
const items = [
|
||||||
|
{ _id: ID_HUMAN, name: "Human", type: "race" },
|
||||||
|
{ _id: "cls1Id00000000", name: "Fighter", type: "class" },
|
||||||
|
{ _id: "sub1Id00000000", name: "Oracle", type: "subclass" },
|
||||||
|
];
|
||||||
|
const character = foundryActor(
|
||||||
|
{ race: ID_HUMAN, class: "cls1Id00000000", subclass: "sub1Id00000000" },
|
||||||
|
items,
|
||||||
|
);
|
||||||
|
|
||||||
|
const fields = foundryActorToCharacter(character);
|
||||||
|
assert.equal(fields.species, "Human");
|
||||||
|
assert.equal(fields.className, "Fighter");
|
||||||
|
assert.equal(fields.subclass, "Oracle");
|
||||||
|
});
|
||||||
|
|
||||||
|
test("a class reference that resolves to nothing falls back to the class item", () => {
|
||||||
|
const character = foundryActor(
|
||||||
|
{ class: ID_GONE, race: ID_GONE },
|
||||||
|
[{ _id: "cls1Id00000000", name: "Fighter", type: "class" }],
|
||||||
|
);
|
||||||
|
|
||||||
|
const fields = foundryActorToCharacter(character);
|
||||||
|
assert.equal(fields.className, "Fighter", "the class the actor carries, not the id");
|
||||||
|
assert.equal(fields.species, "", "and nothing to name the species from");
|
||||||
|
});
|
||||||
|
|
||||||
|
// --- The Foundry module applies Dragonroll's character --------------------------
|
||||||
|
|
||||||
|
// A reference is either the id this sync wrote or the document the field resolves to.
|
||||||
|
function referenceId(actor, field) {
|
||||||
|
const value = actor.system.details?.[field];
|
||||||
|
return typeof value === "string" ? value : value?._id || "";
|
||||||
|
}
|
||||||
|
|
||||||
|
function makeStubItem(id, { name, type, system = {}, flags = {} }) {
|
||||||
|
return {
|
||||||
|
_id: id,
|
||||||
|
id,
|
||||||
|
name,
|
||||||
|
type,
|
||||||
|
system,
|
||||||
|
flags,
|
||||||
|
parent: { documentName: "Actor" },
|
||||||
|
getFlag(module, key) { return this.flags?.[module]?.[key]; },
|
||||||
|
toObject() {
|
||||||
|
return { _id: this.id, name: this.name, type: this.type, system: this.system, flags: this.flags };
|
||||||
|
},
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
function writeDotted(target, data) {
|
||||||
|
for (const [key, value] of Object.entries(data)) {
|
||||||
|
const parts = key.split(".");
|
||||||
|
const last = parts.pop();
|
||||||
|
let node = target;
|
||||||
|
for (const part of parts) node = node[part] ??= {};
|
||||||
|
node[last] = value;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
let stubCounter = 0;
|
||||||
|
|
||||||
|
function makeStubActor(name, { type = "character", system = {}, flags = {}, items = [] } = {}) {
|
||||||
|
stubCounter += 1;
|
||||||
|
const id = `actor-${stubCounter}`;
|
||||||
|
const contents = items.map((item, index) => makeStubItem(item._id || `embedded-${stubCounter}-${index}`, item));
|
||||||
|
const actor = {
|
||||||
|
id,
|
||||||
|
name,
|
||||||
|
type,
|
||||||
|
documentName: "Actor",
|
||||||
|
img: "icons/svg/mystery-man.svg",
|
||||||
|
system,
|
||||||
|
flags,
|
||||||
|
items: { contents },
|
||||||
|
getFlag(module, key) { return this.flags?.[module]?.[key]; },
|
||||||
|
async update(data) {
|
||||||
|
writeDotted(this, data);
|
||||||
|
return this;
|
||||||
|
},
|
||||||
|
async updateEmbeddedDocuments(documentName, updates) {
|
||||||
|
for (const update of updates) {
|
||||||
|
const item = contents.find((candidate) => candidate.id === update._id);
|
||||||
|
if (item) writeDotted(item, update);
|
||||||
|
}
|
||||||
|
return updates.map((update) => contents.find((candidate) => candidate.id === update._id));
|
||||||
|
},
|
||||||
|
async createEmbeddedDocuments(documentName, datas) {
|
||||||
|
const created = datas.map((data) => {
|
||||||
|
const item = makeStubItem(`embedded-${stubCounter}-${contents.length}`, data);
|
||||||
|
item.name = data.name;
|
||||||
|
item.type = data.type;
|
||||||
|
contents.push(item);
|
||||||
|
return item;
|
||||||
|
});
|
||||||
|
return created;
|
||||||
|
},
|
||||||
|
async deleteEmbeddedDocuments(documentName, ids) {
|
||||||
|
for (const id of ids) {
|
||||||
|
const index = contents.findIndex((item) => item.id === id);
|
||||||
|
if (index >= 0) contents.splice(index, 1);
|
||||||
|
}
|
||||||
|
return ids;
|
||||||
|
},
|
||||||
|
toObject() {
|
||||||
|
return {
|
||||||
|
_id: this.id,
|
||||||
|
name: this.name,
|
||||||
|
type: this.type,
|
||||||
|
img: this.img,
|
||||||
|
flags: this.flags,
|
||||||
|
system: this.system,
|
||||||
|
};
|
||||||
|
},
|
||||||
|
};
|
||||||
|
return actor;
|
||||||
|
}
|
||||||
|
|
||||||
|
// A linked world with the actors it holds, answering `foundry/sync/characters` with the
|
||||||
|
// campaign's characters. Each one is applied to its Foundry actor on the next reconcile.
|
||||||
|
function makeWorld({ actors = [], remoteActors = [] } = {}) {
|
||||||
|
const state = {
|
||||||
|
hooks: new Map(),
|
||||||
|
registered: new Map(),
|
||||||
|
requests: [],
|
||||||
|
timers: new Map(),
|
||||||
|
nextTimerId: 1,
|
||||||
|
logs: [],
|
||||||
|
};
|
||||||
|
|
||||||
|
const settingsStore = { autoSync: true, syncToken: "sync-token-1", dragonrollApiUrl: "http://backend.test:5000" };
|
||||||
|
const sandbox = {
|
||||||
|
console: {
|
||||||
|
log() {},
|
||||||
|
info() {},
|
||||||
|
warn: (...args) => state.logs.push(args.map(String).join(" ")),
|
||||||
|
error: (...args) => state.logs.push(args.map(String).join(" ")),
|
||||||
|
},
|
||||||
|
URL,
|
||||||
|
CONFIG: {},
|
||||||
|
window: { location: { origin: "http://vtt.test" } },
|
||||||
|
ui: { notifications: { info() {}, warn() {}, error() {} } },
|
||||||
|
Hooks: {
|
||||||
|
once(name, fn) { state.hooks.set(name, [fn]); },
|
||||||
|
on(name, fn) { state.hooks.set(name, [...(state.hooks.get(name) || []), fn]); },
|
||||||
|
},
|
||||||
|
setTimeout: (fn, delay = 0) => {
|
||||||
|
const timerId = state.nextTimerId++;
|
||||||
|
state.timers.set(timerId, { fn, delay });
|
||||||
|
return timerId;
|
||||||
|
},
|
||||||
|
clearTimeout: (timerId) => state.timers.delete(timerId),
|
||||||
|
setInterval: () => 0,
|
||||||
|
clearInterval: () => {},
|
||||||
|
fetch: async (url, options = {}) => {
|
||||||
|
const href = String(url);
|
||||||
|
state.requests.push({ href, method: options.method, body: options.body ? JSON.parse(options.body) : null });
|
||||||
|
if (href.includes("foundry/sync/characters")) return { ok: true, status: 200, json: async () => ({ status: "ok", actors: remoteActors }) };
|
||||||
|
if (href.includes("foundry/sync/items")) return { ok: true, status: 200, json: async () => ({ status: "ok", items: [] }) };
|
||||||
|
return { ok: true, status: 200, json: async () => ({ status: "ok", actors: [], items: [] }) };
|
||||||
|
},
|
||||||
|
Item: { async create() { return null; } },
|
||||||
|
Actor: {
|
||||||
|
async create(data) {
|
||||||
|
const actor = makeStubActor(data.name, {
|
||||||
|
type: data.type,
|
||||||
|
system: structuredClone(data.system || {}),
|
||||||
|
flags: structuredClone(data.flags || {}),
|
||||||
|
items: (data.items || []).map((item) => ({ name: item.name, type: item.type, system: item.system })),
|
||||||
|
});
|
||||||
|
actors.push(actor);
|
||||||
|
return actor;
|
||||||
|
},
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
sandbox.game = {
|
||||||
|
user: { isGM: true },
|
||||||
|
world: { id: "world-1", title: "Test World" },
|
||||||
|
system: { id: "dnd5e" },
|
||||||
|
modules: { get: () => ({}) },
|
||||||
|
actors: { contents: actors, get: (actorId) => actors.find((actor) => actor.id === actorId) },
|
||||||
|
items: { contents: [], get: () => null },
|
||||||
|
folders: { contents: [], get: () => null },
|
||||||
|
settings: {
|
||||||
|
register(module, key, definition) {
|
||||||
|
state.registered.set(key, definition);
|
||||||
|
if (!(key in settingsStore)) settingsStore[key] = definition.default;
|
||||||
|
},
|
||||||
|
get(module, key) { return settingsStore[key]; },
|
||||||
|
async set(module, key, value) {
|
||||||
|
settingsStore[key] = value;
|
||||||
|
await state.registered.get(key)?.onChange?.(value);
|
||||||
|
},
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
vm.createContext(sandbox);
|
||||||
|
vm.runInContext(read("dragonroll-foundry", "scripts", "api.js"), sandbox);
|
||||||
|
|
||||||
|
state.game = sandbox.game;
|
||||||
|
state.actor = (actorId) => actors.find((actor) => actor.id === actorId);
|
||||||
|
const drain = async () => { await new Promise((resolve) => setImmediate(resolve)); };
|
||||||
|
|
||||||
|
// World start: the actors are pushed, then the campaign's characters are applied.
|
||||||
|
state.start = async () => {
|
||||||
|
await state.fire("init");
|
||||||
|
await state.fire("ready");
|
||||||
|
await state.runTimers();
|
||||||
|
return state;
|
||||||
|
};
|
||||||
|
|
||||||
|
state.fire = async (name, ...args) => {
|
||||||
|
for (const handler of state.hooks.get(name) || []) await handler(...args);
|
||||||
|
await drain();
|
||||||
|
};
|
||||||
|
state.runTimers = async () => {
|
||||||
|
for (let round = 0; round < 6; round += 1) {
|
||||||
|
if (!state.timers.size && round > 2) break;
|
||||||
|
const due = [...state.timers.values()];
|
||||||
|
state.timers.clear();
|
||||||
|
for (const timer of due) await timer.fn();
|
||||||
|
await drain();
|
||||||
|
}
|
||||||
|
};
|
||||||
|
state.itemNames = (actor) => actor.items.contents.map((item) => [item.type, item.name]);
|
||||||
|
|
||||||
|
return state;
|
||||||
|
}
|
||||||
|
|
||||||
|
// The campaign's character for `actor`, holding what Dragonroll keeps for it.
|
||||||
|
function campaignCharacter(actor, over = {}) {
|
||||||
|
return {
|
||||||
|
_id: "dr-actor-1",
|
||||||
|
name: "Thalia",
|
||||||
|
type: "character",
|
||||||
|
species: "",
|
||||||
|
className: "",
|
||||||
|
subclass: "",
|
||||||
|
level: 1,
|
||||||
|
background: "",
|
||||||
|
challengeRating: "",
|
||||||
|
description: "",
|
||||||
|
image: "",
|
||||||
|
abilityScores: {},
|
||||||
|
armorClass: 10,
|
||||||
|
speed: 30,
|
||||||
|
traits: "",
|
||||||
|
proficiencies: "",
|
||||||
|
spells: "",
|
||||||
|
inventory: [],
|
||||||
|
foundryActorId: actor?.id ?? null,
|
||||||
|
...over,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
test("Dragonroll's background becomes the actor's background item, referenced by id", async () => {
|
||||||
|
const actor = makeStubActor("Thalia", {
|
||||||
|
system: { details: { background: "" } },
|
||||||
|
flags: { [MODULE_ID]: { actorId: "dr-actor-1" } },
|
||||||
|
});
|
||||||
|
const world = await makeWorld({
|
||||||
|
actors: [actor],
|
||||||
|
remoteActors: [campaignCharacter(actor, { background: "Soldier" })],
|
||||||
|
}).start();
|
||||||
|
|
||||||
|
const background = actor.items.contents.find((item) => item.type === "background");
|
||||||
|
assert.ok(background, "the character's background stands in Foundry as an item");
|
||||||
|
assert.equal(background.name, "Soldier");
|
||||||
|
assert.equal(referenceId(actor, "background"), background.id, "its details reference points at the item");
|
||||||
|
assert.equal(actor.system.details.background, background.id);
|
||||||
|
assert.deepEqual(world.logs, [], "applying the character did not warn");
|
||||||
|
});
|
||||||
|
|
||||||
|
test("the background an earlier sync invented is taken back out", async () => {
|
||||||
|
// What the bug left behind: an item named after the id the details field held, next to
|
||||||
|
// the real background, and a reference the old sync overwrote with that id.
|
||||||
|
const actor = makeStubActor("Thalia", {
|
||||||
|
system: { details: { background: ID_GONE } },
|
||||||
|
flags: { [MODULE_ID]: { actorId: "dr-actor-1" } },
|
||||||
|
items: [
|
||||||
|
{ _id: ID_SOLDIER, name: "Soldier", type: "background", flags: { [MODULE_ID]: { syncedItem: true } } },
|
||||||
|
{ _id: "item-bogus", name: ID_GONE, type: "background", flags: { [MODULE_ID]: { syncedItem: true } } },
|
||||||
|
],
|
||||||
|
});
|
||||||
|
const world = await makeWorld({
|
||||||
|
actors: [actor],
|
||||||
|
remoteActors: [campaignCharacter(actor, { background: "Soldier" })],
|
||||||
|
}).start();
|
||||||
|
|
||||||
|
assert.deepEqual(world.itemNames(actor), [["background", "Soldier"]], "only the real background is left");
|
||||||
|
assert.equal(referenceId(actor, "background"), ID_SOLDIER, "and the reference resolves to it");
|
||||||
|
});
|
||||||
|
|
||||||
|
test("a background taken off in Dragonroll clears the reference", async () => {
|
||||||
|
const actor = makeStubActor("Thalia", {
|
||||||
|
system: { details: { background: ID_SOLDIER } },
|
||||||
|
flags: { [MODULE_ID]: { actorId: "dr-actor-1" } },
|
||||||
|
items: [
|
||||||
|
{ _id: ID_SOLDIER, name: "Soldier", type: "background", flags: { [MODULE_ID]: { syncedItem: true } } },
|
||||||
|
],
|
||||||
|
});
|
||||||
|
const world = await makeWorld({ actors: [actor], remoteActors: [campaignCharacter(actor)] }).start();
|
||||||
|
|
||||||
|
assert.deepEqual(world.itemNames(actor), [], "the background item went with it");
|
||||||
|
assert.equal(referenceId(actor, "background"), "", "and no reference is left pointing at nothing");
|
||||||
|
});
|
||||||
|
|
||||||
|
test("a species never lands in the details reference as a name", async () => {
|
||||||
|
const actor = makeStubActor("Thalia", {
|
||||||
|
// A species picked in the sheet: dnd5e made the race item and referenced it by id.
|
||||||
|
system: { details: { race: ID_HUMAN } },
|
||||||
|
flags: { [MODULE_ID]: { actorId: "dr-actor-1" } },
|
||||||
|
items: [{ _id: ID_HUMAN, name: "Human", type: "race", flags: { [MODULE_ID]: { syncedItem: true } } }],
|
||||||
|
});
|
||||||
|
await makeWorld({
|
||||||
|
actors: [actor],
|
||||||
|
remoteActors: [campaignCharacter(actor, { species: "Human", background: "Soldier" })],
|
||||||
|
}).start();
|
||||||
|
|
||||||
|
assert.equal(referenceId(actor, "race"), ID_HUMAN, "the species reference still points at the race item");
|
||||||
|
assert.notEqual(actor.system.details.race, "Human", "a name in it would resolve to nothing");
|
||||||
|
});
|
||||||
|
|
||||||
|
test("a species the world keeps as plain text is left to the world", async () => {
|
||||||
|
// An actor migrated from an older system release: no race item, the name is what the
|
||||||
|
// field holds, and Dragonroll has nothing to reference.
|
||||||
|
const actor = makeStubActor("Thalia", {
|
||||||
|
system: { details: { race: "Human" } },
|
||||||
|
flags: { [MODULE_ID]: { actorId: "dr-actor-1" } },
|
||||||
|
});
|
||||||
|
await makeWorld({
|
||||||
|
actors: [actor],
|
||||||
|
remoteActors: [campaignCharacter(actor, { species: "Human" })],
|
||||||
|
}).start();
|
||||||
|
|
||||||
|
assert.equal(actor.system.details.race, "Human", "the text the sheet reads is kept as it was");
|
||||||
|
});
|
||||||
|
|
||||||
|
test("a character made in Dragonroll references the background it is created with", async () => {
|
||||||
|
const world = await makeWorld({ actors: [], remoteActors: [campaignCharacter(null, { background: "Soldier" })] }).start();
|
||||||
|
|
||||||
|
const [actor] = world.game.actors.contents;
|
||||||
|
assert.ok(actor, "the campaign's character was made in this world");
|
||||||
|
const background = actor.items.contents.find((item) => item.type === "background");
|
||||||
|
assert.ok(background, "created together with its background item");
|
||||||
|
assert.equal(background.name, "Soldier");
|
||||||
|
assert.equal(referenceId(actor, "background"), background.id, "referenced by that item's id, never its name");
|
||||||
|
});
|
||||||
69
tests/item-entry-display.test.js
Normal file
69
tests/item-entry-display.test.js
Normal file
@@ -0,0 +1,69 @@
|
|||||||
|
// Tests for Syndria98/dragonroll#53: the item row in the campaign sidebar dropped its "SYNCED"
|
||||||
|
// text badge and now leads with the item's own icon on the left of the entry.
|
||||||
|
//
|
||||||
|
// The repository root installs no dependencies, so these read the sidebar component the way
|
||||||
|
// tests/sidebar-entity-entry.test.js does — the checks are about the markup and style of the row.
|
||||||
|
//
|
||||||
|
// Run with `npm test` from the repository root, or `node --test tests/`.
|
||||||
|
|
||||||
|
const { test } = require("node:test");
|
||||||
|
const assert = require("node:assert/strict");
|
||||||
|
const fs = require("node:fs");
|
||||||
|
const path = require("node:path");
|
||||||
|
|
||||||
|
const source = fs.readFileSync(
|
||||||
|
path.join(__dirname, "..", "frontend", "app", "components", "partials", "ContentSidebar.vue"),
|
||||||
|
"utf8"
|
||||||
|
);
|
||||||
|
|
||||||
|
// The block that renders the item rows, from the items section down to its closing template. The
|
||||||
|
// items section is followed by the maps section (`v-else`), so the first `</template>` that leads
|
||||||
|
// there ends it; the inner `v-for` close is followed by another close, not by `v-else`.
|
||||||
|
const itemSection =
|
||||||
|
/<template v-else-if="activeSection === 'items'">([\s\S]*?)<\/template>\s*\n\s*<template v-else>/.exec(source)?.[1] ?? "";
|
||||||
|
|
||||||
|
// `selector` is inserted verbatim, so escape the `.` of a class combination. Comments are dropped:
|
||||||
|
// they explain a rule, they are not part of it.
|
||||||
|
function ruleFor(selector) {
|
||||||
|
const rule = new RegExp(`\\.${selector}\\s*\\{([^}]*)\\}`).exec(source)?.[0];
|
||||||
|
return rule?.replace(/\/\*[\s\S]*?\*\//g, "");
|
||||||
|
}
|
||||||
|
|
||||||
|
test("the item entry no longer shows the SYNCED text", () => {
|
||||||
|
assert.ok(itemSection, "expected to find the items section of the sidebar");
|
||||||
|
assert.doesNotMatch(itemSection, /campaigns\.synced/, "the item row must not render the synced text");
|
||||||
|
assert.doesNotMatch(itemSection, /entity-entry-sync/, "the item row must not render the synced badge");
|
||||||
|
});
|
||||||
|
|
||||||
|
test("the item entry shows the item's image on the left when it has one", () => {
|
||||||
|
// the icon renders only for an item that carries an image, resolved through the helper...
|
||||||
|
assert.match(
|
||||||
|
itemSection,
|
||||||
|
/<span v-if="row\.item\.image" class="entity-entry-image"[\s\S]*?<img :src="itemImageUrl\(row\.item\.image\)"/
|
||||||
|
);
|
||||||
|
// ...and on the left: it stands before the name in the row markup.
|
||||||
|
assert.ok(
|
||||||
|
itemSection.indexOf("entity-entry-image") < itemSection.indexOf("entity-entry-name"),
|
||||||
|
"the item image must stand to the left of the name"
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
test("the item entry lays the icon out beside the name", () => {
|
||||||
|
const title = ruleFor("entity-entry-title");
|
||||||
|
assert.ok(title, "expected a .entity-entry-title style rule");
|
||||||
|
assert.match(title, /display:\s*flex/, "the icon and the name sit side by side");
|
||||||
|
|
||||||
|
const image = ruleFor("entity-entry-image");
|
||||||
|
assert.ok(image, "expected a .entity-entry-image style rule");
|
||||||
|
assert.match(image, /overflow:\s*hidden/, "the icon is clipped to its box");
|
||||||
|
});
|
||||||
|
|
||||||
|
test("an item image resolves like the item window: uploads from /public, full URLs as they are", () => {
|
||||||
|
assert.match(source, /import Server, \{ getBaseUrl \} from ['"]~\/services\/Server['"]/);
|
||||||
|
|
||||||
|
const resolver = /function itemImageUrl\(image\)\s*\{[\s\S]*?\n\}/.exec(source)?.[0] ?? "";
|
||||||
|
assert.ok(resolver, "expected an itemImageUrl helper");
|
||||||
|
assert.match(resolver, /https\?:/, "a full http(s) URL loads as it is");
|
||||||
|
assert.match(resolver, /data:/, "a data URI loads as it is");
|
||||||
|
assert.match(resolver, /\$\{getBaseUrl\(\)\}\/public\//, "an uploaded filename resolves as a /public file");
|
||||||
|
});
|
||||||
606
tests/item-folder-sync.test.js
Normal file
606
tests/item-folder-sync.test.js
Normal file
@@ -0,0 +1,606 @@
|
|||||||
|
// Tests for item folders following the Foundry world into the campaign
|
||||||
|
// (Syndria98/dragonroll#44): the world's item directory is grouped into folders, and
|
||||||
|
// Dragonroll mirrors that tree as Folders of target 'item' and files the synced items
|
||||||
|
// in them, so its item list reads like the world's.
|
||||||
|
//
|
||||||
|
// The repository root installs no dependencies, so each side is loaded the way the
|
||||||
|
// other tests do it. The sync route runs against a stubbed `require` (express,
|
||||||
|
// mongoose and the models answer with plain objects and a small filter matcher):
|
||||||
|
// that keeps the tree, the filing and the pruning observable without a database. The
|
||||||
|
// Foundry module is loaded into a `node:vm` context holding stubbed Foundry globals
|
||||||
|
// (`game.folders` included) with fake timers, like tests/foundry-sync-toggle.test.js.
|
||||||
|
// The grouping of the sidebar list lives in a plain ES module and is read as text.
|
||||||
|
//
|
||||||
|
// Run with `npm test` from the repository root, or `node --test tests/`.
|
||||||
|
|
||||||
|
const { test } = require("node:test");
|
||||||
|
const assert = require("node:assert/strict");
|
||||||
|
const fs = require("node:fs");
|
||||||
|
const path = require("node:path");
|
||||||
|
const vm = require("node:vm");
|
||||||
|
|
||||||
|
const read = (...parts) => fs.readFileSync(path.join(__dirname, "..", ...parts), "utf8");
|
||||||
|
const repoRequire = (relative) => require(path.join(__dirname, "..", relative));
|
||||||
|
|
||||||
|
// --- The sync route against stubbed models -------------------------------------
|
||||||
|
|
||||||
|
// A mongoose query answers whatever `await query` and `query.lean()` answer with, and
|
||||||
|
// lets `select()`, `sort()` and `limit()` sit in between.
|
||||||
|
function mongooseQuery(value) {
|
||||||
|
const result = {
|
||||||
|
select: () => result,
|
||||||
|
sort: () => result,
|
||||||
|
limit: (count) => mongooseQuery(value.slice(0, count)),
|
||||||
|
lean: () => Promise.resolve(value),
|
||||||
|
then: (onFulfilled, onRejected) => Promise.resolve(value).then(onFulfilled, onRejected),
|
||||||
|
};
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Enough of the query language the item folder sync uses: equality, $or, $in, $nin,
|
||||||
|
// $exists. Anything else is a filter this test did not expect and says so.
|
||||||
|
function matches(document, filter = {}) {
|
||||||
|
return Object.entries(filter).every(([key, expected]) => {
|
||||||
|
if (key === "$or") return expected.some((part) => matches(document, part));
|
||||||
|
const value = document?.[key];
|
||||||
|
if (expected && typeof expected === "object" && !Array.isArray(expected)) {
|
||||||
|
return Object.entries(expected).every(([operator, wanted]) => {
|
||||||
|
if (operator === "$exists") return (value !== undefined && value !== null) === wanted;
|
||||||
|
if (operator === "$in") return wanted.some((entry) => String(value) === String(entry));
|
||||||
|
if (operator === "$nin") return !wanted.some((entry) => String(value) === String(entry));
|
||||||
|
throw new Error(`filter operator "${key}.${operator}" is not stubbed`);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
return String(value ?? "") === String(expected ?? "");
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
function fakeModel(table, seed = [], campaignId) {
|
||||||
|
const rows = [];
|
||||||
|
let counter = 0;
|
||||||
|
|
||||||
|
function Document(data = {}) {
|
||||||
|
counter += 1;
|
||||||
|
this._id = `${table}-${counter}`;
|
||||||
|
this.isNew = true;
|
||||||
|
this.foundryNames = [];
|
||||||
|
Object.assign(this, data);
|
||||||
|
}
|
||||||
|
Document.prototype.save = async function save() {
|
||||||
|
if (this.isNew) rows.push(this);
|
||||||
|
this.isNew = false;
|
||||||
|
return this;
|
||||||
|
};
|
||||||
|
Object.defineProperty(Document.prototype, "id", { get() { return this._id; } });
|
||||||
|
|
||||||
|
for (const data of seed) {
|
||||||
|
// A seeded row belongs to the campaign the requests are made against unless the
|
||||||
|
// seed says otherwise: the routes scope every lookup by campaign.
|
||||||
|
const row = new Document({ campaign: campaignId, [table === "folder" ? "target" : "name"]: undefined, ...data });
|
||||||
|
row.isNew = false;
|
||||||
|
rows.push(row);
|
||||||
|
}
|
||||||
|
|
||||||
|
const model = function Model(data) { return new Document(data); };
|
||||||
|
model.rows = rows;
|
||||||
|
model.findOne = async (filter) => rows.find((row) => matches(row, filter)) ?? null;
|
||||||
|
model.find = (filter) => mongooseQuery(rows.filter((row) => matches(row, filter)));
|
||||||
|
model.deleteOne = async (filter) => {
|
||||||
|
const hit = rows.filter((row) => matches(row, filter));
|
||||||
|
for (const row of hit) rows.splice(rows.indexOf(row), 1);
|
||||||
|
return { deletedCount: hit.length };
|
||||||
|
};
|
||||||
|
model.deleteMany = async (filter) => {
|
||||||
|
const hit = rows.filter((row) => matches(row, filter));
|
||||||
|
for (const row of hit) rows.splice(rows.indexOf(row), 1);
|
||||||
|
return { deletedCount: hit.length };
|
||||||
|
};
|
||||||
|
model.updateMany = async (filter, update) => {
|
||||||
|
const hit = rows.filter((row) => matches(row, filter));
|
||||||
|
for (const row of hit) Object.assign(row, update.$set ?? {});
|
||||||
|
return { modifiedCount: hit.length };
|
||||||
|
};
|
||||||
|
return model;
|
||||||
|
}
|
||||||
|
|
||||||
|
function worldItem(over = {}) {
|
||||||
|
return {
|
||||||
|
_id: "item-1",
|
||||||
|
name: "Longsword",
|
||||||
|
type: "weapon",
|
||||||
|
system: { quantity: 1, weight: 3, rarity: "common" },
|
||||||
|
...over,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
// The Foundry sync route with every model it requires stubbed. `seed` pre-fills the
|
||||||
|
// tables with documents the campaign already holds.
|
||||||
|
function loadSyncRoute({ seed = {}, worldId = "world-1" } = {}) {
|
||||||
|
const routes = new Map();
|
||||||
|
const router = {
|
||||||
|
get: (route, ...handlers) => routes.set(`GET ${route}`, handlers),
|
||||||
|
post: (route, ...handlers) => routes.set(`POST ${route}`, handlers),
|
||||||
|
};
|
||||||
|
const campaign = { _id: "campaign-1", id: "campaign-1", name: "Test Campaign", foundryWorldId: worldId };
|
||||||
|
const models = {
|
||||||
|
"../models/Actor": fakeModel("actor", seed.actors, campaign.id),
|
||||||
|
"../models/Item": fakeModel("item", seed.items, campaign.id),
|
||||||
|
"../models/Folder": fakeModel("folder", seed.folders, campaign.id),
|
||||||
|
};
|
||||||
|
|
||||||
|
const requireStub = (id) => {
|
||||||
|
if (id === "express") return { Router: () => router };
|
||||||
|
// The route hashes the sync token with node's own crypto: the real module costs nothing
|
||||||
|
// to hand it, and nothing here depends on what the hash looks like.
|
||||||
|
if (id === "node:crypto") return require("node:crypto");
|
||||||
|
if (id === "mongoose") return { isValidObjectId: (value) => typeof value === "string" && value.length > 20 };
|
||||||
|
if (id === "../models/Campaign") return { findOne: async () => campaign };
|
||||||
|
if (id === "../services/actor-foundry") return { foundryActorToCharacter: (actor) => ({ name: actor?.name ?? "" }) };
|
||||||
|
if (id === "../services/item-foundry") return repoRequire(path.join("backend", "src", "services", "item-foundry.js"));
|
||||||
|
if (models[id]) return models[id];
|
||||||
|
throw new Error(`require("${id}") is not stubbed`);
|
||||||
|
};
|
||||||
|
|
||||||
|
const moduleStub = { exports: {} };
|
||||||
|
vm.compileFunction(read("backend", "src", "routes", "foundry-link.js"), ["require", "module", "exports"])(
|
||||||
|
requireStub, moduleStub, moduleStub.exports
|
||||||
|
);
|
||||||
|
|
||||||
|
async function call(route, body = {}) {
|
||||||
|
const handlers = routes.get(route);
|
||||||
|
assert.ok(handlers, `${route} is not mounted`);
|
||||||
|
const res = { payload: null, json(payload) { this.payload = payload; }, set: () => {} };
|
||||||
|
const req = { body, get: (name) => (String(name).toLowerCase() === "authorization" ? "Bearer sync-token" : "") };
|
||||||
|
await handlers[handlers.length - 1](req, res);
|
||||||
|
return res.payload;
|
||||||
|
}
|
||||||
|
|
||||||
|
return { call, models, campaign };
|
||||||
|
}
|
||||||
|
|
||||||
|
const FOLDER_TREE = [
|
||||||
|
{ id: "folder-melee", name: "Melee Weapons", parent: null },
|
||||||
|
{ id: "folder-ranged", name: "Ranged Weapons", parent: null },
|
||||||
|
{ id: "folder-powder", name: "Powder Weapons", parent: "folder-ranged" },
|
||||||
|
];
|
||||||
|
|
||||||
|
test("a synced world item arrives in the folder the world keeps it in", async () => {
|
||||||
|
const sync = loadSyncRoute();
|
||||||
|
|
||||||
|
const response = await sync.call("POST /sync/snapshot", {
|
||||||
|
worldId: "world-1",
|
||||||
|
actors: [],
|
||||||
|
folders: FOLDER_TREE,
|
||||||
|
items: [worldItem({ dragonroll: { folder: "folder-melee" } })],
|
||||||
|
});
|
||||||
|
|
||||||
|
assert.equal(response.status, "ok");
|
||||||
|
const [folder] = sync.models["../models/Folder"].rows;
|
||||||
|
assert.equal(folder.name, "Melee Weapons");
|
||||||
|
assert.equal(folder.target, "item", "a synced folder belongs to the item list, not the notes");
|
||||||
|
assert.equal(folder.foundryFolderId, "folder-melee");
|
||||||
|
assert.equal(sync.models["../models/Item"].rows[0].folder, folder._id);
|
||||||
|
});
|
||||||
|
|
||||||
|
test("a nested Foundry folder becomes a nested campaign folder", async () => {
|
||||||
|
const sync = loadSyncRoute();
|
||||||
|
|
||||||
|
await sync.call("POST /sync/item-snapshot", { worldId: "world-1", items: [], folders: FOLDER_TREE });
|
||||||
|
|
||||||
|
const folders = sync.models["../models/Folder"].rows;
|
||||||
|
const ranged = folders.find((folder) => folder.name === "Ranged Weapons");
|
||||||
|
const powder = folders.find((folder) => folder.name === "Powder Weapons");
|
||||||
|
assert.equal(powder.parentFolder, ranged._id, "the subfolder hangs under the folder nesting it");
|
||||||
|
assert.equal(folders.find((folder) => folder.name === "Melee Weapons").parentFolder, null);
|
||||||
|
});
|
||||||
|
|
||||||
|
test("the same world folder is never made twice, and keeps its items", async () => {
|
||||||
|
const sync = loadSyncRoute();
|
||||||
|
|
||||||
|
await sync.call("POST /sync/item-snapshot", {
|
||||||
|
worldId: "world-1", items: [worldItem({ dragonroll: { folder: "folder-melee" } })], folders: FOLDER_TREE,
|
||||||
|
});
|
||||||
|
const filed = sync.models["../models/Item"].rows[0].folder;
|
||||||
|
await sync.call("POST /sync/item-snapshot", {
|
||||||
|
worldId: "world-1", items: [worldItem({ dragonroll: { folder: "folder-melee" } })], folders: FOLDER_TREE,
|
||||||
|
});
|
||||||
|
|
||||||
|
assert.equal(sync.models["../models/Folder"].rows.length, FOLDER_TREE.length, "the tree was mirrored once");
|
||||||
|
assert.equal(sync.models["../models/Item"].rows[0].folder, filed, "the item stays in the folder it was filed in");
|
||||||
|
});
|
||||||
|
|
||||||
|
test("a folder renamed in the world is renamed in the campaign", async () => {
|
||||||
|
const sync = loadSyncRoute({
|
||||||
|
seed: { folders: [{ _id: "folder-1", target: "item", foundryFolderId: "folder-melee", name: "Old name", parentFolder: null }] },
|
||||||
|
});
|
||||||
|
|
||||||
|
await sync.call("POST /sync/item-snapshot", {
|
||||||
|
worldId: "world-1", items: [], folders: [{ id: "folder-melee", name: "Melee Weapons", parent: null }],
|
||||||
|
});
|
||||||
|
|
||||||
|
assert.equal(sync.models["../models/Folder"].rows.length, 1);
|
||||||
|
assert.equal(sync.models["../models/Folder"].rows[0].name, "Melee Weapons");
|
||||||
|
});
|
||||||
|
|
||||||
|
test("a folder the world dropped goes, and its items move to the root", async () => {
|
||||||
|
const sync = loadSyncRoute({
|
||||||
|
seed: {
|
||||||
|
folders: [{ _id: "folder-1", target: "item", foundryFolderId: "folder-melee", name: "Melee Weapons" }],
|
||||||
|
items: [{ _id: "item-1", name: "Longsword", foundryItemId: "item-1", folder: "folder-1" }],
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
await sync.call("POST /sync/item-snapshot", { worldId: "world-1", items: [], folders: [] });
|
||||||
|
|
||||||
|
assert.deepEqual(sync.models["../models/Folder"].rows, [], "the empty folder row is gone with the world's folder");
|
||||||
|
assert.equal(sync.models["../models/Item"].rows[0].folder, null, "the item moves to the root instead of nowhere");
|
||||||
|
});
|
||||||
|
|
||||||
|
test("a campaign folder the world does not know is left alone", async () => {
|
||||||
|
const sync = loadSyncRoute({
|
||||||
|
seed: { folders: [{ _id: "folder-1", target: "item", name: "Homebrew", parentFolder: null }] },
|
||||||
|
});
|
||||||
|
|
||||||
|
await sync.call("POST /sync/item-snapshot", { worldId: "world-1", items: [], folders: [] });
|
||||||
|
|
||||||
|
assert.equal(sync.models["../models/Folder"].rows.length, 1, "only folders mirrored from the world are pruned");
|
||||||
|
});
|
||||||
|
|
||||||
|
test("an item embedded in an actor leaves the folder of its world copy alone", async () => {
|
||||||
|
const sync = loadSyncRoute({
|
||||||
|
seed: { items: [{ _id: "item-1", name: "Longsword", foundryItemId: "item-1", folder: "folder-1" }] },
|
||||||
|
});
|
||||||
|
|
||||||
|
// The actor's copy carries no folder of its own: the inventory folders an actor
|
||||||
|
// keeps say nothing about the campaign's item list.
|
||||||
|
await sync.call("POST /sync/snapshot", {
|
||||||
|
worldId: "world-1",
|
||||||
|
actors: [{ _id: "actor-1", name: "Thalia", items: [worldItem({ _id: "item-1" })] }],
|
||||||
|
items: [],
|
||||||
|
folders: FOLDER_TREE,
|
||||||
|
});
|
||||||
|
|
||||||
|
assert.equal(sync.models["../models/Item"].rows[0].folder, "folder-1");
|
||||||
|
});
|
||||||
|
|
||||||
|
test("a module that knows nothing about folders leaves them untouched", async () => {
|
||||||
|
const sync = loadSyncRoute({
|
||||||
|
seed: {
|
||||||
|
folders: [{ _id: "folder-1", target: "item", foundryFolderId: "folder-melee", name: "Melee Weapons" }],
|
||||||
|
items: [{ _id: "item-1", name: "Longsword", foundryItemId: "item-1", folder: "folder-1" }],
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
await sync.call("POST /sync/snapshot", { worldId: "world-1", actors: [], items: [worldItem()] });
|
||||||
|
await sync.call("POST /sync/item-snapshot", { worldId: "world-1", items: [worldItem()] });
|
||||||
|
|
||||||
|
assert.equal(sync.models["../models/Folder"].rows.length, 1, "no tree was sent, so nothing was pruned");
|
||||||
|
assert.equal(sync.models["../models/Item"].rows[0].folder, "folder-1", "and the item stays filed where it was");
|
||||||
|
});
|
||||||
|
|
||||||
|
test("an item the world moved out of a folder follows it to the root", async () => {
|
||||||
|
const sync = loadSyncRoute({
|
||||||
|
seed: {
|
||||||
|
folders: [{ _id: "folder-1", target: "item", foundryFolderId: "folder-melee", name: "Melee Weapons" }],
|
||||||
|
items: [{ _id: "item-1", name: "Longsword", foundryItemId: "item-1", folder: "folder-1" }],
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
await sync.call("POST /sync/item-snapshot", {
|
||||||
|
worldId: "world-1",
|
||||||
|
items: [worldItem({ dragonroll: { folder: "" } })],
|
||||||
|
folders: [{ id: "folder-melee", name: "Melee Weapons", parent: null }],
|
||||||
|
});
|
||||||
|
|
||||||
|
assert.equal(sync.models["../models/Item"].rows[0].folder, null);
|
||||||
|
});
|
||||||
|
|
||||||
|
test("every folder listing says which campaign list it belongs to", () => {
|
||||||
|
// The sidebar's four lists share the Folder model, so a listing that names no target
|
||||||
|
// would show folders of the other lists between its own rows. The note routes and
|
||||||
|
// `/folder/list` ask through `Folder.filterForTarget`, which for the notes names every
|
||||||
|
// other section instead of the notes' own target: note folders made before the target
|
||||||
|
// field existed carry none at all. tests/entry-folders.test.js runs these routes.
|
||||||
|
for (const route of ["note.js", "folder.js"]) {
|
||||||
|
const source = read("backend", "src", "routes", route);
|
||||||
|
// The listings that gather a campaign's folders are the ones shown as a section's
|
||||||
|
// tree. A walk of one folder's own children (`parentFolder`) is inside a single
|
||||||
|
// list already: folders are only ever nested within their own section.
|
||||||
|
const listings = source.match(/Folder\.find\(\{\s*campaign/g) ?? [];
|
||||||
|
assert.ok(listings.length, `${route} lists folders`);
|
||||||
|
const filtered = source.match(/Folder\.find\(\{\s*campaign[^{]*Folder\.filterForTarget\((?:'note'|target)\)/g) ?? [];
|
||||||
|
assert.equal(filtered.length, listings.length, `${route} has a folder listing that names no campaign list`);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
test("the item list comes with the folders it groups into, and items carry theirs", () => {
|
||||||
|
assert.match(read("backend", "src", "models", "Item.js"), /folder:\s*{\s*type:\s*Schema\.Types\.ObjectId,\s*ref:\s*'Folder'/);
|
||||||
|
const itemRoute = read("backend", "src", "routes", "item.js");
|
||||||
|
assert.match(itemRoute, /res\.json\(\{\s*status:\s*'ok',\s*items,\s*folders:/);
|
||||||
|
assert.match(itemRoute, /Folder\.find\(\{\s*campaign:\s*campaignId,\s*target:\s*'item'\s*\}/);
|
||||||
|
});
|
||||||
|
|
||||||
|
// --- The Foundry module sends its folder tree ------------------------------------
|
||||||
|
|
||||||
|
function makeWorld() {
|
||||||
|
const state = {
|
||||||
|
hooks: new Map(),
|
||||||
|
registered: new Map(),
|
||||||
|
requests: [],
|
||||||
|
timers: new Map(),
|
||||||
|
nextTimerId: 1,
|
||||||
|
};
|
||||||
|
|
||||||
|
const folders = [
|
||||||
|
{ id: "folder-melee", name: "Melee Weapons", type: "Item", parent: null, documentName: "Folder" },
|
||||||
|
{ id: "folder-ranged", name: "Ranged Weapons", type: "Item", parent: "folder-melee", documentName: "Folder" },
|
||||||
|
// An actor's own inventory folder: it hangs off the actor, not the world.
|
||||||
|
{ id: "folder-carried", name: "Carried", type: "Item", parent: { id: "actor-1", documentName: "Actor" }, documentName: "Folder" },
|
||||||
|
{ id: "folder-journal", name: "Lore", type: "JournalEntry", parent: null, documentName: "Folder" },
|
||||||
|
];
|
||||||
|
const items = [
|
||||||
|
{
|
||||||
|
id: "item-1", name: "Longsword", type: "weapon", documentName: "Item", parent: null,
|
||||||
|
folder: "folder-melee",
|
||||||
|
system: { properties: { value: [] }, quantity: 1, weight: 3, rarity: "common" },
|
||||||
|
toObject() { return { _id: this.id, name: this.name, type: this.type, system: this.system, flags: {} }; },
|
||||||
|
},
|
||||||
|
{
|
||||||
|
id: "item-2", name: "Torch", type: "loot", documentName: "Item", parent: null, folder: "",
|
||||||
|
system: { properties: { value: [] }, quantity: 1, weight: 1, rarity: "common" },
|
||||||
|
toObject() { return { _id: this.id, name: this.name, type: this.type, system: this.system, flags: {} }; },
|
||||||
|
},
|
||||||
|
];
|
||||||
|
const carriedItem = {
|
||||||
|
id: "item-3", name: "Caltrops", type: "loot", documentName: "Item", parent: { documentName: "Actor" },
|
||||||
|
folder: "folder-carried",
|
||||||
|
system: { properties: { value: [] }, quantity: 4, weight: 0, rarity: "common" },
|
||||||
|
toObject() { return { _id: this.id, name: this.name, type: this.type, system: this.system, flags: {} }; },
|
||||||
|
};
|
||||||
|
const actors = [
|
||||||
|
{
|
||||||
|
id: "actor-1", name: "Thalia", type: "character", documentName: "Actor", flags: {},
|
||||||
|
items: { contents: [carriedItem] },
|
||||||
|
getFlag() { return undefined; },
|
||||||
|
// A pushed actor has its items marked as synced and itself mapped to the
|
||||||
|
// campaign row: nothing here reads those flags back.
|
||||||
|
async update() { return this; },
|
||||||
|
async updateEmbeddedDocuments() { return []; },
|
||||||
|
toObject() { return { _id: this.id, name: this.name, type: this.type, flags: this.flags }; },
|
||||||
|
},
|
||||||
|
];
|
||||||
|
|
||||||
|
const settingsStore = { autoSync: true, syncToken: "sync-token-1", dragonrollApiUrl: "http://backend.test:5000" };
|
||||||
|
const sandbox = {
|
||||||
|
console: { log() {}, info() {}, warn() {}, error() {} },
|
||||||
|
URL,
|
||||||
|
CONFIG: {},
|
||||||
|
window: { location: { origin: "http://vtt.test" } },
|
||||||
|
ui: { notifications: { info() {}, warn() {}, error() {} } },
|
||||||
|
Hooks: {
|
||||||
|
once(name, fn) { state.hooks.set(name, [fn]); },
|
||||||
|
on(name, fn) { state.hooks.set(name, [...(state.hooks.get(name) || []), fn]); },
|
||||||
|
},
|
||||||
|
setTimeout: (fn, delay = 0) => {
|
||||||
|
const id = state.nextTimerId++;
|
||||||
|
state.timers.set(id, { fn, delay });
|
||||||
|
return id;
|
||||||
|
},
|
||||||
|
clearTimeout: (id) => state.timers.delete(id),
|
||||||
|
setInterval: () => 0,
|
||||||
|
clearInterval: () => {},
|
||||||
|
fetch: async (url, options = {}) => {
|
||||||
|
state.requests.push({
|
||||||
|
href: String(url),
|
||||||
|
method: options.method,
|
||||||
|
body: options.body ? JSON.parse(options.body) : null,
|
||||||
|
});
|
||||||
|
return { ok: true, status: 200, json: async () => ({ status: "ok", actors: [], items: [] }) };
|
||||||
|
},
|
||||||
|
Actor: { async create() { return null; } },
|
||||||
|
Item: { async create() { return null; } },
|
||||||
|
};
|
||||||
|
|
||||||
|
sandbox.game = {
|
||||||
|
user: { isGM: true },
|
||||||
|
world: { id: "world-1", title: "Test World" },
|
||||||
|
system: { id: "dnd5e" },
|
||||||
|
modules: { get: () => ({}) },
|
||||||
|
actors: { contents: actors, get: (id) => actors.find((actor) => actor.id === id) },
|
||||||
|
items: { contents: items, get: (id) => items.find((item) => item.id === id) },
|
||||||
|
folders: { contents: folders, get: (id) => folders.find((folder) => folder.id === id) },
|
||||||
|
settings: {
|
||||||
|
register(module, key, definition) {
|
||||||
|
state.registered.set(key, definition);
|
||||||
|
if (!(key in settingsStore)) settingsStore[key] = definition.default;
|
||||||
|
},
|
||||||
|
get(module, key) { return settingsStore[key]; },
|
||||||
|
async set(module, key, value) {
|
||||||
|
settingsStore[key] = value;
|
||||||
|
await state.registered.get(key)?.onChange?.(value);
|
||||||
|
},
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
vm.createContext(sandbox);
|
||||||
|
vm.runInContext(read("dragonroll-foundry", "scripts", "api.js"), sandbox);
|
||||||
|
|
||||||
|
state.game = sandbox.game;
|
||||||
|
state.folder = (id) => folders.find((folder) => folder.id === id);
|
||||||
|
state.item = (id) => items.find((item) => item.id === id);
|
||||||
|
state.syncRequests = () => state.requests.filter((request) => request.href.includes("foundry/sync")
|
||||||
|
&& !request.href.includes("foundry/sync/status"));
|
||||||
|
state.pushes = (route) => state.syncRequests().filter((request) => request.href.includes(route));
|
||||||
|
|
||||||
|
const drain = async () => { await new Promise((resolve) => setImmediate(resolve)); };
|
||||||
|
state.fire = async (name, ...args) => {
|
||||||
|
for (const handler of state.hooks.get(name) || []) await handler(...args);
|
||||||
|
await drain();
|
||||||
|
};
|
||||||
|
state.runTimers = async () => {
|
||||||
|
for (let round = 0; round < 6; round += 1) {
|
||||||
|
if (!state.timers.size && round > 2) break;
|
||||||
|
const due = [...state.timers.values()];
|
||||||
|
state.timers.clear();
|
||||||
|
for (const timer of due) await timer.fn();
|
||||||
|
await drain();
|
||||||
|
}
|
||||||
|
};
|
||||||
|
state.linkedSetup = async () => {
|
||||||
|
await state.fire("init");
|
||||||
|
await state.fire("ready");
|
||||||
|
await state.runTimers();
|
||||||
|
state.requests.length = 0;
|
||||||
|
return state;
|
||||||
|
};
|
||||||
|
|
||||||
|
return state;
|
||||||
|
}
|
||||||
|
|
||||||
|
test("the world sends its item folder tree with a snapshot", async () => {
|
||||||
|
const world = await makeWorld().linkedSetup();
|
||||||
|
|
||||||
|
await world.fire("updateActor", world.game.actors.contents[0]);
|
||||||
|
await world.runTimers();
|
||||||
|
|
||||||
|
const [push] = world.pushes("foundry/sync/snapshot");
|
||||||
|
assert.ok(push, "the actor change pushed a snapshot");
|
||||||
|
assert.deepEqual(push.body.folders, [
|
||||||
|
{ id: "folder-melee", name: "Melee Weapons", parent: null },
|
||||||
|
{ id: "folder-ranged", name: "Ranged Weapons", parent: "folder-melee" },
|
||||||
|
], "the item directory tree, nested, without the actor's own or another type's folders");
|
||||||
|
const longsword = push.body.items.find((item) => item._id === "item-1");
|
||||||
|
assert.equal(longsword.dragonroll.folder, "folder-melee", "a world item says which folder it stands in");
|
||||||
|
const torch = push.body.items.find((item) => item._id === "item-2");
|
||||||
|
assert.equal(torch.dragonroll.folder, "", "and which one stands at the root");
|
||||||
|
});
|
||||||
|
|
||||||
|
test("an item embedded in an actor does not report the actor's inventory folders", async () => {
|
||||||
|
const world = await makeWorld().linkedSetup();
|
||||||
|
|
||||||
|
await world.fire("updateActor", world.game.actors.contents[0]);
|
||||||
|
await world.runTimers();
|
||||||
|
|
||||||
|
const [push] = world.pushes("foundry/sync/snapshot");
|
||||||
|
const carried = push.body.actors[0].items.find((item) => item._id === "item-3");
|
||||||
|
assert.equal(carried.dragonroll?.folder, undefined, "the actor copy carries no folder for the campaign");
|
||||||
|
});
|
||||||
|
|
||||||
|
test("a live item edit carries the folder tree too", async () => {
|
||||||
|
const world = await makeWorld().linkedSetup();
|
||||||
|
|
||||||
|
await world.fire("updateItem", world.item("item-1"));
|
||||||
|
await world.runTimers();
|
||||||
|
|
||||||
|
const [push] = world.pushes("foundry/sync/item-snapshot");
|
||||||
|
assert.deepEqual(push.body.folders.map((folder) => folder.id), ["folder-melee", "folder-ranged"]);
|
||||||
|
assert.equal(push.body.items[0].dragonroll.folder, "folder-melee");
|
||||||
|
});
|
||||||
|
|
||||||
|
test("a folder change reaches Dragonroll without pushing the items in it", async () => {
|
||||||
|
const world = await makeWorld().linkedSetup();
|
||||||
|
|
||||||
|
const melee = world.folder("folder-melee");
|
||||||
|
melee.name = "Close Weapons";
|
||||||
|
await world.fire("updateFolder", melee);
|
||||||
|
await world.runTimers();
|
||||||
|
|
||||||
|
const [push] = world.pushes("foundry/sync/item-snapshot");
|
||||||
|
assert.deepEqual(push.body.items, [], "the items themselves are left alone");
|
||||||
|
assert.deepEqual(push.body.folders.map((folder) => [folder.id, folder.name]), [
|
||||||
|
["folder-melee", "Close Weapons"],
|
||||||
|
["folder-ranged", "Ranged Weapons"],
|
||||||
|
]);
|
||||||
|
});
|
||||||
|
|
||||||
|
test("a folder of another document type does not touch the item list", async () => {
|
||||||
|
const world = await makeWorld().linkedSetup();
|
||||||
|
|
||||||
|
await world.fire("updateFolder", world.folder("folder-journal"));
|
||||||
|
await world.runTimers();
|
||||||
|
|
||||||
|
assert.deepEqual(world.syncRequests(), []);
|
||||||
|
});
|
||||||
|
|
||||||
|
test("autosync off: folder changes stop syncing", async () => {
|
||||||
|
const world = await makeWorld().linkedSetup();
|
||||||
|
await world.game.settings.set("dragonroll-foundry", "autoSync", false);
|
||||||
|
|
||||||
|
await world.fire("updateFolder", world.folder("folder-melee"));
|
||||||
|
await world.fire("updateItem", world.item("item-1"));
|
||||||
|
await world.runTimers();
|
||||||
|
|
||||||
|
assert.deepEqual(world.syncRequests(), []);
|
||||||
|
});
|
||||||
|
|
||||||
|
// --- The sidebar groups its items under those folders ----------------------------
|
||||||
|
|
||||||
|
function loadItemFoldersService() {
|
||||||
|
const source = read("frontend", "app", "services", "ItemFolders.js").replace("export { BuildItemRows };", "return { BuildItemRows };");
|
||||||
|
return vm.compileFunction(source)();
|
||||||
|
}
|
||||||
|
|
||||||
|
const { BuildItemRows } = loadItemFoldersService();
|
||||||
|
|
||||||
|
const SIDEBAR_FOLDERS = [
|
||||||
|
{ _id: "f-melee", name: "Melee Weapons" },
|
||||||
|
{ _id: "f-ranged", name: "Ranged Weapons" },
|
||||||
|
{ _id: "f-powder", name: "Powder Weapons", parentFolder: "f-ranged" },
|
||||||
|
];
|
||||||
|
const SIDEBAR_ITEMS = [
|
||||||
|
{ _id: "i-sword", name: "Longsword", folder: "f-melee" },
|
||||||
|
{ _id: "i-pistol", name: "Pistol", folder: "f-powder" },
|
||||||
|
{ _id: "i-torch", name: "Torch" },
|
||||||
|
];
|
||||||
|
|
||||||
|
test("items are grouped under the folder they stand in, nested", () => {
|
||||||
|
const shape = BuildItemRows(SIDEBAR_ITEMS, SIDEBAR_FOLDERS).map((row) => [
|
||||||
|
row.kind, row.kind === "folder" ? row.folder.name : row.item.name, row.depth,
|
||||||
|
]);
|
||||||
|
|
||||||
|
// Every folder is followed by what stands in it, one step deeper, and the items that
|
||||||
|
// stand at the root come last (see BuildItemRows).
|
||||||
|
assert.deepEqual(shape, [
|
||||||
|
["folder", "Melee Weapons", 0],
|
||||||
|
["item", "Longsword", 1],
|
||||||
|
["folder", "Ranged Weapons", 0],
|
||||||
|
["folder", "Powder Weapons", 1],
|
||||||
|
["item", "Pistol", 2],
|
||||||
|
["item", "Torch", 0],
|
||||||
|
]);
|
||||||
|
});
|
||||||
|
|
||||||
|
test("a collapsed folder hides its whole subtree", () => {
|
||||||
|
const rows = BuildItemRows(SIDEBAR_ITEMS, SIDEBAR_FOLDERS, ["f-ranged"]);
|
||||||
|
|
||||||
|
assert.ok(rows.some((row) => row.kind === "folder" && row.folder.name === "Ranged Weapons"));
|
||||||
|
assert.ok(!rows.some((row) => row.kind === "item" && row.item.name === "Pistol"), "the nested item is hidden too");
|
||||||
|
});
|
||||||
|
|
||||||
|
test("without any folder the list is the plain item list", () => {
|
||||||
|
const rows = BuildItemRows([{ _id: "i-1", name: "Torch" }, { _id: "i-2", name: "Longsword" }], []);
|
||||||
|
|
||||||
|
assert.deepEqual(rows.map((row) => [row.kind, row.item.name, row.depth]), [
|
||||||
|
["item", "Longsword", 0],
|
||||||
|
["item", "Torch", 0],
|
||||||
|
]);
|
||||||
|
});
|
||||||
|
|
||||||
|
test("an item whose folder is gone, or a folder nested in itself, reads as a root item", () => {
|
||||||
|
const rows = BuildItemRows(
|
||||||
|
[{ _id: "i-1", name: "Torch", folder: "f-gone" }],
|
||||||
|
[{ _id: "f-a", name: "A", parentFolder: "f-b" }, { _id: "f-b", name: "B", parentFolder: "f-a" }],
|
||||||
|
);
|
||||||
|
|
||||||
|
const shape = rows.map((row) => [row.kind, row.kind === "folder" ? row.folder.name : row.item.name]);
|
||||||
|
assert.ok(shape.some(([kind, name]) => kind === "item" && name === "Torch"), "the item is not lost with the folder that was removed");
|
||||||
|
assert.deepEqual(new Set(shape.filter(([kind]) => kind === "folder").map(([, name]) => name)), new Set(["A", "B"]));
|
||||||
|
assert.equal(shape.filter(([kind]) => kind === "folder").length, 2, "a broken tree is walked once, not forever");
|
||||||
|
});
|
||||||
|
|
||||||
|
test("every locale labels the folder row", () => {
|
||||||
|
for (const locale of ["en", "es", "ca"]) {
|
||||||
|
const campaigns = JSON.parse(read("frontend", "i18n", "locales", locale, "campaigns.json"));
|
||||||
|
assert.ok(campaigns.folders?.["toggle"], `${locale} is missing campaigns.folders.toggle`);
|
||||||
|
}
|
||||||
|
});
|
||||||
@@ -65,8 +65,9 @@ test("the item routes accept the icon and upload one", () => {
|
|||||||
|
|
||||||
test("the item info window is registered and opens on a sidebar click", () => {
|
test("the item info window is registered and opens on a sidebar click", () => {
|
||||||
assert.match(windowDefsSource, /item_sheet:\s*{\s*title:[^}]*ItemSheetWindow\.vue/s);
|
assert.match(windowDefsSource, /item_sheet:\s*{\s*title:[^}]*ItemSheetWindow\.vue/s);
|
||||||
// clicking (or Enter/Space on) an item row opens the window instead of expanding inline
|
// clicking (or Enter/Space on) an item row opens the window instead of expanding inline.
|
||||||
assert.match(sidebarSource, /v-for="item in items"[^>]*@click="openItemSheet\(item\)"/);
|
// The rows come from the item list's folder tree, so the row holds the item.
|
||||||
|
assert.match(sidebarSource, /v-for="row in entryRows\.item\.value"[\s\S]*?@click="openItemSheet\(row\.item\)"/);
|
||||||
assert.match(sidebarSource, /CreateWindow\(['"]item_sheet['"],\s*\{ item \}\)/);
|
assert.match(sidebarSource, /CreateWindow\(['"]item_sheet['"],\s*\{ item \}\)/);
|
||||||
assert.doesNotMatch(sidebarSource, /toggleEntryDetails/);
|
assert.doesNotMatch(sidebarSource, /toggleEntryDetails/);
|
||||||
});
|
});
|
||||||
|
|||||||
217
tests/manage-accounts.test.js
Normal file
217
tests/manage-accounts.test.js
Normal file
@@ -0,0 +1,217 @@
|
|||||||
|
// Tests for "Manage accounts" of Syndria98/dragonroll#51: the button on the settings window's site
|
||||||
|
// administration tab opened a window type (`account_management`) that was never registered in
|
||||||
|
// `WindowDefinitions.js`, so `getComponent` dereferenced `defWindows[type].component` on `undefined` —
|
||||||
|
// `can't access property "component", (intermediate value)[type] is undefined` — instead of opening
|
||||||
|
// anything. The window is the site administration screen now (list accounts, create one, grant or
|
||||||
|
// take administrator rights, delete one), guarded on the backend by the `isAdmin` middleware.
|
||||||
|
//
|
||||||
|
// Like tests/settings-window.test.js, the window wiring is read from the sources; the window registry
|
||||||
|
// is also checked against every window type the frontend opens, which is what catches this class of
|
||||||
|
// bug before the click does.
|
||||||
|
//
|
||||||
|
// Run with `npm test` from the repository root, or `node --test tests/`.
|
||||||
|
|
||||||
|
const { test } = require("node:test");
|
||||||
|
const assert = require("node:assert/strict");
|
||||||
|
const fs = require("node:fs");
|
||||||
|
const path = require("node:path");
|
||||||
|
|
||||||
|
const read = (...parts) => fs.readFileSync(path.join(__dirname, "..", ...parts), "utf8");
|
||||||
|
|
||||||
|
const frontendApp = path.join(__dirname, "..", "frontend", "app");
|
||||||
|
const windowDefsSource = read("frontend", "app", "services", "WindowDefinitions.js");
|
||||||
|
const settingsWindowSource = read("frontend", "app", "components", "windows", "SettingsWindow.vue");
|
||||||
|
const accountsWindowSource = read("frontend", "app", "components", "windows", "AccountManagementWindow.vue");
|
||||||
|
const userRouteSource = read("backend", "src", "routes", "user.js");
|
||||||
|
|
||||||
|
// -- the window registry -------------------------------------------------------
|
||||||
|
|
||||||
|
// Top-level entries of `defWindows`: every entry sits at 2 spaces, its contents at 4+.
|
||||||
|
function registryEntries() {
|
||||||
|
const header = /^ {2}([A-Za-z_]\w*):\s*\{/gm;
|
||||||
|
const marks = [];
|
||||||
|
let match;
|
||||||
|
while ((match = header.exec(windowDefsSource))) marks.push({ type: match[1], index: match.index });
|
||||||
|
assert.ok(marks.length > 0, "expected window definitions to register windows");
|
||||||
|
|
||||||
|
const entries = {};
|
||||||
|
marks.forEach((mark, i) => {
|
||||||
|
const end = i + 1 < marks.length ? marks[i + 1].index : windowDefsSource.length;
|
||||||
|
entries[mark.type] = windowDefsSource.slice(mark.index, end);
|
||||||
|
});
|
||||||
|
return entries;
|
||||||
|
}
|
||||||
|
|
||||||
|
function* sourceFiles(dir) {
|
||||||
|
for (const entry of fs.readdirSync(dir, { withFileTypes: true })) {
|
||||||
|
const full = path.join(dir, entry.name);
|
||||||
|
if (entry.isDirectory()) yield* sourceFiles(full);
|
||||||
|
else if (/\.(vue|js|ts)$/.test(entry.name)) yield full;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
test("account_management is a registered window with a component on disk", () => {
|
||||||
|
const entries = registryEntries();
|
||||||
|
const definition = entries["account_management"];
|
||||||
|
assert.ok(definition, "account_management must be registered or getComponent opens undefined");
|
||||||
|
assert.match(definition, /AccountManagementWindow\.vue/);
|
||||||
|
const component = path.join(frontendApp, "components", "windows", "AccountManagementWindow.vue");
|
||||||
|
assert.ok(fs.existsSync(component), "the window component file must exist");
|
||||||
|
});
|
||||||
|
|
||||||
|
test("no window is opened with a type that is not registered", () => {
|
||||||
|
const registered = registryEntries();
|
||||||
|
// The type is the first string argument of CreateWindow; CreateChildWindow takes a parent
|
||||||
|
// (GetFirstWindowId('main_menu')-style, a registered type itself) before the type. Data
|
||||||
|
// objects after it hold strings that mean nothing to the registry, so they stay unmatched.
|
||||||
|
const createWindow = /CreateWindow\(\s*['"]([a-z_]+)['"]/g;
|
||||||
|
const createChildWindow = /CreateChildWindow\(\s*(?:GetFirstWindowId\(\s*['"]([a-z_]+)['"]\s*\)|[a-z_]+)\s*,\s*['"]([a-z_]+)['"]/g;
|
||||||
|
|
||||||
|
for (const file of sourceFiles(frontendApp)) {
|
||||||
|
const source = fs.readFileSync(file, "utf8");
|
||||||
|
const found = [...source.matchAll(createWindow), ...source.matchAll(createChildWindow)];
|
||||||
|
for (const match of found) {
|
||||||
|
for (const type of match.slice(1)) {
|
||||||
|
if (!type) continue;
|
||||||
|
assert.ok(
|
||||||
|
registered[type],
|
||||||
|
`${path.relative(frontendApp, file)} opens '${type}', which WindowDefinitions.js does not define`
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
test("every registered window points at a component file that exists", () => {
|
||||||
|
for (const [type, definition] of Object.entries(registryEntries())) {
|
||||||
|
const imported = /import\(['"]([^'"]+)['"]\)/.exec(definition)?.[1];
|
||||||
|
assert.ok(imported, `${type} must import a component`);
|
||||||
|
const file = path.join(frontendApp, imported.replace(/^~\//, ""));
|
||||||
|
assert.ok(fs.existsSync(file), `${type} points at ${imported}, which is not there`);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
// -- opening it from the settings window ----------------------------------------
|
||||||
|
|
||||||
|
const openManageAccounts = /function OpenManageAccounts\(\)\s*\{[\s\S]*?\n\}/.exec(settingsWindowSource)?.[0];
|
||||||
|
|
||||||
|
test("the settings tab opens the account window and can come back", () => {
|
||||||
|
assert.ok(openManageAccounts, "expected an OpenManageAccounts in the settings window");
|
||||||
|
assert.match(openManageAccounts, /CreateWindow\(\s*'account_management'/);
|
||||||
|
// ClearWindow takes a selector object; a bare string matched neither `selector.type` nor
|
||||||
|
// `selector.id` and closed nothing, leaving both windows stacked.
|
||||||
|
assert.match(openManageAccounts, /ClearWindow\(\s*\{\s*type:\s*'settings'\s*\}\s*\)/);
|
||||||
|
assert.match(openManageAccounts, /ClearWindow\(\s*\{\s*type:\s*'account_management'\s*\}\s*\)/);
|
||||||
|
assert.match(openManageAccounts, /CreateWindow\(\s*'settings'/, "back returns to the settings window");
|
||||||
|
assert.doesNotMatch(settingsWindowSource, /ClearWindow\(\s*['"]/g, "no ClearWindow call may pass a bare string");
|
||||||
|
});
|
||||||
|
|
||||||
|
// -- the account management window ------------------------------------------------
|
||||||
|
|
||||||
|
test("the account window talks to the account management endpoints", () => {
|
||||||
|
assert.match(accountsWindowSource, /Server\(\)\.get\(['"]\/user\/list['"]/);
|
||||||
|
assert.match(accountsWindowSource, /Server\(\)\.post\(['"]\/user\/create['"]/);
|
||||||
|
assert.match(accountsWindowSource, /Server\(\)\.post\(['"]\/user\/set-admin['"]/);
|
||||||
|
assert.match(accountsWindowSource, /Server\(\)\.post\(['"]\/user\/delete['"]/);
|
||||||
|
});
|
||||||
|
|
||||||
|
test("the window closes the switches on the row of the admin using it", () => {
|
||||||
|
// The server answers the same way to anybody who still posts it (see below); the row just
|
||||||
|
// does not invite the attempt.
|
||||||
|
assert.match(accountsWindowSource, /v-if="!IsSelf\(user\)"/);
|
||||||
|
assert.match(accountsWindowSource, /GetUser\(\)\?\._id/);
|
||||||
|
});
|
||||||
|
|
||||||
|
// -- the backend routes -----------------------------------------------------------
|
||||||
|
|
||||||
|
function routeDeclaration(method, route) {
|
||||||
|
const declaration = new RegExp(`router\\.${method}\\(['"]${route}['"][^\\n]*`).exec(userRouteSource)?.[0];
|
||||||
|
assert.ok(declaration, `expected a ${method.toUpperCase()} ${route} route`);
|
||||||
|
// /api/user is mounted before the JWT guard: without inline authentication the route would
|
||||||
|
// be public to any request (landmine 5 of AGENTS.md), and only an admin may manage accounts.
|
||||||
|
assert.match(declaration, /passport\.authenticate\(['"]jwt['"]/);
|
||||||
|
assert.match(declaration, /isAdmin/, `${route} may only be answered for an administrator`);
|
||||||
|
return declaration;
|
||||||
|
}
|
||||||
|
|
||||||
|
function routeBlock(method, route) {
|
||||||
|
const start = userRouteSource.indexOf(`router.${method}('${route}'`);
|
||||||
|
assert.ok(start !== -1, `expected a ${method.toUpperCase()} ${route} route`);
|
||||||
|
const next = userRouteSource.indexOf(`\nrouter.`, start + 1);
|
||||||
|
return userRouteSource.slice(start, next === -1 ? userRouteSource.length : next);
|
||||||
|
}
|
||||||
|
|
||||||
|
test("GET /user/list answers the accounts without passwords or setup codes", () => {
|
||||||
|
routeDeclaration("get", "/list");
|
||||||
|
assert.match(routeBlock("get", "/list"), /select\(['"]-password -setupCode['"]\)/);
|
||||||
|
});
|
||||||
|
|
||||||
|
test("POST /user/create stores a hashed password and refuses duplicates", () => {
|
||||||
|
const block = routeBlock("post", "/create");
|
||||||
|
assert.match(block, /bcrypt\.hash\(password/, "the password must not go in as it came");
|
||||||
|
assert.match(block, /register\.errors\.email-username-exists/, "duplicates answer with the register message");
|
||||||
|
assert.doesNotMatch(block, /setupCode/, "no half-finished setup account is invented here");
|
||||||
|
});
|
||||||
|
|
||||||
|
for (const route of ["/set-admin", "/delete"]) {
|
||||||
|
test(`POST /user${route} refuses to act on the admin that is asking`, () => {
|
||||||
|
routeDeclaration("post", route);
|
||||||
|
const block = routeBlock("post", route);
|
||||||
|
assert.match(block, /String\(req\.user\._id\) === String\(id\)/, "an admin keeps their own account closed");
|
||||||
|
assert.match(block, /errors\.internal/);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
// -- i18n --------------------------------------------------------------------------
|
||||||
|
|
||||||
|
test("every locale titles the account window and names its strings", () => {
|
||||||
|
const required = [
|
||||||
|
"accounts.you",
|
||||||
|
"accounts.admin",
|
||||||
|
"accounts.make-admin",
|
||||||
|
"accounts.remove-admin",
|
||||||
|
"accounts.delete",
|
||||||
|
"accounts.new-account",
|
||||||
|
"accounts.name",
|
||||||
|
"accounts.username",
|
||||||
|
"accounts.email",
|
||||||
|
"accounts.password",
|
||||||
|
"accounts.create",
|
||||||
|
"accounts.created",
|
||||||
|
"accounts.updated",
|
||||||
|
"accounts.deleted",
|
||||||
|
"accounts.errors.self-admin",
|
||||||
|
"accounts.errors.self-delete",
|
||||||
|
];
|
||||||
|
|
||||||
|
for (const locale of ["en", "es", "ca"]) {
|
||||||
|
const windows = JSON.parse(read("frontend", "i18n", "locales", locale, "windows.json"));
|
||||||
|
assert.ok(windows["account-management"]?.trim(), `${locale} is missing the account window title`);
|
||||||
|
|
||||||
|
const settings = JSON.parse(read("frontend", "i18n", "locales", locale, "settings.json"));
|
||||||
|
assert.ok(settings["site-administration"]?.["manage-accounts"]?.trim(), `${locale} is missing manage accounts`);
|
||||||
|
for (const key of required) {
|
||||||
|
const value = key.split(".").reduce((node, part) => node?.[part], settings["site-administration"]);
|
||||||
|
assert.ok(value?.trim(), `${locale} is missing settings.site-administration.${key}`);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
test("every accounts string the window translates exists in every locale", () => {
|
||||||
|
// $t keys with nothing to translate fall back to the key itself, so every accounts key the
|
||||||
|
// window uses has to be carried by every locale. (`errors.internal` is the envelope fallback
|
||||||
|
// every window toasts the same way and stays out of it.)
|
||||||
|
const used = [...new Set(
|
||||||
|
[...accountsWindowSource.matchAll(/\$t\(\s*['"](settings\.site-administration\.accounts\.[\w.-]+)['"]/g)]
|
||||||
|
.map((key) => key[1])
|
||||||
|
)];
|
||||||
|
assert.ok(used.length >= 14, `expected the window's translated strings, found ${used.length}`);
|
||||||
|
|
||||||
|
for (const locale of ["en", "es", "ca"]) {
|
||||||
|
const settings = JSON.parse(read("frontend", "i18n", "locales", locale, "settings.json"));
|
||||||
|
for (const key of used) {
|
||||||
|
const value = key.split(".").slice(1).reduce((node, part) => node?.[part], settings);
|
||||||
|
assert.ok(typeof value === "string" && value.trim(), `${locale} is missing ${key}`);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
@@ -85,6 +85,9 @@ function loadMapRoutes({ ownsCampaign = true, maps = [], notes = [] } = {}) {
|
|||||||
},
|
},
|
||||||
// The pins do not ask after actors, only the token routes below do.
|
// The pins do not ask after actors, only the token routes below do.
|
||||||
"../models/Actor": { findOne: () => mongooseQuery(null) },
|
"../models/Actor": { findOne: () => mongooseQuery(null) },
|
||||||
|
// The map list's own folder tree: `/list` reads it and `/update` checks a move
|
||||||
|
// against it, so the pins need the model to answer, never what it answers.
|
||||||
|
"../models/Folder": { find: () => mongooseQuery([]), belongsToSection: async () => true },
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -181,7 +184,12 @@ function loadNoteRoutes({ ownsCampaign = true, notes = [], folders = [], deleted
|
|||||||
findById: (id) => mongooseQuery(notes.find((note) => note._id === id) ?? null),
|
findById: (id) => mongooseQuery(notes.find((note) => note._id === id) ?? null),
|
||||||
deleteOne: () => mongooseQuery({ deletedCount }),
|
deleteOne: () => mongooseQuery({ deletedCount }),
|
||||||
},
|
},
|
||||||
"../models/Folder": { find: () => mongooseQuery(folders) },
|
"../models/Folder": {
|
||||||
|
find: () => mongooseQuery(folders),
|
||||||
|
// models/Folder.js: the note tree is every folder that is not one of the other
|
||||||
|
// campaign lists, whose rows carry no target at all.
|
||||||
|
filterForTarget: (target) => (target === "note" ? { target: { $nin: ["actor", "item", "map"] } } : { target }),
|
||||||
|
},
|
||||||
"../models/Map": {
|
"../models/Map": {
|
||||||
// The driver drops the pins of the note from every map holding one; what is worth
|
// The driver drops the pins of the note from every map holding one; what is worth
|
||||||
// keeping here is the filter it is asked to do that with.
|
// keeping here is the filter it is asked to do that with.
|
||||||
|
|||||||
@@ -82,6 +82,9 @@ function loadMapRoutes({ ownsCampaign = true, maps = [], actors = [] } = {}) {
|
|||||||
: null
|
: null
|
||||||
),
|
),
|
||||||
},
|
},
|
||||||
|
// The map list's own folder tree: `/list` reads it and `/update` checks a move
|
||||||
|
// against it, so the tokens need the model to answer, never what it answers.
|
||||||
|
"../models/Folder": { find: () => mongooseQuery([]), belongsToSection: async () => true },
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -188,6 +191,8 @@ function loadActorRoutes({ ownsCampaign = true, actors = [], deletedCount = 1 }
|
|||||||
return { modifiedCount: 1 };
|
return { modifiedCount: 1 };
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
// The actor list's own folder tree, which the delete does not ask after.
|
||||||
|
"../models/Folder": { find: () => mongooseQuery([]), belongsToSection: async () => true },
|
||||||
});
|
});
|
||||||
return { api, tokensPulled };
|
return { api, tokensPulled };
|
||||||
}
|
}
|
||||||
@@ -299,10 +304,14 @@ function mapViewerTokenWiringTests() {
|
|||||||
const sidebar = readRepoFile("frontend", "app", "components", "partials", "ContentSidebar.vue");
|
const sidebar = readRepoFile("frontend", "app", "components", "partials", "ContentSidebar.vue");
|
||||||
|
|
||||||
test("an actor row of the sidebar can be dragged out of it", () => {
|
test("an actor row of the sidebar can be dragged out of it", () => {
|
||||||
const actorRow = /<div v-for="actor in actors"[^>]*>/.exec(sidebar)?.[0];
|
// The actors' block of the sidebar: since the entry lists got their folders the rows
|
||||||
|
// come from that tree, so the actor row holds its actor as `row.item`.
|
||||||
|
const actorSection = /<template v-else-if="activeSection === 'actors'">([\s\S]*?)<\/template>\s*\n\s*<template v-else-if="activeSection === 'items'">/
|
||||||
|
.exec(sidebar)?.[1] ?? "";
|
||||||
|
const actorRow = /<div v-else class="entity-entry"[^>]*>/.exec(actorSection)?.[0];
|
||||||
assert.ok(actorRow, "expected the actor rows of the sidebar");
|
assert.ok(actorRow, "expected the actor rows of the sidebar");
|
||||||
assert.match(actorRow, /draggable="true"/);
|
assert.match(actorRow, /draggable="true"/);
|
||||||
assert.match(actorRow, /@dragstart="startActorDrag\(\$event, actor\)"/);
|
assert.match(actorRow, /@dragstart="startActorDrag\(\$event, row\.item\)"/);
|
||||||
assert.match(sidebar, /setData\(ACTOR_DRAG_TYPE, String\(actor\._id\)\)/);
|
assert.match(sidebar, /setData\(ACTOR_DRAG_TYPE, String\(actor\._id\)\)/);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
136
tests/remember-me.test.js
Normal file
136
tests/remember-me.test.js
Normal file
@@ -0,0 +1,136 @@
|
|||||||
|
// Tests for the "remember me" checkbox of Syndria98/dragonroll#48: the login form lets the user keep
|
||||||
|
// the session on the device, and a login without it ends when the browser does.
|
||||||
|
//
|
||||||
|
// `frontend/app/services/TokenStore.js` is dependency-free ESM, so it is imported for real against
|
||||||
|
// stubbed browser storages; the flow around it is checked in the sources the same way
|
||||||
|
// `tests/sidebar-entity-entry.test.js` reads its component.
|
||||||
|
//
|
||||||
|
// Run with `npm test` from the repository root, or `node --test tests/`.
|
||||||
|
|
||||||
|
const { test } = require("node:test");
|
||||||
|
const assert = require("node:assert/strict");
|
||||||
|
const fs = require("node:fs");
|
||||||
|
const path = require("node:path");
|
||||||
|
const { pathToFileURL } = require("node:url");
|
||||||
|
|
||||||
|
function readSource(...parts) {
|
||||||
|
return fs.readFileSync(path.join(__dirname, "..", ...parts), "utf8");
|
||||||
|
}
|
||||||
|
|
||||||
|
const loginWindow = readSource("frontend", "app", "components", "windows", "LoginWindow.vue");
|
||||||
|
const serviceLink = readSource("frontend", "app", "components", "views", "ServiceLinkAuthorize.vue");
|
||||||
|
const user = readSource("frontend", "app", "services", "User.js");
|
||||||
|
const server = readSource("frontend", "app", "services", "Server.js");
|
||||||
|
const backendUser = readSource("backend", "src", "routes", "user.js");
|
||||||
|
|
||||||
|
// -- the token store, for real ------------------------------------------------
|
||||||
|
|
||||||
|
function fakeStorage() {
|
||||||
|
const entries = new Map();
|
||||||
|
return {
|
||||||
|
getItem: (key) => (entries.has(key) ? entries.get(key) : null),
|
||||||
|
setItem: (key, value) => entries.set(key, String(value)),
|
||||||
|
removeItem: (key) => entries.delete(key),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
async function loadTokenStore() {
|
||||||
|
const store = await import(
|
||||||
|
pathToFileURL(path.join(__dirname, "..", "frontend", "app", "services", "TokenStore.js")).href
|
||||||
|
);
|
||||||
|
// The module only touches the storages inside its functions, so fresh stubs per test are enough.
|
||||||
|
globalThis.localStorage = fakeStorage();
|
||||||
|
globalThis.sessionStorage = fakeStorage();
|
||||||
|
return store;
|
||||||
|
}
|
||||||
|
|
||||||
|
test("a remembered login keeps the token in localStorage", async () => {
|
||||||
|
const { GetToken, SetToken } = await loadTokenStore();
|
||||||
|
|
||||||
|
SetToken("tok", true);
|
||||||
|
assert.equal(GetToken(), "tok");
|
||||||
|
assert.equal(globalThis.localStorage.getItem("token"), "tok");
|
||||||
|
assert.equal(globalThis.sessionStorage.getItem("token"), null);
|
||||||
|
});
|
||||||
|
|
||||||
|
test("a login without remember keeps the token only for the browser session", async () => {
|
||||||
|
const { GetToken, SetToken } = await loadTokenStore();
|
||||||
|
|
||||||
|
SetToken("tok", false);
|
||||||
|
assert.equal(GetToken(), "tok");
|
||||||
|
assert.equal(globalThis.sessionStorage.getItem("token"), "tok");
|
||||||
|
// Closing the browser clears sessionStorage, so the session ends with it.
|
||||||
|
assert.equal(globalThis.localStorage.getItem("token"), null);
|
||||||
|
});
|
||||||
|
|
||||||
|
test("a new login replaces the token instead of leaving it in the other store", async () => {
|
||||||
|
const { GetToken, SetToken, ClearToken } = await loadTokenStore();
|
||||||
|
|
||||||
|
SetToken("remembered", true);
|
||||||
|
SetToken("session", false);
|
||||||
|
assert.equal(globalThis.localStorage.getItem("token"), null);
|
||||||
|
assert.equal(GetToken(), "session");
|
||||||
|
|
||||||
|
ClearToken();
|
||||||
|
SetToken("remembered", true);
|
||||||
|
SetToken("session", false);
|
||||||
|
SetToken("remembered-again", true);
|
||||||
|
assert.equal(globalThis.sessionStorage.getItem("token"), null);
|
||||||
|
assert.equal(GetToken(), "remembered-again");
|
||||||
|
});
|
||||||
|
|
||||||
|
test("clearing the token empties both stores", async () => {
|
||||||
|
const { GetToken, ClearToken } = await loadTokenStore();
|
||||||
|
|
||||||
|
globalThis.localStorage.setItem("token", "leftover-remembered");
|
||||||
|
globalThis.sessionStorage.setItem("token", "leftover-session");
|
||||||
|
ClearToken();
|
||||||
|
assert.equal(globalThis.localStorage.getItem("token"), null);
|
||||||
|
assert.equal(globalThis.sessionStorage.getItem("token"), null);
|
||||||
|
assert.equal(GetToken(), null);
|
||||||
|
});
|
||||||
|
|
||||||
|
// -- the login form ------------------------------------------------------------
|
||||||
|
|
||||||
|
test("the login form has a remember-me checkbox wired to the login", () => {
|
||||||
|
assert.match(loginWindow, /type="checkbox"[^>]*v-model="remember"/, "expected a checkbox bound to `remember`");
|
||||||
|
assert.match(loginWindow, /\$t\('login\.remember-me'\)/, "the checkbox label must be translated");
|
||||||
|
assert.match(loginWindow, /post\('\/user\/login',\s*\{[^}]*remember:\s*remember\.value/, "the login request must carry the flag");
|
||||||
|
assert.match(loginWindow, /SetUser\(\s*data\.token,\s*remember\.value\s*\)/, "the token must be stored per the flag");
|
||||||
|
});
|
||||||
|
|
||||||
|
test("every place that reads the token goes through the token store", () => {
|
||||||
|
for (const [name, source] of [["User.js", user], ["Server.js", server]]) {
|
||||||
|
assert.doesNotMatch(source, /Storage\.getItem\(\s*['"]token['"]/, `${name} must not pick a store on its own`);
|
||||||
|
assert.match(source, /from ['"]\.\/TokenStore['"]/, `${name} must import the token store`);
|
||||||
|
assert.match(source, /GetToken\(\)/, `${name} must read the token through GetToken`);
|
||||||
|
}
|
||||||
|
const logout = /function LogoutUser\(\)\s*\{([\s\S]*?)\n\}/.exec(user)?.[1];
|
||||||
|
assert.ok(logout, "expected a LogoutUser function");
|
||||||
|
assert.match(logout, /ClearToken\(\)/, "logging out must clear the token from both stores");
|
||||||
|
});
|
||||||
|
|
||||||
|
test("the service link sign-in keeps its persistent session", () => {
|
||||||
|
// That flow has no checkbox; passing remember explicitly keeps the token in localStorage as before.
|
||||||
|
assert.match(serviceLink, /SetUser\(\s*response\.data\.token,\s*true\s*\)/);
|
||||||
|
});
|
||||||
|
|
||||||
|
// -- the backend lifetime ------------------------------------------------------
|
||||||
|
|
||||||
|
test("a remembered login signs a longer-lived token", () => {
|
||||||
|
assert.match(backendUser, /const\s*\{[^}]*remember[^}]*\}\s*=\s*req\.body/, "the login must read the flag");
|
||||||
|
const expiresIn = /expiresIn:\s*([^,})]+)/.exec(backendUser)?.[1];
|
||||||
|
assert.ok(expiresIn, "expected jwt.sign to set an expiresIn");
|
||||||
|
const [long, short] = expiresIn.match(/\d+/g).map(Number);
|
||||||
|
assert.ok(long > short, `a remembered session (${long}s) must outlive a plain one (${short}s)`);
|
||||||
|
assert.equal(short, 172800, "a plain login keeps the 48 h lifetime");
|
||||||
|
});
|
||||||
|
|
||||||
|
// -- i18n ----------------------------------------------------------------------
|
||||||
|
|
||||||
|
test("the remember-me label exists in every locale", () => {
|
||||||
|
for (const lang of ["en", "es", "ca"]) {
|
||||||
|
const strings = JSON.parse(readSource("frontend", "i18n", "locales", lang, "login.json"));
|
||||||
|
assert.ok(strings["remember-me"]?.trim(), `locales/${lang}/login.json needs a remember-me string`);
|
||||||
|
}
|
||||||
|
});
|
||||||
97
tests/search-everywhere.test.js
Normal file
97
tests/search-everywhere.test.js
Normal file
@@ -0,0 +1,97 @@
|
|||||||
|
// Tests for Syndria98/dragonroll#42: the Ctrl+K search only looked at notes; it now searches the
|
||||||
|
// whole campaign — notes (nested in folders included), actors, items and maps — and selecting a
|
||||||
|
// result opens that entry the same way the campaign sidebar opens it.
|
||||||
|
//
|
||||||
|
// The repository root installs no dependencies, so these checks read the search component's
|
||||||
|
// source, like tests/map-viewer.test.js reads its window.
|
||||||
|
//
|
||||||
|
// Run with `npm test` from the repository root, or `node --test tests/`.
|
||||||
|
|
||||||
|
const { test } = require("node:test");
|
||||||
|
const assert = require("node:assert/strict");
|
||||||
|
const fs = require("node:fs");
|
||||||
|
const path = require("node:path");
|
||||||
|
|
||||||
|
const read = (...parts) => fs.readFileSync(path.join(__dirname, "..", ...parts), "utf8");
|
||||||
|
|
||||||
|
const searchSource = read("frontend", "app", "components", "viewer", "topbar", "TopSearchBar.vue");
|
||||||
|
const windowDefsSource = read("frontend", "app", "services", "WindowDefinitions.js");
|
||||||
|
|
||||||
|
test("the search fetches notes, actors, items and maps of the campaign", () => {
|
||||||
|
for (const [route, key] of [
|
||||||
|
["/note/all", "notes"],
|
||||||
|
["/actor/list", "actors"],
|
||||||
|
["/item/list", "items"],
|
||||||
|
["/map/list", "maps"],
|
||||||
|
]) {
|
||||||
|
assert.ok(searchSource.includes(`'${route}'`), `expected the search to fetch ${route}`);
|
||||||
|
assert.ok(searchSource.includes(`'${key}'`), `expected the ${route} response key '${key}' to be read`);
|
||||||
|
}
|
||||||
|
// every list is fetched scoped to the current campaign
|
||||||
|
assert.match(searchSource, /params:\s*\{\s*campaign:\s*campaignId\.value\s*\}/);
|
||||||
|
});
|
||||||
|
|
||||||
|
test("every entry list is matched against the query, accent- and case-insensitively", () => {
|
||||||
|
// one shared normalisation like the action registry's own filter uses
|
||||||
|
assert.match(searchSource, /normalize\("NFD"\)\.replace\(\/\[\\u0300-\\u036f\]\/g,\s*""\)\.toLowerCase\(\)/);
|
||||||
|
// notes by title, actors / items / maps by name
|
||||||
|
for (const call of [
|
||||||
|
String.raw`pushMatches\(notes\.value,\s*'note',\s*n => n\.title\)`,
|
||||||
|
String.raw`pushMatches\(actors\.value,\s*'actor',\s*a => a\.name\)`,
|
||||||
|
String.raw`pushMatches\(items\.value,\s*'item',\s*i => i\.name\)`,
|
||||||
|
String.raw`pushMatches\(maps\.value,\s*'map',\s*m => m\.name\)`,
|
||||||
|
]) {
|
||||||
|
assert.match(searchSource, new RegExp(call));
|
||||||
|
}
|
||||||
|
// command actions keep matching through the registry
|
||||||
|
assert.match(searchSource, /searchActions\(query \?\? ''\)/);
|
||||||
|
});
|
||||||
|
|
||||||
|
test("selecting a result opens each entry type the way the sidebar opens it", () => {
|
||||||
|
// a note opens in the note column, with its content retrieved (/note/all never carries it)
|
||||||
|
assert.match(searchSource, /get\(`\/note\/retrieve\/\$\{note\.key\}`\)/);
|
||||||
|
assert.match(searchSource, /emitter\.emit\('push-note',\s*\{ key: full\._id, title: full\.title, text: full\.content \?\? ''/);
|
||||||
|
// a character replaces the open sheet window
|
||||||
|
assert.match(searchSource, /GetFirstWindowId\('character_sheet'\)/);
|
||||||
|
assert.match(searchSource, /CreateWindow\('character_sheet',\s*\{ actor \}\)/);
|
||||||
|
// an item replaces the open item window
|
||||||
|
assert.match(searchSource, /GetFirstWindowId\('item_sheet'\)/);
|
||||||
|
assert.match(searchSource, /CreateWindow\('item_sheet',\s*\{ item \}\)/);
|
||||||
|
// a map anchors on the note container, clearing a floating viewer first
|
||||||
|
assert.match(searchSource, /GetFirstWindowId\('map_viewer'\)/);
|
||||||
|
assert.match(searchSource, /AnchorMap\(map\)/);
|
||||||
|
// a command action still executes
|
||||||
|
assert.match(searchSource, /executeAction\(item\.data\.id\)/);
|
||||||
|
|
||||||
|
// the windows these opens use are all registered
|
||||||
|
for (const type of ["character_sheet", "item_sheet"]) {
|
||||||
|
assert.match(windowDefsSource, new RegExp(`${type}:\\s*\\{`));
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
test("keyboard Enter and clicking share one dispatcher over the combined results", () => {
|
||||||
|
// a single openResult handles every type, keyed off the result's type tag
|
||||||
|
assert.match(searchSource, /function openResult\(item\)[\s\S]*item\.type === 'note'[\s\S]*item\.type === 'actor'[\s\S]*item\.type === 'item'[\s\S]*item\.type === 'map'/);
|
||||||
|
// Enter on the selected row and a click on a row both go through it
|
||||||
|
assert.match(searchSource, /if \(event\.key === 'Enter'\)[\s\S]*?openResult\(combined\[selectedIndex\.value\]\)/);
|
||||||
|
assert.match(searchSource, /@click\.stop\.prevent="openResult\(item\)"/);
|
||||||
|
});
|
||||||
|
|
||||||
|
test("the palette shows what each result is and stays fresh", () => {
|
||||||
|
// every result carries its section's icon and label
|
||||||
|
for (const icon of ["book.svg", "user.svg", "box.svg", "map.svg"]) {
|
||||||
|
assert.ok(searchSource.includes(`/icons/iconoir/regular/${icon}`), `expected an icon per entry type (${icon})`);
|
||||||
|
}
|
||||||
|
assert.match(searchSource, /t\(`campaigns\.sections\.\$\{item\.type\}s`\)/);
|
||||||
|
// the section labels come from i18n: they exist in every locale
|
||||||
|
for (const locale of ["en", "es", "ca"]) {
|
||||||
|
const campaigns = JSON.parse(read("frontend", "i18n", "locales", locale, "campaigns.json"));
|
||||||
|
for (const key of ["notes", "actors", "items", "maps"]) {
|
||||||
|
assert.ok(campaigns.sections?.[key], `${locale} is missing campaigns.sections.${key}`);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// refetched when the palette opens (Foundry syncs entries in the background)...
|
||||||
|
assert.match(searchSource, /function onFocus\(\)[\s\S]*?fetchSearchEntries\(\)/);
|
||||||
|
// ...and dropped when another campaign becomes the current one
|
||||||
|
assert.match(searchSource, /watch\(campaignId,\s*\(\)\s*=>\s*\{[^}]*notes\.value = \[\][^}]*actors\.value = \[\][^}]*items\.value = \[\][^}]*maps\.value = \[\]/);
|
||||||
|
});
|
||||||
170
tests/settings-window.test.js
Normal file
170
tests/settings-window.test.js
Normal file
@@ -0,0 +1,170 @@
|
|||||||
|
// Tests for the settings menu opened from the main menu (Syndria98/dragonroll#47): it used to show a
|
||||||
|
// "Syntax Error" instead of the menu, and the main menu did not come back after closing it.
|
||||||
|
//
|
||||||
|
// vue-i18n answers every translation with `SyntaxError: cannot support locale type` from the moment the
|
||||||
|
// locale it holds is something it has no messages for. The settings window put `GetUserSetting('lang')`
|
||||||
|
// straight into that locale, and for a user that never picked a language that is `undefined`: the server
|
||||||
|
// answers GET /user/get-settings with `settings: undefined`. The locale is global, so the one bad write
|
||||||
|
// broke every window on screen — the settings window and the main menu behind it.
|
||||||
|
//
|
||||||
|
// The repository root installs no dependencies, so the window's script is lifted out of its `<script setup>`
|
||||||
|
// block and run in a `node:vm` context with `locale` and `selectedLocale` as plain refs, the way
|
||||||
|
// tests/sidebar-section-pane.test.js loads the sidebar script. The window wiring (coming back to the main
|
||||||
|
// menu on close, the strings the menu draws) is read from the sources like tests/item-sheet-window.test.js.
|
||||||
|
//
|
||||||
|
// Run with `npm test` from the repository root, or `node --test tests/`.
|
||||||
|
|
||||||
|
const { test } = require("node:test");
|
||||||
|
const assert = require("node:assert/strict");
|
||||||
|
const fs = require("node:fs");
|
||||||
|
const path = require("node:path");
|
||||||
|
const vm = require("node:vm");
|
||||||
|
|
||||||
|
const read = (...parts) => fs.readFileSync(path.join(__dirname, "..", ...parts), "utf8");
|
||||||
|
|
||||||
|
const windowSource = read("frontend", "app", "components", "windows", "SettingsWindow.vue");
|
||||||
|
const windowDefsSource = read("frontend", "app", "services", "WindowDefinitions.js");
|
||||||
|
const userRouteSource = read("backend", "src", "routes", "user.js");
|
||||||
|
|
||||||
|
const script = /<script setup>([\s\S]*?)<\/script>/.exec(windowSource)?.[1];
|
||||||
|
|
||||||
|
// Top-level `function name(){...}` or `const name = (...) => {...}` of the script block: their bodies are
|
||||||
|
// indented, so the first `}` in column 0 closes them.
|
||||||
|
function declarationSource(name) {
|
||||||
|
assert.ok(script, "expected the settings window to have a <script setup> block");
|
||||||
|
const decl = new RegExp(`(function ${name}\\s*\\(|const ${name}\\s*=)[\\s\\S]*?\\n\\}`).exec(script)?.[0];
|
||||||
|
assert.ok(decl, `expected a top-level ${name} in the settings window script`);
|
||||||
|
return decl;
|
||||||
|
}
|
||||||
|
|
||||||
|
// The languages Dragonroll offers (frontend/i18n/locales.ts).
|
||||||
|
const LOCALES = [
|
||||||
|
{ code: "en", name: "English" },
|
||||||
|
{ code: "es", name: "Español" },
|
||||||
|
{ code: "ca", name: "Català" },
|
||||||
|
];
|
||||||
|
|
||||||
|
// The settings window with the language it is showing. `saved` collects every language the window asks the
|
||||||
|
// server to store, so a test can tell a language that was applied from one that was merely answered with.
|
||||||
|
function settingsWindow({ locale = "en" } = {}) {
|
||||||
|
const body = [
|
||||||
|
declarationSource("getLocaleFromCode"),
|
||||||
|
declarationSource("localeToShow"),
|
||||||
|
declarationSource("applyLanguage"),
|
||||||
|
declarationSource("getLocaleName"),
|
||||||
|
declarationSource("changeLocale"),
|
||||||
|
"return { localeToShow, applyLanguage, getLocaleName, changeLocale };",
|
||||||
|
].join("\n\n");
|
||||||
|
|
||||||
|
const state = {
|
||||||
|
locale: { value: locale },
|
||||||
|
selectedLocale: { value: null },
|
||||||
|
saved: [],
|
||||||
|
};
|
||||||
|
|
||||||
|
const api = vm.compileFunction(body, ["locale", "selectedLocale", "locales", "SetUserSetting"], {
|
||||||
|
parsingContext: vm.createContext({}),
|
||||||
|
})(
|
||||||
|
state.locale,
|
||||||
|
state.selectedLocale,
|
||||||
|
LOCALES,
|
||||||
|
(key, value) => state.saved.push([key, value])
|
||||||
|
);
|
||||||
|
|
||||||
|
return Object.assign(state, api);
|
||||||
|
}
|
||||||
|
|
||||||
|
test("a user without a stored language keeps the one on screen", () => {
|
||||||
|
const settings = settingsWindow({ locale: "en" });
|
||||||
|
// What GetUserSetting('lang') answers for a user that never picked a language: the server has no
|
||||||
|
// settings for them at all.
|
||||||
|
settings.applyLanguage(undefined);
|
||||||
|
|
||||||
|
assert.equal(settings.locale.value, "en", "the language on screen must not be replaced by nothing");
|
||||||
|
assert.equal(typeof settings.locale.value, "string", "vue-i18n only takes a locale it knows a type for");
|
||||||
|
});
|
||||||
|
|
||||||
|
test("a stored language Dragonroll does not offer is not applied either", () => {
|
||||||
|
for (const stored of ["", null, "fr", "en-US", 0, {}]) {
|
||||||
|
const settings = settingsWindow({ locale: "en" });
|
||||||
|
settings.applyLanguage(stored);
|
||||||
|
assert.equal(settings.locale.value, "en", `${String(stored)} is no language vue-i18n takes`);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
test("the stored language is applied when it is one of the offered ones", () => {
|
||||||
|
for (const [code, name] of [["es", "Español"], ["ca", "Català"]]) {
|
||||||
|
const settings = settingsWindow({ locale: "en" });
|
||||||
|
assert.equal(settings.applyLanguage(code), true, `${code} must be applied`);
|
||||||
|
assert.equal(settings.locale.value, code);
|
||||||
|
assert.equal(settings.selectedLocale.value.name, name, "the dropdown shows the language applied");
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
test("the dropdown always shows a language, and never one the window has not got", () => {
|
||||||
|
const settings = settingsWindow({ locale: "en" });
|
||||||
|
assert.deepEqual(settings.localeToShow(undefined), LOCALES[0], "no language stored: the first one is shown");
|
||||||
|
assert.deepEqual(settings.localeToShow("de"), LOCALES[0], "an unknown code shows the same language");
|
||||||
|
assert.deepEqual(settings.localeToShow("ca"), LOCALES[2]);
|
||||||
|
assert.match(
|
||||||
|
script,
|
||||||
|
/const selectedLocale = ref\(localeToShow\(locale\.value\)\)/,
|
||||||
|
"the dropdown starts on the language being shown instead of on an empty row"
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
test("the dropdown label survives a language that is not there", () => {
|
||||||
|
const settings = settingsWindow();
|
||||||
|
assert.equal(settings.getLocaleName(undefined), "");
|
||||||
|
assert.equal(settings.getLocaleName(LOCALES[1]), "Español");
|
||||||
|
});
|
||||||
|
|
||||||
|
test("picking a language saves it, and picking nothing saves nothing", () => {
|
||||||
|
const settings = settingsWindow();
|
||||||
|
settings.changeLocale(LOCALES[2]);
|
||||||
|
assert.deepEqual(settings.saved, [["lang", "ca"]]);
|
||||||
|
assert.equal(settings.locale.value, "ca");
|
||||||
|
|
||||||
|
const nothing = settingsWindow();
|
||||||
|
nothing.changeLocale(undefined);
|
||||||
|
assert.deepEqual(nothing.saved, [], "a language that was not applied is not saved either");
|
||||||
|
assert.equal(nothing.locale.value, "en");
|
||||||
|
});
|
||||||
|
|
||||||
|
test("the window never hands the server's answer to vue-i18n directly", () => {
|
||||||
|
assert.match(script, /GetUserSetting\(['"]lang['"]\)/, "the stored language is still read from the server");
|
||||||
|
assert.match(
|
||||||
|
script,
|
||||||
|
/GetUserSetting\(['"]lang['"]\)\s*\.then\(\s*\(value\) => applyLanguage\(value\)\s*\)/,
|
||||||
|
"it goes through applyLanguage, which only accepts a language Dragonroll offers"
|
||||||
|
);
|
||||||
|
const writes = [...script.matchAll(/locale\.value\s*=\s*([^;]+);/g)].map((write) => write[1].trim());
|
||||||
|
assert.deepEqual(writes, ["stored.code"], "only a language looked up in the offered list reaches vue-i18n");
|
||||||
|
assert.match(script, /\.catch\(/, "a settings request that fails leaves the language alone");
|
||||||
|
});
|
||||||
|
|
||||||
|
test("GET /user/get-settings answers without a settings object for a user that saved none", () => {
|
||||||
|
// The window has to cope with what this answers: the reason #47 shows up for every fresh account.
|
||||||
|
assert.match(userRouteSource, /router\.get\(['"]\/get-settings['"]/);
|
||||||
|
assert.match(userRouteSource, /settings: data\.settings/);
|
||||||
|
});
|
||||||
|
|
||||||
|
test("closing the settings window goes back to the main menu", () => {
|
||||||
|
const definition = /^\s{2}settings:\s*\{[\s\S]*?\n \},/m.exec(windowDefsSource)?.[0];
|
||||||
|
assert.ok(definition, "expected the settings window to be registered");
|
||||||
|
assert.match(definition, /SettingsWindow\.vue/);
|
||||||
|
assert.match(definition, /ClearWindow\(\s*\{\s*type:\s*['"]settings['"]\s*\}\s*\)/);
|
||||||
|
assert.match(definition, /CreateWindow\(\s*['"]main_menu['"]\s*\)/);
|
||||||
|
});
|
||||||
|
|
||||||
|
test("every locale names the settings menu and its tabs", () => {
|
||||||
|
for (const locale of ["en", "es", "ca"]) {
|
||||||
|
const settings = JSON.parse(read("frontend", "i18n", "locales", locale, "settings.json"));
|
||||||
|
assert.ok(settings.tabs?.["account-settings"], `${locale} is missing the account settings tab`);
|
||||||
|
assert.ok(settings.tabs?.["site-administration"], `${locale} is missing the site administration tab`);
|
||||||
|
assert.ok(settings["account-settings"]?.language, `${locale} is missing the language label`);
|
||||||
|
assert.ok(settings["site-administration"]?.["manage-accounts"], `${locale} is missing manage accounts`);
|
||||||
|
const windows = JSON.parse(read("frontend", "i18n", "locales", locale, "windows.json"));
|
||||||
|
assert.ok(windows.settings, `${locale} is missing the settings window title`);
|
||||||
|
}
|
||||||
|
});
|
||||||
Reference in New Issue
Block a user