yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-17 04:17:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add conditions button state

Browse Source 
Signed-off-by: soupette <cyril.lpz@gmail.com>
This commit is contained in:
soupette 2021-02-17 10:09:43 +01:00
parent 417f3f8f8e
commit 268247d41a
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packages/strapi-admin/admin/src/translations/en.json
View File

@ -90,6 +90,7 @@
"Settings.permissions.conditions.links": "Links", "Settings.permissions.conditions.links": "Links",
"Settings.permissions.conditions.no-actions": "You first need to select actions (create, read, update, ...) before defining conditions on them.", "Settings.permissions.conditions.no-actions": "You first need to select actions (create, read, update, ...) before defining conditions on them.",
"Settings.permissions.conditions.or": "OR", "Settings.permissions.conditions.or": "OR",
"Settings.permissions.conditions.none-selected": "Anytime",
"Settings.permissions.conditions.selected.plural": "{number} conditions selected", "Settings.permissions.conditions.selected.plural": "{number} conditions selected",
"Settings.permissions.conditions.selected.singular": "{number} condition selected", "Settings.permissions.conditions.selected.singular": "{number} condition selected",
"Settings.permissions.conditions.when": "When", "Settings.permissions.conditions.when": "When",

2
packages/strapi-admin/ee/admin/containers/Roles/CreatePage/ConditionsModal/ConditionsSelect/SingleValue.js
View File

@ -15,7 +15,7 @@ const Value = ({ children, selectProps, ...props }) => {
<SingleValue {...props}> <SingleValue {...props}>
<Text style={{ paddingTop: 1 }}> <Text style={{ paddingTop: 1 }}>
{valuesArray.length === 0 {valuesArray.length === 0
? 'Anytime' ? formatMessage({ id: 'Settings.permissions.conditions.none-selected' })
: formatMessage( : formatMessage(
{ {
id: `Settings.permissions.conditions.selected.${ id: `Settings.permissions.conditions.selected.${

10
packages/strapi-admin/ee/admin/containers/Roles/CreatePage/ContentTypeCollapse/Collapse/index.js
View File

@ -50,6 +50,10 @@ const Collapse = ({ availableActions, isActive, isGrey, label, onClickToggle, pa
return generateCheckboxesActions(availableActions, modifiedData, pathToData); return generateCheckboxesActions(availableActions, modifiedData, pathToData);
}, [availableActions, modifiedData, pathToData]); }, [availableActions, modifiedData, pathToData]);
const doesConditionButtonHasConditions = checkboxesActions.some(
({ hasConditions }) => hasConditions
);
return ( return (
<Wrapper isActive={isActive} isGrey={isGrey}> <Wrapper isActive={isActive} isGrey={isGrey}>
<Flex style={{ flex: 1 }}> <Flex style={{ flex: 1 }}>
@ -106,7 +110,11 @@ const Collapse = ({ availableActions, isActive, isGrey, label, onClickToggle, pa
} }
)} )}
</Flex> </Flex>
<ConditionsButton isRight onClick={handleToggleModalIsOpen} /> <ConditionsButton
isRight
onClick={handleToggleModalIsOpen}
hasConditions={doesConditionButtonHasConditions}
/>
</Flex> </Flex>
{modalState.isMounted && ( {modalState.isMounted && (
<ConditionsModal <ConditionsModal