katello 4.0.3 → 4.1.0.rc1

data/webpack/components/extensions/RegistrationCommands/index.js

@@ -0,0 +1,81 @@
+import React, { useEffect } from 'react';
+import PropTypes from 'prop-types';
+import { noop } from 'foremanReact/common/helpers';
+
+import ActivationKeys from './fields/ActivationKeys';
+import LifecycleEnvironment from './fields/LifecycleEnvironment';
+import IgnoreSubmanErrors from './fields/IgnoreSubmanErrors';
+import Force from './fields/Force';
+
+const RegistrationCommands = ({
+  organizationId,
+  hostGroupId,
+  pluginValues,
+  pluginData,
+  onChange,
+  handleInvalidField,
+  isLoading,
+}) => {
+  useEffect(() => {
+    onChange({ activationKeys: [], lifecycleEnvironmentId: '' });
+  }, [organizationId, hostGroupId]);
+
+  return (
+    <>
+      <ActivationKeys
+        activationKeys={pluginData?.activationKeys}
+        organizationId={organizationId}
+        selectedKeys={(pluginValues?.activationKeys || [])}
+        hostGroupActivationKeys={pluginData?.hostGroupActivationKeys}
+        hostGroupId={hostGroupId}
+        pluginValues={pluginValues}
+        onChange={onChange}
+        handleInvalidField={handleInvalidField}
+        isLoading={isLoading}
+      />
+      <LifecycleEnvironment
+        pluginValues={pluginValues}
+        lifecycleEnvironments={pluginData?.lifecycleEnvironments}
+        hostGroupEnvironment={pluginData?.hostGroupEnvironment}
+        organizationId={organizationId}
+        onChange={onChange}
+        isLoading={isLoading}
+      />
+      <IgnoreSubmanErrors
+        value={pluginValues?.ignoreSubmanErrors}
+        pluginValues={pluginValues}
+        onChange={onChange}
+        isLoading={isLoading}
+      />
+      <Force
+        value={pluginValues?.force}
+        pluginValues={pluginValues}
+        onChange={onChange}
+        isLoading={isLoading}
+      />
+    </>
+  );
+};
+
+RegistrationCommands.propTypes = {
+  organizationId: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
+  hostGroupId: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
+  pluginValues: PropTypes.object, // eslint-disable-line react/forbid-prop-types
+  pluginData: PropTypes.object, // eslint-disable-line react/forbid-prop-types
+  onChange: PropTypes.func,
+  handleInvalidField: PropTypes.func,
+  isLoading: PropTypes.bool,
+};
+
+RegistrationCommands.defaultProps = {
+  organizationId: undefined,
+  hostGroupId: undefined,
+  pluginValues: {},
+  pluginData: {},
+  isLoading: false,
+  onChange: noop,
+  handleInvalidField: noop,
+};
+
+export default RegistrationCommands;
+

data/webpack/components/pf3Table/formatters/EntitlementsInlineEditFormatter.js

@@ -3,35 +3,34 @@ import { sprintf, translate as __ } from 'foremanReact/common/I18n';
 import { KEYCODES } from 'foremanReact/common/keyCodes';
 import { Table, FormControl, FormGroup, HelpBlock, Spinner } from 'patternfly-react';
 import { validateQuantity } from '../../../scenes/Subscriptions/SubscriptionValidations';
+import { getEntitlementsDisplayValue } from '../../../scenes/Subscriptions/components/SubscriptionsTable/SubscriptionsTableHelpers';
 
