From ee9a6c4a4102ddd3f03feb6d58139fdf7bc48fcc Mon Sep 17 00:00:00 2001 From: Marion Eyraud Date: Fri, 17 Jun 2022 15:05:16 +0200 Subject: [PATCH 1/4] Front: add setup section --- .../springboot/primary/Generator.component.ts | 2 ++ .../app/springboot/primary/Generator.vue | 19 ++++++++++++++++++- src/main/webapp/content/css/custom.css | 8 ++++++++ .../cypress/integration/Generator.spec.ts | 4 ++++ 4 files changed, 32 insertions(+), 1 deletion(-) diff --git a/src/main/webapp/app/springboot/primary/Generator.component.ts b/src/main/webapp/app/springboot/primary/Generator.component.ts index 4bf208a14d3..eb35b778462 100644 --- a/src/main/webapp/app/springboot/primary/Generator.component.ts +++ b/src/main/webapp/app/springboot/primary/Generator.component.ts @@ -13,6 +13,7 @@ import { ProjectHistoryService } from '@/common/domain/ProjectHistoryService'; import { History } from '@/common/domain/History'; import { ProjectService } from '../domain/ProjectService'; import { StoreGeneric } from 'pinia'; +import { SetupGeneratorVue } from '@/springboot/primary/generator/setup-generator'; export default defineComponent({ name: 'GeneratorComponent', @@ -21,6 +22,7 @@ export default defineComponent({ IconVue, DefaultButtonVue, ProjectGeneratorVue, + SetupGeneratorVue, SpringBootGeneratorVue, AngularGeneratorVue, ReactGeneratorVue, diff --git a/src/main/webapp/app/springboot/primary/Generator.vue b/src/main/webapp/app/springboot/primary/Generator.vue index 3cc3d67fe58..2f95ab8bd93 100644 --- a/src/main/webapp/app/springboot/primary/Generator.vue +++ b/src/main/webapp/app/springboot/primary/Generator.vue @@ -318,7 +318,7 @@
+
  • @@ -459,6 +475,7 @@
    + diff --git a/src/main/webapp/content/css/custom.css b/src/main/webapp/content/css/custom.css index 7ed6bbba2e9..8496f6be47c 100644 --- a/src/main/webapp/content/css/custom.css +++ b/src/main/webapp/content/css/custom.css @@ -25,6 +25,7 @@ --bs-vue-rgb: 63, 178, 127; --bs-angular-rgb: 195, 0, 47; --bs-spring-rgb: 109, 179, 63; + --bs-setup-rgb: 125, 60, 152; --bs-svelte-rgb: 255, 62, 0; --primary-color-light: #4ba8f8; --success-color: #00543c; @@ -202,6 +203,13 @@ input[type='radio'] { color: var(--primary-color); border-color: var(--primary-color); } +.bg-setup { + --bs-bg-opacity: 0.05; + background-color: rgba(var(--bs-setup-rgb), var(--bs-bg-opacity)) !important; +} +.text-setup { + color: rgba(var(--bs-setup-rgb)) !important; +} .bg-spring { --bs-bg-opacity: 0.05; background-color: rgba(var(--bs-spring-rgb), var(--bs-bg-opacity)) !important; diff --git a/src/test/javascript/cypress/integration/Generator.spec.ts b/src/test/javascript/cypress/integration/Generator.spec.ts index 6367dc1d18f..8f40faca7eb 100644 --- a/src/test/javascript/cypress/integration/Generator.spec.ts +++ b/src/test/javascript/cypress/integration/Generator.spec.ts @@ -31,6 +31,10 @@ describe('Generator', () => { cy.get(projectGeneratorSelector('add-download-button')).should('not.exist'); }); + it('should display setup', () => { + cy.get(dataSelector('section-setup')).contains('SETUP'); + }); + it('should display spring boot', () => { cy.get(generatorSelector('option-springboot')).check(); From 880f73dc532ec51619933ddb3108993dd739d8ba Mon Sep 17 00:00:00 2001 From: Marion Eyraud Date: Fri, 17 Jun 2022 15:14:19 +0200 Subject: [PATCH 2/4] add files --- .../app/springboot/domain/SetupService.ts | 1 + .../SetupGenerator.component.ts | 19 ++++++++ .../setup-generator/SetupGenerator.vue | 7 +++ .../generator/setup-generator/index.ts | 4 ++ .../springboot/domain/SetupService.fixture.ts | 5 +++ .../setup-generator/SetupGenerator.spec.ts | 44 +++++++++++++++++++ 6 files changed, 80 insertions(+) create mode 100644 src/main/webapp/app/springboot/domain/SetupService.ts create mode 100644 src/main/webapp/app/springboot/primary/generator/setup-generator/SetupGenerator.component.ts create mode 100644 src/main/webapp/app/springboot/primary/generator/setup-generator/SetupGenerator.vue create mode 100644 src/main/webapp/app/springboot/primary/generator/setup-generator/index.ts create mode 100644 src/test/javascript/spec/springboot/domain/SetupService.fixture.ts create mode 100644 src/test/javascript/spec/springboot/primary/generator/setup-generator/SetupGenerator.spec.ts diff --git a/src/main/webapp/app/springboot/domain/SetupService.ts b/src/main/webapp/app/springboot/domain/SetupService.ts new file mode 100644 index 00000000000..64bf735c79a --- /dev/null +++ b/src/main/webapp/app/springboot/domain/SetupService.ts @@ -0,0 +1 @@ +export interface SetupService {} diff --git a/src/main/webapp/app/springboot/primary/generator/setup-generator/SetupGenerator.component.ts b/src/main/webapp/app/springboot/primary/generator/setup-generator/SetupGenerator.component.ts new file mode 100644 index 00000000000..ae4e6c4bd3b --- /dev/null +++ b/src/main/webapp/app/springboot/primary/generator/setup-generator/SetupGenerator.component.ts @@ -0,0 +1,19 @@ +import { defineComponent } from 'vue'; +import { GeneratorButtonVue } from '@/springboot/primary/generator/generator-button'; + +export default defineComponent({ + name: 'SetupGeneratorComponent', + + components: { + GeneratorButtonVue, + }, + props: { + project: { + type: Object, + required: true, + }, + }, + setup(props) { + return {}; + }, +}); diff --git a/src/main/webapp/app/springboot/primary/generator/setup-generator/SetupGenerator.vue b/src/main/webapp/app/springboot/primary/generator/setup-generator/SetupGenerator.vue new file mode 100644 index 00000000000..c5afda86c6c --- /dev/null +++ b/src/main/webapp/app/springboot/primary/generator/setup-generator/SetupGenerator.vue @@ -0,0 +1,7 @@ + + + diff --git a/src/main/webapp/app/springboot/primary/generator/setup-generator/index.ts b/src/main/webapp/app/springboot/primary/generator/setup-generator/index.ts new file mode 100644 index 00000000000..eb64607a30f --- /dev/null +++ b/src/main/webapp/app/springboot/primary/generator/setup-generator/index.ts @@ -0,0 +1,4 @@ +import SetupGeneratorComponent from './SetupGenerator.component'; +import SetupGeneratorVue from './SetupGenerator.vue'; + +export { SetupGeneratorComponent, SetupGeneratorVue }; diff --git a/src/test/javascript/spec/springboot/domain/SetupService.fixture.ts b/src/test/javascript/spec/springboot/domain/SetupService.fixture.ts new file mode 100644 index 00000000000..0bced199117 --- /dev/null +++ b/src/test/javascript/spec/springboot/domain/SetupService.fixture.ts @@ -0,0 +1,5 @@ +import { SetupService } from '../../../../../main/webapp/app/springboot/domain/SetupService'; + +export interface SetupServiceFixture extends SetupService {} + +export const stubSetupService = (): SetupServiceFixture => ({}); diff --git a/src/test/javascript/spec/springboot/primary/generator/setup-generator/SetupGenerator.spec.ts b/src/test/javascript/spec/springboot/primary/generator/setup-generator/SetupGenerator.spec.ts new file mode 100644 index 00000000000..0278321dc43 --- /dev/null +++ b/src/test/javascript/spec/springboot/primary/generator/setup-generator/SetupGenerator.spec.ts @@ -0,0 +1,44 @@ +import { shallowMount, VueWrapper } from '@vue/test-utils'; +import { AlertBus } from '../../../../../../../main/webapp/app/common/domain/alert/AlertBus'; +import { ProjectToUpdate } from '../../../../../../../main/webapp/app/springboot/primary/ProjectToUpdate'; +import { stubAlertBus } from '../../../../common/domain/AlertBus.fixture'; +import { createProjectToUpdate } from '../../ProjectToUpdate.fixture'; +import { stubSetupService } from '../../../domain/SetupService.fixture'; +import { SetupService } from '../../../../../../../main/webapp/app/springboot/domain/SetupService'; +import { SetupGeneratorVue } from '../../../../../../../main/webapp/app/springboot/primary/generator/setup-generator'; + +let wrapper: VueWrapper; +let component: any; + +interface WrapperOptions { + alertBus: AlertBus; + setupService: SetupService; + project: ProjectToUpdate; +} +const wrap = (wrapperOptions?: Partial) => { + const { alertBus, setupService, project }: WrapperOptions = { + alertBus: stubAlertBus(), + setupService: stubSetupService(), + project: createProjectToUpdate(), + ...wrapperOptions, + }; + wrapper = shallowMount(SetupGeneratorVue, { + props: { + project, + }, + global: { + provide: { + alertBus, + setupService, + }, + }, + }); + component = wrapper.vm; +}; +describe('SetupGenerator', () => { + it('should exist', () => { + wrap(); + + expect(wrapper.exists()).toBe(true); + }); +}); From e7d8b9069881c149d2ab979c7bf61b7b94a6f016 Mon Sep 17 00:00:00 2001 From: Marion Eyraud Date: Fri, 17 Jun 2022 16:15:51 +0200 Subject: [PATCH 3/4] Corrected code smells --- .../generator/setup-generator/SetupGenerator.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webapp/app/springboot/primary/generator/setup-generator/SetupGenerator.component.ts b/src/main/webapp/app/springboot/primary/generator/setup-generator/SetupGenerator.component.ts index ae4e6c4bd3b..7e8644d65d6 100644 --- a/src/main/webapp/app/springboot/primary/generator/setup-generator/SetupGenerator.component.ts +++ b/src/main/webapp/app/springboot/primary/generator/setup-generator/SetupGenerator.component.ts @@ -13,7 +13,7 @@ export default defineComponent({ required: true, }, }, - setup(props) { + setup() { return {}; }, }); From 0261ee3161818e89f8b8f7bdd0351ac7842e56cd Mon Sep 17 00:00:00 2001 From: Pascal Grimaud Date: Sun, 19 Jun 2022 07:18:55 +0200 Subject: [PATCH 4/4] Use alias for import in setup generator tests --- .../generator/setup-generator/SetupGenerator.spec.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/test/javascript/spec/springboot/primary/generator/setup-generator/SetupGenerator.spec.ts b/src/test/javascript/spec/springboot/primary/generator/setup-generator/SetupGenerator.spec.ts index 0278321dc43..3778408af2d 100644 --- a/src/test/javascript/spec/springboot/primary/generator/setup-generator/SetupGenerator.spec.ts +++ b/src/test/javascript/spec/springboot/primary/generator/setup-generator/SetupGenerator.spec.ts @@ -1,11 +1,11 @@ import { shallowMount, VueWrapper } from '@vue/test-utils'; -import { AlertBus } from '../../../../../../../main/webapp/app/common/domain/alert/AlertBus'; -import { ProjectToUpdate } from '../../../../../../../main/webapp/app/springboot/primary/ProjectToUpdate'; +import { AlertBus } from '@/common/domain/alert/AlertBus'; +import { ProjectToUpdate } from '@/springboot/primary/ProjectToUpdate'; import { stubAlertBus } from '../../../../common/domain/AlertBus.fixture'; import { createProjectToUpdate } from '../../ProjectToUpdate.fixture'; import { stubSetupService } from '../../../domain/SetupService.fixture'; -import { SetupService } from '../../../../../../../main/webapp/app/springboot/domain/SetupService'; -import { SetupGeneratorVue } from '../../../../../../../main/webapp/app/springboot/primary/generator/setup-generator'; +import { SetupService } from '@/springboot/domain/SetupService'; +import { SetupGeneratorVue } from '@/springboot/primary/generator/setup-generator'; let wrapper: VueWrapper; let component: any;