Merge branch 'mainsail-crew:develop' into use-client_extrude

mainsail-crew · Aug 7, 2024 · c7c660f · c7c660f
2 parents 4dcddb0 + 85d898a
commit c7c660f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/src/components/panels/Machine/UpdatePanel/Entry.vue b/src/components/panels/Machine/UpdatePanel/Entry.vue
@@ -2,7 +2,7 @@
     <div>
         <v-row class="py-2">
             <v-col class="pl-6">
-                <strong>{{ repo.name }}</strong>
+                <strong>{{ name }}</strong>
                 <br />
                 <template v-if="type === 'git_repo' && commitsBehind.length">
                     <a class="info--text cursor--pointer" @click="boolShowCommitList = true">
@@ -159,6 +159,11 @@ export default class UpdatePanelEntry extends Mixins(BaseMixin) {
     @Prop({ required: true }) readonly repo!: ServerUpdateManagerStateGitRepo
 
     get name() {
+        const info_tags = this.repo.info_tags ?? []
+        const description = info_tags.find((tag) => tag.startsWith('desc='))
+
+        if (description && description.trim() !== 'desc=') return description.replace('desc=', '').trim()
+
         return this.repo.name ?? 'UNKNOWN'
     }
 

diff --git a/src/plugins/helpers.ts b/src/plugins/helpers.ts
@@ -72,11 +72,11 @@ export function formatConsoleMessage(message: string): string {
     message = message.replace(/\n\/\/ /g, '\n')
     // remove echo
     message = message.replace(/^echo:/g, '')
-    message = message.replace(/^echo: /g, '')
     // replace linebreaks with html <br>
     message = message.replace('\n// ', '<br>')
     message = message.replace(/\r\n|\r|\n/g, '<br>')
-    return message
+
+    return message.trim()
 }
 
 export const convertName = (name: string): string => {