diff --git a/src/categories/components/CategoryProductList/CategoryProductList.tsx b/src/categories/components/CategoryProductList/CategoryProductList.tsx index 2cd9c53d1..1d7a894a6 100644 --- a/src/categories/components/CategoryProductList/CategoryProductList.tsx +++ b/src/categories/components/CategoryProductList/CategoryProductList.tsx @@ -13,13 +13,13 @@ import Checkbox from "@saleor/components/Checkbox"; import Money from "@saleor/components/Money"; import Skeleton from "@saleor/components/Skeleton"; import StatusLabel from "@saleor/components/StatusLabel"; +import { FormattedMessage, useIntl } from "react-intl"; import TableCellAvatar, { AVATAR_MARGIN } from "@saleor/components/TableCellAvatar"; import TableHead from "@saleor/components/TableHead"; import TablePagination from "@saleor/components/TablePagination"; -import i18n from "@saleor/i18n"; import { maybe, renderCollection } from "@saleor/misc"; import { ListActions, ListProps } from "@saleor/types"; import React from "react"; @@ -95,6 +95,8 @@ export const CategoryProductList = withStyles(styles, { onPreviousPage, onRowClick }: CategoryProductListProps) => { + const intl = useIntl(); + const numberOfColumns = 5; return ( @@ -117,17 +119,26 @@ export const CategoryProductList = withStyles(styles, { > - {i18n.t("Name", { context: "object" })} + - {i18n.t("Type", { context: "object" })} + - {i18n.t("Published", { context: "object" })} + - {i18n.t("Price", { context: "object" })} + @@ -186,11 +197,14 @@ export const CategoryProductList = withStyles(styles, { ( - {i18n.t("No products found")} + ) diff --git a/src/categories/components/CategoryProductList/index.ts b/src/categories/components/CategoryProductList/index.ts index e69de29bb..5bc658620 100644 --- a/src/categories/components/CategoryProductList/index.ts +++ b/src/categories/components/CategoryProductList/index.ts @@ -0,0 +1,2 @@ +export { default } from "./CategoryProductList"; +export * from "./CategoryProductList"; diff --git a/src/products/components/ProductList/ProductList.tsx b/src/products/components/ProductList/ProductList.tsx index 677576ac9..88508d18a 100644 --- a/src/products/components/ProductList/ProductList.tsx +++ b/src/products/components/ProductList/ProductList.tsx @@ -11,6 +11,7 @@ import TableFooter from "@material-ui/core/TableFooter"; import TableRow from "@material-ui/core/TableRow"; import classNames from "classnames"; import React from "react"; +import { FormattedMessage, useIntl } from "react-intl"; import Checkbox from "@saleor/components/Checkbox"; import Money from "@saleor/components/Money"; @@ -22,7 +23,6 @@ import TableCellAvatar, { import TableHead from "@saleor/components/TableHead"; import TablePagination from "@saleor/components/TablePagination"; import { ProductListColumns } from "@saleor/config"; -import i18n from "@saleor/i18n"; import { maybe, renderCollection } from "@saleor/misc"; import { getAttributeIdFromColumnValue, @@ -113,6 +113,8 @@ export const ProductList = withStyles(styles, { name: "ProductList" })( onUpdateListSettings, onRowClick }: ProductListProps) => { + const intl = useIntl(); + const DisplayColumn: React.FC<{ column: ProductListColumns }> = props => ( ); @@ -154,17 +156,23 @@ export const ProductList = withStyles(styles, { name: "ProductList" })( })} > - {i18n.t("Name", { context: "object" })} + - {i18n.t("Type", { context: "object" })} + - {i18n.t("Published", { context: "object" })} + {gridAttributesFromSettings.map(gridAttributeFromSettings => ( @@ -186,7 +194,10 @@ export const ProductList = withStyles(styles, { name: "ProductList" })( ))} - {i18n.t("Price", { context: "object" })} + @@ -251,11 +262,14 @@ export const ProductList = withStyles(styles, { name: "ProductList" })( ( - {i18n.t("No products found")} + ) diff --git a/src/products/components/ProductListPage/ProductListPage.tsx b/src/products/components/ProductListPage/ProductListPage.tsx index d89e8077d..ec18734b2 100644 --- a/src/products/components/ProductListPage/ProductListPage.tsx +++ b/src/products/components/ProductListPage/ProductListPage.tsx @@ -12,6 +12,7 @@ import ColumnPicker, { import Container from "@saleor/components/Container"; import PageHeader from "@saleor/components/PageHeader"; import { ProductListColumns } from "@saleor/config"; +import { sectionNames } from "@saleor/intl"; import { AvailableInGridAttributes_availableInGrid_edges_node, AvailableInGridAttributes_grid_edges_node diff --git a/src/storybook/__snapshots__/Stories.test.ts.snap b/src/storybook/__snapshots__/Stories.test.ts.snap index e4807b17f..b93bd06f1 100644 --- a/src/storybook/__snapshots__/Stories.test.ts.snap +++ b/src/storybook/__snapshots__/Stories.test.ts.snap @@ -1116,6 +1116,54 @@ exports[`Storyshots Generics / Column picker default 1`] = ` `; +exports[`Storyshots Generics / Column picker loading 1`] = ` +
+
+
+
+
+ +
+
+
+
+
+`; + exports[`Storyshots Generics / Date default 1`] = `
Name Type Published Price @@ -19704,25 +19752,25 @@ Ctrl + K" class="CardTitle-hr-id" />
0 @@ -21401,11 +21439,11 @@ Ctrl + K" src="placeholder60x60.png" /> - Murray Inc - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -91641,7 +92259,7 @@ exports[`Storyshots Views / Products / Product list loading 1`] = ` /> - ‌ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -93613,7 +94811,7 @@ exports[`Storyshots Views / Products / Product variant details attribute errors src="placeholder60x60.png" /> - @@ -93641,7 +94839,7 @@ exports[`Storyshots Views / Products / Product variant details attribute errors src="placeholder60x60.png" /> - @@ -93669,7 +94867,7 @@ exports[`Storyshots Views / Products / Product variant details attribute errors src="placeholder60x60.png" /> - @@ -93697,7 +94895,7 @@ exports[`Storyshots Views / Products / Product variant details attribute errors src="placeholder60x60.png" /> - @@ -94296,7 +95494,7 @@ exports[`Storyshots Views / Products / Product variant details when loaded data src="placeholder60x60.png" /> - @@ -94324,7 +95522,7 @@ exports[`Storyshots Views / Products / Product variant details when loaded data src="placeholder60x60.png" /> - @@ -94352,7 +95550,7 @@ exports[`Storyshots Views / Products / Product variant details when loaded data src="placeholder60x60.png" /> - @@ -94380,7 +95578,7 @@ exports[`Storyshots Views / Products / Product variant details when loaded data src="placeholder60x60.png" /> - @@ -94985,7 +96183,7 @@ exports[`Storyshots Views / Products / Product variant details when loading data /> -
Name Type Published Price @@ -19841,8 +19889,7 @@ Ctrl + K" class="MuiTableBody-root-id" >
- Gardner-Schultz - + 		Coffee
$83.30
- James, Martinez and Murray - + 		Coffee
$68.27
- Curtis, Joyce and Turner - + 		Coffee
$21.43
- Davis, Brown and Ray - + 		Coffee
$62.76
- Gallegos Ltd - + 		Coffee
$7.13
- Franklin Inc - + 		Coffee
$48.82
- Williams-Taylor - + 		Coffee
$27.34
- Riddle, Evans and Hicks - + 		Coffee
$75.42
- Hebert-Sherman - + 		Coffee
$86.62
- Carter and Sons - + 		Coffee
$48.66 - Williams-Taylor - + - Hebert-Sherman - + - Estes, Johnson and Graham - + - ‌ - + - Orange Juice - + - Carrot Juice - + - Bean Juice - + - Black Hoodie - + - @@ -47030,7 +47068,7 @@ exports[`Storyshots Views / HomePage loading 1`] = ` /> - @@ -51199,11 +51237,11 @@ exports[`Storyshots Views / Orders / Order details cancelled 1`] = ` src="placeholder60x60.png" /> - Watkins-Gonzalez (Soft) - + - Williams, Garcia and Walker (XS) - + - Williams, Garcia and Walker (XS) - + - Watkins-Gonzalez (Soft) - + - Williams, Garcia and Walker (XS) - + - Williams, Garcia and Walker (XS) - + - Watkins-Gonzalez (Soft) - + - Williams, Garcia and Walker (XS) - + - Williams, Garcia and Walker (XS) - + - ‌ - + - Watkins-Gonzalez (Soft) - + - Williams, Garcia and Walker (XS) - + - Williams, Garcia and Walker (XS) - + - Watkins-Gonzalez (Soft) - + - Williams, Garcia and Walker (XS) - + - Williams, Garcia and Walker (XS) - + - Watkins-Gonzalez (Soft) - + - Williams, Garcia and Walker (XS) - + - Williams, Garcia and Walker (XS) - + - Watkins-Gonzalez (Soft) - + - Williams, Garcia and Walker (XS) - + - Williams, Garcia and Walker (XS) - + - Watkins-Gonzalez (Soft) - + - Williams, Garcia and Walker (XS) - + - Williams, Garcia and Walker (XS) - + - Watkins-Gonzalez (Soft) - + - Williams, Garcia and Walker (XS) - + - Williams, Garcia and Walker (XS) - + - Watkins-Gonzalez (Soft) - + - Williams, Garcia and Walker (XS) - + - Williams, Garcia and Walker (XS) - + - Watkins-Gonzalez (Soft) - + - Williams, Garcia and Walker (XS) - + - Williams, Garcia and Walker (XS) - + - Watkins-Gonzalez (Soft) - + - Williams, Garcia and Walker (XS) - + - Williams, Garcia and Walker (XS) - + - Watkins-Gonzalez (Soft) - + - Williams, Garcia and Walker (XS) - + - Williams, Garcia and Walker (XS) - + -

58-1338 - +

-

15-1337 - +

- ‌ - + - @@ -82315,7 +82353,7 @@ exports[`Storyshots Views / Products / Create product variant default 1`] = ` src="placeholder255x255.png" /> - @@ -82343,7 +82381,7 @@ exports[`Storyshots Views / Products / Create product variant default 1`] = ` src="placeholder255x255.png" /> - @@ -82397,7 +82435,7 @@ exports[`Storyshots Views / Products / Create product variant default 1`] = ` - @@ -82835,7 +82873,7 @@ exports[`Storyshots Views / Products / Create product variant when loading data /> - @@ -82893,7 +82931,7 @@ exports[`Storyshots Views / Products / Create product variant when loading data - @@ -83263,7 +83301,7 @@ exports[`Storyshots Views / Products / Create product variant with errors 1`] = src="placeholder255x255.png" /> - @@ -83291,7 +83329,7 @@ exports[`Storyshots Views / Products / Create product variant with errors 1`] = src="placeholder255x255.png" /> - @@ -83345,7 +83383,7 @@ exports[`Storyshots Views / Products / Create product variant with errors 1`] = - @@ -90605,7 +90643,6 @@ exports[`Storyshots Views / Products / Product list default 1`] = ` >
- - Gardner-Schultz - + Nebula Night Sky Paint + - Coffee + Paint - $83.30 + $15.00
- - James, Martinez and Murray - + Light Speed Yellow Paint + - Coffee + Paint - $68.27 + $15.00
- - Curtis, Joyce and Turner - + Hyperspace Turquoise Paint + - Coffee + Paint - $21.43 + $15.00
- - Davis, Brown and Ray - + Pineapple Juice + - Coffee + Juice - $62.76 + $3.00
- - Gallegos Ltd - + Coconut Juice + - Coffee + Juice - $7.13 + $3.00
- - Franklin Inc - + Apple Juice + - Coffee + Juice - $48.82 + $3.00
- - Williams-Taylor - + Orange Juice + - Coffee + Juice - $27.34 + $3.00
- - Riddle, Evans and Hicks - + Banana Juice + - Coffee + Juice - $75.42 + $3.00
- - Hebert-Sherman - + Bean Juice + - Coffee + Juice - $86.62 + $3.00
- - Carter and Sons - + Carrot Juice + - Coffee + Juice - $48.66 + $3.00 +
+ + +
+
+ +
+
+ Green Juice +
+
+ 		+ Juice + +
+ Published +
+ 		+ $3.00 +
+ + +
+
+ +
+
+ Code Division T-shirt +
+
+ 		+ Top (clothing) + +
+ Published +
+ 		+ $30.00 +
+ + +
+
+ +
+
+ Polo Shirt +
+
+ 		+ Top (clothing) + +
+ Published +
+ 		+ $30.00 +
+ + +
+
+ +
+
+ Polo Shirt +
+
+ 		+ Top (clothing) + +
+ Published +
+ 		+ $30.00 +
+ + +
+
+ +
+
+ Polo Shirt +
+
+ 		+ Top (clothing) + +
+ Published +
+ 		+ $30.00 +
+ + +
+
+ +
+
+ Polo Shirt +
+
+ 		+ Top (clothing) + +
+ Published +
+ 		+ $30.00 +
+ + +
+
+ +
+
+ Black Hoodie +
+
+ 		+ Top (clothing) + +
+ Published +
+ 		+ $30.00 +
+ + +
+
+ +
+
+ Blue Hoodie +
+
+ 		+ Top (clothing) + +
+ Published +
+ 		+ $30.00 +
+ + +
+
+ +
+
+ Mustard Hoodie +
+
+ 		+ Top (clothing) + +
+ Published +
+ 		+ $30.00 +
+ + +
+
+ +
+
+ Colored Parrot Cushion +
+
+ 		+ Cushion + +
+ Published +
+ 		+ $20.00
- - Gardner-Schultz - + Nebula Night Sky Paint + - Coffee + Paint - $83.30 + $15.00
- - James, Martinez and Murray - + Light Speed Yellow Paint + - Coffee + Paint - $68.27 + $15.00
- - Curtis, Joyce and Turner - + Hyperspace Turquoise Paint + - Coffee + Paint - $21.43 + $15.00
- - Davis, Brown and Ray - + Pineapple Juice + - Coffee + Juice - $62.76 + $3.00
- - Gallegos Ltd - + Coconut Juice + - Coffee + Juice - $7.13 + $3.00
- - Franklin Inc - + Apple Juice + - Coffee + Juice - $48.82 + $3.00
- - Williams-Taylor - + Orange Juice + - Coffee + Juice - $27.34 + $3.00
- - Riddle, Evans and Hicks - + Banana Juice + - Coffee + Juice - $75.42 + $3.00
- - Hebert-Sherman - + Bean Juice + - Coffee + Juice - $86.62 + $3.00
- - Carter and Sons - + Carrot Juice + - Coffee + Juice - $48.66 + $3.00 +
+ + +
+
+ +
+
+ Green Juice +
+
+ 		+ Juice + +
+ Published +
+ 		+ $3.00 +
+ + +
+
+ +
+
+ Code Division T-shirt +
+
+ 		+ Top (clothing) + +
+ Published +
+ 		+ $30.00 +
+ + +
+
+ +
+
+ Polo Shirt +
+
+ 		+ Top (clothing) + +
+ Published +
+ 		+ $30.00 +
+ + +
+
+ +
+
+ Polo Shirt +
+
+ 		+ Top (clothing) + +
+ Published +
+ 		+ $30.00 +
+ + +
+
+ +
+
+ Polo Shirt +
+
+ 		+ Top (clothing) + +
+ Published +
+ 		+ $30.00 +
+ + +
+
+ +
+
+ Polo Shirt +
+
+ 		+ Top (clothing) + +
+ Published +
+ 		+ $30.00 +
+ + +
+
+ +
+
+ Black Hoodie +
+
+ 		+ Top (clothing) + +
+ Published +
+ 		+ $30.00 +
+ + +
+
+ +
+
+ Blue Hoodie +
+
+ 		+ Top (clothing) + +
+ Published +
+ 		+ $30.00 +
+ + +
+
+ +
+
+ Mustard Hoodie +
+
+ 		+ Top (clothing) + +
+ Published +
+ 		+ $30.00 +
+ + +
+
+ +
+
+ Colored Parrot Cushion +
+
+ 		+ Cushion + +
+ Published +
+ 		+ $20.00