From 8401d213921fac5048d73a876dd050e507dede5d Mon Sep 17 00:00:00 2001
From: Stefan Dej <meteyou@gmail.com>
Date: Mon, 24 Jul 2023 22:57:53 +0200
Subject: [PATCH 1/4] refactor: remove notification texts

Signed-off-by: Stefan Dej <meteyou@gmail.com>
---
 .../panels/Machine/UpdatePanel/Entry.vue      | 22 -------------------
 1 file changed, 22 deletions(-)

diff --git a/src/components/panels/Machine/UpdatePanel/Entry.vue b/src/components/panels/Machine/UpdatePanel/Entry.vue
index 707199e96..f03155690 100644
--- a/src/components/panels/Machine/UpdatePanel/Entry.vue
+++ b/src/components/panels/Machine/UpdatePanel/Entry.vue
@@ -70,13 +70,6 @@
                 </v-chip>
             </v-col>
         </v-row>
-        <v-row v-if="notificationText" class="mt-0">
-            <v-col class="px-6 pt-0">
-                <v-alert text dense :color="notificationColor" :icon="notificationIcon" border="left">
-                    {{ notificationText }}
-                </v-alert>
-            </v-col>
-        </v-row>
         <v-row v-if="gitMessages.length" class="mt-0">
             <v-col class="px-6 pt-0">
                 <v-alert
@@ -293,21 +286,6 @@ export default class UpdatePanelEntry extends Mixins(BaseMixin) {
         return this.$t('Machine.UpdatePanel.UpToDate')
     }
 
-    get notificationText() {
-        if (this.isDetached) return this.$t('Machine.UpdatePanel.Notification.Detached')
-        if (this.isDirty) return this.$t('Machine.UpdatePanel.Notification.Dirty')
-
-        return null
-    }
-
-    get notificationColor() {
-        return this.btnColor
-    }
-
-    get notificationIcon() {
-        return this.btnIcon
-    }
-
     get gitMessages() {
         return this.repo.git_messages ?? []
     }

From f140dbb17b037a206ee45a116dc8839994245419 Mon Sep 17 00:00:00 2001
From: Stefan Dej <meteyou@gmail.com>
Date: Tue, 25 Jul 2023 15:27:05 +0200
Subject: [PATCH 2/4] refactor: add anomalies

Signed-off-by: Stefan Dej <meteyou@gmail.com>
---
 .../panels/Machine/UpdatePanel/Entry.vue       | 18 ++++++++++++++++++
 src/store/server/updateManager/types.ts        |  1 +
 2 files changed, 19 insertions(+)

diff --git a/src/components/panels/Machine/UpdatePanel/Entry.vue b/src/components/panels/Machine/UpdatePanel/Entry.vue
index f03155690..5c22082f6 100644
--- a/src/components/panels/Machine/UpdatePanel/Entry.vue
+++ b/src/components/panels/Machine/UpdatePanel/Entry.vue
@@ -70,6 +70,20 @@
                 </v-chip>
             </v-col>
         </v-row>
+        <v-row v-if="anomalies.length" class="mt-0">
+            <v-col class="px-6 pt-0">
+                <v-alert
+                    v-for="(message, index) in anomalies"
+                    :key="'anomalies_' + index"
+                    text
+                    dense
+                    border="left"
+                    type="info"
+                    :icon="mdiAlertCircle">
+                    {{ message }}
+                </v-alert>
+            </v-col>
+        </v-row>
         <v-row v-if="gitMessages.length" class="mt-0">
             <v-col class="px-6 pt-0">
                 <v-alert
@@ -290,6 +304,10 @@ export default class UpdatePanelEntry extends Mixins(BaseMixin) {
         return this.repo.git_messages ?? []
     }
 
+    get anomalies() {
+        return this.repo.anomalies ?? []
+    }
+
     get warnings() {
         return this.repo.warnings ?? []
     }
diff --git a/src/store/server/updateManager/types.ts b/src/store/server/updateManager/types.ts
index 3d51e40a8..1a0e24fb7 100644
--- a/src/store/server/updateManager/types.ts
+++ b/src/store/server/updateManager/types.ts
@@ -51,6 +51,7 @@ export interface ServerUpdateManagerStateGitRepo {
     debug_enabled?: boolean
     commits_behind?: ServerUpdateManagerStateGitRepoCommit[]
     git_messages?: string[]
+    anomalies?: string[]
     warnings?: string[]
     info_tags?: string[]
 }

From 288a9e04e05b6815cf8592a2f0c3e8eb69a76de2 Mon Sep 17 00:00:00 2001
From: Stefan Dej <meteyou@gmail.com>
Date: Wed, 26 Jul 2023 00:00:10 +0200
Subject: [PATCH 3/4] refactor: WIP

