katello 3.11.0 → 3.11.1

data/app/views/katello/api/v2/sync_plans/show.json.rabl

@@ -2,7 +2,7 @@ object @resource
 
 attributes :id, :organization_id
 attributes :name, :description
-attributes :interval, :next_sync
+attributes :interval, :next_sync, :sync_date
 attributes :created_at, :updated_at
 attributes :enabled, :foreman_tasks_recurring_logic_id
 attributes :cron_expression
@@ -27,7 +27,3 @@ node :permissions do |sync_plan|
     :destroy_sync_plans => sync_plan.deletable?
   }
 end
-
-node :sync_date do |sync_plan|
-  sync_plan.plan_date_time
-end

data/db/migrate/20190326145039_remove_version_date_from_ostree_branch.rb

@@ -0,0 +1,5 @@
+class RemoveVersionDateFromOstreeBranch < ActiveRecord::Migration[5.2]
+  def change
+    remove_column :katello_ostree_branches, :version_date, :timestamp
+  end
+end

data/db/seeds.d/111-upgrade_tasks.rb

@@ -7,6 +7,8 @@ UpgradeTask.define_tasks(:katello) do
     {:name => 'katello:upgrades:3.9:migrate_sync_plans'},
     {:name => 'katello:upgrades:3.10:clear_invalid_repo_credentials'},
     {:name => 'katello:upgrades:3.11:import_yum_metadata'},
-    {:name => 'katello:upgrades:3.11:update_puppet_repos'}
+    {:name => 'katello:upgrades:3.11:update_puppet_repos'},
+    {:name => 'katello:upgrades:3.11:clear_checksum_type', :task_name => 'katello:upgrades:3.8:clear_checksum_type'}
+
   ]
 end

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/versions/content-view-version-content.controller.js

@@ -62,7 +62,7 @@
                 params: {
                     'content_type': "ostree",
                     'content_view_version_id': $scope.$stateParams.versionId,
-                    'sort_by': 'created',
+                    'sort_by': 'version',
                     'sort_order': 'DESC'
                 }
             },

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/versions/views/content-view-version-ostree-branches.html

@@ -9,7 +9,6 @@
         <th bst-table-column translate>Name</th>
         <th bst-table-column translate>Version</th>
         <th bst-table-column translate>Commit</th>
-        <th bst-table-column translate>Date</th>
       </tr>
     </thead>
 
@@ -18,7 +17,6 @@
         <td bst-table-cell>{{ branch.name }}</td>
         <td bst-table-cell>{{ branch.version }}</td>
         <td bst-table-cell>{{ branch.commit }}</td>
-        <td bst-table-cell>{{ branch.version_date }}</td>
       </tr>
     </tbody>
   </table>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/environments/details/views/environment-ostree.html

@@ -18,7 +18,6 @@
         <th bst-table-column translate>Name</th>
         <th bst-table-column translate>Version</th>
         <th bst-table-column translate>Commit</th>
-        <th bst-table-column translate>Date</th>
       </tr>
     </thead>
 
@@ -27,7 +26,6 @@
         <td bst-table-cell>{{ branch.name }}</td>
         <td bst-table-cell>{{ branch.version }}</td>
         <td bst-table-cell>{{ branch.commit }}</td>
-        <td bst-table-cell>{{ branch.version_date }}</td>
       </tr>
     </tbody>
   </table>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/errata/details/views/erratum-content-hosts.html

@@ -26,7 +26,7 @@
     </a>
   </div>
 
-  <div class="filters">
+  <div data-block="filters">
     <label class="checkbox-inline">
       <input type="checkbox" ng-model="restrictInstallable" ng-change="toggleInstallable()"/>
       <span translate>Only show content hosts where the errata is currently installable in the host's Lifecycle Environment.</span>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/ostree-branches/details/views/ostree-branch-info.html

@@ -10,9 +10,6 @@
 
       <dt translate>Commit</dt>
       <dd>{{ branch.commit }}</dd>
-
-      <dt translate>Date</dt>
-      <dd>{{ branch.version_date }}</dd>
     </dl>
   </div>
 </div>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/repository-details-info.controller.js

@@ -41,7 +41,7 @@ angular.module('Bastion.repositories').controller('RepositoryDetailsInfoControll
                     return false;
                 });
 
-                results.unshift({id: null});
+                results.unshift({id: null, name: ''});
                 deferred.resolve(results);
             });
 
@@ -61,7 +61,7 @@ angular.module('Bastion.repositories').controller('RepositoryDetailsInfoControll
                     return false;
                 });
 
-                results.unshift({id: null});
+                results.unshift({id: null, name: ''});
                 deferred.resolve(results);
             });
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-manage-ostree-branches.html

@@ -19,7 +19,6 @@
           <th bst-table-column><span translate>Branch Name</span></th>
           <th bst-table-column><span translate>Version</span></th>
           <th bst-table-column><span translate>Commit</span></th>
-          <th bst-table-column><span translate>Date</span></th>
         </tr>
       </thead>
 
@@ -34,9 +33,6 @@
           <td bst-table-cell>
             {{ item.commit }}
           </td>
