Add Fava settings UI and fix race conditions in toolbar buttons
- Add Fava URL, ledger slug, and timeout settings to super admin Settings dialog - Reinitialize Fava client when settings are updated via services.py - Add settingsLoaded flag to prevent race conditions where wrong toolbar buttons appeared before isSuperUser was determined - Remove premature Vue mount() call from permissions.js that caused "Cannot read properties of undefined (reading 'user')" error 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
parent
5eb007b936
commit
cb9bc2d658
4 changed files with 83 additions and 10 deletions
17
services.py
17
services.py
|
|
@ -18,12 +18,29 @@ async def get_settings(user_id: str) -> CastleSettings:
|
||||||
|
|
||||||
|
|
||||||
async def update_settings(user_id: str, data: CastleSettings) -> CastleSettings:
|
async def update_settings(user_id: str, data: CastleSettings) -> CastleSettings:
|
||||||
|
from loguru import logger
|
||||||
|
|
||||||
|
from .fava_client import init_fava_client
|
||||||
|
|
||||||
settings = await get_castle_settings(user_id)
|
settings = await get_castle_settings(user_id)
|
||||||
if not settings:
|
if not settings:
|
||||||
settings = await create_castle_settings(user_id, data)
|
settings = await create_castle_settings(user_id, data)
|
||||||
else:
|
else:
|
||||||
settings = await update_castle_settings(user_id, data)
|
settings = await update_castle_settings(user_id, data)
|
||||||
|
|
||||||
|
# Reinitialize Fava client with new settings
|
||||||
|
try:
|
||||||
|
init_fava_client(
|
||||||
|
fava_url=settings.fava_url,
|
||||||
|
ledger_slug=settings.fava_ledger_slug,
|
||||||
|
timeout=settings.fava_timeout,
|
||||||
|
)
|
||||||
|
logger.info(
|
||||||
|
f"Fava client reinitialized: {settings.fava_url}/{settings.fava_ledger_slug}"
|
||||||
|
)
|
||||||
|
except Exception as e:
|
||||||
|
logger.error(f"Failed to reinitialize Fava client: {e}")
|
||||||
|
|
||||||
return settings
|
return settings
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -31,6 +31,7 @@ window.app = Vue.createApp({
|
||||||
userInfo: null, // User information including equity eligibility
|
userInfo: null, // User information including equity eligibility
|
||||||
isAdmin: false,
|
isAdmin: false,
|
||||||
isSuperUser: false,
|
isSuperUser: false,
|
||||||
|
settingsLoaded: false, // Flag to prevent race conditions on toolbar buttons
|
||||||
castleWalletConfigured: false,
|
castleWalletConfigured: false,
|
||||||
userWalletConfigured: false,
|
userWalletConfigured: false,
|
||||||
currentExchangeRate: null, // BTC/EUR rate (sats per EUR)
|
currentExchangeRate: null, // BTC/EUR rate (sats per EUR)
|
||||||
|
|
@ -57,6 +58,9 @@ window.app = Vue.createApp({
|
||||||
settingsDialog: {
|
settingsDialog: {
|
||||||
show: false,
|
show: false,
|
||||||
castleWalletId: '',
|
castleWalletId: '',
|
||||||
|
favaUrl: 'http://localhost:3333',
|
||||||
|
favaLedgerSlug: 'castle-ledger',
|
||||||
|
favaTimeout: 10.0,
|
||||||
loading: false
|
loading: false
|
||||||
},
|
},
|
||||||
userWalletDialog: {
|
userWalletDialog: {
|
||||||
|
|
@ -517,6 +521,9 @@ window.app = Vue.createApp({
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
// Settings not available
|
// Settings not available
|
||||||
this.castleWalletConfigured = false
|
this.castleWalletConfigured = false
|
||||||
|
} finally {
|
||||||
|
// Mark settings as loaded to enable toolbar buttons
|
||||||
|
this.settingsLoaded = true
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
async loadUserWallet() {
|
async loadUserWallet() {
|
||||||
|
|
@ -534,6 +541,9 @@ window.app = Vue.createApp({
|
||||||
},
|
},
|
||||||
showSettingsDialog() {
|
showSettingsDialog() {
|
||||||
this.settingsDialog.castleWalletId = this.settings?.castle_wallet_id || ''
|
this.settingsDialog.castleWalletId = this.settings?.castle_wallet_id || ''
|
||||||
|
this.settingsDialog.favaUrl = this.settings?.fava_url || 'http://localhost:3333'
|
||||||
|
this.settingsDialog.favaLedgerSlug = this.settings?.fava_ledger_slug || 'castle-ledger'
|
||||||
|
this.settingsDialog.favaTimeout = this.settings?.fava_timeout || 10.0
|
||||||
this.settingsDialog.show = true
|
this.settingsDialog.show = true
|
||||||
},
|
},
|
||||||
showUserWalletDialog() {
|
showUserWalletDialog() {
|
||||||
|
|
@ -549,6 +559,14 @@ window.app = Vue.createApp({
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (!this.settingsDialog.favaUrl) {
|
||||||
|
this.$q.notify({
|
||||||
|
type: 'warning',
|
||||||
|
message: 'Fava URL is required'
|
||||||
|
})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
this.settingsDialog.loading = true
|
this.settingsDialog.loading = true
|
||||||
try {
|
try {
|
||||||
await LNbits.api.request(
|
await LNbits.api.request(
|
||||||
|
|
@ -556,7 +574,10 @@ window.app = Vue.createApp({
|
||||||
'/castle/api/v1/settings',
|
'/castle/api/v1/settings',
|
||||||
this.g.user.wallets[0].adminkey,
|
this.g.user.wallets[0].adminkey,
|
||||||
{
|
{
|
||||||
castle_wallet_id: this.settingsDialog.castleWalletId
|
castle_wallet_id: this.settingsDialog.castleWalletId,
|
||||||
|
fava_url: this.settingsDialog.favaUrl,
|
||||||
|
fava_ledger_slug: this.settingsDialog.favaLedgerSlug || 'castle-ledger',
|
||||||
|
fava_timeout: parseFloat(this.settingsDialog.favaTimeout) || 10.0
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
this.$q.notify({
|
this.$q.notify({
|
||||||
|
|
|
||||||
|
|
@ -1118,5 +1118,3 @@ window.app = Vue.createApp({
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
window.app.mount('#vue')
|
|
||||||
|
|
|
||||||
|
|
@ -17,13 +17,14 @@
|
||||||
<p class="q-mb-none">Track expenses, receivables, and balances for the collective</p>
|
<p class="q-mb-none">Track expenses, receivables, and balances for the collective</p>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-auto q-gutter-xs">
|
<div class="col-auto q-gutter-xs">
|
||||||
<q-btn v-if="!isSuperUser" flat round icon="account_balance_wallet" @click="showUserWalletDialog">
|
<!-- Wait for settings to load before showing role-specific buttons to prevent race conditions -->
|
||||||
|
<q-btn v-if="settingsLoaded && !isSuperUser" flat round icon="account_balance_wallet" @click="showUserWalletDialog">
|
||||||
<q-tooltip>Configure Your Wallet</q-tooltip>
|
<q-tooltip>Configure Your Wallet</q-tooltip>
|
||||||
</q-btn>
|
</q-btn>
|
||||||
<q-btn v-if="isSuperUser" flat round icon="admin_panel_settings" :href="'/castle/permissions'">
|
<q-btn v-if="settingsLoaded && isSuperUser" flat round icon="admin_panel_settings" :href="'/castle/permissions'">
|
||||||
<q-tooltip>Manage Permissions (Admin)</q-tooltip>
|
<q-tooltip>Manage Permissions (Admin)</q-tooltip>
|
||||||
</q-btn>
|
</q-btn>
|
||||||
<q-btn v-if="isSuperUser" flat round icon="settings" @click="showSettingsDialog">
|
<q-btn v-if="settingsLoaded && isSuperUser" flat round icon="settings" @click="showSettingsDialog">
|
||||||
<q-tooltip>Castle Settings (Super User Only)</q-tooltip>
|
<q-tooltip>Castle Settings (Super User Only)</q-tooltip>
|
||||||
</q-btn>
|
</q-btn>
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -32,7 +33,7 @@
|
||||||
</q-card>
|
</q-card>
|
||||||
|
|
||||||
<!-- Setup Warning -->
|
<!-- Setup Warning -->
|
||||||
<q-banner v-if="!castleWalletConfigured && isSuperUser" class="bg-warning text-white" rounded>
|
<q-banner v-if="settingsLoaded && !castleWalletConfigured && isSuperUser" class="bg-warning text-white" rounded>
|
||||||
<template v-slot:avatar>
|
<template v-slot:avatar>
|
||||||
<q-icon name="warning" color="white"></q-icon>
|
<q-icon name="warning" color="white"></q-icon>
|
||||||
</template>
|
</template>
|
||||||
|
|
@ -44,7 +45,7 @@
|
||||||
</template>
|
</template>
|
||||||
</q-banner>
|
</q-banner>
|
||||||
|
|
||||||
<q-banner v-if="!castleWalletConfigured && !isSuperUser" class="bg-info text-white" rounded>
|
<q-banner v-if="settingsLoaded && !castleWalletConfigured && !isSuperUser" class="bg-info text-white" rounded>
|
||||||
<template v-slot:avatar>
|
<template v-slot:avatar>
|
||||||
<q-icon name="info" color="white"></q-icon>
|
<q-icon name="info" color="white"></q-icon>
|
||||||
</template>
|
</template>
|
||||||
|
|
@ -53,7 +54,7 @@
|
||||||
</div>
|
</div>
|
||||||
</q-banner>
|
</q-banner>
|
||||||
|
|
||||||
<q-banner v-if="castleWalletConfigured && !userWalletConfigured && !isSuperUser" class="bg-orange text-white" rounded>
|
<q-banner v-if="settingsLoaded && castleWalletConfigured && !userWalletConfigured && !isSuperUser" class="bg-orange text-white" rounded>
|
||||||
<template v-slot:avatar>
|
<template v-slot:avatar>
|
||||||
<q-icon name="account_balance_wallet" color="white"></q-icon>
|
<q-icon name="account_balance_wallet" color="white"></q-icon>
|
||||||
</template>
|
</template>
|
||||||
|
|
@ -1122,10 +1123,46 @@
|
||||||
:disable="!isSuperUser"
|
:disable="!isSuperUser"
|
||||||
></q-select>
|
></q-select>
|
||||||
|
|
||||||
<div class="text-caption text-grey">
|
<div class="text-caption text-grey q-mb-md">
|
||||||
Select the wallet that will be used for Castle operations and transactions.
|
Select the wallet that will be used for Castle operations and transactions.
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<q-separator class="q-my-md"></q-separator>
|
||||||
|
|
||||||
|
<div class="text-subtitle2 q-mb-sm">Fava/Beancount Integration</div>
|
||||||
|
|
||||||
|
<q-input
|
||||||
|
filled
|
||||||
|
dense
|
||||||
|
v-model="settingsDialog.favaUrl"
|
||||||
|
label="Fava URL *"
|
||||||
|
hint="Base URL of the Fava server (e.g., http://localhost:3333)"
|
||||||
|
:readonly="!isSuperUser"
|
||||||
|
:disable="!isSuperUser"
|
||||||
|
></q-input>
|
||||||
|
|
||||||
|
<q-input
|
||||||
|
filled
|
||||||
|
dense
|
||||||
|
v-model="settingsDialog.favaLedgerSlug"
|
||||||
|
label="Ledger Slug"
|
||||||
|
hint="Ledger identifier in Fava URL (e.g., castle-ledger)"
|
||||||
|
:readonly="!isSuperUser"
|
||||||
|
:disable="!isSuperUser"
|
||||||
|
></q-input>
|
||||||
|
|
||||||
|
<q-input
|
||||||
|
filled
|
||||||
|
dense
|
||||||
|
type="number"
|
||||||
|
step="0.5"
|
||||||
|
v-model.number="settingsDialog.favaTimeout"
|
||||||
|
label="Timeout (seconds)"
|
||||||
|
hint="Request timeout for Fava API calls"
|
||||||
|
:readonly="!isSuperUser"
|
||||||
|
:disable="!isSuperUser"
|
||||||
|
></q-input>
|
||||||
|
|
||||||
<div class="row q-mt-lg">
|
<div class="row q-mt-lg">
|
||||||
<q-btn
|
<q-btn
|
||||||
v-if="isSuperUser"
|
v-if="isSuperUser"
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue