djkato/saleor-dashboard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix component remount in shipping zone settings

Browse source
This commit is contained in:
sektordv 2021-08-17 14:26:21 +02:00
parent f50e3bdde1
commit 306160c217
1 changed files with 22 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
src/shipping/components/ShippingZoneSettingsCard/ShippingZoneSettingsCard.tsx
View file

@ -52,38 +52,28 @@ export const ShippingZoneSettingsCard: React.FC<ShippingZoneSettingsCardProps> =
return ( return (
<Card> <Card>
<CardTitle title={intl.formatMessage(messages.title)} /> <CardTitle title={intl.formatMessage(messages.title)} />
{loading && ( <CardContent>
<CardContent> <ChannelsSection
<Skeleton /> channelsDisplayValues={channelsDisplayValues}
</CardContent> onChange={onChannelChange}
)} allChannels={allChannels}
selectedChannels={formData.channels}
{!loading && ( />
<> </CardContent>
<CardContent> <Divider />
<ChannelsSection <CardContent>
channelsDisplayValues={channelsDisplayValues} <WarehousesSection
onChange={onChannelChange} onAdd={onWarehouseAdd}
allChannels={allChannels} onSearchChange={onWarehousesSearchChange}
selectedChannels={formData.channels} onChange={onWarehouseChange}
/> onFetchMore={onFetchMoreWarehouses}
</CardContent> displayValues={warehousesDisplayValues}
<Divider /> choices={warehousesChoices}
<CardContent> selectedWarehouses={formData.warehouses}
<WarehousesSection hasMore={hasMoreWarehouses}
onAdd={onWarehouseAdd} loading={loading}
onSearchChange={onWarehousesSearchChange} />
onChange={onWarehouseChange} </CardContent>
onFetchMore={onFetchMoreWarehouses}
displayValues={warehousesDisplayValues}
choices={warehousesChoices}
selectedWarehouses={formData.warehouses}
hasMore={hasMoreWarehouses}
loading={false}
/>
</CardContent>
</>
)}
</Card> </Card>
); );
}; };