MirrorSave
/
budibase
mirror of https://github.com/Budibase/budibase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Refactor row lookup map

This commit is contained in:
Andrew Kingston 2024-06-24 08:25:20 +01:00
parent bf77537792
commit 9ca6356694
No known key found for this signature in database
7 changed files with 38 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
packages/client/src/components/app/GridBlock.svelte
View File

@ -124,13 +124,12 @@
return readable([]) return readable([])
} }
return derived( return derived(
[gridContext.selectedRows, gridContext.rowLookupMap, gridContext.rows], [gridContext.selectedRows, gridContext.rowLookupMap],
([$selectedRows, $rowLookupMap, $rows]) => { ([$selectedRows, $rowLookupMap]) => {
return Object.entries($selectedRows || {}) return Object.entries($selectedRows || {})
.filter(([_, selected]) => selected) .filter(([_, selected]) => selected)
.map(([rowId]) => { .map(([rowId]) => {
const idx = $rowLookupMap[rowId] return gridContext.rows.actions.cleanRow($rowLookupMap[rowId])
return gridContext.rows.actions.cleanRow($rows[idx])
}) })
} }
) )

2
packages/frontend-core/src/components/grid/controls/BulkDeleteHandler.svelte
View File

@ -24,7 +24,7 @@
let promptQuantity = 0 let promptQuantity = 0
$: rowsToDelete = Object.keys($selectedRows) $: rowsToDelete = Object.keys($selectedRows)
.map(rowId => $rows[$rowLookupMap[rowId]]) .map(rowId => $rowLookupMap[rowId])
.filter(x => x != null) .filter(x => x != null)
const handleBulkDeleteRequest = () => { const handleBulkDeleteRequest = () => {

3
packages/frontend-core/src/components/grid/controls/BulkDuplicationHandler.svelte
View File

@ -11,6 +11,7 @@
selectedRowCount, selectedRowCount,
allVisibleColumns, allVisibleColumns,
selectedCells, selectedCells,
rowLookupMap,
} = getContext("grid") } = getContext("grid")
const duration = 260 const duration = 260
@ -26,7 +27,7 @@
// duplicate rows // duplicate rows
const rowsToDuplicate = Object.keys($selectedRows).map(id => { const rowsToDuplicate = Object.keys($selectedRows).map(id => {
return rows.actions.getRow(id) return $rowLookupMap[id]
}) })
const newRows = await rows.actions.bulkDuplicate( const newRows = await rows.actions.bulkDuplicate(
rowsToDuplicate, rowsToDuplicate,

2
packages/frontend-core/src/components/grid/overlays/KeyboardManager.svelte
View File

@ -228,7 +228,7 @@
// Determine the new position for this cell // Determine the new position for this cell
const { rowId, field } = parseCellID(sourceCellId) const { rowId, field } = parseCellID(sourceCellId)
const rowIdx = $rowLookupMap[rowId] const rowIdx = $rowLookupMap[rowId].__idx
const newRow = $rows[rowIdx + delta] const newRow = $rows[rowIdx + delta]
if (!newRow) { if (!newRow) {
return return

6
packages/frontend-core/src/components/grid/stores/clipboard.js
View File

@ -81,7 +81,6 @@ export const createActions = context => {
if (multiCellCopy) { if (multiCellCopy) {
const $rowLookupMap = get(rowLookupMap) const $rowLookupMap = get(rowLookupMap)
const $rowChangeCache = get(rowChangeCache) const $rowChangeCache = get(rowChangeCache)
const $rows = get(rows)
// Extract value of each selected cell, accounting for the change cache // Extract value of each selected cell, accounting for the change cache
let value = [] let value = []
@ -89,9 +88,8 @@ export const createActions = context => {
const rowValues = [] const rowValues = []
for (let cellId of row) { for (let cellId of row) {
const { rowId, field } = parseCellID(cellId) const { rowId, field } = parseCellID(cellId)
const rowIndex = $rowLookupMap[rowId]
const row = { const row = {
...$rows[rowIndex], ...$rowLookupMap[rowId],
...$rowChangeCache[rowId], ...$rowChangeCache[rowId],
} }
rowValues.push(row[field]) rowValues.push(row[field])
@ -159,7 +157,7 @@ export const createActions = context => {
const { rowId, field } = parseCellID($focusedCellId) const { rowId, field } = parseCellID($focusedCellId)
const $rowLookupMap = get(rowLookupMap) const $rowLookupMap = get(rowLookupMap)
const $columnLookupMap = get(columnLookupMap) const $columnLookupMap = get(columnLookupMap)
const rowIdx = $rowLookupMap[rowId] const rowIdx = $rowLookupMap[rowId].__idx
const colIdx = $columnLookupMap[field] const colIdx = $columnLookupMap[field]
// Get limits of how many rows and columns we're able to paste into // Get limits of how many rows and columns we're able to paste into

54
packages/frontend-core/src/components/grid/stores/rows.js
View File

@ -17,11 +17,23 @@ export const createStores = () => {
const error = writable(null) const error = writable(null)
const fetch = writable(null) const fetch = writable(null)
// Enrich rows with an index property and any pending changes
const enrichedRows = derived(
[rows, rowChangeCache],
([$rows, $rowChangeCache]) => {
return $rows.map((row, idx) => ({
...row,
...$rowChangeCache[row._id],
__idx: idx,
}))
}
)
// Generate a lookup map to quick find a row by ID // Generate a lookup map to quick find a row by ID
const rowLookupMap = derived(rows, $rows => { const rowLookupMap = derived(enrichedRows, $enrichedRows => {
let map = {} let map = {}
for (let i = 0; i < $rows.length; i++) { for (let i = 0; i < $enrichedRows.length; i++) {
map[$rows[i]._id] = i map[$enrichedRows[i]._id] = $enrichedRows[i]
} }
return map return map
}) })
@ -36,18 +48,6 @@ export const createStores = () => {
} }
}) })
// Enrich rows with an index property and any pending changes
const enrichedRows = derived(
[rows, rowChangeCache],
([$rows, $rowChangeCache]) => {
return $rows.map((row, idx) => ({
...row,
...$rowChangeCache[row._id],
__idx: idx,
}))
}
)
return { return {
rows: { rows: {
...rows, ...rows,
@ -189,12 +189,6 @@ export const createActions = context => {
fetch.set(newFetch) fetch.set(newFetch)
}) })
// Gets a row by ID
const getRow = id => {
const index = get(rowLookupMap)[id]
return index >= 0 ? get(rows)[index] : null
}
// Handles validation errors from the rows API and updates local validation // Handles validation errors from the rows API and updates local validation
// state, storing error messages against relevant cells // state, storing error messages against relevant cells
const handleValidationError = (rowId, error) => { const handleValidationError = (rowId, error) => {
@ -323,7 +317,8 @@ export const createActions = context => {
const bulkDuplicate = async (rowsToDupe, progressCallback) => { const bulkDuplicate = async (rowsToDupe, progressCallback) => {
// Find index of last row // Find index of last row
const $rowLookupMap = get(rowLookupMap) const $rowLookupMap = get(rowLookupMap)
const index = Math.max(...rowsToDupe.map(row => $rowLookupMap[row._id])) const indices = rowsToDupe.map(row => $rowLookupMap[row._id]?.__idx)
const index = Math.max(...indices)
const count = rowsToDupe.length const count = rowsToDupe.length
// Clone and clean rows // Clone and clean rows
@ -371,7 +366,7 @@ export const createActions = context => {
// Get index of row to check if it exists // Get index of row to check if it exists
const $rows = get(rows) const $rows = get(rows)
const $rowLookupMap = get(rowLookupMap) const $rowLookupMap = get(rowLookupMap)
const index = $rowLookupMap[id] const index = $rowLookupMap[id].__idx
// Process as either an update, addition or deletion // Process as either an update, addition or deletion
if (row) { if (row) {
@ -420,10 +415,8 @@ export const createActions = context => {
// Patches a row with some changes in local state, and returns whether a // Patches a row with some changes in local state, and returns whether a
// valid pending change was made or not // valid pending change was made or not
const stashRowChanges = (rowId, changes) => { const stashRowChanges = (rowId, changes) => {
const $rows = get(rows)
const $rowLookupMap = get(rowLookupMap) const $rowLookupMap = get(rowLookupMap)
const index = $rowLookupMap[rowId] const row = $rowLookupMap[rowId]
const row = $rows[index]
// Check this is a valid change // Check this is a valid change
if (!row || !changesAreValid(row, changes)) { if (!row || !changesAreValid(row, changes)) {
@ -449,10 +442,8 @@ export const createActions = context => {
updateState = true, updateState = true,
handleErrors = true, handleErrors = true,
}) => { }) => {
const $rows = get(rows)
const $rowLookupMap = get(rowLookupMap) const $rowLookupMap = get(rowLookupMap)
const index = $rowLookupMap[rowId] const row = $rowLookupMap[rowId]
const row = $rows[index]
if (row == null) { if (row == null) {
return return
} }
@ -479,7 +470,7 @@ export const createActions = context => {
if (savedRow?._id) { if (savedRow?._id) {
if (updateState) { if (updateState) {
rows.update(state => { rows.update(state => {
state[index] = savedRow state[row.__idx] = savedRow
return state.slice() return state.slice()
}) })
} }
@ -562,7 +553,7 @@ export const createActions = context => {
const $rowLookupMap = get(rowLookupMap) const $rowLookupMap = get(rowLookupMap)
rows.update(state => { rows.update(state => {
for (let row of updated) { for (let row of updated) {
const index = $rowLookupMap[row._id] const index = $rowLookupMap[row._id].__idx
state[index] = row state[index] = row
} }
return state.slice() return state.slice()
@ -664,7 +655,6 @@ export const createActions = context => {
addRow, addRow,
duplicateRow, duplicateRow,
bulkDuplicate, bulkDuplicate,
getRow,
updateValue, updateValue,
applyRowChanges, applyRowChanges,
deleteRows, deleteRows,

18
packages/frontend-core/src/components/grid/stores/ui.js
View File

@ -65,16 +65,12 @@ export const deriveStores = context => {
// Derive the row that contains the selected cell // Derive the row that contains the selected cell
const focusedRow = derived( const focusedRow = derived(
[focusedRowId, rowLookupMap, rows], [focusedRowId, rowLookupMap],
([$focusedRowId, $rowLookupMap, $rows]) => { ([$focusedRowId, $rowLookupMap]) => {
// Edge case for new rows
if ($focusedRowId === NewRowID) { if ($focusedRowId === NewRowID) {
return { _id: NewRowID } return { _id: NewRowID }
} }
return $rowLookupMap[$focusedRowId]
// All normal rows
const index = $rowLookupMap[$focusedRowId]
return $rows[index]
} }
) )
@ -119,8 +115,8 @@ export const deriveStores = context => {
const targetInfo = parseCellID(targetCellId) const targetInfo = parseCellID(targetCellId)
// Row indices // Row indices
const sourceRowIndex = $rowLookupMap[sourceInfo.rowId] const sourceRowIndex = $rowLookupMap[sourceInfo.rowId].__idx
const targetRowIndex = $rowLookupMap[targetInfo.rowId] const targetRowIndex = $rowLookupMap[targetInfo.rowId].__idx
const lowerRowIndex = Math.min(sourceRowIndex, targetRowIndex) const lowerRowIndex = Math.min(sourceRowIndex, targetRowIndex)
const upperRowIndex = Math.max(sourceRowIndex, targetRowIndex) const upperRowIndex = Math.max(sourceRowIndex, targetRowIndex)
@ -206,7 +202,7 @@ export const createActions = context => {
if (!newState[id]) { if (!newState[id]) {
delete newState[id] delete newState[id]
} else { } else {
lastSelectedIndex = get(rowLookupMap)[id] lastSelectedIndex = get(rowLookupMap)[id].__idx
} }
return newState return newState
}) })
@ -220,7 +216,7 @@ export const createActions = context => {
if (lastSelectedIndex == null) { if (lastSelectedIndex == null) {
return return
} }
const thisIndex = get(rowLookupMap)[id] const thisIndex = get(rowLookupMap)[id].__idx
// Skip if indices are the same // Skip if indices are the same
if (lastSelectedIndex === thisIndex) { if (lastSelectedIndex === thisIndex) {