[6.x] Critical updates visibility (#14202)

jasonvarga · web-flow · commit 00cf9bc41959 · 2026-03-10T16:21:20.000-04:00
diff --git a/resources/js/components/UpdatesBadge.vue b/resources/js/components/UpdatesBadge.vue
@@ -1,12 +1,13 @@
 <template>
-    <Badge v-if="count" :text="String(count)" color="amber" size="sm" pill />
+    <Badge v-if="count" :text="String(count)" :color="critical ? 'red' : 'amber'" size="sm" pill />
 </template>
 
 <script>
 import { ref } from 'vue';
 import { Badge } from '@/components/ui';
 
-const count = ref(null);
+const countRef = ref(null);
+const criticalRef = ref(false);
 const requested = ref(false);
 
 export default {
@@ -16,7 +17,10 @@ export default {
 
     computed: {
         count() {
-            return count.value;
+            return countRef.value;
+        },
+        critical() {
+            return criticalRef.value;
         },
     },
 
@@ -30,7 +34,10 @@ export default {
 
             this.$axios
                 .get(cp_url('updater/count'))
-                .then((response) => (count.value = !isNaN(response.data) ? response.data : 0));
+                .then((response) => {
+                    countRef.value = response.data?.count ?? 0;
+                    criticalRef.value = response.data?.critical ?? false;
+                });
 
             requested.value = true;
         },
diff --git a/resources/js/components/updater/Release.vue b/resources/js/components/updater/Release.vue
@@ -2,7 +2,10 @@
     <ui-panel>
         <ui-panel-header class="flex items-center justify-between">
             <div>
-                <ui-heading :text="release.version" />
+                <div class="flex items-center gap-2">
+                    <ui-heading :text="release.version" />
+                    <ui-badge v-if="release.critical" :text="__('Critical')" color="red" size="sm" />
+                </div>
                 <ui-subheading :text="`${__('Released on :date', { date })}`" />
             </div>
             <ui-modal :title="__('Update to :version', { version: release.version })" blur>
diff --git a/resources/js/components/updater/Updater.vue b/resources/js/components/updater/Updater.vue
@@ -2,8 +2,10 @@
     <div class="max-w-page mx-auto">
         <ui-header :title="name" icon="updates">
             <template v-if="!gettingChangelog" #actions>
-                <ui-badge :prepend="__('Version')" :text="currentVersion" :color="onLatestVersion ? 'green' : 'amber'" size="lg" />
-                <div v-if="onLatestVersion" v-text="__('Up to date')" />
+                {{ currentVersion }}
+                <ui-badge v-if="onLatestVersion" :text="__('Up to date')" color="green" size="lg" icon="checkmark" />
+                <ui-badge v-else-if="criticalUpdateAvailable" :text="__('Critical update available')" color="red" size="lg" icon="alert-warning-exclamation-mark" />
+                <ui-badge v-else :text="__('Update available')" color="amber" size="lg" icon="alert-warning-exclamation-mark" />
             </template>
         </ui-header>
 
@@ -93,6 +95,12 @@ export default {
             return this.currentVersion && this.currentVersion == this.latestVersion;
         },
 
+        criticalUpdateAvailable() {
+            return this.currentVersion && this.changelog
+                .filter((release) => release.type === 'upgrade')
+                .some((release) => release.critical);
+        },
+
         licensedReleases() {
             return this.changelog.filter((release) => release.licensed);
         },
diff --git a/resources/js/components/updater/UpdaterWidget.vue b/resources/js/components/updater/UpdaterWidget.vue
@@ -18,10 +18,12 @@ defineProps({
                             <Link :href="update.url" class="flex items-center gap-2" v-text="update.name" />
                         </td>
                         <td>
-                            <Badge pill :color="update.critical ? 'red' : 'amber'" :text="update.count" />
-                            <div class="inline-flex" v-tooltip="__('Critical')">
-                                <Icon v-if="update.critical" name="warning-diamond" color="red" />
-                            </div>
+                            <Badge
+                                pill
+                                :text="update.count"
+                                :color="update.critical ? 'red' : 'amber'"
+                                v-tooltip="update.critical ? __('Critical update available') : null"
+                            />
                         </td>
                     </tr>
                 </table>
diff --git a/resources/js/pages/updater/Index.vue b/resources/js/pages/updater/Index.vue
@@ -2,15 +2,22 @@
 import { Link } from '@inertiajs/vue3';
 import Head from '@/pages/layout/Head.vue';
 import { Header, Card, Panel, Table, TableRow, TableCell, Badge, Heading, Button, DocsCallout, CommandPaletteItem } from '@ui';
+import { computed } from 'vue';
 
-defineProps(['requestError', 'statamic', 'addons']);
+const props = defineProps(['requestError', 'statamic', 'addons']);
+
+const criticalUpdateAvailable = computed(() => props.statamic.critical || props.addons.some(addon => addon.critical));
 </script>
 
 <template>
     <Head :title="__('Updates')" />
 
     <div class="max-w-page mx-auto">
-        <Header :title="__('Updates')" icon="updates" />
+        <Header :title="__('Updates')" icon="updates">
+            <template #actions>
+                <Badge v-if="criticalUpdateAvailable" :text="__('Critical update available')" color="red" size="lg" icon="alert-warning-exclamation-mark" />
+            </template>
+        </Header>
 
         <Card v-if="requestError" class="w-full space-y-4 flex items-center justify-between">
             <Heading size="lg" class="mb-0!" :text="__('statamic::messages.outpost_issue_try_later')" icon="warning-diamond" />
@@ -38,7 +45,11 @@ defineProps(['requestError', 'statamic', 'addons']);
                             </TableCell>
                             <TableCell>{{ statamic.currentVersion }}</TableCell>
                             <TableCell v-if="statamic.availableUpdatesCount" class="text-right">
-                                <Badge size="sm" color="amber">{{ __n('1 update|:count updates', statamic.availableUpdatesCount) }}</Badge>
+                                <Badge
+                                    size="sm"
+                                    :text="__n('1 update|:count updates', statamic.availableUpdatesCount)"
+                                    :color="statamic.critical ? 'red' : 'amber'"
+                                />
                             </TableCell>
                             <TableCell v-else class="text-right">{{ __('Up to date') }}</TableCell>
                         </TableRow>
@@ -63,7 +74,11 @@ defineProps(['requestError', 'statamic', 'addons']);
                             </TableCell>
                             <TableCell>{{ addon.version }}</TableCell>
                             <TableCell v-if="addon.availableUpdatesCount" class="text-right">
-                                <Badge size="sm" color="amber">{{ __n('1 update|:count updates', addon.availableUpdatesCount) }}</Badge>
+                                <Badge
+                                    size="sm"
+                                    :text="__n('1 update|:count updates', addon.availableUpdatesCount)"
+                                    :color="addon.critical ? 'red' : 'amber'"
+                                />
                             </TableCell>
                             <TableCell v-else class="text-right">{{ __('Up to date') }}</TableCell>
                         </TableRow>
diff --git a/resources/views/nav/updates.blade.php b/resources/views/nav/updates.blade.php
@@ -1,5 +1,5 @@
 <li>
-    <inertia-link href="{{ $item->url() }}" class="flex items-centerb gap-2 sm:gap-3 {{ $item->isActive() ? 'active' : '' }}">
+    <inertia-link href="{{ $item->url() }}" class="flex items-center gap-2 sm:gap-3 {{ $item->isActive() ? 'active' : '' }}">
         @cp_svg('icons/updates', 'size-4 shrink-0')
         <span v-pre>{{ __($item->name()) }}</span>
         <updates-badge class="-ml-1.5"></updates-badge>
diff --git a/src/Http/Controllers/CP/Updater/UpdaterController.php b/src/Http/Controllers/CP/Updater/UpdaterController.php
@@ -33,12 +33,14 @@ public function index(Licenses $licenses)
             'statamic' => [
                 'currentVersion' => $changelog->currentVersion(),
                 'availableUpdatesCount' => $changelog->availableUpdatesCount(),
+                'critical' => $changelog->hasCriticalUpdate(),
             ],
             'addons' => $addons->filter->existsOnMarketplace()->map(fn ($addon) => [
                 'name' => $addon->name(),
                 'slug' => $addon->slug(),
                 'version' => $addon->version(),
                 'availableUpdatesCount' => $addon->changelog()->availableUpdatesCount(),
+                'critical' => $addon->changelog()->hasCriticalUpdate(),
             ])->values()->all(),
         ]);
     }
@@ -50,6 +52,6 @@ public function count(Request $request)
     {
         $this->authorize('view updates');
 
-        return UpdatesOverview::count();
+        return UpdatesOverview::badge();
     }
 }
diff --git a/src/Updater/Changelog.php b/src/Updater/Changelog.php
@@ -70,6 +70,7 @@ protected function transformReleases($releases, $page = 1)
                 'licensed' => $this->isLicensed($release['version']),
                 'date' => Carbon::parse($release['date'])->toIso8601String(),
                 'body' => $release['changelog'],
+                'critical' => $release['critical'] ?? false,
             ];
         });
     }
