yujunjun/OpenMetadata
1
0
Fork 0
mirror of https://github.com/open-metadata/OpenMetadata.git synced 2025-12-12 15:57:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(#10989): Backend: The Rule Resource All name should be in lowercase. (#11229)

Browse Source
This commit is contained in:
Sachin Chaurasiya 2023-04-24 19:57:18 +05:30 committed by GitHub
parent c920c9afa3
commit 4edd40540f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
openmetadata-ui/src/main/resources/ui/src/pages/PoliciesPage/RuleForm/RuleForm.tsx
View File

@ -24,6 +24,7 @@ import {
getPolicyResources,
validateRuleCondition,
} from 'rest/rolesAPIV1';
import { ALL_TYPE_RESOURCE_LIST } from 'utils/PermissionsUtils';
import { allowedNameRegEx } from '../../../constants/regex.constants';
import {
Effect,
@ -63,12 +64,12 @@ const RuleForm: FC<RuleFormProps> = ({ ruleData, setRuleData }) => {
*/
const resourcesOptions = useMemo(() => {
const resources = policyResources.filter(
(resource) => resource.name !== 'all'
(resource) => !ALL_TYPE_RESOURCE_LIST.includes(resource.name || '')
);
const option = [
{
title: 'All',
value: 'all',
value: 'All',
key: 'all',
children: resources.map((resource) => ({
title: startCase(resource.name),
@ -85,9 +86,16 @@ const RuleForm: FC<RuleFormProps> = ({ ruleData, setRuleData }) => {
* Derive the operations from selected resources
*/
const operationOptions = useMemo(() => {
const selectedResources = policyResources.filter((resource) =>
ruleData.resources?.includes(resource.name || '')
);
const selectedResources = policyResources.filter((resource) => {
// if resource is all then check for both case lower and upper
if (ALL_TYPE_RESOURCE_LIST.includes(resource.name || '')) {
return ALL_TYPE_RESOURCE_LIST.some((val) =>
ruleData.resources?.includes(val)
);
}
return ruleData.resources?.includes(resource.name || '');
});
const operations = selectedResources
.reduce(
(prev: Operation[], curr: ResourceDescriptor) =>

2
openmetadata-ui/src/main/resources/ui/src/utils/PermissionsUtils.ts
View File

@ -124,3 +124,5 @@ export const DEFAULT_ENTITY_PERMISSION = {
} as OperationPermission;
export const LIST_CAP = 1;
export const ALL_TYPE_RESOURCE_LIST = ['all', 'All'];