foreman_openscap 5.1.0 → 5.2.0

data/webpack/routes/OvalPolicies/OvalPoliciesNew/__tests__/OvalPoliciesNew.test.js

@@ -0,0 +1,172 @@
+import React from 'react';
+import { render, screen } from '@testing-library/react';
+import '@testing-library/jest-dom';
+import userEvent from '@testing-library/user-event';
+
+import OvalPoliciesNew from '../';
+import { ovalPoliciesPath } from '../../../../helpers/pathsHelper';
+
+import { unpagedMocks as ovalContentMocks } from '../../../OvalContents/OvalContentsIndex/__tests__/OvalContentsIndex.fixtures';
+
+import {
+  withMockedProvider,
+  wait,
+  withRouter,
+  withRedux,
+} from '../../../../testHelper';
+
+import {
+  newPolicyName,
+  newPolicyDescription,
+  newPolicyCronline,
+  newPolicyContentName,
+  policySuccessMock,
+  policyValidationMock,
+  policyPreconditionMock,
+  policyInvalidHgMock,
+  hostgroupsMock,
+  firstHg,
+  roleAbsent as roleAbsentCheck,
+  hgWithoutProxy as withoutProxyCheck,
+} from './OvalPoliciesNew.fixtures';
+
+import * as toasts from '../../../../helpers/toastsHelper';
+
+const TestComponent = withRouter(
+  withRedux(withMockedProvider(OvalPoliciesNew))
+);
+
+describe('OvalPoliciesNew', () => {
+  it('should create new OVAL policy', async () => {
+    const showToast = jest.fn();
+    jest.spyOn(toasts, 'showToast').mockImplementation(() => showToast);
+    const pushMock = jest.fn();
+
+    render(
+      <TestComponent
+        mocks={ovalContentMocks.concat(policySuccessMock)}
+        history={{
+          push: pushMock,
+        }}
+      />
+    );
+    expect(screen.getByText('Loading')).toBeInTheDocument();
+    await wait();
+    const submitBtn = screen.getByRole('button', { name: 'submit' });
+    expect(submitBtn).toBeDisabled();
+    userEvent.type(screen.getByLabelText(/name/), newPolicyName);
+    await wait();
+    expect(submitBtn).toBeDisabled();
+    userEvent.type(screen.getByLabelText(/cronLine/), 'foo');
+    userEvent.type(screen.getByLabelText(/description/), newPolicyDescription);
+    userEvent.selectOptions(
+      screen.getByLabelText(/ovalContentId/),
+      newPolicyContentName
+    );
+    await wait();
+    expect(screen.getByText('is not a valid cronline')).toBeInTheDocument();
+    expect(submitBtn).toBeDisabled();
+    userEvent.clear(screen.getByLabelText(/cronLine/));
+    userEvent.type(screen.getByLabelText(/cronLine/), newPolicyCronline);
+    await wait();
+    expect(
+      screen.queryByText('is not a valid cronline')
+    ).not.toBeInTheDocument();
+    expect(submitBtn).not.toBeDisabled();
+    userEvent.click(submitBtn);
+    await wait(2);
+    expect(pushMock).toHaveBeenCalledWith(ovalPoliciesPath);
+    expect(showToast).toHaveBeenCalledWith({
+      type: 'success',
+      message: 'OVAL Policy succesfully created.',
+    });
+  });
+  it('should not create new policy on validation error', async () => {
+    const showToast = jest.fn();
+    jest.spyOn(toasts, 'showToast').mockImplementation(() => showToast);
+    const pushMock = jest.fn();
+
+    render(
+      <TestComponent
+        mocks={ovalContentMocks.concat(policyValidationMock)}
+        history={{
+          push: pushMock,
+        }}
+      />
+    );
+    await wait();
+    userEvent.type(screen.getByLabelText(/name/), newPolicyName);
+    userEvent.type(screen.getByLabelText(/cronLine/), newPolicyCronline);
+    userEvent.selectOptions(
+      screen.getByLabelText(/ovalContentId/),
+      newPolicyContentName
+    );
+    await wait();
+    userEvent.click(screen.getByRole('button', { name: 'submit' }));
+    await wait(2);
+    expect(pushMock).not.toHaveBeenCalled();
+    expect(showToast).not.toHaveBeenCalled();
+    expect(screen.getByText('has already been taken')).toBeInTheDocument();
+  });
+  it('should not create policy on preconditions error', async () => {
+    const showToast = jest.fn();
+    jest.spyOn(toasts, 'showToast').mockImplementation(() => showToast);
+    const pushMock = jest.fn();
+
+    render(
+      <TestComponent
+        mocks={ovalContentMocks.concat(policyPreconditionMock)}
+        history={{
+          push: pushMock,
+        }}
+      />
+    );
+    await wait();
+    userEvent.type(screen.getByLabelText(/name/), newPolicyName);
+    userEvent.type(screen.getByLabelText(/cronLine/), newPolicyCronline);
+    userEvent.selectOptions(
+      screen.getByLabelText(/ovalContentId/),
+      newPolicyContentName
+    );
+    await wait();
+    userEvent.click(screen.getByRole('button', { name: 'submit' }));
+    await wait(2);
+    await wait();
+    expect(pushMock).not.toHaveBeenCalled();
+    expect(showToast).toHaveBeenCalledWith({
+      type: 'error',
+      message: roleAbsentCheck.failMsg,
+    });
+  });
+  it('should show hostgroup errros', async () => {
+    const showToast = jest.fn();
+    jest.spyOn(toasts, 'showToast').mockImplementation(() => showToast);
+    const pushMock = jest.fn();
+
+    render(
+      <TestComponent
+        mocks={ovalContentMocks
+          .concat(policyInvalidHgMock)
+          .concat(hostgroupsMock)}
+        history={{
+          push: pushMock,
+        }}
+      />
+    );
+    await wait();
+    userEvent.type(screen.getByLabelText(/name/), newPolicyName);
+    userEvent.type(screen.getByLabelText(/cronLine/), newPolicyCronline);
+    userEvent.selectOptions(
+      screen.getByLabelText(/ovalContentId/),
+      newPolicyContentName
+    );
+    userEvent.type(screen.getByLabelText(/hostgroup/), 'first');
+    await wait(500);
+    userEvent.click(screen.getByText(firstHg.name));
+    await wait();
+    userEvent.click(screen.getByRole('button', { name: 'submit' }));
+    await wait(2);
+    expect(pushMock).not.toHaveBeenCalled();
+    expect(screen.getByText(withoutProxyCheck.failMsg)).toBeInTheDocument();
+  });
+});

