Skip to content

Refactor chart of accounts mapping logic and bump client to 0.3.34 #145

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jfrench9 merged 2 commits into from
May 27, 2026
Merged

Refactor chart of accounts mapping logic and bump client to 0.3.34 #145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8a56a98
Update @robosystems/client to version 0.3.34 and refactor ChartOfAcco…
jfrench9 May 27, 2026
4964e7a
fix classifications
jfrench9 May 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
},
"dependencies": {
"@aws-sdk/client-sns": "^3.1041.0",
"@robosystems/client": "0.3.33",
"@robosystems/client": "0.3.34",
"flowbite": "^3.1",
"flowbite-react": "^0.12.5",
"intuit-oauth": "^4.1.0",
Expand Down
215 changes: 76 additions & 139 deletions src/app/(app)/ledger/chart-of-accounts/content.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,6 @@ interface GaapMapping {
}

interface AccountMappings {
fac: GaapMapping | null
rsGaap: GaapMapping | null
}

Expand Down Expand Up @@ -349,12 +348,11 @@ const ChartOfAccountsContent: FC = function () {
// review or edit the FAC / rs-GAAP relationships.
const [showMappings, setShowMappings] = useState(false)

// Inline editing state
const [facElements, setFacElements] = useState<GaapElement[]>([])
// Inline editing state. Mapping is CoA → rs-gaap only; the FAC level is
// inferred (reverse fac-to-rs-gaap equivalence), never edited here.
const [rsGaapElements, setRsGaapElements] = useState<GaapElement[]>([])
const [editingState, setEditingState] = useState<{
accountId: string
mode: 'fac' | 'rsGaap'
} | null>(null)
const [isSaving, setIsSaving] = useState(false)

Expand Down Expand Up @@ -428,46 +426,37 @@ const ChartOfAccountsContent: FC = function () {
}

try {
const [detail, coverage, facResult, rsGaapResult] = await Promise.all([
const [detail, coverage, rsGaapResult] = await Promise.all([
clients.ledger.getMapping(currentGraph.graphId, selectedMappingId),
clients.ledger
.getMappingCoverage(currentGraph.graphId, selectedMappingId)
.catch(() => null),
// Load FAC elements for the dropdown (once)
facElements.length === 0
? clients.ledger
.listElements(currentGraph.graphId, {
source: 'fac',
isAbstract: false,
limit: 200,
})
.catch(() => ({ elements: [] }))
: null,
// Load rs-gaap elements in two pages (API max is 1000; ~1863 total)
// Candidate concepts per EFS classification, limited to those that
// render under the active Reporting Style (mappingCandidates wraps
// suggest_mapping_candidates, minus subtotals). One call per trait,
// combined into the flat list the dropdown groups client-side.
// Mapping outside this set would land a fact on an unreachable branch.
// The trait set must match the backend MappingOperator's (it groups
// CoA elements by their EFS trait); gain/loss are valid CoA traits
// with their own rs-gaap concepts, so they're fetched too.
rsGaapElements.length === 0
? Promise.all([
clients.ledger
.listElements(currentGraph.graphId, {
source: 'rs-gaap',
isAbstract: false,
limit: 1000,
offset: 0,
})
.catch(() => ({ elements: [] })),
clients.ledger
.listElements(currentGraph.graphId, {
source: 'rs-gaap',
isAbstract: false,
limit: 1000,
offset: 1000,
})
.catch(() => ({ elements: [] })),
]).then(([p1, p2]) => ({
elements: [
...((p1 as { elements?: unknown[] })?.elements ?? []),
...((p2 as { elements?: unknown[] })?.elements ?? []),
],
}))
? Promise.all(
(
[
'asset',
'liability',
'equity',
'revenue',
'expense',
'gain',
'loss',
] as const
).map((cls) =>
clients.ledger
.getMappingCandidates(currentGraph.graphId, cls)
.catch(() => [])
)
).then((lists) => ({ elements: lists.flat() }))
: null,
])

Expand All @@ -480,10 +469,13 @@ const ChartOfAccountsContent: FC = function () {
id: e.id as string,
name: e.name as string,
qname: (e.qname as string) ?? '',
classification: (e.classification as string) ?? '',
// EFS class lives on `trait` (asset/liability/equity/revenue/expense);
// the legacy `classification` field was removed from the Element type.
// The dropdown groups by this value, so reading the wrong field left
// every concept ungrouped → "No matching concepts".
classification: (e.trait as string) ?? '',
}))
}
if (facResult) setFacElements(toGaapElements(facResult))
if (rsGaapResult) setRsGaapElements(toGaapElements(rsGaapResult))
} catch (err) {
console.error('Error loading mapping detail:', err)
Expand All @@ -493,19 +485,21 @@ const ChartOfAccountsContent: FC = function () {
}

loadMappingData()
// eslint-disable-next-line react-hooks/exhaustive-deps -- facElements/rsGaapElements intentionally excluded to avoid re-fetching
// eslint-disable-next-line react-hooks/exhaustive-deps -- rsGaapElements intentionally excluded to avoid re-fetching
}, [currentGraph, selectedMappingId])

