katello 4.2.1 → 4.3.0.rc1

data/lib/katello/repository_types/python.rb

@@ -5,36 +5,50 @@ Katello::RepositoryTypeManager.register('python') do
   pulp3_service_class Katello::Pulp3::Repository::Generic
   pulp3_api_class Katello::Pulp3::Api::Generic
   pulp3_plugin 'python'
-  partial_repo_path '' #TODO: add partial repo path
 
-  repositories_api_class PulpPythonClient::RepositoriesPythonApi
+  client_module_class PulpPythonClient
   api_class PulpPythonClient::ApiClient
   configuration_class PulpPythonClient::Configuration
+  remote_class PulpPythonClient::PythonPythonRemote
   remotes_api_class PulpPythonClient::RemotesPythonApi
-  distributions_api_class PulpPythonClient::DistributionsPypiApi
+  repositories_api_class PulpPythonClient::RepositoriesPythonApi
   repository_versions_api_class PulpPythonClient::RepositoriesPythonVersionsApi
-  remote_class PulpPythonClient::PythonPythonRemote
-  repo_sync_url_class PulpPythonClient::RepositorySyncURL
-  client_module_class PulpPythonClient
+  distributions_api_class PulpPythonClient::DistributionsPypiApi
   distribution_class PulpPythonClient::PythonPythonDistribution
   publication_class PulpPythonClient::PythonPythonPublication
   publications_api_class PulpPythonClient::PublicationsPypiApi
+  repo_sync_url_class PulpPythonClient::RepositorySyncURL
+
+  generic_remote_option :includes, title: N_("Includes"), type: Array, input_type: "textarea", delimiter: "\\n",
+                        description: N_("Python packages to include from the upstream URL, names separated by newline. You may also specify versions, for example: django~=2.0. Leave empty to include every package.")
+
+  generic_remote_option :excludes, title: N_("Excludes"), type: Array, input_type: "textarea", delimiter: "\\n",
+                        description: N_("Python packages to exclude from the upstream URL, names separated by newline. You may also specify versions, for example: django~=2.0.")
 
-  generic_remote_option :includes, type: Array, description: "A list containing project specifiers for Python packages to include."
-  generic_remote_option :excludes, type: Array, description: "A list containing project specifiers for Python packages to exclude."
-  generic_remote_option :package_types, type: Array, description: "A list of package types to sync for Python content. Leave blank to get every package type."
+  generic_remote_option :package_types, title: N_("Package Types"), type: Array, input_type: "text", delimiter: ",",
+                        description: N_("Package types to sync for Python content, separated by comma. Leave empty to get every package type. Package types are: bdist_dmg, bdist_dumb, bdist_egg, bdist_msi, bdist_rpm, bdist_wheel, bdist_wininst, sdist.")
 
-  model_name lambda { |pulp_unit| pulp_unit["name"] }
-  model_version lambda { |pulp_unit| pulp_unit["version"] }
+  url_description N_("URL of a PyPI content source such as https://pypi.org.")
 
   generic_content_type 'python_package',
+                       pluralized_name: "Python Packages",
                        model_class: Katello::GenericContentUnit,
                        pulp3_api: PulpPythonClient::ContentPackagesApi,
                        pulp3_model: PulpPythonClient::PythonPythonPackageContent,
                        pulp3_service_class: Katello::Pulp3::GenericContentUnit,
+                       model_name: lambda { |pulp_unit| pulp_unit["name"] },
+                       model_version: lambda { |pulp_unit| pulp_unit["version"] },
+                       model_filename: lambda { |pulp_unit| pulp_unit["filename"] },
+                       model_additional_metadata: lambda { |pulp_unit|
+                         {
+                           "package_type": pulp_unit["packagetype"],
+                           "sha256": pulp_unit["sha256"]
+                         }
+                       },
                        removable: true,
                        uploadable: true,
                        duplicates_allowed: false,
-                       filename_key: :filename
+                       filename_key: :filename,
+                       generic_browser: true
   default_managed_content_type :python_package
 end

