[FEAT] Allow for queries/filters on collections when generating the sitemap #109
There are no files selected for viewing
This file contains 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 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,103 @@ | ||
| import * as React from 'react'; | ||
|
|
||
| import { | ||
| Grid, | ||
| Typography, | ||
| Flex, | ||
| Button, | ||
| } from '@strapi/design-system'; | ||
| import { useIntl } from 'react-intl'; | ||
| import { useDispatch } from 'react-redux'; | ||
|
|
||
| import SelectConditional from '../../../SelectConditional'; | ||
| import { onChangeContentTypes } from '../../../../state/actions/Sitemap'; | ||
|
|
||
| // eslint-disable-next-line arrow-body-style | ||
| const Filters = (props) => { | ||
| // eslint-disable-next-line @typescript-eslint/unbound-method | ||
| const { formatMessage } = useIntl(); | ||
| const dispatch = useDispatch(); | ||
| const [conditionCount, setConditionCount] = React.useState(0); | ||
| const { | ||
| modifiedState, | ||
| uid, | ||
| langcode, | ||
| contentTypes, | ||
| } = props; | ||
|
|
||
| React.useEffect(() => { | ||
| // get the initial condition count | ||
| const count = Object.keys(modifiedState.getIn([uid, 'filters'], []).toJS()).length; | ||
| setConditionCount(count); | ||
| }, [uid, langcode]); | ||
|
|
||
| const handleRemoveCondition = () => { | ||
| dispatch(onChangeContentTypes(uid, null, ['filters', conditionCount, 'field'], '')); | ||
| dispatch(onChangeContentTypes(uid, null, ['filters', conditionCount, 'operator'], '')); | ||
| dispatch(onChangeContentTypes(uid, null, ['filters', conditionCount, 'value'], '')); | ||
| setConditionCount(conditionCount - 1); | ||
| }; | ||
| return ( | ||
| <div> | ||
| {conditionCount === 0 ? ( | ||
|
There was a problem hiding this comment. I think this condition can be optimized. The only thing that should/shouldn't show for this ternary is the list of conditions. Though this ternary is used to render the entire component leaving duplicate code below (e.g. the add/remove buttons). If we use the ternary just for the conditions list this would be resolved. |
||
| <Flex direction="column" alignItems="stretch"> | ||
| <Flex direction="row" justifyContent="space-between"> | ||
| <Flex direction="column" justifyContent="center" alignItems="flex-start"> | ||
| <Typography variant="pi" fontWeight="bold"> | ||
| {formatMessage({ id: 'sitemap.Settings.Field.Condition.Label', defaultMessage: 'Conditional Filtering' })} | ||
| </Typography> | ||
| <Typography> | ||
| {formatMessage({ id: 'sitemap.Settings.Field.Condition.Description', defaultMessage: 'Only include URLs that match the following condition.' })} | ||
| </Typography> | ||
| </Flex> | ||
| <Flex direction="row" alignItems="center" gap={2}> | ||
| <Button onClick={() => setConditionCount(conditionCount + 1)}> | ||
| {formatMessage({ id: 'sitemap.Settings.Field.Condition.Add', defaultMessage: 'Add' })} | ||
| </Button> | ||
| <Button variant="secondary" onClick={() => handleRemoveCondition()}> | ||
| {formatMessage({ id: 'sitemap.Settings.Field.Condition.Remove', defaultMessage: 'Remove' })} | ||
| </Button> | ||
| </Flex> | ||
| </Flex> | ||
| </Flex> | ||
| ) : ( | ||
| <Flex direction="column" alignItems="stretch"> | ||
| <Flex direction="row" justifyContent="space-between" style={{ marginBottom: '2rem' }}> | ||
| <Flex direction="column" justifyContent="center" alignItems="flex-start"> | ||
| <Typography variant="pi" fontWeight="bold"> | ||
| {formatMessage({ id: 'sitemap.Settings.Field.Condition.Label', defaultMessage: 'Conditional Filtering' })} | ||
| </Typography> | ||
| <Typography> | ||
| {formatMessage({ id: 'sitemap.Settings.Field.Condition.Description', defaultMessage: 'Only include URLs that match the following conditions.' })} | ||
| </Typography> | ||
| </Flex> | ||
| <Flex direction="row" alignItems="center" gap={2}> | ||
| <Button onClick={() => setConditionCount(conditionCount + 1)}> | ||
| {formatMessage({ id: 'sitemap.Settings.Field.Condition.Add', defaultMessage: 'Add' })} | ||
| </Button> | ||
| <Button variant="secondary" onClick={() => handleRemoveCondition()}> | ||
| {formatMessage({ id: 'sitemap.Settings.Field.Condition.Remove', defaultMessage: 'Remove' })} | ||
| </Button> | ||
| </Flex> | ||
| </Flex> | ||
| {Array.from(Array(conditionCount).keys()).map((i) => ( | ||
| <Grid gap={4} style={{ marginBottom: '1rem' }}> | ||
| <SelectConditional | ||
| disabled={!uid || (contentTypes[uid].locales && !langcode)} | ||
| contentType={contentTypes[uid]} | ||
| onConditionChange={(value) => dispatch(onChangeContentTypes(uid, null, ['filters', String(i), 'field'], value))} | ||
| onOperatorChange={(value) => dispatch(onChangeContentTypes(uid, null, ['filters', String(i), 'operator'], value))} | ||
| onValueChange={(value) => dispatch(onChangeContentTypes(uid, null, ['filters', String(i), 'value'], value))} | ||
| condition={modifiedState.getIn([uid, 'filters', String(i), 'field'], '')} | ||
| conditionOperator={modifiedState.getIn([uid, 'filters', String(i), 'operator'], '')} | ||
| conditionValue={modifiedState.getIn([uid, 'filters', String(i), 'value'], '')} | ||
| /> | ||
| </Grid> | ||
| ))} | ||
| </Flex> | ||
| )} | ||
| </div> | ||
| ); | ||
| }; | ||
|
|
||
| export default Filters; | ||
This file contains 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 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,85 @@ | ||
| import React from 'react'; | ||
| import { Select, Option, TextInput, GridItem } from '@strapi/design-system'; | ||
| import { useIntl } from 'react-intl'; | ||
|
|
||
| const operators = [ | ||
| '$not', | ||
| '$eq', | ||
| '$eqi', | ||
| '$ne', | ||
| '$in', | ||
| '$notIn', | ||
| '$lt', | ||
| '$lte', | ||
| '$gt', | ||
| '$gte', | ||
| '$between', | ||
| '$contains', | ||
| '$notContains', | ||
| '$containsi', | ||
| '$notContainsi', | ||
| '$startsWith', | ||
| '$endsWith', | ||
| '$null', | ||
| '$notNull', | ||
| ]; | ||
|
|
||
| const SelectConditional = (props) => { | ||
| const { formatMessage } = useIntl(); | ||
|
|
||
| const { | ||
| contentType, | ||
| disabled, | ||
| onConditionChange, | ||
| onOperatorChange, | ||
| onValueChange, | ||
| condition, | ||
| conditionOperator, | ||
| conditionValue, | ||
| } = props; | ||
|
|
||
| return ( | ||
| <> | ||
| <GridItem col={4}> | ||
| <Select | ||
| name="select" | ||
| label={formatMessage({ id: 'sitemap.Settings.Field.SelectConditional.Label', defaultMessage: 'Attribute' })} | ||
| hint={formatMessage({ id: 'sitemap.Settings.Field.SelectConditional.Description', defaultMessage: 'Select an attribute' })} | ||
| disabled={disabled} | ||
| onChange={(condition) => onConditionChange(condition)} | ||
| value={condition} | ||
| > | ||
| {contentType && contentType.attributes.map((attribute) => { | ||
| return <Option value={attribute} key={attribute}>{attribute}</Option>; | ||
| })} | ||
| </Select> | ||
| </GridItem> | ||
| <GridItem col={2}> | ||
| <Select | ||
| name="select" | ||
| label={formatMessage({ id: 'sitemap.Settings.Field.SelectOperator.Label', defaultMessage: 'Operator' })} | ||
| hint={formatMessage({ id: 'sitemap.Settings.Field.SelectOperator.Description', defaultMessage: 'Select an operator' })} | ||
| disabled={disabled} | ||
| onChange={(operator) => onOperatorChange(operator)} | ||
| value={conditionOperator} | ||
| > | ||
| {operators.map((operator) => { | ||
| return <Option value={operator} key={operator}>{operator}</Option>; | ||
| })} | ||
| </Select> | ||
| </GridItem> | ||
| <GridItem col={6}> | ||
| <TextInput | ||
| disabled={disabled} | ||
| label={formatMessage({ id: 'sitemap.Settings.Field.SelectConditionValue.Label', defaultMessage: 'Value' })} | ||
| name="conditionValue" | ||
| hint={formatMessage({ id: 'sitemap.Settings.Field.SelectConditionValue.Description', defaultMessage: '"Text", true, 2, etc' })} | ||
| onChange={(e) => onValueChange(e.target.value)} | ||
| value={conditionValue} | ||
| /> | ||
| </GridItem> | ||
| </> | ||
| ); | ||
| }; | ||
|
|
||
| export default SelectConditional; |
This file contains 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 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 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 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
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
handleRemoveConditionfunction always removes the last filter. It would be neat if we can specify the filter we want to remove. Giving the end user more control on the filters interface.