From 589eb3fa15cbd9a4970633149907648fae00f433 Mon Sep 17 00:00:00 2001 From: Jarrod Flesch Date: Wed, 7 Jun 2023 22:31:36 -0400 Subject: [PATCH] chore: removes console logs, accounts for initCollapsed --- .../Form/buildStateFromSchema/addFieldStatePromise.ts | 11 ++++++----- src/admin/components/forms/Form/fieldReducer.ts | 2 +- test/array-update/config.ts | 3 +++ 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/admin/components/forms/Form/buildStateFromSchema/addFieldStatePromise.ts b/src/admin/components/forms/Form/buildStateFromSchema/addFieldStatePromise.ts index b75b3606e..507b6a9b6 100644 --- a/src/admin/components/forms/Form/buildStateFromSchema/addFieldStatePromise.ts +++ b/src/admin/components/forms/Form/buildStateFromSchema/addFieldStatePromise.ts @@ -105,10 +105,11 @@ export const addFieldStatePromise = async ({ preferences, })); - console.log(`${path}${field.name}`, { preferences }); + const collapsedRowIDs = preferences?.fields?.[`${path}${field.name}`]?.collapsed; + acc.rowMetadata.push({ id: row.id, - collapsed: (preferences?.fields?.[`${path}${field.name}`]?.collapsed || []).includes(row.id), + collapsed: collapsedRowIDs === undefined ? field.admin.initCollapsed : collapsedRowIDs.includes(row.id), }); return acc; @@ -117,8 +118,6 @@ export const addFieldStatePromise = async ({ rowMetadata: [], }); - console.log(rowMetadata); - await Promise.all(promises); // Add values to field state @@ -183,9 +182,11 @@ export const addFieldStatePromise = async ({ preferences, })); + const collapsedRowIDs = preferences?.fields?.[`${path}${field.name}`]?.collapsed; + acc.rowMetadata.push({ id: row.id, - collapsed: (preferences?.fields?.[`${path}${field.name}`]?.collapsed || []).includes(row.id), + collapsed: collapsedRowIDs === undefined ? field.admin.initCollapsed : collapsedRowIDs.includes(row.id), blockType: row.blockType, }); } diff --git a/src/admin/components/forms/Form/fieldReducer.ts b/src/admin/components/forms/Form/fieldReducer.ts index 29de047d2..64ede18fe 100644 --- a/src/admin/components/forms/Form/fieldReducer.ts +++ b/src/admin/components/forms/Form/fieldReducer.ts @@ -228,7 +228,7 @@ export function fieldReducer(state: Fields, action: FieldAction): Fields { arrayState.rows[matchedIndex].collapsed = collapsed; setDocFieldPreferences(path, { collapsed: collapsedRowIDs }); } - console.log({ collapsedRowIDs }); + const newState = { ...state, [path]: { diff --git a/test/array-update/config.ts b/test/array-update/config.ts index ef3d6c3bb..306e05491 100644 --- a/test/array-update/config.ts +++ b/test/array-update/config.ts @@ -8,6 +8,9 @@ export default buildConfig({ { name: 'arrayOfFields', type: 'array', + admin: { + initCollapsed: true, + }, fields: [ { type: 'text',