data/lib/katello/repository_types/yum.rb

@@ -5,11 +5,25 @@ Katello::RepositoryTypeManager.register(::Katello::Repository::YUM_TYPE) do
   pulp3_plugin 'rpm'
   prevent_unneeded_metadata_publish
 
+  client_module_class PulpRpmClient
+  api_class PulpRpmClient::ApiClient
+  remote_class PulpRpmClient::RpmRpmRemote
+  remotes_api_class PulpRpmClient::RemotesRpmApi
+  repository_versions_api_class PulpRpmClient::RepositoriesRpmVersionsApi
+  repositories_api_class PulpRpmClient::RepositoriesRpmApi
+  configuration_class PulpRpmClient::Configuration
+  distributions_api_class PulpRpmClient::DistributionsRpmApi
+  distribution_class PulpRpmClient::RpmRpmDistribution
+  publication_class PulpRpmClient::RpmRpmPublication
+  publications_api_class PulpRpmClient::PublicationsRpmApi
+  repo_sync_url_class PulpRpmClient::RpmRepositorySyncURL
+
   default_managed_content_type Katello::Rpm::CONTENT_TYPE
   content_type Katello::Rpm,
     :priority => 1,
     :pulp2_service_class => ::Katello::Pulp::Rpm,
     :pulp3_service_class => ::Katello::Pulp3::Rpm,
+    :primary_content => true,
     :removable => true,
     :uploadable => true
   content_type Katello::ModuleStream,
@@ -18,7 +32,8 @@ Katello::RepositoryTypeManager.register(::Katello::Repository::YUM_TYPE) do
     :pulp3_service_class => ::Katello::Pulp3::ModuleStream
   content_type Katello::Erratum, :priority => 3,
     :pulp2_service_class => ::Katello::Pulp::Erratum,
-    :pulp3_service_class => ::Katello::Pulp3::Erratum
+    :pulp3_service_class => ::Katello::Pulp3::Erratum,
+    :primary_content => true
   content_type Katello::PackageGroup,
     :pulp2_service_class => ::Katello::Pulp::PackageGroup,
     :pulp3_service_class => ::Katello::Pulp3::PackageGroup

data/lib/katello/tasks/repository.rake

@@ -69,12 +69,12 @@ namespace :katello do
     end
   end
 
-  desc "Change the download policy of all repos. Specify DOWNLOAD_POLICY=policy. Options are #{::Runcible::Models::YumImporter::DOWNLOAD_POLICIES.join(', ')}."
+  desc "Change the download policy of all repos. Specify DOWNLOAD_POLICY=policy. Options are immediate or on_demand."
   task :change_download_policy => ["environment", "check_ping"] do
     policy = ENV['DOWNLOAD_POLICY']
-    unless ::Runcible::Models::YumImporter::DOWNLOAD_POLICIES.include?(policy)
+    unless ::Katello::RootRepository::DOWNLOAD_POLICIES.include?(policy)
       puts "Invalid download policy specified: '#{policy}'. "
-      puts "Options are #{::Runcible::Models::YumImporter::DOWNLOAD_POLICIES.to_sentence}."
+      puts "Options are immediate or on_demand."
       next
     end
 
@@ -92,15 +92,6 @@ namespace :katello do
     end
   end
 
-  desc "Refresh pulp sync schedules"
-  task :refresh_sync_schedule => ["environment", "check_ping"] do
-    User.current = User.anonymous_api_admin
-    Katello::Product.all.each do |product|
-      puts "Updating #{product}"
-      ForemanTasks.sync_task(::Actions::Pulp::Repos::Update, product)
-    end
-  end
-
   def lookup_repositories
     lifecycle_envs = Katello::KTEnvironment.where(:name => ENV['LIFECYCLE_ENVIRONMENT']) if ENV['LIFECYCLE_ENVIRONMENT']
     content_views = Katello::ContentView.where(:name => ENV['CONTENT_VIEW']) if ENV['CONTENT_VIEW']

