katello 4.2.2 → 4.3.0.rc1

data/webpack/scenes/ContentViews/Delete/__tests__/envPathData.fixtures.json

@@ -0,0 +1,424 @@
+{
+  "total": 2,
+  "subtotal": 2,
+  "page": null,
+  "per_page": null,
+  "error": null,
+  "search": null,
+  "sort": {
+    "by": null,
+    "order": null
+  },
+  "results": [
+    {
+      "environments": [
+        {
+          "library": true,
+          "registry_name_pattern": null,
+          "registry_unauthenticated_pull": false,
+          "id": 1,
+          "name": "Library",
+          "label": "Library",
+          "description": null,
+          "organization_id": 1,
+          "organization": {
+            "name": "Default Organization",
+            "label": "Default_Organization",
+            "id": 1
+          },
+          "created_at": "2021-09-20 17:11:39 -0400",
+          "updated_at": "2021-09-20 17:11:39 -0400",
+          "prior": null,
+          "successor": null,
+          "counts": {
+            "content_hosts": 0,
+            "content_views": 2,
+            "packages": 22,
+            "module_streams": 14,
+            "errata": {
+              "security": 2,
+              "bugfix": 0,
+              "enhancement": 5,
+              "total": 9
+            },
+            "yum_repositories": 3,
+            "docker_repositories": 1,
+            "ostree_repositories": 0,
+            "products": 1
+          },
+          "permissions": {
+            "create_lifecycle_environments": true,
+            "view_lifecycle_environments": true,
+            "edit_lifecycle_environments": true,
+            "destroy_lifecycle_environments": false,
+            "promote_or_remove_content_views_to_environments": true
+          }
+        },
+        {
+          "library": false,
+          "registry_name_pattern": null,
+          "registry_unauthenticated_pull": false,
+          "id": 2,
+          "name": "dev1",
+          "label": "dev1",
+          "description": null,
+          "organization_id": 1,
+          "organization": {
+            "name": "Default Organization",
+            "label": "Default_Organization",
+            "id": 1
+          },
+          "created_at": "2021-09-20 19:54:37 -0400",
+          "updated_at": "2021-09-20 19:54:37 -0400",
+          "prior": {
+            "name": "Library",
+            "id": 1
+          },
+          "successor": {
+            "name": "dev2",
+            "id": 3
+          },
+          "counts": {
+            "content_hosts": 1,
+            "content_views": 2
+          },
+          "permissions": {
+            "create_lifecycle_environments": true,
+            "view_lifecycle_environments": true,
+            "edit_lifecycle_environments": true,
+            "destroy_lifecycle_environments": false,
+            "promote_or_remove_content_views_to_environments": true
+          }
+        },
+        {
+          "library": false,
+          "registry_name_pattern": null,
+          "registry_unauthenticated_pull": false,
+          "id": 3,
+          "name": "dev2",
+          "label": "dev2",
+          "description": null,
+          "organization_id": 1,
+          "organization": {
+            "name": "Default Organization",
+            "label": "Default_Organization",
+            "id": 1
+          },
+          "created_at": "2021-09-20 19:54:44 -0400",
+          "updated_at": "2021-09-20 19:54:44 -0400",
+          "prior": {
+            "name": "dev1",
+            "id": 2
+          },
+          "successor": {
+            "name": "dev3",
+            "id": 4
+          },
+          "counts": {
+            "content_hosts": 0,
+            "content_views": 2
+          },
+          "permissions": {
+            "create_lifecycle_environments": true,
+            "view_lifecycle_environments": true,
+            "edit_lifecycle_environments": true,
+            "destroy_lifecycle_environments": true,
+            "promote_or_remove_content_views_to_environments": true
+          }
+        },
+        {
+          "library": false,
+          "registry_name_pattern": null,
+          "registry_unauthenticated_pull": false,
+          "id": 4,
+          "name": "dev3",
+          "label": "dev3",
+          "description": null,
+          "organization_id": 1,
+          "organization": {
+            "name": "Default Organization",
+            "label": "Default_Organization",
+            "id": 1
+          },
+          "created_at": "2021-09-20 19:54:50 -0400",
+          "updated_at": "2021-09-20 19:54:50 -0400",
+          "prior": {
+            "name": "dev2",
+            "id": 3
+          },
+          "successor": {
+            "name": "dev4",
+            "id": 5
+          },
+          "counts": {
+            "content_hosts": 0,
+            "content_views": 2
+          },
+          "permissions": {
+            "create_lifecycle_environments": true,
+            "view_lifecycle_environments": true,
+            "edit_lifecycle_environments": true,
+            "destroy_lifecycle_environments": true,
+            "promote_or_remove_content_views_to_environments": true
+          }
+        },
+        {
+          "library": false,
+          "registry_name_pattern": null,
+          "registry_unauthenticated_pull": false,
+          "id": 5,
+          "name": "dev4",
+          "label": "dev4",
+          "description": null,
+          "organization_id": 1,
+          "organization": {
+            "name": "Default Organization",
+            "label": "Default_Organization",
+            "id": 1
+          },
+          "created_at": "2021-09-20 19:54:58 -0400",
+          "updated_at": "2021-09-20 19:54:58 -0400",
+          "prior": {
+            "name": "dev3",
+            "id": 4
+          },
+          "successor": null,
+          "counts": {
+            "content_hosts": 0,
+            "content_views": 1
+          },
+          "permissions": {
+            "create_lifecycle_environments": true,
+            "view_lifecycle_environments": true,
+            "edit_lifecycle_environments": true,
+            "destroy_lifecycle_environments": true,
+            "promote_or_remove_content_views_to_environments": true
+          }
+        }
+      ]
+    },
+    {
+      "environments": [
+        {
+          "library": true,
+          "registry_name_pattern": null,
+          "registry_unauthenticated_pull": false,
+          "id": 1,
+          "name": "Library",
+          "label": "Library",
+          "description": null,
+          "organization_id": 1,
+          "organization": {
+            "name": "Default Organization",
+            "label": "Default_Organization",
+            "id": 1
+          },
+          "created_at": "2021-09-20 17:11:39 -0400",
+          "updated_at": "2021-09-20 17:11:39 -0400",
+          "prior": null,
+          "successor": null,
+          "counts": {
+            "content_hosts": 0,
+            "content_views": 2,
+            "packages": 22,
+            "module_streams": 14,
+            "errata": {
+              "security": 2,
+              "bugfix": 0,
+              "enhancement": 5,
+              "total": 9
+            },
+            "yum_repositories": 3,
+            "docker_repositories": 1,
+            "ostree_repositories": 0,
+            "products": 1
+          },
+          "permissions": {
+            "create_lifecycle_environments": true,
+            "view_lifecycle_environments": true,
+            "edit_lifecycle_environments": true,
+            "destroy_lifecycle_environments": false,
+            "promote_or_remove_content_views_to_environments": true
+          }
+        },
+        {
+          "library": false,
+          "registry_name_pattern": null,
+          "registry_unauthenticated_pull": false,
+          "id": 9,
+          "name": "test1",
+          "label": "test1",
+          "description": null,
+          "organization_id": 1,
+          "organization": {
+            "name": "Default Organization",
+            "label": "Default_Organization",
+            "id": 1
+          },
+          "created_at": "2021-09-20 19:55:25 -0400",
+          "updated_at": "2021-09-20 19:55:25 -0400",
+          "prior": {
+            "name": "Library",
+            "id": 1
+          },
+          "successor": {
+            "name": "test2",
+            "id": 10
+          },
+          "counts": {
+            "content_hosts": 0,
+            "content_views": 1
+          },
+          "permissions": {
+            "create_lifecycle_environments": true,
+            "view_lifecycle_environments": true,
+            "edit_lifecycle_environments": true,
+            "destroy_lifecycle_environments": true,
+            "promote_or_remove_content_views_to_environments": true
+          }
+        },
+        {
+          "library": false,
+          "registry_name_pattern": null,
+          "registry_unauthenticated_pull": false,
+          "id": 10,
+          "name": "test2",
+          "label": "test2",
+          "description": null,
+          "organization_id": 1,
+          "organization": {
+            "name": "Default Organization",
+            "label": "Default_Organization",
+            "id": 1
+          },
+          "created_at": "2021-09-20 19:55:31 -0400",
+          "updated_at": "2021-09-20 19:55:31 -0400",
+          "prior": {
+            "name": "test1",
+            "id": 9
+          },
+          "successor": {
+            "name": "test3",
+            "id": 11
+          },
+          "counts": {
+            "content_hosts": 0,
+            "content_views": 1
+          },
+          "permissions": {
+            "create_lifecycle_environments": true,
+            "view_lifecycle_environments": true,
+            "edit_lifecycle_environments": true,
+            "destroy_lifecycle_environments": true,
+            "promote_or_remove_content_views_to_environments": true
+          }
+        },
+        {
+          "library": false,
+          "registry_name_pattern": null,
+          "registry_unauthenticated_pull": false,
+          "id": 11,
+          "name": "test3",
+          "label": "test3",
+          "description": null,
+          "organization_id": 1,
+          "organization": {
+            "name": "Default Organization",
+            "label": "Default_Organization",
+            "id": 1
+          },
+          "created_at": "2021-09-20 19:55:37 -0400",
+          "updated_at": "2021-09-20 19:55:37 -0400",
+          "prior": {
+            "name": "test2",
+            "id": 10
+          },
+          "successor": {
+            "name": "test4",
+            "id": 12
+          },
+          "counts": {
+            "content_hosts": 0,
+            "content_views": 1
+          },
+          "permissions": {
+            "create_lifecycle_environments": true,
+            "view_lifecycle_environments": true,
+            "edit_lifecycle_environments": true,
+            "destroy_lifecycle_environments": true,
+            "promote_or_remove_content_views_to_environments": true
+          }
+        },
+        {
+          "library": false,
+          "registry_name_pattern": null,
+          "registry_unauthenticated_pull": false,
+          "id": 12,
+          "name": "test4",
+          "label": "test4",
+          "description": null,
+          "organization_id": 1,
+          "organization": {
+            "name": "Default Organization",
+            "label": "Default_Organization",
+            "id": 1
+          },
+          "created_at": "2021-09-20 19:55:44 -0400",
+          "updated_at": "2021-09-20 19:55:44 -0400",
+          "prior": {
+            "name": "test3",
+            "id": 11
+          },
+          "successor": {
+            "name": "test5",
+            "id": 13
+          },
+          "counts": {
+            "content_hosts": 0,
+            "content_views": 2
+          },
+          "permissions": {
+            "create_lifecycle_environments": true,
+            "view_lifecycle_environments": true,
+            "edit_lifecycle_environments": true,
+            "destroy_lifecycle_environments": true,
+            "promote_or_remove_content_views_to_environments": true
+          }
+        },
+        {
+          "library": false,
+          "registry_name_pattern": null,
+          "registry_unauthenticated_pull": false,
+          "id": 13,
+          "name": "test5",
+          "label": "test5",
+          "description": null,
+          "organization_id": 1,
+          "organization": {
+            "name": "Default Organization",
+            "label": "Default_Organization",
+            "id": 1
+          },
+          "created_at": "2021-09-20 19:55:52 -0400",
+          "updated_at": "2021-09-20 19:55:52 -0400",
+          "prior": {
+            "name": "test4",
+            "id": 12
+          },
+          "successor": null,
+          "counts": {
+            "content_hosts": 0,
+            "content_views": 2
+          },
+          "permissions": {
+            "create_lifecycle_environments": true,
+            "view_lifecycle_environments": true,
+            "edit_lifecycle_environments": true,
+            "destroy_lifecycle_environments": true,
+            "promote_or_remove_content_views_to_environments": true
+          }
+        }
+      ]
+    }
+  ]
+}

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

