katello 4.2.1 → 4.3.0.rc1

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

@@ -2,20 +2,32 @@ import { API_OPERATIONS, APIActions, get, put, post } from 'foremanReact/redux/A
 import { addToast } from 'foremanReact/redux/actions/toasts';
 import { translate as __ } from 'foremanReact/common/I18n';
 import {
+  RPM_PACKAGES_CONTENT,
+  RPM_PACKAGE_GROUPS_CONTENT,
   UPDATE_CONTENT_VIEW,
   UPDATE_CONTENT_VIEW_FAILURE,
   UPDATE_CONTENT_VIEW_SUCCESS,
   CREATE_CONTENT_VIEW_FILTER_KEY,
   DELETE_CONTENT_VIEW_FILTER_KEY,
   DELETE_CONTENT_VIEW_FILTERS_KEY,
+  EDIT_CONTENT_VIEW_FILTER,
+  ADD_CONTENT_VIEW_FILTER_RULE,
+  EDIT_CONTENT_VIEW_FILTER_RULE,
+  REMOVE_CONTENT_VIEW_FILTER_RULE,
+  DELETE_CONTENT_VIEW_FILTER_RULES_KEY,
+  ADD_CONTENT_VIEW_FILTER_RULES_KEY,
   NOT_ADDED,
   ALL_STATUSES,
   REPOSITORY_TYPES,
+  ACTIVATION_KEY_KEY,
+  HOSTS_KEY,
   cvDetailsKey,
   cvDetailsRepoKey,
   cvDetailsFiltersKey,
   cvFilterDetailsKey,
   cvFilterPackageGroupsKey,
+  cvFilterModuleStreamKey,
+  cvFilterErratumIDKey,
   cvDetailsHistoryKey,
   cvFilterRulesKey,
   cvDetailsComponentKey,
@@ -24,13 +36,27 @@ import {
   cvRemoveComponentKey,
   addComponentSuccessMessage,
   removeComponentSuccessMessage,
+  cvVersionPromoteKey,
+  cvFilterRepoKey,
+  cvVersionDetailsKey,
+  cvRemoveVersionKey,
+  REPOSITORY_CONTENT,
+  FILE_CONTENT,
+  ERRATA_CONTENT,
+  MODULE_STREAMS_CONTENT,
+  DEB_PACKAGES_CONTENT,
+  ANSIBLE_COLLECTIONS_CONTENT,
+  DOCKER_TAGS_CONTENT,
 } from '../ContentViewsConstants';
-import api from '../../../services/api';
+import api, { foremanApi, orgId } from '../../../services/api';
 import { getResponseErrorMsgs, apiError } from '../../../utils/helpers';
+import { renderTaskStartedToast } from '../../Tasks/helpers';
+import { cvErrorToast } from '../ContentViewsActions';
 
-const getContentViewDetails = cvId => get({
+const getContentViewDetails = (cvId, extraParams = {}) => get({
   type: API_OPERATIONS.GET,
   key: cvDetailsKey(cvId),
+  params: { organization_id: orgId(), include_permissions: true, ...extraParams },
   url: api.getApiUrl(`/content_views/${cvId}`),
 });
 
@@ -44,6 +70,22 @@ const cvUpdateSuccess = (response, dispatch) => {
   }));
 };
 
