Add version editor to playground (hyperledger-archives#3671)

Simplifiy the process of editing/updating business network versions in the Playground editor. Versions can now be edited without opening the package.json file, and versions are incremented automatically when changes are deployed Also includes version validation Contributes to #3241 Signed-off-by: James Taylor <[email protected]>
rossPy · Mar 23, 2018 · bd0f224 · bd0f224
1 parent dc73cfe
commit bd0f224
Show file tree

Hide file tree

Showing 22 changed files with 940 additions and 628 deletions.
diff --git a/packages/composer-playground/e2e/component/editor.ts b/packages/composer-playground/e2e/component/editor.ts
@@ -77,15 +77,15 @@ export class Editor {
                       return OperationsHelper.retrieveTextFromElement(elm); });
   }
 
-  // Retrieve Editor Side Navigation File Action buttons (Add/Deploy)
-  static retrieveNavigatorFileActionButtons() {
-    return OperationsHelper.retrieveMatchingElementsByCSS('.files', '[type="button"]', 0)
+  // Retrieve Editor Side Navigation Action buttons (Add/Export)
+  static retrieveNavigatorActions() {
+    return OperationsHelper.retrieveMatchingElementsByCSS('.actions', '[type="button"]', 0)
     .map((elm) => { return {text: elm.getText(), enabled: elm.isEnabled()}; });
   }
 
-  // Retrieve Editor Side Navigation Action Buttons
-  static retrieveBusinessArchiveActionButtons() {
-      return OperationsHelper.retrieveMatchingElementsByCSS('.actions', '[type="button"]', 0)
+  // Retrieve Editor Update Business Network Buttons
+  static retrieveUpdateBusinessNetworkButtons() {
+      return OperationsHelper.retrieveMatchingElementsByCSS('.deploy', '[type="button"]', 0)
       .map((elm) => { return {text: elm.getText(), enabled: elm.isEnabled()}; });
   }
 

diff --git a/packages/composer-playground/e2e/constants.ts b/packages/composer-playground/e2e/constants.ts
@@ -37,4 +37,8 @@ export class Constants {
     static readonly fabricBaseDir = path.join(__dirname, 'fabric');
     static readonly fabricConfigDir = path.join(Constants.fabricBaseDir, 'hlfv1');
     static readonly peerAdminCardName = 'TestPeerAdmin.card';
+
+    static readonly addFileActionLabel = 'Add a file...';
+    static readonly exportActionLabel = 'Export';
+    static readonly deployButtonLabel = 'Deploy changes';
 }
diff --git a/packages/composer-playground/e2e/specs/editor-define.spec.ts b/packages/composer-playground/e2e/specs/editor-define.spec.ts
diff --git a/packages/composer-playground/e2e/specs/playground-tutorial.spec.ts b/packages/composer-playground/e2e/specs/playground-tutorial.spec.ts
@@ -30,6 +30,8 @@ let expect = chai.expect;
 
 describe('Playground Tutorial Define', (() => {
 
+    const deployButtonLabel = Constants.deployButtonLabel;
+
     let baseTiles: Array<string> = null;
     let npmTiles: Array<string> = null;
     let sampleOptions;
@@ -114,11 +116,10 @@ describe('Playground Tutorial Define', (() => {
                             filelist.forEach((file) => {
                                 expect(file).to.be.oneOf(expectedFiles);
                             });
-                            return Editor.retrieveNavigatorFileActionButtons()
+                            return Editor.retrieveUpdateBusinessNetworkButtons()
                                 .then((buttonlist: any) => {
                                     expect(buttonlist).to.be.an('array').lengthOf(2);
-                                    expect(buttonlist[0]).to.deep.equal({ text: '+ Add a file...', enabled: true });
-                                    expect(buttonlist[1]).to.deep.equal({ text: 'Update', enabled: false });
+                                    expect(buttonlist[1]).to.deep.equal({ text: deployButtonLabel, enabled: true });
                                 });
                         });
                 })
@@ -148,12 +149,11 @@ describe('Playground Tutorial Define', (() => {
                 .then((text) => {
                     let lines = text.toString().split(/\r\n|\n/);
                     expect(lines.map((e) => { return e.trim(); })).to.deep.equal(modelFileCode.split(/\r\n|\n/).map((e) => { return e.trim(); })); // Use trim to handle that codemirror autotabs so file is formatted differently
-                    return Editor.retrieveNavigatorFileActionButtons();
+                    return Editor.retrieveUpdateBusinessNetworkButtons();
                 })
                 .then((buttonlist: any) => {
                     expect(buttonlist).to.be.an('array').lengthOf(2);
-                    expect(buttonlist[0]).to.deep.equal({ text: '+ Add a file...', enabled: true });
-                    expect(buttonlist[1]).to.deep.equal({ text: 'Update', enabled: true });
+                    expect(buttonlist[1]).to.deep.equal({ text: deployButtonLabel, enabled: true });
                 })
                 .catch((err) => {
                     fail(err);
@@ -210,11 +210,10 @@ describe('Playground Tutorial Define', (() => {
                             expect(lines.map((e) => { return e.trim(); })).to.deep.equal(scriptFileCode.split(/\r\n|\n/).map((e) => { return e.trim(); })); // Use trim to handle that codemirror autotabs so file is formatted differently
                         });
 
-                    Editor.retrieveNavigatorFileActionButtons()
+                    Editor.retrieveUpdateBusinessNetworkButtons()
                         .then((buttonlist: any) => {
                             expect(buttonlist).to.be.an('array').lengthOf(2);
-                            expect(buttonlist[0]).to.deep.equal({ text: '+ Add a file...', enabled: true });
-                            expect(buttonlist[1]).to.deep.equal({ text: 'Update', enabled: true });
+                            expect(buttonlist[1]).to.deep.equal({ text: deployButtonLabel, enabled: true });
                         });
                 })
                 .catch((err) => {