Merge pull request #102 from kaleido-io/default-ns

update sandbox to work with different namespaces
hyperledger · Sep 2, 2022 · 8593ca6 · 8593ca6
2 parents 5a7d32f + 86176f5
commit 8593ca6
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 4 deletions.
diff --git a/server/src/clients/firefly.ts b/server/src/clients/firefly.ts
@@ -3,6 +3,7 @@ import { InternalServerError } from 'routing-controllers';
 
 export const firefly = new FireFly({
   host: process.env.FF_ENDPOINT || 'http://localhost:5000',
+  namespace: process.env.FF_DEFAULT_NAMESPACE || 'default',
 });
 
 firefly.onError((err) => {

diff --git a/server/src/controllers/common.ts b/server/src/controllers/common.ts
@@ -2,7 +2,7 @@ import { Get, InternalServerError, JsonController, Param, QueryParam } from 'rou
 import { OpenAPI, ResponseSchema } from 'routing-controllers-openapi';
 import { firefly } from '../clients/firefly';
 import { FFStatus, Organization, Plugin, Plugins, Transaction, Verifier } from '../interfaces';
-
+const DEFAULT_NAMESPACE = process.env.FF_DEFAULT_NAMESPACE || 'default';
 /**
  * Common Operations - API Server
  */
@@ -35,7 +35,7 @@ export class CommonController {
   async verifiers(): Promise<Verifier[]> {
     try {
       const orgs = await firefly.getOrganizations();
-      let verifiers = await firefly.getVerifiers('default');
+      let verifiers = await firefly.getVerifiers(DEFAULT_NAMESPACE);
       if (verifiers.length === 0) {
         // attempt to query legacy ff_system verifiers
         verifiers = await firefly.getVerifiers('ff_system');
@@ -61,7 +61,7 @@ export class CommonController {
   @OpenAPI({ summary: 'List verifiers (such as Ethereum keys) for local organization' })
   async verifierSelf(): Promise<Verifier[]> {
     const status = await firefly.getStatus();
-    const verifiers = await firefly.getVerifiers('default');
+    const verifiers = await firefly.getVerifiers(DEFAULT_NAMESPACE);
     const result: Verifier[] = [];
     for (const v of verifiers) {
       if (status.org?.id === v.identity) {
@@ -101,11 +101,13 @@ export class CommonController {
     if ("multiparty" in status) {
       return {
         multiparty: status.multiparty?.enabled,
+        namespace: DEFAULT_NAMESPACE,
       };
     } else {
       // Assume multiparty mode if `multiparty` key is missing from status
       return {
-        multiparty: true
+        multiparty: true,
+        namespace: DEFAULT_NAMESPACE,
       }
     }
   }

diff --git a/server/src/interfaces.ts b/server/src/interfaces.ts
@@ -388,4 +388,7 @@ export class DatatypeInterface {
 export class FFStatus {
   @IsBoolean()
   multiparty: boolean;
+
+  @IsString()
+  namespace: string;
 }
diff --git a/ui/src/App.tsx b/ui/src/App.tsx
@@ -44,6 +44,7 @@ function App() {
     type: '',
     id: '',
   });
+  const [namespace, setNamespace] = useState('');
   const [tokensDisabled, setTokensDisabled] = useState(false);
   const [blockchainPlugin, setBlockchainPlugin] = useState('');
   const [tutorialSections, setTutorialSections] = useState<ITutorialSection[]>(
@@ -66,6 +67,7 @@ function App() {
         );
         const ffStatus = statusResponse as IFireflyStatus;
         setMultiparty(ffStatus.multiparty);
+        setNamespace(ffStatus.namespace);
         if (ffStatus.multiparty === true) {
           setTutorialSections(TutorialSections);
           fetchCatcher(SDK_PATHS.verifiers)
@@ -122,6 +124,7 @@ function App() {
             blockchainPlugin,
             multiparty,
             tutorialSections,
+            namespace,
           }}
         >
           <StyledEngineProvider injectFirst>

diff --git a/ui/src/components/Header.tsx b/ui/src/components/Header.tsx
@@ -39,6 +39,7 @@ import ReconnectingWebSocket from 'reconnecting-websocket';
 import { ReactComponent as DiscordLogo } from '../assets/Discord-Logo-White.svg';
 import { ResourceUrls } from '../constants/ResourceUrls';
 import { EventContext } from '../contexts/EventContext';
+import { ApplicationContext } from '../contexts/ApplicationContext';
 import { FF_EVENTS } from '../ff_models/eventTypes';
 import { DEFAULT_BORDER_RADIUS, DEFAULT_PADDING, FFColors } from '../theme';
 import { MenuLogo } from './Logos/MenuLogo';
@@ -52,6 +53,7 @@ export const Header: React.FC = () => {
   const { t } = useTranslation();
   const theme = useTheme();
   const { addLogToHistory } = useContext(EventContext);
+  const { namespace } = useContext(ApplicationContext);
   const [wsConnected, setWsConnected] = useState<boolean>(false);
   const webSocket = useRef<ReconnectingWebSocket | null>(null);
   const [isModalOpen, setIsModalOpen] = useState(false);
@@ -201,6 +203,11 @@ export const Header: React.FC = () => {
                   onClick={connectToWS}
                 />
               </Tooltip>
+              <Grid item paddingLeft={1}>
+                <Typography>
+                  {t('namespaceX', { namespace: namespace })}
+                </Typography>
+              </Grid>
               <IconButton
                 color="inherit"
                 onClick={() => setIsModalOpen(true)}

diff --git a/ui/src/contexts/ApplicationContext.tsx b/ui/src/contexts/ApplicationContext.tsx
@@ -36,6 +36,7 @@ export interface IApplicationContext {
   blockchainPlugin: string;
   multiparty: boolean;
   tutorialSections: ITutorialSection[];
+  namespace: string;
 }
 
 export const ApplicationContext = createContext({} as IApplicationContext);
diff --git a/ui/src/interfaces/api.ts b/ui/src/interfaces/api.ts
@@ -10,6 +10,7 @@ export interface IApiStatus {
 
 export interface IFireflyStatus {
   multiparty: boolean;
+  namespace: string;
 }
 
 export interface IBatch {

diff --git a/ui/src/translations/en.json b/ui/src/translations/en.json
@@ -119,6 +119,7 @@
   "name": "Name",
   "namespaceConfirmed": "Namespace Confirmed",
   "namespaceID": "Namespace ID",
+  "namespaceX": "Namespace: {{namespace}}",
   "noAPIsRegisteredWithFireFly": "No APIs Registered with FireFly",
   "noBalancesForWallet": "No Balances for Wallet",
   "noConnectors": "No Token Connectors",