-          <td bst-table-cell>
-            {{ item.version_date }}
-          </td>
         </tr>
       </tbody>
     </table>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/sync-plans/details/sync-plan-details-info.controller.js

@@ -28,8 +28,15 @@ angular.module('Bastion.sync-plans').controller('SyncPlanDetailsInfoController',
             $scope.editedInterval = false;
 
             function updateSyncPlan(syncPlan) {
-                syncPlan.syncDate = new Date(syncPlan['sync_date']);
-                syncPlan.syncTime = new Date(syncPlan['sync_date']);
+                var syncDate;
+                if (syncPlan['sync_date']) {
+                    syncDate = new Date(syncPlan['sync_date'].replace(/\s/, 'T').replace(/\s/, ''));
+                } else {
+                    syncDate = new Date();
+                }
+
+                syncPlan.syncDate = syncDate;
+                syncPlan.syncTime = syncDate;
                 $scope.syncPlan = syncPlan;
             }
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/sync-plans/details/views/sync-plan-info.html

@@ -18,7 +18,7 @@
       </dd>
 
       <dt translate>Start Date</dt>
-      <dd bst-edit-custom="syncPlan.sync_date"
+      <dd bst-edit-custom="syncPlan.syncDate"
           formatter="date"
           formatter-options="'medium'"
           on-save="save(syncPlan)"

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

@@ -8,6 +8,18 @@ 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
+                  }
+
+                  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)
 

data/lib/katello/version.rb

@@ -1,3 +1,3 @@
 module Katello
-  VERSION = "3.11.0".freeze
+  VERSION = "3.11.1".freeze
 end

data/webpack/components/SelectOrg/SelectOrgAction.js

@@ -25,7 +25,7 @@ export const getOrganiztionsList = () => (dispatch) => {
     });
 };
 
