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

Update snapshots

Browse source
This commit is contained in:
dominik-zeglen 2019-08-28 16:44:25 +02:00
parent 85cd2e875e
commit 609c99ace2
5 changed files with 1597 additions and 368 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/categories/components/CategoryProductList/CategoryProductList.tsx
View file

@ -13,13 +13,13 @@ import Checkbox from "@saleor/components/Checkbox";
import Money from "@saleor/components/Money"; import Money from "@saleor/components/Money";
import Skeleton from "@saleor/components/Skeleton"; import Skeleton from "@saleor/components/Skeleton";
import StatusLabel from "@saleor/components/StatusLabel"; import StatusLabel from "@saleor/components/StatusLabel";
import { FormattedMessage, useIntl } from "react-intl";
import TableCellAvatar, { import TableCellAvatar, {
AVATAR_MARGIN AVATAR_MARGIN
} from "@saleor/components/TableCellAvatar"; } from "@saleor/components/TableCellAvatar";
import TableHead from "@saleor/components/TableHead"; import TableHead from "@saleor/components/TableHead";
import TablePagination from "@saleor/components/TablePagination"; import TablePagination from "@saleor/components/TablePagination";
import i18n from "@saleor/i18n";
import { maybe, renderCollection } from "@saleor/misc"; import { maybe, renderCollection } from "@saleor/misc";
import { ListActions, ListProps } from "@saleor/types"; import { ListActions, ListProps } from "@saleor/types";
import React from "react"; import React from "react";
@ -95,6 +95,8 @@ export const CategoryProductList = withStyles(styles, {
onPreviousPage, onPreviousPage,
onRowClick onRowClick
}: CategoryProductListProps) => { }: CategoryProductListProps) => {
const intl = useIntl();
const numberOfColumns = 5; const numberOfColumns = 5;
return ( return (
@ -117,17 +119,26 @@ export const CategoryProductList = withStyles(styles, {
> >
<TableCell className={classes.colName}> <TableCell className={classes.colName}>
<span className={classes.colNameHeader}> <span className={classes.colNameHeader}>
{i18n.t("Name", { context: "object" })} <FormattedMessage defaultMessage="Name" description="product" />
</span> </span>
</TableCell> </TableCell>
<TableCell className={classes.colType}> <TableCell className={classes.colType}>
{i18n.t("Type", { context: "object" })} <FormattedMessage
defaultMessage="Type"
description="product type"
/>
</TableCell> </TableCell>
<TableCell className={classes.colPublished}> <TableCell className={classes.colPublished}>
{i18n.t("Published", { context: "object" })} <FormattedMessage
defaultMessage="Published"
description="product status"
/>
</TableCell> </TableCell>
<TableCell className={classes.colPrice}> <TableCell className={classes.colPrice}>
{i18n.t("Price", { context: "object" })} <FormattedMessage
defaultMessage="Price"
description="product price"
/>
</TableCell> </TableCell>
</TableHead> </TableHead>
<TableFooter> <TableFooter>
@ -186,11 +197,14 @@ export const CategoryProductList = withStyles(styles, {
<StatusLabel <StatusLabel
label={ label={
product.isAvailable product.isAvailable
? i18n.t("Published", { ? intl.formatMessage({
context: "product status" defaultMessage: "Published",
description: "product",
id: "productStatusLabel"
}) })
: i18n.t("Not published", { : intl.formatMessage({
context: "product status" defaultMessage: "Not published",
description: "product"
}) })
} }
status={product.isAvailable ? "success" : "error"} status={product.isAvailable ? "success" : "error"}
@ -214,7 +228,7 @@ export const CategoryProductList = withStyles(styles, {
() => ( () => (
<TableRow> <TableRow>
<TableCell colSpan={numberOfColumns}> <TableCell colSpan={numberOfColumns}>
{i18n.t("No products found")} <FormattedMessage defaultMessage="No products found" />
</TableCell> </TableCell>
</TableRow> </TableRow>
) )

2
src/categories/components/CategoryProductList/index.ts
View file

@ -0,0 +1,2 @@
export { default } from "./CategoryProductList";
export * from "./CategoryProductList";

34
src/products/components/ProductList/ProductList.tsx
View file

@ -11,6 +11,7 @@ import TableFooter from "@material-ui/core/TableFooter";
import TableRow from "@material-ui/core/TableRow"; import TableRow from "@material-ui/core/TableRow";
import classNames from "classnames"; import classNames from "classnames";
import React from "react"; import React from "react";
import { FormattedMessage, useIntl } from "react-intl";
import Checkbox from "@saleor/components/Checkbox"; import Checkbox from "@saleor/components/Checkbox";
import Money from "@saleor/components/Money"; import Money from "@saleor/components/Money";
@ -22,7 +23,6 @@ import TableCellAvatar, {
import TableHead from "@saleor/components/TableHead"; import TableHead from "@saleor/components/TableHead";
import TablePagination from "@saleor/components/TablePagination"; import TablePagination from "@saleor/components/TablePagination";
import { ProductListColumns } from "@saleor/config"; import { ProductListColumns } from "@saleor/config";
import i18n from "@saleor/i18n";
import { maybe, renderCollection } from "@saleor/misc"; import { maybe, renderCollection } from "@saleor/misc";
import { import {
getAttributeIdFromColumnValue, getAttributeIdFromColumnValue,
@ -113,6 +113,8 @@ export const ProductList = withStyles(styles, { name: "ProductList" })(
onUpdateListSettings, onUpdateListSettings,
onRowClick onRowClick
}: ProductListProps) => { }: ProductListProps) => {
const intl = useIntl();
const DisplayColumn: React.FC<{ column: ProductListColumns }> = props => ( const DisplayColumn: React.FC<{ column: ProductListColumns }> = props => (
<TDisplayColumn displayColumns={settings.columns} {...props} /> <TDisplayColumn displayColumns={settings.columns} {...props} />
); );
@ -154,17 +156,23 @@ export const ProductList = withStyles(styles, { name: "ProductList" })(
})} })}
> >
<span className={classes.colNameHeader}> <span className={classes.colNameHeader}>
{i18n.t("Name", { context: "object" })} <FormattedMessage defaultMessage="Name" description="product" />
</span> </span>
</TableCell> </TableCell>
<DisplayColumn column="productType"> <DisplayColumn column="productType">
<TableCell className={classes.colType}> <TableCell className={classes.colType}>
{i18n.t("Type", { context: "object" })} <FormattedMessage
defaultMessage="Type"
description="product type"
/>
</TableCell> </TableCell>
</DisplayColumn> </DisplayColumn>
<DisplayColumn column="isPublished"> <DisplayColumn column="isPublished">
<TableCell className={classes.colPublished}> <TableCell className={classes.colPublished}>
{i18n.t("Published", { context: "object" })} <FormattedMessage
defaultMessage="Published"
description="product status"
/>
</TableCell> </TableCell>
</DisplayColumn> </DisplayColumn>
{gridAttributesFromSettings.map(gridAttributeFromSettings => ( {gridAttributesFromSettings.map(gridAttributeFromSettings => (
@ -186,7 +194,10 @@ export const ProductList = withStyles(styles, { name: "ProductList" })(
))} ))}
<DisplayColumn column="price"> <DisplayColumn column="price">
<TableCell className={classes.colPrice}> <TableCell className={classes.colPrice}>
{i18n.t("Price", { context: "object" })} <FormattedMessage
defaultMessage="Price"
description="product price"
/>
</TableCell> </TableCell>
</DisplayColumn> </DisplayColumn>
</TableHead> </TableHead>
@ -251,11 +262,14 @@ export const ProductList = withStyles(styles, { name: "ProductList" })(
<StatusLabel <StatusLabel
label={ label={
product.isAvailable product.isAvailable
? i18n.t("Published", { ? intl.formatMessage({
context: "product status" defaultMessage: "Published",
description: "product",
id: "productStatusLabel"
}) })
: i18n.t("Not published", { : intl.formatMessage({
context: "product status" defaultMessage: "Not published",
description: "product"
}) })
} }
status={product.isAvailable ? "success" : "error"} status={product.isAvailable ? "success" : "error"}
@ -303,7 +317,7 @@ export const ProductList = withStyles(styles, { name: "ProductList" })(
() => ( () => (
<TableRow> <TableRow>
<TableCell colSpan={numberOfColumns}> <TableCell colSpan={numberOfColumns}>
{i18n.t("No products found")} <FormattedMessage defaultMessage="No products found" />
</TableCell> </TableCell>
</TableRow> </TableRow>
) )

1
src/products/components/ProductListPage/ProductListPage.tsx
View file

@ -12,6 +12,7 @@ import ColumnPicker, {
import Container from "@saleor/components/Container"; import Container from "@saleor/components/Container";
import PageHeader from "@saleor/components/PageHeader"; import PageHeader from "@saleor/components/PageHeader";
import { ProductListColumns } from "@saleor/config"; import { ProductListColumns } from "@saleor/config";
import { sectionNames } from "@saleor/intl";
import { import {
AvailableInGridAttributes_availableInGrid_edges_node, AvailableInGridAttributes_availableInGrid_edges_node,
AvailableInGridAttributes_grid_edges_node AvailableInGridAttributes_grid_edges_node

1894
src/storybook/__snapshots__/Stories.test.ts.snap
View file

File diff suppressed because it is too large Load diff