Signed-off-by: Stefan Dej <meteyou@gmail.com>
---
 .../panels/Machine/UpdatePanel/Entry.vue      | 83 ++++++++++---------
 src/locales/en.json                           |  1 +
 src/store/server/updateManager/types.ts       |  2 +
 3 files changed, 45 insertions(+), 41 deletions(-)

diff --git a/src/components/panels/Machine/UpdatePanel/Entry.vue b/src/components/panels/Machine/UpdatePanel/Entry.vue
index 5c22082f6..13fe9730e 100644
--- a/src/components/panels/Machine/UpdatePanel/Entry.vue
+++ b/src/components/panels/Machine/UpdatePanel/Entry.vue
@@ -19,7 +19,17 @@
                 <span v-else>{{ versionOutput }}</span>
             </v-col>
             <v-col class="col-auto pr-6 text-right" align-self="center">
-                <template v-if="needsRecovery">
+                <v-chip
+                    v-if="anomalies.length > 0"
+                    small
+                    label
+                    outlined
+                    color="primary"
+                    class="minwidth-0 px-1 mr-2"
+                    @click="toggleAnomalies = !toggleAnomalies">
+                    <v-icon small>{{ mdiInformation }}</v-icon>
+                </v-chip>
+                <template v-if="!isValid">
                     <v-menu :offset-y="true">
                         <template #activator="{ on, attrs }">
                             <v-chip
@@ -37,16 +47,16 @@
                             </v-chip>
                         </template>
                         <v-list dense class="py-0">
-                            <v-list-item @click="doRecovery(false)">
-                                <v-list-item-icon class="mr-0">
+                            <v-list-item v-if="!isCorrupt" @click="doRecovery(false)">
+                                <v-list-item-icon class="mr-0 pt-1">
                                     <v-icon small>{{ mdiReload }}</v-icon>
                                 </v-list-item-icon>
                                 <v-list-item-content>
                                     <v-list-item-title>{{ $t('Machine.UpdatePanel.SoftRecovery') }}</v-list-item-title>
                                 </v-list-item-content>
                             </v-list-item>
-                            <v-list-item @click="doRecovery(true)">
-                                <v-list-item-icon class="mr-0">
+                            <v-list-item :disabled="!existsRecoveryUrl" @click="doRecovery(true)">
+                                <v-list-item-icon class="mr-0 pt-1">
                                     <v-icon small>{{ mdiReload }}</v-icon>
                                 </v-list-item-icon>
                                 <v-list-item-content>
@@ -70,43 +80,30 @@
                 </v-chip>
             </v-col>
         </v-row>
-        <v-row v-if="anomalies.length" class="mt-0">
-            <v-col class="px-6 pt-0">
-                <v-alert
-                    v-for="(message, index) in anomalies"
-                    :key="'anomalies_' + index"
-                    text
-                    dense
-                    border="left"
-                    type="info"
-                    :icon="mdiAlertCircle">
-                    {{ message }}
-                </v-alert>
-            </v-col>
-        </v-row>
-        <v-row v-if="gitMessages.length" class="mt-0">
+        <v-row v-if="warnings.length" class="mt-0">
             <v-col class="px-6 pt-0">
                 <v-alert
-                    v-for="(message, index) in gitMessages"
-                    :key="'message_' + index"
+                    v-for="(message, index) in warnings"
+                    :key="'warnings_' + index"
                     text
                     dense
                     border="left"
-                    type="info">
+                    color="orange"
+                    :icon="mdiCloseCircle">
                     {{ message }}
                 </v-alert>
             </v-col>
         </v-row>
-        <v-row v-if="warnings.length" class="mt-0">
+        <v-row v-show="toggleAnomalies" class="mt-0">
             <v-col class="px-6 pt-0">
                 <v-alert
-                    v-for="(message, index) in warnings"
-                    :key="'warnings_' + index"
+                    v-for="(message, index) in anomalies"
+                    :key="'anomalies_' + index"
                     text
                     dense
                     border="left"
-                    color="orange"
-                    :icon="mdiAlertCircle">
+                    color="info"
+                    :icon="mdiInformation">
                     {{ message }}
                 </v-alert>
             </v-col>