-const renderValue = (value, additionalData, onActivate) => {
+const renderValue = (rawValue, additionalData, onActivate) => {
   const { available, upstream_pool_id: upstreamPoolId, collapsible } = additionalData.rowData;
 
-  if (collapsible) {
-    return (
-      <td>{__('NA')}</td>
-    );
-  } else if (available < 0 || !upstreamPoolId) {
-    return (
-      <td>{available < 0 ? __('Unlimited') : available}</td>
-    );
-  }
+  const value = getEntitlementsDisplayValue({
+    rawValue, available, collapsible, upstreamPoolId,
+  });
+  const editable = (typeof value === 'number');
 
   return (
-    <td className="editable">
-      <div
-        onClick={() => onActivate(additionalData)}
-        onKeyPress={(e) => {
-          if (e.keyCode === KEYCODES.ENTER) {
-            onActivate(additionalData);
-          }
-        }}
-        className="input"
-        role="textbox"
-        tabIndex={0}
-      >
-        {value}
-      </div>
+    <td className={editable ? 'editable' : ''}>
+      {editable &&
+        <div
+          onClick={() => onActivate(additionalData)}
+          onKeyPress={(e) => {
+            if (e.keyCode === KEYCODES.ENTER) {
+              onActivate(additionalData);
+            }
+          }}
+          className="input"
+          role="textbox"
+          tabIndex={0}
+        >
+          {value}
+        </div>
+      }
+      {!editable && value}
     </td>
   );
 };

data/webpack/components/pf3Table/formatters/__tests__/__snapshots__/EntitlementsInlineEditFormatter.test.js.snap

@@ -222,7 +222,9 @@ exports[`EntitlementsInlineEditFormatter value mode renders the value 1`] = `
 `;
 
 exports[`EntitlementsInlineEditFormatter value mode renders unlimited for -1 1`] = `
-<td>
+<td
+  className=""
+>
   Unlimited
 </td>
 `;

data/webpack/components/pf3Table/formatters/entitlementsValueFormatter.js

@@ -0,0 +1,16 @@
+import React from 'react';
+import { Table as PfTable } from 'patternfly-react';
+import { getEntitlementsDisplayValue } from '../../../scenes/Subscriptions/components/SubscriptionsTable/SubscriptionsTableHelpers.js';
+
+export default (rawValue, additionalData) => {
+  const { available, upstream_pool_id: upstreamPoolId, collapsible } = additionalData.rowData;
+  const value = getEntitlementsDisplayValue({
+    rawValue, available, collapsible, upstreamPoolId,
+  });
+
+  return (
+    <PfTable.Cell>
+      {value}
+    </PfTable.Cell>
+  );
+};

data/webpack/containers/Application/overrides.scss

@@ -60,3 +60,6 @@ td, th {
   outline: none;
 }
 
+.tab-body-with-spacing {
+  margin: 24px 0px;
+}

data/webpack/fills_index.js

@@ -3,8 +3,11 @@ import { addGlobalFill } from 'foremanReact/components/common/Fill/GlobalFill';
 import { registerReducer } from 'foremanReact/common/MountingService';
 
 import SystemStatuses from './components/extensions/about';
+import RegistrationCommands from './components/extensions/RegistrationCommands';
+
 import extendReducer from './components/extensions/reducers';
 
 registerReducer('katelloExtends', extendReducer);
 
 addGlobalFill('aboutFooterSlot', '[katello]AboutSystemStatuses', <SystemStatuses key="katello-system-statuses" />, 100);
+addGlobalFill('registrationAdvanced', '[katello]RegistrationCommands', <RegistrationCommands key="katello-reg" />, 100);

data/webpack/redux/reducers/RedHatRepositories/enabled.fixtures.js

@@ -65,7 +65,6 @@ export const requestSuccessResponse = Immutable({
         package: 0,
         package_group: 0,
         erratum: 0,
-        puppet_module: 0,
         file: 0,
         deb: 0,
       },
@@ -107,7 +106,6 @@ export const requestSuccessResponse = Immutable({
         package: 0,
         package_group: 0,
         erratum: 0,
-        puppet_module: 0,
         file: 0,
         deb: 0,
       },

data/webpack/scenes/ContentViews/ContentViewsConstants.js

@@ -6,7 +6,14 @@ export const UPDATE_CONTENT_VIEW_SUCCESS = 'UPDATE_CONTENT_VIEW_SUCCESS';
 export const UPDATE_CONTENT_VIEW_FAILURE = 'UPDATE_CONTENT_VIEW_FAILURE';
 export const cvDetailsKey = cvId => `${CONTENT_VIEWS_KEY}_${cvId}`;
 export const cvDetailsRepoKey = cvId => `${CONTENT_VIEWS_KEY}_REPOSITORIES_${cvId}`;
-export const cvDetailsFilterKey = cvId => `${CONTENT_VIEWS_KEY}_FILTERS_${cvId}`;
+export const cvDetailsFiltersKey = cvId => `${CONTENT_VIEWS_KEY}_FILTERS_${cvId}`;
+export const cvFilterDetailsKey = (cvId, filterId) => `${CONTENT_VIEWS_KEY}_${cvId}_FILTER_${filterId}`;
+export const cvFilterPackageGroupsKey =
+  (cvId, filterId) => `${CONTENT_VIEWS_KEY}_${cvId}_FILTER_${filterId}_PACKAGE_GROUPS`;
+export const cvDetailsHistoryKey = cvId => `${CONTENT_VIEWS_KEY}_HISTORIES_${cvId}`;
+export const cvFilterRulesKey = filterId => `CONTENT_VIEW_FILTER_${filterId}_RULES`;
+export const cvDetailsComponentKey = cvId => `${CONTENT_VIEWS_KEY}_COMPONENTS_${cvId}`;
+export const cvDetailsVersionKey = cvId => `${CONTENT_VIEWS_KEY}_VERSIONS_${cvId}`;
 
 // Repo added to content view status display and key
 export const ADDED = 'Added';

data/webpack/scenes/ContentViews/Copy/__tests__/contentViewCopyResult.fixtures.json

@@ -3,7 +3,6 @@
   "composite": false,
   "component_ids": [],
   "default": false,
-  "force_puppet_environment": false,
   "version_count": 0,
   "latest_version": null,
   "auto_publish": false,
@@ -24,7 +23,6 @@
   "updated_at": "2020-12-14 12:45:59 -0500",
   "environments": [],
   "repositories": [],
-  "puppet_modules": [],
   "versions": [],
   "components": [],
   "content_view_components": [],
@@ -39,4 +37,4 @@
     "promote_or_remove_content_views": true
   },
   "duplicate_repositories_to_publish": []
-}
+}

