-
Notifications
You must be signed in to change notification settings - Fork 1.2k
Feature/attribute values search #6301
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from 8 commits
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
ec0ca8a
Ads changeset
mirekm 423634b
Add attribute values filtering
mirekm 64daac3
Hook search into server side filtering for attribute values
mirekm 80ccc7f
Refactor Attribute values search
mirekm a0352ed
Add ripple
mirekm b67bd3b
Add tests
mirekm 9f40d75
Extract messages
mirekm 78930ad
Disable sorting when in search mode
mirekm 8092807
Don't pass the search query in variants
mirekm d80b8a3
Merge branch 'main' into feature/attribute-values-search
mirekm b7f8948
Simplify redundant condition
mirekm f7454a2
Fix types
mirekm File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Some comments aren't visible on the classic Files Changed page.
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| --- | ||
| "saleor-dashboard": patch | ||
| --- | ||
|
|
||
| Attribute configuration: allow users to filter attribute values by slug or name when there are more than 5 values. | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
| @@ -1,7 +1,9 @@ | ||||||
| import { rippleAttributeValuesSearch } from "@dashboard/attributes/ripples/attributeValuesSearch"; | ||||||
| import { DashboardCard } from "@dashboard/components/Card"; | ||||||
| import { iconSize, iconStrokeWidthBySize } from "@dashboard/components/icons"; | ||||||
| import { Placeholder } from "@dashboard/components/Placeholder"; | ||||||
| import { ResponsiveTable } from "@dashboard/components/ResponsiveTable"; | ||||||
| import { SearchInput } from "@dashboard/components/SearchInput/SearchInput"; | ||||||
| import { SortableTableBody, SortableTableRow } from "@dashboard/components/SortableTable"; | ||||||
| import { TablePagination } from "@dashboard/components/TablePagination"; | ||||||
| import TableRowLink from "@dashboard/components/TableRowLink"; | ||||||
|
|
@@ -11,6 +13,7 @@ import { | |||||
| AttributeValueListFragment, | ||||||
| } from "@dashboard/graphql"; | ||||||
| import { renderCollection, stopPropagation } from "@dashboard/misc"; | ||||||
| import { Ripple } from "@dashboard/ripples/components/Ripple"; | ||||||
| import { ListProps, PaginateListProps, RelayToFlat, ReorderAction } from "@dashboard/types"; | ||||||
| import { TableCell, TableHead } from "@material-ui/core"; | ||||||
| import { makeStyles } from "@saleor/macaw-ui"; | ||||||
|
|
@@ -28,6 +31,8 @@ interface AttributeValuesProps | |||||
| onValueReorder: ReorderAction; | ||||||
| onValueUpdate: (id: string) => void; | ||||||
| inputType: AttributeInputTypeEnum; | ||||||
| searchQuery?: string; | ||||||
| onSearchChange?: (query: string) => void; | ||||||
| } | ||||||
|
|
||||||
| const useStyles = makeStyles( | ||||||
|
|
@@ -72,6 +77,7 @@ const getSwatchCellStyle = (value?: AttributeValueFragment | undefined) => { | |||||
| ? { backgroundImage: `url(${value.file.url})` } | ||||||
| : { backgroundColor: value.value ?? undefined }; | ||||||
| }; | ||||||
|
|
||||||
| const AttributeValues = ({ | ||||||
| disabled, | ||||||
| onValueAdd, | ||||||
|
|
@@ -85,11 +91,16 @@ const AttributeValues = ({ | |||||
| onNextPage, | ||||||
| onPreviousPage, | ||||||
| inputType, | ||||||
| searchQuery = "", | ||||||
| onSearchChange, | ||||||
| }: AttributeValuesProps) => { | ||||||
| const classes = useStyles({}); | ||||||
| const intl = useIntl(); | ||||||
| const isSwatch = inputType === AttributeInputTypeEnum.SWATCH; | ||||||
|
|
||||||
| // Show search when callback is provided (controlled by parent) | ||||||
| const showSearch = Boolean(onSearchChange); | ||||||
|
Comment on lines
+101
to
+102
|
||||||
|
|
||||||
| return ( | ||||||
| <DashboardCard data-test-id="attribute-values-section"> | ||||||
| <DashboardCard.Header> | ||||||
|
|
@@ -118,113 +129,151 @@ const AttributeValues = ({ | |||||
| <DashboardCard.Content> | ||||||
| {values === undefined ? ( | ||||||
| <Skeleton /> | ||||||
| ) : values.length === 0 ? ( | ||||||
| <Placeholder> | ||||||
| <FormattedMessage | ||||||
| id="dAst+b" | ||||||
| defaultMessage="No values found" | ||||||
| description="attribute values list: no attribute values found" | ||||||
| /> | ||||||
| </Placeholder> | ||||||
| ) : ( | ||||||
| <ResponsiveTable | ||||||
| footer={ | ||||||
| <TablePagination | ||||||
| hasNextPage={pageInfo && !disabled ? pageInfo.hasNextPage : false} | ||||||
| onNextPage={onNextPage} | ||||||
| hasPreviousPage={pageInfo && !disabled ? pageInfo.hasPreviousPage : false} | ||||||
| onPreviousPage={onPreviousPage} | ||||||
| settings={settings} | ||||||
| onUpdateListSettings={onUpdateListSettings} | ||||||
| /> | ||||||
| } | ||||||
| > | ||||||
| <TableHead> | ||||||
| <TableRowLink> | ||||||
| <TableCell className={classes.columnDrag} /> | ||||||
| {isSwatch && ( | ||||||
| <TableCell className={classes.columnSwatch}> | ||||||
| <FormattedMessage | ||||||
| id="NUevU9" | ||||||
| defaultMessage="Swatch" | ||||||
| description="attribute values list: slug column header" | ||||||
| /> | ||||||
| </TableCell> | ||||||
| )} | ||||||
| <TableCell className={classes.columnAdmin}> | ||||||
| <FormattedMessage | ||||||
| id="3psvRS" | ||||||
| defaultMessage="Admin" | ||||||
| description="attribute values list: slug column header" | ||||||
| /> | ||||||
| </TableCell> | ||||||
| <TableCell className={classes.columnStore}> | ||||||
| <FormattedMessage | ||||||
| id="H60H6L" | ||||||
| defaultMessage="Default Store View" | ||||||
| description="attribute values list: name column header" | ||||||
| <Box display="flex" flexDirection="column" gap={4}> | ||||||
| {/* Search input - always visible when search is enabled */} | ||||||
|
||||||
| {/* Search input - always visible when search is enabled */} | |
| {/* Search input - rendered when onSearchChange is provided (visibility controlled by parent) */} |
mirekm marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
mirekm marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
mirekm marked this conversation as resolved.
Show resolved
Hide resolved
mirekm marked this conversation as resolved.
Show resolved
Hide resolved
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1 @@ | ||
| export { default } from "./AttributeValues"; | ||
| export * from "./AttributeValues"; | ||
| export { AttributeValues } from "./AttributeValues"; | ||
mirekm marked this conversation as resolved.
Show resolved
Hide resolved
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The changeset description states that users can filter "when there are more than 5 values", but this condition is not implemented in the code. The search feature is always available regardless of the number of values. Either update this description to match the actual implementation, or implement the condition as described.