foreman_openscap 5.0.0 → 5.1.0

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

@@ -19,42 +19,6 @@ export const pageParamsHistoryMock = {
   push: pushMock,
 };
 
-const policiesMocks = {
-  totalCount: 2,
-  nodes: [
-    {
-      __typename: 'ForemanOpenscap::OvalPolicy',
-      id: 'abc',
-      name: 'first policy',
-      ovalContent: { name: 'first content' },
-    },
-    {
-      __typename: 'ForemanOpenscap::OvalPolicy',
-      id: 'xyz',
-      name: 'second policy',
-      ovalContent: { name: 'second content' },
-    },
-  ],
-};
-
-const pagedPoliciesMocks = {
-  totalCount: 7,
-  nodes: [
-    {
-      __typename: 'ForemanOpenscap::OvalPolicy',
-      id: 'xyz',
-      name: 'sixth policy',
-      ovalContent: { name: 'sixth content' },
-    },
-    {
-      __typename: 'ForemanOpenscap::OvalPolicy',
-      id: 'abc',
-      name: 'seventh policy',
-      ovalContent: { name: 'seventh content' },
-    },
-  ],
-};
-
 const viewer = userFactory('viewer', [
   {
     __typename: 'Permission',
@@ -63,16 +27,54 @@ const viewer = userFactory('viewer', [
   },
 ]);
 
+const firstPolicy = (meta = { canDestroy: true }) => ({
+  __typename: 'ForemanOpenscap::OvalPolicy',
+  id: 'MDE6Rm9yZW1hbk9wZW5zY2FwOjpPdmFsUG9saWN5LTE=',
+  name: 'first policy',
+  meta,
+  ovalContent: { name: 'first content' },
+});
+const secondPolicy = (meta = { canDestroy: true }) => ({
+  __typename: 'ForemanOpenscap::OvalPolicy',
+  id: 'MDE6Rm9yZW1hbk9wZW5zY2FwOjpPdmFsUG9saWN5LTQw',
+  name: 'second policy',
+  meta,
+  ovalContent: { name: 'second content' },
+});
+const policiesData = {
+  totalCount: 2,
+  nodes: [firstPolicy(), secondPolicy()],
+};
+
 export const mocks = policiesMockFactory(
   { first: 20, last: 20 },
-  policiesMocks,
+  policiesData,
   { currentUser: admin }
 );
 export const pageParamsMocks = policiesMockFactory(
   { first: 10, last: 5 },
-  pagedPoliciesMocks,
+  {
+    totalCount: 7,
+    nodes: [
+      {
+        __typename: 'ForemanOpenscap::OvalPolicy',
+        id: 'MDE6Rm9yZW1hbk9wZW5zY2FwOjpPdmFsUG9saWN5LTQx',
+        name: 'sixth policy',
+        meta: { canDestroy: true },
+        ovalContent: { name: 'sixth content' },
+      },
+      {
+        __typename: 'ForemanOpenscap::OvalPolicy',
+        id: 'MDE6Rm9yZW1hbk9wZW5zY2FwOjpPdmFsUG9saWN5LTQy',
+        name: 'seventh policy',
+        meta: { canDestroy: true },
+        ovalContent: { name: 'seventh content' },
+      },
+    ],
+  },
   { currentUser: admin }
 );
+
 export const emptyMocks = policiesMockFactory(
   { first: 20, last: 20 },
   { totalCount: 0, nodes: [] },
@@ -81,15 +83,29 @@ export const emptyMocks = policiesMockFactory(
 export const errorMocks = policiesMockFactory(
   { first: 20, last: 20 },
   { totalCount: 0, nodes: [] },
-  { errors: [{ message: 'Something very bad happened.' }], currentUser: admin }
+  {
+    errors: [{ message: 'Something very bad happened.', path: 'base' }],
+    currentUser: admin,
+  }
 );
 export const viewerMocks = policiesMockFactory(
   { first: 20, last: 20 },
-  policiesMocks,
+  policiesData,
   { currentUser: viewer }
 );
 export const unauthorizedMocks = policiesMockFactory(
   { first: 20, last: 20 },
-  policiesMocks,
+  policiesData,
   { currentUser: intruder }
 );
+export const noDeleteMocks = policiesMockFactory(
+  { first: 20, last: 20 },
+  {
+    totalCount: 2,
+    nodes: [
+      firstPolicy({ canDestroy: false }),
+      secondPolicy({ canDestroy: false }),
+    ],
+  },
+  { currentUser: admin }
+);

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

@@ -7,6 +7,7 @@ import '@testing-library/jest-dom';
 import {
   withMockedProvider,
   withRouter,
+  withRedux,
   tick,
   historyMock,
 } from '../../../../testHelper';
@@ -22,10 +23,12 @@ import {
   unauthorizedMocks,
 } from './OvalPoliciesIndex.fixtures';
 
-import OvalPoliciesIndex from '../OvalPoliciesIndex';
+import OvalPoliciesIndex from '../index';
 import { ovalPoliciesPath } from '../../../../helpers/pathsHelper';
 
-const TestComponent = withRouter(withMockedProvider(OvalPoliciesIndex));
+const TestComponent = withRouter(
+  withRedux(withMockedProvider(OvalPoliciesIndex))
+);
 
 describe('OvalPoliciesIndex', () => {
   it('should load page', async () => {
@@ -42,6 +45,15 @@ describe('OvalPoliciesIndex', () => {
     expect(within(pageItems).getByText(/1 - 2/)).toBeInTheDocument();
     expect(within(pageItems).getByText('of')).toBeInTheDocument();
     expect(within(pageItems).getByText('2')).toBeInTheDocument();
+
+    expect(screen.getByText('first policy').closest('a')).toHaveAttribute(
+      'href',
+      '/experimental/compliance/oval_policies/1'
+    );
+    expect(screen.getByText('second policy').closest('a')).toHaveAttribute(
+      'href',
+      '/experimental/compliance/oval_policies/40'
+    );
   });
   it('should load page with page params', async () => {
     const { container } = render(

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

@@ -1,7 +1,13 @@
 import React from 'react';
+import { useDispatch } from 'react-redux';
+import { showToast } from '../../../helpers/toastHelper';
 
 import OvalPoliciesIndex from './OvalPoliciesIndex';
 
-const WrappedOvalPoliciesIndex = props => <OvalPoliciesIndex {...props} />;
+const WrappedOvalPoliciesIndex = props => {
+  const dispatch = useDispatch();
+
+  return <OvalPoliciesIndex {...props} showToast={showToast(dispatch)} />;
+};
 
 export default WrappedOvalPoliciesIndex;

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

@@ -0,0 +1,85 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { useMutation } from '@apollo/client';
+
+import {
+  TextList,
+  TextContent,
+  TextArea,
+  TextListItem,
+  TextListVariants,
+  TextListItemVariants,
+  TextInput,
+} from '@patternfly/react-core';
+
+import { translate as __ } from 'foremanReact/common/I18n';
+
+import EditableInput from '../../../components/EditableInput';
+
+import { onAttrUpdate, policySchedule } from './OvalPoliciesShowHelper';
+import updateOvalPolicyMutation from '../../../graphql/mutations/updateOvalPolicy.gql';
+
+const DetailsTab = props => {
+  const { policy, showToast } = props;
+
+  const [callMutation] = useMutation(updateOvalPolicyMutation);
+
+  return (
+    <TextContent className="pf-u-pt-md">
+      <TextList component={TextListVariants.dl}>
+        <TextListItem component={TextListItemVariants.dt}>
+          {__('Name')}
+        </TextListItem>
+        <TextListItem
+          aria-label="label text value"
+          component={TextListItemVariants.dd}
+          className="foreman-spaced-list"
+        >
+          <EditableInput
+            value={policy.name}
+            onConfirm={onAttrUpdate('name', policy, callMutation, showToast)}
+            component={TextInput}
+            attrName="name"
+          />
+        </TextListItem>
+        <TextListItem component={TextListItemVariants.dt}>
+          {__('Period')}
+        </TextListItem>
+        <TextListItem
+          aria-label="label text value"
+          component={TextListItemVariants.dd}
+          className="foreman-spaced-list"
+        >
+          {policySchedule(policy)}
+        </TextListItem>
+        <TextListItem component={TextListItemVariants.dt}>
+          {__('Description')}
+        </TextListItem>
+        <TextListItem
+          aria-label="label text value"
+          component={TextListItemVariants.dd}
+          className="foreman-spaced-list"
+        >
+          <EditableInput
+            value={policy.description}
+            onConfirm={onAttrUpdate(
+              'description',
+              policy,
+              callMutation,
+              showToast
+            )}
+            component={TextArea}
+            attrName="description"
+          />
+        </TextListItem>
+      </TextList>
+    </TextContent>
+  );
+};
+
+DetailsTab.propTypes = {
+  policy: PropTypes.object.isRequired,
+  showToast: PropTypes.func.isRequired,
+};
+
+export default DetailsTab;

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

@@ -0,0 +1,49 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { translate as __ } from 'foremanReact/common/I18n';
+
+import { useQuery } from '@apollo/client';
+
+import HostgroupsTable from './HostgroupsTable';
+
+import hostgroups from '../../../graphql/queries/hostgroups.gql';
+import {
+  useParamsToVars,
+  useCurrentPagination,
+} from '../../../helpers/pageParamsHelper';
+
+const HostgroupsTab = props => {
+  const useFetchFn = componentProps =>
+    useQuery(hostgroups, {
+      variables: {
+        search: `oval_policy_id = ${componentProps.match.params.id}`,
+        ...useParamsToVars(componentProps.history),
+      },
+    });
+
+  const renameData = data => ({
+    hostgroups: data.hostgroups.nodes,
+    totalCount: data.hostgroups.totalCount,
+  });
+
+  const pagination = useCurrentPagination(props.history);
+
+  return (
+    <HostgroupsTable
+      {...props}
+      fetchFn={useFetchFn}
+      renameData={renameData}
+      resultPath="hostgroups.nodes"
+      pagination={pagination}
+      emptyStateTitle={__('No Hostgroups found.')}
+      permissions={['view_hostgroups']}
+    />
+  );
+};
+
+HostgroupsTab.propTypes = {
+  match: PropTypes.object.isRequired,
+  history: PropTypes.object.isRequired,
+};
+
+export default HostgroupsTab;

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

@@ -0,0 +1,38 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { translate as __ } from 'foremanReact/common/I18n';
+
+import withLoading from '../../../components/withLoading';
+import IndexTable from '../../../components/IndexTable';
+
+const CvesTable = props => {
+  const columns = [{ title: __('Name') }];
+
+  const rows = props.hostgroups.map(hostgroup => ({
+    cells: [{ title: hostgroup.name }],
+    hostgroup,
+  }));
+
+  const actions = [];
+
+  return (
+    <IndexTable
+      columns={columns}
+      rows={rows}
+      actions={actions}
+      pagination={props.pagination}
+      totalCount={props.totalCount}
+      history={props.history}
+      ariaTableLabel={__('Table of hostgroups for OVAL policy')}
+    />
+  );
+};
+
+CvesTable.propTypes = {
+  hostgroups: PropTypes.array.isRequired,
+  pagination: PropTypes.object.isRequired,
+  totalCount: PropTypes.number.isRequired,
+  history: PropTypes.object.isRequired,
+};
+
+export default withLoading(CvesTable);

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

@@ -7,7 +7,6 @@ import {
   Button,
   Grid,
   GridItem,
-  TextContent,
   Text,
   TextVariants,
   Tabs,
@@ -16,10 +15,11 @@ import {
 } from '@patternfly/react-core';
 
 import withLoading from '../../../components/withLoading';
-
 import CvesTab from './CvesTab';
+import HostgroupsTab from './HostgroupsTab';
+import DetailsTab from './DetailsTab';
 
-import { policySchedule, newJobFormPath } from './OvalPoliciesShowHelper';
+import { newJobFormPath } from './OvalPoliciesShowHelper';
 import { resolvePath } from '../../../helpers/pathsHelper';
 
 const OvalPoliciesShow = props => {
@@ -50,18 +50,22 @@ const OvalPoliciesShow = props => {
           <Tabs mountOnEnter activeKey={activeTab} onSelect={handleTabSelect}>
             <Tab
               eventKey="details"
-              title={<TabTitleText>Details</TabTitleText>}
+              title={<TabTitleText>{__('Details')}</TabTitleText>}
             >
-              <TextContent className="pf-u-pt-md">
-                <Text component={TextVariants.h3}>Period</Text>
-                <Text component={TextVariants.p}>{policySchedule(policy)}</Text>
-                <Text component={TextVariants.h3}>Description</Text>
-                <Text component={TextVariants.p}>{policy.description}</Text>
-              </TextContent>
+              <DetailsTab {...props} />
             </Tab>
-            <Tab eventKey="cves" title={<TabTitleText>CVEs</TabTitleText>}>
+            <Tab
+              eventKey="cves"
+              title={<TabTitleText>{__('CVEs')}</TabTitleText>}
+            >
               <CvesTab {...props} />
             </Tab>
+            <Tab
+              eventKey="hostgroups"
+              title={<TabTitleText>{__('Hostgroups')}</TabTitleText>}
+            >
+              <HostgroupsTab {...props} />
+            </Tab>
           </Tabs>
         </GridItem>
       </Grid>

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

@@ -1,3 +1,5 @@
+import { translate as __, sprintf } from 'foremanReact/common/I18n';
+
 import { decodeId } from '../../../helpers/globalIdHelper';
 import { addSearch } from '../../../helpers/pageParamsHelper';
 import { newJobPath } from '../../../helpers/pathsHelper';
@@ -37,3 +39,78 @@ export const newJobFormPath = (policy, policyId) =>
     host_ids: targetingScopedSearchQuery(policy),
     'inputs[oval_policies]': policyId,
   });
+
+const policyToAttrs = (policy, attrs) =>
+  Object.entries(policy).reduce((memo, [key, value]) => {
+    if (attrs.includes(key)) {
+      memo[key] = value;
+    }
+    return memo;
+  }, {});
+
+const onUpdateSuccess = (
+  closeEditable,
+  stopSubmitting,
+  showToast,
+  attr,
+  onValidationError
+) => result => {
+  const { errors } = result.data.updateOvalPolicy;
+  if (Array.isArray(errors) && errors.length > 0) {
+    stopSubmitting();
+    if (
+      errors.length === 1 &&
+      errors[0].path.join(' ') === `attributes ${attr}`
+    ) {
+      onValidationError(errors[0].message);
+    } else {
+      showToast({
+        type: 'error',
+        message: formatError(joinErrors(errors)),
+      });
+    }
+  } else {
+    closeEditable();
+    showToast({
+      type: 'success',
+      message: __('OVAL policy was successfully updated.'),
+    });
+  }
+};
+
+const formatError = error =>
+  sprintf(
+    __('There was a following error when updating OVAL policy: %s'),
+    error
+  );
+
+const joinErrors = errors => errors.map(err => err.message).join(', ');
+
+const onUpdateError = (showToast, stopSubmitting) => error => {
+  stopSubmitting();
+  showToast({ type: 'error', message: formatError(error.message) });
+};
+
+export const onAttrUpdate = (attr, policy, callMutation, showToast) => (
+  newValue,
+  closeEditable,
+  stopSubmitting,
+  onValidationError
+) => {
+  const vars = policyToAttrs(policy, ['id', 'name', 'description', 'cronLine']);
+  vars[attr] = newValue;
+  return (
+    callMutation({ variables: vars })
+      // eslint-disable-next-line promise/prefer-await-to-then
+      .then(
+        onUpdateSuccess(
+          closeEditable,
+          stopSubmitting,
+          showToast,
+          attr,
+          onValidationError
+        )
+      )
+      .catch(onUpdateError(showToast, stopSubmitting))
+  );
+};

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

@@ -0,0 +1,48 @@
+import { mockFactory } from '../../../../testHelper';
+import updateOvalPolicyMutation from '../../../../graphql/mutations/updateOvalPolicy.gql';
+import { ovalPolicy } from './OvalPoliciesShow.fixtures';
+
+const updateOvalPolicyMockFactory = mockFactory(
+  'updateOvalPolicy',
+  updateOvalPolicyMutation
+);
+
+export const updatedName = 'updated policy name';
+
+const variables = {
+  id: ovalPolicy.id,
+  name: updatedName,
+  cronLine: ovalPolicy.cronLine,
+  description: ovalPolicy.description,
+};
+const responsePolicy = {
+  ovalPolicy: {
+    __typename: 'ForemanOpenscap::OvalPolicy',
+    id: ovalPolicy.id,
+    name: updatedName,
+    description: ovalPolicy.description,
+    cronLine: ovalPolicy.cronLine,
+  },
+  errors: [],
+};
+
+export const policyUpdateMock = updateOvalPolicyMockFactory(
+  variables,
+  responsePolicy
+);
+
+export const policyUpdateErrorMock = updateOvalPolicyMockFactory(
+  variables,
+  responsePolicy,
+  { errors: [{ message: 'This is an unexpected failure.' }] }
+);
+
+export const policyUpdateValidationMock = updateOvalPolicyMockFactory(
+  variables,
+  {
+    ovalPolicy,
+    errors: [
+      { path: ['attributes', 'name'], message: 'has already been taken' },
+    ],
+  }
+);