katello 3.15.1 → 3.16.0.rc2.1

data/webpack/scenes/ContentViews/components/ContentViewName.js

@@ -0,0 +1,33 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { CubeIcon, CubesIcon } from '@patternfly/react-icons';
+import './contentViewName.scss';
+
+const ContentViewName = ({ composite, name, cvId }) => {
+  const props = {
+    key: cvId,
+    title: composite ? 'composite' : 'single',
+    style: { margin: '1px 5px' },
+    className: 'svg-icon-centered',
+  };
+  return (
+    <React.Fragment>
+      <div className="svg-centered-container">
+        {composite ? <CubesIcon {...props} /> : <CubeIcon {...props} />}
+        {name}
+      </div>
+    </React.Fragment>
+  );
+};
+
+ContentViewName.propTypes = {
+  cvId: PropTypes.number.isRequired,
+  name: PropTypes.string.isRequired,
+  composite: PropTypes.bool,
+};
+
+ContentViewName.defaultProps = {
+  composite: false,
+};
+
+export default ContentViewName;

data/webpack/scenes/ContentViews/components/EmptyStateMessage.js

@@ -0,0 +1,43 @@
+import React from 'react';
+import { EmptyState,
+  EmptyStateBody,
+  EmptyStateIcon,
+  EmptyStateVariant,
+  Bullseye,
+  Title } from '@patternfly/react-core';
+import PropTypes from 'prop-types';
+import { CubeIcon, ExclamationCircleIcon } from '@patternfly/react-icons';
+import { global_danger_color_200 as dangerColor } from '@patternfly/react-tokens';
+
+const EmptyStateMessage = ({ title, body, error }) => (
+  <Bullseye>
+    <EmptyState variant={EmptyStateVariant.small}>
+      {error ?
+        <EmptyStateIcon icon={ExclamationCircleIcon} color={dangerColor.value} /> :
+        <EmptyStateIcon icon={CubeIcon} />}
+      <Title headingLevel="h2" size="lg">
+        {title}
+      </Title>
+      <EmptyStateBody>
+        {body}
+      </EmptyStateBody>
+    </EmptyState>
+  </Bullseye>
+);
+
+EmptyStateMessage.propTypes = {
+  title: PropTypes.string,
+  body: PropTypes.string,
+  error: PropTypes.oneOfType([
+    PropTypes.shape({}),
+    PropTypes.string,
+  ]),
+};
+
+EmptyStateMessage.defaultProps = {
+  title: 'Unable to retrieve information from the server.',
+  body: 'Please check the server logs for more information',
+  error: undefined,
+};
+
+export default EmptyStateMessage;

data/webpack/scenes/ContentViews/components/IconWithCount.js

@@ -0,0 +1,18 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import './IconWithCount.scss';
+
+const IconWithCount = ({ count, title, Icon }) => (
+  <React.Fragment>
+    <Icon title={title} className="ktable-cell-icon" />
+    {count}
+  </React.Fragment>
+);
+
+IconWithCount.propTypes = {
+  count: PropTypes.number.isRequired,
+  title: PropTypes.string.isRequired,
+  Icon: PropTypes.elementType.isRequired,
+};
+
+export default IconWithCount;

data/webpack/scenes/ContentViews/components/IconWithCount.scss

@@ -0,0 +1,3 @@
+.ktable-cell-icon {
+  margin-right: 8px;
+}

data/webpack/scenes/ContentViews/components/Loading.js

@@ -0,0 +1,31 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import {
+  Bullseye,
+  Title,
+  EmptyState,
+  EmptyStateIcon,
+  Spinner,
+} from '@patternfly/react-core';
+
+const Loading = ({ size }) => (
+  <Bullseye>
+    <EmptyState>
+      <EmptyStateIcon variant="container" component={Spinner} />
+      <Title size={size}>
+        Loading
+      </Title>
+    </EmptyState>
+  </Bullseye>
+);
+
+Loading.propTypes = {
+  size: PropTypes.string,
+};
+
+Loading.defaultProps = {
+  size: 'lg',
+};
+
+
+export default Loading;