@@ -1,14 +1,18 @@
 import React, { useState, useEffect } from 'react';
 import PropTypes from 'prop-types';
-import { Modal, ModalVariant, FormSelect,
+import {
+  Modal, ModalVariant, FormSelect,
   FormSelectOption, Checkbox, Form, FormGroup,
-  ActionGroup, Button } from '@patternfly/react-core';
+  ActionGroup, Button,
+} from '@patternfly/react-core';
 import { useDispatch, useSelector, shallowEqual } from 'react-redux';
 import { translate as __ } from 'foremanReact/common/I18n';
 import { STATUS } from 'foremanReact/constants';
-import { selectCVDetails,
+import {
+  selectCVDetails,
   selectCVDetailStatus,
-  selectCVDetailError } from '../../Details/ContentViewDetailSelectors';
+  selectCVDetailError,
+} from '../../Details/ContentViewDetailSelectors';
 import { addComponent } from '../ContentViewDetailActions';
 
 const ComponentContentViewAddModal = ({
@@ -91,7 +95,11 @@ const ComponentContentViewAddModal = ({
       }}
       appendTo={document.body}
     >
-      <Form>
+      <Form onSubmit={(e) => {
+        e.preventDefault();
+        onSubmit();
+      }}
+      >
         <FormGroup label={__('Version')} isRequired fieldId="version">
           <FormSelect
             value={selected}
@@ -104,7 +112,7 @@ const ComponentContentViewAddModal = ({
             {options.map((option, index) => (
               // eslint-disable-next-line react/no-array-index-key
               <FormSelectOption key={index} value={option.value} label={option.label} />
-          ))}
+            ))}
           </FormSelect>
         </FormGroup>
         <FormGroup fieldId="latest">
@@ -118,7 +126,7 @@ const ComponentContentViewAddModal = ({
           />
         </FormGroup>
         <ActionGroup>
-          <Button aria-label="add_component" variant="primary" onClick={() => onSubmit()}>{__('Submit')}</Button>
+          <Button aria-label="add_component" variant="primary" type="submit">{__('Submit')}</Button>
           <Button variant="link" onClick={() => setIsOpen(false)}>{__('Cancel')}</Button>
         </ActionGroup>
       </Form>

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

@@ -0,0 +1,123 @@
+import React, { useState, useMemo } from 'react';
+import { last } from 'lodash';
+import PropTypes from 'prop-types';
+import { Modal, ModalVariant, FormSelect,
+  FormSelectOption, Checkbox, Form, FormGroup,
+  ActionGroup, Button, Card, CardTitle, CardBody } from '@patternfly/react-core';
+import { useDispatch } from 'react-redux';
+import { translate as __ } from 'foremanReact/common/I18n';
+import { addComponent } from '../ContentViewDetailActions';
+
+const ComponentContentViewBulkAddModal = ({ cvId, rowsToAdd, onClose }) => {
+  const dispatch = useDispatch();
+  const [versionSelectOptions, setVersionSelectOptions] = useState({});
+  const [selectedVersion, setSelectedVersion] = useState({});
+  const [selectedComponentLatest, setSelectedComponentLatest] = useState({});
+
+  useMemo(() => {
+    const versionSelect = {};
+    const versionSelectedOption = {};
+    const componentLatest = {};
+    rowsToAdd.forEach((row) => {
+      const { componentCvVersions: versions, componentCvName: name } = row;
+      const sortedVersions = [].concat(versions).sort((a, b) => (a.id > b.id ? 1 : -1));
+      versionSelect[name] = sortedVersions;
+      versionSelectedOption[name] = last(sortedVersions)?.id;
+      componentLatest[name] = sortedVersions && sortedVersions?.length === 0;
+    });
+    setVersionSelectOptions(versionSelect);
+    setSelectedVersion(versionSelectedOption);
+    setSelectedComponentLatest(componentLatest);
+  }, [rowsToAdd, setVersionSelectOptions, setSelectedVersion, setSelectedComponentLatest]);
+
+  const bulkAddParams = () => rowsToAdd.map((row) => {
+    const { componentCvId: id, componentCvName: name } = row;
+    if (selectedComponentLatest[name]) {
+      return { latest: true, content_view_id: id };
+    }
+    return { content_view_version_id: selectedVersion[name] };
+  });
+
+  const onSubmit = () => {
+    dispatch(addComponent({
+      compositeContentViewId: cvId,
+      components: bulkAddParams(),
+    }));
+    onClose();
+  };
+
+  return (
+    <Modal
+      title={__('Add component content views')}
+      variant={ModalVariant.large}
+      isOpen
+      description={__('Select available version of components to use')}
+      onClose={onClose}
+      appendTo={document.body}
+    >
+      <Form onSubmit={(e) => {
+        e.preventDefault();
+        onSubmit();
+      }}
+      >
+        {Object.keys(versionSelectOptions).sort().map(componentCvName => (
+          <Card key={componentCvName}>
+            <CardTitle aria-label={componentCvName}>{componentCvName}</CardTitle>
+            <CardBody>
+              <FormGroup label={__('Version')} isRequired fieldId="version">
+                <FormSelect
+                  value={selectedVersion[componentCvName]}
+                  isDisabled={versionSelectOptions[componentCvName].length <= 1}
+                  onChange={value =>
+                    setSelectedVersion({ ...selectedVersion, ...{ [componentCvName]: value } })}
+                  id={`horzontal-form-title-${componentCvName}`}
+                  name="horizontal-form-title"
+                  aria-label={`version-select-${componentCvName}`}
+                >
+                  {versionSelectOptions[componentCvName].map((version, index) => (
+                  // eslint-disable-next-line react/no-array-index-key
+                    <FormSelectOption aria-label={`${componentCvName}-${version.version}`} key={index} value={version.id} label={`${__('Version')} ${version.version}`} />
+                ))}
+                </FormSelect>
+              </FormGroup>
+              <FormGroup style={{ marginTop: '1em' }}>
+                <Checkbox
+                  style={{ marginTop: 0 }}
+                  id={`latest-${componentCvName}`}
+                  name="latest"
+                  label={__('Always update to latest version')}
+                  isChecked={selectedComponentLatest[componentCvName]}
+                  onChange={checked =>
+                    setSelectedComponentLatest({
+                      ...selectedComponentLatest,
+                      ...{ [componentCvName]: checked },
+                    })
+                  }
+                />
+              </FormGroup>
+            </CardBody>
+          </Card>
+        ))}
+        <ActionGroup>
+          <Button aria-label="add_components" variant="primary" type="submit">{__('Add')}</Button>
+          <Button variant="link" onClick={onClose}>{__('Cancel')}</Button>
+        </ActionGroup>
+      </Form>
+    </Modal>);
+};
+
+ComponentContentViewBulkAddModal.propTypes = {
+  cvId: PropTypes.oneOfType([
+    PropTypes.number,
+    PropTypes.string,
+  ]).isRequired,
+  rowsToAdd: PropTypes.arrayOf(PropTypes.shape({})),
+  onClose: PropTypes.func,
+};
+
+ComponentContentViewBulkAddModal.defaultProps = {
+  rowsToAdd: [],
+  onClose: null,
+};
+
+export default ComponentContentViewBulkAddModal;

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

@@ -6,7 +6,7 @@ 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>
+        <Label color="purple" href={`/lifecycle_environments/${env.id}`} isTruncated>{`${env.name}`}</Label>
       </FlexItem>
     ));
   return (

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

@@ -1,5 +1,4 @@
 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';
@@ -14,17 +13,19 @@ const ComponentVersion = ({ componentCV }) => {
     id: componentId, latest, content_view_version: cvVersion, content_view: cv,
   } = componentCV;
   const {
-    id,
+    id: cvId,
     latest_version: latestVersion,
   } = cv;
-  const { version } = cvVersion || {};
+  const { version, id: versionId } = cvVersion || {};
   const noVersionText = __('Not yet published');
   const latestDescription = __('Latest (automatically updates)');
   const manualVersionText = (latestVersion === version) ? __('Latest version') : __(`New version is available: Version ${latestVersion}`);
   if (componentId) {
     return (
       <>
-        <Link to={urlBuilder('labs/content_views', '', id)}>{version ? `Version ${version}` : noVersionText}</Link>
+        <a href={`${urlBuilder('content_views', '')}${cvId}#/versions/${versionId}`}>
+          {version ? `Version ${version}` : noVersionText}
+        </a>
         <TextContent>
           <Text component={TextVariants.small}>
             {latest ? latestDescription : manualVersionText}
@@ -34,7 +35,9 @@ const ComponentVersion = ({ componentCV }) => {
     );
   }
   return (
-    <Link to={urlBuilder('labs/content_views', '', id)}>{latestVersion ? `Version ${latestVersion}` : noVersionText}</Link>
+    <a href={`${urlBuilder('content_views', '')}${cvId}${latestVersion ? `#/versions/${versionId}` : ''}`}>
+      {latestVersion ? `Version ${latestVersion}` : noVersionText}
+    </a>
   );
 };