Merge pull request #26550 from mshima/templates

apply prettier to templates
jhipster · Jun 26, 2024 · 34dc757 · 34dc757
2 parents 2f43dfe + ff62f59
commit 34dc757
Show file tree

Hide file tree

Showing 139 changed files with 1,109 additions and 1,113 deletions.
diff --git a/...rators/angular/templates/src/main/webapp/app/account/activate/activate.component.html.ejs b/...rators/angular/templates/src/main/webapp/app/account/activate/activate.component.html.ejs
@@ -20,15 +20,15 @@
   <div class="d-flex justify-content-center">
     <div class="col-md-8">
       <h1>__jhiTranslateTag__('activate.title')</h1>
-    @if (success()) {
-      <div class="alert alert-success">
-        <span>__jhiTranslateTag__('activate.messages.success')</span>
-        <a class="alert-link" routerLink="/login">__jhiTranslateTag__('global.messages.info.authenticated.link')</a>.
-      </div>
-    }
-    @if (error()) {
-      <div class="alert alert-danger">__jhiTranslateTag__('activate.messages.error')</div>
-    }
+      @if (success()) {
+        <div class="alert alert-success">
+          <span>__jhiTranslateTag__('activate.messages.success')</span>
+          <a class="alert-link" routerLink="/login">__jhiTranslateTag__('global.messages.info.authenticated.link')</a>.
+        </div>
+      }
+      @if (error()) {
+        <div class="alert alert-danger">__jhiTranslateTag__('activate.messages.error')</div>
+      }
     </div>
   </div>
 </div>
diff --git a/...ors/angular/templates/src/main/webapp/app/account/activate/activate.component.spec.ts.ejs b/...ors/angular/templates/src/main/webapp/app/account/activate/activate.component.spec.ts.ejs
@@ -27,22 +27,20 @@ import ActivateComponent from './activate.component';
 describe('ActivateComponent', () => {
   let comp: ActivateComponent;
 
-  beforeEach(
-    waitForAsync(() => {
-      TestBed.configureTestingModule({
-        imports: [ActivateComponent],
-        providers: [
-          provideHttpClient(),
-          {
-            provide: ActivatedRoute,
-            useValue: { queryParams: of({ key: 'ABC123' }) },
-          },
-        ],
-      })
-        .overrideTemplate(ActivateComponent, '')
-        .compileComponents();
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      imports: [ActivateComponent],
+      providers: [
+        provideHttpClient(),
+        {
+          provide: ActivatedRoute,
+          useValue: { queryParams: of({ key: 'ABC123' }) },
+        },
+      ],
     })
-  );
+      .overrideTemplate(ActivateComponent, '')
+      .compileComponents();
+  }));
 
   beforeEach(() => {
     const fixture = TestBed.createComponent(ActivateComponent);
@@ -58,7 +56,7 @@ describe('ActivateComponent', () => {
       tick();
 
       expect(service.get).toHaveBeenCalledWith('ABC123');
-    })
+    }),
   ));
 
   it('should set set success to true upon successful activation', inject(
@@ -71,7 +69,7 @@ describe('ActivateComponent', () => {
 
       expect(comp.error()).toBe(false);
       expect(comp.success()).toBe(true);
-    })
+    }),
   ));
 
   it('should set set error to true upon activation failure', inject(
@@ -84,6 +82,6 @@ describe('ActivateComponent', () => {
 
       expect(comp.error()).toBe(true);
       expect(comp.success()).toBe(false);
-    })
+    }),
   ));
 });
diff --git a/generators/angular/templates/src/main/webapp/app/account/activate/activate.component.ts.ejs b/generators/angular/templates/src/main/webapp/app/account/activate/activate.component.ts.ejs
@@ -39,7 +39,7 @@ export default class ActivateComponent implements OnInit {
   ngOnInit(): void {
     this.route.queryParams.pipe(mergeMap(params => this.activateService.get(params.key))).subscribe({
       next: () => this.success.set(true),
-      error: () => this.error.set(true)
+      error: () => this.error.set(true),
     });
   }
 }
