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

Merge pull request #744 from mirumee/fix/product-type-attributes-empty-table

Browse source 
Fix style of product type attributes empty table
This commit is contained in:
Dawid Tarasiuk 2020-10-07 15:54:15 +02:00 committed by GitHub
commit 758c22770f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 23 additions and 110 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG.md
View file

@ -47,7 +47,7 @@ All notable, unreleased changes to this project will be documented in this file.
- Change plural form of "informations" to "information" strings across the app #722 by @mmarkusik - Change plural form of "informations" to "information" strings across the app #722 by @mmarkusik
- Fix misaligned rich text draft controls - #725 by @orzechdev - Fix misaligned rich text draft controls - #725 by @orzechdev
- Allow taxes to be configured per product - #728 by @dominik-zeglen - Allow taxes to be configured per product - #728 by @dominik-zeglen
- Fix style of product type attributes empty table - #744 by @orzechdev
## 2.10.1 ## 2.10.1

42
src/productTypes/components/ProductTypeAttributes/ProductTypeAttributes.tsx
View file

@ -125,26 +125,28 @@ const ProductTypeAttributes: React.FC<ProductTypeAttributesProps> = props => {
<col className={classes.colSlug} /> <col className={classes.colSlug} />
<col className={classes.colAction} /> <col className={classes.colAction} />
</colgroup> </colgroup>
<TableHead {attributes?.length > 0 && (
colSpan={numberOfColumns} <TableHead
disabled={disabled} colSpan={numberOfColumns}
dragRows disabled={disabled}
selected={selected} dragRows
items={attributes} selected={selected}
toggleAll={toggleAll} items={attributes}
toolbar={toolbar} toggleAll={toggleAll}
> toolbar={toolbar}
<TableCell className={classes.colName}> >
<FormattedMessage defaultMessage="Attribute name" /> <TableCell className={classes.colName}>
</TableCell> <FormattedMessage defaultMessage="Attribute name" />
<TableCell className={classes.colName}> </TableCell>
<FormattedMessage <TableCell className={classes.colName}>
defaultMessage="Slug" <FormattedMessage
description="attribute internal name" defaultMessage="Slug"
/> description="attribute internal name"
</TableCell> />
<TableCell /> </TableCell>
</TableHead> <TableCell />
</TableHead>
)}
<SortableTableBody onSortEnd={onAttributeReorder}> <SortableTableBody onSortEnd={onAttributeReorder}>
{renderCollection( {renderCollection(
attributes, attributes,

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

@ -128346,71 +128346,6 @@ exports[`Storyshots Views / Product types / Product type details loading 1`] = `
class="ProductTypeAttributes-colAction-id" class="ProductTypeAttributes-colAction-id"
/> />
</colgroup> </colgroup>
<thead
class="MuiTableHead-root-id"
>
<tr
class="MuiTableRow-root-id MuiTableRow-head-id"
>
<th
class="MuiTableCell-root-id MuiTableCell-head-id"
scope="col"
/>
<th
class="MuiTableCell-root-id MuiTableCell-head-id TableHead-dragRows-id MuiTableCell-paddingCheckbox-id"
scope="col"
>
<span
aria-disabled="true"
class="MuiButtonBase-root-id MuiIconButton-root-id PrivateSwitchBase-root-id MuiCheckbox-root-id MuiCheckbox-colorPrimary-id PrivateSwitchBase-disabled-id MuiCheckbox-disabled-id MuiIconButton-colorPrimary-id MuiIconButton-disabled-id MuiButtonBase-disabled-id"
tabindex="-1"
>
<span
class="MuiIconButton-label-id"
>
<input
class="PrivateSwitchBase-input-id"
data-indeterminate="false"
disabled=""
type="checkbox"
/>
<svg
aria-hidden="true"
class="MuiSvgIcon-root-id"
focusable="false"
role="presentation"
viewBox="0 0 24 24"
>
<rect
fill="none"
height="14"
stroke="currentColor"
width="14"
x="5"
y="5"
/>
</svg>
</span>
</span>
</th>
<th
class="MuiTableCell-root-id MuiTableCell-head-id ProductTypeAttributes-colName-id"
scope="col"
>
Attribute name
</th>
<th
class="MuiTableCell-root-id MuiTableCell-head-id ProductTypeAttributes-colName-id"
scope="col"
>
Slug
</th>
<th
class="MuiTableCell-root-id MuiTableCell-head-id"
scope="col"
/>
</tr>
</thead>
<tbody <tbody
class="MuiTableBody-root-id" class="MuiTableBody-root-id"
> >
@ -128972,30 +128907,6 @@ exports[`Storyshots Views / Product types / Product type details no attributes 1
class="ProductTypeAttributes-colAction-id" class="ProductTypeAttributes-colAction-id"
/> />
</colgroup> </colgroup>
<thead
class="MuiTableHead-root-id"
>
<tr
class="MuiTableRow-root-id MuiTableRow-head-id"
>
<th
class="MuiTableCell-root-id MuiTableCell-head-id ProductTypeAttributes-colName-id"
scope="col"
>
Attribute name
</th>
<th
class="MuiTableCell-root-id MuiTableCell-head-id ProductTypeAttributes-colName-id"
scope="col"
>
Slug
</th>
<th
class="MuiTableCell-root-id MuiTableCell-head-id"
scope="col"
/>
</tr>
</thead>
<tbody <tbody
class="MuiTableBody-root-id" class="MuiTableBody-root-id"
> >