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

Merge pull request #1299 from mirumee/SALEOR-3611-warehouse-settings-card-fix

Browse source 
warehouse settings card fix
This commit is contained in:
SektorDV 2021-08-24 11:13:47 +02:00 committed by GitHub
commit 0cdcec4476
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2,7 +2,6 @@ import { Card, CardContent, Divider } from "@material-ui/core";
import { BaseChannels_channels } from "@saleor/channels/types/BaseChannels";
import CardTitle from "@saleor/components/CardTitle";
import { MultiAutocompleteChoiceType } from "@saleor/components/MultiAutocompleteSelectField";
import Skeleton from "@saleor/components/Skeleton";
import { FormChange } from "@saleor/hooks/useForm";
import React from "react";
import { defineMessages, useIntl } from "react-intl";
@ -52,38 +51,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>
);
};