katello 3.18.0.rc2.1 → 4.0.0.rc2

data/webpack/scenes/ContentViews/Create/index.js

@@ -0,0 +1,4 @@
+import { withRouter } from 'react-router-dom';
+import CreateContentViewModal from './CreateContentViewModal';
+
+export default withRouter(CreateContentViewModal);

data/webpack/scenes/ContentViews/Details/ContentViewDetailActions.js

@@ -8,8 +8,10 @@ import {
   UPDATE_CONTENT_VIEW_SUCCESS,
   NOT_ADDED,
   ALL_STATUSES,
+  REPOSITORY_TYPES,
   cvDetailsKey,
   cvDetailsRepoKey,
+  cvDetailsFilterKey,
 } from '../ContentViewsConstants';
 import api from '../../../services/api';
 
@@ -63,4 +65,18 @@ export const getContentViewRepositories = (cvId, params, status) => {
   });
 };
 
+export const getRepositoryTypes = () => get({
+  type: API_OPERATIONS.GET,
+  key: REPOSITORY_TYPES,
+  errorToast: error => __(`Something went wrong while retrieving the repository types! ${error}`),
+  url: api.getApiUrl('/repositories/repository_types'),
+});
+
+export const getContentViewFilters = (cvId, params) => get({
+  key: cvDetailsFilterKey(cvId),
+  params: { content_view_id: cvId, ...params },
+  errorToast: error => __(`Something went wrong while retrieving the content view filters! ${error}`),
+  url: api.getApiUrl('/content_view_filters'),
+});
+
 export default getContentViewDetails;

data/webpack/scenes/ContentViews/Details/ContentViewDetailSelectors.js

@@ -4,7 +4,12 @@ import {
   selectAPIResponse,
 } from 'foremanReact/redux/API/APISelectors';
 import { STATUS } from 'foremanReact/constants';
-import { cvDetailsKey, cvDetailsRepoKey } from '../ContentViewsConstants';
+import {
+  cvDetailsKey,
+  cvDetailsRepoKey,
+  cvDetailsFilterKey,
+  REPOSITORY_TYPES,
+} from '../ContentViewsConstants';
 
 export const selectCVDetails = (state, cvId) =>
   selectAPIResponse(state, cvDetailsKey(cvId)) || {};
@@ -24,5 +29,19 @@ export const selectCVReposStatus = (state, cvId) =>
 export const selectCVReposError = (state, cvId) =>
   selectAPIError(state, cvDetailsRepoKey(cvId));
 
+export const selectRepoTypes = state =>
+  selectAPIResponse(state, REPOSITORY_TYPES) || {};
+
+export const selectRepoTypesStatus = state =>
+  selectAPIStatus(state, REPOSITORY_TYPES) || STATUS.PENDING;
+
+export const selectCVFilters = (state, cvId) =>
+  selectAPIResponse(state, cvDetailsFilterKey(cvId)) || {};
+
+export const selectCVFiltersStatus = (state, cvId) =>
+  selectAPIStatus(state, cvDetailsFilterKey(cvId)) || STATUS.PENDING;
+
+export const selectCVFiltersError = (state, cvId) =>
+  selectAPIError(state, cvDetailsFilterKey(cvId));
 
 export const selectIsCVUpdating = state => state.katello?.contentViewDetails?.updating;

data/webpack/scenes/ContentViews/Details/ContentViewDetails.js

@@ -1,12 +1,14 @@
 import React from 'react';
 import { useSelector, shallowEqual } from 'react-redux';
-import { Grid, GridItem, TextContent, Text, TextVariants } from '@patternfly/react-core';
+import { Grid, GridItem, TextContent, Text, TextVariants, Button } from '@patternfly/react-core';
+import { ExternalLinkAltIcon } from '@patternfly/react-icons';
 import { translate as __ } from 'foremanReact/common/I18n';
 import PropTypes from 'prop-types';
 
 import DetailsContainer from './DetailsContainer';
 import ContentViewInfo from './ContentViewInfo';
 import ContentViewRepositories from './Repositories/ContentViewRepositories';
+import ContentViewFilters from './Filters/ContentViewFilters';
 import { selectCVDetails } from './ContentViewDetailSelectors';
 import TabbedView from '../../../components/TabbedView';
 
@@ -30,27 +32,35 @@ const ContentViewDetails = ({ match }) => {
     },
     {
       title: __('Filters'),
-      content: <React.Fragment>Filters</React.Fragment>,
+      content: <ContentViewFilters cvId={cvId} />,
     },
     {
       title: __('History'),
       content: <React.Fragment>History</React.Fragment>,
     },
