feat: queue improvements

flarum · Dec 8, 2023 · 82b7fa1 · 82b7fa1
1 parent 0bc859e
commit 82b7fa1
Show file tree

Hide file tree

Showing 6 changed files with 57 additions and 9 deletions.
diff --git a/extensions/package-manager/js/src/admin/components/QueueSection.tsx b/extensions/package-manager/js/src/admin/components/QueueSection.tsx
@@ -95,12 +95,15 @@ export default class QueueSection extends Component<{}> {
       {
         label: extractText(app.translator.trans('flarum-package-manager.admin.sections.queue.columns.status')),
         content: (task) => (
-          <Label
-            className="PackageManager-queueTable-status"
-            type={{ running: 'neutral', failure: 'error', pending: 'warning', success: 'success' }[task.status()]}
-          >
-            {app.translator.trans(`flarum-package-manager.admin.sections.queue.statuses.${task.status()}`)}
-          </Label>
+          <>
+            <Label
+              className="PackageManager-queueTable-status"
+              type={{ running: 'neutral', failure: 'error', pending: 'warning', success: 'success' }[task.status()]}
+            >
+              {app.translator.trans(`flarum-package-manager.admin.sections.queue.statuses.${task.status()}`)}
+            </Label>
+            {['pending', 'running'].includes(task.status()) && <LoadingIndicator size="small" display="inline" />}
+          </>
         ),
       },
       70

diff --git a/extensions/package-manager/js/src/admin/components/SettingsPage.tsx b/extensions/package-manager/js/src/admin/components/SettingsPage.tsx
@@ -48,12 +48,17 @@ export default class SettingsPage extends ExtensionPage {
 
     items.add('control', <ControlSection />, 8);
 
-    if (parseInt(app.data.settings['flarum-package-manager.queue_jobs'])) {
+    if (app.data.settings['flarum-package-manager.queue_jobs'] !== '0' && app.data.settings['flarum-package-manager.queue_jobs']) {
       items.add('queue', <QueueSection />, 5);
     }
 
     items.setPriority('permissions', 0);
 
     return items;
   }
+
+  onsaved() {
+    super.onsaved();
+    m.redraw();
+  }
 }
diff --git a/extensions/package-manager/js/src/admin/utils/jumpToQueue.ts b/extensions/package-manager/js/src/admin/utils/jumpToQueue.ts
@@ -5,9 +5,36 @@ window.jumpToQueue = jumpToQueue;
 
 export default function jumpToQueue(): void {
   app.modal.close();
+
   m.route.set(app.route('extension', { id: 'flarum-package-manager' }));
+
   app.packageManager.queue.load();
+
   setTimeout(() => {
     document.getElementById('PackageManager-queueSection')?.scrollIntoView({ block: 'nearest' });
   }, 200);
+
+  pollQueue();
+}
+
+let queuePolling: any = null;
+
+export function pollQueue(): void {
+  if (queuePolling) {
+    clearInterval(queuePolling);
+  }
+
+  queuePolling = setTimeout(() => {
+    app.packageManager.queue.load();
+
+    // Check if there is a pending or running task
+    const task = app.packageManager.queue.getItems()?.find((task) => task.status() === 'pending' || task.status() === 'running');
+
+    if (task) {
+      pollQueue();
+    } else {
+      // Refresh the page
+      window.location.reload();
+    }
+  }, 6000);
 }
diff --git a/extensions/package-manager/less/admin/QueueSection.less b/extensions/package-manager/less/admin/QueueSection.less
@@ -11,6 +11,7 @@
 
   .Label {
     text-transform: uppercase;
+    margin-inline-end: 8px;
   }
 
   .Table {

diff --git a/extensions/package-manager/src/Job/ComposerCommandJob.php b/extensions/package-manager/src/Job/ComposerCommandJob.php
@@ -37,10 +37,10 @@ public function __construct(AbstractActionCommand $command, string $phpVersion)
     public function handle(Dispatcher $bus)
     {
         try {
-            ComposerAdapter::setPhpVersion($this->phpVersion);
-
             $this->command->task->start();
 
+            ComposerAdapter::setPhpVersion($this->phpVersion);
+
             $bus->dispatch($this->command);
 
             $this->command->task->end(true);

diff --git a/extensions/package-manager/src/Task/Task.php b/extensions/package-manager/src/Task/Task.php
@@ -60,6 +60,18 @@ class Task extends AbstractModel
         'finished_at' => 'datetime',
     ];
 
+    public static function boot()
+    {
+        parent::boot();
+
+        static::created(function (self $task) {
+            // auto clear tasks older than 2 weeks.
+            static::query()
+                ->where('created_at', '<', Carbon::now()->subWeeks(2))
+                ->delete();
+        });
+    }
+
     public static function build(string $operation, ?string $package): self
     {
         $task = new static;