From bebb9947a66dc28e3ac989ffb103787f9a67df4b Mon Sep 17 00:00:00 2001
From: AmauryD <deflorenne.amaury@gmail.com>
Date: Mon, 21 Oct 2024 14:43:55 +0200
Subject: [PATCH] changes

---
 app/changesets/register.ts                    |  2 ++
 app/components/forms/register.gts             | 31 ++++++++++++++++---
 app/modifiers/errors-scroll-up.ts             | 28 -----------------
 app/modifiers/scroll-on-error.ts              | 13 --------
 app/styles/app.css                            |  2 ++
 app/templates/register.gts                    |  4 +++
 ember-cli-build.js                            |  7 +----
 package.json                                  |  2 ++
 pnpm-lock.yaml                                |  6 ++++
 .../forms/register/component-test.gts         |  4 +++
 .../changesets/register/changesets.ts         |  6 +++-
 .../components/forms/register/fr-fr.yaml      |  2 ++
 12 files changed, 55 insertions(+), 52 deletions(-)
 delete mode 100644 app/modifiers/errors-scroll-up.ts
 delete mode 100644 app/modifiers/scroll-on-error.ts

diff --git a/app/changesets/register.ts b/app/changesets/register.ts
index bef8313..ecb9f78 100644
--- a/app/changesets/register.ts
+++ b/app/changesets/register.ts
@@ -4,6 +4,8 @@ export interface RegisterDTO {
   id?: string;
   firstName: string;
   lastName: string;
+  category: string;
+  birthDate?: Date;
   phone: string;
   email: string;
   gift: number;
diff --git a/app/components/forms/register.gts b/app/components/forms/register.gts
index 6e89526..98da7f6 100644
--- a/app/components/forms/register.gts
+++ b/app/components/forms/register.gts
@@ -1,12 +1,14 @@
 import t from 'ember-intl/helpers/t';
-import type { TOC } from '@ember/component/template-only';
 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: {
     changeset: RegisterChangeset;
+    categories: string[];
     saveFunction: (changeset: RegisterChangeset) => void;
     validationSchema: typeof validationsRegister;
   };
@@ -16,7 +18,18 @@ export interface FormsRegisterSignature {
   Element: HTMLFormElement;
 }
 
-const FormsRegisterSignature: TOC<FormsRegisterSignature> = <template>
+export default class FormsRegister extends Component<FormsRegisterSignature> {
+  @action
+  setBirthdate(date: unknown) {
+    this.args.changeset.set('birthDate', date as Date);
+  }
+
+  @action
+  selectCategory(category: unknown) {
+    this.args.changeset.set('category', category as string);
+  }
+
+  <template>
     <TpkForm
       @changeset={{@changeset}}
       @onSubmit={{@saveFunction}}
@@ -56,6 +69,17 @@ const FormsRegisterSignature: TOC<FormsRegisterSignature> = <template>
         @validationField="password"
         data-test-input="password"
       />
+      <F.TpkDatepicker class="col-span-12" @validationField="birthDate" @label={{t "components.forms.register.birth_date"}} @onChange={{this.setBirthdate}} as |D|>
+        <D.Label />
+        <D.Input />
+      </F.TpkDatepicker>
+      <F.TpkSelectPrefab
+        @validationField="category"
+        @options={{@categories}}
+        @label={{t "components.forms.register.category"}}
+        @onChange={{this.selectCategory}}
+        class="col-span-12"
+      />
       <F.TpkPasswordPrefab
         class="input_block col-span-12"
         @label={{t "components.forms.register.confirm_password"}}
@@ -75,5 +99,4 @@ const FormsRegisterSignature: TOC<FormsRegisterSignature> = <template>
       </button>
     </TpkForm>
   </template>;
-
-export default FormsRegisterSignature;
+}
diff --git a/app/modifiers/errors-scroll-up.ts b/app/modifiers/errors-scroll-up.ts
deleted file mode 100644
index 3e53407..0000000
--- a/app/modifiers/errors-scroll-up.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import { runTask } from 'ember-lifeline';
-import type { ValidationError } from 'ember-immer-changeset';
-
-export function scrollToFirstError(
-  target: object,
-  element: Element | Document,
-  errors: ValidationError[],
-): void {
-  const firstValidError = errors.find(
-    (error) =>
-      element.querySelector(`[anchorScrollUp="${error?.key}"]`) !== null,
-  );
-
-  if (firstValidError) {
-    const errorElement = document.querySelector(
-      `[anchorScrollUp="${firstValidError?.key}"]`,
-    ) as HTMLElement;
-
-    errorElement.style.transition = '0.3s ease-out';
-
-    const targetTop =
-      errorElement.getBoundingClientRect().top + window.scrollY - 85;
-
-    runTask(target, () => {
-      window.scrollTo({ top: targetTop, behavior: 'smooth' });
-    }, 20);
-  }
-}
diff --git a/app/modifiers/scroll-on-error.ts b/app/modifiers/scroll-on-error.ts
deleted file mode 100644
index dcaea0c..0000000
--- a/app/modifiers/scroll-on-error.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { modifier } from 'ember-modifier';
-
-import { scrollToFirstError } from './errors-scroll-up';
-
-import type { ValidationError } from 'ember-immer-changeset';
-
-export default modifier(function scrollOnError(
-  this: object,
-  element,
-  [errors]: [ValidationError[]],
-) {
-  scrollToFirstError(this, element, errors);
-});
diff --git a/app/styles/app.css b/app/styles/app.css
index af3fd38..4cbef1a 100644
--- a/app/styles/app.css
+++ b/app/styles/app.css
@@ -6,6 +6,8 @@
 @import url("input.css");
 @import url("table.css");
 @import url("button.css");
+@import url("@eonasdan/tempus-dominus/dist/css/tempus-dominus.css");
+@import url("ember-power-select/vendor/ember-power-select.css");
 
 /*** GENERAL  ****/
 button:focus-visible,
diff --git a/app/templates/register.gts b/app/templates/register.gts
index b92f179..25efd27 100644
--- a/app/templates/register.gts
+++ b/app/templates/register.gts
@@ -13,6 +13,7 @@ import RouteTemplate from 'ember-route-template';
 import type RegisterChangesetService from 'ember-boilerplate/services/changesets/register';
 import type ErrorHandlerService from 'ember-boilerplate/services/error-handler';
 import type FlashMessageService from 'ember-cli-flash/services/flash-messages';
+import { array } from '@ember/helper';
 
 export interface RegisterRouteComponentSignature {
   Args: {};
@@ -34,6 +35,8 @@ class RegisterRouteComponent extends Component<RegisterRouteComponentSignature>
       lastName: '',
       phone: '',
       gift: 0,
+      birthDate: undefined,
+      category: '',
       password: '',
       confirmPassword: '',
     });
