Merge pull request #1 from brancusi/aramzadikian/ch419/can-delete-fla…

…sh-cards Add destroy flash card button
brancusi · Apr 19, 2017 · eca4a29 · eca4a29
2 parents d682e6d + 7fceb24
commit eca4a29
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 19 deletions.
diff --git a/app/components/audio-recorder/template.hbs b/app/components/audio-recorder/template.hbs
@@ -1,3 +1,3 @@
 {{ui/icon-button
-    label="Push to record"
+    label="Push & hold to record"
     leftIcon="microphone"}}
diff --git a/app/components/flash-card/template.hbs b/app/components/flash-card/template.hbs
@@ -1,7 +1,15 @@
-<header>
+<header class="row">
   <div class="index">
     {{position}}.
   </div>
+  <div class="stretch">
+
+  </div>
+  <div class="ui-container">
+    {{ui/icon-button
+        label="X"
+        click=destroyModel}}
+  </div>
 </header>
 
 <div class="row fieldsContainer">

diff --git a/app/routes/session.js b/app/routes/session.js
@@ -6,10 +6,11 @@ import moment from 'moment';
 export default Ember.Route.extend({
   setupController(controller, model) {
     const { record, sessionId } = model;
-    this._super(...arguments);
 
     controller.set('session', record);
     controller.set('sessionId', sessionId);
+
+    this._super(...arguments);
   },
 
   async model(params) {
@@ -49,6 +50,15 @@ export default Ember.Route.extend({
       model.save();
     },
 
+    // @TODO: Not sure why this is failing.
+    async destroyModel(flashCard, lesson) {
+      await flashCard
+        .destroyRecord()
+        .catch(() => {});
+
+      await lesson.save();
+    },
+
     async createFlashCard(lesson) {
       await this.store
         .createRecord('flash-card', { lesson, ts:moment().valueOf() })

diff --git a/app/templates/session.hbs b/app/templates/session.hbs
@@ -11,6 +11,7 @@
             total=cardCount
             index=index
             onAudioCreated=(route-action 'onAudioCreated' flashCard)
+            destroyModel=(route-action 'destroyModel' flashCard session)
             saveModel=(route-action 'saveModel')}}
       {{/each}}
     {{else}}

diff --git a/tests/integration/components/audio-recorder/component-test.js b/tests/integration/components/audio-recorder/component-test.js