feat: show custom update modal

Commandos-app · Aug 30, 2021 · 5f4bbb9 · 5f4bbb9
1 parent 9489149
commit 5f4bbb9
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 6 deletions.
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "app"
-version = "0.7.5"
+version = "0.7.0"
 description = "Commandos is a multi git repo client"
 authors = [ "Dominik Schenk" ]
 license = ""

diff --git a/src/app/app.component.html b/src/app/app.component.html
@@ -22,4 +22,4 @@
     </footer> -->
 </div>
 <app-commander-modal *ngIf="commanderModalService.open"></app-commander-modal>
-<commandos-update-modal *ngIf="update && update.shouldUpdate" [update]="update"></commandos-update-modal>
+<commandos-update-modal *ngIf="hasUpdate" [update]="update" (close)="closeUpdate()"></commandos-update-modal>
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
@@ -15,6 +15,7 @@ import { UpdateResult } from '@tauri-apps/api/updater';
 export class AppComponent {
     devEnv: boolean = !environment.production;
     update: UpdateResult;
+    hasUpdate: boolean = false;
 
     constructor(
         private translate: TranslateService,
@@ -58,9 +59,12 @@ export class AppComponent {
         this.registerNewRepoCommand();
 
         this.update = await this.tauriService.checkUpdate();
-        console.log(`TCL: ~ file: app.component.ts ~ line 61 ~ AppComponent ~ load ~ this.update`, this.update);
+        this.hasUpdate = this.update.shouldUpdate;
     }
 
+    closeUpdate() {
+        this.hasUpdate = false;
+    }
 
     private setDarkMode() {
         if (this.storeService.DarkMode) {

diff --git a/src/app/shared/components/update-modal/update-modal.component.html b/src/app/shared/components/update-modal/update-modal.component.html
@@ -6,7 +6,7 @@ <h3 cds-text="title">Command update version v{{version}}</h3>
         <div [innerHtml]="manifest"></div>
     </cds-modal-content>
     <cds-modal-actions>
-        <cds-button action="flat" (click)="cancel()">Cancel</cds-button>
+        <cds-button action="flat" (click)="cancel()">Keep current Version</cds-button>
         <cds-button (click)="startUpdate()">Update Commandos</cds-button>
     </cds-modal-actions>
 </cds-modal>
diff --git a/src/app/shared/components/update-modal/update-modal.component.ts b/src/app/shared/components/update-modal/update-modal.component.ts
@@ -1,4 +1,4 @@
-import { Component, Input, OnInit, SecurityContext } from '@angular/core';
+import { Component, EventEmitter, Input, OnInit, Output, SecurityContext } from '@angular/core';
 import { DomSanitizer } from '@angular/platform-browser';
 import { relaunch } from "@tauri-apps/api/process";
 import { installUpdate, UpdateResult } from '@tauri-apps/api/updater';
@@ -15,12 +15,16 @@ export class UpdateModalComponent implements OnInit {
     version: string;
     manifest: string;
 
+    @Output() close = new EventEmitter();
 
     @Input()
     public set update(value: UpdateResult) {
         this.version = value.manifest.version;
         const manifest = marked(value.manifest.body);
         this.manifest = this.domSanitizer.sanitize(SecurityContext.HTML, manifest);
+        this.manifest += this.manifest;
+        this.manifest += this.manifest;
+        this.manifest += this.manifest;
     }
 
 
@@ -37,6 +41,6 @@ export class UpdateModalComponent implements OnInit {
     }
 
     cancel() {
-
+        this.close.emit();
     }
 }