data/webpack/routes/OvalPolicies/OvalPoliciesNew/index.js

@@ -0,0 +1,11 @@
+import React from 'react';
+import { useDispatch } from 'react-redux';
+
+import { showToast } from '../../../helpers/toastsHelper';
+import OvalPoliciesNew from './OvalPoliciesNew';
+
+const WrappedOvalPoliciesNew = props => (
+  <OvalPoliciesNew {...props} showToast={showToast(useDispatch())} />
+);
+
+export default WrappedOvalPoliciesNew;

data/webpack/routes/OvalPolicies/OvalPoliciesShow/CvesTable.js

@@ -4,7 +4,7 @@ import { translate as __ } from 'foremanReact/common/I18n';
 
 import { linkCell } from '../../../helpers/tableHelper';
 import { hostsPath } from '../../../helpers/pathsHelper';
-import { decodeId } from '../../../helpers/globalIdHelper';
+import { decodeModelId } from '../../../helpers/globalIdHelper';
 import { addSearch } from '../../../helpers/pageParamsHelper';
 
 import withLoading from '../../../components/withLoading';
@@ -25,7 +25,7 @@ const CvesTable = props => {
 
   const hostCount = cve =>
     linkCell(
-      addSearch(hostsPath, { search: `cve_id = ${decodeId(cve)}` }),
+      addSearch(hostsPath, { search: `cve_id = ${decodeModelId(cve)}` }),
       cve.hosts.nodes.length
     );
 

data/webpack/routes/OvalPolicies/OvalPoliciesShow/DetailsTab.js

@@ -40,6 +40,7 @@ const DetailsTab = props => {
             onConfirm={onAttrUpdate('name', policy, callMutation, showToast)}
             component={TextInput}
             attrName="name"
+            allowed={policy.meta.canEdit}
           />
         </TextListItem>
         <TextListItem component={TextListItemVariants.dt}>
@@ -70,6 +71,7 @@ const DetailsTab = props => {
             )}
             component={TextArea}
             attrName="description"
+            allowed={policy.meta.canEdit}
           />
         </TextListItem>
       </TextList>

data/webpack/routes/OvalPolicies/OvalPoliciesShow/OvalPoliciesShowHelper.js

@@ -1,6 +1,5 @@
 import { translate as __, sprintf } from 'foremanReact/common/I18n';
-
-import { decodeId } from '../../../helpers/globalIdHelper';
+import { decodeModelId } from '../../../helpers/globalIdHelper';
 import { addSearch } from '../../../helpers/pageParamsHelper';
 import { newJobPath } from '../../../helpers/pathsHelper';
 
@@ -19,7 +18,9 @@ export const policySchedule = policy => {
 
 const targetingScopedSearchQuery = policy => {
   const hgIds = policy.hostgroups.nodes.reduce((memo, hg) => {
-    const ids = [decodeId(hg)].concat(hg.descendants.nodes.map(decodeId));
+    const ids = [decodeModelId(hg)].concat(
+      hg.descendants.nodes.map(decodeModelId)
+    );
     return ids.reduce(
       (acc, id) => (acc.includes(id) ? acc : [...acc, id]),
       memo

data/webpack/routes/OvalPolicies/OvalPoliciesShow/__tests__/OvalPoliciesEdit.test.js

@@ -9,6 +9,7 @@ import {
   historyMock,
   ovalPolicyId,
   policyDetailMock,
+  policyEditPermissionsMock,
   ovalPolicy,
 } from './OvalPoliciesShow.fixtures';
 import {
@@ -171,5 +172,31 @@ describe('OvalPoliciesShow', () => {
     ).not.toBeInTheDocument();
     expect(screen.getByText(ovalPolicy.name)).toBeInTheDocument();
     expect(screen.getByText('has already been taken')).toBeInTheDocument();
+    userEvent.click(
+      screen.getByRole('button', { name: 'cancel editing name' })
+    );
+    userEvent.click(editBtn);
+    expect(
+      screen.queryByText('has already been taken')
+    ).not.toBeInTheDocument();
+  });
+  it('should not show edit btns when user is not allowed to edit', async () => {
+    render(
+      <TestComponent
+        history={historyMock}
+        match={{
+          params: { id: ovalPolicyId, tab: 'details' },
+          path: ovalPoliciesShowPath,
+        }}
+        mocks={policyEditPermissionsMock}
+      />
+    );
+    await waitFor(tick);
+    expect(
+      screen.queryByRole('button', { name: 'edit name' })
+    ).not.toBeInTheDocument();
+    expect(
+      screen.queryByRole('button', { name: 'edit description' })
+    ).not.toBeInTheDocument();
   });
 });

data/webpack/routes/OvalPolicies/OvalPoliciesShow/__tests__/OvalPoliciesShow.fixtures.js

@@ -1,4 +1,4 @@
-import { mockFactory, admin, intruder } from '../../../../testHelper';
+import { mockFactory, admin, intruder, viewer } from '../../../../testHelper';
 import ovalPolicyQuery from '../../../../graphql/queries/ovalPolicy.gql';
 import cvesQuery from '../../../../graphql/queries/cves.gql';
 import hostgroupsQuery from '../../../../graphql/queries/hostgroups.gql';
@@ -16,6 +16,9 @@ export const ovalPolicy = {
   weekday: 'tuesday',
   dayOfMonth: null,
   description: 'A very strict policy',
+  meta: {
+    canEdit: true,
+  },
   hostgroups: {
     nodes: [
       {
@@ -33,6 +36,8 @@ export const ovalPolicy = {
   },
 };
 
+const noEditPolicy = { ...ovalPolicy, meta: { canEdit: false } };
+
 const cvesResult = {
   totalCount: 1,
   nodes: [
@@ -112,3 +117,8 @@ export const policyHostgroupsDeniedMock = hostgroupsMockFactory(
   { totalCount: 0, nodes: [] },
   { currentUser: intruder }
 );
+export const policyEditPermissionsMock = policyDetailMockFactory(
+  { id: ovalPolicy.id },
+  noEditPolicy,
+  { currentUser: viewer }
+);

data/webpack/routes/routes.js

@@ -3,6 +3,7 @@ import OvalContentsIndex from './OvalContents/OvalContentsIndex';
 import OvalContentsShow from './OvalContents/OvalContentsShow';
 import OvalContentsNew from './OvalContents/OvalContentsNew';
 import OvalPoliciesIndex from './OvalPolicies/OvalPoliciesIndex';
+import OvalPoliciesNew from './OvalPolicies/OvalPoliciesNew';
 import OvalPoliciesShow from './OvalPolicies/OvalPoliciesShow';
 
 import {
@@ -11,6 +12,7 @@ import {
   ovalContentsNewPath,
   ovalPoliciesPath,
   ovalPoliciesShowPath,
+  ovalPoliciesNewPath,
 } from '../helpers/pathsHelper';
 
 export default [
@@ -34,6 +36,11 @@ export default [
     render: props => <OvalPoliciesIndex {...props} />,
     exact: true,
   },
+  {
+    path: ovalPoliciesNewPath,
+    render: props => <OvalPoliciesNew {...props} />,
+    exact: true,
+  },
   {
     path: ovalPoliciesShowPath,
     render: props => <OvalPoliciesShow {...props} />,

data/webpack/testHelper.js

@@ -4,6 +4,7 @@ import store from 'foremanReact/redux';
 import { MockedProvider } from '@apollo/react-testing';
 import { MemoryRouter } from 'react-router-dom';
 import { getForemanContext } from 'foremanReact/Root/Context/ForemanContext';
+import { waitFor } from '@testing-library/react';
 
 export const withRedux = Component => props => (
   <Provider store={store}>
@@ -42,6 +43,14 @@ export const withMockedProvider = Component => props => {
 // use to resolve async mock requests for apollo MockedProvider
 export const tick = () => new Promise(resolve => setTimeout(resolve, 0));
 
+export const wait = async (tickCount = 1) => {
+  for (let i = 1; i < tickCount; i++) {
+    // eslint-disable-next-line no-await-in-loop
+    await waitFor(tick);
+  }
+  return waitFor(tick);
+};
+
 export const historyMock = {
   location: {
     search: '',
@@ -76,6 +85,19 @@ export const intruder = userFactory('intruder', [
   },
 ]);
 
+export const viewer = userFactory('viewer', [
+  {
+    __typename: 'Permission',
+    id: 'MDE6UGVybWlzc2lvbi0yOTY=',
+    name: 'view_oval_contents',
+  },
+  {
+    __typename: 'Permission',
+    id: 'MDE6UGVybWlzc2lvbi0yNzU=',
+    name: 'view_oval_policies',
+  },
+]);
+
 export const mockFactory = (resultName, query) => (
   variables,
   modelResults,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_openscap
 version: !ruby/object:Gem::Version
-  version: 5.1.0
+  version: 5.2.0
 platform: ruby
 authors:
 - slukasik@redhat.com
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-01 00:00:00.000000000 Z
+date: 2021-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -73,6 +73,7 @@ files:
 - app/controllers/scap_contents_controller.rb
 - app/controllers/tailoring_files_controller.rb
 - app/graphql/mutations/oval_contents/delete.rb
+- app/graphql/mutations/oval_policies/create.rb
 - app/graphql/mutations/oval_policies/delete.rb
 - app/graphql/mutations/oval_policies/update.rb
 - app/graphql/types/cve.rb
@@ -444,6 +445,7 @@ files:
 - webpack/components/withDeleteModal.js
 - webpack/components/withLoading.js
 - webpack/global_index.js
+- webpack/graphql/mutations/createOvalPolicy.gql
 - webpack/graphql/mutations/deleteOvalContent.gql
 - webpack/graphql/mutations/deleteOvalPolicy.gql
 - webpack/graphql/mutations/updateOvalPolicy.gql
@@ -463,6 +465,7 @@ files:
 - webpack/helpers/permissionsHelper.js
 - webpack/helpers/tableHelper.js
 - webpack/helpers/toastHelper.js
+- webpack/helpers/toastsHelper.js
 - webpack/index.js
 - webpack/routes/OvalContents/OvalContentsIndex/OvalContentsIndex.js
 - webpack/routes/OvalContents/OvalContentsIndex/OvalContentsTable.js
@@ -487,6 +490,13 @@ files:
 - webpack/routes/OvalPolicies/OvalPoliciesIndex/__tests__/OvalPoliciesIndex.fixtures.js
 - webpack/routes/OvalPolicies/OvalPoliciesIndex/__tests__/OvalPoliciesIndex.test.js
 - webpack/routes/OvalPolicies/OvalPoliciesIndex/index.js
+- webpack/routes/OvalPolicies/OvalPoliciesNew/HostgroupSelect.js
+- webpack/routes/OvalPolicies/OvalPoliciesNew/NewOvalPolicyForm.js
+- webpack/routes/OvalPolicies/OvalPoliciesNew/NewOvalPolicyFormHelpers.js
+- webpack/routes/OvalPolicies/OvalPoliciesNew/OvalPoliciesNew.js
+- webpack/routes/OvalPolicies/OvalPoliciesNew/__tests__/OvalPoliciesNew.fixtures.js
+- webpack/routes/OvalPolicies/OvalPoliciesNew/__tests__/OvalPoliciesNew.test.js
+- webpack/routes/OvalPolicies/OvalPoliciesNew/index.js
 - webpack/routes/OvalPolicies/OvalPoliciesShow/CvesTab.js
 - webpack/routes/OvalPolicies/OvalPoliciesShow/CvesTable.js
 - webpack/routes/OvalPolicies/OvalPoliciesShow/DetailsTab.js