Merge branch 'master' into ai/issue-20
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
<script setup>
|
||||
import { onBeforeUnmount, onMounted, ref } from 'vue';
|
||||
import { onMounted, ref } from 'vue';
|
||||
import WindowHandle from './partials/WindowHandle.vue';
|
||||
import Tabs from '../layouts/Tabs.vue';
|
||||
import { SetupHandle, SetSize, ResetPosition, Top, SetResizable, SetMinSize } from '@/services/Windows';
|
||||
@@ -17,18 +17,20 @@ const name = ref(campaign.name || '');
|
||||
const color = ref(campaign.color || '#6b6b6b');
|
||||
const settings = ref(campaign.settings && typeof campaign.settings === 'object' ? campaign.settings : {});
|
||||
const foundryUrl = ref(settings.value.integrations?.foundryUrl || '');
|
||||
const pairingCode = ref('');
|
||||
const requestId = ref('');
|
||||
const linking = ref(false);
|
||||
const id = data.id;
|
||||
let statusPoll;
|
||||
let checkingStatus = false;
|
||||
|
||||
// Els serveis s'enllacen tots igual: ells mostren un enllaç de Dragonroll i aquí
|
||||
// només es mira què té connectat la campanya i se'n desenllaça el que calgui.
|
||||
const services = ref([]);
|
||||
const unlinked = ref('');
|
||||
|
||||
const rows = [
|
||||
{ id: 'basic', value: 'campaigns.settings.tabs.basic' },
|
||||
{ id: 'integrations', value: 'campaigns.settings.tabs.integrations' }
|
||||
];
|
||||
|
||||
const serviceKeys = ['foundry', 'discord', 'obsidian'];
|
||||
|
||||
onMounted(() => {
|
||||
Top(wrapper);
|
||||
SetupHandle(id, handle);
|
||||
@@ -36,11 +38,7 @@ onMounted(() => {
|
||||
ResetPosition(id, 'center');
|
||||
SetResizable(id, true);
|
||||
SetMinSize(id, { width: 440, height: 340 });
|
||||
ResumePendingFoundryLink();
|
||||
});
|
||||
|
||||
onBeforeUnmount(() => {
|
||||
clearInterval(statusPoll);
|
||||
LoadServices();
|
||||
});
|
||||
|
||||
function ApplyCampaignUpdate(updatedCampaign) {
|
||||
@@ -100,95 +98,56 @@ async function SaveSettings() {
|
||||
}
|
||||
}
|
||||
|
||||
async function StartFoundryLink() {
|
||||
linking.value = true;
|
||||
async function LoadServices() {
|
||||
try {
|
||||
const response = await Server().post('/campaign/foundry-link/start', { campaignId: campaign._id });
|
||||
if (response.data.status !== 'ok') {
|
||||
DisplayToast('red', $t(response.data.msg || 'errors.internal'), 3000);
|
||||
return;
|
||||
}
|
||||
|
||||
pairingCode.value = response.data.code;
|
||||
requestId.value = response.data.requestId;
|
||||
clearInterval(statusPoll);
|
||||
statusPoll = setInterval(CheckFoundryLinkStatus, 2500);
|
||||
const response = await Server().get(`/campaign/services?campaignId=${campaign._id}`);
|
||||
services.value = response.data.status === 'ok' && Array.isArray(response.data.services)
|
||||
? response.data.services
|
||||
: [];
|
||||
} catch {
|
||||
DisplayToast('red', $t('errors.internal'), 3000);
|
||||
} finally {
|
||||
linking.value = false;
|
||||
services.value = [];
|
||||
}
|
||||
}
|
||||
|
||||
// The pairing code lives server-side until it expires, so re-attach to it when
|
||||
// the window opens again after a reload, restart or closing the window.
|
||||
async function ResumePendingFoundryLink() {
|
||||
try {
|
||||
const response = await Server().get(`/campaign/foundry-link/pending?campaignId=${campaign._id}`);
|
||||
if (response.data.status !== 'ok' || !response.data.request) return;
|
||||
|
||||
pairingCode.value = response.data.request.code || '';
|
||||
requestId.value = response.data.request.requestId;
|
||||
clearInterval(statusPoll);
|
||||
statusPoll = setInterval(CheckFoundryLinkStatus, 2500);
|
||||
} catch {
|
||||
// Showing the stored pairing code is best-effort; ignore resume failures.
|
||||
}
|
||||
function LinkFor(service) {
|
||||
return services.value.find((link) => link.service === service) || null;
|
||||
}
|
||||
|
||||
async function CheckFoundryLinkStatus() {
|
||||
if (!requestId.value || checkingStatus) return;
|
||||
checkingStatus = true;
|
||||
try {
|
||||
const response = await Server().get(`/campaign/foundry-link/status/${requestId.value}`);
|
||||
if (response.data.status !== 'ok' || response.data.state === 'expired') {
|
||||
clearInterval(statusPoll);
|
||||
pairingCode.value = '';
|
||||
requestId.value = '';
|
||||
const error = response.data.state === 'expired'
|
||||
? 'campaigns.settings.errors.link-expired'
|
||||
: response.data.msg || 'campaigns.settings.errors.link-expired';
|
||||
DisplayToast('red', $t(error), 3000);
|
||||
return;
|
||||
}
|
||||
if (response.data.state === 'complete') {
|
||||
ApplyCampaignUpdate(response.data.campaign);
|
||||
clearInterval(statusPoll);
|
||||
pairingCode.value = '';
|
||||
requestId.value = '';
|
||||
DisplayToast('green', $t('campaigns.settings.linked'), 3000);
|
||||
}
|
||||
} catch {
|
||||
// Keep polling while the Foundry module completes the pairing.
|
||||
} finally {
|
||||
checkingStatus = false;
|
||||
}
|
||||
// El món de Foundry es descriu amb el que la campanya ja en sap, per si el món
|
||||
// es va enllaçar abans que els serveis tinguessin un registre comú.
|
||||
function ServiceTarget(service, link) {
|
||||
if (link?.targetName) return link.targetName;
|
||||
if (service === 'foundry' && campaign.foundryWorldTitle) return campaign.foundryWorldTitle;
|
||||
if (service === 'discord' && campaign.discordGuildId) return campaign.discordGuildId;
|
||||
return '';
|
||||
}
|
||||
|
||||
async function UnlinkFoundry() {
|
||||
linking.value = true;
|
||||
function WhoConnected(link) {
|
||||
return link?.dragonrollUserName ? $t('campaigns.settings.services.connected-by', { user: link.dragonrollUserName }) : '';
|
||||
}
|
||||
|
||||
async function Unlink(service) {
|
||||
unlinked.value = service;
|
||||
try {
|
||||
const response = await Server().post('/campaign/foundry-unlink', { campaignId: campaign._id });
|
||||
const response = await Server().post('/campaign/service-unlink', {
|
||||
campaignId: campaign._id,
|
||||
service
|
||||
});
|
||||
|
||||
if (response.data.status !== 'ok') {
|
||||
DisplayToast('red', $t(response.data.msg || 'errors.internal'), 3000);
|
||||
return;
|
||||
}
|
||||
|
||||
ApplyCampaignUpdate(response.data.campaign);
|
||||
DisplayToast('green', $t('campaigns.settings.unlinked'), 3000);
|
||||
services.value = Array.isArray(response.data.services) ? response.data.services : [];
|
||||
DisplayToast('green', $t('campaigns.settings.services.unlinked', {
|
||||
service: $t(`campaigns.settings.services.${service}.name`)
|
||||
}), 3000);
|
||||
} catch {
|
||||
DisplayToast('red', $t('errors.internal'), 3000);
|
||||
} finally {
|
||||
linking.value = false;
|
||||
}
|
||||
}
|
||||
|
||||
async function CopyPairingCode() {
|
||||
try {
|
||||
await navigator.clipboard.writeText(pairingCode.value);
|
||||
DisplayToast('green', $t('campaigns.settings.code-copied'), 2000);
|
||||
} catch {
|
||||
DisplayToast('red', $t('campaigns.settings.errors.copy-code'), 3000);
|
||||
unlinked.value = '';
|
||||
}
|
||||
}
|
||||
</script>
|
||||
@@ -212,29 +171,33 @@ async function CopyPairingCode() {
|
||||
</div>
|
||||
</template>
|
||||
<template #integrations>
|
||||
<p class="help-text standalone">{{ $t('campaigns.settings.services.help') }}</p>
|
||||
<div class="settings-fields">
|
||||
<div class="world-link">
|
||||
<div v-if="campaign.foundryWorldId" class="linked-world">
|
||||
<strong>{{ campaign.foundryWorldTitle || campaign.foundryWorldId }}</strong>
|
||||
<span v-if="campaign.foundrySystem">{{ campaign.foundrySystem }}</span>
|
||||
<button class="btn-primary sound-click" type="button" :disabled="linking" @click="UnlinkFoundry">
|
||||
{{ $t('campaigns.settings.unlink-foundry') }}
|
||||
</button>
|
||||
</div>
|
||||
<p v-else class="help-text standalone">{{ $t('campaigns.settings.no-foundry-world') }}</p>
|
||||
|
||||
<button class="btn-primary sound-click" type="button" :disabled="linking" @click="StartFoundryLink">
|
||||
{{ $t('campaigns.settings.start-foundry-link') }}
|
||||
</button>
|
||||
<p class="help-text standalone">{{ $t('campaigns.settings.start-foundry-link-help') }}</p>
|
||||
<div v-if="pairingCode" class="pairing-code">
|
||||
<code>{{ pairingCode }}</code>
|
||||
<button class="btn-primary sound-click" type="button" @click="CopyPairingCode">
|
||||
{{ $t('campaigns.settings.copy-code') }}
|
||||
<div v-for="service in serviceKeys" :key="service" class="service">
|
||||
<div class="service-head">
|
||||
<strong>{{ $t(`campaigns.settings.services.${service}.name`) }}</strong>
|
||||
<button
|
||||
v-if="LinkFor(service)"
|
||||
class="btn-primary sound-click"
|
||||
type="button"
|
||||
:disabled="unlinked !== ''"
|
||||
@click="Unlink(service)"
|
||||
>
|
||||
{{ $t('campaigns.settings.services.unlink') }}
|
||||
</button>
|
||||
</div>
|
||||
<p class="service-state" :class="{ linked: LinkFor(service) }">
|
||||
{{ ServiceTarget(service, LinkFor(service)) || $t('campaigns.settings.services.not-connected') }}
|
||||
<span v-if="WhoConnected(LinkFor(service))" class="who">
|
||||
{{ WhoConnected(LinkFor(service)) }}
|
||||
</span>
|
||||
</p>
|
||||
<p class="help-text standalone">
|
||||
{{ $t(`campaigns.settings.services.${service}.how`) }}
|
||||
</p>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<div class="settings-fields">
|
||||
<label class="field">
|
||||
<span>{{ $t('campaigns.settings.foundry-url') }}</span>
|
||||
<input
|
||||
@@ -313,40 +276,36 @@ input {
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
.world-link {
|
||||
.service {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 10px;
|
||||
gap: 6px;
|
||||
padding-bottom: 14px;
|
||||
border-bottom: 1px solid var(--color-border);
|
||||
}
|
||||
|
||||
.linked-world {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 10px;
|
||||
flex-wrap: wrap;
|
||||
}
|
||||
|
||||
.linked-world span {
|
||||
opacity: 0.75;
|
||||
}
|
||||
|
||||
.pairing-code {
|
||||
.service-head {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
gap: 10px;
|
||||
padding: 10px;
|
||||
border: 1px solid var(--color-border);
|
||||
border-radius: 6px;
|
||||
}
|
||||
|
||||
.pairing-code code {
|
||||
user-select: text;
|
||||
.service-state {
|
||||
margin: 0;
|
||||
font-size: 14px;
|
||||
overflow-wrap: anywhere;
|
||||
}
|
||||
|
||||
.service-state.linked {
|
||||
color: var(--color-green);
|
||||
}
|
||||
|
||||
.who {
|
||||
opacity: 0.75;
|
||||
font-size: 13px;
|
||||
}
|
||||
|
||||
.actions {
|
||||
display: flex;
|
||||
justify-content: flex-end;
|
||||
|
||||
Reference in New Issue
Block a user