katello 4.3.0.rc1 → 4.3.0.rc4

data/webpack/scenes/ContentViews/Details/Versions/VersionDetails/ContentViewVersionDetailsHeader.js

@@ -1,4 +1,5 @@
-import React from 'react';
+import React, { useState, useEffect } from 'react';
+import { useDispatch } from 'react-redux';
 import PropTypes from 'prop-types';
 import {
   GridItem,
@@ -10,52 +11,153 @@ import {
   Label,
   Flex,
   FlexItem,
+  Dropdown,
+  DropdownItem,
+  DropdownToggle,
+  DropdownPosition,
 } from '@patternfly/react-core';
 import { translate as __ } from 'foremanReact/common/I18n';
 import EditableTextInput from '../../../../../components/EditableTextInput';
 import { hasPermission } from '../../../helpers';
+import ContentViewVersionPromote from '../../Promote/ContentViewVersionPromote';
+import getEnvironmentPaths from '../../../components/EnvironmentPaths/EnvironmentPathActions';
+import RemoveCVVersionWizard from '../Delete/RemoveCVVersionWizard';
 
 const ContentViewVersionDetailsHeader = ({
   versionDetails: {
-    version, description, environments,
+    version, description, environments, content_view_id: cvId, id,
   },
   onEdit,
   details: { permissions },
-}) => (
-  <>
-    <GridItem span={12}>
-      <TextContent>
-        <Text component={TextVariants.h2}>{__('Version ')}{version}</Text>
-      </TextContent>
-    </GridItem>
-    <GridItem className="content-view-header-content" span={12}>
-      <TextContent>
-        <TextList component={TextListVariants.dl}>
-          <EditableTextInput
-            key={description} // This fixes a render issue with the initial value
-            textArea
-            label={__('Description')}
-            attribute="description"
-            placeholder={__('No description provided')}
-            onEdit={onEdit}
-            disabled={!hasPermission(permissions, 'edit_content_views')}
-            value={description}
-          />
-        </TextList>
-      </TextContent>
-      <Flex>
-        {environments?.map(({ name, id }) =>
-          <FlexItem key={name}><Label isTruncated color="purple" href={`/lifecycle_environments/${id}`}>{name}</Label></FlexItem>)}
-      </Flex>
-    </GridItem>
-  </>
-);
+}) => {
+  const dispatch = useDispatch();
+  useEffect(
+    () => {
+      dispatch(getEnvironmentPaths());
+    },
+    [dispatch],
+  );
+  const [dropdownOpen, setDropdownOpen] = useState(false);
+  const [promoting, setPromoting] = useState(false);
+  const [removingFromEnv, setRemovingFromEnv] = useState(false);
+  const [currentStep, setCurrentStep] = useState(1);
+  const [deleteVersion, setDeleteVersion] = useState(false);
+  const dropDownItems = [
+    <DropdownItem
+      key="promote"
+      onClick={() => {
+        setPromoting(true);
+      }}
+    >
+      {__('Promote')}
+    </DropdownItem>,
+    <DropdownItem
+      key="remove"
+      onClick={() => {
+        setRemovingFromEnv(true);
+      }}
+    >
+      {__('Remove from environment')}
+    </DropdownItem>,
+    <DropdownItem
+      key="delete"
+      onClick={() => {
+        setCurrentStep(1);
+        setDeleteVersion(true);
+        setRemovingFromEnv(true);
+      }}
+    >
+      {__('Delete')}
+    </DropdownItem>,
+  ];
+
+  return (
+    <>
+      <GridItem span={10}>
+        <TextContent>
+          <Text component={TextVariants.h2}>{__('Version ')}{version}</Text>
+        </TextContent>
+      </GridItem>
+      <GridItem span={2} style={{ display: 'flex' }}>
+        <Dropdown
+          aria-label="version-action-dropdown"
+          position={DropdownPosition.right}
+          style={{ marginLeft: 'auto' }}
+          toggle={
+            <DropdownToggle
+              onToggle={setDropdownOpen}
+              id="toggle-id"
+            >
+              {__('Actions')}
+            </DropdownToggle>
+        }
+          isOpen={dropdownOpen}
+          dropdownItems={dropDownItems}
+        />
+      </GridItem>
+      <GridItem className="content-view-header-content" span={12}>
+        <TextContent>
+          <TextList component={TextListVariants.dl}>
+            <EditableTextInput
+              key={description} // This fixes a render issue with the initial value
+              textArea
+              label={__('Description')}
+              attribute="description"
+              placeholder={__('No description')}
+              onEdit={onEdit}
+              disabled={!hasPermission(permissions, 'edit_content_views')}
+              value={description}
+            />
+          </TextList>
+        </TextContent>
+        <Flex>
+          {environments?.map(({ name, id: envId }) =>
+            <FlexItem key={name}><Label isTruncated color="purple" href={`/lifecycle_environments/${envId}`}>{name}</Label></FlexItem>)}
+        </Flex>
+      </GridItem>
+      {promoting &&
+      <ContentViewVersionPromote
+        cvId={cvId}
+        versionIdToPromote={id}
+        versionNameToPromote={version}
+        versionEnvironments={environments}
+        setIsOpen={setPromoting}
+        detailsPage
+        aria-label="promote_content_view_modal"
+      />
+      }
+      {removingFromEnv &&
+      <RemoveCVVersionWizard
+        cvId={cvId}
+        versionIdToRemove={id}
+        versionNameToRemove={version}
+        versionEnvironments={environments}
+        show={removingFromEnv}
+        setIsOpen={setRemovingFromEnv}
+        currentStep={currentStep}
+        setCurrentStep={setCurrentStep}
+        deleteWizard={deleteVersion}
+        detailsPage
+        aria-label="remove_content_view_version_modal"
+      />
+      }
+    </>
+  );
+};
 
 ContentViewVersionDetailsHeader.propTypes = {
   versionDetails: PropTypes.shape({
     version: PropTypes.string,
-    environments: PropTypes.arrayOf(PropTypes.shape({ })),
+    environments: PropTypes.arrayOf(PropTypes.shape({})),
     description: PropTypes.string,
+    content_view_id: PropTypes.oneOfType([
+      PropTypes.string,
+      PropTypes.number,
+    ]),
+    id: PropTypes.oneOfType([
+      PropTypes.string,
+      PropTypes.number,
+    ]),
   }).isRequired,
   onEdit: PropTypes.func.isRequired,
   details: PropTypes.shape({

data/webpack/scenes/ContentViews/Details/Versions/VersionDetails/ContentViewVersionRepositoryCell.js

@@ -8,6 +8,7 @@ import {
   GridItem,
 } from '@patternfly/react-core';
 import InactiveText from '../../../components/InactiveText';
+import ContentConfig from '../../../../Content/ContentConfig';
 
 const ContentViewVersionRepositoryCell = ({
   data: {
@@ -49,9 +50,6 @@ const ContentViewVersionRepositoryCell = ({
       name: __('Module streams'),
       url: `products/${id}/repositories/${libraryInstanceId}/content/module_streams`,
     },
-    ostree_branch: {
-      name: __('OStree branches'),
-    },
     package: {
       name: __('Packages'),
       url: `products/${id}/repositories/${libraryInstanceId}/content/packages`,
@@ -69,6 +67,13 @@ const ContentViewVersionRepositoryCell = ({
     },
   };
 
+  ContentConfig().forEach((type) => {
+    CONTENT_COUNTS[type.names.singularLabel] = {
+      name: type.names.pluralLowercase,
+      url: `products/${id}/repositories/${libraryInstanceId}/content/${type.names.pluralLabel}`,
+    };
+  });
+
   const getContentSpan = (num) => {
     switch (true) {
       case num < 4:

data/webpack/scenes/ContentViews/Details/Versions/VersionDetails/__tests__/ContentViewVersionComponent.fixtures.json

@@ -242,7 +242,6 @@
             "srpm_count": 0,
             "module_stream_count": 14,
             "package_count": 22,
-            "ostree_branch_count": null,
             "component_view_count": 0,
             "ansible_collection_repository_count": 1,
             "deb_repository_count": 0,
@@ -445,7 +444,6 @@
             "srpm_count": 0,
             "module_stream_count": 0,
             "package_count": 0,
-            "ostree_branch_count": null,
             "component_view_count": 0,
             "ansible_collection_repository_count": 0,
             "deb_repository_count": 1,
@@ -732,7 +730,6 @@
             "srpm_count": 0,
             "module_stream_count": 0,
             "package_count": 0,
-            "ostree_branch_count": null,
             "component_view_count": 0,
             "ansible_collection_repository_count": 0,
             "deb_repository_count": 0,
@@ -750,4 +747,4 @@
             }
         }
     ]
-}
+}

data/webpack/scenes/ContentViews/Details/Versions/VersionDetails/__tests__/ContentViewVersionDetails.fixtures.json

@@ -138,7 +138,6 @@
     "srpm_count": 0,
     "module_stream_count": 0,
     "package_count": 0,
-    "ostree_branch_count": null,
     "component_view_count": 0,
     "ansible_collection_repository_count": 0,
     "deb_repository_count": 0,
@@ -155,4 +154,4 @@
     "permissions": {
         "deletable": true
     }
-}
+}

data/webpack/scenes/ContentViews/Details/Versions/VersionDetails/__tests__/ContentViewVersionDetails.test.js

@@ -2,7 +2,7 @@ import React from 'react';
 import { renderWithRedux, patientlyWaitFor } from 'react-testing-lib-wrapper';
 import { Route } from 'react-router-dom';
 import { head, last } from 'lodash';
-import { nockInstance, assertNockRequest, mockSetting, mockAutocomplete } from '../../../../../../test-utils/nockWrapper';
+import nock, { nockInstance, assertNockRequest, mockSetting, mockAutocomplete } from '../../../../../../test-utils/nockWrapper';
 import api from '../../../../../../services/api';
 import { cvVersionDetailsKey } from '../../../../ContentViewsConstants';
 import ContentViewVersionDetails from '../ContentViewVersionDetails';
@@ -20,12 +20,15 @@ import ContentViewVersionModuleStreamsData from './ContentViewVersionModuleStrea
 import ContentViewVersionDebPackagesData from './ContentViewVersionDebPackages.fixtures.json';
 import ContentViewVersionAnsibleCollectionsData from './ContentViewVersionAnsibleCollections.fixtures.json';
 import ContentViewVersionDockerTagsData from './ContentViewVersionDockerTags.fixtures.json';
+import environmentPathsData from '../../Delete/__tests__/versionRemoveEnvPaths.fixtures';
 
 // This changes the api count value so that only the specified tab will show.
 const getTabSpecificData = key => ({
   ...ContentViewVersionDetailsData,
   [key]: ContentViewVersionDetailsCounts[key],
 });
+let envScope;
+const environmentPathsPath = api.getApiUrl('/organizations/1/environments/paths');
 
 const withCVRoute = component => <Route path="/versions/:versionId([0-9]+)">{component}</Route>;
 
@@ -39,11 +42,23 @@ const renderOptions = {
   },
 };
 
+beforeEach(() => {
+  envScope = nockInstance
+    .get(environmentPathsPath)
+    .query(true)
+    .reply(200, environmentPathsData);
+});
+
+afterEach(() => {
+  assertNockRequest(envScope);
+  nock.cleanAll();
+});
 // This is written separately, as the autocomplete/search scopes are not needed.
 test('Can show versions details - Components Tab', async (done) => {
   const { version } = ContentViewVersionDetailsData;
   const scope = nockInstance
     .get(cvVersions)
+    .times(2)
     .query(true)
     .reply(200, getTabSpecificData('component_view_count'));
 
@@ -72,6 +87,7 @@ test('Can show versions details - Components Tab', async (done) => {
       .content_view.name)).toBeTruthy();
   });
 
+  assertNockRequest(scope);
   assertNockRequest(scope);
   assertNockRequest(componentScope, done);
 });
