katello 4.4.0 → 4.4.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e193a2273fbdeccfaeb286b7a86738e7bbb1bb78120a663e4309aac912ef4501
-  data.tar.gz: afbec4d28494d215e8b7c318cd403a632d3c8c14ccff79f809cc01f4fc713f3d
+  metadata.gz: 2b7c14fb8d3608a0596bbe874028ed8966b14c2d530e8f22dd33253e678e7f7b
+  data.tar.gz: 4d762d2ac2cbe0c7362b52901c4fdf671421aae11fe9c3fdf6146b8729221895
 SHA512:
-  metadata.gz: da5af110e6327f56eff8c5f72eb1e80936142b534e68d9bdc9f081efa9838f35b0eb03d99e461e59f9c0f2be1a55f7955f2fee6d97b8874f35ce4ba60bb4c1df
-  data.tar.gz: 6c6db26dac3ffa0ace7837e9774d56d93cba08df34fee0616bde18816a6785e5c54d697768d2f5a39bbd40a67b990462bb9e2e7e2d44cfdd74043221ca820dd6
+  metadata.gz: 63470c8748cb2f52087d0e6afb152b3e1d7ac7b0985f755ea662189acf807945fba766f6def46417995b665a914adfcf62d5041bb2ea1381c03031a07d34ac34
+  data.tar.gz: 39dfbe4fe023dd34b8f371b2df102ffe8a9318c7f8ee0e67aa37b371c06ac171a8ab73fe6359ca17209209c73e7d083caf91e301b9e3ff040bb68069d48103c0

data/db/migrate/20220303160220_remove_duplicate_errata.rb

@@ -12,7 +12,7 @@ class RemoveDuplicateErrata < ActiveRecord::Migration[6.0]
     #For duplicate errata,
     # a) update all RepositoryErrata to point to unique errata,
     # b) if repo-errata association for that combination exists, delete duplicate errata association
-    # c) Delete all duplicate errata
+    # c) Delete all duplicate errata and child records
     ::Katello::Erratum.group(:errata_id).having("count(errata_id) > 1").pluck(:errata_id).each do |original_errata_id|
       errata_to_keep = ::Katello::Erratum.find_by(pulp_id: original_errata_id)
       errata_all = ::Katello::Erratum.where(errata_id: original_errata_id)
@@ -24,7 +24,13 @@ class RemoveDuplicateErrata < ActiveRecord::Migration[6.0]
           repo_erratum.update(erratum_id: errata_to_keep.id)
         end
       end
-      ::Katello::Erratum.delete(dup_errata&.pluck(:id))
+      dup_errata_ids = dup_errata&.pluck(:id)
+      if dup_errata_ids&.present?
+        ::Katello::ErratumPackage.where(:erratum_id => dup_errata_ids).delete_all
+        ::Katello::ErratumBugzilla.where(:erratum_id => dup_errata_ids).delete_all
+        ::Katello::ErratumCve.where(:erratum_id => dup_errata_ids).delete_all
+        ::Katello::Erratum.where(:id => dup_errata_ids).delete_all
+      end
     end
   end
 

data/lib/katello/version.rb

@@ -1,3 +1,3 @@
 module Katello
-  VERSION = "4.4.0".freeze
+  VERSION = "4.4.0.1".freeze
 end

data/webpack/components/RoutedTabs/index.js

@@ -1,18 +1,33 @@
 import React from 'react';
 import { shape, string, number, element, arrayOf } from 'prop-types';
 import { Tab, Tabs, TabTitleText } from '@patternfly/react-core';
-import { Switch, Route, Redirect, useLocation, withRouter, HashRouter } from 'react-router-dom';
+import { Switch, Route, Redirect, useHistory, useLocation, withRouter, HashRouter } from 'react-router-dom';
 import { head, last } from 'lodash';
 
 const RoutedTabs = ({
   tabs, defaultTabIndex,
 }) => {
+  const { push } = useHistory();
   const {
     hash, key: locationKey,
   } = useLocation();
 
   // The below transforms #/history/6 to history
   const currentTabFromUrl = head(last(hash.split('#/')).split('/'));
+  // Allows navigation back to mainTab
+  const onSubTab = currentTabFromUrl !== last(last(hash.split('#/')).split('/'));
+
+  const onSelect = (e, key) => {
+    e.preventDefault();
+    // See the below links for understanding of this mouseEvent
+    // https://www.w3schools.com/jsref/event_which.asp
+    // https://www.w3schools.com/jsref/event_button.asp
+    const middleMouseButtonNotUsed = !(e.button === 1 || e.buttons === 4 || e.which === 2);
+    const notCurrentTab = currentTabFromUrl !== key;
+    if (middleMouseButtonNotUsed && (notCurrentTab || !!onSubTab)) {
+      push(`#/${key}`);
+    }
+  };
 
   return (
     <>
@@ -24,6 +39,7 @@ const RoutedTabs = ({
           <a
             key={key}
             href={`#/${key}`}
+            onMouseUp={e => onSelect(e, key)}
             style={{ textDecoration: 'none' }}
           >
             <Tab

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katello
 version: !ruby/object:Gem::Version
-  version: 4.4.0
+  version: 4.4.0.1
 platform: ruby
 authors:
 - N/A
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-18 00:00:00.000000000 Z
+date: 2022-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails