From 7f99dcac07c3f7c6c27177887959f91b332beb2b Mon Sep 17 00:00:00 2001
From: AmauryD <deflorenne.amaury@gmail.com>
Date: Thu, 12 Dec 2024 15:17:06 +0100
Subject: [PATCH] remove @action decorator and type route templates

---
 app/components/forms/register.gts |  7 ++-----
 app/routes/404.ts                 |  2 +-
 app/routes/application.ts         |  2 +-
 app/routes/login.ts               |  2 +-
 app/routes/register.ts            |  4 ----
 app/templates/404.gts             |  9 ++++-----
 app/templates/application.gts     |  4 +++-
 app/templates/forgot-password.gts | 13 ++++++-------
 app/templates/login.gts           | 16 +++++++---------
 app/templates/register.gts        | 14 +++++---------
 app/templates/reset-password.gts  | 19 +++++++------------
 app/utils/route-template.ts       | 20 ++++++++++++++++++++
 12 files changed, 57 insertions(+), 55 deletions(-)
 create mode 100644 app/utils/route-template.ts

diff --git a/app/components/forms/register.gts b/app/components/forms/register.gts
index b816c61..09daac1 100644
--- a/app/components/forms/register.gts
+++ b/app/components/forms/register.gts
@@ -3,7 +3,6 @@ import type { RegisterChangeset } from 'ember-boilerplate/changesets/register';
 import TpkForm from '@triptyk/ember-input-validation/components/tpk-form';
 import type validationsRegister from 'ember-boilerplate/validations/register';
 import Component from '@glimmer/component';