diff --git a/...main/webapp/app/account/password-reset/finish/password-reset-finish.component.spec.ts.ejs b/...main/webapp/app/account/password-reset/finish/password-reset-finish.component.spec.ts.ejs
@@ -93,7 +93,7 @@ describe('PasswordResetFinishComponent', () => {
 
       expect(service.save).toHaveBeenCalledWith('XYZPDQ', 'password');
       expect(comp.success()).toBe(true);
-    })
+    }),
   ));
 
   it('should notify of generic error', inject(
@@ -111,6 +111,6 @@ describe('PasswordResetFinishComponent', () => {
       expect(service.save).toHaveBeenCalledWith('XYZPDQ', 'password');
       expect(comp.success()).toBe(false);
       expect(comp.error()).toBe(true);
-    })
+    }),
   ));
 });
diff --git a/.../src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.ts.ejs b/.../src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.ts.ejs
@@ -76,8 +76,8 @@ export default class PasswordResetFinishComponent implements OnInit, AfterViewIn
       this.doNotMatch.set(true);
     } else {
       this.passwordResetFinishService.save(this.key(), newPassword).subscribe({
-        next: () => (this.success.set(true)),
-        error: () => (this.error.set(true)),
+        next: () => this.success.set(true),
+        error: () => this.error.set(true),
       });
     }
   }

