Browse Source

Fixed issues based on third review

deam 4 years ago
parent
commit
7a51f2b07e

+ 3 - 7
packages/apps-routing/src/joy-election.ts

@@ -4,15 +4,11 @@ import Election from '@polkadot/joy-election/index';
 
 export const councilSidebarName = 'council';
 
-export default ([
+export default [
   {
     Component: Election,
     display: {
-      needsAccounts: true,
-      needsApi: [
-        'query.council.activeCouncil',
-        'query.councilElection.stage',
-      ]
+      needsApi: ['query.council.activeCouncil', 'query.councilElection.stage']
     },
     i18n: {
       defaultValue: 'Council'
@@ -20,4 +16,4 @@ export default ([
     icon: 'university',
     name: councilSidebarName
   }
-] as Routes);
+] as Routes;

+ 3 - 6
packages/apps-routing/src/joy-members.ts

@@ -2,14 +2,11 @@ import { Routes } from './types';
 
 import Members from '@polkadot/joy-members/index';
 
-export default ([
+export default [
   {
     Component: Members,
     display: {
-      needsAccounts: true,
-      needsApi: [
-        'query.members.membersCreated'
-      ]
+      needsApi: ['query.members.membersCreated']
     },
     i18n: {
       defaultValue: 'Membership'
@@ -17,4 +14,4 @@ export default ([
     icon: 'users',
     name: 'members'
   }
-] as Routes);
+] as Routes;

+ 6 - 7
packages/apps-routing/src/joy-proposals.ts

@@ -1,18 +1,17 @@
-import { Routes } from "./types";
+import { Routes } from './types';
 
-import Proposals from "@polkadot/joy-proposals/";
+import Proposals from '@polkadot/joy-proposals/';
 
 export default [
   {
     Component: Proposals,
     display: {
-      needsAccounts: true,
-      needsApi: ["query.proposalsEngine.proposalCount"]
+      needsApi: ['query.proposalsEngine.proposalCount']
     },
     i18n: {
-      defaultValue: "Proposals"
+      defaultValue: 'Proposals'
     },
-    icon: "tasks",
-    name: "proposals"
+    icon: 'tasks',
+    name: 'proposals'
   }
 ] as Routes;

+ 3 - 6
packages/apps-routing/src/joy-storage.ts

@@ -2,14 +2,11 @@ import { Routes } from './types';
 
 import Storage from '@polkadot/joy-storage/index';
 
-export default ([
+export default [
   {
     Component: Storage,
     display: {
-      needsAccounts: true,
-      needsApi: [
-        'query.actors.actorAccountIds'
-      ]
+      needsApi: ['query.actors.actorAccountIds']
     },
     i18n: {
       defaultValue: 'Storage'
@@ -17,4 +14,4 @@ export default ([
     icon: 'database',
     name: 'storage'
   }
-] as Routes);
+] as Routes;

+ 3 - 1
packages/apps/src/SideBar/Item.tsx

@@ -63,10 +63,12 @@ function checkVisible(
   { api, isApiReady, isApiConnected }: ApiProps,
   hasAccounts: boolean,
   hasSudo: boolean,
-  { isHidden, needsApi, needsSudo }: Route['display']
+  { isHidden, needsAccounts, needsApi, needsSudo }: Route['display']
 ): boolean {
   if (isHidden) {
     return false;
+  } else if (needsAccounts && !hasAccounts) {
+    return false;
   } else if (!needsApi) {
     return true;
   } else if (!isApiReady || !isApiConnected) {