foreman_openscap 5.1.0 → 5.1.1

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.1.1
 platform: ruby
 authors:
 - slukasik@redhat.com
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-01 00:00:00.000000000 Z
+date: 2022-02-07 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
@@ -320,45 +321,32 @@ files:
 - locale/Makefile
 - locale/action_names.rb
 - locale/de/LC_MESSAGES/foreman_openscap.mo
-- locale/de/foreman_openscap.edit.po
 - locale/de/foreman_openscap.po
 - locale/en_GB/LC_MESSAGES/foreman_openscap.mo
-- locale/en_GB/foreman_openscap.edit.po
 - locale/en_GB/foreman_openscap.po
 - locale/es/LC_MESSAGES/foreman_openscap.mo
-- locale/es/foreman_openscap.edit.po
 - locale/es/foreman_openscap.po
 - locale/foreman_openscap.pot
 - locale/fr/LC_MESSAGES/foreman_openscap.mo
-- locale/fr/foreman_openscap.edit.po
 - locale/fr/foreman_openscap.po
 - locale/gl/LC_MESSAGES/foreman_openscap.mo
-- locale/gl/foreman_openscap.edit.po
 - locale/gl/foreman_openscap.po
 - locale/it/LC_MESSAGES/foreman_openscap.mo
-- locale/it/foreman_openscap.edit.po
 - locale/it/foreman_openscap.po
 - locale/ja/LC_MESSAGES/foreman_openscap.mo
-- locale/ja/foreman_openscap.edit.po
 - locale/ja/foreman_openscap.po
 - locale/ko/LC_MESSAGES/foreman_openscap.mo
-- locale/ko/foreman_openscap.edit.po
 - locale/ko/foreman_openscap.po
 - locale/pt_BR/LC_MESSAGES/foreman_openscap.mo
-- locale/pt_BR/foreman_openscap.edit.po
 - locale/pt_BR/foreman_openscap.po
 - locale/ru/LC_MESSAGES/foreman_openscap.mo
-- locale/ru/foreman_openscap.edit.po
 - locale/ru/foreman_openscap.po
 - locale/sv_SE/LC_MESSAGES/foreman_openscap.mo
-- locale/sv_SE/foreman_openscap.edit.po
 - locale/sv_SE/foreman_openscap.po
 - locale/zanata.xml
 - locale/zh_CN/LC_MESSAGES/foreman_openscap.mo
-- locale/zh_CN/foreman_openscap.edit.po
 - locale/zh_CN/foreman_openscap.po
 - locale/zh_TW/LC_MESSAGES/foreman_openscap.mo
-- locale/zh_TW/foreman_openscap.edit.po
 - locale/zh_TW/foreman_openscap.po
 - package.json
 - test/factories/arf_report_factory.rb
@@ -444,6 +432,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 +452,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 +477,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
@@ -505,7 +502,7 @@ homepage: https://github.com/theforeman/foreman_openscap
 licenses:
 - GPL-3.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -520,41 +517,46 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: Foreman plug-in for displaying OpenSCAP audit reports
 test_files:
 - test/factories/arf_report_factory.rb
 - test/factories/asset_factory.rb
-- test/factories/policy_arf_report_factory.rb
-- test/factories/policy_factory.rb
-- test/factories/scap_content_related.rb
-- test/factories/compliance_log_factory.rb
 - test/factories/compliance_host_factory.rb
+- test/factories/compliance_log_factory.rb
 - test/factories/oval_content_factory.rb
 - test/factories/oval_policy_factory.rb
+- test/factories/policy_arf_report_factory.rb
+- test/factories/policy_factory.rb
+- test/factories/scap_content_related.rb
 - test/files/arf_report/arf_report.bz2
 - test/files/arf_report/arf_report.html
 - test/files/arf_report/arf_report.json
 - test/files/arf_report/arf_report_msg_desc_changed.json
 - test/files/arf_report/arf_report_msg_value_changed.json
+- test/files/oval_contents/ansible-2.9.oval.xml.bz2
 - test/files/scap_contents/ssg-fedora-ds.xml
 - test/files/tailoring_files/ssg-firefox-ds-tailoring-2.xml
 - test/files/tailoring_files/ssg-firefox-ds-tailoring.xml
-- test/files/oval_contents/ansible-2.9.oval.xml.bz2
-- test/functional/api/v2/compliance/scap_content_profiles_controller_test.rb
-- test/functional/api/v2/compliance/scap_contents_controller_test.rb
-- test/functional/api/v2/compliance/tailoring_files_controller_test.rb
+- test/fixtures/cve_fixtures.rb
 - test/functional/api/v2/compliance/arf_reports_controller_test.rb
 - test/functional/api/v2/compliance/oval_contents_controller_test.rb
 - test/functional/api/v2/compliance/oval_policies_controller_test.rb
 - test/functional/api/v2/compliance/oval_reports_controller_test.rb
 - test/functional/api/v2/compliance/policies_controller_test.rb
+- test/functional/api/v2/compliance/scap_content_profiles_controller_test.rb
+- test/functional/api/v2/compliance/scap_contents_controller_test.rb
+- test/functional/api/v2/compliance/tailoring_files_controller_test.rb
 - test/functional/api/v2/hosts_controller_test.rb
 - 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
 - test/helpers/policy_dashboard_helper_test.rb
 - test/lib/foreman_openscap/bulk_upload_test.rb
@@ -565,24 +567,19 @@ test_files:
 - test/unit/concerns/openscap_proxy_extenstions_test.rb
 - test/unit/message_cleaner_test.rb
 - test/unit/openscap_host_test.rb
+- test/unit/oval_host_test.rb
+- test/unit/oval_policy_test.rb
+- test/unit/oval_status_test.rb
 - test/unit/policy_mailer_test.rb
+- test/unit/policy_test.rb
 - test/unit/scap_content_test.rb
-- test/unit/services/report_dashboard/data_test.rb
-- 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/lookup_key_overrider_test.rb
 - 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
-- test/unit/oval_host_test.rb
-- test/unit/oval_policy_test.rb
-- test/unit/oval_status_test.rb
-- test/unit/policy_test.rb
-- 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