Fix View Transaction Dialog (hyperledger-archives#2113)

Updated to stop showing error if escape is pressed contributes to hyperledger/composer#1896
davesocha · Sep 13, 2017 · 590ea77 · 590ea77
1 parent d8ec417
commit 590ea77
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 1 deletion.
diff --git a/packages/composer-playground/src/app/test/registry/registry.component.spec.ts b/packages/composer-playground/src/app/test/registry/registry.component.spec.ts
@@ -389,6 +389,31 @@ describe(`RegistryComponent`, () => {
 
             mockAlertService.errorStatus$.next.should.have.been.calledWith('some error');
         }));
+
+        it('should handle escape', fakeAsync(() => {
+            mockClientService.resolveTransactionRelationship.returns(Promise.resolve({$class: 'myTransaction'}));
+
+            let componentInstance = {
+                transaction: {},
+                events: []
+            };
+
+            mockNgbModal.open = sinon.stub().returns({
+                componentInstance: componentInstance,
+                result: Promise.reject(1)
+            });
+
+            let mockTransaction = {mock: 'transaction', eventsEmitted: ['event 1']};
+            component.viewTransactionData(mockTransaction);
+
+            tick();
+
+            mockNgbModal.open.should.have.been.called;
+            componentInstance.transaction.should.deep.equal({$class: 'myTransaction'});
+            componentInstance.events.should.deep.equal(['event 1']);
+
+            mockAlertService.errorStatus$.next.should.not.have.been.called;
+        }));
     });
 
     describe('updateTableScroll', () => {

diff --git a/packages/composer-playground/src/app/test/registry/registry.component.ts b/packages/composer-playground/src/app/test/registry/registry.component.ts
@@ -136,7 +136,9 @@ export class RegistryComponent {
             transactionModalRef.componentInstance.events = transaction.eventsEmitted;
 
             transactionModalRef.result.catch((error) => {
-                this.alertService.errorStatus$.next(error);
+                if (error && error !== 1) {
+                    this.alertService.errorStatus$.next(error);
+                }
             });
         });
     }