-    {
-      title: __('Tasks'),
-      content: <React.Fragment>Tasks</React.Fragment>,
-    },
   ];
 
   return (
     <Grid className="grid-with-margin">
       <DetailsContainer cvId={cvId}>
         <React.Fragment>
-          <GridItem span={12}>
+          <GridItem span={8}>
             <TextContent>
               <Text component={TextVariants.h1}>{`${name} content view`}</Text>
             </TextContent>
           </GridItem>
+          <GridItem span={4} style={{ textAlign: 'right' }}>
+            <Button
+              component="a"
+              aria-label="view tasks button"
+              href={`/foreman_tasks/tasks?search=resource_type%3D+Katello%3A%3AContentView+resource_id%3D${cvId}`}
+              target="_blank"
+              variant="secondary"
+            >
+              {'View tasks '}
+              <ExternalLinkAltIcon />
+            </Button>
+          </GridItem>
           <GridItem span={12}>
             <TabbedView tabs={tabs} />
           </GridItem>

data/webpack/scenes/ContentViews/Details/ContentViewInfo.js

@@ -8,6 +8,7 @@ import {
   TextListVariants,
   TextListItem,
   TextListItemVariants,
+  Switch,
 } from '@patternfly/react-core';
 import PropTypes from 'prop-types';
 import { translate as __ } from 'foremanReact/common/I18n';
@@ -18,6 +19,8 @@ import Loading from '../../../components/Loading';
 import ContentViewIcon from '../components/ContentViewIcon';
 import ActionableDetail from '../../../components/ActionableDetail';
 import './contentViewInfo.scss';
+import { dependenciesHelpText, autoPublishHelpText } from '../helpers';
+import { LabelImportOnly } from '../Create/ContentViewFormComponents';
 
 const ContentViewInfo = ({ cvId, details }) => {
   const dispatch = useDispatch();
@@ -29,19 +32,9 @@ const ContentViewInfo = ({ cvId, details }) => {
     composite,
     solve_dependencies: solveDependencies,
     auto_publish: autoPublish,
+    import_only: importOnly,
   } = details;
 
-  const autoPublishTooltip = __('Applicable only for composite views. Auto publish composite ' +
-    'view when a new version of a component content view is created. Also note auto publish will ' +
-    'only happen when the component is marked "latest".');
-
-  const solveDependenciesTooltip = __('This option will solve RPM and Module Stream dependencies ' +
-    'on every publish of this Content View. Dependency solving significantly increases publish ' +
-    'time (publishes can take over three times as long) and filters will be ignored when adding ' +
-    'packages to solve dependencies. Also, certain scenarios involving errata may still cause ' +
-    'dependency errors.');
-
-
   if (updating) return <Loading size="sm" showText={false} />;
   const onEdit = (val, attribute) => dispatch(updateContentView(cvId, { [attribute]: val }));
   return (
@@ -85,7 +78,7 @@ const ContentViewInfo = ({ cvId, details }) => {
             attribute="auto_publish"
             value={autoPublish}
             onEdit={onEdit}
-            tooltip={autoPublishTooltip}
+            tooltip={autoPublishHelpText}
             boolean
           />) :
           (<ActionableDetail
@@ -93,9 +86,21 @@ const ContentViewInfo = ({ cvId, details }) => {
             attribute="solve_dependencies"
             value={solveDependencies}
             onEdit={onEdit}
-            tooltip={solveDependenciesTooltip}
+            tooltip={dependenciesHelpText}
             boolean
           />)}
+        <TextListItem component={TextListItemVariants.dt}>
+          {LabelImportOnly()}
+        </TextListItem>
+        <TextListItem component={TextListItemVariants.dd} className="foreman-spaced-list">
+          <Switch
+            id="import_only_switch"
+            aria-label="import_only_switch"
+            isChecked={importOnly}
+            className="foreman-spaced-list"
+            disabled
+          />
+        </TextListItem>
       </TextList>
     </TextContent>
   );
@@ -110,6 +115,7 @@ ContentViewInfo.propTypes = {
     composite: PropTypes.bool,
     solve_dependencies: PropTypes.bool,
     auto_publish: PropTypes.bool,
+    import_only: PropTypes.bool,
   }).isRequired,
 };
 

data/webpack/scenes/ContentViews/Details/Filters/ContentType.js