@@ -55,6 +58,7 @@ class RegisterRouteComponent extends Component<RegisterRouteComponentSignature>
   <template>
     <LoginLayout @title={{t "components.templates.register.title"}}>
       <RegisterForm
+        @categories={{array 'bonjour' 'au revoir' 'caca'}}
         @changeset={{this.changeset}}
         @validationSchema={{this.validationSchema}}
         @saveFunction={{this.saveRegister}}
diff --git a/ember-cli-build.js b/ember-cli-build.js
index 44788f2..420bb9a 100644
--- a/ember-cli-build.js
+++ b/ember-cli-build.js
@@ -69,11 +69,6 @@ module.exports = async function (defaults) {
         package: 'qunit',
       },
     ],
-    amdCompatibility: {
-      es: [
-        ["fetch", ["default", "setupFastboot"]]
-      ],
-    },
     staticAddonTrees: true,
     staticAddonTestSupportTrees: true,
     staticHelpers: true,
@@ -81,6 +76,6 @@ module.exports = async function (defaults) {
     staticComponents: true,
     splitControllers: true,
     splitRouteClasses: true,
-    staticEmberSource: true,
+    staticEmberSource: true
   });
 };
diff --git a/package.json b/package.json
index 3a829d0..0462bb4 100644
--- a/package.json
+++ b/package.json
@@ -61,6 +61,7 @@
     "@embroider/router": "2.1.8",
     "@embroider/test-setup": "~4.0.0",
     "@embroider/webpack": "^4.0.8",
+    "@eonasdan/tempus-dominus": "^6.9.11",
     "@eslint/eslintrc": "^3.1.0",
     "@eslint/js": "^9.13.0",
     "@glimmer/component": "~1.1.2",
@@ -120,6 +121,7 @@
     "ember-load-initializers": "^3.0.1",
     "ember-modifier": "~4.2.0",
     "ember-page-title": "~8.2.3",