@@ -188,6 +204,7 @@ testConfig.forEach(({
 
     const scope = nockInstance
       .get(cvVersions)
+      .times(2)
       .query(true)
       .reply(200, getTabSpecificData(countKey));
 
@@ -219,6 +236,7 @@ testConfig.forEach(({
     assertNockRequest(autocompleteScope);
     assertNockRequest(searchDelayScope);
     assertNockRequest(autoSearchScope);
+    assertNockRequest(scope);
     assertNockRequest(tabScope);
     assertNockRequest(scope, done);
   }));
@@ -239,6 +257,7 @@ test('Can change repository selector', async (done) => {
   const scope = nockInstance
     .get(cvVersions)
     .query(true)
+    .times(2)
     .reply(200, {
       ...getTabSpecificData(countKey),
       repositories: ContentViewVersionDetailsCounts.repositories,
@@ -284,6 +303,7 @@ test('Can change repository selector', async (done) => {
   assertNockRequest(autocompleteScope);
   assertNockRequest(searchDelayScope);
   assertNockRequest(autoSearchScope);
+  assertNockRequest(scope);
   assertNockRequest(tabScope);
   assertNockRequest(scope, done);
 });

data/webpack/scenes/ContentViews/Details/Versions/VersionDetails/__tests__/ContentViewVersionDetailsCounts.fixtures.json

@@ -12,7 +12,6 @@
         "srpm_count": 0,
         "module_stream_count": 14,
         "package_count": 22,
-        "ostree_branch_count": null,
         "component_view_count": 3,
         "ansible_collection_repository_count": 1,
         "deb_repository_count": 1,
@@ -70,4 +69,4 @@
                 "library_instance_id": 22
             }
         ]
-    }
+    }

data/webpack/scenes/ContentViews/Details/Versions/VersionDetails/__tests__/ContentViewVersionDetailsEmpty.test.js

@@ -2,16 +2,20 @@ import React from 'react';
 import { renderWithRedux, patientlyWaitFor } from 'react-testing-lib-wrapper';
 import { Route } from 'react-router-dom';
 
-import { nockInstance, assertNockRequest } from '../../../../../../test-utils/nockWrapper';
+import nock, { nockInstance, assertNockRequest } from '../../../../../../test-utils/nockWrapper';
 import api from '../../../../../../services/api';
 import { cvVersionDetailsKey } from '../../../../ContentViewsConstants';
 import ContentViewVersionDetails from '../ContentViewVersionDetails';
 import ContentViewVersionDetailsEmptyData from './ContentViewVersionDetails.fixtures.json';
 import cvDetailData from '../../../../__tests__/mockDetails.fixtures.json';
+import environmentPathsData from '../../Delete/__tests__/versionRemoveEnvPaths.fixtures';
 
 const withCVRoute = component =>
   <Route path="/versions/:versionId([0-9]+)">{component}</Route>;
 const cvVersions = api.getApiUrl('/content_view_versions/73');
+let envScope;
+let versionScope;
+const environmentPathsPath = api.getApiUrl('/organizations/1/environments/paths');
 
 const renderOptions = {
   apiNamespace: cvVersionDetailsKey(3, 73),
@@ -21,6 +25,23 @@ const renderOptions = {
   },
 };
 
+beforeEach(() => {
+  envScope = nockInstance
+    .get(environmentPathsPath)
+    .query(true)
+    .reply(200, environmentPathsData);
+  versionScope = nockInstance
+    .get(cvVersions)
+    .query(true)
+    .reply(200, ContentViewVersionDetailsEmptyData);
+});
+
+afterEach(() => {
+  assertNockRequest(envScope);
+  assertNockRequest(versionScope);
+  nock.cleanAll();
+});
+
 test('Can show versions detail header', async (done) => {
   const { version } = ContentViewVersionDetailsEmptyData;
   const scope = nockInstance

data/webpack/scenes/ContentViews/Details/Versions/VersionDetails/__tests__/ContentViewVersionRepositories.fixtures.json

@@ -52,7 +52,6 @@
             },
             "content_label": "Default_Organization_Nemero_Uno_Producto_Ansible_Collection_uno",
             "content_counts": {
-                "ostree_branch": 0,
                 "docker_manifest": 0,
                 "docker_manifest_list": 0,
                 "docker_tag": 0,
@@ -110,7 +109,6 @@
             },
             "content_label": "rhel-7-server-ansible-tower-3.3-rpms",
             "content_counts": {
-                "ostree_branch": 0,
                 "docker_manifest": 0,
                 "docker_manifest_list": 0,
                 "docker_tag": 0,
@@ -168,7 +166,6 @@
             },
             "content_label": "rhel-7-server-ansible-tower-3.4-rpms",
             "content_counts": {
-                "ostree_branch": 0,
                 "docker_manifest": 0,
                 "docker_manifest_list": 0,
                 "docker_tag": 0,
@@ -226,7 +223,6 @@
             },
             "content_label": "rhel-7-server-ansible-tower-3.5-rpms",
             "content_counts": {
-                "ostree_branch": 0,
                 "docker_manifest": 0,
                 "docker_manifest_list": 0,
                 "docker_tag": 0,
@@ -284,7 +280,6 @@
             },
             "content_label": "rhel-7-server-ansible-tower-3.6-rpms",
             "content_counts": {
-                "ostree_branch": 0,
                 "docker_manifest": 0,
                 "docker_manifest_list": 0,
                 "docker_tag": 0,
@@ -342,7 +337,6 @@
             },
             "content_label": "rhel-7-server-ansible-tower-3.8-textonly-rpms",
             "content_counts": {
-                "ostree_branch": 0,
                 "docker_manifest": 0,
                 "docker_manifest_list": 0,
                 "docker_tag": 0,
@@ -400,7 +394,6 @@
             },
             "content_label": "Default_Organization_Nemero_Uno_Producto_Deb_distro_Uno",
             "content_counts": {
-                "ostree_branch": 0,
                 "docker_manifest": 0,
                 "docker_manifest_list": 0,
                 "docker_tag": 0,
@@ -458,7 +451,6 @@
             },
             "content_label": "Default_Organization_Nemero_Uno_Producto_Docker_Repo_Dos",
             "content_counts": {
-                "ostree_branch": 0,
                 "docker_manifest": 407,
                 "docker_manifest_list": 76,
                 "docker_tag": 162,
@@ -516,7 +508,6 @@
             },
             "content_label": "Default_Organization_Nemero_Uno_Producto_Docker_Repo_Uno",
             "content_counts": {
-                "ostree_branch": 0,
                 "docker_manifest": 1,
                 "docker_manifest_list": 0,
                 "docker_tag": 1,
@@ -574,7 +565,6 @@
             },
             "content_label": "Default_Organization_Nemero_Uno_Producto_File_Repo_Uno",
             "content_counts": {
-                "ostree_branch": 0,
                 "docker_manifest": 0,
                 "docker_manifest_list": 0,
                 "docker_tag": 0,
@@ -632,7 +622,6 @@
             },
             "content_label": "a-mq-clients-1-for-rhel-5-server-rpms",
             "content_counts": {
-                "ostree_branch": 0,
                 "docker_manifest": 0,
                 "docker_manifest_list": 0,
                 "docker_tag": 0,
@@ -690,7 +679,6 @@
             },
             "content_label": "a-mq-clients-1-for-rhel-6-server-rpms",
             "content_counts": {
-                "ostree_branch": 0,
                 "docker_manifest": 0,
                 "docker_manifest_list": 0,
                 "docker_tag": 0,
@@ -748,7 +736,6 @@
             },
             "content_label": "a-mq-clients-1-for-rhel-6-server-rpms",
             "content_counts": {
-                "ostree_branch": 0,
                 "docker_manifest": 0,
                 "docker_manifest_list": 0,
                 "docker_tag": 0,
@@ -806,7 +793,6 @@
             },
             "content_label": "a-mq-clients-1-for-rhel-7-server-rpms",
             "content_counts": {
-                "ostree_branch": 0,
                 "docker_manifest": 0,
                 "docker_manifest_list": 0,
                 "docker_tag": 0,
@@ -864,7 +850,6 @@
             },
             "content_label": "Default_Organization_Nemero_Uno_Producto_Module_Stream_Uno",
             "content_counts": {
-                "ostree_branch": 0,
                 "docker_manifest": 0,
                 "docker_manifest_list": 0,
                 "docker_tag": 0,
@@ -922,7 +907,6 @@
             },
             "content_label": "Default_Organization_Nemero_Uno_Producto_Zoo_Repo_Dos",
             "content_counts": {
-                "ostree_branch": 0,
                 "docker_manifest": 0,
                 "docker_manifest_list": 0,
                 "docker_tag": 0,
@@ -980,7 +964,6 @@
             },
             "content_label": "Default_Organization_Nemero_Uno_Producto_Zoo_Repo_Uno",
             "content_counts": {
-                "ostree_branch": 0,
                 "docker_manifest": 0,
                 "docker_manifest_list": 0,
                 "docker_tag": 0,
@@ -997,4 +980,4 @@
             "last_sync_words": null
         }
     ]
-}
+}

data/webpack/scenes/ContentViews/Details/Versions/__tests__/contentViewVersions.fixtures.json

@@ -288,7 +288,8 @@
       "srpm_count": 0,
       "module_stream_count": 0,
       "package_count": 8,
-      "ostree_branch_count": 0,
+      "ostree_ref_count": 2,
+      "python_package_count": 80,
       "errata_counts": {
         "security": 5,
         "bugfix": 3,
@@ -442,7 +443,6 @@
       "srpm_count": 0,
       "module_stream_count": 0,
       "package_count": 8,
-      "ostree_branch_count": 0,
       "errata_counts": {
         "security": null,
         "bugfix": 0,
@@ -582,7 +582,6 @@
       "srpm_count": 0,
       "module_stream_count": 0,
       "package_count": 8,
-      "ostree_branch_count": 0,
       "errata_counts": {
         "security": null,
         "bugfix": 0,
@@ -713,7 +712,8 @@
       "srpm_count": 0,
       "module_stream_count": 0,
       "package_count": 0,
-      "ostree_branch_count": 0,
+      "ostree_ref_count": 0,
+      "python_package_count": 0,
       "errata_counts": {
         "security": null,
         "bugfix": 0,
@@ -725,4 +725,4 @@
       }
     }
   ]
-}
+}

