katello 3.15.3.1 → 3.16.0.rc1

data/lib/katello/tasks/upgrades/3.10/clear_invalid_repo_credentials.rake

@@ -14,7 +14,7 @@ namespace :katello do
 
         root_repos.each do |root_repo|
           puts "Clearing invalid credentials for #{root_repo.label} (#{root_repo.id})"
-          root_repo.update_attributes(upstream_username: nil, upstream_password: nil)
+          root_repo.update(upstream_username: nil, upstream_password: nil)
 
           root_repo.repositories.each do |repo|
             puts "Refreshing repository #{repo.label} (#{repo.id})"

data/lib/katello/tasks/upgrades/3.10/update_gpg_key_urls.rake

@@ -10,7 +10,7 @@ namespace :katello do
 
           org_contents.each do |cp_content|
             gpg_url = cp_content['gpgUrl']
-            if gpg_url && gpg_url.match(/katello\/api\/repositories/)
+            if gpg_url&.match(/katello\/api\/repositories/)
               content = Katello::Content.where(cp_content_id: cp_content['id'], organization: org).first
 
               if content.nil?

data/lib/katello/tasks/upgrades/3.11/update_puppet_repos.rake

@@ -12,18 +12,16 @@ namespace :katello do
       task :update_puppet_repos => %w(environment) do
         User.current = User.anonymous_admin
         Katello::Repository.puppet_type.each do |repo|
-          begin
-            puts "Refreshing repository #{repo.label} (#{repo.id})"
-            install_dist = repo.backend_service(SmartProxy.pulp_master).backend_data['distributors'].find { |dist| dist['distributor_type_id'] == 'puppet_install_distributor' }
-            if install_dist
-              response = SmartProxy.pulp_master.pulp_api.resources.repository.delete_distributor(repo.pulp_id, install_dist['id'])
-              wait_on_task('task_id' => response['spawned_tasks'][0]['task_id'])
-            end
-            ForemanTasks.sync_task(::Actions::Pulp::Repository::Refresh, repo)
-          rescue RestClient::ResourceNotFound
-            Rails.logger.warn("Recieved 404 on repository: #{repo.id} - #{repo.name}")
-            next
+          puts "Refreshing repository #{repo.label} (#{repo.id})"
+          install_dist = repo.backend_service(SmartProxy.pulp_master).backend_data['distributors'].find { |dist| dist['distributor_type_id'] == 'puppet_install_distributor' }
+          if install_dist
+            response = SmartProxy.pulp_master.pulp_api.resources.repository.delete_distributor(repo.pulp_id, install_dist['id'])
+            wait_on_task('task_id' => response['spawned_tasks'][0]['task_id'])
           end
+          ForemanTasks.sync_task(::Actions::Pulp::Repository::Refresh, repo)
+        rescue RestClient::ResourceNotFound
+          Rails.logger.warn("Recieved 404 on repository: #{repo.id} - #{repo.name}")
+          next
         end
       end
     end

data/lib/katello/tasks/upgrades/3.15/set_sub_facet_dmi_uuid.rake

@@ -8,7 +8,7 @@ namespace :katello do
 
         fact_values = ::FactValue.where(fact_name: dmi_uuid_fact_name).where.not(value: nil)
         fact_values.each do |fv|
-          fv.host.subscription_facet&.update_attributes(dmi_uuid: fv.value)
+          fv.host.subscription_facet&.update(dmi_uuid: fv.value)
         end
       end
     end

data/lib/katello/tasks/upgrades/3.8/clear_checksum_type.rake

@@ -7,34 +7,30 @@ namespace :katello do
 
         Katello::RootRepository.yum_type.find_each do |root_repo|
           root_repo.transaction do
