code refactor and datatype fix.

fossasia · Jun 21, 2019 · ee91f3a · ee91f3a
1 parent 476ed51
commit ee91f3a
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 9 deletions.
diff --git a/app/components/explore/side-bar.js b/app/components/explore/side-bar.js
@@ -12,7 +12,7 @@ export default Component.extend({
   customEndDate : null,
   showFilters   : false,
 
-  hideClearFilters: computed('category', 'sub_category', 'event_type', 'startDate', 'endDate', 'location', 'ticket_type', function() {
+  hideClearFilters: computed('category', 'sub_category', 'event_type', 'startDate', 'endDate', 'location', 'ticket_type', 'cfs', function() {
     return !(this.category || this.sub_category || this.event_type || this.startDate || this.endDate || this.location || this.ticket_type || this.cfs !== null);
   }),
 
@@ -54,7 +54,11 @@ export default Component.extend({
     },
 
     selectEventCfs(cfs) {
-      this.set('cfs', cfs === this.cfs ? null : (cfs === 'open' ? true : false));
+      console.log('incoming param cfs and current this.cfs', cfs, this.cfs);
+      console.log('typeof cfs and typeof this.cfs', typeof(cfs), typeof(this.cfs));
+      this.set('cfs', cfs === this.cfs ? null : cfs);
+      console.log('value of param cfs are this.set and value of this.cfs are this.set', cfs, this.cfs);
+      console.log('typeof cfs and typeof this.cfs after this.set', typeof(cfs), typeof(this.cfs));
     },
 
     selectDateFilter(dateType) {

diff --git a/app/routes/explore.js b/app/routes/explore.js
@@ -78,11 +78,10 @@ export default Route.extend({
     }
 
     if (params.cfs) {
-      let cfsVal = (params.cfs === 'open' ? true : false);
       filterOptions.push({
         name : 'is_sessions_speakers_enabled',
         op   : 'eq',
-        val  : cfsVal
+        val  : params.cfs
       });
     }
 

diff --git a/app/templates/components/explore/side-bar.hbs b/app/templates/components/explore/side-bar.hbs
@@ -125,13 +125,13 @@
     </span>
     <div class="content menu">
       <a href="#"
-        class="link item {{if (eq cfs 'open') 'active'}}"
-        {{action 'selectEventCfs' 'open'}}>
+        class="link item {{if cfs 'active'}}"
+        {{action 'selectEventCfs' true}}>
         {{t 'Open'}}
       </a>
       <a href="#"
-        class="link item {{if (eq cfs 'closed') 'active'}}"
-        {{action 'selectEventCfs' 'closed'}}>
+        class="link item {{unless cfs 'active'}}"
+        {{action 'selectEventCfs' false}}>
         {{t 'Closed'}}
       </a>
     </div>

diff --git a/app/templates/explore.hbs b/app/templates/explore.hbs
@@ -43,7 +43,7 @@
       {{/if}}
       {{#if filters.cfs}}
         <div class="ui mini label">
-          {{if (eq filters.cfs 'true') 'Open' 'Closed'}}
+          {{if filters.cfs 'Open' 'Closed'}}
           <a role="button" {{action 'clearFilter' 'cfs'}}><i class="icon close"></i></a>
         </div>
       {{/if}}