yujunjun/OpenMetadata
1
0
Fork 0
mirror of https://github.com/open-metadata/OpenMetadata.git synced 2025-08-28 19:05:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix #8490 Wrong message in the required message on Policy page (#8522)

Browse Source 
* Fix #8490 Wrong message in the required message on Policy page

* Fix unit test

* rename functions to conditionFunctions

* Address review comments

* Address review comments

* Fix cypress test data test id.

* FIx unit test
This commit is contained in:
Sachin Chaurasiya 2022-11-04 11:20:36 +05:30 committed by GitHub
parent a49c261cbe
commit aa7c31ec31
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 53 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openmetadata-ui/src/main/resources/ui/cypress/e2e/Pages/Policies.spec.js
View File

@ -59,7 +59,7 @@ const addRule = (rulename, ruleDescription, descriptionIndex) => {
.scrollIntoView() .scrollIntoView()
.type(ruleDescription); .type(ruleDescription);
//Select resource dropdown //Select resource dropdown
cy.get('[data-testid="resuorces"]') cy.get('[data-testid="resources"]')
.scrollIntoView() .scrollIntoView()
.should('be.visible') .should('be.visible')
.click(); .click();

9
openmetadata-ui/src/main/resources/ui/src/locale/languages/en-us.json
View File

@ -201,7 +201,14 @@
"end-date": "End Date", "end-date": "End Date",
"show-deleted": "Show deleted", "show-deleted": "Show deleted",
"add-bot": "Add Bot", "add-bot": "Add Bot",
"search-for-bots": "Search for bots..." "search-for-bots": "Search for bots...",
"condition-is-invalid": "Condition is invalid",
"rule-name": "Rule Name",
"write-your-description": "Write your description",
"select-resource": "Select Resources",
"select-rule-effect": "Select Rule Effect",
"field-required": "{{field}} is required",
"field-required-plural": "{{field}} are required"
}, },
"message": { "message": {
"service-email-required": "Service account Email is required", "service-email-required": "Service account Email is required",

2
openmetadata-ui/src/main/resources/ui/src/pages/PoliciesPage/AddPolicyPage/AddPolicyPage.test.tsx
View File

@ -78,7 +78,7 @@ describe('Test Add Policy Page', () => {
const ruleName = await screen.findByTestId('rule-name'); const ruleName = await screen.findByTestId('rule-name');
const resources = await screen.findByTestId('resuorces'); const resources = await screen.findByTestId('resources');
const operations = await screen.findByTestId('operations'); const operations = await screen.findByTestId('operations');
const effect = await screen.findByTestId('effect'); const effect = await screen.findByTestId('effect');

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

@ -65,7 +65,7 @@ describe('Test Rule Form Component', () => {
const ruleName = await screen.findByTestId('rule-name'); const ruleName = await screen.findByTestId('rule-name');
const resources = await screen.findByTestId('resuorces'); const resources = await screen.findByTestId('resources');
const operations = await screen.findByTestId('operations'); const operations = await screen.findByTestId('operations');
const effect = await screen.findByTestId('effect'); const effect = await screen.findByTestId('effect');

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

@ -16,6 +16,7 @@ import { BaseOptionType } from 'antd/lib/select';
import { AxiosError } from 'axios'; import { AxiosError } from 'axios';
import { capitalize, startCase, uniq, uniqBy } from 'lodash'; import { capitalize, startCase, uniq, uniqBy } from 'lodash';
import React, { FC, useEffect, useMemo, useState } from 'react'; import React, { FC, useEffect, useMemo, useState } from 'react';
import { useTranslation } from 'react-i18next';
import { import {
getPolicyFunctions, getPolicyFunctions,
getPolicyResources, getPolicyResources,
@ -40,6 +41,7 @@ export interface RuleFormProps {
} }
const RuleForm: FC<RuleFormProps> = ({ ruleData, setRuleData }) => { const RuleForm: FC<RuleFormProps> = ({ ruleData, setRuleData }) => {
const { t } = useTranslation();
const [policyResources, setPolicyResources] = useState<ResourceDescriptor[]>( const [policyResources, setPolicyResources] = useState<ResourceDescriptor[]>(
[] []
); );
@ -51,8 +53,8 @@ const RuleForm: FC<RuleFormProps> = ({ ruleData, setRuleData }) => {
); );
const [validationError, setValidationError] = useState<string>(''); const [validationError, setValidationError] = useState<string>('');
const [isValidatingCondition, setIsvalidating] = useState<boolean>(false); const [isValidatingCondition, setIsValidating] = useState<boolean>(false);
const [isValidCondition, setIsvalidCondition] = useState<boolean>(false); const [isValidCondition, setIsValidCondition] = useState<boolean>(false);
/** /**
* Derive the resources from policy resources * Derive the resources from policy resources
@ -108,15 +110,18 @@ const RuleForm: FC<RuleFormProps> = ({ ruleData, setRuleData }) => {
return option; return option;
}, [ruleData.resources, policyResources]); }, [ruleData.resources, policyResources]);
const getConditionOptions = (funtions: Function[]) => { const getConditionOptions = (conditionFunctions: Function[]) => {
return funtions.reduce((prev: BaseOptionType[], curr: Function) => { return conditionFunctions.reduce(
(prev: BaseOptionType[], curr: Function) => {
const currentValues = (curr.examples || []).map((example: string) => ({ const currentValues = (curr.examples || []).map((example: string) => ({
label: example, label: example,
value: example, value: example,
})); }));
return uniqBy([...prev, ...currentValues], 'value'); return uniqBy([...prev, ...currentValues], 'value');
}, []); },
[]
);
}; };
const handleConditionSearch = (value: string) => { const handleConditionSearch = (value: string) => {
@ -138,7 +143,7 @@ const RuleForm: FC<RuleFormProps> = ({ ruleData, setRuleData }) => {
} }
}; };
const fetchPolicyFuntions = async () => { const fetchPolicyFunctions = async () => {
try { try {
const data = await getPolicyFunctions(); const data = await getPolicyFunctions();
setPolicyFunctions(data.data || []); setPolicyFunctions(data.data || []);
@ -148,9 +153,10 @@ const RuleForm: FC<RuleFormProps> = ({ ruleData, setRuleData }) => {
}; };
const handleConditionValidation = async (condition: string) => { const handleConditionValidation = async (condition: string) => {
const defaultErrorText = 'Condition is invalid'; const defaultErrorText = t('label.condition-is-invalid');
if (condition) { if (condition) {
setIsvalidating(true); setIsValidating(true);
try { try {
const response = await validateRuleCondition(condition); const response = await validateRuleCondition(condition);
@ -161,22 +167,22 @@ const RuleForm: FC<RuleFormProps> = ({ ruleData, setRuleData }) => {
const check = [200, 204].includes(response.status); const check = [200, 204].includes(response.status);
if (check) { if (check) {
setValidationError(''); setValidationError('');
setIsvalidCondition(true); setIsValidCondition(true);
} else { } else {
setValidationError(defaultErrorText); setValidationError(defaultErrorText);
} }
} catch (error) { } catch (error) {
setValidationError(getErrorText(error as AxiosError, defaultErrorText)); setValidationError(getErrorText(error as AxiosError, defaultErrorText));
setIsvalidCondition(false); setIsValidCondition(false);
} finally { } finally {
setIsvalidating(false); setIsValidating(false);
} }
} }
}; };
useEffect(() => { useEffect(() => {
fetchPolicyResources(); fetchPolicyResources();
fetchPolicyFuntions(); fetchPolicyFunctions();
}, []); }, []);
useEffect(() => { useEffect(() => {
@ -186,18 +192,19 @@ const RuleForm: FC<RuleFormProps> = ({ ruleData, setRuleData }) => {
return ( return (
<> <>
<Form.Item <Form.Item
label="Rule Name:" label={`${t('label.rule-name')}:`}
name="ruleName" name="ruleName"
rules={[ rules={[
{ {
required: true, required: true,
max: 128, max: 128,
min: 1, min: 1,
message: t('label.field-required', { field: t('label.rule-name') }),
}, },
]}> ]}>
<Input <Input
data-testid="rule-name" data-testid="rule-name"
placeholder="Rule Name" placeholder={t('label.rule-name')}
type="text" type="text"
value={ruleData.name} value={ruleData.name}
onChange={(e) => onChange={(e) =>
@ -205,11 +212,11 @@ const RuleForm: FC<RuleFormProps> = ({ ruleData, setRuleData }) => {
} }
/> />
</Form.Item> </Form.Item>
<Form.Item label="Description:" name="ruleDescription"> <Form.Item label={t('label.description')} name="ruleDescription">
<RichTextEditor <RichTextEditor
height="200px" height="200px"
initialValue={ruleData.description || ''} initialValue={ruleData.description || ''}
placeHolder="Write your description" placeHolder={t('label.write-your-description')}
style={{ margin: 0 }} style={{ margin: 0 }}
onTextChange={(value) => onTextChange={(value) =>
setRuleData((prev: Rule) => ({ ...prev, description: value })) setRuleData((prev: Rule) => ({ ...prev, description: value }))
@ -217,18 +224,21 @@ const RuleForm: FC<RuleFormProps> = ({ ruleData, setRuleData }) => {
/> />
</Form.Item> </Form.Item>
<Form.Item <Form.Item
label="Resources:" label={`${t('label.resources')}:`}
name="resources" name="resources"
rules={[ rules={[
{ {
required: true, required: true,
message: t('label.field-required-plural', {
field: t('label.resources'),
}),
}, },
]}> ]}>
<TreeSelect <TreeSelect
treeCheckable treeCheckable
className="tw-w-full" className="tw-w-full"
data-testid="resuorces" data-testid="resources"
placeholder="Select Resources" placeholder={t('label.select-resource')}
showCheckedStrategy={TreeSelect.SHOW_PARENT} showCheckedStrategy={TreeSelect.SHOW_PARENT}
treeData={resourcesOptions} treeData={resourcesOptions}
onChange={(values) => { onChange={(values) => {
@ -240,11 +250,14 @@ const RuleForm: FC<RuleFormProps> = ({ ruleData, setRuleData }) => {
/> />
</Form.Item> </Form.Item>
<Form.Item <Form.Item
label="Operations:" label={`${t('label.operations')}:`}
name="operations" name="operations"
rules={[ rules={[
{ {
required: true, required: true,
message: t('label.field-required-plural', {
field: t('label.operations'),
}),
}, },
]}> ]}>
<TreeSelect <TreeSelect
@ -263,16 +276,17 @@ const RuleForm: FC<RuleFormProps> = ({ ruleData, setRuleData }) => {
/> />
</Form.Item> </Form.Item>
<Form.Item <Form.Item
label="Effect:" label={`${t('label.effect')}:`}
name="ruleEffect" name="ruleEffect"
rules={[ rules={[
{ {
required: true, required: true,
message: t('label.field-required', { field: t('label.effect') }),
}, },
]}> ]}>
<Select <Select
data-testid="effect" data-testid="effect"
placeholder="Select Rule Effect" placeholder={t('label.select-rule-effect')}
value={ruleData.effect} value={ruleData.effect}
onChange={(value) => onChange={(value) =>
setRuleData((prev: Rule) => ({ ...prev, effect: value })) setRuleData((prev: Rule) => ({ ...prev, effect: value }))
@ -281,7 +295,7 @@ const RuleForm: FC<RuleFormProps> = ({ ruleData, setRuleData }) => {
<Option key={Effect.Deny}>{capitalize(Effect.Deny)}</Option> <Option key={Effect.Deny}>{capitalize(Effect.Deny)}</Option>
</Select> </Select>
</Form.Item> </Form.Item>
<Form.Item label="Condition:" name="condition"> <Form.Item label={`${t('label.condition')}:`} name="condition">
<> <>
<AutoComplete <AutoComplete
data-testid="condition" data-testid="condition"