katello 4.2.1 → 4.3.0.rc1

data/webpack/scenes/ContentViews/Details/Histories/ContentViewHistories.js

@@ -1,12 +1,10 @@
 import React, { useState, useCallback } from 'react';
-import useDeepCompareEffect from 'use-deep-compare-effect';
 import { useSelector } from 'react-redux';
-import { TableVariant, TableText } from '@patternfly/react-table';
+import { TableVariant, TableText, Thead, Tbody, Tr, Th, Td } from '@patternfly/react-table';
 import { Label } from '@patternfly/react-core';
 import { translate as __ } from 'foremanReact/common/I18n';
 import LongDateTime from 'foremanReact/components/common/dates/LongDateTime';
-import { urlBuilder } from 'foremanReact/common/urlHelpers';
-import { STATUS } from 'foremanReact/constants';
+import { Link } from 'react-router-dom';
 import PropTypes from 'prop-types';
 
 import TableWrapper from '../../../../components/Table/TableWrapper';
@@ -21,10 +19,7 @@ const ContentViewHistories = ({ cvId }) => {
   const response = useSelector(state => selectCVHistories(state, cvId));
   const status = useSelector(state => selectCVHistoriesStatus(state, cvId));
   const error = useSelector(state => selectCVHistoriesError(state, cvId));
-  const loading = status === STATUS.PENDING;
 
-  const [rows, setRows] = useState([]);
-  const [metadata, setMetadata] = useState({});
   const [searchQuery, updateSearchQuery] = useState('');
 
   const columnHeaders = [
@@ -36,84 +31,46 @@ const ContentViewHistories = ({ cvId }) => {
     __('User'),
   ];
 
-
-  useDeepCompareEffect(() => {
-    const taskTypes = {
-      publish: 'Actions::Katello::ContentView::Publish',
-      promotion: 'Actions::Katello::ContentView::Promote',
-      removal: 'Actions::Katello::ContentView::Remove',
-      incrementalUpdate: 'Actions::Katello::ContentView::IncrementalUpdates',
-      export: 'Actions::Katello::ContentViewVersion::Export',
-    };
-
-    const actionText = (history) => {
-      const {
-        action,
-        task,
-        environment,
-      } = history;
-
-      const taskType = task ? task.label : taskTypes[action];
-
-      if (taskType === taskTypes.removal) {
-        return <React.Fragment> Deleted from <Label key="1" color="blue" href={`/lifecycle_environments/${environment.id}`}>{`${environment.name}`}</Label>{}</React.Fragment>;
-      } else if (taskType === taskTypes.promotion) {
-        return <React.Fragment> Promoted to <Label key="2" color="blue" href={`/lifecycle_environments/${environment.id}`}>{`${environment.name}`}</Label>{}</React.Fragment>;
-      } else if (taskType === taskTypes.publish) {
-        return ('Published new version');
-      } else if (taskType === taskTypes.export) {
-        return ('Exported content view');
-      } else if (taskType === taskTypes.incrementalUpdate) {
-        return ('Incremental update');
-      }
-      return '';
-    };
-
-    const buildRows = (results) => {
-      const newRows = [];
-      results.forEach((history) => {
-        const {
-          version,
-          version_id: versionId,
-          created_at: createdAt,
-          status: taskStatus,
-          description,
-          user,
-        } = history;
-
-        const actionMessage = actionText(history);
-
-        const cells = [
-          { title: <LongDateTime date={createdAt} showRelativeTimeTooltip /> },
-          { title: <a href={urlBuilder(`content_views/${cvId}/versions/${versionId}`, '')}>{`Version ${version}`}</a> },
-          taskStatus,
-          actionMessage,
-          { title: <TableText wrapModifier="truncate">{description}</TableText> },
-          user,
-        ];
-
-        newRows.push({ cells });
-      });
-      return newRows;
-    };
-
-    const { results, ...meta } = response;
-    setMetadata(meta);
-    if (!loading && results) {
-      const newRows = buildRows(results);
-      setRows(newRows);
+  const taskTypes = {
+    publish: 'Actions::Katello::ContentView::Publish',
+    promotion: 'Actions::Katello::ContentView::Promote',
+    removal: 'Actions::Katello::ContentView::Remove',
+    incrementalUpdate: 'Actions::Katello::ContentView::IncrementalUpdates',
+    export: 'Actions::Katello::ContentViewVersion::Export',
+  };
+
+  const actionText = (history) => {
+    const {
+      action,
+      task,
+      environment,
+    } = history;
+
+    const taskType = task ? task.label : taskTypes[action];
+
+    if (taskType === taskTypes.removal) {
+      return <>{__('Deleted from ')} <Label isTruncated key="1" color="blue" href={`/lifecycle_environments/${environment?.id}`}>{`${environment?.name ?? __('all environments')}`}</Label>{}</>;
+    } else if (action === 'promotion' || taskType === taskTypes.promotion) {
+      return <>{__('Promoted to ')}<Label isTruncated key="2" color="blue" href={`/lifecycle_environments/${environment?.id}`}>{`${environment?.name}`}</Label>{}</>;
+    } else if (taskType === taskTypes.publish) {
+      return __('Published new version');
+    } else if (taskType === taskTypes.export) {
+      return __('Exported content view');
+    } else if (taskType === taskTypes.incrementalUpdate) {
+      return __('Incremental update');
     }
-  }, [response, setMetadata, loading, setRows, cvId]);
+    return '';
+  };
 
   const emptyContentTitle = __("You currently don't have any history for this content view.");
   const emptyContentBody = __('History will appear here when the content view is published or promoted.'); // needs link
   const emptySearchTitle = __('No matching history record found');
   const emptySearchBody = __('Try changing your search settings.');
-
+  const { results, ...metadata } = response;
+  /* eslint-disable react/no-array-index-key */
   return (
     <TableWrapper
       {...{
-        rows,
         metadata,
         emptyContentTitle,
         emptyContentBody,
@@ -124,13 +81,45 @@ const ContentViewHistories = ({ cvId }) => {
         error,
         status,
       }}
-      cells={columnHeaders}
       variant={TableVariant.compact}
       autocompleteEndpoint={`/content_views/${cvId}/history/auto_complete_search`}
       fetchItems={useCallback(params => getContentViewHistories(cvId, params), [cvId])}
-    />);
+    >
+      <Thead>
+        <Tr>
+          {columnHeaders.map(col =>
+            <Th key={col}>{col}</Th>)}
+        </Tr>
+      </Thead>
+      <Tbody>
+        {results?.map((history, index) => {
+          const {
+            version,
+            version_id: versionId,
+            created_at: createdAt,
+            status: taskStatus,
+            description,
+            user,
+          } = history;
+          return (
+            <Tr key={index}>
+              <Td><LongDateTime date={createdAt} showRelativeTimeTooltip /></Td>
+              <Td>
+                <Link to={`/versions/${versionId}`}>{`Version ${version}`}</Link>
+              </Td>
+              <Td>{taskStatus}</Td>
+              <Td>{actionText(history)}</Td>
+              <Td><TableText wrapModifier="truncate">{description}</TableText></Td>
+              <Td>{user}</Td>
+            </Tr>
+          );
+        })
+        }
+      </Tbody>
+    </TableWrapper>
+  );
+  /* eslint-enable react/no-array-index-key */
 };
-
 ContentViewHistories.propTypes = {
   cvId: PropTypes.number.isRequired,
 };

data/webpack/scenes/ContentViews/Details/Histories/__tests__/contentViewHistory.test.js

@@ -5,8 +5,7 @@ import nock, { nockInstance, assertNockRequest, mockAutocomplete, mockSetting }
 import api from '../../../../../services/api';
 import CONTENT_VIEWS_KEY from '../../../ContentViewsConstants';
 import ContentViewHistories from '../ContentViewHistories';
-
-const historyData = require('./contentViewHistory.fixtures.json');
+import historyData from './contentViewHistory.fixtures.json';
 
 const renderOptions = { apiNamespace: `${CONTENT_VIEWS_KEY}_1` };
 const cvHistories = api.getApiUrl('/content_views/1/history');

data/webpack/scenes/ContentViews/Details/Promote/ContentViewVersionPromote.js

@@ -0,0 +1,163 @@
+import React, { useState, useMemo, useCallback } from 'react';
+import useDeepCompareEffect from 'use-deep-compare-effect';
+import { useDispatch, useSelector } from 'react-redux';
+import { STATUS } from 'foremanReact/constants';
+import PropTypes from 'prop-types';
+import { Form, FormGroup, TextArea, ActionGroup, Button, Modal, ModalVariant, Alert } from '@patternfly/react-core';
+import { translate as __ } from 'foremanReact/common/I18n';
+
+import {
+  selectEnvironmentPaths,
+  selectEnvironmentPathsStatus,
+} from '../../components/EnvironmentPaths/EnvironmentPathSelectors';
+import EnvironmentPaths from '../../components/EnvironmentPaths/EnvironmentPaths';
+import { getContentViewVersions, promoteContentViewVersion } from '../ContentViewDetailActions';
+import {
+  selectPromoteCVVersionError, selectPromoteCVVersionResponse,
+  selectPromoteCVVersionStatus,
+} from './ContentViewVersionPromoteSelectors';
+import ComponentEnvironments from '../ComponentContentViews/ComponentEnvironments';
+import Loading from '../../../../components/Loading';
+
+const ContentViewVersionPromote = ({
+  cvId, versionIdToPromote, versionNameToPromote, versionEnvironments, setIsOpen,
+}) => {
+  const [description, setDescription] = useState('');
+  const [userCheckedItems, setUserCheckedItems] = useState([]);
+  const [promoting, setPromoting] = useState(false);
+  const [forcePromote, setForcePromote] = useState([]);
+  const environmentPathResponse = useSelector(selectEnvironmentPaths);
+  const environmentPathStatus = useSelector(selectEnvironmentPathsStatus);
+  const environmentPathLoading = environmentPathStatus === STATUS.PENDING;
+  const promoteResponse = useSelector(state =>
+    selectPromoteCVVersionResponse(state, versionIdToPromote, versionEnvironments));
+  const promoteStatus = useSelector(state =>
+    selectPromoteCVVersionStatus(state, versionIdToPromote, versionEnvironments));
+  const promoteError = useSelector(state =>
+    selectPromoteCVVersionError(state, versionIdToPromote, versionEnvironments));
+  const promoteResolved = promoteStatus === STATUS.RESOLVED;
+  const dispatch = useDispatch();
+
+  const onPromote = () => {
+    setPromoting(true);
+    dispatch(promoteContentViewVersion({
+      id: versionIdToPromote,
+      description,
+      versionEnvironments,
+      environment_ids: userCheckedItems.map(item => item.id),
+      force: true,
+    }));
+  };
+
+  useDeepCompareEffect(() => {
+    if (promoteResolved && promoteResponse) {
+      setIsOpen(false);
+      dispatch(getContentViewVersions(cvId));
+    }
+    if (promoteError) {
+      setPromoting(false);
+    }
+  }, [promoteResponse, promoteResolved, promoteError, setPromoting, setIsOpen, dispatch, cvId]);
+
+  const envPathFlat = useMemo(() => {
+    if (!environmentPathLoading) {
+      const { results } = environmentPathResponse || {};
+      return results.map(result => result.environments).flatten();
+    }
+    return [];
+  }, [environmentPathResponse, environmentPathLoading]);
+
+  const prior = useCallback(
+    env => envPathFlat.find(item => item.id === env.prior.id),
+    [envPathFlat],
+  );
+
+  const isChecked = useCallback(
+    env => (userCheckedItems.includes(env) ||
+      versionEnvironments.filter(item => item.id === env.id).length),
+    [userCheckedItems, versionEnvironments],
+  );
+
+  const isValid = useCallback((env) => {
+    if (!env.prior) return true;
+    if (!isChecked(prior(env))) return false;
+    return isValid(prior(env));
+  }, [prior, isChecked]);
+
+  useDeepCompareEffect(() => {
+    setForcePromote(userCheckedItems.filter(item => !isValid(item)));
+  }, [userCheckedItems, setForcePromote, isValid]);
+
+  return (
+    <Modal
+      title={__(`Promote version ${versionNameToPromote}`)}
+      isOpen
+      variant={ModalVariant.large}
+      onClose={() => {
+        setIsOpen(false);
+      }}
+      appendTo={document.body}
+    >
+      {promoting ? <Loading loadingText={__('Please wait while the task starts..')} /> :
+      <>
+        <Form>
+          <FormGroup label="Description" fieldId="description">
+            <TextArea
+              isRequired
+              type="text"
+              id="description"
+              aria-label="input_description"
+              name="description"
+              value={description}
+              onChange={value => setDescription(value)}
+            />
+          </FormGroup>
+        </Form>
+        <hr />
+        {forcePromote.length > 0 && (
+          <Alert variant="info" isInline title="Force Promotion">
+            <p>{__('Selected environments are out of the environment order. ' +
+              'The recommended practice is to promote to the next environment in the path.')}
+            </p>
+            <ComponentEnvironments environments={forcePromote} />
+          </Alert>)}
+        <EnvironmentPaths
+          userCheckedItems={userCheckedItems}
+          setUserCheckedItems={setUserCheckedItems}
+          promotedEnvironments={versionEnvironments}
+          publishing={false}
+        />
+        <Form>
+          <ActionGroup>
+            <Button
+              aria-label="promote_content_view"
+              variant="primary"
+              isDisabled={promoting}
+              onClick={() => onPromote()}
+            >
+              {__('Promote')}
+            </Button>
+            <Button variant="link" onClick={() => setIsOpen(false)}>
+              {__('Cancel')}
+            </Button>
+          </ActionGroup>
+        </Form>
+      </>}
+    </Modal>
+  );
+};
+
+ContentViewVersionPromote.propTypes = {
+  cvId: PropTypes.number.isRequired,
+  versionIdToPromote: PropTypes.number.isRequired,
+  versionNameToPromote: PropTypes.string.isRequired,
+  versionEnvironments: PropTypes.arrayOf(PropTypes.shape({})),
+  setIsOpen: PropTypes.func,
+};
+
+ContentViewVersionPromote.defaultProps = {
+  versionEnvironments: [],
+  setIsOpen: null,
+};
+
+export default ContentViewVersionPromote;

data/webpack/scenes/ContentViews/Details/Promote/ContentViewVersionPromoteSelectors.js

@@ -0,0 +1,16 @@
+import {
+  selectAPIStatus,
+  selectAPIError,
+  selectAPIResponse,
+} from 'foremanReact/redux/API/APISelectors';
+import { STATUS } from 'foremanReact/constants';
+import { cvVersionPromoteKey } from '../../ContentViewsConstants';
+
+export const selectPromoteCVVersionResponse = (state, versionId, versionEnvironments) =>
+  selectAPIResponse(state, cvVersionPromoteKey(versionId, versionEnvironments)) || {};
+
+export const selectPromoteCVVersionStatus = (state, versionId, versionEnvironments) =>
+  selectAPIStatus(state, cvVersionPromoteKey(versionId, versionEnvironments)) || STATUS.PENDING;
+
+export const selectPromoteCVVersionError = (state, versionId, versionEnvironments) =>
+  selectAPIError(state, cvVersionPromoteKey(versionId, versionEnvironments));

data/webpack/scenes/ContentViews/Details/Repositories/ContentCounts.js

@@ -1,6 +1,7 @@
 import React, { Fragment } from 'react';
 import PropTypes from 'prop-types';
 import { urlBuilder } from 'foremanReact/common/urlHelpers';
+import ContentConfig from '../../../Content/ContentConfig';
 
 // type: [plural_name, singular_name, link]
 const repoLabels = {
@@ -38,7 +39,14 @@ const ContentCounts = ({ productId, repoId, counts }) => {
 
   Object.keys(counts).forEach((type) => {
     const count = counts[type];
-    const info = repoLabels[type];
+    let info = repoLabels[type];
+    const config = ContentConfig().find(typeConfig =>
+      typeConfig.names.singularLabel === type);
+
+    if (config) {
+      const { pluralLowercase, singularLowercase, pluralLabel } = config.names;
+      info = [pluralLowercase, singularLowercase, pluralLabel];
+    }
     // package and rpm are the same
     if (type !== 'package' && count > 0) allCounts.push(appendCount(type, count, info, productId, repoId));
   });