Merge pull request #211 from kaleido-io/new-events

Add new events and operations to FireFly UI

Author: nguyer

package-lock.json

@@ -111,7 +111,7 @@ export const FF_Paths = {
   transactionByIdBlockchainEvents: (txId: string) =>
     `/transactions/${txId}/blockchainevents`,
   transactionByIdOperations: (txId: string) =>
-    `/transactions/${txId}/operations`,
+    `/transactions/${txId}/operations?fetchstatus`,
   transactionByIdStatus: (txId: string) => `/transactions/${txId}/status`,
   // Network
   networkIdentities: '/network/identities',

src/interfaces/constants.ts

@@ -31,6 +31,8 @@ export enum FF_EVENTS {
   BLOCKCHAIN_EVENT_RECEIVED = 'blockchain_event_received',
   BLOCKCHAIN_INVOKE_OP_SUCCEEDED = 'blockchain_invoke_op_succeeded',
   BLOCKCHAIN_INVOKE_OP_FAILED = 'blockchain_invoke_op_failed',
+  BLOCKCHAIN_CONTRACT_DEPLOY_OP_SUCCEEDED = 'blockchain_contract_deploy_op_succeeded',
+  BLOCKCHAIN_CONTRACT_DEPLOY_OP_FAILED = 'blockchain_contract_deploy_op_failed',
   CONTRACT_API_CONFIRMED = 'contract_api_confirmed',
   CONTRACT_INTERFACE_CONFIRMED = 'contract_interface_confirmed',
   DATATYPE_CONFIRMED = 'datatype_confirmed',
@@ -111,6 +113,30 @@ export const FF_EVENTS_CATEGORY_MAP: {
       <LaunchButton link={FF_NAV_PATHS.activityOpPath(ns, refID)} />
     ),
   },
+  [FF_EVENTS.BLOCKCHAIN_CONTRACT_DEPLOY_OP_SUCCEEDED]: {
+    category: EventCategoryEnum.BLOCKCHAIN,
+    color: FFColors.Yellow,
+    nicename: 'blockchainContractDeploySucceeded',
+    enrichedEventKey: 'operation',
+    enrichedEventString: (event: IEvent): string =>
+      `Operation ID=${event.reference}`,
+    referenceIDName: 'operationID',
+    referenceIDButton: (ns: string, refID: string): JSX.Element => (
+      <LaunchButton link={FF_NAV_PATHS.activityOpPath(ns, refID)} />
+    ),
+  },
+  [FF_EVENTS.BLOCKCHAIN_CONTRACT_DEPLOY_OP_FAILED]: {
+    category: EventCategoryEnum.BLOCKCHAIN,
+    color: FFColors.Yellow,
+    nicename: 'blockchainContractDeployFailed',
+    enrichedEventKey: 'operation',
+    enrichedEventString: (event: IEvent): string =>
+      `Operation ID=${event.reference}`,
+    referenceIDName: 'operationID',
+    referenceIDButton: (ns: string, refID: string): JSX.Element => (
+      <LaunchButton link={FF_NAV_PATHS.activityOpPath(ns, refID)} />
+    ),
+  },
   [FF_EVENTS.CONTRACT_API_CONFIRMED]: {
     category: EventCategoryEnum.BLOCKCHAIN,
     color: FFColors.Yellow,

src/interfaces/enums/eventTypes.tsx

@@ -52,6 +52,7 @@ export enum FF_OPS {
   BLOCKCHAIN_PIN_BATCH = 'blockchain_pin_batch',
   BLOCKCHAIN_INVOKE = 'blockchain_invoke',
   BLOCKCHAIN_NETWORK_ACTION = 'blockchain_network_action',
+  BLOCKCHAIN_DEPLOY = 'blockchain_deploy',
   // Message/Definitions
   SHAREDSTORAGE_UPLOAD_BATCH = 'sharedstorage_upload_batch',
   SHAREDSTORAGE_UPLOAD_BLOB = 'sharedstorage_upload_blob',
@@ -84,6 +85,11 @@ export const FF_OP_CATEGORY_MAP: { [key in FF_OPS]: IBlockchainCategory } = {
     color: FFColors.Yellow,
     nicename: 'blockchainNetworkAction',
   },
+  [FF_OPS.BLOCKCHAIN_DEPLOY]: {
+    category: OpCategoryEnum.BLOCKCHAIN,
+    color: FFColors.Yellow,
+    nicename: 'blockchainDeploy',
+  },
   // Message Events
   [FF_OPS.SHAREDSTORAGE_UPLOAD_BATCH]: {
     category: OpCategoryEnum.MESSAGES,

src/interfaces/enums/operationTypes.ts

@@ -51,6 +51,7 @@ export enum FF_TX {
   // Blockchain Event
   CONTRACT_INVOKE = 'contract_invoke',
   NETWORK_ACTION = 'network_action',
+  CONTRACT_DEPLOY = 'contract_deploy',
   //Message/Definitions
   BATCH_PIN = 'batch_pin',
   UNPINNED = 'unpinned',
@@ -74,6 +75,11 @@ export const FF_TX_CATEGORY_MAP: { [key in FF_TX]: IBlockchainCategory } = {
     color: FFColors.Yellow,
     nicename: 'networkAction',
   },
+  [FF_TX.CONTRACT_DEPLOY]: {
+    category: TxCategoryEnum.BLOCKCHAIN,
+    color: FFColors.Yellow,
+    nicename: 'contractDeploy',
+  },
   [FF_TX.NONE]: {
     category: TxCategoryEnum.BLOCKCHAIN,
     color: FFColors.Yellow,

src/interfaces/enums/transactionTypes.ts

@@ -34,6 +34,9 @@
   "blockchainEvent": "Blockchain Event",
   "blockchainEventID": "Blockchain Event ID",
   "blockchainEventReceived": "Blockchain Event Received",
+  "blockchainContractDeploySucceeded": "Contract Deployment Succeeded",
+  "blockchainContractDeployFailed": "Contract Deployment Failed",
+  "blockchainDeploy": "Contract Deployment",
   "blockchainEvents": "Blockchain Events",
   "blockchainId": "Blockchain ID",
   "blockchainIds": "Blockchain IDs",
@@ -60,6 +63,7 @@
   "contractAPI": "Contract API",
   "contractApiConfirmed": "Contract API Confirmed",
   "contractAPIs": "Contract APIs",
+  "contractDeploy": "Contract Deployment",
   "contractInterface": "Contract Interface",
   "contractInterfaceConfirmed": "Contract Interface Confirmed",
   "contractInterfaces": "Contract Interfaces",
@@ -388,4 +392,4 @@
   "yes": "Yes",
   "yourNode": "Your Node",
   "yourOrg": "Your Org"
-}
+}