data/webpack/scenes/ContentViews/Create/__tests__/contentViewCreateResult.fixtures.json

@@ -3,7 +3,6 @@
   "composite": false,
   "component_ids": [],
   "default": false,
-  "force_puppet_environment": false,
   "version_count": 0,
   "latest_version": null,
   "auto_publish": false,
@@ -24,7 +23,6 @@
   "updated_at": "2020-12-14 12:45:59 -0500",
   "environments": [],
   "repositories": [],
-  "puppet_modules": [],
   "versions": [],
   "components": [],
   "content_view_components": [],
@@ -39,4 +37,4 @@
     "promote_or_remove_content_views": true
   },
   "duplicate_repositories_to_publish": []
-}
+}

data/webpack/scenes/ContentViews/Details/ComponentContentViews/ComponentEnvironments.js

@@ -0,0 +1,28 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { Label, Flex, FlexItem } from '@patternfly/react-core';
+
+const ComponentEnvironments = ({ environments }) => {
+  const envList = environments.map(env =>
+    (
+      <FlexItem key={env.id} style={{ marginTop: '0.25em', marginBottom: '0.25em' }}>
+        <Label color="purple" href={`/lifecycle_environments/${env.id}`}>{`${env.name}`}</Label>
+      </FlexItem>
+    ));
+  return (
+    <Flex grow={{ default: 'grow' }} spaceItems={{ default: 'spaceItemsSm' }}>
+      {envList}
+    </Flex>
+  );
+};
+
+ComponentEnvironments.propTypes = {
+  environments: PropTypes.instanceOf(Array),
+};
+
+ComponentEnvironments.defaultProps = {
+  environments: [],
+};
+
+export default ComponentEnvironments;
+

data/webpack/scenes/ContentViews/Details/ComponentContentViews/ComponentVersion.js

@@ -0,0 +1,45 @@
+import React from 'react';
+import { Link } from 'react-router-dom';
+import PropTypes from 'prop-types';
+import { urlBuilder } from 'foremanReact/common/urlHelpers';
+import { translate as __ } from 'foremanReact/common/I18n';
+import {
+  Text,
+  TextContent,
+  TextVariants,
+} from '@patternfly/react-core';
+
+const ComponentVersion = ({ componentCV }) => {
+  const { latest, content_view_version: cvVersion, content_view: cv } = componentCV;
+  const {
+    id,
+    latest_version: latestVersion,
+  } = cv;
+  const { version } = cvVersion;
+  const latestDescription = __('Latest (automatically updates)');
+  const manualVersionText = (latestVersion === version) ? __('Latest version') : __(`New version is available: Version ${latestVersion}`);
+  return (
+    <>
+      <Link to={urlBuilder('labs/content_views', '', id)}> Version {version}</Link>
+      <TextContent>
+        <Text component={TextVariants.small}>{latest ? latestDescription : manualVersionText}</Text>
+      </TextContent>
+    </>
+  );
+};
+
+ComponentVersion.propTypes = {
+  componentCV: PropTypes.shape({
+    latest: PropTypes.bool.isRequired,
+    content_view_version: PropTypes.shape({
+      version: PropTypes.string.isRequired,
+    }),
+    content_view: PropTypes.shape({
+      id: PropTypes.number.isRequired,
+      latest_version: PropTypes.string.isRequired,
+    }),
+  }).isRequired,
+};
+
+export default ComponentVersion;
+