@@ -0,0 +1,40 @@
+import React, { Fragment } from 'react';
+import PropTypes from 'prop-types';
+import { translate as __ } from 'foremanReact/common/I18n';
+
+import RepoIcon from '../Repositories/RepoIcon';
+import { capitalize } from '../../../../utils/helpers';
+
+const typeName = (type, errataByDate) => {
+  if (errataByDate) return 'Errata - by date range';
+  const nameMap = {
+    rpm: __('RPM'),
+    docker: __('Container image tag'),
+    modulemd: __('Module stream'),
+    erratum: __('Errata'),
+  };
+
+  if (Object.prototype.hasOwnProperty.call(nameMap, type)) return nameMap[type];
+  return capitalize(type.replace('_', ' '));
+};
+
+const ContentType = ({ type, errataByDate }) => {
+  const repoType = ['rpm', 'modulemd', 'rpm', 'erratum', 'package_group'].includes(type) ? 'yum' : type;
+  return (
+    <Fragment>
+      <span style={{ marginRight: '5px' }}><RepoIcon type={repoType} /></span>
+      {typeName(type, errataByDate)}
+    </Fragment>
+  );
+};
+
+ContentType.propTypes = {
+  type: PropTypes.string.isRequired,
+  errataByDate: PropTypes.bool,
+};
+
+ContentType.defaultProps = {
+  errataByDate: false,
+};
+
+export default ContentType;

data/webpack/scenes/ContentViews/Details/Filters/ContentViewFilters.js

@@ -0,0 +1,124 @@
+import React, { useState, useEffect } from 'react';
+import { shallowEqual, useSelector } from 'react-redux';
+import { Label } from '@patternfly/react-core';
+import { TableVariant } from '@patternfly/react-table';
+import { STATUS } from 'foremanReact/constants';
+import LongDateTime from 'foremanReact/components/common/dates/LongDateTime';
+import { translate as __ } from 'foremanReact/common/I18n';
+import PropTypes from 'prop-types';
+
+import TableWrapper from '../../../../components/Table/TableWrapper';
+import onSelect from '../../../../components/Table/helpers';
+import { getContentViewFilters } from '../ContentViewDetailActions';
+import {
+  selectCVFilters,
+  selectCVFiltersStatus,
+  selectCVFiltersError,
+} from '../ContentViewDetailSelectors';
+import { truncate } from '../../../../utils/helpers';
+import ContentType from './ContentType';
+
+// won't be needed when details pages are built, linking to old pages for now
+const cvFilterUrl = (cvId, filterId, type, errataByDate) => {
+  const repoType = type === 'docker' ? 'docker' : 'yum';
+  const filterType = errataByDate ? 'errata_by_date' : type;
+  const base = `/content_views/${cvId}/repositories/${repoType}/filters/${filterId}`;
+  const endings = {
+    rpm: '/package/details',
+    package_group: '/package-group/list',
+    erratum: '/errata/list',
+    errata_by_date: '/errata/date_type',
+    modulemd: '/module-stream/list',
+    docker: '/docker/details',
+  };
+
+  return base + endings[filterType];
+};
+
+const ContentViewFilters = ({ cvId }) => {
+  const response = useSelector(state => selectCVFilters(state, cvId), shallowEqual);
+  const status = useSelector(state => selectCVFiltersStatus(state, cvId), shallowEqual);
+  const error = useSelector(state => selectCVFiltersError(state, cvId), shallowEqual);
+  const [rows, setRows] = useState([]);
+  const [metadata, setMetadata] = useState({});
+  const [searchQuery, updateSearchQuery] = useState('');
+  const loading = status === STATUS.PENDING;
+
+  const columnHeaders = [
+    __('Name'),
+    __('Description'),
+    __('Updated'),
+    __('Content type'),
+    __('Inclusion type'),
+  ];
+
+  const buildRows = (results) => {
+    const newRows = [];
+    results.forEach((filter) => {
+      let errataByDate = false;
+      const {
+        id, name, type, description, updated_at: updatedAt, inclusion,
+      } = filter;
+      if (filter.type === 'erratum' && filter.rules[0].types) errataByDate = true;
+
+      const cells = [
+        { title: <a href={cvFilterUrl(cvId, id, type, errataByDate)}>{name}</a> },
+        truncate(description || ''),
+        { title: <LongDateTime date={updatedAt} showRelativeTimeTooltip /> },
+        { title: <ContentType type={type} errataByDate={errataByDate} /> },
+        {
+          title: (
+            <Label color={inclusion && 'blue'}>
+              {inclusion ? 'Include' : 'Exclude'}
+            </Label>),
+        },
+      ];
+
+      newRows.push({ cells });
+    });
+    return newRows;
+  };
+
+  useEffect(() => {
+    const { results, ...meta } = response;
+    setMetadata(meta);
+
+    if (!loading && results) {
+      const newRows = buildRows(results);
+      setRows(newRows);
+    }
+  }, [JSON.stringify(response)]);
+
+  const emptyContentTitle = __("You currently don't have any filters for this content view.");
+  const emptyContentBody = __("Add filters using the 'Add filter' button above."); // needs link
+  const emptySearchTitle = __('No matching filters found');
+  const emptySearchBody = __('Try changing your search settings.');
+
+  return (
+    <TableWrapper
+      {...{
+        rows,
+        metadata,
+        emptyContentTitle,
+        emptyContentBody,
+        emptySearchTitle,
+        emptySearchBody,
+        searchQuery,
+        updateSearchQuery,
+        error,
+        status,
+      }}
+      onSelect={onSelect(rows, setRows)}
+      cells={columnHeaders}
+      variant={TableVariant.compact}
+      autocompleteEndpoint="/content_view_filters/auto_complete_search"
+      fetchItems={params => getContentViewFilters(cvId, params)}
+    />);
+};
+
+
+ContentViewFilters.propTypes = {
+  cvId: PropTypes.number.isRequired,
+};
+
+export default ContentViewFilters;

