granblue.team/hensei-web
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge svelte-main into feature/remove-suggestion-ui-v2

Browse source 
Resolve conflicts in import pages by removing redundant Basic Info
sections since MetadataSection components now handle name fields.
This commit is contained in:
Justin Edmund 2026-01-04 14:41:00 -08:00
commit 5fcba24cdd
7 changed files with 105 additions and 74 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/lib/features/database/characters/sections/CharacterMetadataSection.svelte
View file

@ -67,19 +67,27 @@
<DetailsContainer title="Metadata">
{#if editMode}
<DetailItem
<SuggestionDetailItem
label="Name (EN)"
bind:value={editData.name}
editable={true}
type="text"
placeholder="English name"
suggestion={suggestions?.nameEn}
dismissedSuggestion={dismissedSuggestions?.has('name')}
onAcceptSuggestion={() => onAcceptSuggestion?.('name', suggestions?.nameEn)}
onDismissSuggestion={() => onDismissSuggestion?.('name')}
/>
<DetailItem
<SuggestionDetailItem
label="Name (JP)"
bind:value={editData.nameJp}
editable={true}
type="text"
placeholder="日本語名"
suggestion={suggestions?.nameJp}
dismissedSuggestion={dismissedSuggestions?.has('nameJp')}
onAcceptSuggestion={() => onAcceptSuggestion?.('nameJp', suggestions?.nameJp)}
onDismissSuggestion={() => onDismissSuggestion?.('nameJp')}
/>
<DetailItem
label="Rarity"
@ -88,12 +96,16 @@
type="select"
options={rarityOptions}
/>
<DetailItem
<SuggestionDetailItem
label="Granblue ID"
bind:value={editData.granblueId}
editable={true}
type="text"
placeholder="Granblue ID"
suggestion={suggestions?.granblueId}
dismissedSuggestion={dismissedSuggestions?.has('granblueId')}
onAcceptSuggestion={() => onAcceptSuggestion?.('granblueId', suggestions?.granblueId)}
onDismissSuggestion={() => onDismissSuggestion?.('granblueId')}
/>
<DetailItem
label="Character ID"

20
src/lib/features/database/summons/sections/SummonMetadataSection.svelte
View file

@ -23,19 +23,27 @@
<DetailsContainer title="Metadata">
{#if editMode}
<DetailItem
<SuggestionDetailItem
label="Name (EN)"
bind:value={editData.name}
editable={true}
type="text"
placeholder="English name"
suggestion={suggestions?.nameEn}
dismissedSuggestion={dismissedSuggestions?.has('name')}
onAcceptSuggestion={() => onAcceptSuggestion?.('name', suggestions?.nameEn)}
onDismissSuggestion={() => onDismissSuggestion?.('name')}
/>
<DetailItem
<SuggestionDetailItem
label="Name (JP)"
bind:value={editData.nameJp}
editable={true}
type="text"
placeholder="日本語名"
suggestion={suggestions?.nameJp}
dismissedSuggestion={dismissedSuggestions?.has('nameJp')}
onAcceptSuggestion={() => onAcceptSuggestion?.('nameJp', suggestions?.nameJp)}
onDismissSuggestion={() => onDismissSuggestion?.('nameJp')}
/>
<DetailItem
label="Rarity"
@ -50,6 +58,14 @@
editable={true}
type="text"
/>
<DetailItem
label="Summon ID"
sublabel="Internal game identifier (if known)"
bind:value={editData.summonId}
editable={true}
type="text"
placeholder="Optional"
/>
{:else}
<DetailItem label="Name (EN)" value={summon.name?.en || '—'} />
<DetailItem label="Name (JP)" value={summon.name?.ja || '—'} />

12
src/lib/features/database/weapons/sections/WeaponMetadataSection.svelte
View file

@ -23,19 +23,27 @@
<DetailsContainer title="Metadata">
{#if editMode}
<DetailItem
<SuggestionDetailItem
label="Name (EN)"
bind:value={editData.name}
editable={true}
type="text"
placeholder="English name"
suggestion={suggestions?.nameEn}
dismissedSuggestion={dismissedSuggestions?.has('name')}
onAcceptSuggestion={() => onAcceptSuggestion?.('name', suggestions?.nameEn)}
onDismissSuggestion={() => onDismissSuggestion?.('name')}
/>
<DetailItem
<SuggestionDetailItem
label="Name (JP)"
bind:value={editData.nameJp}
editable={true}
type="text"
placeholder="日本語名"
suggestion={suggestions?.nameJp}
dismissedSuggestion={dismissedSuggestions?.has('nameJp')}
onAcceptSuggestion={() => onAcceptSuggestion?.('nameJp', suggestions?.nameJp)}
onDismissSuggestion={() => onDismissSuggestion?.('nameJp')}
/>
<DetailItem
label="Rarity"

8
src/lib/utils/rarity.ts
View file

@ -8,6 +8,14 @@ export function getRarityLabel(rarity: number): string {
return RARITY_LABELS[rarity] || '—'
}
/**
* Get rarity prefix for URL generation (e.g., "SSR", "SR", "R")
* Returns empty string for unknown rarity values
*/
export function getRarityPrefix(rarity: number): string {
return RARITY_LABELS[rarity] || ''
}
export function getRarityOptions() {
return Object.entries(RARITY_LABELS).map(([value, label]) => ({
value: Number(value),

43
src/routes/(app)/database/characters/import/+page.svelte
View file

@ -13,6 +13,7 @@
buildGamewithUrl,
buildKamigameUrl
} from '$lib/utils/external-links'
import { getRarityPrefix } from '$lib/utils/rarity'
// Components
import CharacterUncapSection from '$lib/features/database/characters/sections/CharacterUncapSection.svelte'
@ -83,6 +84,23 @@
// Get selected entity data
const selectedEntity = $derived(selectedWikiPage ? entities.get(selectedWikiPage) : null)
// Auto-generate wiki URLs when Name (JP) or Rarity changes
$effect(() => {
if (!selectedWikiPage) return
const formData = formDataByPage[selectedWikiPage]
if (!formData) return
const nameJp = formData.nameJp
const rarity = formData.rarity
if (nameJp) {
// Auto-generate wikiJa: "Name (JP) (SSR)"
formData.wikiJa = `${nameJp} (${getRarityPrefix(rarity)})`
// Auto-generate kamigame: "Name (JP)" for characters (no rarity prefix)
formData.kamigame = nameJp
}
})
// Entity tabs for TabbedEntitySelector
const entityTabs = $derived<EntityTab[]>(
Array.from(entities.entries()).map(([wikiPage, entity]) => ({
@ -427,31 +445,6 @@
</div>
{:else if selectedWikiPage && formDataByPage[selectedWikiPage]}
<section class="details">
<!-- Basic Info: Name fields needed for import (not in MetadataSection) -->
<DetailsContainer title="Basic Info">
<DetailItem
label="Name (EN)"
bind:value={formDataByPage[selectedWikiPage].name}
editable={true}
type="text"
placeholder="Character name"
/>
<DetailItem
label="Name (JP)"
bind:value={formDataByPage[selectedWikiPage].nameJp}
editable={true}
type="text"
placeholder="キャラクター名"
/>
<DetailItem
label="Granblue ID"
bind:value={formDataByPage[selectedWikiPage].granblueId}
editable={true}
type="text"
placeholder="3040001000"
/>
</DetailsContainer>
<CharacterMetadataSection
character={emptyCharacter}
editMode={true}

43
src/routes/(app)/database/summons/import/+page.svelte
View file

@ -13,6 +13,7 @@
buildGamewithUrl,
buildKamigameUrl
} from '$lib/utils/external-links'
import { getRarityPrefix } from '$lib/utils/rarity'
// Components
import SummonUncapSection from '$lib/features/database/summons/sections/SummonUncapSection.svelte'
@ -82,6 +83,23 @@
// Get selected entity data
const selectedEntity = $derived(selectedWikiPage ? entities.get(selectedWikiPage) : null)
// Auto-generate wiki URLs when Name (JP) or Rarity changes
$effect(() => {
if (!selectedWikiPage) return
const formData = formDataByPage[selectedWikiPage]
if (!formData) return
const nameJp = formData.nameJp
const rarity = formData.rarity
if (nameJp) {
// Auto-generate wikiJa: "Name (JP) (SSR)"
formData.wikiJa = `${nameJp} (${getRarityPrefix(rarity)})`
// Auto-generate kamigame: "SSRName (JP)" for summons
formData.kamigame = `${getRarityPrefix(rarity)}${nameJp}`
}
})
// Entity tabs for TabbedEntitySelector
const entityTabs = $derived<EntityTab[]>(
Array.from(entities.entries()).map(([wikiPage, entity]) => ({
@ -406,31 +424,6 @@
</div>
{:else if selectedWikiPage && formDataByPage[selectedWikiPage]}
<section class="details">
<DetailsContainer title="Basic Info">
<DetailItem
label="Name (EN)"
bind:value={formDataByPage[selectedWikiPage].name}
editable={true}
type="text"
placeholder="Summon name"
/>
<DetailItem
label="Name (JP)"
bind:value={formDataByPage[selectedWikiPage].nameJp}
editable={true}
type="text"
placeholder="召喚石名"
/>
<DetailItem
label="Summon ID"
sublabel="Internal game identifier (if known)"
bind:value={formDataByPage[selectedWikiPage].summonId}
editable={true}
type="text"
placeholder="Optional"
/>
</DetailsContainer>
<SummonMetadataSection
summon={emptySummon}
editMode={true}

35
src/routes/(app)/database/weapons/import/+page.svelte
View file

@ -13,6 +13,7 @@
buildGamewithUrl,
buildKamigameUrl
} from '$lib/utils/external-links'
import { getRarityPrefix } from '$lib/utils/rarity'
// Components
import WeaponUncapSection from '$lib/features/database/weapons/sections/WeaponUncapSection.svelte'
@ -82,6 +83,23 @@
// Get selected entity data
const selectedEntity = $derived(selectedWikiPage ? entities.get(selectedWikiPage) : null)
// Auto-generate wiki URLs when Name (JP) or Rarity changes
$effect(() => {
if (!selectedWikiPage) return
const formData = formDataByPage[selectedWikiPage]
if (!formData) return
const nameJp = formData.nameJp
const rarity = formData.rarity
if (nameJp) {
// Auto-generate wikiJa: "Name (JP) (SSR)"
formData.wikiJa = `${nameJp} (${getRarityPrefix(rarity)})`
// Auto-generate kamigame: "SSRName (JP)" for weapons
formData.kamigame = `${getRarityPrefix(rarity)}${nameJp}`
}
})
// Entity tabs for TabbedEntitySelector
const entityTabs = $derived<EntityTab[]>(
Array.from(entities.entries()).map(([wikiPage, entity]) => ({
@ -420,23 +438,6 @@
</div>
{:else if selectedWikiPage && formDataByPage[selectedWikiPage]}
<section class="details">
<DetailsContainer title="Basic Info">
<DetailItem
label="Name (EN)"
bind:value={formDataByPage[selectedWikiPage].name}
editable={true}
type="text"
placeholder="Weapon name"
/>
<DetailItem
label="Name (JP)"
bind:value={formDataByPage[selectedWikiPage].nameJp}
editable={true}
type="text"
placeholder="武器名"
/>
</DetailsContainer>
<WeaponMetadataSection
weapon={emptyWeapon}
editMode={true}