@@ -86,6 +87,18 @@ public function availableUpdatesCount()
         })->count();
     }
 
+    /**
+     * Check if any available upgrade is marked as critical.
+     *
+     * @return bool
+     */
+    public function hasCriticalUpdate()
+    {
+        return $this->get()->contains(function ($release) {
+            return $release->type === 'upgrade' && $release->critical;
+        });
+    }
+
     /**
      * Get latest release.
      *
diff --git a/src/Updater/UpdatesOverview.php b/src/Updater/UpdatesOverview.php
@@ -15,6 +15,7 @@ class UpdatesOverview
 
     protected $count;
     protected $statamic;
+    protected $critical;
     protected $addons;
 
     /**
@@ -47,6 +48,29 @@ public function updatableAddons()
         return $this->getCached('updates-overview.addons');
     }
 
+    /**
+     * Check if a critical update is available (Statamic or any addon).
+     *
+     * @return bool
+     */
+    public function hasCriticalUpdate()
+    {
+        return $this->getCached('updates-overview.critical');
+    }
+
+    /**
+     * Get badge data (count and whether there is a critical update).
+     *
+     * @return array{count: int, critical: bool}
+     */
+    public function badge()
+    {
+        return [
+            'count' => $this->count(),
+            'critical' => $this->hasCriticalUpdate(),
+        ];
+    }
+
     /**
      * Get value from cache.
      *
@@ -83,6 +107,7 @@ protected function resetState()
     {
         $this->count = 0;
         $this->statamic = false;
+        $this->critical = false;
         $this->addons = [];
 
         return $this;
@@ -106,6 +131,10 @@ protected function checkForStatamicUpdates()
             $this->count++;
         }
 
+        if ($this->statamic && Marketplace::statamic()->changelog()->hasCriticalUpdate()) {
+            $this->critical = true;
+        }
+
         return $this;
     }
 
@@ -116,11 +145,17 @@ protected function checkForStatamicUpdates()
      */
     protected function checkForAddonUpdates()
     {
-        $this->addons = Addon::all()
-            ->reject->isLatestVersion()
-            ->map->id()
-            ->values()
-            ->all();
+        $updatableAddons = Addon::all()->reject->isLatestVersion();
+
+        foreach ($updatableAddons as $addon) {
+            if ($addon->changelog()->hasCriticalUpdate()) {
+                $this->critical = true;
+                break;
+            }
+        }
+
+        $this->addons = $updatableAddons->map->id()->values()->all();
+        $this->count += count($this->addons);
 
         return $this;
     }