@@ -130,7 +127,7 @@ import { Component, Mixins, Prop } from 'vue-property-decorator'
 import BaseMixin from '@/components/mixins/base'
 import { ServerUpdateManagerStateGitRepo } from '@/store/server/updateManager/types'
 import {
-    mdiAlertCircle,
+    mdiCloseCircle,
     mdiCheck,
     mdiHelpCircleOutline,
     mdiInformation,
@@ -148,11 +145,13 @@ export default class UpdatePanelEntry extends Mixins(BaseMixin) {
     mdiInformation = mdiInformation
     mdiMenuDown = mdiMenuDown
     mdiReload = mdiReload
-    mdiAlertCircle = mdiAlertCircle
+    mdiCloseCircle = mdiCloseCircle
 
     boolShowCommitList = false
     boolShowUpdateHint = false
 
+    toggleAnomalies = false
+
     @Prop({ required: true }) readonly repo!: ServerUpdateManagerStateGitRepo
 
     get name() {
@@ -237,6 +236,10 @@ export default class UpdatePanelEntry extends Mixins(BaseMixin) {
         return this.repo.is_dirty ?? false
     }
 
+    get isCorrupt() {
+        return this.repo.corrupt ?? false
+    }
+
     get debugEnabled() {
         return this.repo.debug_enabled ?? false
     }
@@ -247,19 +250,21 @@ export default class UpdatePanelEntry extends Mixins(BaseMixin) {
         return !this.debugEnabled && (this.repo.detached ?? false)
     }
 
-    get needsRecovery() {
-        return !this.isValid || this.isDirty
+    get existsRecoveryUrl() {
+        const url = this.repo.recovery_url ?? '?'
+
+        return url !== '?'
     }
 
     get btnDisabled() {
         if (['printing', 'paused'].includes(this.printer_state)) return true
-        if (!this.isValid || this.isDirty || this.commitsBehind.length) return false
+        if (!this.isValid || this.isCorrupt || this.isDirty || this.commitsBehind.length) return false
 
         return !(this.localVersion && this.remoteVersion && semver.gt(this.remoteVersion, this.localVersion))
     }
 
     get btnIcon() {
-        if (this.isDetached || !this.isValid || this.isDirty) return mdiAlertCircle
+        if (this.isDetached || !this.isValid || this.isCorrupt || this.isDirty) return mdiCloseCircle
 
         if (
             this.commitsBehind.length ||
@@ -273,8 +278,7 @@ export default class UpdatePanelEntry extends Mixins(BaseMixin) {
     }
 
     get btnColor() {
-        if (this.isDetached || !this.isValid) return 'orange'
-        if (this.isDirty) return 'red'
+        if (this.isCorrupt || this.isDetached || this.isDirty || !this.isValid) return 'orange'
 
         if (
             this.commitsBehind.length ||
@@ -286,9 +290,10 @@ export default class UpdatePanelEntry extends Mixins(BaseMixin) {
     }
 
     get btnText() {
+        if (this.isCorrupt) return this.$t('Machine.UpdatePanel.Corrupt')
         if (this.isDetached) return this.$t('Machine.UpdatePanel.Detached')
-        if (!this.isValid) return this.$t('Machine.UpdatePanel.Invalid')
         if (this.isDirty) return this.$t('Machine.UpdatePanel.Dirty')
+        if (!this.isValid) return this.$t('Machine.UpdatePanel.Invalid')
         if (
             this.commitsBehind.length ||
             (this.localVersion && this.remoteVersion && semver.gt(this.remoteVersion, this.localVersion))
@@ -300,10 +305,6 @@ export default class UpdatePanelEntry extends Mixins(BaseMixin) {
         return this.$t('Machine.UpdatePanel.UpToDate')
     }
 
-    get gitMessages() {
-        return this.repo.git_messages ?? []
-    }
-
     get anomalies() {
         return this.repo.anomalies ?? []
     }
diff --git a/src/locales/en.json b/src/locales/en.json
index 9bdd6b0a9..7d55092ea 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -490,6 +490,7 @@
             "CommittedHoursAgo": "committed {hours} hours ago",
             "CommittedOnDate": "committed on {date}",
             "CommittedYesterday": "committed yesterday",
+            "Corrupt": "corrupt",
             "ConfigChanges": "Config Changes",
             "CountPackagesCanBeUpgraded": "{count} packages can be upgraded",
             "Detached": "detached",
diff --git a/src/store/server/updateManager/types.ts b/src/store/server/updateManager/types.ts
index 1a0e24fb7..3e2361a46 100644
--- a/src/store/server/updateManager/types.ts
+++ b/src/store/server/updateManager/types.ts
@@ -47,6 +47,7 @@ export interface ServerUpdateManagerStateGitRepo {
     remote_hash?: string
     is_valid?: boolean
     is_dirty?: boolean
+    corrupt?: boolean
     detached?: boolean
     debug_enabled?: boolean
     commits_behind?: ServerUpdateManagerStateGitRepoCommit[]
@@ -54,6 +55,7 @@ export interface ServerUpdateManagerStateGitRepo {
     anomalies?: string[]
     warnings?: string[]
     info_tags?: string[]
+    recovery_url?: string
 }
 
 export interface ServerUpdateManagerStateGitRepoGroupedCommits {

From 320c8f7976e4850dbf0bae9059d31e43a3c5a339 Mon Sep 17 00:00:00 2001
From: Stefan Dej <meteyou@gmail.com>
Date: Sat, 29 Jul 2023 20:16:15 +0200
Subject: [PATCH 4/4] fix: fix issue with wrong repo_name in links to github

Signed-off-by: Stefan Dej <meteyou@gmail.com>
---
 src/components/panels/Machine/UpdatePanel/Entry.vue       | 6 +++++-
 .../Machine/UpdatePanel/GitCommitsListDayCommit.vue       | 6 +++++-
 .../panels/Machine/UpdatePanel/UpdateHintAlert.vue        | 8 ++++++--
 src/store/server/updateManager/types.ts                   | 1 +
 4 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/src/components/panels/Machine/UpdatePanel/Entry.vue b/src/components/panels/Machine/UpdatePanel/Entry.vue
index 13fe9730e..1ea5d2859 100644
--- a/src/components/panels/Machine/UpdatePanel/Entry.vue
+++ b/src/components/panels/Machine/UpdatePanel/Entry.vue
@@ -320,8 +320,12 @@ export default class UpdatePanelEntry extends Mixins(BaseMixin) {
         return semver.gt(this.remoteVersion, this.localVersion)
     }
 
+    get repo_name() {
+        return this.repo.repo_name ?? this.repo.name ?? ''
+    }
+
     get webLinkRelease() {
-        return `https://github.com/${this.repo.owner}/${this.repo.name}/releases/tag/${this.repo.remote_version}`
+        return `https://github.com/${this.repo.owner}/${this.repo_name}/releases/tag/${this.repo.remote_version}`
     }
 
     get hideUpdateWarning() {
diff --git a/src/components/panels/Machine/UpdatePanel/GitCommitsListDayCommit.vue b/src/components/panels/Machine/UpdatePanel/GitCommitsListDayCommit.vue
index 47df5d42e..7fcde9471 100644
--- a/src/components/panels/Machine/UpdatePanel/GitCommitsListDayCommit.vue
+++ b/src/components/panels/Machine/UpdatePanel/GitCommitsListDayCommit.vue
@@ -85,8 +85,12 @@ export default class GitCommitsListDayCommit extends Mixins(BaseMixin) {
             })
     }
 
+    get repo_name() {
+        return this.repo.repo_name ?? this.repo.name ?? ''
+    }
+
     get commitHref() {
-        return `https://github.com/${this.repo.owner}/${this.repo.name}/commit/${this.commit.sha}`
+        return `https://github.com/${this.repo.owner}/${this.repo_name}/commit/${this.commit.sha}`
     }
 
     get commitShortSha() {
diff --git a/src/components/panels/Machine/UpdatePanel/UpdateHintAlert.vue b/src/components/panels/Machine/UpdatePanel/UpdateHintAlert.vue
index 15a38f9e1..97c15c621 100644
--- a/src/components/panels/Machine/UpdatePanel/UpdateHintAlert.vue
+++ b/src/components/panels/Machine/UpdatePanel/UpdateHintAlert.vue
@@ -69,13 +69,17 @@ export default class UpdateHintAlert extends Mixins(BaseMixin) {
         return null
     }
 
+    get repo_name() {
+        return this.repo.repo_name ?? this.repo.name ?? ''
+    }
+
     get externalLink() {
         if (this.name === 'klipper') return '//www.klipper3d.org/Config_Changes.html'
         if (this.name === 'moonraker') return '//moonraker.readthedocs.io/en/latest/changelog/'
         if (this.repo?.configured_type === 'web')
-            return `//github.com/${this.repo.owner}/${this.repo.name}/releases/tag/${this.repo.remote_version}`
+            return `//github.com/${this.repo.owner}/${this.repo_name}/releases/tag/${this.repo.remote_version}`
 
-        return `//github.com/${this.repo.owner}/${this.repo.name}`
+        return `//github.com/${this.repo.owner}/${this.repo_name}`
     }
 
     get externalLinkText() {
diff --git a/src/store/server/updateManager/types.ts b/src/store/server/updateManager/types.ts
index 3e2361a46..91dfbe121 100644
--- a/src/store/server/updateManager/types.ts
+++ b/src/store/server/updateManager/types.ts
@@ -32,6 +32,7 @@ export interface ServerUpdateManagerStateGitRepoCommit {
 
 export interface ServerUpdateManagerStateGitRepo {
     name: string
+    repo_name?: string
     configured_type: string
     detected_type?: string
     channel?: string