From 5b053772e3e018957c47c28962d09f843bdaad84 Mon Sep 17 00:00:00 2001 From: Josue Ruiz <7465495+SwaySway@users.noreply.github.com> Date: Wed, 9 Mar 2022 13:34:26 -0800 Subject: [PATCH] fix: remove hook from conditional statement (#455) --- .../studio-ui-codegen-react.test.ts.snap | 68 ++++++++----------- .../lib/react-studio-template-renderer.ts | 52 +++++++++++--- 2 files changed, 70 insertions(+), 50 deletions(-) diff --git a/packages/codegen-ui-react/lib/__tests__/__snapshots__/studio-ui-codegen-react.test.ts.snap b/packages/codegen-ui-react/lib/__tests__/__snapshots__/studio-ui-codegen-react.test.ts.snap index 43337c0ac..1be98afa8 100644 --- a/packages/codegen-ui-react/lib/__tests__/__snapshots__/studio-ui-codegen-react.test.ts.snap +++ b/packages/codegen-ui-react/lib/__tests__/__snapshots__/studio-ui-codegen-react.test.ts.snap @@ -617,14 +617,12 @@ export default function CollectionOfCustomButtons( ], }; const buttonUserFilter = createDataStorePredicate(buttonUserFilterObj); - const buttonUser = - items !== undefined - ? items - : useDataStoreBinding({ - type: \\"collection\\", - model: User, - criteria: buttonUserFilter, - }).items; + const buttonUserDataStore = useDataStoreBinding({ + type: \\"collection\\", + model: User, + criteria: buttonUserFilter, + }).items; + const buttonUser = items !== undefined ? items : buttonUserDataStore; const buttonColorFilterObj = { field: \\"userID\\", operand: \\"user@email.com\\", @@ -723,15 +721,13 @@ export default function CollectionOfCustomButtons( sort: (s: SortPredicate) => s.firstName(SortDirection.ASCENDING).lastName(SortDirection.DESCENDING), }; - const buttonUser = - items !== undefined - ? items - : useDataStoreBinding({ - type: \\"collection\\", - model: User, - criteria: buttonUserFilter, - pagination: buttonUserPagination, - }).items; + const buttonUserDataStore = useDataStoreBinding({ + type: \\"collection\\", + model: User, + criteria: buttonUserFilter, + pagination: buttonUserPagination, + }).items; + const buttonUser = items !== undefined ? items : buttonUserDataStore; const buttonColorFilterObj = { field: \\"userID\\", operand: \\"user@email.com\\", @@ -827,14 +823,12 @@ export default function CollectionOfCustomButtons( ], }; const itemsFilter = createDataStorePredicate(itemsFilterObj); - const items = - itemsProp !== undefined - ? itemsProp - : useDataStoreBinding({ - type: \\"collection\\", - model: User, - criteria: itemsFilter, - }).items; + const itemsDataStore = useDataStoreBinding({ + type: \\"collection\\", + model: User, + criteria: itemsFilter, + }).items; + const items = itemsProp !== undefined ? itemsProp : itemsDataStore; const buttonColorFilterObj = { field: \\"userID\\", operand: \\"user@email.com\\", @@ -904,13 +898,11 @@ export default function ListingCardCollection( props: ListingCardCollectionProps ): React.ReactElement { const { items, overrideItems, overrides, ...rest } = props; - const bananas = - items !== undefined - ? items - : useDataStoreBinding({ - type: \\"collection\\", - model: UntitledModel, - }).items; + const bananasDataStore = useDataStoreBinding({ + type: \\"collection\\", + model: UntitledModel, + }).items; + const bananas = items !== undefined ? items : bananasDataStore; return ( /* @ts-ignore: TS2322 */