data/webpack/scenes/ContentViews/components/contentViewName.scss

@@ -0,0 +1,9 @@
+.svg-centered-container {
+  display: flex;
+  align-items: center;
+}
+
+.svg-icon-centered {
+  margin: 0 5px;
+  display: block;
+}

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

@@ -0,0 +1,12 @@
+import { API_OPERATIONS, get } from 'foremanReact/redux/API';
+
+import CONTENT_VIEWS_KEY from '../ContentViewsConstants';
+
+const getContentViewDetails = cvId => get({
+  type: API_OPERATIONS.GET,
+  key: `${CONTENT_VIEWS_KEY}_${cvId}`,
+  url: `/katello/api/content_views/${cvId}`,
+  params: {},
+});
+
+export default getContentViewDetails;

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

@@ -0,0 +1,15 @@
+import {
+  selectAPIStatus,
+  selectAPIError,
+  selectAPIResponse,
+} from 'foremanReact/redux/API/APISelectors';
+import CONTENT_VIEWS_KEY from '../ContentViewsConstants';
+
+export const selectCVDetails = (state, cvId) =>
+  selectAPIResponse(state, `${CONTENT_VIEWS_KEY}_${cvId}`) || {};
+
+export const selectCVDetailStatus =
+  (state, cvId) => selectAPIStatus(state, `${CONTENT_VIEWS_KEY}_${cvId}`);
+
+export const selectCVDetailError =
+  (state, cvId) => selectAPIError(state, `${CONTENT_VIEWS_KEY}_${cvId}`);

data/webpack/scenes/ContentViews/details/DetailsContainer.js

@@ -0,0 +1,35 @@
+import React, { useEffect } from 'react';
+import { useDispatch, useSelector, shallowEqual } from 'react-redux';
+import PropTypes from 'prop-types';
+import { STATUS } from 'foremanReact/constants';
+import EmptyStateMessage from '../components/EmptyStateMessage';
+import Loading from '../components/Loading';
+import getContentViewDetails from './ContentViewDetailActions';
+import { selectCVDetails,
+  selectCVDetailStatus,
+  selectCVDetailError } from './ContentViewDetailSelectors';
+
+const DetailsContainer = ({ children, cvId, isOpen }) => {
+  const dispatch = useDispatch();
+  const details = useSelector(state => selectCVDetails(state, cvId), shallowEqual);
+  const status = useSelector(state => selectCVDetailStatus(state, cvId), shallowEqual);
+  const error = useSelector(state => selectCVDetailError(state, cvId), shallowEqual);
+
+  useEffect(() => {
+    if (isOpen && Object.keys(details).length === 0) {
+      dispatch(getContentViewDetails(cvId));
+    }
+  });
+
+  if (status === STATUS.PENDING) return (<Loading size="sm" />);
+  if (status === STATUS.ERROR) return (<EmptyStateMessage error={error} />);
+  return (<React.Fragment>{children}</React.Fragment>);
+};
+
+DetailsContainer.propTypes = {
+  children: PropTypes.element.isRequired,
+  cvId: PropTypes.number.isRequired,
+  isOpen: PropTypes.bool.isRequired,
+};
+
+export default DetailsContainer;

data/webpack/scenes/ContentViews/expansions/DetailsExpansion.js

@@ -0,0 +1,11 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { translate as __ } from 'foremanReact/common/I18n';
+
+const DetailsExpansion = ({ cvId }) => <div id={`cv-details-expansion-${cvId}`}>{__('Details')}</div>;
+
+DetailsExpansion.propTypes = {
+  cvId: PropTypes.number.isRequired,
+};
+
+export default DetailsExpansion;

data/webpack/scenes/ContentViews/expansions/EnvironmentsExpansion.js