-            begin
-              if [::Runcible::Models::YumImporter::DOWNLOAD_ON_DEMAND, ::Runcible::Models::YumImporter::DOWNLOAD_BACKGROUND].include?(root_repo.download_policy) && root_repo.url.present? && URI(root_repo.url).scheme == 'file'
-                root_repo.update_attribute(:download_policy, ::Runcible::Models::YumImporter::DOWNLOAD_IMMEDIATE)
-                root_repo.repositories.each do |repo|
-                  importer = repo.importers[0]
-                  config = {
-                    :download_policy => ::Runcible::Models::YumImporter::DOWNLOAD_IMMEDIATE
-                  }
+            if [::Runcible::Models::YumImporter::DOWNLOAD_ON_DEMAND, ::Runcible::Models::YumImporter::DOWNLOAD_BACKGROUND].include?(root_repo.download_policy) && root_repo.url.present? && URI(root_repo.url).scheme == 'file'
+              root_repo.update_attribute(:download_policy, ::Runcible::Models::YumImporter::DOWNLOAD_IMMEDIATE)
+              root_repo.repositories.each do |repo|
+                importer = repo.importers[0]
+                config = {
+                  :download_policy => ::Runcible::Models::YumImporter::DOWNLOAD_IMMEDIATE
+                }
 
-                  SmartProxy.pulp_master.pulp_api.resources.repository.update_importer(repo.pulp_id, importer[:id], config) if (importer && importer[:id])
-                end
+                SmartProxy.pulp_master.pulp_api.resources.repository.update_importer(repo.pulp_id, importer[:id], config) if (importer && importer[:id])
               end
+            end
 
-              if root_repo.on_demand? && root_repo.url.present?
-                root_repo.update_attribute(:checksum_type, nil)
+            if root_repo.on_demand? && root_repo.url.present?
+              root_repo.update_attribute(:checksum_type, nil)
 
-                root_repo.repositories.each do |repo|
-                  begin
-                    repo.update_attribute(:saved_checksum_type, nil)
+              root_repo.repositories.each do |repo|
+                repo.update_attribute(:saved_checksum_type, nil)
 
-                    if repo.find_distributor[:config]&.delete(:checksum_type)
-                      SmartProxy.pulp_master.pulp_api.resources.repository.update_distributor(
-                        repo.pulp_id, repo.find_distributor[:id], repo.find_distributor[:config])
-                    end
-                  # rubocop:disable HandleExceptions
-                  rescue RestClient::ResourceNotFound
-                  end
+                if repo.find_distributor[:config]&.delete(:checksum_type)
+                  SmartProxy.pulp_master.pulp_api.resources.repository.update_distributor(
+                    repo.pulp_id, repo.find_distributor[:id], repo.find_distributor[:config])
                 end
+              # rubocop:disable Lint/SuppressedException
+              rescue RestClient::ResourceNotFound
               end
             end
           end

data/lib/katello/version.rb

@@ -1,3 +1,3 @@
 module Katello
-  VERSION = "3.15.3.1".freeze
+  VERSION = "3.16.0.rc1".freeze
 end

data/lib/monkeys/ar_postgres_evr_t.rb

@@ -0,0 +1,24 @@
+if defined? ActiveRecord::ConnectionAdapters::PostgreSQLAdapter
+  module PostgreSQLAdapterExtensions
+    private
+
+    def get_oid_type(oid, fmod, column_name, sql_type = "".freeze)
+      if type_map.instance_variable_get(:@mapping)["evr_t"].nil?
+        type_map.register_type "evr_t", ActiveRecord::ConnectionAdapters::PostgreSQLAdapter::OID::EvrT.new
+      end
+      super
+    end
+  end
+  module ActiveRecord
+    module ConnectionAdapters
+      module PostgreSQL
+        module OID # :nodoc:
+          class EvrT < Type::String; end # :nodoc:
+        end
+      end
+      class PostgreSQLAdapter < AbstractAdapter
+        prepend PostgreSQLAdapterExtensions
+      end
+    end
+  end
+end

data/lib/monkeys/fx_sqlite_skip.rb

@@ -0,0 +1,13 @@
+module Fx
+  module SchemaDumper
+    # @api private
+    module Trigger
+      def tables(stream)
+        unless ActiveRecord::Migration[5.2].connection.adapter_name.downcase.include?('sqlite')
+          super
+          triggers(stream)
+        end
+      end
+    end
+  end
+end