diff --git a/...src/main/webapp/app/account/password-reset/init/password-reset-init.component.spec.ts.ejs b/...src/main/webapp/app/account/password-reset/init/password-reset-init.component.spec.ts.ejs
@@ -64,9 +64,7 @@ describe('PasswordResetInitComponent', () => {
 
   it('no notification of success upon error response', inject([PasswordResetInitService], (service: PasswordResetInitService) => {
     const err = { status: 503, data: 'something else' };
-    jest.spyOn(service, 'save').mockReturnValue(
-      throwError(() => err)
-    );
+    jest.spyOn(service, 'save').mockReturnValue(throwError(() => err));
     comp.resetRequestForm.patchValue({
       email: '[email protected]',
     });

diff --git a/...pp/app/account/password/password-strength-bar/password-strength-bar.component.spec.ts.ejs b/...pp/app/account/password/password-strength-bar/password-strength-bar.component.spec.ts.ejs
@@ -24,15 +24,13 @@ describe('PasswordStrengthBarComponent', () => {
   let comp: PasswordStrengthBarComponent;
   let fixture: ComponentFixture<PasswordStrengthBarComponent>;
 
-  beforeEach(
-    waitForAsync(() => {
-      TestBed.configureTestingModule({
-        imports: [PasswordStrengthBarComponent],
-      })
-        .overrideTemplate(PasswordStrengthBarComponent, '')
-        .compileComponents();
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      imports: [PasswordStrengthBarComponent],
     })
-  );
+      .overrideTemplate(PasswordStrengthBarComponent, '')
+      .compileComponents();
+  }));
 
   beforeEach(() => {
     fixture = TestBed.createComponent(PasswordStrengthBarComponent);

diff --git a/...ors/angular/templates/src/main/webapp/app/account/password/password.component.spec.ts.ejs b/...ors/angular/templates/src/main/webapp/app/account/password/password.component.spec.ts.ejs
@@ -33,16 +33,14 @@ describe('PasswordComponent', () => {
   let fixture: ComponentFixture<PasswordComponent>;
   let service: PasswordService;
 
-  beforeEach(
-    waitForAsync(() => {
-      TestBed.configureTestingModule({
-        imports: [PasswordComponent],
-        providers: [FormBuilder, AccountService, provideHttpClient()],
-      })
-        .overrideTemplate(PasswordComponent, '')
-        .compileComponents();
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      imports: [PasswordComponent],
+      providers: [FormBuilder, AccountService, provideHttpClient()],
     })
-  );
+      .overrideTemplate(PasswordComponent, '')
+      .compileComponents();
+  }));
 
   beforeEach(() => {
     fixture = TestBed.createComponent(PasswordComponent);

diff --git a/generators/angular/templates/src/main/webapp/app/account/password/password.component.ts.ejs b/generators/angular/templates/src/main/webapp/app/account/password/password.component.ts.ejs
@@ -66,8 +66,8 @@ export default class PasswordComponent implements OnInit {
       this.doNotMatch.set(true);
     } else {
       this.passwordService.save(newPassword, currentPassword).subscribe({
-        next: () => (this.success.set(true)),
-        error: () => (this.error.set(true)),
+        next: () => this.success.set(true),
+        error: () => this.error.set(true),
       });
     }
   }

diff --git a/...ators/angular/templates/src/main/webapp/app/account/password/password.service.spec.ts.ejs b/...ators/angular/templates/src/main/webapp/app/account/password/password.service.spec.ts.ejs
@@ -33,7 +33,10 @@ describe('Password Service', () => {
       // WHEN
       service.save(password2, password1).subscribe();
 
-      const testRequest = httpMock.expectOne({ method: 'POST', url: applicationConfigService.getEndpointFor('api/account/change-password') });
+      const testRequest = httpMock.expectOne({
+        method: 'POST',
+        url: applicationConfigService.getEndpointFor('api/account/change-password'),
+      });
 
       // THEN
       expect(testRequest.request.body).toEqual({ currentPassword: password1, newPassword: password2 });

diff --git a/...ors/angular/templates/src/main/webapp/app/account/register/register.component.spec.ts.ejs b/...ors/angular/templates/src/main/webapp/app/account/register/register.component.spec.ts.ejs
@@ -90,16 +90,14 @@ describe('RegisterComponent', () => {
       expect(comp.errorUserExists()).toBe(false);
       expect(comp.errorEmailExists()).toBe(false);
       expect(comp.error()).toBe(false);
-    })
+    }),
   ));
 
   it('should notify of user existence upon 400/login already in use', inject(
     [RegisterService],
     fakeAsync((service: RegisterService) => {
       const err = { status: 400, error: { type: LOGIN_ALREADY_USED_TYPE } };
-      jest.spyOn(service, 'save').mockReturnValue(
-        throwError(() => err)
-      );
+      jest.spyOn(service, 'save').mockReturnValue(throwError(() => err));
       comp.registerForm.patchValue({
         password: 'password',
         confirmPassword: 'password',
@@ -111,16 +109,14 @@ describe('RegisterComponent', () => {
       expect(comp.errorUserExists()).toBe(true);
       expect(comp.errorEmailExists()).toBe(false);
       expect(comp.error()).toBe(false);
-    })
+    }),
   ));
 
   it('should notify of email existence upon 400/email address already in use', inject(
     [RegisterService],
     fakeAsync((service: RegisterService) => {
       const err = { status: 400, error: { type: EMAIL_ALREADY_USED_TYPE } };
-      jest.spyOn(service, 'save').mockReturnValue(
-        throwError(() => err)
-      );
+      jest.spyOn(service, 'save').mockReturnValue(throwError(() => err));
       comp.registerForm.patchValue({
         password: 'password',
         confirmPassword: 'password',
@@ -132,16 +128,14 @@ describe('RegisterComponent', () => {
       expect(comp.errorEmailExists()).toBe(true);
       expect(comp.errorUserExists()).toBe(false);
       expect(comp.error()).toBe(false);
-    })
+    }),
   ));
 
   it('should notify of generic error', inject(
     [RegisterService],
     fakeAsync((service: RegisterService) => {
       const err = { status: 503 };
-      jest.spyOn(service, 'save').mockReturnValue(
-        throwError(() => err)
-      );
+      jest.spyOn(service, 'save').mockReturnValue(throwError(() => err));
       comp.registerForm.patchValue({
         password: 'password',
         confirmPassword: 'password',
@@ -153,6 +147,6 @@ describe('RegisterComponent', () => {
       expect(comp.errorUserExists()).toBe(false);
       expect(comp.errorEmailExists()).toBe(false);
       expect(comp.error()).toBe(true);
-    })
+    }),
   ));
 });
diff --git a/generators/angular/templates/src/main/webapp/app/account/register/register.model.ts.ejs b/generators/angular/templates/src/main/webapp/app/account/register/register.model.ts.ejs
@@ -17,5 +17,10 @@
  limitations under the License.
 -%>
 export class Registration {
-  constructor(public login: string, public email: string, public password: string, public langKey: string) {}
+  constructor(
+    public login: string,
+    public email: string,
+    public password: string,
+    public langKey: string,
+  ) {}
 }
diff --git a/generators/angular/templates/src/main/webapp/app/account/sessions/session.model.ts.ejs b/generators/angular/templates/src/main/webapp/app/account/sessions/session.model.ts.ejs
@@ -21,6 +21,6 @@ export class Session {
     public series: string,
     public tokenDate: Date,
     public ipAddress: string,
-    public userAgent: string
+    public userAgent: string,
   ) {}
 }
diff --git a/...ors/angular/templates/src/main/webapp/app/account/sessions/sessions.component.spec.ts.ejs b/...ors/angular/templates/src/main/webapp/app/account/sessions/sessions.component.spec.ts.ejs
@@ -69,7 +69,7 @@ describe('SessionsComponent', () => {
       expect(comp.error).toBe(false);
       expect(comp.account).toEqual(account);
       expect(comp.sessions).toEqual(sessions);
-    })
+    }),
   ));
 
   it('should call delete on Sessions to invalidate a session', inject(
@@ -84,7 +84,7 @@ describe('SessionsComponent', () => {
       tick();
 
       expect(service.delete).toHaveBeenCalledWith('xyz');
-    })
+    }),
   ));
 
   it('should call delete on Sessions and notify of error', inject(
@@ -100,7 +100,7 @@ describe('SessionsComponent', () => {
 
       expect(comp.success).toBe(false);
       expect(comp.error).toBe(true);
-    })
+    }),
   ));
 
   it('should call notify of success upon session invalidation', inject(
@@ -116,6 +116,6 @@ describe('SessionsComponent', () => {
 
       expect(comp.error).toBe(false);
       expect(comp.success).toBe(true);
-    })
+    }),
   ));
 });
