Disable format button without Prettier applied

jhipster · Sep 15, 2022 · 641f1a0 · 641f1a0
1 parent c5f4e02
commit 641f1a0
Show file tree

Hide file tree

Showing 10 changed files with 50 additions and 7 deletions.
diff --git a/src/main/webapp/app/module/primary/landscape/Landscape.component.ts b/src/main/webapp/app/module/primary/landscape/Landscape.component.ts
@@ -367,6 +367,10 @@ export default defineComponent({
       operationInProgress.value = false;
     };
 
+    const isApplied = (moduleId: string): boolean => {
+      return landscapeValue().isApplied(new ModuleSlug(moduleId));
+    };
+
     return {
       levels,
       isFeature,
@@ -397,6 +401,7 @@ export default defineComponent({
       applyNewModules,
       operationStarted,
       operationEnded,
+      isApplied,
     };
   },
 });
diff --git a/src/main/webapp/app/module/primary/landscape/Landscape.html b/src/main/webapp/app/module/primary/landscape/Landscape.html
@@ -36,7 +36,12 @@
         />
       </div>
       <div class="jhlite-vertical-space--slot">
-        <ProjectActionsVue :folderPath="folderPath" @operationStarted="operationStarted()" @operationEnded="operationEnded()">
+        <ProjectActionsVue
+          :folderPath="folderPath"
+          :isPrettierButtonEnabled="isApplied('prettier')"
+          @operationStarted="operationStarted()"
+          @operationEnded="operationEnded()"
+        >
           <div class="jhlite-vertical-space--slot">
             <button
               class="jhlite-button -block"

diff --git a/src/main/webapp/app/module/primary/modules-patch/ModulesPatch.html b/src/main/webapp/app/module/primary/modules-patch/ModulesPatch.html
@@ -12,7 +12,12 @@
       @propertyDeleted="deleteProperty"
     />
 
-    <ProjectActionsVue :folderPath="folderPath" @operationStarted="operationStarted()" @operationEnded="operationEnded()" />
+    <ProjectActionsVue
+      :folderPath="folderPath"
+      :isPrettierButtonEnabled="true"
+      @operationStarted="operationStarted()"
+      @operationEnded="operationEnded()"
+    />
   </aside>
 
   <div class="jhipster-modules-list">

