Header - prettyName (#111)

* Header - prettyName * update test
SAP · Jan 16, 2020 · f8a23bf · f8a23bf
1 parent 5858d34
commit f8a23bf
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/backend/package.json b/backend/package.json
@@ -5,7 +5,7 @@
 	"license": "Apache 2.0",
 	"description": "Provide rich user experience for Yeoman generators using VSCode extension or the browser",
 	"repository": "https://github.com/SAP/yeoman-ui",
-	"version": "0.0.25",
+	"version": "0.0.26",
 	"engines": {
 		"vscode": "^1.38.0"
 	},

diff --git a/frontend/src/App.vue b/frontend/src/App.vue
@@ -101,6 +101,7 @@ export default {
   data() {
     return {
       generatorName: "",
+      generatorPrettyName: "",
       stepValidated: false,
       prompts: [],
       promptIndex: 0,
@@ -127,7 +128,7 @@ export default {
       );
     },
     selectedGeneratorHeader() {
-      return this.messages.selected_generator + this.generatorName;
+      return this.generatorName ? this.messages.selected_generator + this.generatorPrettyName : "";
     },
     currentPrompt() {
       const prompt = _.get(this.prompts, "[" + this.promptIndex +"]")
@@ -275,8 +276,9 @@ export default {
       this.prompts[this.promptIndex].active = true;
       this.transitionToggle = !this.transitionToggle;
     },
-    selectGenerator(generatorName) {
+    selectGenerator(generatorName, generatorPrettyName) {
       this.generatorName = generatorName;
+      this.generatorPrettyName = generatorPrettyName;
     },
     onStepValidated(stepValidated) {
       this.stepValidated = stepValidated;

diff --git a/frontend/src/components/QuestionTypes/GeneratorSelection.vue b/frontend/src/components/QuestionTypes/GeneratorSelection.vue
@@ -28,7 +28,7 @@
                 <v-card-text>
                   {{item.message}}
                   <br />
-                  <a :href="item.homepage">Generator Documentation</a>
+                  <a :href="item.homepage">More Information</a>
                 </v-card-text>
                 <v-spacer></v-spacer>
                 <v-card-actions>
@@ -76,7 +76,9 @@ export default {
     },
     emitSelection(generatorName) {
       this.currentQuestion.answer = generatorName;
-      this.selectGenerator(generatorName);
+      const choice = _.find(this.currentQuestion.choices, choice => {return choice.name === generatorName});
+      const generatorPrettyName = _.get(choice, "prettyName", generatorName);
+      this.selectGenerator(generatorName, generatorPrettyName);
     }
   }
 };

diff --git a/frontend/tests/App.spec.js b/frontend/tests/App.spec.js
@@ -286,9 +286,10 @@ describe('App.vue', () => {
     wrapper = initComponent(App)
     wrapper.vm.generatorName = 'test_ge_name'
 
-    wrapper.vm.selectGenerator('testGeneratorName');
+    wrapper.vm.selectGenerator('testGeneratorName', 'Test Generator Name');
 
     expect(wrapper.vm.generatorName).toBe('testGeneratorName')
+    expect(wrapper.vm.generatorPrettyName).toBe('Test Generator Name')
   })
 
   test('onStepValidated - method', () => {