Merge pull request #208 from kaleido-io/fetch-detailed-operation-status

Add 'Detail' to operation slide out

Author: shorsher

CONTRIBUTING.md

@@ -4,7 +4,7 @@ We welcome contributions to the FireFly Project in many forms, and
 there's always plenty to do!
 
 Please visit the
-[contributors guide](https://hyperledger.github.io/firefly/contributors/contributors.html) in the
+[contributors guide](https://hyperledger.github.io/firefly/contributors/index.html) in the
 docs to learn how to make contributions to this exciting project.
 
 <a rel="license" href="http://creativecommons.org/licenses/by/4.0/"><img alt="Creative Commons License" style="border-width:0" src="https://i.creativecommons.org/l/by/4.0/88x31.png" /></a><br />This work is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution 4.0 International License</a>.

src/components/Slides/OperationSlide.tsx

@@ -57,20 +57,25 @@ export const OperationSlide: React.FC<Props> = ({ op, open, onClose }) => {
               <FFJsonViewer json={op.error} />
             </Grid>
           )}
-          {/* Input and Output */}
-          {(op.input || op.output) && (
-            <SlideSectionHeader title={t('inputAndOutput')} />
+          {/* Input, Output and Detail */}
+          {(op.input || op.output || op.detail) && (
+            <SlideSectionHeader title={t('inputOutputDetail')} />
           )}
           {op.input && (
             <Grid container item pb={DEFAULT_PADDING}>
               <JsonViewAccordion isOpen header={t('input')} json={op.input} />
             </Grid>
           )}
           {op.output && (
-            <Grid container item>
+            <Grid container item pb={DEFAULT_PADDING}>
               <JsonViewAccordion isOpen header={t('output')} json={op.output} />
             </Grid>
           )}
+          {op.detail && (
+            <Grid container item>
+              <JsonViewAccordion isOpen header={t('detail')} json={op.detail} />
+            </Grid>
+          )}
         </Grid>
       </DisplaySlide>
     </>

src/interfaces/api.ts

@@ -282,6 +282,7 @@ export interface IOperation {
     id: string;
     success: boolean;
   };
+  detail?: any;
   created: string;
   updated: string;
   retry?: string;

src/interfaces/constants.ts

@@ -85,7 +85,8 @@ export const FF_Paths = {
   messageTxById: (msgId: string) => `/messages/${msgId}/transaction`,
   // Operations
   operations: '/operations',
-  operationsById: (opId: string) => `/operations/${opId}`,
+  operationsById: (opId: string, fetchStatus: boolean) =>
+    `/operations/${opId}${fetchStatus ? '?fetchstatus=true' : ''}`,
   // Subscriptions
   subscriptions: '/subscriptions',
   subscriptionsById: (subId: string) => `/subscriptions/${subId}?fetchstatus`,

src/pages/Activity/views/Operations.tsx

@@ -92,7 +92,8 @@ export const ActivityOperations: () => JSX.Element = () => {
       slideID &&
       fetchCatcher(
         `${FF_Paths.nsPrefix}/${selectedNamespace}${FF_Paths.operationsById(
-          slideID
+          slideID,
+          true
         )}`
       )
         .then((opRes: IOperation) => {

src/translations/en.json

@@ -92,6 +92,7 @@
   "definition": "Definition",
   "description": "Description",
   "details": "Details",
+  "detail": "Detail",
   "did": "DID",
   "docs": "Docs",
   "download": "Download",
@@ -138,7 +139,7 @@
   "in": "In",
   "info": "Info",
   "input": "Input",
-  "inputAndOutput": "Input and Output",
+  "inputOutputDetail": "Input, Output and Detail",
   "interfaceID": "Interface ID",
   "interfaces": "Interfaces",
   "joined": "Joined",