replace changeset workaround w/ correct helper usage

briarsweetbriar · briarsweetbriar · commit eb3fbb78bf88 · 2023-05-03T10:10:35.000-04:00
diff --git a/TodoListClient/app/components/forms/todo-item-form/component.js b/TodoListClient/app/components/forms/todo-item-form/component.js
@@ -1,38 +1,22 @@
 import Component from '@glimmer/component';
 import { action } from '@ember/object';
 import { inject as service } from '@ember/service';
-import Changeset from 'ember-changeset';
-import lookupValidator from 'ember-changeset-validations';
-import TodoItemValidations from '../../../validations/todo-item';
 
 export default class TodoItemForm extends Component {
   @service notify;
   @service router;
 
-  constructor() {
-    super(...arguments);
-
-    // Was unable to use the changeset helpr, so I'm constructing the changeset manually.
-    // Most likely related to this issue, but the fix didn't work.
-    // https://github.com/poteto/ember-changeset-validations/issues/214
-    this.changeset = new Changeset(
-      this.args.todoItem,
-      lookupValidator(TodoItemValidations),
-      TodoItemValidations
-    );
-  }
-
   @action
   async save(event) {
     event.preventDefault();
     try {
-      await this.changeset.validate();
+      await this.args.changeset.validate();
 
-      if (this.changeset.isValid) {
-        await this.changeset.save();
+      if (this.args.changeset.isValid) {
+        await this.args.changeset.save();
         this.router.transitionTo('s.todo-items');
       } else {
-        const errors = this.changeset.errors
+        const errors = this.args.changeset.errors
           .map((error) => `${error.validation} <br />`)
           .reduce((accumulator, currentValue) => accumulator + currentValue);
         this.notify.error({ html: errors });
diff --git a/TodoListClient/app/controllers/s/todo-items/add.js b/TodoListClient/app/controllers/s/todo-items/add.js
@@ -0,0 +1,6 @@
+import Controller from '@ember/controller';
+import TodoItemValidations from '../../../validations/todo-item';
+
+export default class AddController extends Controller {
+  TodoItemValidations = TodoItemValidations;
+}
diff --git a/TodoListClient/app/templates/s/todo-items/add.hbs b/TodoListClient/app/templates/s/todo-items/add.hbs
@@ -1 +1 @@
-<Forms::TodoItemForm @todoItem={{this.model}} />
+<Forms::TodoItemForm @changeset={{changeset this.model this.TodoItemValidations}} @todoItem={{this.model}} />

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-<Forms::TodoItemForm @todoItem={{this.model}} />`
	`1`	`+<Forms::TodoItemForm @changeset={{changeset this.model this.TodoItemValidations}} @todoItem={{this.model}} />`