foreman_openscap 5.0.0 → 5.1.0

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

@@ -0,0 +1,175 @@
+import React from 'react';
+
+import { render, screen, waitFor } from '@testing-library/react';
+import '@testing-library/jest-dom';
+import userEvent from '@testing-library/user-event';
+
+import OvalPoliciesShow from '../';
+import {
+  historyMock,
+  ovalPolicyId,
+  policyDetailMock,
+  ovalPolicy,
+} from './OvalPoliciesShow.fixtures';
+import {
+  policyUpdateMock,
+  policyUpdateErrorMock,
+  policyUpdateValidationMock,
+  updatedName,
+} from './OvalPoliciesEdit.fixtures';
+import { ovalPoliciesShowPath } from '../../../../helpers/pathsHelper';
+
+import {
+  withMockedProvider,
+  tick,
+  withRouter,
+  withRedux,
+} from '../../../../testHelper';
+
+import * as toasts from '../../../../helpers/toastHelper';
+
+const TestComponent = withRouter(
+  withRedux(withMockedProvider(OvalPoliciesShow))
+);
+
+describe('OvalPoliciesShow', () => {
+  it('should open and close inline edit for name', async () => {
+    render(
+      <TestComponent
+        history={historyMock}
+        match={{
+          params: { id: ovalPolicyId, tab: 'details' },
+          path: ovalPoliciesShowPath,
+        }}
+        mocks={policyDetailMock}
+      />
+    );
+    await waitFor(tick);
+    userEvent.click(screen.getByRole('button', { name: 'edit name' }));
+    userEvent.clear(screen.getByLabelText(/name text input/));
+    userEvent.type(screen.getByLabelText(/name text input/), 'foo');
+    expect(screen.getByLabelText(/name text input/)).toHaveAttribute(
+      'value',
+      'foo'
+    );
+    userEvent.click(
+      screen.getByRole('button', { name: 'cancel editing name' })
+    );
+    expect(screen.queryByText('foo')).not.toBeInTheDocument();
+  });
+  it('should update policy name', async () => {
+    const showToast = jest.fn();
+    jest.spyOn(toasts, 'showToast').mockImplementation(() => showToast);
+
+    const { container } = render(
+      <TestComponent
+        history={historyMock}
+        match={{
+          params: { id: ovalPolicyId, tab: 'details' },
+          path: ovalPoliciesShowPath,
+        }}
+        mocks={policyDetailMock.concat(policyUpdateMock)}
+      />
+    );
+    await waitFor(tick);
+    const editBtn = screen.getByRole('button', { name: 'edit name' });
+    expect(editBtn).toBeInTheDocument();
+    expect(
+      screen.queryByRole('button', { name: 'submit name' })
+    ).not.toBeInTheDocument();
+
+    userEvent.click(editBtn);
+    expect(
+      screen.queryByRole('button', { name: 'edit name' })
+    ).not.toBeInTheDocument();
+    const inputField = screen.getByLabelText(/name text input/);
+    const submitBtn = screen.getByRole('button', { name: 'submit name' });
+    const cancelBtn = screen.getByRole('button', {
+      name: 'cancel editing name',
+    });
+
+    userEvent.clear(inputField);
+    userEvent.type(inputField, updatedName);
+    userEvent.click(submitBtn);
+    expect(inputField).toBeDisabled();
+    expect(submitBtn).toBeDisabled();
+    expect(cancelBtn).toBeDisabled();
+    const spinner = container.querySelector('#edit-name-spinner');
+    expect(spinner).toBeInTheDocument();
+    await waitFor(tick);
+    expect(showToast).toHaveBeenCalledWith({
+      type: 'success',
+      message: 'OVAL policy was successfully updated.',
+    });
+
+    expect(inputField).not.toBeInTheDocument();
+    expect(editBtn).toBeInTheDocument();
+    expect(cancelBtn).not.toBeInTheDocument();
+    expect(
+      screen.queryByRole('button', { name: 'submit name' })
+    ).not.toBeInTheDocument();
+    await waitFor(tick);
+    expect(screen.getAllByText(updatedName).pop()).toBeInTheDocument();
+  });
+  it('should show unexpected errors', async () => {
+    const showToast = jest.fn();
+    jest.spyOn(toasts, 'showToast').mockImplementation(() => showToast);
+
+    render(
+      <TestComponent
+        history={historyMock}
+        match={{
+          params: { id: ovalPolicyId, tab: 'details' },
+          path: ovalPoliciesShowPath,
+        }}
+        mocks={policyDetailMock.concat(policyUpdateErrorMock)}
+      />
+    );
+    await waitFor(tick);
+    const editBtn = screen.getByRole('button', { name: 'edit name' });
+    userEvent.click(editBtn);
+    const inputField = screen.getByLabelText(/name text input/);
+    userEvent.clear(inputField);
+    userEvent.type(inputField, updatedName);
+    userEvent.click(screen.getByRole('button', { name: 'submit name' }));
+    await waitFor(tick);
+    expect(showToast).toHaveBeenCalledWith({
+      type: 'error',
+      message:
+        'There was a following error when updating OVAL policy: This is an unexpected failure.',
+    });
+    expect(inputField).toBeInTheDocument();
+    expect(inputField).not.toBeDisabled();
+    expect(screen.getByText(ovalPolicy.name)).toBeInTheDocument();
+  });
+  it('should show validation errors', async () => {
+    const showToast = jest.fn();
+    jest.spyOn(toasts, 'showToast').mockImplementation(() => showToast);
+
+    const { container } = render(
+      <TestComponent
+        history={historyMock}
+        match={{
+          params: { id: ovalPolicyId, tab: 'details' },
+          path: ovalPoliciesShowPath,
+        }}
+        mocks={policyDetailMock.concat(policyUpdateValidationMock)}
+      />
+    );
+    await waitFor(tick);
+    const editBtn = screen.getByRole('button', { name: 'edit name' });
+    userEvent.click(editBtn);
+    const inputField = screen.getByLabelText(/name text input/);
+    userEvent.clear(inputField);
+    userEvent.type(inputField, updatedName);
+    userEvent.click(screen.getByRole('button', { name: 'submit name' }));
+    await waitFor(tick);
+    expect(inputField).toBeInTheDocument();
+    expect(inputField).not.toBeDisabled();
+    expect(
+      container.querySelector('#edit-name-spinner')
+    ).not.toBeInTheDocument();
+    expect(screen.getByText(ovalPolicy.name)).toBeInTheDocument();
+    expect(screen.getByText('has already been taken')).toBeInTheDocument();
+  });
+});

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

