refactor: edit and destroy controllers to octane style (#556)

Co-authored-by: Guido de Jong <[email protected]> Co-authored-by: guidojw <[email protected]> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
csvalpha · Oct 29, 2022 · c40be53 · c40be53
1 parent 3296286
commit c40be53
Show file tree

Hide file tree

Showing 137 changed files with 1,136 additions and 863 deletions.
diff --git a/app/components/forms/activity-form.hbs b/app/components/forms/activity-form.hbs
@@ -140,13 +140,13 @@
         @errors={{@combinedErrors}}
         @errorMessage={{@errorMessage}}
       >
-        <LinkTo
-          @route='activities.show'
-          @model={{@model.id}}
+        <button
+          {{action @onCancel}}
+          type="button"
           class='btn btn-default'
         >
           Annuleren
-        </LinkTo>
+        </button>
       </ModelForm::FormActions>
     </form>
   </div>

diff --git a/app/components/forms/article-form.hbs b/app/components/forms/article-form.hbs
@@ -73,7 +73,7 @@
         @errors={{@model.errors}}
         @errorMessage={{@errorMessage}}
       >
-        <LinkTo @route='index' class='btn btn-default'>Annuleren</LinkTo>
+        <button {{action @onCancel}} type="button" class='btn btn-default'>Annuleren</button>
       </ModelForm::FormActions>
     </form>
   </div>

diff --git a/app/components/forms/book-form.hbs b/app/components/forms/book-form.hbs
@@ -98,19 +98,13 @@
         @errors={{@model.errors}}
         @errorMessage={{@errorMessage}}
       >
-        {{#if @model.isNew}}
-          <LinkTo @route='books.index' class='btn btn-default'>
-            Annuleren
-          </LinkTo>
-        {{else}}
-          <LinkTo
-            @route='books.show'
-            @model={{@model.id}}
-            class='btn btn-default'
-          >
-            Annuleren
-          </LinkTo>
-        {{/if}}
+        <button
+          {{action @onCancel}}
+          type="button"
+          class='btn btn-default'
+        >
+          Annuleren
+        </button>
       </ModelForm::FormActions>
     </form>
   </div>

diff --git a/app/components/forms/category-form.hbs b/app/components/forms/category-form.hbs
@@ -15,15 +15,9 @@
         @errors={{@model.errors}}
         @errorMessage={{@errorMessage}}
       >
-        {{#if @model.isNew}}
-          <LinkTo @route='forum.categories' class='btn btn-default'>
-            Annuleren
-          </LinkTo>
-        {{else}}
-          <LinkTo @route='forum.categories.category' class='btn btn-default'>
-            Annuleren
-          </LinkTo>
-        {{/if}}
+        <button {{action @onCancel}} type="button" class='btn btn-default'>
+          Annuleren
+        </button>
       </ModelForm::FormActions>
     </form>
   </div>

diff --git a/app/components/forms/group-form.hbs b/app/components/forms/group-form.hbs
@@ -55,7 +55,7 @@
         @errors={{@model.errors}}
         @errorMessage={{@errorMessage}}
       >
-        <LinkTo @route='groups.index' class='btn btn-default'>Annuleren</LinkTo>
+        <button {{action @onCancel}} type="button" class='btn btn-default'>Annuleren</button>
       </ModelForm::FormActions>
     </div>
   </div>

diff --git a/app/components/forms/mail-alias-form.hbs b/app/components/forms/mail-alias-form.hbs
@@ -101,9 +101,9 @@
         @errors={{@model.errors}}
         @errorMessage={{@errorMessage}}
       >
-        <LinkTo @route='mail-aliases.index' class='btn btn-default'>
+        <button {{action @onCancel}} type="button" class='btn btn-default'>
           Annuleren
-        </LinkTo>
+        </button>
       </ModelForm::FormActions>
     </form>
   </div>

diff --git a/app/components/forms/mandate-form.hbs b/app/components/forms/mandate-form.hbs
@@ -41,9 +41,9 @@
       </div>
 
       <ModelForm::FormActions @model={{@model}} @errorMessage={{@errorMessage}}>
-        <LinkTo @route='debit.mandates.index' class='btn btn-default'>
+        <button {{action @onCancel}} type="button" class='btn btn-default'>
           Annuleren
-        </LinkTo>
+        </button>
       </ModelForm::FormActions>
     </form>
   </div>

diff --git a/app/components/forms/photo-album-form.hbs b/app/components/forms/photo-album-form.hbs
@@ -73,9 +73,9 @@
         @errors={{@model.errors}}
         @errorMessage={{@errorMessage}}
       >
-        <LinkTo @route='photo-albums.index' class='btn btn-default'>
+        <button {{action @onCancel}} type="button" class='btn btn-default'>
           Annuleren
-        </LinkTo>
+        </button>
       </ModelForm::FormActions>
     </form>
   </div>

diff --git a/app/components/forms/poll-form.hbs b/app/components/forms/poll-form.hbs
@@ -36,13 +36,13 @@
         @errors={{@combinedErrors}}
         @errorMessage={{@errorMessage}}
       >
-        <LinkTo
-          @route='polls.show'
-          @model={{@model.id}}
+        <button
+          {{action @onCancel}}
+          type="button"
           class='btn btn-default'
         >
           Annuleren
-        </LinkTo>
+        </button>
       </ModelForm::FormActions>
     </form>
   </div>

diff --git a/app/components/forms/post-form.hbs b/app/components/forms/post-form.hbs
@@ -21,13 +21,13 @@
         @errors={{@model.errors}}
         @errorMessage={{@errorMessage}}
       >
-        <LinkTo
-          @route='forum.categories.category.threads.thread.show'
-          @model={{@model.thread}}
+        <button
+          {{action @onCancel}}
+          type="button"
           class='btn btn-default'
         >
           Annuleren
-        </LinkTo>
+        </button>
       </ModelForm::FormActions>
     </form>
   </div>

diff --git a/app/components/forms/static-page-form.hbs b/app/components/forms/static-page-form.hbs
@@ -42,9 +42,9 @@
       </div>
 
       <ModelForm::FormActions @model={{@model}} @errorMessage={{@errorMessage}}>
-        <LinkTo @route='static-pages.index' class='btn btn-default'>
+        <button {{action @onCancel}} type="button" class='btn btn-default'>
           Annuleren
-        </LinkTo>
+        </button>
       </ModelForm::FormActions>
     </form>
   </div>

diff --git a/app/components/forms/thread-form.hbs b/app/components/forms/thread-form.hbs
@@ -1,26 +1,26 @@
 <div class='card'>
   <div class='card-header'>
-    <h5>{{if @model.thread.isNew 'Topic aanmaken' 'Topic wijzigen'}}</h5>
+    <h5>{{if @model.isNew 'Topic aanmaken' 'Topic wijzigen'}}</h5>
   </div>
   <div class='card-body'>
     <form {{action @onSubmit on='submit'}}>
       <ModelForm::TextInput
-        @model={{@model.thread}}
+        @model={{@model}}
         @property='title'
         @label='Titel'
         @required={{true}}
       />
 
-      {{#if @model.post}}
+      {{#if @model.isNew }}
         <label for='forumpost-message'>Bericht *</label>
         <MdEditor
-          @content={{@model.post.message}}
+          @content={{@model.firstPost.message}}
           @textareaId='forumpost-message'
         />
       {{else}}
         {{#if (can 'edit forum/threads')}}
           <ModelForm::CheckboxInput
-            @model={{@model.thread}}
+            @model={{@model}}
             @property='isOpen'
             @label='Open voor reacties'
           />
@@ -31,22 +31,13 @@
         @errors={{@model.errors}}
         @errorMessage={{@errorMessage}}
       >
-        {{#if @model.thread.isNew}}
-          <LinkTo
-            @route='forum.categories.category.threads'
-            class='btn btn-default'
-          >
-            Annuleren
-          </LinkTo>
-        {{else}}
-          <LinkTo
-            @route='forum.categories.category.threads.thread'
-            @model={{@model.thread}}
-            class='btn btn-default'
-          >
-            Annuleren
-          </LinkTo>
-        {{/if}}
+        <button
+          {{action @onCancel}}
+          type="button"
+          class='btn btn-default'
+        >
+          Annuleren
+        </button>
       </ModelForm::FormActions>
     </form>
   </div>

diff --git a/app/components/forms/transaction-form.hbs b/app/components/forms/transaction-form.hbs
@@ -36,9 +36,9 @@
       </div>
 
       <ModelForm::FormActions @model={{@model}} @errorMessage={{@errorMessage}}>
-        <LinkTo @route='debit.collections' class='btn btn-default'>
+        <button {{action @onCancel}} type="button" class='btn btn-default'>
           Annuleren
-        </LinkTo>
+        </button>
       </ModelForm::FormActions>
     </form>
   </div>

diff --git a/app/components/forms/user-form.hbs b/app/components/forms/user-form.hbs
@@ -170,8 +170,8 @@
     @errorMessage={{@errorMessage}}
     @inputLayout='vertical'
   >
-    <LinkTo @route='users.show' @model={{@model.id}} class='btn btn-default'>
+    <button {{action @onCancel}} type="button" class='btn btn-default'>
       Annuleren
-    </LinkTo>
+    </button>
   </ModelForm::FormActions>
 </form>
diff --git a/app/components/forum/forum-post-new.js b/app/components/forum/forum-post-new.js
@@ -2,25 +2,23 @@ import { inject as service } from '@ember/service';
 import Component from '@ember/component';
 import { action } from '@ember/object';
 
+// todo: incorporate the model-save-util into components?
 export default class ForumPostNewComponent extends Component {
   @service store;
-  @service('flash-notice') flashNotice;
+  @service flashNotice;
 
   @action
-  save() {
+  async save() {
     let { content, thread } = this;
-
-    this.store
+    await this.store
       .createRecord('forum/post', {
         message: content,
         thread,
       })
-      .save()
-      .then(() => {
-        this.flashNotice.sendSuccess('Forumbericht toegevoegd!');
-        this.set('content', '');
-        this.onSubmit();
-      });
+      .save();
+    this.flashNotice.sendSuccess('Forumbericht toegevoegd!');
+    this.set('content', '');
+    this.onSubmit();
   }
 
   @action

diff --git a/app/components/users/privacy-settings.hbs b/app/components/users/privacy-settings.hbs
@@ -1,5 +1,5 @@
 <h5>Privacyinstellingen</h5>
-<form class='form' {{action 'submit' on='submit'}}>
+<form class='form' {{action @onSubmit on='submit'}}>
   {{#if isOwnUser}}
     <div class='form-group row'>
       <label class='col-sm-6 col-form-label form-control-label'>
@@ -105,9 +105,9 @@
       @errorMessage={{this.errorMessage}}
       @inputLayout='vertical'
     >
-      <LinkTo @route='users.show' @model={{model.id}} class='btn btn-default'>
+      <button {{action @onCancel}} type="button" class='btn btn-default'>
         Annuleren
-      </LinkTo>
+      </button>
     </ModelForm::FormActions>
   {{/if}}
 </form>
diff --git a/app/components/users/privacy-settings.js b/app/components/users/privacy-settings.js
@@ -4,7 +4,6 @@ import {
 } from 'amber-ui/constants';
 import Component from '@glimmer/component';
 import ModelSaveUtil from 'amber-ui/utils/model-save';
-import { action } from '@ember/object';
 import { inject as service } from '@ember/service';
 import { isPresent } from '@ember/utils';
 import { tracked } from '@glimmer/tracking';
@@ -17,7 +16,10 @@ export default class PrivacySettingsComponent extends Component {
 
   successMessage = 'Privacyinstellingen gewijzigd!';
   successTransitionTarget = null;
-  successTransitionModel = null;
+  get successTransitionModel() {
+    return null;
+  }
+
   formActionsVisible = true;
 
   constructor() {
@@ -48,9 +50,4 @@ export default class PrivacySettingsComponent extends Component {
       this.args.model.allowTomatoSharing
     );
   }
-
-  @action
-  submit() {
-    this.modelSaveUtil.saveModel(this.args.model);
-  }
 }
diff --git a/app/controllers/activities/destroy.js b/app/controllers/activities/destroy.js
@@ -1,5 +1,6 @@
 import DestroyController from 'amber-ui/controllers/application/destroy';
 
-export default DestroyController.extend({
-  successTransitionTarget: 'activities.index',
-});
+export default class ActivityDestroyController extends DestroyController {
+  successTransitionTarget = 'activities.index';
+  cancelTransitionTarget = 'activities.show';
+}