@@ -136,6 +171,7 @@ protected function cache()
 
         Cache::put('updates-overview.count', $this->count, $expiry);
         Cache::put('updates-overview.statamic', $this->statamic, $expiry);
+        Cache::put('updates-overview.critical', $this->critical, $expiry);
         Cache::put('updates-overview.addons', $this->addons, $expiry);
 
         return $this;
diff --git a/src/Widgets/Updater.php b/src/Widgets/Updater.php
@@ -18,19 +18,22 @@ public function component()
         $items = collect(UpdatesOverview::updatableAddons())->map(function ($id) {
             $addon = Addon::get($id);
 
+            $changelog = $addon->changelog();
+
             return [
                 'name' => $addon->name(),
-                'count' => $addon->changelog()->availableUpdatesCount(),
-                'critical' => false,
+                'count' => $changelog->availableUpdatesCount(),
+                'critical' => $changelog->hasCriticalUpdate(),
                 'url' => cp_route('updater.product', $addon->slug()),
             ];
         });
 
         if (UpdatesOverview::hasStatamicUpdate()) {
+            $changelog = Marketplace::statamic()->changelog();
             $items->push([
                 'name' => 'Statamic Core',
-                'count' => Marketplace::statamic()->changelog()->availableUpdatesCount(),
-                'critical' => false,
+                'count' => $changelog->availableUpdatesCount(),
+                'critical' => $changelog->hasCriticalUpdate(),
                 'url' => cp_route('updater.product', 'statamic'),
             ]);
         }
diff --git a/tests/Composer/ChangelogTests.php b/tests/Composer/ChangelogTests.php
diff --git a/tests/Updater/UpdatesOverviewTest.php b/tests/Updater/UpdatesOverviewTest.php

Original file line number	Diff line number	Diff line change
`@@ -33,12 +33,14 @@ public function index(Licenses $licenses)`
`33`	`33`	`'statamic' => [`
`34`	`34`	`'currentVersion' => $changelog->currentVersion(),`
`35`	`35`	`'availableUpdatesCount' => $changelog->availableUpdatesCount(),`
	`36`	`+ 'critical' => $changelog->hasCriticalUpdate(),`
`36`	`37`	`],`
`37`	`38`	`'addons' => $addons->filter->existsOnMarketplace()->map(fn ($addon) => [`
`38`	`39`	`'name' => $addon->name(),`
`39`	`40`	`'slug' => $addon->slug(),`
`40`	`41`	`'version' => $addon->version(),`
`41`	`42`	`'availableUpdatesCount' => $addon->changelog()->availableUpdatesCount(),`
	`43`	`+ 'critical' => $addon->changelog()->hasCriticalUpdate(),`
`42`	`44`	`])->values()->all(),`
`43`	`45`	`]);`
`44`	`46`	`}`
`@@ -50,6 +52,6 @@ public function count(Request $request)`
`50`	`52`	`{`
`51`	`53`	`$this->authorize('view updates');`
`52`	`54`
`53`		`- return UpdatesOverview::count();`
	`55`	`+ return UpdatesOverview::badge();`
`54`	`56`	`}`
`55`	`57`	`}`