Merge pull request #404 from eliashaeussler/fix/0.5/no-crawls-message

[BUGFIX] Handle empty crawling result in progress and report modals
eliashaeussler · Aug 22, 2023 · 0d6ac61 · 0d6ac61
2 parents 0ec6f45 + eb34608
commit 0d6ac61
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/Resources/Private/Frontend/src/scripts/lib/RequestHandler/EventSourceRequestHandler.ts b/Resources/Private/Frontend/src/scripts/lib/RequestHandler/EventSourceRequestHandler.ts
@@ -113,7 +113,7 @@ export default class EventSourceRequestHandler implements RequestHandlerInterfac
  const data = JSON.parse(event.data);
  this.progress.update(data);
 
- // Pass update upgraded progress to progress modal
+ // Pass updated progress to progress modal
  CacheWarmupProgressModal.updateProgress(this.progress);
  }
 
@@ -130,6 +130,9 @@ export default class EventSourceRequestHandler implements RequestHandlerInterfac
  // Ensure event source is closed to stop future retries
  this.closeSource();
 
+ // Pass updated progress to progress modal
+ CacheWarmupProgressModal.updateProgress(this.progress);
+
  // Build report modal on click on "open report" button
  CacheWarmupProgressModal.getReportButton()
  .removeClass('hidden')

diff --git a/Resources/Private/Frontend/src/scripts/lib/WarmupProgress.ts b/Resources/Private/Frontend/src/scripts/lib/WarmupProgress.ts
@@ -116,7 +116,7 @@ export default class WarmupProgress {
  return Number((this.progress.current / this.progress.total) * 100);
  }
 
- return Number(0);
+ return Number(100);
  }
 
  /**

diff --git a/Resources/Public/JavaScript/Backend/ContextMenu/CacheWarmupContextMenuAction.js b/Resources/Public/JavaScript/Backend/ContextMenu/CacheWarmupContextMenuAction.js
diff --git a/Resources/Public/JavaScript/Backend/Toolbar/CacheWarmupMenu.js b/Resources/Public/JavaScript/Backend/Toolbar/CacheWarmupMenu.js