data/webpack/scenes/ContentViews/Details/ComponentContentViews/ContentViewComponents.js

@@ -0,0 +1,124 @@
+import React, { useState, useEffect } from 'react';
+import { useSelector } from 'react-redux';
+import {
+  Bullseye,
+} from '@patternfly/react-core';
+import { Link } from 'react-router-dom';
+import { TableVariant, fitContent, TableText } from '@patternfly/react-table';
+import { STATUS } from 'foremanReact/constants';
+import { translate as __ } from 'foremanReact/common/I18n';
+import { urlBuilder } from 'foremanReact/common/urlHelpers';
+import PropTypes from 'prop-types';
+
+import TableWrapper from '../../../../components/Table/TableWrapper';
+import onSelect from '../../../../components/Table/helpers';
+import {
+  selectCVComponents,
+  selectCVComponentsStatus,
+  selectCVComponentsError,
+} from '../ContentViewDetailSelectors';
+import { getContentViewComponents } from '../ContentViewDetailActions';
+import AddedStatusLabel from '../../../../components/AddedStatusLabel';
+import ComponentVersion from './ComponentVersion';
+import ComponentEnvironments from './ComponentEnvironments';
+import ContentViewIcon from '../../components/ContentViewIcon';
+
+const ContentViewComponents = ({ cvId, details }) => {
+  const response = useSelector(state => selectCVComponents(state, cvId));
+  const status = useSelector(state => selectCVComponentsStatus(state, cvId));
+  const error = useSelector(state => selectCVComponentsError(state, cvId));
+
+  const [rows, setRows] = useState([]);
+  const [metadata, setMetadata] = useState({});
+  const [searchQuery, updateSearchQuery] = useState('');
+  const columnHeaders = [
+    { title: __('Type'), transforms: [fitContent] },
+    { title: __('Name') },
+    { title: __('Version') },
+    { title: __('Environments') },
+    { title: __('Repositories') },
+    { title: __('Status') },
+    { title: __('Description') },
+  ];
+  const loading = status === STATUS.PENDING;
+  const { label } = details || {};
+
+  const buildRows = (results) => {
+    const newRows = [];
+    results.forEach((componentCV) => {
+      const { content_view: cv, content_view_version: cvVersion } = componentCV;
+      const { environments, repositories } = cvVersion || {};
+      const {
+        id,
+        name,
+        description,
+      } = cv;
+
+      const cells = [
+        { title: <Bullseye><ContentViewIcon composite={false} /></Bullseye> },
+        { title: <Link to={urlBuilder('labs/content_views', '', id)}>{name}</Link> },
+        { title: cvVersion ? <ComponentVersion {...{ componentCV }} /> : 'Not yet published' },
+        { title: environments ? <ComponentEnvironments {...{ environments }} /> : 'Not yet published' },
+        { title: <Link to={urlBuilder(`labs/content_views/${id}#repositories`, '')}>{ repositories ? repositories.length : 0 }</Link> },
+        {
+          title: <AddedStatusLabel added />,
+        },
+        { title: <TableText wrapModifier="truncate">{description || 'No description'}</TableText> },
+      ];
+      newRows.push({ cells });
+    });
+    return newRows;
+  };
+
+  const emptyContentTitle = __(`No content views belong to ${label}`);
+  const emptyContentBody = __('Please add some content views.');
+  const emptySearchTitle = __('No matching content views found');
+  const emptySearchBody = __('Try changing your search settings.');
+
+  useEffect(() => {
+    const { results, ...meta } = response;
+    setMetadata(meta);
+
+    if (!loading && results) {
+      const newRows = buildRows(results);
+      setRows(newRows);
+    }
+  }, [JSON.stringify(response)]);
+
+  return (
+    <TableWrapper
+      {...{
+        rows,
+        metadata,
+        emptyContentTitle,
+        emptyContentBody,
+        emptySearchTitle,
+        emptySearchBody,
+        searchQuery,
+        updateSearchQuery,
+        error,
+        status,
+      }}
+      onSelect={onSelect(rows, setRows)}
+      cells={columnHeaders}
+      variant={TableVariant.compact}
+      autocompleteEndpoint="/content_views/auto_complete_search"
+      fetchItems={params => getContentViewComponents(cvId, params)}
+    />
+  );
+};
+
+ContentViewComponents.propTypes = {
+  cvId: PropTypes.number.isRequired,
+  details: PropTypes.shape({
+    label: PropTypes.string,
+  }),
+};
+
+ContentViewComponents.defaultProps = {
+  details: {
+    label: '',
+  },
+};
+
+export default ContentViewComponents;

