Fix backup page

show full/incremental and CRON expressions

Author: luigidellaquila

orientdb-studio.iml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" version="4">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

src/app/administration/stats/backup/singlebackup.component.html

@@ -52,14 +52,14 @@
                                 <div class="form-group" *ngIf="mode == '3' || mode == '2'">
                                     <label class="col-sm-3 control-label">Full Backup</label>
                                     <div class="col-sm-9">
-                                        <cron *ngIf="backup.modes['FULL_BACKUP']" [cron]="backup.modes['FULL_BACKUP'].when"
+                                        <cron *ngIf="backup.modes['FULL_BACKUP']" [cronVal]="backup.modes['FULL_BACKUP'].when"
                                             (changed)="onChange('2',$event)"></cron>
                                     </div>
                                 </div>
                                 <div class="form-group" *ngIf="mode == '3' || mode == '1'">
                                     <label class="col-sm-3 control-label">Incremental Backup</label>
                                     <div class="col-sm-9">
-                                        <cron *ngIf="backup.modes['INCREMENTAL_BACKUP']" [cron]="backup.modes['INCREMENTAL_BACKUP'].when"
+                                        <cron *ngIf="backup.modes['INCREMENTAL_BACKUP']" [cronVal]="backup.modes['INCREMENTAL_BACKUP'].when"
                                             (changed)="onChange('1',$event)"></cron>
                                     </div>
                                 </div>
@@ -109,4 +109,4 @@
             </div>
         </div>
     </div>
-</div>
+</div>

src/app/administration/stats/backup/singlebackup.component.ts

@@ -125,6 +125,14 @@ class SingleBackupComponent implements OnInit, OnDestroy, OnChanges {
   ngOnInit(): void {
     this.ee = this.agent.active;
     this.canEdit = this.permissionService.isAllow("server.backup.edit");
+
+      if(this.backup.modes["INCREMENTAL_BACKUP"] && this.backup.modes["FULL_BACKUP"]){
+          this.mode = "3";
+        } else if(this.backup.modes["INCREMENTAL_BACKUP"]){
+          this.mode = "1";
+        } else {
+          this.mode = "2";
+        }
   }
 
   ngOnChanges(changes: SimpleChanges) {

src/app/util/cron.component.ts

@@ -21,7 +21,7 @@ export class CronComponent implements OnInit, OnChanges {
   constructor(private elem: ElementRef) {}
 
   @Input()
-  private cron;
+  private cronVal;
 
   @Output()
   private changed: EventEmitter<any> = new EventEmitter();
@@ -33,6 +33,7 @@ export class CronComponent implements OnInit, OnChanges {
   }
   ngOnInit(): void {
     let self = this;
+
     this.cronElement = $(this.elem.nativeElement).cron({
       onChange: function() {
         self.changed.emit($(this).cron("value"));
@@ -41,7 +42,8 @@ export class CronComponent implements OnInit, OnChanges {
         "5 Minutes": "0 0/5 * * * ?",
         "10 Minutes": "0 0/10 * * * ?",
         "30 Minutes": "0 0/30 * * * ?"
-      }
+      },
+      initial: this.cronVal
     });
   }
 }