data/package.json

@@ -10,8 +10,8 @@
     "test:current": "jest webpack --watch",
     "format": "prettier --single-quote --trailing-comma es5 --write 'webpack/**/*.js'",
     "build": "npm run format && npm run lint",
-    "lint": "eslint webpack/",
-    "lint:fix": "eslint --fix webpack/",
+    "lint": "npx eslint webpack/",
+    "lint:fix": "npx eslint --fix webpack/",
     "lint:test": "npm run lint && npm test",
     "coveralls": "cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js"
   },
@@ -24,10 +24,13 @@
   },
   "devDependencies": {
     "@babel/core": "^7.7.0",
+    "@sheerun/mutationobserver-shim": "^0.3.3",
     "@storybook/react": "^3.2.17",
     "@storybook/storybook-deployer": "^2.0.0",
-    "@theforeman/builder": "^4.0.2",
-    "@theforeman/vendor-dev": "^3.8.0",
+    "@testing-library/jest-dom": "^5.3.0",
+    "@testing-library/react": "^10.0.2",
+    "@theforeman/builder": "^4.2.0",
+    "@theforeman/vendor-dev": "^4.2.0",
     "axios-mock-adapter": "^1.10.0",
     "babel-eslint": "^10.0.3",
     "babel-jest": "^24.9.0",
@@ -47,51 +50,22 @@
     "eslint-plugin-react": "^7.4.0",
     "identity-obj-proxy": "^3.0.0",
     "jest": "^24.9.0",
+    "nock": "^12.0.3",
     "prettier": "^1.7.4",
     "react-redux-test-utils": "^0.1.1",
     "react-test-renderer": "^16.0.0",
     "redux-mock-store": "^1.3.0"
   },
+  "_comment": "We don't include @theforeman/vendor because it's assumed to be present in Foreman",
   "dependencies": {
-    "angular": "1.5.5",
+    "@patternfly/react-icons": "^3.15.15",
+    "@patternfly/react-tokens": "^2.8.13",
+    "angular": "1.7.9",
     "bootstrap-select": "1.12.4",
     "downshift": "^1.28.0",
     "jed": "^1.1.1",
     "ngreact": "^0.5.0",
     "query-string": "^6.1.0",
-    "react-bootstrap": "^0.32.1",
-    "react-helmet": "^5.2.0"
-  },
-  "peerDependencies": {
-    "@theforeman/vendor": ">= 3.8.0"
-  },
-  "jest": {
-    "collectCoverage": true,
-    "collectCoverageFrom": [
-      "webpack/**/*.js",
-      "!webpack/**/bundle*"
-    ],
-    "coverageReporters": [
-      "lcov"
-    ],
-    "testURL": "http://localhost/",
-    "setupFiles": [
-      "raf/polyfill",
-      "./webpack/test_setup.js"
-    ],
-    "setupTestFrameworkScriptFile": "./webpack/global_test_setup.js",
-    "testPathIgnorePatterns": [
-      "/node_modules/",
-      "<rootDir>/foreman/",
-      "<rootDir>/.+fixtures.+",
-      "<rootDir>/engines"
-    ],
-    "moduleDirectories": [
-      "node_modules/@theforeman/vendor-core/node_modules",
-      "node_modules"
-    ],
-    "moduleNameMapper": {
-      "^.+\\.(css|scss)$": "identity-obj-proxy"
-    }
+    "react-bootstrap": "^0.32.1"
   }
 }

data/webpack/__mocks__/foremanReact/components/{BreadcrumbBar.js → BreadcrumbBar/index.js}

@@ -1,3 +1,2 @@
-
 const BreadcrumbsBar = () => jest.fn();
 export default BreadcrumbsBar;

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

@@ -0,0 +1,3 @@
+export const addLocaleData = jest.fn();
+export const FormattedRelative = jest.fn();
+export const intlShape = jest.fn();

data/webpack/__mocks__/react-intl/locale-data/en.js

@@ -0,0 +1 @@
+export default {};

data/webpack/components/Content/ContentTable.js