data/webpack/scenes/ContentViews/Details/ComponentContentViews/__tests__/contentViewComponents.fixtures.json

@@ -0,0 +1,161 @@
+{
+  "total": 2,
+  "subtotal": 2,
+  "page": "1",
+  "per_page": "20",
+  "error": null,
+  "search": null,
+  "sort": {
+    "by": "label",
+    "order": "asc"
+  },
+  "results": [
+    {
+      "latest": false,
+      "id": 5,
+      "created_at": "2021-04-12 21:18:08 -0400",
+      "updated_at": "2021-04-16 10:34:00 -0400",
+      "composite_content_view": {
+        "id": 5,
+        "name": "composite1",
+        "label": "composite1",
+        "description": null,
+        "next_version": 1,
+        "latest_version": null,
+        "version_count": 0
+      },
+      "content_view": {
+        "id": 3,
+        "name": "component1",
+        "label": "component1",
+        "description": "Test Description",
+        "next_version": 5,
+        "latest_version": "4.0",
+        "version_count": 4
+      },
+      "content_view_version": {
+        "id": 11,
+        "name": "component1 4.0",
+        "content_view_id": 3,
+        "version": "4.0",
+        "content_view": {
+          "id": 3,
+          "name": "component1",
+          "label": "component1",
+          "description": ""
+        },
+        "environments": [
+          {
+            "id": 1,
+            "name": "Library",
+            "label": "Library"
+          },
+          {
+            "id": 2,
+            "name": "dev",
+            "label": "dev"
+          },
+          {
+            "id": 3,
+            "name": "dev1",
+            "label": "dev1"
+          },
+          {
+            "id": 4,
+            "name": "dev2",
+            "label": "dev2"
+          },
+          {
+            "id": 5,
+            "name": "dev3",
+            "label": "dev3"
+          },
+          {
+            "id": 6,
+            "name": "test",
+            "label": "test"
+          },
+          {
+            "id": 7,
+            "name": "test1",
+            "label": "test1"
+          },
+          {
+            "id": 9,
+            "name": "test2",
+            "label": "test2"
+          },
+          {
+            "id": 8,
+            "name": "test3",
+            "label": "test3"
+          }
+        ],
+        "repositories": [
+          {
+            "id": 25,
+            "name": "test",
+            "label": "test",
+            "description": null
+          },
+          {
+            "id": 27,
+            "name": "fileRepo1",
+            "label": "fileRepo1",
+            "description": null
+          },
+          {
+            "id": 26,
+            "name": "fileRepo",
+            "label": "fileRepo",
+            "description": null
+          }
+        ]
+      }
+    },
+    {
+      "latest": true,
+      "id": 4,
+      "created_at": "2021-04-12 21:14:48 -0400",
+      "updated_at": "2021-04-12 21:14:48 -0400",
+      "composite_content_view": {
+        "id": 5,
+        "name": "composite1",
+        "label": "composite1",
+        "description": null,
+        "next_version": 1,
+        "latest_version": null,
+        "version_count": 0
+      },
+      "content_view": {
+        "id": 4,
+        "name": "component2",
+        "label": "component2",
+        "description": null,
+        "next_version": 2,
+        "latest_version": "1.0",
+        "version_count": 1
+      },
+      "content_view_version": {
+        "id": 8,
+        "name": "component2 1.0",
+        "content_view_id": 4,
+        "version": "1.0",
+        "content_view": {
+          "id": 4,
+          "name": "component2",
+          "label": "component2",
+          "description": null
+        },
+        "environments": [
+          {
+            "id": 1,
+            "name": "Library",
+            "label": "Library"
+          }
+        ],
+        "repositories": []
+      }
+    }
+  ]
+}