-import { action } from '@ember/object';
 
 export interface FormsRegisterSignature {
   Args: {
@@ -19,13 +18,11 @@ export interface FormsRegisterSignature {
 }
 
 export default class FormsRegister extends Component<FormsRegisterSignature> {
-  @action
-  setBirthdate(date: unknown) {
+  setBirthdate = (date: unknown) => {
     this.args.changeset.set('birthDate', date as Date);
   }
 
-  @action
-  selectCategory(category: unknown) {
+  selectCategory = (category: unknown) => {
     this.args.changeset.set('category', category as string);
   }
 
diff --git a/app/routes/404.ts b/app/routes/404.ts
index f8006c3..2ce5d42 100644
--- a/app/routes/404.ts
+++ b/app/routes/404.ts
@@ -1,3 +1,3 @@
 import Route from '@ember/routing/route';
 
-export default class NotFound extends Route {}
+export default class NotFoundRoute extends Route {}
diff --git a/app/routes/application.ts b/app/routes/application.ts
index ca91278..8acb054 100644
--- a/app/routes/application.ts
+++ b/app/routes/application.ts
@@ -9,7 +9,7 @@ import type { IntlService } from 'ember-intl';
 import type SessionService from 'ember-simple-auth/services/session';
 import { setupWorker } from 'msw/browser';
 
-export default class Application extends Route {
+export default class ApplicationRoute extends Route {
   @service declare session: SessionService;
   @service declare currentUser: CurrentUserService;
   @service declare intl: IntlService;
diff --git a/app/routes/login.ts b/app/routes/login.ts
index 9eafd0d..db5835b 100644
--- a/app/routes/login.ts
+++ b/app/routes/login.ts
@@ -3,7 +3,7 @@ import { service } from '@ember/service';
 
 import type SessionService from 'ember-simple-auth/services/session';
 
-export default class Login extends Route {
+export default class LoginRoute extends Route {
   @service declare session: SessionService;
 
   beforeModel() {
diff --git a/app/routes/register.ts b/app/routes/register.ts
index b9ab6e5..a366e77 100644
--- a/app/routes/register.ts
+++ b/app/routes/register.ts
@@ -1,9 +1,5 @@
 import Route from '@ember/routing/route';
 
-export interface RegisterRouteParams {}
-
-export type RegisterRouteModel = Resolved<ReturnType<RegisterRoute['model']>>;
-
 export default class RegisterRoute extends Route {
   model() {
     return {};
diff --git a/app/templates/404.gts b/app/templates/404.gts
index f4cb0a4..0340f72 100644
--- a/app/templates/404.gts
+++ b/app/templates/404.gts
@@ -1,15 +1,14 @@
 import Component from '@glimmer/component';
 import { on } from '@ember/modifier';
-import { action } from '@ember/object';
-
 import t from 'ember-intl/helpers/t';
 import RouteTemplate from 'ember-route-template';
+import type { RouteTemplateSignature } from 'ember-boilerplate/utils/route-template';
+import type NotFoundRoute from 'ember-boilerplate/routes/404';
 
 export interface NotFoundRouteComponentSignature {}
 
-class NotFoundRouteComponent extends Component<NotFoundRouteComponentSignature> {
-  @action
-  comeback() {
+class NotFoundRouteComponent extends Component<RouteTemplateSignature<NotFoundRoute>> {
+  comeback = () => {
     window.history.back();
   }
 
diff --git a/app/templates/application.gts b/app/templates/application.gts
index 83a299e..54963cd 100644
--- a/app/templates/application.gts
+++ b/app/templates/application.gts
@@ -7,8 +7,10 @@ import HeadLayout from 'ember-cli-head/components/head-layout';
 import RouteTemplate from 'ember-route-template';
 
 import type FlashMessageService from 'ember-cli-flash/services/flash-messages';
+import type { RouteTemplateSignature } from 'ember-boilerplate/utils/route-template';
+import type ApplicationRoute from 'ember-boilerplate/routes/application';
 
-class ApplicationRouteComponent extends Component {
+class ApplicationRouteComponent extends Component<RouteTemplateSignature<ApplicationRoute>> {
   @service declare flashMessages: FlashMessageService;
 
   <template>
diff --git a/app/templates/forgot-password.gts b/app/templates/forgot-password.gts
index 77b12b8..553bbdb 100644
--- a/app/templates/forgot-password.gts
+++ b/app/templates/forgot-password.gts
@@ -1,5 +1,5 @@
 import Component from '@glimmer/component';
-import { action } from '@ember/object';
+
 import { service } from '@ember/service';
 
 import { ForgotPasswordChangeset } from 'ember-boilerplate/changesets/forgot-password';
@@ -12,10 +12,10 @@ import { tracked } from 'tracked-built-ins';
 import type Router from '@ember/routing/router';
 import type FlashMessageService from 'ember-cli-flash/services/flash-messages';
 import RequestManager from '@ember-data/request';
+import type ForgotPasswordRoute from 'ember-boilerplate/routes/forgot-password';
+import type { RouteTemplateSignature } from 'ember-boilerplate/utils/route-template';
 
-interface PagesForgotPasswordArgs {}
-
-class PagesForgotPassword extends Component<PagesForgotPasswordArgs> {
+class PagesForgotPassword extends Component<RouteTemplateSignature<ForgotPasswordRoute>> {
   @service declare router: Router;
   @service declare requestManager: RequestManager;
   @service declare flashMessages: FlashMessageService;
@@ -23,15 +23,14 @@ class PagesForgotPassword extends Component<PagesForgotPasswordArgs> {
 
   validationSchema = forgotPasswordSchema;
 
-  constructor(owner: unknown, args: PagesForgotPasswordArgs) {
+  constructor(owner: unknown, args: RouteTemplateSignature<ForgotPasswordRoute>['Args']) {
     super(owner, args);
     this.changeset = new ForgotPasswordChangeset({
       email: '',
     });
   }
 
-  @action
-  async sendRecoveryRequest(changeset: ForgotPasswordChangeset) {
+  sendRecoveryRequest = async (changeset: ForgotPasswordChangeset) => {
     try {
       await this.requestManager.request({
         url: '/auth/forgot-password',
diff --git a/app/templates/login.gts b/app/templates/login.gts
index 9639a48..2987679 100644
--- a/app/templates/login.gts
+++ b/app/templates/login.gts
@@ -1,6 +1,6 @@
 import Component from '@glimmer/component';
 import { tracked } from '@glimmer/tracking';
-import { action } from '@ember/object';
+
 import { service } from '@ember/service';
 import { waitFor } from '@ember/test-waiters';
 
@@ -15,10 +15,10 @@ import type RouterService from '@ember/routing/router-service';
 import type CurrentUserService from 'ember-boilerplate/services/current-user';
 import type FlashMessageService from 'ember-cli-flash/services/flash-messages';
 import type SessionService from 'ember-simple-auth/services/session';
+import type { RouteTemplateSignature } from 'ember-boilerplate/utils/route-template';
+import type LoginRoute from 'ember-boilerplate/routes/login';
 
-interface PagesLoginArgs {}
-
-class PagesLogin extends Component<PagesLoginArgs> {
+class PagesLogin extends Component<RouteTemplateSignature<LoginRoute>> {
   @service declare flashMessages: FlashMessageService;
   @service declare currentUser: CurrentUserService;
   @service declare router: RouterService;
@@ -28,7 +28,7 @@ class PagesLogin extends Component<PagesLoginArgs> {
 
   @tracked changeset: LoginChangeset;
 
-  public constructor(owner: unknown, args: PagesLoginArgs) {
+  public constructor(owner: unknown, args: RouteTemplateSignature<LoginRoute>['Args']) {
     super(owner, args);
     this.changeset = new LoginChangeset({
       email: '',
@@ -36,9 +36,7 @@ class PagesLogin extends Component<PagesLoginArgs> {
     });
   }
 
-  @action
-  @waitFor
-  async login(changeset: LoginChangeset) {
+  login = waitFor(async (changeset: LoginChangeset) => {
     try {
       await this.session.authenticate('authenticator:jwt', {
         email: changeset.get('email'),
@@ -49,7 +47,7 @@ class PagesLogin extends Component<PagesLoginArgs> {
     } catch (e) {
       this.flashMessages.danger('Username or password incorrect');
     }
-  }
+  });
 
   <template>
     <LoginLayout @title={{t "components.templates.login.title"}}>
diff --git a/app/templates/register.gts b/app/templates/register.gts
index d2b1e7e..8c973da 100644
--- a/app/templates/register.gts
+++ b/app/templates/register.gts
@@ -1,6 +1,5 @@
 import Component from '@glimmer/component';
 import { tracked } from '@glimmer/tracking';
-import { action } from '@ember/object';
 import { service } from '@ember/service';
 
 import { RegisterChangeset } from 'ember-boilerplate/changesets/register';
@@ -14,12 +13,10 @@ import type RegisterChangesetService from 'ember-boilerplate/services/changesets
 import type ErrorHandlerService from 'ember-boilerplate/services/error-handler';
 import type FlashMessageService from 'ember-cli-flash/services/flash-messages';
 import { array } from '@ember/helper';
+import type { RouteTemplateSignature } from 'ember-boilerplate/utils/route-template';
+import type RegisterRoute from 'ember-boilerplate/routes/register';
 
-export interface RegisterRouteComponentSignature {
-  Args: {};
-}
-
-class RegisterRouteComponent extends Component<RegisterRouteComponentSignature> {
+class RegisterRouteComponent extends Component<RouteTemplateSignature<RegisterRoute>> {
   @service declare flashMessages: FlashMessageService;
   @service('changesets/register') declare register: RegisterChangesetService;
   @service declare errorHandler: ErrorHandlerService;
@@ -27,7 +24,7 @@ class RegisterRouteComponent extends Component<RegisterRouteComponentSignature>
 
   validationSchema = formsRegisterSchema;
 
-  constructor(owner: unknown, args: RegisterRouteComponentSignature['Args']) {
+  constructor(owner: unknown, args: RouteTemplateSignature<RegisterRoute>['Args']) {
     super(owner, args);
     this.changeset = new RegisterChangeset({
       email: '',
@@ -47,8 +44,7 @@ class RegisterRouteComponent extends Component<RegisterRouteComponentSignature>
     });
   }
 
-  @action
-  async saveRegister(changeset: RegisterChangeset) {
+  saveRegister = async (changeset: RegisterChangeset) => {
     const user = await this.register.save(changeset);
 
     if (user.isErr) {
diff --git a/app/templates/reset-password.gts b/app/templates/reset-password.gts
index 8ef55ba..c2f0366 100644
--- a/app/templates/reset-password.gts
+++ b/app/templates/reset-password.gts
@@ -1,5 +1,5 @@
 import Component from '@glimmer/component';
-import { action } from '@ember/object';
+
 import { service } from '@ember/service';
 
 import { ResetPasswordChangeset } from 'ember-boilerplate/changesets/reset-password';
@@ -13,14 +13,10 @@ import { tracked } from 'tracked-built-ins';
 import type RouterService from '@ember/routing/router-service';
 import type FlashMessageService from 'ember-cli-flash/services/flash-messages';
 import type RequestManager from '@ember-data/request';
+import type ResetPasswordRoute from 'ember-boilerplate/routes/reset-password';
+import type { RouteTemplateSignature } from 'ember-boilerplate/utils/route-template';
 
-interface ResetPasswordRouteComponentSignature {
-  Args: {
-    token: string;
-  };
-}
-
-class ResetPasswordRouteComponent extends Component<ResetPasswordRouteComponentSignature> {
+class ResetPasswordRouteComponent extends Component<RouteTemplateSignature<ResetPasswordRoute>> {
   @service declare requestManager: RequestManager;
   @service declare router: RouterService;
   @service declare flashMessages: FlashMessageService;
@@ -28,7 +24,7 @@ class ResetPasswordRouteComponent extends Component<ResetPasswordRouteComponentS
 
   validationSchema = passwordRecoveryValidation;
 
-  constructor(owner: unknown, args: ResetPasswordRouteComponentSignature['Args']) {
+  constructor(owner: unknown, args: RouteTemplateSignature<ResetPasswordRoute>['Args']) {
     super(owner, args);
     this.changeset = new ResetPasswordChangeset({
       password: '',
@@ -36,11 +32,10 @@ class ResetPasswordRouteComponent extends Component<ResetPasswordRouteComponentS
     });
   }
 
-  @action
-  async recoverPassword(changeset: ResetPasswordChangeset) {
+  recoverPassword = async (changeset: ResetPasswordChangeset) => {
     try {
       await this.requestManager.request({
-        url: `auth/set-password/${this.args.token}`,
+        url: `auth/set-password/${this.args.model.token}`,
         body: JSON.stringify({
           password: changeset.get('password'),
         }),
diff --git a/app/utils/route-template.ts b/app/utils/route-template.ts
new file mode 100644
index 0000000..2ae7ea9
--- /dev/null
+++ b/app/utils/route-template.ts
@@ -0,0 +1,20 @@
+import Route from '@ember/routing/route';
+import type Controller from '@ember/controller';
+
+export type ModelFrom<R extends Route> = Awaited<ReturnType<R['model']>>;
+
+export type RouteTemplateSignature<
+  R extends Route,
+  C extends Controller | undefined = undefined,
+> = C extends Controller
+  ? {
+      Args: {
+        model: ModelFrom<R>;
+        controller: C;
+      };
+    }
+  : {
+      Args: {
+        model: ModelFrom<R>;
+      };
+    };