Merge pull request #6320 from FlowFuse/ui-update-scheduled-maintenance

knolleary · web-flow · commit 6755d2ca25d8 · 2025-11-21T11:26:23.000Z
Add Scheduled Maintenance pill to Overview
diff --git a/forge/ee/routes/autoUpdateStacks/index.js b/forge/ee/routes/autoUpdateStacks/index.js
@@ -35,7 +35,7 @@ module.exports = async function (app) {
      * @memberof forge.routes.api.project
      */
     app.get('/', {
-        preHandler: app.needsPermission('project:edit'),
+        preHandler: app.needsPermission('project:read'),
         schema: {
             summary: 'Returns when a Instance allowed to be restarted ',
             tags: ['Instances'],
diff --git a/frontend/src/components/expert/resources/FlowResourceCard.vue b/frontend/src/components/expert/resources/FlowResourceCard.vue
@@ -2,18 +2,18 @@
     <div class="flex flex-col gap-3 p-3 bg-white border border-gray-200 rounded-lg">
         <div class="flex items-start gap-2">
             <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none" viewBox="0 0 24 24" class="flex-shrink-0 w-4 h-4 mt-0.5">
-                    <rect width="24" height="24" fill="gray" rx="4" />
-                    <g clip-path="url(#a)">
-                        <path fill="#fff" d="M0 12v-1.647c5.09 0 5.81-.9 6.44-1.695.72-.9 1.46-1.6 3.88-1.6v1.648c-1.76 0-2.04.354-2.51.948C6.79 10.937 5.5 12 0 12Z" />
-                        <path fill="#fff" d="M8.6 16.941c-2.9 0-3.47-1.513-3.88-2.614C4.25 13.072 3.85 12 0 12v-1.647c4.67 0 5.67 1.618 6.34 3.419.38 1.015.57 1.522 2.26 1.522v1.647Z" />
-                        <path fill="#fff" d="M16.78 19H9.9c-.95 0-1.72-.737-1.72-1.647v-2.47c0-.91.77-1.648 1.72-1.648h6.88c.95 0 1.72.738 1.72 1.647v2.47c0 .91-.77 1.648-1.72 1.648Zm0-4.118H9.9v2.47h6.88v-2.47Zm1.5-4.117H11.4c-.95 0-1.72-.738-1.72-1.647v-2.47c0-.91.77-1.648 1.72-1.648h6.88c.95 0 1.72.737 1.72 1.647v2.47c0 .91-.77 1.648-1.72 1.648Zm0-4.118H11.4v2.47h6.88v-2.47Z" />
-                    </g>
-                    <defs>
-                        <clipPath id="a">
-                            <path fill="#fff" d="M0 5h20v14H0z" />
-                        </clipPath>
-                    </defs>
-                </svg>
+                <rect width="24" height="24" fill="gray" rx="4" />
+                <g clip-path="url(#a)">
+                    <path fill="#fff" d="M0 12v-1.647c5.09 0 5.81-.9 6.44-1.695.72-.9 1.46-1.6 3.88-1.6v1.648c-1.76 0-2.04.354-2.51.948C6.79 10.937 5.5 12 0 12Z" />
+                    <path fill="#fff" d="M8.6 16.941c-2.9 0-3.47-1.513-3.88-2.614C4.25 13.072 3.85 12 0 12v-1.647c4.67 0 5.67 1.618 6.34 3.419.38 1.015.57 1.522 2.26 1.522v1.647Z" />
+                    <path fill="#fff" d="M16.78 19H9.9c-.95 0-1.72-.737-1.72-1.647v-2.47c0-.91.77-1.648 1.72-1.648h6.88c.95 0 1.72.738 1.72 1.647v2.47c0 .91-.77 1.648-1.72 1.648Zm0-4.118H9.9v2.47h6.88v-2.47Zm1.5-4.117H11.4c-.95 0-1.72-.738-1.72-1.647v-2.47c0-.91.77-1.648 1.72-1.648h6.88c.95 0 1.72.737 1.72 1.647v2.47c0 .91-.77 1.648-1.72 1.648Zm0-4.118H11.4v2.47h6.88v-2.47Z" />
+                </g>
+                <defs>
+                    <clipPath id="a">
+                        <path fill="#fff" d="M0 5h20v14H0z" />
+                    </clipPath>
+                </defs>
+            </svg>
             <div class="flex-1 flex flex-col gap-1 min-w-0">
                 <div class="flex items-start justify-between gap-2">
                     <div class="text-sm font-medium text-gray-900 overflow-hidden text-ellipsis whitespace-nowrap flex-1 min-w-0">{{ flow.title }}</div>
diff --git a/frontend/src/pages/instance/Overview.vue b/frontend/src/pages/instance/Overview.vue
@@ -7,7 +7,7 @@
 
                     <table class="table-fixed w-full border border-separate rounded">
                         <tr class="border-b">
-                            <td class="w-40 font-medium">Editor</td>
+                            <td class="w-48 font-medium">Editor</td>
                             <td>
                                 <div v-if="editorAvailable">
                                     <div v-if="isVisitingAdmin || instance.settings.disableEditor" class="my-2">
@@ -65,7 +65,29 @@
                                     <template v-else>
                                         None
                                     </template>
-                                    <router-link class="mt-0.5 ml-3" :to="{ name: 'instance-settings-security' }"><LinkIcon class="w-4" /></router-link>
+                                    <router-link v-if="canEditProject" class="mt-0.5 ml-3" :to="{ name: 'instance-settings-security' }"><LinkIcon class="w-4" /></router-link>
+                                </div>
+                            </td>
+                        </tr>
+                        <tr class="border-b">
+                            <td class="font-medium">Scheduled Maintenance</td>
+                            <td class="py-2">
+                                <div class="flex">
+                                    <template v-if="autoStackUpgrade">
+                                        <StatusBadge
+                                            class="forge-status-running hover:text-blue-600"
+                                            status="Enabled"
+                                        />
+                                    </template>
+                                    <template v-else>
+                                        <StatusBadge
+                                            class="text-gray-400 hover:text-blue-600"
+                                            status="Disabled"
+                                        />
+                                    </template>
+                                    <router-link v-if="canEditProject" :to="{ name: 'instance-settings-maintenance' }" @click.stop>
+                                        <LinkIcon class="mt-0.5 ml-3 w-4" />
+                                    </router-link>
                                 </div>
                             </td>
                         </tr>
@@ -148,14 +170,18 @@ export default {
         }
     },
     setup () {
-        const { isVisitingAdmin } = usePermissions()
+        const { hasPermission, isVisitingAdmin } = usePermissions()
 
-        return { isVisitingAdmin }
+        return {
+            hasPermission,
+            isVisitingAdmin
+        }
     },
     data () {
         return {
             auditLog: [],
-            loading: true
+            loading: true,
+            autoStackUpgrade: false
         }
     },
     computed: {
@@ -173,15 +199,20 @@ export default {
                 return this.instance.settings.httpNodeAuth.type
             }
             return this.instance.template.settings.httpNodeAuth?.type
+        },
+        canEditProject () {
+            return this.hasPermission('project:edit', { application: this.instance.application })
         }
     },
     watch: {
         'instance.id': function (old, news) {
             this.loadLogs()
+            this.getUpdateSchedule(this.instance.id)
         }
     },
     mounted () {
         this.loadLogs()
+        this.getUpdateSchedule(this.instance.id)
     },
     methods: {
         loadLogs () {
@@ -202,6 +233,15 @@ export default {
         },
         loadItems: async function (instanceId, cursor) {
             return await InstanceApi.getInstanceAuditLog(instanceId, null, cursor, 4)
+        },
+        getUpdateSchedule: async function (instanceId) {
+            try {
+                await InstanceApi.getUpdateSchedule(instanceId)
+                this.autoStackUpgrade = true
+                return
+            } catch (error) {
+            }
+            this.autoStackUpgrade = false
         }
     }
 }
diff --git a/frontend/src/pages/instance/Settings/Maintenance.vue b/frontend/src/pages/instance/Settings/Maintenance.vue
@@ -7,7 +7,7 @@
                 Apply upgrades when available
                 <template #description>
                     <p>
-                        Select the day of the week and the hour during which the automatic upgrade will occur. The
+                        Select the day of the week and the hour during which the automatic upgrade will occur if available. The
                         upgrade will start within the selected hour.
                     </p>
                     <p class="my-3"><span class="font-bold">Note:</span> All times are stated in UTC.</p>