data/lib/katello/tasks/reset.rake

@@ -15,9 +15,9 @@ namespace :katello do
       system("sudo runuser - postgres -c 'createdb pulpcore'")
 
       Dir.chdir("/tmp") do
-        fail "\e[31mCannot migrate Pulp3 database\e[0m\n\n" unless system("sudo -u pulp PULP_SETTINGS='/etc/pulp/settings.py' DJANGO_SETTINGS_MODULE='pulpcore.app.settings' pulpcore-manager migrate --no-input")
+        fail "\e[31mCannot migrate Pulp3 database\e[0m\n\n" unless system("sudo -u pulp PULP_SETTINGS='/etc/pulp/settings.py' DJANGO_SETTINGS_MODULE='pulpcore.app.settings' python3-django-admin migrate --no-input")
         puts "\e[33mRecreating Admin User\e[0m\n\n"
-        system("sudo -u pulp PULP_SETTINGS='/etc/pulp/settings.py' DJANGO_SETTINGS_MODULE='pulpcore.app.settings' pulpcore-manager reset-admin-password --password password")
+        system("sudo -u pulp PULP_SETTINGS='/etc/pulp/settings.py' DJANGO_SETTINGS_MODULE='pulpcore.app.settings' python3-django-admin reset-admin-password --password password")
       end
 
       SERVICES.each { |s| system(service_start.gsub("%s", s)) }
@@ -38,7 +38,7 @@ namespace :katello do
     end
   end
 
-  task :reset_default_smart_proxy => :environment do
+  task :reset_default_smart_proxy do
     User.current = User.anonymous_admin
     hostname = Socket.gethostname.chomp
     SmartProxy.where(name: hostname, url: "https://#{hostname}:9090").first_or_create!
@@ -54,8 +54,7 @@ namespace :katello do
     ENV['SEED_ADMIN_PASSWORD'] ||= 'changeme'
     ENV['SEED_ORGANIZATION'] ||= 'Default Organization'
     ENV['SEED_LOCATION'] ||= 'Default Location'
-    # Rake::Task['katello:reset_backends'].invoke
-    ENV['RAILS_ENV'] = 'development'
+    Rake::Task['katello:reset_backends'].invoke
     Rake::Task['db:drop'].invoke
     Rake::Task['db:create'].invoke
 

data/lib/katello/version.rb

@@ -1,3 +1,3 @@
 module Katello
-  VERSION = "4.2.1".freeze
+  VERSION = "4.3.0.rc1".freeze
 end

data/package.json

