Merge branch 'master' into negative_marking

Author: jatinkatyal13

app/helpers/toCsv.js

@@ -0,0 +1,8 @@
+import { helper } from '@ember/component/helper';
+
+
+export function toCsv(param) {
+  return param[0].reduce((acc, val) => acc + ',' + val, '')
+}
+
+export default helper(toCsv);

app/models/question.js

@@ -3,6 +3,7 @@ import DS from "ember-data";
 export default DS.Model.extend({
   title: DS.attr(),
   description: DS.attr(),
+  explanation: DS.attr(),
   difficulty: DS.attr(),
   positiveScore: DS.attr(),
   negativeScore: DS.attr(),

app/pods/components/question-editor/template.hbs

@@ -30,6 +30,18 @@
     </div>
   </div>
 
+  <div class="row justify-content-center align-items-center">
+    <div class="col-2">
+      <label>Question Explanation:</label>
+    </div>
+    <div class="col-5 input-group">
+      {{textarea type="text" class="input-text py-4" placeholder="Edit this explanation" value=question.explanation}}
+    </div>
+    <div class="col-5">
+      {{markdown-to-html question.explanation extensions='katex'}}
+    </div>
+  </div>
+
   <div class="row justiy-content-center align-items-center">
     <div class="col-1">
       <label>Positive Score</label>

app/pods/questions/index/controller.js

@@ -5,36 +5,13 @@ import { computed } from '@ember/object';
 
 export default Controller.extend({
   store: service(),
-  queryParams: ['page', 'limit'],
+  queryParams: ['page', 'limit', 'filter', 'filterTagsParam'],
   page: 1,
   limit: 10,
-  searchString: '',
+  filter: '',
   pageCount: computed('limit', 'questions', function() {
     return Math.ceil(this.questions.meta.pagination.count / this.limit)
   }),
-  searchTask: task(function * () {
-    yield timeout(250)
-
-    let searchStr = this.get('searchString').trim()
-    let selectedTags = []
-
-    if(this.get('filterTags')) {
-      selectedTags = this.get('filterTags')
-      selectedTags = selectedTags.map(t => +t.id)
-    } 
-
-    const questions = yield this.get('store').query('question', {
-      include: 'user',
-      filter: {
-        title: {
-          $iLike: `%${this.get('searchString')}%`
-        },
-        tags: selectedTags
-      }
-    })
-    this.set('page', 1)
-    this.set('questions', questions)
-  }).restartable(),
   tagsFilterTask: task(function * (str) {
     yield timeout(250)
     const tags = yield this.get('store').query('tag', {
@@ -47,6 +24,10 @@ export default Controller.extend({
     return tags.toArray()
   }),
   actions : {
+    selectTags (tags) {
+      this.set('filterTagsParam', tags.length ? tags.mapBy('id').reduce((acc, val) => acc + ',' + val) : '')
+      this.set('filterTags', tags)
+    },
     deleteQuestion(question) {
       question.destroyRecord()
     }

app/pods/questions/index/route.js

@@ -7,16 +7,32 @@ export default Route.extend({
     },
     limit: {
       refreshModel: true
+    },
+    filter: {
+      refreshModel: true
+    },
+    filterTagsParam: {
+      refreshModel: true
     }
   },
   model (params) {
-    const {page, limit} = params
+    const { page, limit, filter = '' } = params
+    let { filterTagsParam } = params
+
+    filterTagsParam = filterTagsParam ? filterTagsParam.split(',') : []
+    
     return this.store.query('question', {
       include: 'user',
+      filter: {
+        title: {
+          $iLike: `%${filter}%`
+        },
+        ...(filterTagsParam.length && {tags: filterTagsParam} )
+      },
       page: {
         offset: (page-1)*limit > 0 ? (page-1)*limit: 0,
         limit: params.limit
-      }
+      },
     })
   },
   setupController (controller, model) {

app/pods/questions/index/template.hbs

@@ -7,7 +7,7 @@
   </div>
   <div class="row justify-content-center">
     <div class="input-search nav-search col-8 justify-content-center">
-      {{input type="text"  placeholder="Enter Question Name" key-up=(perform searchTask) value=searchString}}
+      {{input type="text"  placeholder="Enter Question Name" value=filter}}
       <img src="http://online.codingblocks.com/images/searchicon-06d8faf96de7c883b5440b6594e39eda.png" alt="search">
     </div>
   </div>
@@ -16,7 +16,7 @@
       {{#power-select-multiple 
       search=(perform tagsFilterTask)
       selected=filterTags
-      onchange=(action (pipe (action (mut filterTags)) (perform searchTask)))
+      onchange=(action "selectTags")
       placeholder="Filter by tags"
       as |tag|}}
       {{tag.title}}

ember-cli-build.js

@@ -6,6 +6,9 @@ module.exports = function(defaults) {
   let app = new EmberApp(defaults, {
     'ember-composable-helpers': {
       // Add conditions
+    },
+    babel: {
+      plugins: ['transform-object-rest-spread']
     }
     // Add options here
   });