From 0783fd2549e4bc07857a1299ce2d66ca5e39a6c5 Mon Sep 17 00:00:00 2001 From: asvarcas Date: Mon, 4 Jan 2021 10:52:21 -0300 Subject: [PATCH 1/3] Fix prop override --- .../src/reducer/admin/references/possibleValues.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/ra-core/src/reducer/admin/references/possibleValues.ts b/packages/ra-core/src/reducer/admin/references/possibleValues.ts index d0337006613..b0efeadba2e 100644 --- a/packages/ra-core/src/reducer/admin/references/possibleValues.ts +++ b/packages/ra-core/src/reducer/admin/references/possibleValues.ts @@ -56,13 +56,13 @@ export const getPossibleReferences = ( if (possibleValues.error) { return possibleValues; } - possibleValues = Array.from(possibleValues); + const [...possibleValuesList] = possibleValues; selectedIds.forEach( id => - possibleValues.some(value => value === id) || - possibleValues.unshift(id) + possibleValuesList.some(value => value === id) || + possibleValuesList.unshift(id) ); - return possibleValues + return possibleValuesList .map(id => referenceState.data[id]) .filter(r => typeof r !== 'undefined'); }; From 78bbfe3db1546874b1d8b5e4a337b52f1df68b85 Mon Sep 17 00:00:00 2001 From: asvarcas Date: Mon, 4 Jan 2021 11:01:49 -0300 Subject: [PATCH 2/3] Improve last commit --- packages/ra-core/src/reducer/admin/references/possibleValues.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/ra-core/src/reducer/admin/references/possibleValues.ts b/packages/ra-core/src/reducer/admin/references/possibleValues.ts index b0efeadba2e..a3d95221732 100644 --- a/packages/ra-core/src/reducer/admin/references/possibleValues.ts +++ b/packages/ra-core/src/reducer/admin/references/possibleValues.ts @@ -56,7 +56,7 @@ export const getPossibleReferences = ( if (possibleValues.error) { return possibleValues; } - const [...possibleValuesList] = possibleValues; + const possibleValuesList = Array.from(possibleValues); selectedIds.forEach( id => possibleValuesList.some(value => value === id) || From bf4554c75becd7016b8198bd82da1755bc662228 Mon Sep 17 00:00:00 2001 From: asvarcas Date: Mon, 4 Jan 2021 11:17:47 -0300 Subject: [PATCH 3/3] Add @ts-ignore --- .../src/reducer/admin/references/possibleValues.ts | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/packages/ra-core/src/reducer/admin/references/possibleValues.ts b/packages/ra-core/src/reducer/admin/references/possibleValues.ts index a3d95221732..ab7d0202b9e 100644 --- a/packages/ra-core/src/reducer/admin/references/possibleValues.ts +++ b/packages/ra-core/src/reducer/admin/references/possibleValues.ts @@ -62,9 +62,12 @@ export const getPossibleReferences = ( possibleValuesList.some(value => value === id) || possibleValuesList.unshift(id) ); - return possibleValuesList - .map(id => referenceState.data[id]) - .filter(r => typeof r !== 'undefined'); + return ( + possibleValuesList + // @ts-ignore + .map(id => referenceState.data[id]) + .filter(r => typeof r !== 'undefined') + ); }; export default possibleValuesreducer;