@@ -23,13 +23,14 @@
     "url": "https://projects.theforeman.org/projects/katello/issues"
   },
   "devDependencies": {
+    "@babel/eslint-parser": "^7.15.0",
+    "@babel/eslint-plugin": "^7.14.5",
     "@sheerun/mutationobserver-shim": "^0.3.3",
     "@testing-library/jest-dom": "^5.3.0",
     "@testing-library/react": "^10.0.2",
     "@theforeman/builder": ">= 6.0.0",
     "@theforeman/find-foreman": "^4.8.0",
     "axios-mock-adapter": "^1.10.0",
-    "babel-eslint": "^10.0.3",
     "eslint": "^6.2.2",
     "eslint-config-airbnb": "^16.0.0",
     "eslint-plugin-babel": "^5.1.0",
@@ -46,7 +47,7 @@
   "_comment": "We don't include @theforeman/vendor because it's assumed to be present in Foreman",
   "dependencies": {
     "angular": "1.8.2",
-    "bootstrap-select": "1.13.6",
+    "bootstrap-select": "1.13.18",
     "downshift": "^5.4.2",
     "ngreact": "^0.5.0",
     "query-string": "^6.1.0",

data/webpack/__mocks__/react-intl/index.js

@@ -1,3 +1,7 @@
+/* eslint-disable react/prop-types */
+import React from 'react';
+
 export const addLocaleData = jest.fn();
 export const FormattedRelative = jest.fn();
 export const intlShape = jest.fn();
+export const FormattedMessage = ({ defaultMessage }) => <>{defaultMessage}</>;

data/webpack/components/ActionableDetail.js

@@ -13,9 +13,20 @@ import EditableSwitch from './EditableSwitch';
 
 // To be used within a TextList
 const ActionableDetail = ({
-  attribute, label, value, textArea, boolean, tooltip, onEdit,
+  attribute,
+  label,
+  value,
+  textArea,
+  boolean,
+  tooltip,
+  onEdit,
+  currentAttribute,
+  setCurrentAttribute,
+  disabled,
 }) => {
-  const displayProps = { attribute, value, onEdit };
+  const displayProps = {
+    attribute, value, onEdit, disabled,
+  };
 
   return (
     <React.Fragment key={label}>
@@ -35,7 +46,10 @@ const ActionableDetail = ({
       <TextListItem component={TextListItemVariants.dd} className="foreman-spaced-list">
         {boolean ?
           <EditableSwitch {...displayProps} /> :
-          <EditableTextInput {...{ ...displayProps, textArea, onEdit }} />}
+          <EditableTextInput {...{
+            ...displayProps, textArea, onEdit, currentAttribute, setCurrentAttribute,
+          }}
+          />}
       </TextListItem>
     </React.Fragment>
   );
@@ -52,6 +66,9 @@ ActionableDetail.propTypes = {
   textArea: PropTypes.bool,
   boolean: PropTypes.bool,
   tooltip: PropTypes.string,
+  currentAttribute: PropTypes.string,
+  setCurrentAttribute: PropTypes.func,
+  disabled: PropTypes.bool,
 };
 
 ActionableDetail.defaultProps = {
@@ -59,6 +76,9 @@ ActionableDetail.defaultProps = {
   boolean: false,
   tooltip: null,
   value: null,
+  currentAttribute: undefined,
+  setCurrentAttribute: undefined,
+  disabled: false,
 };
 
 export default ActionableDetail;

data/webpack/components/AddedStatusLabel.js

@@ -1,8 +1,8 @@
 import React from 'react';
+import PropTypes from 'prop-types';
 import { Label } from '@patternfly/react-core';
 import { CheckCircleIcon } from '@patternfly/react-icons';
 import { translate as __ } from 'foremanReact/common/I18n';
-import PropTypes from 'prop-types';
 
 const AddedStatusLabel = ({ added }) => {
   if (added) {

data/webpack/components/Bookmark/AddBookmarkModal.js

@@ -0,0 +1,96 @@
+import React, { useState } from 'react';
+import PropTypes from 'prop-types';
+import {
+  Modal, ModalVariant, TextInput,
+  Checkbox, Form, FormGroup,
+  ActionGroup, Button, Tooltip,
+  TooltipPosition,
+} from '@patternfly/react-core';
+import { OutlinedQuestionCircleIcon } from '@patternfly/react-icons';
+import { useDispatch } from 'react-redux';
+import { translate as __ } from 'foremanReact/common/I18n';
+import { createBookmark, getBookmarks } from './BookmarkActions';
+
+const AddBookmarkModal = ({ selectedItem, onClose, controller }) => {
+  const dispatch = useDispatch();
+  const [name, setName] = useState(selectedItem);
+  const [query, setQuery] = useState(selectedItem);
+  const [isPublic, setIsPublic] = useState(false);
+  const submitDisabled = !name || !query;
+
+  const onSubmit = (e) => {
+    e.preventDefault();
+    dispatch(createBookmark({
+      controller, name, query, public: isPublic,
+    }, () =>
+      dispatch(getBookmarks(controller))));
+    onClose();
+  };
+
+  return (
+    <Modal
+      title={__('Add Bookmark')}
+      variant={ModalVariant.small}
+      isOpen
+      onClose={onClose}
+      appendTo={document.body}
+    >
+      <Form onSubmit={onSubmit}>
+        <FormGroup label={__('Name')} isRequired fieldId="name">
+          <TextInput
+            isRequired
+            type="text"
+            id="name"
+            aria-label="input_name"
+            name="name"
+            value={name}
+            onChange={setName}
+          />
+        </FormGroup>
+        <FormGroup label={__('Search Query')} isRequired fieldId="query">
+          <TextInput
+            isRequired
+            type="text"
+            id="query"
+            aria-label="input_query"
+            name="query"
+            value={query}
+            onChange={setQuery}
+          />
+        </FormGroup>
+        <FormGroup fieldId="public" isInline>
+          <Checkbox
+            id="public"
+            name="public"
+            label={__('Public')}
+            isChecked={isPublic}
+            onChange={setIsPublic}
+          />
+          <Tooltip
+            position={TooltipPosition.top}
+            content={
+              __('Bookmarks marked as public are available to all users')
+            }
+          >
+            <OutlinedQuestionCircleIcon />
+          </Tooltip>
+        </FormGroup>
+        <ActionGroup>
+          <Button variant="primary" type="submit" isDisabled={submitDisabled}>{__('Save')}</Button>
+          <Button variant="link" onClick={onClose}>{__('Cancel')}</Button>
+        </ActionGroup>
+      </Form>
+    </Modal>);
+};
+
+AddBookmarkModal.propTypes = {
+  controller: PropTypes.string.isRequired,
+  onClose: PropTypes.func.isRequired,
+  selectedItem: PropTypes.string,
+};
+
+AddBookmarkModal.defaultProps = {
+  selectedItem: '',
+};
+
+export default AddBookmarkModal;

data/webpack/components/Bookmark/Bookmark.scss

@@ -0,0 +1,28 @@
+  .pf-c-dropdown__toggle-text {
+    padding: 0 5px;
+
+    .fa-bookmark {
+      font-size: 14px;
+    }
+  }
+
+  .pf-c-dropdown__toggle-icon {
+    margin: 0;
+  }
+
+
+  .pf-m-inline {
+    align-content: center;
+
+    .pf-c-check {
+      input {
+        margin-top: 2px;
+      }
+
+      margin-right: 10px !important;
+    }
+
+    svg {
+      margin-top: 2px;
+    }
+  }

data/webpack/components/Bookmark/BookmarkActions.js

@@ -0,0 +1,24 @@
+import { API_OPERATIONS, get, post } from 'foremanReact/redux/API';
+import { translate as __ } from 'foremanReact/common/I18n';
+import { getBookmarkErrorMsgs } from '../../utils/helpers';
+import { bookmarkKey, CREATE_BOOKMARK } from './BookmarkConstants';
+
+
+export const getBookmarks = key =>
+  get({
+    type: API_OPERATIONS.GET,
+    key: bookmarkKey(key),
+    url: '/api/v2/bookmarks',
+    params: { search: `controller=${key}` },
+  });
+
+export const createBookmark = (params, handleSuccess) =>
+  post({
+    type: API_OPERATIONS.POST,
+    key: CREATE_BOOKMARK,
+    url: '/api/v2/bookmarks',
+    params,
+    handleSuccess,
+    errorToast: error =>
+      __(`Something went wrong while adding a bookmark: ${getBookmarkErrorMsgs(error.response)}`),
+  });

data/webpack/components/Bookmark/BookmarkConstants.js

@@ -0,0 +1,3 @@
+export const bookmarkKey = key => `BOOKMARK_${key}`;
+
+export const CREATE_BOOKMARK = 'CREATE_BOOKMARK';

data/webpack/components/Bookmark/BookmarkSelectors.js

@@ -0,0 +1,15 @@
+import {
+  selectAPIStatus,
+  selectAPIError,
+  selectAPIResponse,
+} from 'foremanReact/redux/API/APISelectors';
+import { STATUS } from 'foremanReact/constants';
+import { bookmarkKey } from './BookmarkConstants';
+
+export const selectBookmarks = (state, key) => selectAPIResponse(state, bookmarkKey(key)) || {};
+
+export const selectBookmarkStatus = (state, key) =>
+  selectAPIStatus(state, bookmarkKey(key)) || STATUS.PENDING;
+
+export const selectBookmarkError = (state, key) =>
+  selectAPIError(state, bookmarkKey(key));

data/webpack/components/Bookmark/index.js

@@ -0,0 +1,94 @@
+import React, { useEffect, useState } from 'react';
+import PropTypes from 'prop-types';
+import { useDispatch, useSelector, shallowEqual } from 'react-redux';
+import { translate as __ } from 'foremanReact/common/I18n';
+import { STATUS } from 'foremanReact/constants';
+import { Dropdown, DropdownItem, DropdownToggle, DropdownSeparator } from '@patternfly/react-core';
+import { CaretDownIcon } from '@patternfly/react-icons';
+import { getBookmarks } from './BookmarkActions';
+import { selectBookmarks, selectBookmarkStatus } from './BookmarkSelectors';
+import './Bookmark.scss';
+import AddBookmarkModal from './AddBookmarkModal';
+
+const Bookmark = ({
+  selectItem, selectedItem, controller = '', isDisabled,
+}) => {
+  const dispatch = useDispatch();
+  const [dropdownOpen, setDropdownOpen] = useState(false);
+  const [modalOpen, setModalOpen] = useState(false);
+  const { results = [] } =
+    useSelector(state => selectBookmarks(state, controller), shallowEqual);
+  const status =
+    useSelector(state => selectBookmarkStatus(state, controller), shallowEqual);
+
+  useEffect(() => {
+    dispatch(getBookmarks(controller));
+  }, [controller, dispatch]);
+
+  const setSelectItem = (query) => {
+    if (selectedItem !== query) {
+      selectItem(query);
+    }
+    setDropdownOpen(false);
+  };
+
+  const dropDownItems = [
+    ...results.map(({ name, id, query }) => (
+      <DropdownItem
+        onClick={() => setSelectItem(query)}
+        key={id}
+        tooltip={query}
+      >
+        {name}
+      </DropdownItem >)),
+    <DropdownSeparator key="separator" />,
+    <DropdownItem
+      onClick={() => {
+        setDropdownOpen(false);
+        setModalOpen(true);
+      }}
+      key="ADD_BOOKMARK"
+    >
+      {selectedItem ? __('Bookmark this search') : __('Add new bookmark')}
+    </DropdownItem >];
+
+
+  return (
+    <>
+      <Dropdown
+        aria-label="bookmark-dropdown"
+        toggle={
+          <DropdownToggle
+            isDisabled={isDisabled || status !== STATUS.RESOLVED}
+            onToggle={setDropdownOpen}
+            id="toggle-id"
+            toggleIndicator={CaretDownIcon}
+          >
+            <i className="fas fa-bookmark" />
+          </DropdownToggle>
+        }
+        isOpen={dropdownOpen}
+        dropdownItems={dropDownItems}
+      />
+      {modalOpen &&
+        <AddBookmarkModal
+          selectedItem={selectedItem}
+          controller={controller}
+          onClose={() => setModalOpen(false)}
+        />}
+    </>
+  );
+};
+
+Bookmark.propTypes = {
+  isDisabled: PropTypes.bool,
+  controller: PropTypes.string.isRequired,
+  selectItem: PropTypes.func.isRequired,
+  selectedItem: PropTypes.string.isRequired,
+};
+
+Bookmark.defaultProps = {
+  isDisabled: undefined,
+};
+
+export default Bookmark;

data/webpack/components/EditableSwitch.js

@@ -3,7 +3,9 @@ import { Switch } from '@patternfly/react-core';
 import { noop } from 'foremanReact/common/helpers';
 import PropTypes from 'prop-types';
 
-const EditableSwitch = ({ value, attribute, onEdit }) => {
+const EditableSwitch = ({
+  value, attribute, onEdit, disabled,
+}) => {
   const identifier = `${attribute} switch`;
 
   return (
@@ -12,6 +14,7 @@ const EditableSwitch = ({ value, attribute, onEdit }) => {
       aria-label={identifier}
       isChecked={value}
       onChange={v => onEdit(v, attribute)}
+      disabled={disabled}
     />
   );
 };
@@ -20,11 +23,13 @@ EditableSwitch.propTypes = {
   value: PropTypes.bool.isRequired,
   attribute: PropTypes.string,
   onEdit: PropTypes.func,
+  disabled: PropTypes.bool,
 };
 
 EditableSwitch.defaultProps = {
   attribute: '',
   onEdit: noop,
+  disabled: false,
 };
 
 export default EditableSwitch;

data/webpack/components/EditableTextInput/EditableTextInput.js

@@ -7,13 +7,28 @@ import Loading from '../Loading';
 import './editableTextInput.scss';
 
 const EditableTextInput = ({
-  onEdit, value, textArea, attribute,
+  onEdit, value, textArea, attribute, placeholder,
+  component, currentAttribute, setCurrentAttribute, disabled,
 }) => {
   // Tracks input box state
   const [inputValue, setInputValue] = useState(value);
   const [editing, setEditing] = useState(false);
   const [submitting, setSubmitting] = useState(false);
 
+
+  useEffect(() => {
+    if (setCurrentAttribute && currentAttribute) {
+      if (attribute !== currentAttribute) {
+        setEditing(false);
+      }
+    }
+  }, [attribute, currentAttribute, setCurrentAttribute]);
+
+  const onEditClick = () => {
+    setEditing(true);
+    if (setCurrentAttribute) setCurrentAttribute(attribute);
+  };
+
   // Setting didCancel to prevent actions from happening after component has been unmounted
   // see https://overreacted.io/a-complete-guide-to-useeffect/#speaking-of-race-conditions
   useEffect(() => {
@@ -54,6 +69,7 @@ const EditableTextInput = ({
   };
 
   const inputProps = {
+    component,
     value: inputValue || '',
     onChange: v => setInputValue(v),
   };
@@ -87,20 +103,22 @@ const EditableTextInput = ({
   return (
     <Split>
       <SplitItem>
-        <Text aria-label={`${attribute} text value`} component={TextVariants.p}>
-          {value || (<i>{__('None provided')}</i>)}
+        <Text aria-label={`${attribute} text value`} component={component || TextVariants.p}>
+          {value || (<i>{placeholder}</i>)}
         </Text>
       </SplitItem>
-      <SplitItem>
-        <Button
-          className="foreman-edit-icon"
-          aria-label={`edit ${attribute}`}
-          variant="plain"
-          onClick={() => setEditing(true)}
-        >
-          <PencilAltIcon />
-        </Button>
-      </SplitItem>
+      {!disabled &&
+        <SplitItem>
+          <Button
+            className="foreman-edit-icon"
+            aria-label={`edit ${attribute}`}
+            variant="plain"
+            onClick={onEditClick}
+          >
+            <PencilAltIcon />
+          </Button>
+        </SplitItem>
+      }
     </Split>
   );
 };
@@ -110,11 +128,21 @@ EditableTextInput.propTypes = {
   value: PropTypes.string,
   attribute: PropTypes.string.isRequired,
   textArea: PropTypes.bool, // Is a text area instead of input when editing
+  placeholder: PropTypes.string,
+  component: PropTypes.string,
+  currentAttribute: PropTypes.string,
+  setCurrentAttribute: PropTypes.func,
+  disabled: PropTypes.bool,
 };
 
 EditableTextInput.defaultProps = {
   textArea: false,
+  placeholder: __('None provided'),
   value: '', // API can return null, so default to empty string
+  component: undefined,
+  currentAttribute: undefined,
+  setCurrentAttribute: undefined,
+  disabled: false,
 };
 
 export default EditableTextInput;