data/webpack/scenes/ContentViews/Details/Versions/__tests__/contentViewVersions.test.js

@@ -152,6 +152,8 @@ test('Can show additional content and link to list page', async () => {
       .toHaveAttribute('href', '/content_views/5#/versions/11/files/');
     expect(getByText('1 Deb packages').closest('a'))
       .toHaveAttribute('href', '/versions/11/debPackages');
+    expect(getByText('80 Python packages')).toBeInTheDocument();
+    expect(getByText('2 OSTree refs')).toBeInTheDocument();
   });
 
   assertNockRequest(autocompleteScope);

data/webpack/scenes/ContentViews/Details/Versions/__tests__/contentViewVersionsWithTask.fixtures.json

@@ -550,7 +550,6 @@
       "srpm_count": 0,
       "module_stream_count": 0,
       "package_count": 0,
-      "ostree_branch_count": null,
       "errata_counts": {
         "security": null,
         "bugfix": 0,
@@ -698,7 +697,6 @@
       "srpm_count": 0,
       "module_stream_count": 0,
       "package_count": 8,
-      "ostree_branch_count": null,
       "errata_counts": {
         "security": null,
         "bugfix": 0,
@@ -710,4 +708,4 @@
       }
     }
   ]
-}
+}

data/webpack/scenes/ContentViews/Details/contentViewInfo.scss

@@ -1,7 +1,3 @@
-.foreman-spaced-icon {
-  margin: 0px 10px;
-}
-
 // Keeps spacing in the list even despite contents
 .foreman-spaced-list {
   min-height: 40px;