+export const getRPMPackages = params => get({
+  type: API_OPERATIONS.GET,
+  key: RPM_PACKAGES_CONTENT,
+  url: api.getApiUrl('/packages'),
+  params,
+  errorToast: error => __(`Something went wrong while fetching rpm packages! ${getResponseErrorMsgs(error.response)}`),
+});
+
+export const getFiles = params => get({
+  type: API_OPERATIONS.GET,
+  key: FILE_CONTENT,
+  url: api.getApiUrl('/files'),
+  params,
+  errorToast: error => __(`Something went wrong while fetching files! ${getResponseErrorMsgs(error.response)}`),
+});
+
 export const updateContentView = (cvId, params) => dispatch => dispatch(put({
   type: API_OPERATIONS.PUT,
   key: cvDetailsKey(cvId),
@@ -85,6 +127,54 @@ export const createContentViewFilter = (cvId, params) => post({
   errorToast: error => __(`Something went wrong while creating the filter! ${getResponseErrorMsgs(error.response)}`),
 });
 
+export const getDockerTags = params => get({
+  type: API_OPERATIONS.GET,
+  key: DOCKER_TAGS_CONTENT,
+  url: api.getApiUrl('/docker_tags'),
+  params,
+  errorToast: error => __(`Something went wrong while getting docker tags! ${getResponseErrorMsgs(error.response)}`),
+});
+
+export const getAnsibleCollections = params => get({
+  type: API_OPERATIONS.GET,
+  key: ANSIBLE_COLLECTIONS_CONTENT,
+  url: api.getApiUrl('/ansible_collections'),
+  params,
+  errorToast: error => __(`Something went wrong while getting ansible collections! ${getResponseErrorMsgs(error.response)}`),
+});
+
+export const getErrata = params => get({
+  type: API_OPERATIONS.GET,
+  key: ERRATA_CONTENT,
+  url: api.getApiUrl('/errata'),
+  params,
+  errorToast: error => __(`Something went wrong while getting errata! ${getResponseErrorMsgs(error.response)}`),
+});
+
+export const getDebPackages = params => get({
+  type: API_OPERATIONS.GET,
+  key: DEB_PACKAGES_CONTENT,
+  url: api.getApiUrl('/debs'),
+  params,
+  errorToast: error => __(`Something went wrong while getting deb packages! ${getResponseErrorMsgs(error.response)}`),
+});
+
+export const getModuleStreams = params => get({
+  type: API_OPERATIONS.GET,
+  key: MODULE_STREAMS_CONTENT,
+  url: api.getApiUrl('/module_streams'),
+  params,
+  errorToast: error => __(`Something went wrong while getting module streams! ${getResponseErrorMsgs(error.response)}`),
+});
+
+export const getRepositories = params => get({
+  type: API_OPERATIONS.GET,
+  key: REPOSITORY_CONTENT,
+  url: api.getApiUrl('/repositories'),
+  params,
+  errorToast: error => __(`Something went wrong while getting repositories! ${getResponseErrorMsgs(error.response)}`),
+});
+
 export const getContentViewRepositories = (cvId, params, status) => {
   const apiParams = { ...params };
   let apiUrl = `/content_views/${cvId}/repositories`;
@@ -103,6 +193,28 @@ export const getContentViewRepositories = (cvId, params, status) => {
   });
 };
 
+export const getFilterRepositories = (cvId, filterId, params) => {
+  const apiParams = { ...params };
+  const apiUrl = `/content_views/${cvId}/repositories`;
+
+  return get({
+    type: API_OPERATIONS.GET,
+    key: cvFilterRepoKey(filterId),
+    url: api.getApiUrl(apiUrl),
+    params: apiParams,
+  });
+};
+
+export const editCVFilter = (filterId, params, handleSuccess) => put({
+  type: API_OPERATIONS.PUT,
+  key: EDIT_CONTENT_VIEW_FILTER,
+  url: api.getApiUrl(`/content_view_filters/${filterId}`),
+  params,
+  handleSuccess,
+  successToast: () => __('Filter edited successfully'),
+  errorToast: error => __(`Something went wrong while editing the filter! ${getResponseErrorMsgs(error.response)}`),
+});
+
 export const getRepositoryTypes = () => get({
   type: API_OPERATIONS.GET,
   key: REPOSITORY_TYPES,
@@ -117,6 +229,20 @@ export const getContentViewFilters = (cvId, params) => get({
   url: api.getApiUrl('/content_view_filters'),
 });
 
+export const getActivationKeys = params => get({
+  key: ACTIVATION_KEY_KEY,
+  params: { organization_id: orgId(), ...params },
+  errorToast: error => __(`Something went wrong while retrieving the activation keys! ${getResponseErrorMsgs(error.response)}`),
+  url: api.getApiUrl('/activation_keys'),
+});
+
+export const getHosts = params => get({
+  key: HOSTS_KEY,
+  params: { organization_id: orgId(), ...params },
+  errorToast: error => __(`Something went wrong while retrieving the hosts! ${getResponseErrorMsgs(error.response)}`),
+  url: foremanApi.getApiUrl('/hosts'),
+});
+
 export const deleteContentViewFilters = (cvId, ids, handleSuccess) => put({
   type: API_OPERATIONS.PUT,
   key: DELETE_CONTENT_VIEW_FILTERS_KEY,
@@ -127,6 +253,26 @@ export const deleteContentViewFilters = (cvId, ids, handleSuccess) => put({
   errorToast: error => __(`Something went wrong while deleting filters! ${getResponseErrorMsgs(error.response)}`),
 });
 
+export const deleteContentViewFilterRules = (filterId, ids, handleSuccess) => put({
+  type: API_OPERATIONS.PUT,
+  key: DELETE_CONTENT_VIEW_FILTER_RULES_KEY,
+  url: api.getApiUrl(`/content_view_filters/${filterId}/remove_filter_rules`),
+  params: { rule_ids: ids },
+  handleSuccess,
+  successToast: () => __('Filter rules successfully deleted'),
+  errorToast: error => __(`Something went wrong while deleting filter rules! ${getResponseErrorMsgs(error.response)}`),
+});
+
+export const addContentViewFilterRules = (filterId, rulesParams, handleSuccess) => put({
+  type: API_OPERATIONS.PUT,
+  key: ADD_CONTENT_VIEW_FILTER_RULES_KEY,
+  url: api.getApiUrl(`/content_view_filters/${filterId}/add_filter_rules`),
+  params: { rules_params: rulesParams },
+  handleSuccess,
+  successToast: () => __('Filter rules successfully added'),
+  errorToast: error => __(`Something went wrong while adding filter rules! ${getResponseErrorMsgs(error.response)}`),
+});
+
 export const deleteContentViewFilter = (filterId, handleSuccess) => APIActions.delete({
   type: API_OPERATIONS.DELETE,
   key: DELETE_CONTENT_VIEW_FILTER_KEY,
@@ -143,6 +289,13 @@ export const getCVFilterDetails = (cvId, filterId, params) => get({
   url: api.getApiUrl(`/content_view_filters/${filterId}`),
 });
 
+export const getPackageGroups = params => get({
+  key: RPM_PACKAGE_GROUPS_CONTENT,
+  url: api.getApiUrl('/package_groups'),
+  params,
+  errorToast: error => __(`Something went wrong while retrieving package groups! ${getResponseErrorMsgs(error.response)}`),
+});
+
 export const getCVFilterPackageGroups = (cvId, filterId, params) => get({
   key: cvFilterPackageGroupsKey(cvId, filterId),
   params: {
@@ -152,6 +305,61 @@ export const getCVFilterPackageGroups = (cvId, filterId, params) => get({
   url: api.getApiUrl('/package_groups'),
 });
 
+export const getCVFilterModuleStreams = (cvId, filterId, params) => get({
+  key: cvFilterModuleStreamKey(cvId, filterId),
+  params: {
+    filter_id: filterId, show_all_for: 'content_view_filter', include_filter_ids: true, ...params,
+  },
+  errorToast: error => __(`Something went wrong while retrieving the content view filter! ${getResponseErrorMsgs(error.response)}`),
+  url: api.getApiUrl('/module_streams'),
+});
+
+export const getCVFilterErrata = (cvId, filterId, params = {}, statusSelected = ALL_STATUSES) => {
+  let apiParams = { filter_id: filterId, include_filter_ids: true, ...params };
+  if (statusSelected === ALL_STATUSES) {
+    apiParams = { show_all_for: 'content_view_filter', ...apiParams };
+  } else if (statusSelected === NOT_ADDED) {
+    apiParams = { available_for: 'content_view_filter', ...apiParams };
+  }
+
+  return get({
+    key: cvFilterErratumIDKey(cvId, filterId),
+    params: apiParams,
+    errorToast: error => __(`Something went wrong while retrieving the content view filter! ${getResponseErrorMsgs(error.response)}`),
+    url: api.getApiUrl('/errata'),
+  });
+};
+
+export const editCVFilterRule = (filterId, params, handleSuccess) => put({
+  type: API_OPERATIONS.PUT,
+  key: EDIT_CONTENT_VIEW_FILTER_RULE,
+  url: api.getApiUrl(`/content_view_filters/${filterId}/rules/${params.id}`),
+  params,
+  handleSuccess,
+  successToast: () => __('Filter rule edited successfully'),
+  errorToast: error => __(`Something went wrong while editing a filter rule! ${getResponseErrorMsgs(error.response)}`),
+});
+
+export const addCVFilterRule = (filterId, params, handleSuccess) => post({
+  type: API_OPERATIONS.POST,
+  key: ADD_CONTENT_VIEW_FILTER_RULE,
+  url: api.getApiUrl(`/content_view_filters/${filterId}/rules`),
+  params,
+  handleSuccess,
+  successToast: () => __('Filter rule added successfully'),
+  errorToast: error => __(`Something went wrong while adding a filter rule! ${getResponseErrorMsgs(error.response)}`),
+});
+
+export const removeCVFilterRule = (filterId, packageGroupFilterId, handleSuccess) =>
+  APIActions.delete({
+    type: API_OPERATIONS.DELETE,
+    key: REMOVE_CONTENT_VIEW_FILTER_RULE,
+    url: api.getApiUrl(`/content_view_filters/${filterId}/rules/${packageGroupFilterId}`),
+    handleSuccess,
+    successToast: () => __('Filter rule removed successfully'),
+    errorToast: error => __(`Something went wrong while removing a filter rule! ${getResponseErrorMsgs(error.response)}`),
+  });
+
 export const getContentViewHistories = (cvId, params) => {
   const apiParams = { ...params };
   const apiUrl = `/content_views/${cvId}/history`;
@@ -183,7 +391,7 @@ export const getContentViewComponents = (cvId, params, statusSelected) => {
 
 export const getContentViewVersions = (cvId, params) => {
   const apiParams = { content_view_id: cvId, ...params };
-  const apiUrl = '/content_view_versions/';
+  const apiUrl = '/content_view_versions';
   return get({
     key: cvDetailsVersionKey(cvId),
     params: apiParams,
@@ -192,4 +400,41 @@ export const getContentViewVersions = (cvId, params) => {
   });
 };
 
+export const getContentViewVersionDetails = (versionId, cvId, handleSuccess) =>
+  APIActions.get({
+    type: API_OPERATIONS.GET,
+    key: cvVersionDetailsKey(versionId, cvId),
+    url: api.getApiUrl(`/content_view_versions/${versionId}`),
+    handleSuccess,
+    errorToast: error => __(`Something went wrong while getting version details. ${getResponseErrorMsgs(error.response)}`),
+  });
+
+export const editContentViewVersionDetails = (versionId, cvId, params, handleSuccess) =>
+  APIActions.put({
+    type: API_OPERATIONS.PUT,
+    key: cvVersionDetailsKey(versionId, cvId),
+    url: api.getApiUrl(`/content_view_versions/${versionId}`),
+    params,
+    handleSuccess,
+    errorToast: error => __(`Something went wrong while editing version details. ${getResponseErrorMsgs(error.response)}`),
+  });
+
+export const removeContentViewVersion = (cvId, versionId, versionEnvironments, params) => put({
+  type: API_OPERATIONS.PUT,
+  key: cvRemoveVersionKey(versionId, versionEnvironments),
+  url: api.getApiUrl(`/content_views/${cvId}/remove`),
+  params,
+  handleSuccess: response => renderTaskStartedToast(response.data),
+  errorToast: error => cvErrorToast(error),
+});
+
+export const promoteContentViewVersion = params => post({
+  type: API_OPERATIONS.POST,
+  key: cvVersionPromoteKey(params.id, params.versionEnvironments),
+  url: api.getApiUrl(`/content_view_versions/${params.id}/promote`),
+  params,
+  handleSuccess: response => renderTaskStartedToast(response.data),
+  errorToast: error => cvErrorToast(error),
+});
+
 export default getContentViewDetails;

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

@@ -10,6 +10,8 @@ import {
   cvDetailsFiltersKey,
   cvFilterDetailsKey,
   cvFilterPackageGroupsKey,
+  cvFilterModuleStreamKey,
+  cvFilterErratumIDKey,
   cvDetailsHistoryKey,
   cvFilterRulesKey,
   cvDetailsVersionKey,
@@ -18,6 +20,21 @@ import {
   cvAddComponentKey,
   cvRemoveComponentKey,
   CREATE_CONTENT_VIEW_FILTER_KEY,
+  ADD_CONTENT_VIEW_FILTER_RULE,
+  ACTIVATION_KEY_KEY,
+  HOSTS_KEY,
+  cvFilterRepoKey,
+  cvVersionDetailsKey,
+  cvRemoveVersionKey,
+  RPM_PACKAGES_CONTENT,
+  RPM_PACKAGE_GROUPS_CONTENT,
+  REPOSITORY_CONTENT,
+  FILE_CONTENT,
+  ERRATA_CONTENT,
+  MODULE_STREAMS_CONTENT,
+  DEB_PACKAGES_CONTENT,
+  ANSIBLE_COLLECTIONS_CONTENT,
+  DOCKER_TAGS_CONTENT,
 } from '../ContentViewsConstants';
 import { pollTaskKey } from '../../Tasks/helpers';
 
@@ -63,6 +80,15 @@ export const selectCVFilterDetailStatus = (state, cvId, filterId) =>
 export const selectCVFilterDetailError = (state, cvId, filterId) =>
   selectAPIError(state, cvFilterDetailsKey(cvId, filterId));
 
+export const selectCVFilterRepos = (state, filterId) =>
+  selectAPIResponse(state, cvFilterRepoKey(filterId)) || {};
+
+export const selectCVFilterReposStatus = (state, filterId) =>
+  selectAPIStatus(state, cvFilterRepoKey(filterId)) || STATUS.PENDING;
+
+export const selectCVFilterReposError = (state, filterId) =>
+  selectAPIError(state, cvFilterRepoKey(filterId));
+
 export const selectCVFilterPackageGroups = (state, cvId, filterId) =>
   selectAPIResponse(state, cvFilterPackageGroupsKey(cvId, filterId));
 
@@ -72,6 +98,24 @@ export const selectCVFilterPackageGroupStatus = (state, cvId, filterId) =>
 export const selectCVFilterPackageGroupError = (state, cvId, filterId) =>
   selectAPIError(state, cvFilterPackageGroupsKey(cvId, filterId));
 
+export const selectCVFilterModuleStream = (state, cvId, filterId) =>
+  selectAPIResponse(state, cvFilterModuleStreamKey(cvId, filterId));
+
+export const selectCVFilterModuleStreamStatus = (state, cvId, filterId) =>
+  selectAPIStatus(state, cvFilterModuleStreamKey(cvId, filterId)) || STATUS.PENDING;
+
+export const selectCVFilterModuleStreamError = (state, cvId, filterId) =>
+  selectAPIError(state, cvFilterModuleStreamKey(cvId, filterId));
+
+export const selectCVFilterErratumID = (state, cvId, filterId) =>
+  selectAPIResponse(state, cvFilterErratumIDKey(cvId, filterId));
+
+export const selectCVFilterErratumIDStatus = (state, cvId, filterId) =>
+  selectAPIStatus(state, cvFilterErratumIDKey(cvId, filterId)) || STATUS.PENDING;
+
+export const selectCVFilterErratumIDError = (state, cvId, filterId) =>
+  selectAPIError(state, cvFilterErratumIDKey(cvId, filterId));
+
 export const selectCVHistories = (state, cvId) =>
   selectAPIResponse(state, cvDetailsHistoryKey(cvId)) || {};
 
@@ -87,6 +131,60 @@ export const selectCVFilterRules = (state, filterId) =>
 export const selectCVFilterRulesStatus = (state, filterId) =>
   selectAPIStatus(state, cvFilterRulesKey(filterId)) || STATUS.PENDING;
 
+export const selectAnsibleCollections = state =>
+  selectAPIResponse(state, ANSIBLE_COLLECTIONS_CONTENT);
+
+export const selectAnsibleCollectionsStatus = state =>
+  selectAPIStatus(state, ANSIBLE_COLLECTIONS_CONTENT) || STATUS.PENDING;
+
+export const selectDockerTags = state =>
+  selectAPIResponse(state, DOCKER_TAGS_CONTENT);
+
+export const selectDockerTagsStatus = state =>
+  selectAPIStatus(state, DOCKER_TAGS_CONTENT) || STATUS.PENDING;
+
+export const selectRepositories = state =>
+  selectAPIResponse(state, REPOSITORY_CONTENT);
+
+export const selectRepositoriesStatus = state =>
+  selectAPIStatus(state, REPOSITORY_CONTENT) || STATUS.PENDING;
+
+export const selectDebPackages = state =>
+  selectAPIResponse(state, DEB_PACKAGES_CONTENT);
+
+export const selectDebPackagesStatus = state =>
+  selectAPIStatus(state, DEB_PACKAGES_CONTENT) || STATUS.PENDING;
+
+export const selectModuleStreams = state =>
+  selectAPIResponse(state, MODULE_STREAMS_CONTENT);
+
+export const selectModuleStreamsStatus = state =>
+  selectAPIStatus(state, MODULE_STREAMS_CONTENT) || STATUS.PENDING;
+
+export const selectRPMPackageGroups = state =>
+  selectAPIResponse(state, RPM_PACKAGE_GROUPS_CONTENT);
+
+export const selectRPMPackageGroupsStatus = state =>
+  selectAPIStatus(state, RPM_PACKAGE_GROUPS_CONTENT) || STATUS.PENDING;
+
+export const selectRPMPackages = state =>
+  selectAPIResponse(state, RPM_PACKAGES_CONTENT);
+
+export const selectRPMPackagesStatus = state =>
+  selectAPIStatus(state, RPM_PACKAGES_CONTENT) || STATUS.PENDING;
+
+export const selectFiles = state =>
+  selectAPIResponse(state, FILE_CONTENT);
+
+export const selectFilesStatus = state =>
+  selectAPIStatus(state, FILE_CONTENT) || STATUS.PENDING;
+
+export const selectErrata = state =>
+  selectAPIResponse(state, ERRATA_CONTENT);
+
+export const selectErrataStatus = state =>
+  selectAPIStatus(state, ERRATA_CONTENT) || STATUS.PENDING;
+
 export const selectCVComponents = (state, cvId) =>
   selectAPIResponse(state, cvDetailsComponentKey(cvId)) || {};
 
@@ -105,6 +203,15 @@ export const selectCVVersionsStatus = (state, cvId) =>
 export const selectCVVersionsError = (state, cvId) =>
   selectAPIError(state, cvDetailsVersionKey(cvId));
 
+export const selectCVVersionDetails = (state, versionId, cvId) =>
+  selectAPIResponse(state, cvVersionDetailsKey(versionId, cvId)) || {};
+
+export const selectCVVersionDetailsStatus = (state, versionId, cvId) =>
+  selectAPIStatus(state, cvVersionDetailsKey(versionId, cvId)) || STATUS.PENDING;
+
+export const selectCVVersionDetailsError = (state, versionId, cvId) =>
+  selectAPIError(state, cvVersionDetailsKey(versionId, cvId));
+
 export const selectPublishTaskPoll = (state, cvVersionPublishKey) =>
   selectAPIResponse(state, pollTaskKey(cvVersionPublishKey)) || {};
 
@@ -144,4 +251,38 @@ export const selectCreateContentViewFilterStatus = state =>
 export const selectCreateContentViewFilterError = state =>
   selectAPIError(state, CREATE_CONTENT_VIEW_FILTER_KEY);
 
+export const selectCreateFilterRule = state =>
+  selectAPIResponse(state, ADD_CONTENT_VIEW_FILTER_RULE) || {};
+
+export const selectCreateFilterRuleStatus = state =>
+  selectAPIStatus(state, ADD_CONTENT_VIEW_FILTER_RULE) || STATUS.PENDING;
+
+export const selectCreateFilterRuleError = state =>
+  selectAPIError(state, ADD_CONTENT_VIEW_FILTER_RULE);
+
+export const selectCVActivationKeys = state =>
+  selectAPIResponse(state, ACTIVATION_KEY_KEY) || {};
+
+export const selectCVActivationKeysStatus = state =>
+  selectAPIStatus(state, ACTIVATION_KEY_KEY) || STATUS.PENDING;
+
+export const selectCVActivationKeysError = state =>
+  selectAPIError(state, ACTIVATION_KEY_KEY);
+
+export const selectCVHosts = state =>
+  selectAPIResponse(state, HOSTS_KEY) || {};
+
+export const selectCVHostsStatus = state =>
+  selectAPIStatus(state, HOSTS_KEY) || STATUS.PENDING;
+
+export const selectRemoveCVVersionResponse = (state, versionId, versionEnvironments) =>
+  selectAPIResponse(state, cvRemoveVersionKey(versionId, versionEnvironments)) || {};
+
+export const selectRemoveCVVersionStatus = (state, versionId, versionEnvironments) =>
+  selectAPIStatus(state, cvRemoveVersionKey(versionId, versionEnvironments)) || STATUS.PENDING;
+
+export const selectRemoveCVVersionError = (state, versionId, versionEnvironments) =>
+  selectAPIError(state, cvRemoveVersionKey(versionId, versionEnvironments));
+
+
 export const selectIsCVUpdating = state => state.katello?.contentViewDetails?.updating;

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

@@ -1,32 +1,32 @@
 import React, { useState } from 'react';
 import { useSelector, shallowEqual } from 'react-redux';
-import { Link } from 'react-router-dom';
-import { Grid, GridItem, TextContent, Text, TextVariants, Button, Flex, FlexItem, Breadcrumb, BreadcrumbItem } from '@patternfly/react-core';
-import Skeleton from 'react-loading-skeleton';
+import { useParams } from 'react-router-dom';
+import { Grid, GridItem, TextContent, Text, TextVariants, Button, Flex, FlexItem } 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 ContentViewVersions from './Versions/ContentViewVersions';
+import ContentViewVersionsRoutes from './Versions';
+import ContentViewFilterRoutes from './Filters';
 import ContentViewRepositories from './Repositories/ContentViewRepositories';
 import ContentViewComponents from './ComponentContentViews/ContentViewComponents';
 import ContentViewHistories from './Histories/ContentViewHistories';
-import ContentViewFilters from './Filters/ContentViewFilters';
-import ContentViewFilterDetails from './Filters/ContentViewFilterDetails';
 import { selectCVDetails } from './ContentViewDetailSelectors';
 import RoutedTabs from '../../../components/RoutedTabs';
 import ContentViewIcon from '../components/ContentViewIcon';
+import CVBreadCrumb from '../components/CVBreadCrumb';
 import PublishContentViewWizard from '../Publish/PublishContentViewWizard';
+import { hasPermission } from '../helpers';
 
-const ContentViewDetails = ({ match }) => {
-  const cvId = parseInt(match.params.id, 10);
+export default () => {
+  const { id } = useParams();
+  const cvId = Number(id);
   const details = useSelector(state => selectCVDetails(state, cvId), shallowEqual);
   const [isPublishModalOpen, setIsPublishModalOpen] = useState(false);
   const [currentStep, setCurrentStep] = useState(1);
 
-  const { name, composite } = details;
+  const { name, composite, permissions } = details;
   const tabs = [
     {
       key: 'details',
@@ -36,24 +36,22 @@ const ContentViewDetails = ({ match }) => {
     {
       key: 'versions',
       title: __('Versions'),
-      content: <ContentViewVersions cvId={cvId} />,
+      content: <ContentViewVersionsRoutes {...{ cvId, details }} />,
     },
-    (composite ? {
+    ...composite ? [{
       key: 'contentviews',
       title: __('Content Views'),
       content: <ContentViewComponents {...{ cvId, details }} />,
-    } : {
+    }] : [{
       key: 'repositories',
       title: __('Repositories'),
       content: <ContentViewRepositories {...{ cvId, details }} />,
-    }
-    ),
+    },
     {
       key: 'filters',
       title: __('Filters'),
-      content: <ContentViewFilters cvId={cvId} />,
-      detailContent: <ContentViewFilterDetails />,
-    },
+      content: <ContentViewFilterRoutes {...{ cvId, details }} />,
+    }],
     {
       key: 'history',
       title: __('History'),
@@ -65,16 +63,8 @@ const ContentViewDetails = ({ match }) => {
     <Grid className="grid-with-margin">
       <DetailsContainer cvId={cvId}>
         <React.Fragment>
-          <Breadcrumb style={{ marginTop: '15px' }}>
-            <BreadcrumbItem
-              aria-label="cv_breadcrumb"
-              render={() => (<Link to="/labs/content_views" >{__('Content Views')}</Link>)}
-            />
-            <BreadcrumbItem aria-label="cv_breadcrumb_cv" isActive>
-              {name || <Skeleton />}
-            </BreadcrumbItem>
-          </Breadcrumb>
-          <GridItem span={8}>
+          <CVBreadCrumb />
+          <GridItem xl={8} lg={7} sm={12} >
             <Flex>
               <FlexItem>
                 <TextContent>
@@ -86,21 +76,23 @@ const ContentViewDetails = ({ match }) => {
               </FlexItem>
             </Flex>
           </GridItem>
-          <GridItem span={4}>
-            <Flex>
-              <FlexItem>
-                <Button onClick={() => { setIsPublishModalOpen(true); }} variant="primary" aria-label="publish_content_view">
-                  Publish new version
-                </Button>
-                {isPublishModalOpen && <PublishContentViewWizard
-                  details={details}
-                  show={isPublishModalOpen}
-                  setIsOpen={setIsPublishModalOpen}
-                  currentStep={currentStep}
-                  setCurrentStep={setCurrentStep}
-                  aria-label="publish_content_view_modal"
-                />}
-              </FlexItem>
+          <GridItem xl={4} lg={5} sm={12} >
+            <Flex justifyContent={{ lg: 'justifyContentFlexEnd', sm: 'justifyContentFlexStart' }}>
+              {hasPermission(permissions, 'publish_content_views') &&
+                <FlexItem>
+                  <Button onClick={() => { setIsPublishModalOpen(true); }} variant="primary" aria-label="publish_content_view">
+                    {__('Publish new version')}
+                  </Button>
+                  {isPublishModalOpen && <PublishContentViewWizard
+                    details={details}
+                    show={isPublishModalOpen}
+                    setIsOpen={setIsPublishModalOpen}
+                    currentStep={currentStep}
+                    setCurrentStep={setCurrentStep}
+                    aria-label="publish_content_view_modal"
+                  />}
+                </FlexItem>
+              }
               <FlexItem>
                 <Button
                   component="a"
@@ -116,20 +108,10 @@ const ContentViewDetails = ({ match }) => {
             </Flex>
           </GridItem>
           <GridItem span={12}>
-            <RoutedTabs tabs={tabs} baseUrl={`/labs/content_views/${cvId}`} defaultTabIndex={1} />
+            <RoutedTabs tabs={tabs} defaultTabIndex={1} />
           </GridItem>
         </React.Fragment>
       </DetailsContainer>
     </Grid>
   );
 };
-
-ContentViewDetails.propTypes = {
-  match: PropTypes.shape({
-    params: PropTypes.shape({
-      id: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
-    }),
-  }).isRequired,
-};
-
-export default ContentViewDetails;