@@ -0,0 +1,19 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { translate as __ } from 'foremanReact/common/I18n';
+
+const EnvironmentsExpansion = ({ cvId }) => {
+  const identifier = `cv-environments-expansion-${cvId}`;
+  return (
+    <React.Fragment>
+      <div id={identifier}>{__('Environments')}</div>
+      <div>this should be showing but will be replaced by something else later</div>
+    </React.Fragment>
+  );
+};
+
+EnvironmentsExpansion.propTypes = {
+  cvId: PropTypes.number.isRequired,
+};
+
+export default EnvironmentsExpansion;

data/webpack/scenes/ContentViews/expansions/RepositoriesExpansion.js

@@ -0,0 +1,12 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { translate as __ } from 'foremanReact/common/I18n';
+
+const RepositoriesExpansion = ({ cvId }) =>
+  <div id={`cv-repositories-expansion-${cvId}`}>{__('Repositories')}</div>;
+
+RepositoriesExpansion.propTypes = {
+  cvId: PropTypes.number.isRequired,
+};
+
+export default RepositoriesExpansion;

data/webpack/scenes/ContentViews/expansions/VersionsExpansion.js

@@ -0,0 +1,11 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { translate as __ } from 'foremanReact/common/I18n';
+
+const VersionsExpansion = ({ cvId }) => <div id={`cv-versions-expansion-${cvId}`}>{__('Versions')}</div>;
+
+VersionsExpansion.propTypes = {
+  cvId: PropTypes.number.isRequired,
+};
+
+export default VersionsExpansion;

data/webpack/scenes/ContentViews/index.js

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

data/webpack/scenes/ModuleStreams/Details/ModuleStreamDetailsActions.js