@@ -1,11 +1,14 @@
 import { mockFactory, admin, intruder } from '../../../../testHelper';
 import ovalPolicyQuery from '../../../../graphql/queries/ovalPolicy.gql';
 import cvesQuery from '../../../../graphql/queries/cves.gql';
+import hostgroupsQuery from '../../../../graphql/queries/hostgroups.gql';
 
 const policyDetailMockFactory = mockFactory('ovalPolicy', ovalPolicyQuery);
 const cvesMockFactory = mockFactory('cves', cvesQuery);
+const hostgroupsMockFactory = mockFactory('hostgroups', hostgroupsQuery);
 
-const ovalPolicy = {
+export const ovalPolicy = {
+  __typename: 'ForemanOpenscap::OvalPolicy',
   id: 'MDE6Rm9yZW1hbk9wZW5zY2FwOjpPdmFsUG9saWN5LTM=',
   name: 'Third policy',
   period: 'weekly',
@@ -51,6 +54,20 @@ const cvesResult = {
   ],
 };
 
+const hostgroupsResult = {
+  totalCount: 2,
+  nodes: [
+    {
+      id: 'MDE6SG9zdGdyb3VwLTQ=',
+      name: 'first hostgroup',
+    },
+    {
+      id: 'MDE6SG9zdGdyb3VwLTEy',
+      name: 'second hostgroup',
+    },
+  ],
+};
+
 export const ovalPolicyId = 3;
 
 export const pushMock = jest.fn();
@@ -85,3 +102,13 @@ export const policyCvesMock = cvesMockFactory(
   cvesResult,
   { currentUser: admin }
 );
+export const policyHostgroupsMock = hostgroupsMockFactory(
+  { search: `oval_policy_id = ${ovalPolicyId}`, first: 5, last: 5 },
+  hostgroupsResult,
+  { currentUser: admin }
+);
+export const policyHostgroupsDeniedMock = hostgroupsMockFactory(
+  { search: `oval_policy_id = ${ovalPolicyId}`, first: 5, last: 5 },
+  { totalCount: 0, nodes: [] },
+  { currentUser: intruder }
+);

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

@@ -12,18 +12,27 @@ import {
   resolvePath,
 } from '../../../../helpers/pathsHelper';
 
-import { withMockedProvider, tick, withRouter } from '../../../../testHelper';
+import {
+  withRedux,
+  withMockedProvider,
+  tick,
+  withRouter,
+} from '../../../../testHelper';
 import {
   policyDetailMock,
   historyMock,
   historyWithSearch,
   pushMock,
   policyCvesMock,
+  policyHostgroupsMock,
+  policyHostgroupsDeniedMock,
   ovalPolicyId,
   policyUnauthorizedMock,
 } from './OvalPoliciesShow.fixtures';
 
-const TestComponent = withRouter(withMockedProvider(OvalPoliciesShow));
+const TestComponent = withRedux(
+  withRouter(withMockedProvider(OvalPoliciesShow))
+);
 
 describe('OvalPoliciesShow', () => {
   it('should load details by default and handle tab change', async () => {
@@ -37,7 +46,7 @@ describe('OvalPoliciesShow', () => {
     expect(screen.getByText('Loading')).toBeInTheDocument();
     await waitFor(tick);
     expect(screen.queryByText('Loading')).not.toBeInTheDocument();
-    expect(screen.getByText('Third policy')).toBeInTheDocument();
+    expect(screen.getAllByText('Third policy').pop()).toBeInTheDocument();
     expect(screen.getByText('Weekly, on tuesday')).toBeInTheDocument();
     expect(screen.getByText('A very strict policy')).toBeInTheDocument();
     const activeTabHeader = container.querySelector(
@@ -105,7 +114,7 @@ describe('OvalPoliciesShow', () => {
   it('should have button for scanning all hostgroups', async () => {
     const btnText = 'Scan All Hostgroups';
 
-    const WithProvider = withMockedProvider(OvalPoliciesShow);
+    const WithProvider = withRedux(withMockedProvider(OvalPoliciesShow));
     const history = createMemoryHistory();
     history.push = jest.fn();
 
@@ -126,4 +135,38 @@ describe('OvalPoliciesShow', () => {
       '/job_invocations/new?feature=foreman_openscap_run_oval_scans&host_ids=hostgroup_id+%5E+%284+10+12+11%29&inputs%5Boval_policies%5D=3'
     );
   });
+  it('should load hostgroups tab when specified in URL', async () => {
+    const mocks = policyDetailMock.concat(policyHostgroupsMock);
+    render(
+      <TestComponent
+        history={historyWithSearch}
+        match={{
+          params: { id: ovalPolicyId, tab: 'hostgroups' },
+          path: ovalPoliciesShowPath,
+        }}
+        mocks={mocks}
+      />
+    );
+    expect(screen.getByText('Loading')).toBeInTheDocument();
+    await waitFor(tick);
+    await waitFor(tick);
+    expect(screen.queryByText('Loading')).not.toBeInTheDocument();
+    expect(screen.getByText('first hostgroup')).toBeInTheDocument();
+  });
+  it('should not show hostgroups for a user without permissions', async () => {
+    const mocks = policyDetailMock.concat(policyHostgroupsDeniedMock);
+    render(
+      <TestComponent
+        history={historyWithSearch}
+        match={{
+          params: { id: ovalPolicyId, tab: 'hostgroups' },
+          path: ovalPoliciesShowPath,
+        }}
+        mocks={mocks}
+      />
+    );
+    await waitFor(tick);
+    await waitFor(tick);
+    expect(screen.getByText('Permission denied')).toBeInTheDocument();
+  });
 });

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

@@ -1,8 +1,10 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { useQuery } from '@apollo/client';
+import { useDispatch } from 'react-redux';
 
 import { translate as __ } from 'foremanReact/common/I18n';
+import { showToast } from '../../../helpers/toastHelper';
 
 import OvalPoliciesShow from './OvalPoliciesShow';
 import { encodeId } from '../../../helpers/globalIdHelper';
@@ -25,6 +27,7 @@ const WrappedOvalPoliciesShow = props => {
       resultPath="ovalPolicy"
       emptyStateTitle={__('No OVAL Policy found')}
       permissions={['view_oval_policies']}
+      showToast={showToast(useDispatch())}
     />
   );
 };

data/webpack/routes/routes.js

@@ -1,10 +1,14 @@
 import React from 'react';
 import OvalContentsIndex from './OvalContents/OvalContentsIndex';
+import OvalContentsShow from './OvalContents/OvalContentsShow';
+import OvalContentsNew from './OvalContents/OvalContentsNew';
 import OvalPoliciesIndex from './OvalPolicies/OvalPoliciesIndex';
 import OvalPoliciesShow from './OvalPolicies/OvalPoliciesShow';
 
 import {
   ovalContentsPath,
+  ovalContentsShowPath,
+  ovalContentsNewPath,
   ovalPoliciesPath,
   ovalPoliciesShowPath,
 } from '../helpers/pathsHelper';
@@ -15,6 +19,16 @@ export default [
     render: props => <OvalContentsIndex {...props} />,
     exact: true,
   },
+  {
+    path: ovalContentsNewPath,
+    render: props => <OvalContentsNew {...props} />,
+    exact: true,
+  },
+  {
+    path: ovalContentsShowPath,
+    render: props => <OvalContentsShow {...props} />,
+    exact: true,
+  },
   {
     path: ovalPoliciesPath,
     render: props => <OvalPoliciesIndex {...props} />,

data/webpack/testHelper.js

@@ -1,8 +1,16 @@
 import React from 'react';
+import { Provider } from 'react-redux';
+import store from 'foremanReact/redux';
 import { MockedProvider } from '@apollo/react-testing';
 import { MemoryRouter } from 'react-router-dom';
 import { getForemanContext } from 'foremanReact/Root/Context/ForemanContext';
 
+export const withRedux = Component => props => (
+  <Provider store={store}>
+    <Component {...props} />
+  </Provider>
+);
+
 export const withRouter = Component => props => (
   <MemoryRouter>
     <Component {...props} />
@@ -71,7 +79,7 @@ export const intruder = userFactory('intruder', [
 export const mockFactory = (resultName, query) => (
   variables,
   modelResults,
-  { errors = [], currentUser = null }
+  { errors = [], currentUser = null } = {}
 ) => {
   const mock = {
     request: {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_openscap
 version: !ruby/object:Gem::Version
-  version: 5.0.0
+  version: 5.1.0
 platform: ruby
 authors:
 - slukasik@redhat.com
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-27 00:00:00.000000000 Z
+date: 2021-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -72,7 +72,11 @@ files:
 - app/controllers/policy_dashboard_controller.rb
 - app/controllers/scap_contents_controller.rb
 - app/controllers/tailoring_files_controller.rb
+- app/graphql/mutations/oval_contents/delete.rb
+- app/graphql/mutations/oval_policies/delete.rb
+- app/graphql/mutations/oval_policies/update.rb
 - app/graphql/types/cve.rb
+- app/graphql/types/oval_check.rb
 - app/graphql/types/oval_content.rb
 - app/graphql/types/oval_policy.rb
 - app/helpers/arf_report_dashboard_helper.rb
@@ -301,6 +305,7 @@ files:
 - db/migrate/20201217130800_add_has_errata_to_cve.rb
 - db/migrate/20201217161511_add_url_to_oval_content.rb
 - db/migrate/20210409095625_add_oval_policy_reference_to_cve.rb
+- db/migrate/20210819143316_drop_unused_tables.rb
 - db/seeds.d/75-job_templates.rb
 - db/seeds.d/openscap_feature.rb
 - db/seeds.d/openscap_policy_notification.rb
@@ -387,6 +392,8 @@ files:
 - test/functional/arf_reports_controller_test.rb
 - test/functional/openscap_proxies_controller_test.rb
 - test/functional/tailoring_files_controller_test.rb
+- test/graphql/mutations/oval_policies/delete_mutation_test.rb
+- test/graphql/queries/oval_content_query_test.rb
 - test/graphql/queries/oval_contents_query_test.rb
 - test/graphql/queries/oval_policies_query_test.rb
 - test/helpers/arf_report_dashboard_helper_test.rb
@@ -410,15 +417,21 @@ files:
 - test/unit/services/hostgroup_overrider_test.rb
 - test/unit/services/lookup_key_overrider_test.rb
 - test/unit/services/oval/cves_test.rb
+- test/unit/services/oval/setup_check_test.rb
 - test/unit/services/oval/setup_test.rb
 - test/unit/services/report_dashboard/data_test.rb
 - test/unit/services/tailoring_files_proxy_check_test.rb
 - test/unit/tailoring_file_test.rb
+- webpack/components/ConfirmModal.js
+- webpack/components/ConfirmModal.scss
+- webpack/components/EditableInput.js
+- webpack/components/EditableInput.scss
 - webpack/components/EmptyState.js
 - webpack/components/IndexLayout.js
 - webpack/components/IndexLayout.scss
 - webpack/components/IndexTable/IndexTableHelper.js
 - webpack/components/IndexTable/index.js
+- webpack/components/LinkButton.js
 - webpack/components/RuleSeverity/RuleSeverity.scss
 - webpack/components/RuleSeverity/RuleSeverity.test.js
 - webpack/components/RuleSeverity/__snapshots__/RuleSeverity.test.js.snap
@@ -428,34 +441,61 @@ files:
 - webpack/components/RuleSeverity/i_severity-med.svg
 - webpack/components/RuleSeverity/i_unknown.svg
 - webpack/components/RuleSeverity/index.js
+- webpack/components/withDeleteModal.js
 - webpack/components/withLoading.js
 - webpack/global_index.js
+- webpack/graphql/mutations/deleteOvalContent.gql
+- webpack/graphql/mutations/deleteOvalPolicy.gql
+- webpack/graphql/mutations/updateOvalPolicy.gql
 - webpack/graphql/queries/currentUserAttributes.gql
 - webpack/graphql/queries/cves.gql
+- webpack/graphql/queries/hostgroups.gql
+- webpack/graphql/queries/ovalContent.gql
 - webpack/graphql/queries/ovalContents.gql
 - webpack/graphql/queries/ovalPolicies.gql
 - webpack/graphql/queries/ovalPolicy.gql
 - webpack/helpers/commonHelper.js
+- webpack/helpers/formFieldsHelper.js
 - webpack/helpers/globalIdHelper.js
+- webpack/helpers/mutationHelper.js
 - webpack/helpers/pageParamsHelper.js
 - webpack/helpers/pathsHelper.js
 - webpack/helpers/permissionsHelper.js
 - webpack/helpers/tableHelper.js
+- webpack/helpers/toastHelper.js
 - webpack/index.js
 - webpack/routes/OvalContents/OvalContentsIndex/OvalContentsIndex.js
 - webpack/routes/OvalContents/OvalContentsIndex/OvalContentsTable.js
+- webpack/routes/OvalContents/OvalContentsIndex/__tests__/OvalContentsDestroy.fixtures.js
+- webpack/routes/OvalContents/OvalContentsIndex/__tests__/OvalContentsDestroy.test.js
 - webpack/routes/OvalContents/OvalContentsIndex/__tests__/OvalContentsIndex.fixtures.js
 - webpack/routes/OvalContents/OvalContentsIndex/__tests__/OvalContentsIndex.test.js
 - webpack/routes/OvalContents/OvalContentsIndex/index.js
+- webpack/routes/OvalContents/OvalContentsNew/OvalContentsNew.js
+- webpack/routes/OvalContents/OvalContentsNew/OvalContentsNew.scss
+- webpack/routes/OvalContents/OvalContentsNew/OvalContentsNewHelper.js
+- webpack/routes/OvalContents/OvalContentsNew/__tests__/OvalContentsNew.test.js
+- webpack/routes/OvalContents/OvalContentsNew/index.js
+- webpack/routes/OvalContents/OvalContentsShow/OvalContentsShow.js
+- webpack/routes/OvalContents/OvalContentsShow/OvalContentsShow.test.js
+- webpack/routes/OvalContents/OvalContentsShow/OvalContentsShowHelper.js
+- webpack/routes/OvalContents/OvalContentsShow/index.js
 - webpack/routes/OvalPolicies/OvalPoliciesIndex/OvalPoliciesIndex.js
 - webpack/routes/OvalPolicies/OvalPoliciesIndex/OvalPoliciesTable.js
+- webpack/routes/OvalPolicies/OvalPoliciesIndex/__tests__/OvalPoliciesDestroy.fixtures.js
+- webpack/routes/OvalPolicies/OvalPoliciesIndex/__tests__/OvalPoliciesDestroy.test.js
 - 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/OvalPoliciesShow/CvesTab.js
 - webpack/routes/OvalPolicies/OvalPoliciesShow/CvesTable.js
+- webpack/routes/OvalPolicies/OvalPoliciesShow/DetailsTab.js
+- webpack/routes/OvalPolicies/OvalPoliciesShow/HostgroupsTab.js
+- webpack/routes/OvalPolicies/OvalPoliciesShow/HostgroupsTable.js
 - webpack/routes/OvalPolicies/OvalPoliciesShow/OvalPoliciesShow.js
 - webpack/routes/OvalPolicies/OvalPoliciesShow/OvalPoliciesShowHelper.js
+- webpack/routes/OvalPolicies/OvalPoliciesShow/__tests__/OvalPoliciesEdit.fixtures.js
+- webpack/routes/OvalPolicies/OvalPoliciesShow/__tests__/OvalPoliciesEdit.test.js
 - webpack/routes/OvalPolicies/OvalPoliciesShow/__tests__/OvalPoliciesShow.fixtures.js
 - webpack/routes/OvalPolicies/OvalPoliciesShow/__tests__/OvalPoliciesShow.test.js
 - webpack/routes/OvalPolicies/OvalPoliciesShow/index.js
@@ -531,9 +571,10 @@ test_files:
 - test/unit/services/tailoring_files_proxy_check_test.rb
 - test/unit/services/oval/cves_test.rb
 - test/unit/services/oval/setup_test.rb
+- test/unit/services/oval/setup_check_test.rb
 - test/unit/services/config_name_service_test.rb
-- test/unit/services/hostgroup_overrider_test.rb
 - test/unit/services/lookup_key_overrider_test.rb
+- test/unit/services/hostgroup_overrider_test.rb
 - test/unit/tailoring_file_test.rb
 - test/unit/oval_host_test.rb
 - test/unit/oval_policy_test.rb
@@ -542,4 +583,6 @@ test_files:
 - test/fixtures/cve_fixtures.rb
 - test/graphql/queries/oval_contents_query_test.rb
 - test/graphql/queries/oval_policies_query_test.rb
+- test/graphql/queries/oval_content_query_test.rb
+- test/graphql/mutations/oval_policies/delete_mutation_test.rb
 - test/test_plugin_helper.rb