+    "ember-power-select": "^8.3.1",
     "ember-qunit": "~8.1.0",
     "ember-resolver": "~13.0.2",
     "ember-route-template": "^1.0.3",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index b1ab455..0417c87 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -120,6 +120,9 @@ importers:
       '@embroider/webpack':
         specifier: ^4.0.8
         version: 4.0.8(@embroider/core@3.4.19(@glint/template@1.5.0))(webpack@5.95.0)
+      '@eonasdan/tempus-dominus':
+        specifier: ^6.9.11
+        version: 6.9.11(@popperjs/core@2.11.8)
       '@eslint/eslintrc':
         specifier: ^3.1.0
         version: 3.1.0
@@ -297,6 +300,9 @@ importers:
       ember-page-title:
         specifier: ~8.2.3
         version: 8.2.3(ember-source@5.12.0(@glimmer/component@1.1.2(@babel/core@7.25.8))(@glint/template@1.5.0)(rsvp@4.8.5)(webpack@5.95.0))
+      ember-power-select:
+        specifier: ^8.3.1
+        version: 8.3.1(qk3rqwq2gycwbwr3x55fgbcjuu)
       ember-qunit:
         specifier: ~8.1.0
         version: 8.1.0(@ember/test-helpers@4.0.4(@babel/core@7.25.8)(@glint/template@1.5.0)(ember-source@5.12.0(@glimmer/component@1.1.2(@babel/core@7.25.8))(@glint/template@1.5.0)(rsvp@4.8.5)(webpack@5.95.0)))(@glint/template@1.5.0)(ember-source@5.12.0(@glimmer/component@1.1.2(@babel/core@7.25.8))(@glint/template@1.5.0)(rsvp@4.8.5)(webpack@5.95.0))(qunit@2.22.0)
diff --git a/tests/integration/components/forms/register/component-test.gts b/tests/integration/components/forms/register/component-test.gts
index 4dca6e8..e34e006 100644
--- a/tests/integration/components/forms/register/component-test.gts
+++ b/tests/integration/components/forms/register/component-test.gts
@@ -6,6 +6,7 @@ import { pagesFormsRegister } from 'ember-boilerplate/tests/pages/forms/register
 import validationsRegister from 'ember-boilerplate/validations/register';
 import { setupIntl } from 'ember-intl/test-support';
 import RegisterForm from 'ember-boilerplate/components/forms/register';
+import { array } from '@ember/helper';
 
 module('Integration | Component | forms/register', function (hooks) {
   setupRenderingTest(hooks);
@@ -15,6 +16,8 @@ module('Integration | Component | forms/register', function (hooks) {
     return new RegisterChangeset({
       email: 'test@triptyk.eu',
       lastName: 'triptyk',
+      category: '1',
+      birthDate: new Date(),
       firstName: 'papa',
       phone: '+32 498542257',
       gift: 1000,
@@ -31,6 +34,7 @@ module('Integration | Component | forms/register', function (hooks) {
     return render(
       <template>
         <RegisterForm
+          @categories={{array '1' '2' '3'}}
           @changeset={{changeset}}
           @saveFunction={{saveFunction}}
           @validationSchema={{validationSchema}}
diff --git a/tests/unit/services/changesets/register/changesets.ts b/tests/unit/services/changesets/register/changesets.ts
index 23f3b78..82e96da 100644
--- a/tests/unit/services/changesets/register/changesets.ts
+++ b/tests/unit/services/changesets/register/changesets.ts
@@ -1,3 +1,5 @@
+import type { RegisterDTO } from "ember-boilerplate/changesets/register";
+
 export const changesetInitialData = {
   firstName: 'a',
   lastName: 'a',
@@ -5,4 +7,6 @@ export const changesetInitialData = {
   email: 'a',
   gift: 5000,
   password: '123',
-};
+  birthDate: new Date(),
+  category: 'a',
+} satisfies RegisterDTO;
diff --git a/translations/components/forms/register/fr-fr.yaml b/translations/components/forms/register/fr-fr.yaml
index 59047fa..d54a140 100644
--- a/translations/components/forms/register/fr-fr.yaml
+++ b/translations/components/forms/register/fr-fr.yaml
@@ -5,3 +5,5 @@ email: "Email"
 gift: "Don"
 password: "Mot de passe"
 confirm_password: "Confirmer mot de passe"
+birth_date: "Date de naissance"
+category: "Catégorie"