// Build GAAP lookup from mapping associations, keyed by from_element_id.
// Each account can have both a FAC mapping (fac:*) and an rs-gaap mapping (rs-gaap:*).
// Mapping is CoA → rs-gaap only. Legacy fac:* associations are skipped so
// they don't show in the rs-gaap slot; the FAC level is inferred, not edited.
const gaapByElementId = useMemo(() => {
const map = new Map<string, AccountMappings>()
if (!mappingDetail?.associations) return map

for (const assoc of mappingDetail.associations) {
const fromId = assoc.fromElementId
if (!fromId) continue
const existing = map.get(fromId) ?? { fac: null, rsGaap: null }
if (assoc.toElementQname?.startsWith('fac:')) continue
const existing = map.get(fromId) ?? { rsGaap: null }
const mapping: GaapMapping = {
gaapName: assoc.toElementName ?? '',
gaapQname: assoc.toElementQname ?? '',
Expand All @@ -514,11 +508,7 @@ const ChartOfAccountsContent: FC = function () {
fromElementId: fromId,
toElementId: assoc.toElementId,
}
if (assoc.toElementQname?.startsWith('fac:')) {
map.set(fromId, { ...existing, fac: mapping })
} else {
map.set(fromId, { ...existing, rsGaap: mapping })
}
map.set(fromId, { ...existing, rsGaap: mapping })
}
return map
}, [mappingDetail])
Expand All @@ -542,18 +532,13 @@ const ChartOfAccountsContent: FC = function () {

// Handle GAAP element selection (fac or rsGaap slot)
const handleSelectGaap = useCallback(
async (
accountId: string,
gaapElement: GaapElement,
mode: 'fac' | 'rsGaap'
) => {
async (accountId: string, gaapElement: GaapElement) => {
if (!currentGraph || !selectedMappingId) return

setIsSaving(true)
try {
const accountMappings = gaapByElementId.get(accountId)
const existing =
mode === 'fac' ? accountMappings?.fac : accountMappings?.rsGaap
const existing = accountMappings?.rsGaap
if (existing) {
await clients.ledger.deleteMappingAssociation(currentGraph.graphId, {
mapping_id: selectedMappingId,
Expand All @@ -580,14 +565,13 @@ const ChartOfAccountsContent: FC = function () {
[currentGraph, selectedMappingId, gaapByElementId, refreshMappingData]
)

// Handle clear mapping (fac or rsGaap slot)
// Handle clear mapping (rs-gaap)
const handleClearMapping = useCallback(
async (accountId: string, mode: 'fac' | 'rsGaap') => {
async (accountId: string) => {
if (!currentGraph || !selectedMappingId) return

const accountMappings = gaapByElementId.get(accountId)
const existing =
mode === 'fac' ? accountMappings?.fac : accountMappings?.rsGaap
const existing = accountMappings?.rsGaap
if (!existing) return

setIsSaving(true)
Expand Down Expand Up @@ -927,93 +911,46 @@ const ChartOfAccountsContent: FC = function () {
) : isEditing ? (
<GaapDropdown
accountClassification={account.classification}
gaapElements={
editingState!.mode === 'fac'
? facElements
: rsGaapElements
}
currentMapping={
editingState!.mode === 'fac'
? (accountMappings?.fac ?? null)
: (accountMappings?.rsGaap ?? null)
}
gaapElements={rsGaapElements}
currentMapping={accountMappings?.rsGaap ?? null}
onSelect={(el) =>
handleSelectGaap(
account.id,
el,
editingState!.mode
)
}
onClear={() =>
handleClearMapping(
account.id,
editingState!.mode
)
handleSelectGaap(account.id, el)
}
onClear={() => handleClearMapping(account.id)}
onClose={() => setEditingState(null)}
/>
) : (
<div className="flex flex-col gap-0.5">
{/* FAC row */}
<button
type="button"
onClick={() =>
setEditingState({
accountId: account.id,
mode: 'fac',
})
}
className="group flex w-full cursor-pointer items-center justify-between rounded px-1 py-0.5 text-left transition-colors hover:bg-gray-50 dark:hover:bg-gray-700/50"
>
<div className="flex min-w-0 flex-col">
<span className="text-[10px] font-semibold tracking-wide text-gray-400 uppercase dark:text-gray-500">
FAC
</span>
{accountMappings?.fac ? (
<span className="truncate font-mono text-xs text-blue-500 dark:text-blue-400">
{accountMappings.fac.gaapQname}
<button
type="button"
onClick={() =>
setEditingState({ accountId: account.id })
}
className="group flex w-full cursor-pointer items-center justify-between rounded px-1 py-0.5 text-left transition-colors hover:bg-gray-50 dark:hover:bg-gray-700/50"
>
<div className="flex max-w-md min-w-0 flex-col">
{accountMappings?.rsGaap ? (
<>
<span
className="truncate text-sm font-medium text-purple-500 dark:text-purple-400"
title={accountMappings.rsGaap.gaapName}
>
{accountMappings.rsGaap.gaapName}
</span>
) : (
<span className="text-xs text-gray-400">
Unmapped
<span
className="truncate font-mono text-xs text-gray-500 dark:text-gray-400"
title={accountMappings.rsGaap.gaapQname}
>
{accountMappings.rsGaap.gaapQname}
</span>
)}
</div>
<HiPencil className="ml-1 h-3 w-3 shrink-0 text-gray-300 transition-colors group-hover:text-purple-400 dark:text-gray-600 dark:group-hover:text-purple-400" />
</button>
{/* rs-gaap row */}
<button
type="button"
onClick={() =>
setEditingState({
accountId: account.id,
mode: 'rsGaap',
})
}
className="group flex w-full cursor-pointer items-center justify-between rounded px-1 py-0.5 text-left transition-colors hover:bg-gray-50 dark:hover:bg-gray-700/50"
>
<div className="flex min-w-0 flex-col">
<span className="text-[10px] font-semibold tracking-wide text-gray-400 uppercase dark:text-gray-500">
rs-gaap
</>
) : (
<span className="text-xs text-gray-400">
Unmapped
</span>
{accountMappings?.rsGaap ? (
<>
<span className="truncate text-sm font-medium text-purple-500 dark:text-purple-400">
{accountMappings.rsGaap.gaapName}
</span>
<span className="truncate font-mono text-xs text-gray-500 dark:text-gray-400">
{accountMappings.rsGaap.gaapQname}
</span>
</>
) : (
<span className="text-xs text-gray-400">
Unmapped
</span>
)}
</div>
<HiPencil className="ml-1 h-3 w-3 shrink-0 text-gray-300 transition-colors group-hover:text-purple-400 dark:text-gray-600 dark:group-hover:text-purple-400" />
</button>
</div>
)}
</div>
<HiPencil className="ml-1 h-3 w-3 shrink-0 text-gray-300 transition-colors group-hover:text-purple-400 dark:text-gray-600 dark:group-hover:text-purple-400" />
</button>
)}
</TableCell>
)}
Expand Down