@@ -1,4 +1,4 @@
-import api from '../../../services/api';
+import api, { orgId } from '../../../services/api';
 import {
   MODULE_STREAM_DETAILS_REQUEST,
   MODULE_STREAM_DETAILS_SUCCESS,
@@ -10,7 +10,7 @@ export const loadModuleStreamDetails = moduleStreamId => async (dispatch) => {
   dispatch({ type: MODULE_STREAM_DETAILS_REQUEST });
 
   try {
-    const { data } = await api.get(`/module_streams/${moduleStreamId}`);
+    const { data } = await api.get(`/module_streams/${moduleStreamId}`, {}, { organization_id: orgId() });
     return dispatch({
       type: MODULE_STREAM_DETAILS_SUCCESS,
       response: data,

data/webpack/scenes/ModuleStreams/Details/__tests__/__snapshots__/ModuleStreamDetailsActions.test.js.snap

@@ -139,6 +139,10 @@ exports[`Module stream details actions should load module stream details on succ
 Array [
   Array [
     "/module_streams/1",
+    Object {},
+    Object {
+      "organization_id": undefined,
+    },
   ],
 ]
 `;

data/webpack/scenes/RedHatRepositories/__tests__/__snapshots__/RedHatRepositoriesPage.test.js.snap

@@ -2,11 +2,19 @@
 
 exports[`RedHatRepositories page should render <PermissionDenied /> when permissions are missing 1`] = `
 <PermissionDenied
+  backHref="/"
   missingPermissions={
     Array [
       "view_organizations",
     ]
   }
+  texts={
+    Object {
+      "notAuthorizedMsg": "You are not authorized to perform this action.",
+      "permissionDeniedMsg": "Permission denied",
+      "pleaseRequestMsg": "Please request one of the required permissions listed below from a Foreman administrator:",
+    }
+  }
 />
 `;
 

data/webpack/scenes/Subscriptions/Manifest/__tests__/__snapshots__/ManageManifestModal.test.js.snap

@@ -83,6 +83,7 @@ exports[`manage manifest modal should render 1`] = `
               "header": "There is no Manifest History to display.",
             }
           }
+          onPaginationChange={[Function]}
           rows={
             Array [
               Object {
@@ -141,7 +142,7 @@ exports[`manage manifest modal should render 1`] = `
       </LoadingState>
     </Tab>
   </Uncontrolled(Tabs)>
-  <Component>
+  <mockConstructor>
     <Button
       active={false}
       block={false}
@@ -152,6 +153,6 @@ exports[`manage manifest modal should render 1`] = `
     >
       Close
     </Button>
-  </Component>
+  </mockConstructor>
 </ForemanModal>
 `;

data/webpack/scenes/Subscriptions/SubscriptionActions.js

@@ -38,7 +38,7 @@ import {
   stopPollingTasks,
   toastTaskFinished,
 } from '../Tasks/TaskActions';
-import { selectIsPollingTasks, selectIsPollingTask } from '../Tasks/TaskSelectors';
+import { selectIsPollingTasks } from '../Tasks/TaskSelectors';
 
 export const createSubscriptionParams = (extendedParams = {}) => ({
   ...{
@@ -104,19 +104,17 @@ export const resetTasks = () => (dispatch) => {
   });
 };
 
-export const handleTask = task => async (dispatch, getState) => {
-  if (selectIsPollingTask(getState(), SUBSCRIPTIONS)) {
-    if (!task.pending) {
-      dispatch(stopPollingTask(SUBSCRIPTIONS));
-      dispatch(toastTaskFinished(task));
-      dispatch(resetTasks());
-      dispatch(pollTasks());
-      dispatch(loadSubscriptions());
-    }
-  } else {
-    dispatch(cancelPollTasks());
-    dispatch(startPollingTask(SUBSCRIPTIONS, task));
-  }
+export const handleFinishedTask = task => (dispatch) => {
+  dispatch(stopPollingTask(SUBSCRIPTIONS));
+  dispatch(toastTaskFinished(task));
+  dispatch(resetTasks());
+  dispatch(pollTasks());
+  dispatch(loadSubscriptions());
+};
+
+export const handleStartTask = task => (dispatch) => {
+  dispatch(cancelPollTasks());
+  dispatch(startPollingTask(SUBSCRIPTIONS, task));
 };
 
 export const updateQuantity = (quantities = {}) => async (dispatch) => {

data/webpack/scenes/Subscriptions/SubscriptionsPage.js

@@ -39,11 +39,16 @@ class SubscriptionsPage extends Component {
 
   componentDidUpdate(prevProps) {
     const {
-      organization, task, handleTask,
+      organization, task, handleStartTask, handleFinishedTask, isTaskPending, isPollingTask,
     } = this.props;
-
     if (task) {
-      handleTask(task);
+      if (isPollingTask) {
+        if (prevProps.isTaskPending && !isTaskPending) {
+          handleFinishedTask(task);
+        }
+      } else {
+        handleStartTask(task);
+      }
     }
 
     if (organization) {
@@ -291,9 +296,12 @@ SubscriptionsPage.propTypes = {
     }),
     pending: PropTypes.bool,
   }),
+  isTaskPending: PropTypes.bool,
+  isPollingTask: PropTypes.bool,
   pollTasks: PropTypes.func.isRequired,
   cancelPollTasks: PropTypes.func.isRequired,
-  handleTask: PropTypes.func.isRequired,
+  handleStartTask: PropTypes.func.isRequired,
+  handleFinishedTask: PropTypes.func.isRequired,
   loadSetting: PropTypes.func.isRequired,
   loadTables: PropTypes.func.isRequired,
   createColumns: PropTypes.func.isRequired,
@@ -314,6 +322,8 @@ SubscriptionsPage.propTypes = {
 
 SubscriptionsPage.defaultProps = {
   task: undefined,
+  isTaskPending: undefined,
+  isPollingTask: undefined,
   organization: undefined,
   searchQuery: '',
   deleteModalOpened: false,

data/webpack/scenes/Subscriptions/SubscriptionsSelectors.js

@@ -16,5 +16,13 @@ export const selectActivePermissions = state =>
 export const selectSubscriptionsTask = state =>
   selectSubscriptionsState(state).task;
 
+export const selectIsTaskPending = (state) => {
+  const task = selectSubscriptionsTask(state);
+  if (task) {
+    return task.pending || task.result === 'pending';
+  }
+  return false;
+};
+
 export const selectTableSettings = (state, tableName) =>
   state.katello.settings.tables[tableName] || undefined;