From 8189dadfbf2d7e910403d70f31b732e0f767d34c Mon Sep 17 00:00:00 2001
From: peter <peter.millauer@gmail.com>
Date: Sun, 9 Feb 2020 04:16:37 +0100
Subject: [PATCH] fix archive raid no reserves

---
 .../app/frontcraft/pages/raid/archive.component.ts  |  4 +++-
 .../app/frontcraft/pages/raid/raid.component.html   |  4 ++--
 .../src/app/frontcraft/pages/raid/raid.component.ts | 13 ++++++++++---
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/frontend/src/app/frontcraft/pages/raid/archive.component.ts b/src/frontend/src/app/frontcraft/pages/raid/archive.component.ts
index aa9d58d..df4da35 100644
--- a/src/frontend/src/app/frontcraft/pages/raid/archive.component.ts
+++ b/src/frontend/src/app/frontcraft/pages/raid/archive.component.ts
@@ -52,7 +52,9 @@ export class FrontcraftArchiveComponent implements OnInit{
       const raidManager = this.api.get('RaidManager')
       const raiddata = await raidManager.getArchiveRaid(parseInt(param))
       this.raid = raiddata
-      this.tokens = raiddata.tokens;
+      this.isTier = raiddata.tier != null
+      this.tokens = raiddata.tokens
+      this.displayedtokens = this.tokens;
 
       [
         ...raiddata.tanks, 
diff --git a/src/frontend/src/app/frontcraft/pages/raid/raid.component.html b/src/frontend/src/app/frontcraft/pages/raid/raid.component.html
index 4c9410c..412ade4 100644
--- a/src/frontend/src/app/frontcraft/pages/raid/raid.component.html
+++ b/src/frontend/src/app/frontcraft/pages/raid/raid.component.html
@@ -137,7 +137,7 @@
         <nb-card  *ngIf="isTier">
             <nb-card-body>
                 <nb-tabset>
-                    <nb-tab tabTitle="Reserves">
+                    <nb-tab tabTitle="Reserves" [active]="reservesShown">
                         <input type="text" nbInput [(ngModel)]="search" (change)="changeSearch()" placeholder="Search"
                             fullWidth="true">
 
@@ -162,7 +162,7 @@
                             </nb-list-item>
                         </nb-list>
                     </nb-tab>
-                    <nb-tab tabTitle="Items" *ngIf="isSignedup">
+                    <nb-tab tabTitle="Items" *ngIf="isSignedup" [active]="!reservesShown">
                         <shop [tier]="raid.tier" (onSelect)="itemSelect($event)"></shop>
                     </nb-tab>
                 </nb-tabset>
diff --git a/src/frontend/src/app/frontcraft/pages/raid/raid.component.ts b/src/frontend/src/app/frontcraft/pages/raid/raid.component.ts
index d243a1a..0b44473 100644
--- a/src/frontend/src/app/frontcraft/pages/raid/raid.component.ts
+++ b/src/frontend/src/app/frontcraft/pages/raid/raid.component.ts
@@ -18,6 +18,7 @@ export class FrontcraftRaidComponent implements OnInit, OnDestroy{
     isSignedup = false
     islate = false
     isTier = false
+    reservesShown = true
     manageRaid
     mySignup: (Signup & Character & Spec)
 
@@ -36,7 +37,7 @@ export class FrontcraftRaidComponent implements OnInit, OnDestroy{
       tanks: [],
       healers: [],
       tokens:{},
-      tier: 'MC'
+      tier: 'null'
     }
     tokens = {}
     displayedtokens = {}
@@ -79,8 +80,6 @@ export class FrontcraftRaidComponent implements OnInit, OnDestroy{
       this.uuid = res.uuid
     }
 
- 
-
     itemSelect = async(item) => {
       this.dialogService.open(FrontcraftBuyTokenComponent, {
         context: {
@@ -89,6 +88,10 @@ export class FrontcraftRaidComponent implements OnInit, OnDestroy{
           tier: this.raid.tier,
           characterName: this.mySignup.charactername
         }
+      }).onClose.subscribe(() => {
+        this.refresh().then(()=>{
+          this.reservesShown = true
+        })
       })
     }
 
@@ -102,6 +105,10 @@ export class FrontcraftRaidComponent implements OnInit, OnDestroy{
         context: {
           raid: this.raid,
         } 
+      }).onClose.subscribe(() => {
+        this.refresh().then(()=>{
+          this.reservesShown = false
+        })
       })
     }