diff --git a/generators/angular/templates/src/main/webapp/app/account/sessions/sessions.component.ts.ejs b/generators/angular/templates/src/main/webapp/app/account/sessions/sessions.component.ts.ejs
@@ -40,9 +40,9 @@ export default class SessionsComponent implements OnInit {
   private accountService = inject(AccountService);
 
   ngOnInit(): void {
-    this.sessionsService.findAll().subscribe(sessions => this.sessions = sessions);
+    this.sessionsService.findAll().subscribe(sessions => (this.sessions = sessions));
 
-    this.accountService.identity().subscribe(account => this.account = account);
+    this.accountService.identity().subscribe(account => (this.account = account));
   }
 
   invalidate(series: string): void {
@@ -52,9 +52,9 @@ export default class SessionsComponent implements OnInit {
     this.sessionsService.delete(encodeURIComponent(series)).subscribe(
       () => {
         this.success = true;
-        this.sessionsService.findAll().subscribe(sessions => this.sessions = sessions);
+        this.sessionsService.findAll().subscribe(sessions => (this.sessions = sessions));
       },
-      () => this.error = true
+      () => (this.error = true),
     );
   }
 }
diff --git a/...lar/templates/src/main/webapp/app/admin/configuration/configuration.component.spec.ts.ejs b/...lar/templates/src/main/webapp/app/admin/configuration/configuration.component.spec.ts.ejs
@@ -29,16 +29,14 @@ describe('ConfigurationComponent', () => {
   let fixture: ComponentFixture<ConfigurationComponent>;
   let service: ConfigurationService;
 
-  beforeEach(
-    waitForAsync(() => {
-      TestBed.configureTestingModule({
-        imports: [ConfigurationComponent],
-        providers: [provideHttpClient(), ConfigurationService],
-      })
-        .overrideTemplate(ConfigurationComponent, '')
-        .compileComponents();
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      imports: [ConfigurationComponent],
+      providers: [provideHttpClient(), ConfigurationService],
     })
-  );
+      .overrideTemplate(ConfigurationComponent, '')
+      .compileComponents();
+  }));
 
   beforeEach(() => {
     fixture = TestBed.createComponent(ConfigurationComponent);

diff --git a/...rs/angular/templates/src/main/webapp/app/admin/configuration/configuration.service.ts.ejs b/...rs/angular/templates/src/main/webapp/app/admin/configuration/configuration.service.ts.ejs
@@ -35,9 +35,9 @@ export class ConfigurationService {
         Object.values(
           Object.values(configProps.contexts)
             .map(context => context.beans)
-            .reduce((allBeans: Beans, contextBeans: Beans) => ({ ...allBeans, ...contextBeans }), {})
-        )
-      )
+            .reduce((allBeans: Beans, contextBeans: Beans) => ({ ...allBeans, ...contextBeans }), {}),
+        ),
+      ),
     );
   }
 

diff --git a/generators/angular/templates/src/main/webapp/app/admin/docs/docs.component.html.ejs b/generators/angular/templates/src/main/webapp/app/admin/docs/docs.component.html.ejs
@@ -16,4 +16,13 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-<iframe src="swagger-ui/index.html" width="100%" height="900" seamless target="_top" title="Swagger UI" class="border-0" data-cy="swagger-frame"></iframe>
+<iframe
+  src="swagger-ui/index.html"
+  width="100%"
+  height="900"
+  seamless
+  target="_top"
+  title="Swagger UI"
+  class="border-0"
+  data-cy="swagger-frame"
+></iframe>