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 (
<Card>
<CardTitle title={intl.formatMessage(messages.title)} />
{loading && (
<CardContent>
<Skeleton />
</CardContent>
)}
{!loading && (
<>
<CardContent>
<ChannelsSection
channelsDisplayValues={channelsDisplayValues}
onChange={onChannelChange}
allChannels={allChannels}
selectedChannels={formData.channels}
/>
</CardContent>
<Divider />
<CardContent>
<WarehousesSection
onAdd={onWarehouseAdd}
onSearchChange={onWarehousesSearchChange}
onChange={onWarehouseChange}
onFetchMore={onFetchMoreWarehouses}
displayValues={warehousesDisplayValues}
choices={warehousesChoices}
selectedWarehouses={formData.warehouses}
hasMore={hasMoreWarehouses}
loading={false}
/>
</CardContent>
</>
)}
<CardContent>
<ChannelsSection
channelsDisplayValues={channelsDisplayValues}
onChange={onChannelChange}
allChannels={allChannels}
selectedChannels={formData.channels}
/>
</CardContent>
<Divider />
<CardContent>
<WarehousesSection
onAdd={onWarehouseAdd}
onSearchChange={onWarehousesSearchChange}
onChange={onWarehouseChange}
onFetchMore={onFetchMoreWarehouses}
displayValues={warehousesDisplayValues}
choices={warehousesChoices}
selectedWarehouses={formData.warehouses}
hasMore={hasMoreWarehouses}
loading={loading}
/>
</CardContent>
</Card>
);
};