Compare commits
10 Commits
cd741880ac
...
ai/issue-6
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d8900cfb7f | ||
| 20128d195b | |||
| d901385900 | |||
|
|
2add9e7cb8 | ||
| fe63bd15f3 | |||
| 733e7ef193 | |||
| d566388fc6 | |||
| 86e1d34beb | |||
|
|
7e1ed4475e | ||
|
|
0c6026aea8 |
@@ -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();
|
||||||
@@ -1000,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 || "",
|
||||||
},
|
},
|
||||||
@@ -1036,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 || "",
|
||||||
@@ -1052,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 } });
|
||||||
@@ -1110,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({
|
||||||
@@ -1137,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);
|
||||||
}
|
}
|
||||||
@@ -1183,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 {
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ import { AnchorMap, AnchoredMap, ClearAnchoredMap, SetActivePane } from '~/servi
|
|||||||
import { emitter } from '~/services/Emitter';
|
import { emitter } from '~/services/Emitter';
|
||||||
import { BuildColorMenu } from '~/services/EntryColors';
|
import { BuildColorMenu } from '~/services/EntryColors';
|
||||||
import { BuildItemRows } from '~/services/ItemFolders';
|
import { BuildItemRows } from '~/services/ItemFolders';
|
||||||
import Server from '~/services/Server';
|
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';
|
||||||
@@ -283,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 });
|
||||||
}
|
}
|
||||||
@@ -670,9 +677,11 @@ onBeforeUnmount(() => {
|
|||||||
@toggle="toggleFolder(row.folder._id)"
|
@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')">
|
<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-name-row">
|
<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 class="entity-entry-name">{{ row.item.name }}</span>
|
||||||
<span v-if="row.item.foundryItemId" class="entity-entry-sync">{{ t('campaigns.synced') }}</span>
|
|
||||||
</span>
|
</span>
|
||||||
<span class="entity-entry-meta">{{ itemSummary(row.item) }}</span>
|
<span class="entity-entry-meta">{{ itemSummary(row.item) }}</span>
|
||||||
</div>
|
</div>
|
||||||
@@ -865,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 {
|
||||||
|
|||||||
@@ -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,7 +217,9 @@ 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 class="sheet-content">
|
||||||
|
<main v-show="activeTab === 'abilities'" class="sheet-grid">
|
||||||
<div v-if="form.image || editing" class="sheet-portrait" :class="{ empty: !form.image }">
|
<div v-if="form.image || editing" class="sheet-portrait" :class="{ empty: !form.image }">
|
||||||
<img v-if="form.image" :src="imageUrl" :alt="$t('campaigns.character-sheet.photo')">
|
<img v-if="form.image" :src="imageUrl" :alt="$t('campaigns.character-sheet.photo')">
|
||||||
<button v-if="editing && !form.image" class="portrait-upload" type="button" :disabled="uploadingPhoto" @click="pickPhoto">
|
<button v-if="editing && !form.image" class="portrait-upload" type="button" :disabled="uploadingPhoto" @click="pickPhoto">
|
||||||
@@ -256,19 +268,9 @@ async function saveSheet() {
|
|||||||
<textarea v-if="editing" v-model="form.proficiencies" rows="5" :placeholder="$t('campaigns.character-sheet.proficiencies-placeholder')" />
|
<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>
|
<p v-else class="sheet-copy">{{ form.proficiencies || $t('campaigns.character-sheet.empty-proficiencies') }}</p>
|
||||||
</section>
|
</section>
|
||||||
|
</main>
|
||||||
|
|
||||||
<section class="sheet-panel traits-panel">
|
<main v-show="activeTab === 'inventory'" class="sheet-tab-body">
|
||||||
<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">
|
<section class="sheet-panel inventory-panel">
|
||||||
<div class="panel-title-row">
|
<div class="panel-title-row">
|
||||||
<h2>{{ $t('campaigns.character-sheet.inventory') }}</h2>
|
<h2>{{ $t('campaigns.character-sheet.inventory') }}</h2>
|
||||||
@@ -302,6 +304,37 @@ async function saveSheet() {
|
|||||||
</div>
|
</div>
|
||||||
</section>
|
</section>
|
||||||
</main>
|
</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>
|
||||||
|
|
||||||
|
<nav class="sheet-tabs" role="tablist" aria-orientation="vertical">
|
||||||
|
<button
|
||||||
|
v-for="tab in tabs"
|
||||||
|
:key="tab.key"
|
||||||
|
class="sheet-tab"
|
||||||
|
:class="{ active: activeTab === tab.key }"
|
||||||
|
type="button"
|
||||||
|
role="tab"
|
||||||
|
:aria-selected="activeTab === tab.key"
|
||||||
|
@click="activeTab = tab.key"
|
||||||
|
>{{ $t(tab.label) }}</button>
|
||||||
|
</nav>
|
||||||
|
</div>
|
||||||
</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>
|
||||||
|
|||||||
@@ -105,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",
|
||||||
|
|||||||
@@ -109,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",
|
||||||
|
|||||||
@@ -105,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",
|
||||||
|
|||||||
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}`);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
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");
|
||||||
|
});
|
||||||
@@ -55,7 +55,7 @@ function matches(document, filter = {}) {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
function fakeModel(table, seed = []) {
|
function fakeModel(table, seed = [], campaignId) {
|
||||||
const rows = [];
|
const rows = [];
|
||||||
let counter = 0;
|
let counter = 0;
|
||||||
|
|
||||||
@@ -74,7 +74,9 @@ function fakeModel(table, seed = []) {
|
|||||||
Object.defineProperty(Document.prototype, "id", { get() { return this._id; } });
|
Object.defineProperty(Document.prototype, "id", { get() { return this._id; } });
|
||||||
|
|
||||||
for (const data of seed) {
|
for (const data of seed) {
|
||||||
const row = new Document({ [table === "folder" ? "target" : "name"]: undefined, ...data });
|
// 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;
|
row.isNew = false;
|
||||||
rows.push(row);
|
rows.push(row);
|
||||||
}
|
}
|
||||||
@@ -121,13 +123,16 @@ function loadSyncRoute({ seed = {}, worldId = "world-1" } = {}) {
|
|||||||
};
|
};
|
||||||
const campaign = { _id: "campaign-1", id: "campaign-1", name: "Test Campaign", foundryWorldId: worldId };
|
const campaign = { _id: "campaign-1", id: "campaign-1", name: "Test Campaign", foundryWorldId: worldId };
|
||||||
const models = {
|
const models = {
|
||||||
"../models/Actor": fakeModel("actor", seed.actors),
|
"../models/Actor": fakeModel("actor", seed.actors, campaign.id),
|
||||||
"../models/Item": fakeModel("item", seed.items),
|
"../models/Item": fakeModel("item", seed.items, campaign.id),
|
||||||
"../models/Folder": fakeModel("folder", seed.folders),
|
"../models/Folder": fakeModel("folder", seed.folders, campaign.id),
|
||||||
};
|
};
|
||||||
|
|
||||||
const requireStub = (id) => {
|
const requireStub = (id) => {
|
||||||
if (id === "express") return { Router: () => router };
|
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 === "mongoose") return { isValidObjectId: (value) => typeof value === "string" && value.length > 20 };
|
||||||
if (id === "../models/Campaign") return { findOne: async () => campaign };
|
if (id === "../models/Campaign") return { findOne: async () => campaign };
|
||||||
if (id === "../services/actor-foundry") return { foundryActorToCharacter: (actor) => ({ name: actor?.name ?? "" }) };
|
if (id === "../services/actor-foundry") return { foundryActorToCharacter: (actor) => ({ name: actor?.name ?? "" }) };
|
||||||
@@ -298,9 +303,12 @@ test("every folder listing says which campaign list it belongs to", () => {
|
|||||||
// field existed carry none at all. tests/entry-folders.test.js runs these routes.
|
// field existed carry none at all. tests/entry-folders.test.js runs these routes.
|
||||||
for (const route of ["note.js", "folder.js"]) {
|
for (const route of ["note.js", "folder.js"]) {
|
||||||
const source = read("backend", "src", "routes", route);
|
const source = read("backend", "src", "routes", route);
|
||||||
const listings = source.match(/Folder\.find\(/g) ?? [];
|
// 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`);
|
assert.ok(listings.length, `${route} lists folders`);
|
||||||
const filtered = source.match(/Folder\.find\(\{[^{]*Folder\.filterForTarget\((?:'note'|target)\)/g) ?? [];
|
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`);
|
assert.equal(filtered.length, listings.length, `${route} has a folder listing that names no campaign list`);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@@ -354,6 +362,10 @@ function makeWorld() {
|
|||||||
id: "actor-1", name: "Thalia", type: "character", documentName: "Actor", flags: {},
|
id: "actor-1", name: "Thalia", type: "character", documentName: "Actor", flags: {},
|
||||||
items: { contents: [carriedItem] },
|
items: { contents: [carriedItem] },
|
||||||
getFlag() { return undefined; },
|
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 }; },
|
toObject() { return { _id: this.id, name: this.name, type: this.type, flags: this.flags }; },
|
||||||
},
|
},
|
||||||
];
|
];
|
||||||
@@ -523,12 +535,12 @@ test("autosync off: folder changes stop syncing", async () => {
|
|||||||
|
|
||||||
// --- The sidebar groups its items under those folders ----------------------------
|
// --- The sidebar groups its items under those folders ----------------------------
|
||||||
|
|
||||||
async function loadItemFoldersService() {
|
function loadItemFoldersService() {
|
||||||
const source = read("frontend", "app", "services", "ItemFolders.js").replace("export { BuildItemRows };", "return { BuildItemRows };");
|
const source = read("frontend", "app", "services", "ItemFolders.js").replace("export { BuildItemRows };", "return { BuildItemRows };");
|
||||||
return vm.compileFunction(source)();
|
return vm.compileFunction(source)();
|
||||||
}
|
}
|
||||||
|
|
||||||
const { BuildItemRows } = await loadItemFoldersService();
|
const { BuildItemRows } = loadItemFoldersService();
|
||||||
|
|
||||||
const SIDEBAR_FOLDERS = [
|
const SIDEBAR_FOLDERS = [
|
||||||
{ _id: "f-melee", name: "Melee Weapons" },
|
{ _id: "f-melee", name: "Melee Weapons" },
|
||||||
@@ -546,13 +558,15 @@ test("items are grouped under the folder they stand in, nested", () => {
|
|||||||
row.kind, row.kind === "folder" ? row.folder.name : row.item.name, row.depth,
|
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, [
|
assert.deepEqual(shape, [
|
||||||
["folder", "Melee Weapons", 0],
|
["folder", "Melee Weapons", 0],
|
||||||
|
["item", "Longsword", 1],
|
||||||
["folder", "Ranged Weapons", 0],
|
["folder", "Ranged Weapons", 0],
|
||||||
["folder", "Powder Weapons", 1],
|
["folder", "Powder Weapons", 1],
|
||||||
["item", "Pistol", 1],
|
["item", "Pistol", 2],
|
||||||
["item", "Torch", 0],
|
["item", "Torch", 0],
|
||||||
["item", "Longsword", 1],
|
|
||||||
]);
|
]);
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -579,9 +593,9 @@ test("an item whose folder is gone, or a folder nested in itself, reads as a roo
|
|||||||
);
|
);
|
||||||
|
|
||||||
const shape = rows.map((row) => [row.kind, row.kind === "folder" ? row.folder.name : row.item.name]);
|
const shape = rows.map((row) => [row.kind, row.kind === "folder" ? row.folder.name : row.item.name]);
|
||||||
assert.ok(shape.includes(["item", "Torch"]), "the item is not lost with the folder that was removed");
|
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.deepEqual(new Set(shape.filter(([kind]) => kind === "folder").map(([, name]) => name)), new Set(["A", "B"]));
|
||||||
assert.equal(rows.filter(([kind]) => kind === "folder").length, 2, "a broken tree is walked once, not forever");
|
assert.equal(shape.filter(([kind]) => kind === "folder").length, 2, "a broken tree is walked once, not forever");
|
||||||
});
|
});
|
||||||
|
|
||||||
test("every locale labels the folder row", () => {
|
test("every locale labels the folder row", () => {
|
||||||
|
|||||||
@@ -66,8 +66,8 @@ 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.
|
||||||
// Since #44 the rows come from the folder tree the world synced, so the row holds the item.
|
// The rows come from the item list's folder tree, so the row holds the item.
|
||||||
assert.match(sidebarSource, /v-for="row in itemRows"[\s\S]*?@click="openItemSheet\(row\.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/);
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -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\)\)/);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user