Merge pull request #2647 from wazuh/feature/2643-increase-api-entitie…

…s-reserved-id feat(frontend): increase the API entities reserved IDs
wazuh · Nov 20, 2020 · 382618b · 382618b
2 parents a7f7617 + 5d2b58c
commit 382618b
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 9 deletions.
diff --git a/public/components/security/policies/edit-policy.tsx b/public/components/security/policies/edit-policy.tsx
@@ -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([]);

diff --git a/public/components/security/policies/policies-table.tsx b/public/components/security/policies/policies-table.tsx
@@ -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}) => {
@@ -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,
@@ -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{

diff --git a/public/components/security/roles/roles-table.tsx b/public/components/security/roles/roles-table.tsx
@@ -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}) => {
 
@@ -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,
@@ -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{

diff --git a/public/components/security/users/components/users-table.tsx b/public/components/security/users/components/users-table.tsx
@@ -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 => {

diff --git a/public/react-services/wz-api-utils.ts b/public/react-services/wz-api-utils.ts
@@ -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{