From f8a23bfad36e23ef7e019ae6f1f2610f7694c4b6 Mon Sep 17 00:00:00 2001 From: Tomer Epstein <57438361+tomer-epstein@users.noreply.github.com> Date: Thu, 16 Jan 2020 16:33:41 +0200 Subject: [PATCH] Header - prettyName (#111) * Header - prettyName * update test --- backend/package.json | 2 +- frontend/src/App.vue | 6 ++++-- .../src/components/QuestionTypes/GeneratorSelection.vue | 6 ++++-- frontend/tests/App.spec.js | 3 ++- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/backend/package.json b/backend/package.json index 259b5ab0..8a900de0 100644 --- 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 index dd3b47fb..f5b05958 100644 --- 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 index 5990d58f..7cdc1162 100644 --- a/frontend/src/components/QuestionTypes/GeneratorSelection.vue +++ b/frontend/src/components/QuestionTypes/GeneratorSelection.vue @@ -28,7 +28,7 @@ {{item.message}}
- Generator Documentation + More Information
@@ -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 index f9279c11..335e340e 100644 --- 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', () => {