Fixes #37481 - Update cached value for manifest expiration date durin…

…g import
Katello · May 22, 2024 · 2933094 · 2933094
1 parent 7864fcc
commit 2933094
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/app/lib/actions/katello/organization/manifest_import.rb b/app/lib/actions/katello/organization/manifest_import.rb
@@ -27,6 +27,11 @@ def plan(organization, path, force)
           end
         end
 
+        def run
+          organization = ::Organization.find_by(name: input[:organization_name])
+          organization&.manifest_expiration_date(cached: false) # update the date
+        end
+
         def failure_notification(plan)
           ::Katello::UINotifications::Subscriptions::ManifestImportError.deliver!(
             :subject => subject_organization,

diff --git a/app/models/katello/concerns/organization_extensions.rb b/app/models/katello/concerns/organization_extensions.rb
@@ -102,7 +102,7 @@ def manifest_imported?(cached: false)
 
         def manifest_expiration_date(cached: true)
           Rails.cache.fetch("#{self.label}_manifest_expiration_date", expires_in: 1.minute, force: !cached) do
-            unless manifest_imported?(cached: true)
+            unless manifest_imported?(cached: cached)
               Rails.logger.error "Manifest not imported for organization #{self.label}"
               return nil
             end
@@ -117,8 +117,8 @@ def manifest_expiration_date(cached: true)
           end
         end
 
-        def manifest_expired?
-          manifest_expiry = manifest_expiration_date
+        def manifest_expired?(cached: true)
+          manifest_expiry = manifest_expiration_date(cached: cached)
 
           if manifest_expiry
             manifest_expiry < DateTime.now

diff --git a/webpack/scenes/Subscriptions/Manifest/ManageManifestModal.js b/webpack/scenes/Subscriptions/Manifest/ManageManifestModal.js
@@ -174,7 +174,7 @@ class ManageManifestModal extends Component {
                           />
                         </Alert>
                       }
-                      {manifestExpired &&
+                      {manifestExpired && isManifestImported &&
                         <Alert
                           ouiaId="manifest-expired-alert"
                           variant="danger"
@@ -198,7 +198,7 @@ class ManageManifestModal extends Component {
                           {getManifestName()}
                         </Col>
                       </Row>
-                      {isManifestImported &&
+                      {isManifestImported && manifestExpirationDate &&
                         <Row>
                           <Col sm={5} />
                           <Col sm={7}>