data/webpack/scenes/ContentViews/Details/Filters/__tests__/contentViewFilters.fixtures.json

@@ -0,0 +1,134 @@
+{
+  "total":6,
+  "subtotal":6,
+  "page":"1",
+  "per_page":"20",
+  "error":null,
+  "search":null,
+  "sort":{
+     "by":"name",
+     "order":"asc"
+  },
+  "results":[
+     {
+        "inclusion":true,
+        "id":4,
+        "name":"af1",
+        "description":"A really great filter",
+        "created_at":"2020-12-07 09:58:36 -0500",
+        "updated_at":"2020-12-07 10:42:05 -0500",
+        "content_view":{
+        },
+        "repositories":[
+           
+        ],
+        "type":"rpm",
+        "rules":[
+           
+        ]
+     },
+     {
+        "inclusion":false,
+        "id":5,
+        "name":"Another filter",
+        "description":"hey",
+        "created_at":"2020-12-07 12:59:12 -0500",
+        "updated_at":"2020-12-07 12:59:12 -0500",
+        "content_view":{
+        },
+        "repositories":[
+           
+        ],
+        "type":"package_group",
+        "rules":[
+           
+        ]
+     },
+     {
+        "inclusion":true,
+        "id":6,
+        "name":"f2",
+        "description":null,
+        "created_at":"2020-12-08 09:26:11 -0500",
+        "updated_at":"2020-12-08 09:26:11 -0500",
+        "content_view":{
+        },
+        "repositories":[
+           
+        ],
+        "type":"erratum",
+        "rules":[
+           {
+              "content_view_filter_id":6,
+              "errata_id":"RHEA-2012:0059",
+              "date_type":"updated",
+              "id":3,
+              "created_at":"2020-12-08 10:32:25 -0500",
+              "updated_at":"2020-12-08 10:32:25 -0500"
+           }
+        ]
+     },
+     {
+        "inclusion":false,
+        "id":7,
+        "name":"f3",
+        "description":null,
+        "created_at":"2020-12-08 09:26:27 -0500",
+        "updated_at":"2020-12-08 09:26:27 -0500",
+        "content_view":{
+        },
+        "repositories":[
+           
+        ],
+        "type":"erratum",
+        "rules":[
+           {
+              "content_view_filter_id":7,
+              "types":[
+                 "security",
+                 "enhancement",
+                 "bugfix"
+              ],
+              "date_type":"updated",
+              "id":2,
+              "created_at":"2020-12-08 09:26:27 -0500",
+              "updated_at":"2020-12-08 09:26:27 -0500"
+           }
+        ]
+     },
+     {
+        "inclusion":false,
+        "id":8,
+        "name":"f4",
+        "description":null,
+        "created_at":"2020-12-08 09:26:51 -0500",
+        "updated_at":"2020-12-08 09:26:51 -0500",
+        "content_view":{
+        },
+        "repositories":[
+           
+        ],
+        "type":"modulemd",
+        "rules":[
+           
+        ]
+     },
+     {
+        "inclusion":true,
+        "id":9,
+        "name":"f5",
+        "description":null,
+        "created_at":"2020-12-08 09:32:53 -0500",
+        "updated_at":"2020-12-08 09:32:53 -0500",
+        "content_view":{
+        },
+        "repositories":[
+           
+        ],
+        "type":"docker",
+        "rules":[
+           
+        ]
+     }
+  ]
+}