From db75080cfee058a0fc57a42d4383471810deae23 Mon Sep 17 00:00:00 2001
From: Ramir Mesquita <ramir.mesquita@gmail.com>
Date: Wed, 20 Jul 2022 12:50:41 -0300
Subject: [PATCH 1/3] Adding capabilities property on session user and
 verifying the correct capability on menu rendering

---
 src/AppMenu.tsx | 69 ++++++++++++++++++++++++++++++++-----------------
 src/types.d.ts  |  1 +
 2 files changed, 47 insertions(+), 23 deletions(-)

diff --git a/src/AppMenu.tsx b/src/AppMenu.tsx
index 8592342..f2f42db 100644
--- a/src/AppMenu.tsx
+++ b/src/AppMenu.tsx
@@ -1,6 +1,8 @@
 import React from "react";
 import { Link } from "react-router-dom";
 
+import useCurrentUser from "./hooks/useCurrentUser";
+
 import playerSvg from "./assets/icons/player.svg";
 import skull from "./assets/icons/skull.svg";
 import sword from "./assets/icons/sword.svg";
@@ -14,6 +16,8 @@ interface GamesHQRouteOption {
   to: string;
 }
 export const AppMenu = ({ children }: { children: JSX.Element }) => {
+  const { currentUser } = useCurrentUser();
+
   const inspectRoutes = [
     { name: "Inspect Arena", to: "/inspect/arena", icon: playerSvg },
   ];
@@ -35,6 +39,7 @@ export const AppMenu = ({ children }: { children: JSX.Element }) => {
   const gameDevRoutes = [{ name: "Games", to: "/games", icon: games }];
 
   const generateRouteList = (route: GamesHQRouteOption[]) => {
+
     return route.map((route, i) => (
       <ul className="pt-4" key={i}>
         <Link to={route.to} className="items-center">
@@ -54,34 +59,52 @@ export const AppMenu = ({ children }: { children: JSX.Element }) => {
         </div>
         <div className="px-8 flex-col flex">
           <span className="pt-4" />
-          <span className="uppercase py-1 text-xs text-gray-400 font-semibold">
-            MY GAMES
-          </span>
-
-          {generateRouteList(gameDevRoutes)}
-
-          <span className="uppercase py-1 text-xs text-gray-400 font-semibold mt-12">
-            INSPECT LIVE GAMES
-          </span>
-
-          {generateRouteList(inspectRoutes)}
+          {currentUser?.capabilities.includes('MY_GAME_READ') && (
+            <>
+              <span className="uppercase py-1 text-xs text-gray-400 font-semibold">
+                MY GAMES
+              </span>
+              
+              {generateRouteList(gameDevRoutes)}
+              
+              <span className="uppercase py-1 text-xs text-gray-400 font-semibold mt-12">
+                INSPECT LIVE GAMES
+              </span>
+    
+              {generateRouteList(inspectRoutes)}
+            </>
 
-          <span className="uppercase py-1 text-xs text-gray-400 font-semibold mt-12">
-            GENERAL
-          </span>
+          )}
+          
+          {currentUser?.capabilities.includes('WEAPONS_READ') && (
+            <>
+              <span className="uppercase py-1 text-xs text-gray-400 font-semibold mt-12">
+                GENERAL
+              </span>
 
-          {generateRouteList(databaseRoutes)}
+              {generateRouteList(databaseRoutes)}
+            </>
+          )}
 
-          <span className="uppercase py-1 text-xs text-gray-400 font-semibold mt-12">
-            THE TOWER
-          </span>
+          {currentUser?.capabilities.includes('TOWER_READ') && (
+            <>
+              <span className="uppercase py-1 text-xs text-gray-400 font-semibold mt-12">
+                THE TOWER
+              </span>
+    
+              {generateRouteList(towerRoutes)}
+            </>
+          )}
 
-          {generateRouteList(towerRoutes)}
-          <span className="uppercase py-1 text-xs text-gray-400 font-semibold mt-12">
-            THE ARENA
-          </span>
+          {currentUser?.capabilities.includes('ARENA_READ') && (
+            <>
+              <span className="uppercase py-1 text-xs text-gray-400 font-semibold mt-12">
+                THE ARENA
+              </span>
 
-          {generateRouteList(arenaRoutes)}
+              {generateRouteList(arenaRoutes)}
+            </>
+          )}
         </div>
       </nav>
       <div className="w-full min-w-0 px-16 py-8">{children}</div>
diff --git a/src/types.d.ts b/src/types.d.ts
index 3535b63..1e88716 100644
--- a/src/types.d.ts
+++ b/src/types.d.ts
@@ -280,6 +280,7 @@ interface GamesAPIUSer {
   profilePictureUrl: string;
   role: number;
   isAdmin: boolean;
+  capabilities: string[];
 }
 
 interface GamesAPISession {

From c121f90ee8b4d11b34c994ff52ca2d5a72b0597c Mon Sep 17 00:00:00 2001
From: Ramir Mesquita <ramir.mesquita@gmail.com>
Date: Thu, 21 Jul 2022 09:48:50 -0300
Subject: [PATCH 2/3] Updating AppMenu to display menu items verifying
 capabilities.

---
 src/AppMenu.tsx | 34 ++++++++++++++++------------------
 1 file changed, 16 insertions(+), 18 deletions(-)

diff --git a/src/AppMenu.tsx b/src/AppMenu.tsx
index f2f42db..f633844 100644
--- a/src/AppMenu.tsx
+++ b/src/AppMenu.tsx
@@ -14,33 +14,34 @@ interface GamesHQRouteOption {
   name: string;
   icon: string;
   to: string;
+  necessaryCapability: string;
 }
 export const AppMenu = ({ children }: { children: JSX.Element }) => {
   const { currentUser } = useCurrentUser();
 
   const inspectRoutes = [
-    { name: "Inspect Arena", to: "/inspect/arena", icon: playerSvg },
+    { name: "Inspect Arena", to: "/inspect/arena", icon: playerSvg, necessaryCapability: "THE_ARENA_READ" },
   ];
 
   const databaseRoutes = [
     /* { name: "Players", to: "/players", icon: playerSvg }, */
-    { name: "Weapons", to: "/weapons", icon: sword },
+    { name: "Weapons", to: "/weapons", icon: sword, necessaryCapability: "WEAPONS_READ" },
     /* { name: "Traits", to: "/traits", icon: trait }, */
   ];
 
   const towerRoutes = [
-    { name: "Tower Game", to: "/tower/status", icon: playerSvg },
-    { name: "Enemies", to: "/enemies", icon: skull },
-    { name: "Floors", to: "/floors", icon: floor },
+    { name: "Tower Game", to: "/tower/status", icon: playerSvg, necessaryCapability: "THE_TOWER_READ" },
+    { name: "Enemies", to: "/enemies", icon: skull, necessaryCapability: "ENEMY_READ" },
+    { name: "Floors", to: "/floors", icon: floor, necessaryCapability: "THE_TOWER_READ" },
   ];
 
-  const arenaRoutes = [{ name: "Zones", to: "/zones", icon: zone }];
+  const arenaRoutes = [{ name: "Zones", to: "/zones", icon: zone, necessaryCapability: "ZONE_READ" }];
 
-  const gameDevRoutes = [{ name: "Games", to: "/games", icon: games }];
+  const gameDevRoutes = [{ name: "Games", to: "/games", icon: games, necessaryCapability: "MY_GAME_READ" }];
 
   const generateRouteList = (route: GamesHQRouteOption[]) => {
 
-    return route.map((route, i) => (
+    return route.map((route, i) => ( route.necessaryCapability && currentUser?.capabilities.includes(route.necessaryCapability) && 
       <ul className="pt-4" key={i}>
         <Link to={route.to} className="items-center">
           <li className="flex text-gray-400 hover:text-gray-700 items-center">
@@ -51,6 +52,7 @@ export const AppMenu = ({ children }: { children: JSX.Element }) => {
       </ul>
     ));
   };
+  
   return (
     <div className="flex h-screen bg-white">
       <nav className="w-80 font-medium text-base bg-gray-50 h-full py-4">
@@ -86,17 +88,13 @@ export const AppMenu = ({ children }: { children: JSX.Element }) => {
             </>
           )}
 
-          {currentUser?.capabilities.includes('TOWER_READ') && (
-            <>
-              <span className="uppercase py-1 text-xs text-gray-400 font-semibold mt-12">
-                THE TOWER
-              </span>
-    
-              {generateRouteList(towerRoutes)}
-            </>
-          )}
+          <span className="uppercase py-1 text-xs text-gray-400 font-semibold mt-12">
+            THE TOWER
+          </span>
+
+          {generateRouteList(towerRoutes)}
 
-          {currentUser?.capabilities.includes('ARENA_READ') && (
+          {currentUser?.capabilities.includes('THE_ARENA_READ') && (
             <>
               <span className="uppercase py-1 text-xs text-gray-400 font-semibold mt-12">
                 THE ARENA

From 1689ce6c7ec7a0ab24544620b837c1f4d036037a Mon Sep 17 00:00:00 2001
From: Frederico Braga <frederico.braga@x-team.com>
Date: Fri, 22 Jul 2022 14:59:27 -0300
Subject: [PATCH 3/3] fix contract with getState

---
 src/pages/InspectArenaPage.tsx | 2 +-
 src/types.d.ts                 | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/pages/InspectArenaPage.tsx b/src/pages/InspectArenaPage.tsx
index 94d365b..b7b8870 100644
--- a/src/pages/InspectArenaPage.tsx
+++ b/src/pages/InspectArenaPage.tsx
@@ -19,7 +19,7 @@ const InspectArenaPage = function InspectArenaPage(props: any) {
 
     const arenaPlayers = get(
         arenaGame,
-        "_arena._players",
+        "_arenaPlayers",
         []
     ) as IArenaPlayer[];
 
diff --git a/src/types.d.ts b/src/types.d.ts
index 3535b63..ebf891d 100644
--- a/src/types.d.ts
+++ b/src/types.d.ts
@@ -167,6 +167,7 @@ interface IGame {
   endedAt: string;
   _gameTypeId: number;
   _arena: IArenaGame;
+  _arenaPlayers: [IArenaPlayer];
 }
 
 interface IGameWithTower extends IGame {
@@ -181,7 +182,7 @@ interface IArenaGame {
   currentRingDeactivation: number;
   inactiveZonePenaltyPower: number;
   _gameId: number;
-  _players: [IArenaPlayer];
+
 }
 
 interface IArenaRoundAction {