-export const changeCurrentOrgaziation = orgID => dispatch => foremanEndpoint
+export const changeCurrentOrganization = orgID => dispatch => foremanEndpoint
   .get(`organizations/${orgID}/select`)
   .then(() => {
     dispatch({

data/webpack/components/SelectOrg/SetOrganization.js

@@ -34,12 +34,12 @@ class SetOrganization extends Component {
   onSend() {
     const {
       history,
-      changeCurrentOrgaziation,
+      changeCurrentOrganization,
       redirectPath,
     } = this.props;
-    const { id, item } = this.state;
+    const { id } = this.state;
 
-    changeCurrentOrgaziation(encodeURIComponent(`${id}-${item}`)).then(() =>
+    changeCurrentOrganization(`${id}`).then(() =>
       history.push({
         pathname: redirectPath,
         state: { orgChanged: this.state.item },
@@ -95,7 +95,7 @@ class SetOrganization extends Component {
 SetOrganization.propTypes = {
   list: PropTypes.arrayOf(PropTypes.object),
   loading: PropTypes.bool.isRequired,
-  changeCurrentOrgaziation: PropTypes.func.isRequired,
+  changeCurrentOrganization: PropTypes.func.isRequired,
   history: PropTypes.shape({}).isRequired,
   redirectPath: PropTypes.string.isRequired,
   getOrganiztionsList: PropTypes.func.isRequired,

data/webpack/components/WithOrganization/__snapshots__/withOrganization.test.js.snap

@@ -1,41 +1,175 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`subscriptions page should render select org page 1`] = `
-<CheckOrg>
-  <Header
-    title="Select Organization"
+<Connect(CheckOrg)
+  store={
+    Object {
+      "clearActions": [Function],
+      "dispatch": [Function],
+      "getActions": [Function],
+      "getState": [Function],
+      "replaceReducer": [Function],
+      "subscribe": [Function],
+    }
+  }
+>
+  <CheckOrg
+    default={[Function]}
+    loadOrganization={[Function]}
+    organization={Object {}}
+    saveOrganization={[Function]}
+    store={
+      Object {
+        "clearActions": [Function],
+        "dispatch": [Function],
+        "getActions": [Function],
+        "getState": [Function],
+        "replaceReducer": [Function],
+        "subscribe": [Function],
+      }
+    }
+    storeSubscription={
+      Subscription {
+        "listeners": Object {
+          "clear": [Function],
+          "get": [Function],
+          "notify": [Function],
+          "subscribe": [Function],
+        },
+        "onStateChange": [Function],
+        "parentSub": undefined,
+        "store": Object {
+          "clearActions": [Function],
+          "dispatch": [Function],
+          "getActions": [Function],
+          "getState": [Function],
+          "replaceReducer": [Function],
+          "subscribe": [Function],
+        },
+        "unsubscribe": [Function],
+      }
+    }
   >
-    <HelmetWrapper
-      defer={true}
-      encodeSpecialCharacters={true}
+    <Header
+      title="Select Organization"
     >
-      <SideEffect(NullComponent)
+      <HelmetWrapper
         defer={true}
         encodeSpecialCharacters={true}
-        title="Select Organization"
-        titleAttributes={Object {}}
       >
-        <NullComponent
+        <SideEffect(NullComponent)
           defer={true}
           encodeSpecialCharacters={true}
           title="Select Organization"
           titleAttributes={Object {}}
-        />
-      </SideEffect(NullComponent)>
-    </HelmetWrapper>
-  </Header>
-  <Connect(withRouter(SetOrganization))
-    redirectPath="/test"
-  />
-</CheckOrg>
+        >
+          <NullComponent
+            defer={true}
+            encodeSpecialCharacters={true}
+            title="Select Organization"
+            titleAttributes={Object {}}
+          />
+        </SideEffect(NullComponent)>
+      </HelmetWrapper>
+    </Header>
+    <Connect(withRouter(SetOrganization))
+      redirectPath="/test"
+    />
+  </CheckOrg>
+</Connect(CheckOrg)>
 `;
 
 exports[`subscriptions page should render the wrapped component 1`] = `
-<CheckOrg>
-  <WrappedComponent>
-    <div>
-       Wrapped! 
-    </div>
-  </WrappedComponent>
-</CheckOrg>
+<Connect(CheckOrg)
+  store={
+    Object {
+      "clearActions": [Function],
+      "dispatch": [Function],
+      "getActions": [Function],
+      "getState": [Function],
+      "replaceReducer": [Function],
+      "subscribe": [Function],
+    }
+  }
+>
+  <CheckOrg
+    default={[Function]}
+    loadOrganization={[Function]}
+    organization={Object {}}
+    saveOrganization={[Function]}
+    store={
+      Object {
+        "clearActions": [Function],
+        "dispatch": [Function],
+        "getActions": [Function],
+        "getState": [Function],
+        "replaceReducer": [Function],
+        "subscribe": [Function],
+      }
+    }
+    storeSubscription={
+      Subscription {
+        "listeners": Object {
+          "clear": [Function],
+          "get": [Function],
+          "notify": [Function],
+          "subscribe": [Function],
+        },
+        "onStateChange": [Function],
+        "parentSub": undefined,
+        "store": Object {
+          "clearActions": [Function],
+          "dispatch": [Function],
+          "getActions": [Function],
+          "getState": [Function],
+          "replaceReducer": [Function],
+          "subscribe": [Function],
+        },
+        "unsubscribe": [Function],
+      }
+    }
+  >
+    <WrappedComponent
+      default={[Function]}
+      loadOrganization={[Function]}
+      organization={Object {}}
+      saveOrganization={[Function]}
+      store={
+        Object {
+          "clearActions": [Function],
+          "dispatch": [Function],
+          "getActions": [Function],
+          "getState": [Function],
+          "replaceReducer": [Function],
+          "subscribe": [Function],
+        }
+      }
+      storeSubscription={
+        Subscription {
+          "listeners": Object {
+            "clear": [Function],
+            "get": [Function],
+            "notify": [Function],
+            "subscribe": [Function],
+          },
+          "onStateChange": [Function],
+          "parentSub": undefined,
+          "store": Object {
+            "clearActions": [Function],
+            "dispatch": [Function],
+            "getActions": [Function],
+            "getState": [Function],
+            "replaceReducer": [Function],
+            "subscribe": [Function],
+          },
+          "unsubscribe": [Function],
+        }
+      }
+    >
+      <div>
+         Wrapped! 
+      </div>
+    </WrappedComponent>
+  </CheckOrg>
+</Connect(CheckOrg)>
 `;

data/webpack/components/WithOrganization/withOrganization.js

@@ -1,9 +1,19 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
+import { bindActionCreators } from 'redux';
+import { connect } from 'react-redux';
+
 import { translate as __ } from 'foremanReact/common/I18n';
 import { get } from 'lodash';
 import SetOrganization from '../SelectOrg/SetOrganization';
 import Header from '../../containers/Application/Headers';
+import * as organizationActions from '../../scenes/Organizations/OrganizationActions';
+
+const mapStateToProps = state => ({
+  organization: state.katello.organization,
+});
+
+const mapDispatchToProps = dispatch => bindActionCreators({ ...organizationActions }, dispatch);
 
 function withOrganization(WrappedComponent, redirectPath) {
   class CheckOrg extends Component {
@@ -31,10 +41,12 @@ function withOrganization(WrappedComponent, redirectPath) {
     }
 
     render() {
-      const { location } = this.props;
+      const { organization, location } = this.props;
       const newOrgSelected = get(location, 'state.orgChanged');
 
       if (newOrgSelected) {
+        if (!organization.label && !organization.loading) { this.props.loadOrganization(); }
+
         return <WrappedComponent {...this.props} />;
       } else if (this.state.orgId === '') {
         return (
@@ -49,12 +61,15 @@ function withOrganization(WrappedComponent, redirectPath) {
 
   CheckOrg.propTypes = {
     location: PropTypes.shape({}),
+    loadOrganization: PropTypes.func.isRequired,
+    organization: PropTypes.shape({}).isRequired,
   };
 
   CheckOrg.defaultProps = {
     location: undefined,
   };
-  return CheckOrg;
+
+  return connect(mapStateToProps, mapDispatchToProps)(CheckOrg);
 }
 
 export default withOrganization;