diff --git a/packages/core/admin/admin/src/contexts/PermisssionsDataManagerContext/index.js b/packages/core/admin/admin/src/contexts/PermisssionsDataManagerContext/index.js deleted file mode 100644 index 13d86bf0c5..0000000000 --- a/packages/core/admin/admin/src/contexts/PermisssionsDataManagerContext/index.js +++ /dev/null @@ -1,5 +0,0 @@ -import { createContext } from 'react'; - -const PermissionsDataManagerContext = createContext({}); - -export default PermissionsDataManagerContext; diff --git a/packages/core/admin/admin/src/contexts/index.js b/packages/core/admin/admin/src/contexts/index.js index c61280d75f..2731b9e41d 100644 --- a/packages/core/admin/admin/src/contexts/index.js +++ b/packages/core/admin/admin/src/contexts/index.js @@ -1,3 +1,2 @@ export { default as AdminContext } from './Admin'; export { ConfigurationsContext } from './configuration'; -export { default as PermissionsDataManagerContext } from './PermisssionsDataManagerContext'; diff --git a/packages/core/admin/admin/src/hooks/index.js b/packages/core/admin/admin/src/hooks/index.js index e9a11f3fb9..5816534277 100644 --- a/packages/core/admin/admin/src/hooks/index.js +++ b/packages/core/admin/admin/src/hooks/index.js @@ -1,6 +1,5 @@ export { useConfigurations } from './useConfigurations'; export { useContentTypes } from './useContentTypes'; export { default as useMenu } from './useMenu'; -export { default as usePermissionsDataManager } from './usePermissionsDataManager'; export { default as useSettingsForm } from './useSettingsForm'; export { default as useSettingsMenu } from './useSettingsMenu'; diff --git a/packages/core/admin/admin/src/hooks/usePermissionsDataManager/index.js b/packages/core/admin/admin/src/hooks/usePermissionsDataManager/index.js deleted file mode 100644 index 39f4d2c5f7..0000000000 --- a/packages/core/admin/admin/src/hooks/usePermissionsDataManager/index.js +++ /dev/null @@ -1,7 +0,0 @@ -import { useContext } from 'react'; - -import { PermissionsDataManagerContext } from '../../contexts'; - -const usePermissionsDataManager = () => useContext(PermissionsDataManagerContext); - -export default usePermissionsDataManager; diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/ConditionsModal/index.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/ConditionsModal/index.js index b1cd781b5f..5bf61b6edd 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/ConditionsModal/index.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/ConditionsModal/index.js @@ -16,7 +16,7 @@ import upperFirst from 'lodash/upperFirst'; import PropTypes from 'prop-types'; import { useIntl } from 'react-intl'; -import { usePermissionsDataManager } from '../../../../../../../hooks'; +import { usePermissionsDataManager } from '../../hooks/usePermissionsDataManager'; import ActionRow from './ActionRow'; import createDefaultConditionsForm from './utils/createDefaultConditionsForm'; diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/ContentTypeCollapse/Collapse/index.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/ContentTypeCollapse/Collapse/index.js index 689c8a9cfb..d74ca1866e 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/ContentTypeCollapse/Collapse/index.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/ContentTypeCollapse/Collapse/index.js @@ -8,7 +8,7 @@ import PropTypes from 'prop-types'; import { useIntl } from 'react-intl'; import styled from 'styled-components'; -import { usePermissionsDataManager } from '../../../../../../../../hooks'; +import { usePermissionsDataManager } from '../../../hooks/usePermissionsDataManager'; import ConditionsButton from '../../ConditionsButton'; import ConditionsModal from '../../ConditionsModal'; import HiddenAction from '../../HiddenAction'; diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/ContentTypeCollapse/CollapsePropertyMatrix/ActionRow/index.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/ContentTypeCollapse/CollapsePropertyMatrix/ActionRow/index.js index da4a6ef581..210cf83548 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/ContentTypeCollapse/CollapsePropertyMatrix/ActionRow/index.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/ContentTypeCollapse/CollapsePropertyMatrix/ActionRow/index.js @@ -6,7 +6,7 @@ import PropTypes from 'prop-types'; import { useIntl } from 'react-intl'; import styled from 'styled-components'; -import { usePermissionsDataManager } from '../../../../../../../../../hooks'; +import { usePermissionsDataManager } from '../../../../hooks/usePermissionsDataManager'; import HiddenAction from '../../../HiddenAction'; import { cellWidth, rowHeight } from '../../../Permissions/utils/constants'; import RequiredSign from '../../../RequiredSign'; diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/ContentTypeCollapse/CollapsePropertyMatrix/SubActionRow/index.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/ContentTypeCollapse/CollapsePropertyMatrix/SubActionRow/index.js index 656f46900e..750c2d5ff4 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/ContentTypeCollapse/CollapsePropertyMatrix/SubActionRow/index.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/ContentTypeCollapse/CollapsePropertyMatrix/SubActionRow/index.js @@ -7,7 +7,7 @@ import PropTypes from 'prop-types'; import { useIntl } from 'react-intl'; import styled from 'styled-components'; -import { usePermissionsDataManager } from '../../../../../../../../../hooks'; +import { usePermissionsDataManager } from '../../../../hooks/usePermissionsDataManager'; import CollapseLabel from '../../../CollapseLabel'; import Curve from '../../../Curve'; import HiddenAction from '../../../HiddenAction'; diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/GlobalActions/index.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/GlobalActions/index.js index a033b2dcb5..5ac24daff2 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/GlobalActions/index.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/GlobalActions/index.js @@ -6,7 +6,7 @@ import PropTypes from 'prop-types'; import { useIntl } from 'react-intl'; import styled from 'styled-components'; -import { usePermissionsDataManager } from '../../../../../../../hooks'; +import { usePermissionsDataManager } from '../../hooks/usePermissionsDataManager'; import { cellWidth, firstRowWidth } from '../Permissions/utils/constants'; import { findDisplayedActions, getCheckboxesState } from './utils'; diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/PermissionsDataManagerProvider/index.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/PermissionsDataManagerProvider/index.js index 2ce8e94b0b..130ae6db7b 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/PermissionsDataManagerProvider/index.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/PermissionsDataManagerProvider/index.js @@ -2,7 +2,7 @@ import React from 'react'; import PropTypes from 'prop-types'; -import { PermissionsDataManagerContext } from '../../../../../../../contexts'; +import { PermissionsDataManagerContext } from '../../hooks/usePermissionsDataManager'; const PermissionsDataManagerProvider = ({ children, value }) => { return ( diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/PluginsAndSettings/SubCategory/index.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/PluginsAndSettings/SubCategory/index.js index 68599d849b..b166f1d300 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/PluginsAndSettings/SubCategory/index.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/PluginsAndSettings/SubCategory/index.js @@ -6,7 +6,7 @@ import PropTypes from 'prop-types'; import { useIntl } from 'react-intl'; import styled from 'styled-components'; -import { usePermissionsDataManager } from '../../../../../../../../hooks'; +import { usePermissionsDataManager } from '../../../hooks/usePermissionsDataManager'; import ConditionsButton from '../../ConditionsButton'; import ConditionsModal from '../../ConditionsModal'; import { getCheckboxState, removeConditionKeyFromData } from '../../utils'; diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/hooks/usePermissionsDataManager.ts b/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/hooks/usePermissionsDataManager.ts new file mode 100644 index 0000000000..ee7b9e5b8f --- /dev/null +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/hooks/usePermissionsDataManager.ts @@ -0,0 +1,28 @@ +import * as React from 'react'; + +// Note: I had to guess most of these types based on the name and usage, but I actually don't +// know if they are correct, because the usage is very generic. Feel free to correct them if +// they create problems. +export interface PermissionsDataManagerContextValue { + availableConditions: unknown[]; + modifiedData: object; + onChangeCollectionTypeLeftActionRowCheckbox: ( + pathToData: string, + propertyName: string, + nam: string, + value: unknown + ) => void; + onChangeConditions: (conditions: object) => void; + onChangeSimpleCheckbox: (target: { name: string; value: unknown }) => void; + onChangeParentCheckbox: (target: { name: string; value: unknown }) => void; + onChangeCollectionTypeGlobalActionCheckbox: ( + kind: string, + actionId: string, + value: unknown + ) => void; +} + +export const PermissionsDataManagerContext = + React.createContext(null); + +export const usePermissionsDataManager = () => React.useContext(PermissionsDataManagerContext);