diff --git a/src/main/webapp/app/module/primary/project-actions/ProjectActions.component.ts b/src/main/webapp/app/module/primary/project-actions/ProjectActions.component.ts
@@ -14,6 +14,10 @@ export default defineComponent({
       type: String,
       required: true,
     },
+    isPrettierButtonEnabled: {
+      type: Boolean,
+      required: true,
+    },
   },
   emits: ['operationStarted', 'operationEnded'],
   setup(props, { emit }) {
@@ -27,6 +31,10 @@ export default defineComponent({
       return operationInProgress.value || empty(props.folderPath);
     };
 
+    const disabledPrettier = (): boolean => {
+      return disabledActions() || !props.isPrettierButtonEnabled;
+    };
+
     const formatProject = (): void => {
       startOperation();
 
@@ -85,6 +93,7 @@ export default defineComponent({
 
     return {
       disabledActions,
+      disabledPrettier,
       formatProject,
       downloadProject,
     };

diff --git a/src/main/webapp/app/module/primary/project-actions/ProjectActions.html b/src/main/webapp/app/module/primary/project-actions/ProjectActions.html
@@ -7,7 +7,7 @@
         tabindex="5"
         class="jhlite-button -block"
         @click="formatProject()"
-        :disabled="disabledActions()"
+        :disabled="disabledPrettier()"
         data-selector="format-button"
       >
         <IconVue name="code" aria-label="Icon code" />

diff --git a/src/test/javascript/spec/module/domain/Modules.fixture.ts b/src/test/javascript/spec/module/domain/Modules.fixture.ts
@@ -99,7 +99,7 @@ export const defaultProjectHistory = (): ProjectHistory => ({
 });
 
 export const projectHistoryWithInit = (): ProjectHistory => ({
-  modules: [moduleSlug('init')],
+  modules: [moduleSlug('init'), moduleSlug('prettier')],
   properties: appliedModuleProperties(),
 });
 

diff --git a/src/test/javascript/spec/module/domain/landscape/Landscape.fixture.ts b/src/test/javascript/spec/module/domain/landscape/Landscape.fixture.ts
@@ -13,6 +13,7 @@ export const defaultLandscape = (): Landscape =>
       elements: [
         initialModule('infinitest', 'Add infinitest filters', [applicationBaseNamePropertyDefinition()], []),
         initialModule('init', 'Add some initial tools', [applicationBaseNamePropertyDefinition()], []),
+        initialModule('prettier', 'Add prettier', [applicationBaseNamePropertyDefinition()], []),
       ],
     },
     {

diff --git a/src/test/javascript/spec/module/primary/landscape/LandscapeComponent.spec.ts b/src/test/javascript/spec/module/primary/landscape/LandscapeComponent.spec.ts
@@ -287,7 +287,7 @@ describe('Landscape', () => {
 
       assertSelectedConnectorsCount(wrapper, 1);
       expect(wrapper.find(wrappedElement('modules-apply-new-button')).text()).toContain('(1)');
-      expect(wrapper.find(wrappedElement('modules-apply-all-button')).text()).toContain('(2)');
+      expect(wrapper.find(wrappedElement('modules-apply-all-button')).text()).toContain('(3)');
     });
 
     it('Should not select not selectable module', async () => {
@@ -370,7 +370,9 @@ describe('Landscape', () => {
       const [appliedModules] = modules.applyAll.lastCall.args as ModulesToApply[];
       expect(appliedModules.modules.map(slug => slug.get())).toEqual(['vue']);
       expect(wrapper.find(wrappedElement('modules-apply-new-button')).attributes('disabled')).toBeDefined();
-
+      const component: any = wrapper.vm;
+      expect(component.isApplied('vue')).toBeTruthy();
+      expect(component.isApplied('angular')).toBeFalsy();
       const [message] = alertBus.success.lastCall.args;
       expect(message).toBe('Modules applied');
     });

diff --git a/src/test/javascript/spec/module/primary/project-actions/ProjectActionsComponent.spec.ts b/src/test/javascript/spec/module/primary/project-actions/ProjectActionsComponent.spec.ts
@@ -9,22 +9,25 @@ import sinon from 'sinon';
 
 interface WrapperOptions {
   folderPath: string;
+  isPrettierButtonEnabled: boolean;
   modules: ModulesRepository;
 }
 
 const alertBus = stubAlertBus();
 const windowStub = stubWindow();
 
 const wrap = (options?: Partial<WrapperOptions>): VueWrapper => {
-  const { modules, folderPath }: WrapperOptions = {
+  const { modules, folderPath, isPrettierButtonEnabled }: WrapperOptions = {
     folderPath: '/dummy',
     modules: stubModulesRepository(),
+    isPrettierButtonEnabled: true,
     ...options,
   };
 
   return shallowMount(ProjectActionsVue, {
     props: {
       folderPath,
+      isPrettierButtonEnabled,
     },
     global: { provide: { modules, alertBus, globalWindow: windowStub } },
   });
@@ -45,6 +48,18 @@ describe('Project actions', () => {
 
       expect(wrapper.find(wrappedElement('format-button')).attributes('disabled')).toBeDefined();
     });
+
+    it('should disable format button according to prop', async () => {
+      const wrapper = wrap({ isPrettierButtonEnabled: false });
+
+      expect(wrapper.find(wrappedElement('format-button')).attributes('disabled')).toBeDefined();
+    });
+
+    it('should enable format button according to prop', async () => {
+      const wrapper = wrap({ isPrettierButtonEnabled: true });
+
+      expect(wrapper.find(wrappedElement('format-button')).attributes('disabled')).toBeUndefined();
+    });
   });
 
   it('Should format file using repository', async () => {

diff --git a/src/test/javascript/spec/module/secondary/RestModulesRepository.spec.ts b/src/test/javascript/spec/module/secondary/RestModulesRepository.spec.ts
@@ -148,6 +148,7 @@ const restLandscape = (): RestLandscape => ({
       elements: [
         landscapeModule('infinitest', 'Add infinitest filters', applicationBaseNameProperties()),
         landscapeModule('init', 'Add some initial tools', applicationBaseNameProperties()),
+        landscapeModule('prettier', 'Add prettier', applicationBaseNameProperties()),
       ],
     },
     {