Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(frontend): increase the API entities reserved IDs #2647

Merged
merged 2 commits into from
Nov 20, 2020
Merged

feat(frontend): increase the API entities reserved IDs #2647

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e672678
fix(frontend): fix some errors in imports and apply the API entities …
Desvelao Nov 20, 2020
5d2b58c
Merge branch '4.0-7.9' of https://github.com/wazuh/wazuh-kibana-app i…
Desvelao Nov 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion public/components/security/policies/edit-policy.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,11 @@ import {
} from '@elastic/eui';
import { WzRequest } from '../../../react-services/wz-request';
import { ErrorHandler } from '../../../react-services/error-handler';
import { WzAPIUtils } from '../../../react-services/wz-api-utils';


export const EditPolicyFlyout = ({ policy, closeFlyout }) => {
const isReserved = policy.id < 100;
const isReserved = WzAPIUtils.isReservedID(policy.id);
const [actionValue, setActionValue] = useState('');
const [addedActions, setAddedActions] = useState([]);
const [availableResources, setAvailableResources] = useState([]);
Expand Down
7 changes: 4 additions & 3 deletions public/components/security/policies/policies-table.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import {
} from '@elastic/eui';
import { WzRequest } from '../../../react-services/wz-request';
import { ErrorHandler } from '../../../react-services/error-handler';
import { WzAPIUtils } from '../../../react-services/wz-api-utils';
import { WzButtonModalConfirm } from '../../common/buttons';

export const PoliciesTable = ({policies, loading, editPolicy, updatePolicies}) => {
Expand Down Expand Up @@ -60,7 +61,7 @@ export const PoliciesTable = ({policies, loading, editPolicy, updatePolicies}) =
field: 'id',
name: 'Status',
render: (item) => {
return item < 100 && <EuiBadge color="primary" >Reserved</EuiBadge>
return WzAPIUtils.isReservedID(item) && <EuiBadge color="primary" >Reserved</EuiBadge>
},
width: 150,
sortable: false,
Expand All @@ -73,8 +74,8 @@ export const PoliciesTable = ({policies, loading, editPolicy, updatePolicies}) =
<div onClick={ev => ev.stopPropagation()}>
<WzButtonModalConfirm
buttonType='icon'
tooltip={{content: item.id < 100 ? "Reserved policies can't be deleted" : 'Delete policy', position: 'left'}}
isDisabled={item.id < 100}
tooltip={{content: WzAPIUtils.isReservedID(item.id) ? "Reserved policies can't be deleted" : 'Delete policy', position: 'left'}}
isDisabled={WzAPIUtils.isReservedID(item.id)}
modalTitle={`Do you want to delete the ${item.name} policy?`}
onConfirm={async () => {
try{
Expand Down
7 changes: 4 additions & 3 deletions public/components/security/roles/roles-table.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import {
import { WzRequest } from '../../../react-services/wz-request';
import { ErrorHandler } from '../../../react-services/error-handler';
import { WzButtonModalConfirm } from '../../common/buttons';
import { WzAPIUtils } from '../../../react-services/wz-api-utils';

export const RolesTable = ({roles, policiesData, loading, editRole, updateRoles}) => {

Expand Down Expand Up @@ -79,7 +80,7 @@ export const RolesTable = ({roles, policiesData, loading, editRole, updateRoles}
field: 'id',
name: 'Status',
render: (item) => {
return item < 100 && <EuiBadge color="primary" >Reserved</EuiBadge>
return WzAPIUtils.isReservedID(item) && <EuiBadge color="primary" >Reserved</EuiBadge>
},
width: 150,
sortable: false,
Expand All @@ -92,8 +93,8 @@ export const RolesTable = ({roles, policiesData, loading, editRole, updateRoles}
<div onClick={ev => ev.stopPropagation()}>
<WzButtonModalConfirm
buttonType='icon'
tooltip={{content: item.id < 100 ? "Reserved roles can't be deleted" : 'Delete role', position: 'left'}}
isDisabled={item.id < 100}
tooltip={{content: WzAPIUtils.isReservedID(item.id) ? "Reserved roles can't be deleted" : 'Delete role', position: 'left'}}
isDisabled={WzAPIUtils.isReservedID(item.id)}
modalTitle={`Do you want to delete the ${item.name} role?`}
onConfirm={async () => {
try{
Expand Down
2 changes: 1 addition & 1 deletion public/components/security/users/components/users-table.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import {
import { WzButtonModalConfirm } from '../../../common/buttons';
import UsersServices from '../services';
import { ErrorHandler } from '../../../../react-services/error-handler';
import { WzAPIUtils } from '../../../../react-services/wz-api-utilsq';
import { WzAPIUtils } from '../../../../react-services/wz-api-utils';

export const UsersTable = ({ users, editUserFlyover, rolesLoading, roles, onSave }) => {
const getRowProps = item => {
Expand Down
2 changes: 1 addition & 1 deletion public/react-services/wz-api-utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
* Find more information about this on the LICENSE file.
*/

import { WAZUH_API_RESERVED_ID_LOWER_THAN } from '../../util/contants';
import { WAZUH_API_RESERVED_ID_LOWER_THAN } from '../../util/constants';

export class WzAPIUtils{
static isReservedID(id: number): boolean{
Expand Down