@@ -34,8 +34,6 @@ const ContentTable = ({ content, tableSchema, onPaginationChange }) => {
 ContentTable.propTypes = {
   content: PropTypes.shape({
     loading: PropTypes.bool,
-    // Disabling rule as existing code failed due to an eslint-plugin-react update
-    // eslint-disable-next-line react/forbid-prop-types
     results: PropTypes.array,
     pagination: PropTypes.shape({}),
     itemCount: PropTypes.number,

data/webpack/components/Content/Details/ContentDetails.js

@@ -59,12 +59,9 @@ ContentDetails.propTypes = {
   contentDetails: PropTypes.shape({
     loading: PropTypes.bool,
     name: PropTypes.string,
-    // Disabling rule as existing code failed due to an eslint-plugin-react update
-    /* eslint-disable react/forbid-prop-types */
     profiles: PropTypes.array,
     repositories: PropTypes.array,
     artifacts: PropTypes.array,
-    /* eslint-enable react/forbid-prop-types */
     stream: PropTypes.string,
   }).isRequired,
   schema: PropTypes.arrayOf(PropTypes.shape({})).isRequired,

data/webpack/containers/Application/config.js

@@ -9,6 +9,7 @@ import ModuleStreams from '../../scenes/ModuleStreams';
 import ModuleStreamDetails from '../../scenes/ModuleStreams/Details';
 import AnsibleCollections from '../../scenes/AnsibleCollections';
 import AnsibleCollectionDetails from '../../scenes/AnsibleCollections/Details';
+import ContentViews from '../../scenes/ContentViews';
 import withHeader from './withHeaders';
 
 // eslint-disable-next-line import/prefer-default-export
@@ -50,4 +51,8 @@ export const links = [
     path: 'ansible_collections/:id([0-9]+)',
     component: withHeader(AnsibleCollectionDetails, { title: __('Ansible Collection Details') }),
   },
+  {
+    path: 'labs/content_views',
+    component: withHeader(ContentViews, { title: __('Content Views') }),
+  },
 ];

data/webpack/containers/Application/overrides.scss

@@ -19,6 +19,14 @@ td, th {
   word-wrap: break-word;
 }
 
+// needed because we have overflow set to auto for all td's and it affected the pf4 table
+.katello-pf4-table {
+  td {
+    max-width: 200px;
+    overflow: unset;
+    word-wrap: break-word;
+  }
+}
 // override foreman's .editable styles, that are conflicting with the patternfly ones
 .pf-table-inline-edit {
   .editable {

data/webpack/mockRequest.js

@@ -30,3 +30,4 @@ export const mockErrorRequest = ({
 });
 
 export const mockReset = () => mock.reset();
+

data/webpack/move_to_foreman/common/helpers.js

@@ -69,9 +69,10 @@ export const apiResponse = (actionType, result, additionalData = {}) => (dispatc
 
 export const sendErrorNotifications = messages => (dispatch) => {
   messages.forEach((msg) => {
+    const message = typeof msg === 'string' ? msg : `${msg.message}: ${msg.details}`;
     dispatch(addToast({
       type: 'error',
-      message: msg,
+      message,
       sticky: true,
     }));
   });

data/webpack/move_to_foreman/components/common/table/components/__snapshots__/Table.test.js.snap

@@ -139,6 +139,7 @@ exports[`Table renders Table with pagination 1`] = `
   </TablePfProvider>
   <PaginationWrapper
     itemCount={2}
+    onChange={[Function]}
     pagination={
       Object {
         "page": 1,

data/webpack/scenes/AnsibleCollections/Details/AnsibleCollectionDetails.js

@@ -83,11 +83,8 @@ AnsibleCollectionDetails.propTypes = {
     name: PropTypes.string,
     namespace: PropTypes.string,
     version: PropTypes.string,
-    // Disabling rule as existing code failed due to an eslint-plugin-react update
-    /* eslint-disable react/forbid-prop-types */
     repositories: PropTypes.array,
     tags: PropTypes.array,
-    /* eslint-enable react/forbid-prop-types */
   }).isRequired,
 };
 

data/webpack/scenes/AnsibleCollections/Details/AnsibleCollectionDetailsActions.js

@@ -1,4 +1,4 @@
-import api from '../../../services/api';
+import api, { orgId } from '../../../services/api';
 import {
   ANSIBLE_COLLECTION_DETAILS_ERROR,
   ANSIBLE_COLLECTION_DETAILS_REQUEST,
@@ -10,7 +10,7 @@ export const getAnsibleCollectionDetails = ansibleCollectionId => async (dispatc
   dispatch({ type: ANSIBLE_COLLECTION_DETAILS_REQUEST });
 
   try {
-    const { data } = await api.get(`/ansible_collections/${ansibleCollectionId}`);
+    const { data } = await api.get(`/ansible_collections/${ansibleCollectionId}`, {}, { organization_id: orgId() });
     return dispatch({
       type: ANSIBLE_COLLECTION_DETAILS_SUCCESS,
       response: data,

data/webpack/scenes/AnsibleCollections/Details/__tests__/__snapshots__/AnsibleCollectionDetailsActions.test.js.snap

@@ -36,6 +36,10 @@ exports[`Ansible Collection details actions should load ansible collection detai
 Array [
   Array [
     "/ansible_collections/1",
+    Object {},
+    Object {
+      "organization_id": undefined,
+    },
   ],
 ]
 `;

data/webpack/scenes/ContentViews/ContentViewSelectors.js

@@ -0,0 +1,13 @@
+import {
+  selectAPIStatus,
+  selectAPIError,
+  selectAPIResponse,
+} from 'foremanReact/redux/API/APISelectors';
+import CONTENT_VIEWS_KEY from './ContentViewsConstants';
+
+export const selectContentViews = state =>
+  selectAPIResponse(state, CONTENT_VIEWS_KEY).results || [];
+
+export const selectContentViewStatus = state => selectAPIStatus(state, CONTENT_VIEWS_KEY);
+
+export const selectContentViewError = state => selectAPIError(state, CONTENT_VIEWS_KEY);

data/webpack/scenes/ContentViews/ContentViewsActions.js

@@ -0,0 +1,18 @@
+import { API_OPERATIONS, get } from 'foremanReact/redux/API';
+import api, { orgId } from '../../services/api';
+import CONTENT_VIEWS_KEY from './ContentViewsConstants';
+
+
+const createContentViewsParams = () => ({
+  organization_id: orgId(),
+  nondefault: true,
+});
+
+const getContentViews = () => get({
+  type: API_OPERATIONS.GET,
+  key: CONTENT_VIEWS_KEY,
+  url: api.getApiUrl('/content_views'),
+  params: createContentViewsParams(),
+});
+
+export default getContentViews;

data/webpack/scenes/ContentViews/ContentViewsConstants.js

@@ -0,0 +1,3 @@
+const CONTENT_VIEWS_KEY = 'contentViews';
+
+export default CONTENT_VIEWS_KEY;

data/webpack/scenes/ContentViews/ContentViewsPage.js

@@ -0,0 +1,30 @@
+import React, { useEffect } from 'react';
+import { translate as __ } from 'foremanReact/common/I18n';
+import { useSelector, useDispatch } from 'react-redux';
+import getContentViews from './ContentViewsActions';
+import { selectContentViews,
+  selectContentViewStatus,
+  selectContentViewError } from './ContentViewSelectors';
+
+import ContentViewsTable from './Table/ContentViewsTable';
+
+const ContentViewsPage = () => {
+  const items = useSelector(selectContentViews);
+  const status = useSelector(selectContentViewStatus);
+  const error = useSelector(selectContentViewError);
+
+  const dispatch = useDispatch();
+
+  useEffect(() => {
+    dispatch(getContentViews());
+  }, []);
+
+  return (
+    <React.Fragment>
+      <h1>{__('Content Views')}</h1>
+      <ContentViewsTable {...{ items, status, error }} />
+    </React.Fragment>
+  );
+};
+
+export default ContentViewsPage;