feat: Add CFS filter to sidebar filters in explore route. #3144

Anupam-dagar · 2019-06-14T19:01:54Z

Reference: #3098

Short description of what this resolves:

This adds a new search filter to sidebar of explore route.

Changes proposed in this pull request:

Add a new filter accordion with open and closed options in sidebar.
Add a query for cfs.

Checklist

I have read the Contribution & Best practices Guide.
My branch is up-to-date with the Upstream development branch.
The acceptance, integration, unit tests and linter pass locally with my changes
I have added tests that prove my fix is effective or that my feature works
I have added necessary documentation (if appropriate)

Anupam-dagar · 2019-06-14T19:04:29Z

I am not quiite sure if we can implement not available since the db field is either true or false i.e we either have it open or closed.
Also @uds5501 @shreyanshdwivedi @CosmicCoder96 can you please check it locally. For me, the events with cfs closed were also appearing in the filter of open cfs. I expect the query to be correct.
Please review.

mrsaicharan1 · 2019-06-15T05:17:12Z

app/components/explore/side-bar.js

@@ -44,6 +44,10 @@ export default Component.extend({
      this.send('selectDateFilter', 'custom_dates');
    },

+    selectEventCfs(cfs) {


Just out of doubt, What is this property being used for ?

to set cfs variable to either open or closed. Via this, events are filtered,

kushthedude · 2019-06-15T07:32:55Z

@Anupam-dagar can you please open a sub issue related to it ?

abhinavk96 · 2019-06-15T08:16:57Z

app/routes/explore.js

@@ -65,6 +65,18 @@ export default Route.extend({
      });
    }

+    if (params.cfs) {
+      let cfsVal = false;
+      if (params.cfs === 'open') {


this entire block can be reduced to a single line:

let cfsVal = (params.cfs === 'open' ? true: false);

@CosmicCoder96 Requested changes completed.

Anupam-dagar · 2019-06-15T17:03:19Z

@Anupam-dagar can you please open a sub issue related to it ?

I referenced the issue in the PR as well as commit, I don't know if it will be correct to create a sub issue for it.

kushthedude · 2019-06-15T17:07:14Z

@Anupam-dagar can you please open a sub issue related to it ?

I referenced the issue in the PR as well as commit, I don't know if it will be correct to create a sub issue for it.

Quoted by @CosmicCoder96
Please don't write 'partially fixes' in front of an issue number, it will still close the whole issue. If you are partially fixing a issue, then the complete issue is a parent issue, and you are fixin a sub issue, create a sub issue, and write fixes # in the PR for it.

Anupam-dagar · 2019-06-15T17:08:35Z

@Anupam-dagar can you please open a sub issue related to it ?

I referenced the issue in the PR as well as commit, I don't know if it will be correct to create a sub issue for it.

Quoted by @CosmicCoder96
Please don't write 'partially fixes' in front of an issue number, it will still close the whole issue. If you are partially fixing a issue, then the complete issue is a parent issue, and you are fixin a sub issue, create a sub issue, and write fixes # in the PR for it.

I have added reference, writing reference doesn't close the issue, it just adds a reference there. Partially fixes closes it because it has the term fixes. You can compare it by checking a PR with Fixes in it.

If the workflow requirement is to open a subissue for it I'll open it. Waiting for @CosmicCoder96 @niranjan94 answer on it.

mariobehling · 2019-06-17T12:45:39Z

@Anupam-dagar Please add screenshots showing the changes. Please always add a screenshot to PRs in the frontend. Thanks.

abhinavk96 · 2019-06-18T17:30:09Z

app/templates/explore.hbs

@@ -35,6 +35,12 @@
          <a role="button" {{action 'clearFilter' 'end_date'}}><i class="icon close"></i></a>
        </div>
      {{/if}}
+      {{#if filters.cfs}}
+        <div class="ui mini label">
+          {{if (eq filters.cfs 'true') 'Open' 'Closed'}}


no need to explicitly compare with true.

doing {{if filters.cfs 'Open' 'Closed'}} results in only Open being set, even on selecting Closed.

@Anupam-dagar then it's probably because filters.cfs is a string and not a boolean. Ensure it is a boolean.

@niranjan94 I am setting it as boolean only. this.set('cfs', cfs === this.cfs ? null : (cfs === 'open' ? true : false));
Also if filters.cfs is boolean, then shouldn't the if block must not get executed when closed is selected since it will become if false.

@Anupam-dagar check the data type in the model definition (if one exists). Also check if it is being assigned as a non-boolean anywhere else. Because the only explanation for the behaviour you talk about is if it is a non-boolean.

@niranjan94 I refactored my code, it was being set as boolean but I interpreted it wrong in the router. A little weird thing is happening. Please take a look at the screenshot.

Before the first click, no filter is set for cfs. I click on Open, the cfs value passed in action as parameter is true. Since cfs variable for request isn't set, this.cfs is null. The type here is boolean and Object as expected. I set the variable cfs to the param value. Now the types are boolean and boolean as expected.

Now I do the second click on the same filter to unset it, before the this.set line, the cfs param and this.cfs are both true but the types are boolean and string which should have been boolean and boolean as this.cfs was set to a boolean which can be seen from the previous console log. Now after the this.set statement, again the cfs is set to true which should have been null but since the type mismatched it is set to true. Finally the types now are both boolean.

For the third click, the type for this.cfs is boolean and hence I can unset the filter. I am not able to understand how the type is getting changed from boolean to string.

Also I am still unsure for this code block

{{#if filters.cfs}} <div class="ui mini label"> {{if filters.cfs 'Open' 'Closed'}} <a role="button" {{action 'clearFilter' 'cfs'}}><i class="icon close"></i></a> </div> {{/if}}

I tried after setting to boolean too. I am concerned about the case when filters.cfs is false, in that case will the if block get executed since the value is false. If it doesn't get executed then we won't be able to display the 'Closed' label.

@shreyanshdwivedi @uds5501 @mrsaicharan1 can you please take a look here.

abhinavk96

@Anupam-dagar When you set a query param to true, and it appears in the URL as ?xyz=true, it has been implicitly typecasted into a string. This also explains the behavior in the screenshot you added.

Anupam-dagar · 2019-06-26T19:23:13Z

I have made the changes. I have considered true and false as string data.

niranjan94

I have made the changes. I have considered true and false as string data.

@Anupam-dagar this is the wrong fix. It should remain a string only in the query. Any other usage in code should be a boolean. You should do the necessary conversions for it.

Anupam-dagar · 2019-06-27T18:46:13Z

@niranjan94 I took a look at the changes I made. I got to know that in the routes for sending a request, I need to send true or false as a string and not as a boolean. Sending it as a boolean doesn't show the correct result. Also I'm not quite sure on how I can typecast string to boolean to send to handlebar.

niranjan94 · 2019-06-28T09:34:08Z

@Anupam-dagar see https://guides.emberjs.com/v3.10.0/routing/query-params/#toc_default-values-and-deserialization

Query param values are cast to the same datatype as the default value. The same also applies to boolean default values.

Anupam-dagar · 2019-06-28T19:50:31Z

@niranjan94 I tried by setting a default value, it didn't seem to work as in that case I had to make a decision to what type of events I should show by default.
I got rid of the boolean datatype. All the operations now happen within string datatype. The true and false boolean for query param is decided on the basis of cfs type Open or Closed.

niranjan94 · 2019-06-29T11:39:32Z

app/routes/explore.js

@@ -76,6 +76,14 @@ export default Route.extend({
        val  : `%${params.location}%`
      });
    }
+    if (params.cfs) {
+      let cfsVal = params.cfs === 'Open' ? true : false;


Use lower case open/close

niranjan94 · 2019-06-29T11:39:49Z

app/routes/explore.js

+      filterOptions.push({
+        name : 'is_sessions_speakers_enabled',
+        op   : 'eq',
+        val  : cfsVal


This can just be params.cfs === 'open'

@Anupam-dagar You missed this one!

@kushthedude this has also been fixed, check in changes section.

Anupam-dagar · 2019-06-29T19:11:22Z

@niranjan94 This is ready for another review. I guess it's complete now.

abhinavk96 · 2019-07-04T22:34:12Z

app/components/explore/side-bar.js

-  hideClearFilters: computed('category', 'sub_category', 'event_type', 'startDate', 'endDate', 'location', 'ticket_type', function() {
-    return !(this.category || this.sub_category || this.event_type || this.startDate || this.endDate || this.location || this.ticket_type !== null);
+  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);


if you are passing a string to query param cfs, you can just use || this.cfs here?

the other data type are also string, hence i added it in this way.

this.cfs !== null is true if cfs is not null, false if it is null.
so you can just write this.cfs, there is no need for the explicit comparison to null

abhinavk96 · 2019-07-04T22:35:11Z

app/routes/explore.js

+      filterOptions.push({
+        name : 'is_sessions_speakers_enabled',
+        op   : 'eq',
+        val  : cfsVal


val: params.cfs === 'open'

Reference: fossasia#3098

…param.

abhinavk96 · 2019-07-05T21:13:48Z

app/components/explore/side-bar.js

-  hideClearFilters: computed('category', 'sub_category', 'event_type', 'startDate', 'endDate', 'location', 'ticket_type', function() {
-    return !(this.category || this.sub_category || this.event_type || this.startDate || this.endDate || this.location || this.ticket_type !== null);
+  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);


this.cfs !== null is true if cfs is not null, false if it is null.
so you can just write this.cfs, there is no need for the explicit comparison to null

Anupam-dagar · 2019-07-06T05:43:06Z

@CosmicCoder96 @niranjan94 Updated pull request with the requested changes. Please review.

auto-label bot added the feature label Jun 14, 2019

mrsaicharan1 reviewed Jun 15, 2019

View reviewed changes

abhinavk96 suggested changes Jun 15, 2019

View reviewed changes

Anupam-dagar force-pushed the sidebarfilter branch from fb668eb to cbf80e3 Compare June 15, 2019 17:16

fossasia deleted a comment Jun 15, 2019

fossasia deleted a comment Jun 17, 2019

abhinavk96 suggested changes Jun 18, 2019

View reviewed changes

Anupam-dagar force-pushed the sidebarfilter branch from deb5fc2 to ee91f3a Compare June 21, 2019 21:08

fossasia deleted a comment Jun 21, 2019

Anupam-dagar mentioned this pull request Jun 22, 2019

feat: Add link "Show more calls for speakers" below section on start page. #3171

Merged

5 tasks

abhinavk96 suggested changes Jun 25, 2019

View reviewed changes

Anupam-dagar force-pushed the sidebarfilter branch from ee91f3a to c821b08 Compare June 26, 2019 19:22

fossasia deleted a comment Jun 26, 2019

niranjan94 suggested changes Jun 27, 2019

View reviewed changes

fossasia deleted a comment Jun 28, 2019

niranjan94 suggested changes Jun 29, 2019

View reviewed changes

fossasia deleted a comment Jun 29, 2019

niranjan94 requested a review from abhinavk96 July 1, 2019 03:42

fossasia deleted a comment Jul 4, 2019

abhinavk96 suggested changes Jul 4, 2019

View reviewed changes

Anupam-dagar added 9 commits July 5, 2019 23:25

feat: Add CFS filter to sidebar filters in explore route.

8bc86aa

Reference: fossasia#3098

Optimize code block in routes.

eeb8d3b

fix build.

01b5fac

code refactor and datatype fix.

579b719

Fix bool and string type conversion in if condition.

dc804d3

Reimplement the code with string datatype and boolean only for query …

c0279d3

…param.

refine if condition in explore for cfs filter.

a38af83

refactor code statement for cfsVal and lowercase cfs options.

27eff1b

code refactor

8470d3e

Anupam-dagar force-pushed the sidebarfilter branch from 4a8f7e2 to 8470d3e Compare July 5, 2019 17:56

fossasia deleted a comment Jul 5, 2019

abhinavk96 suggested changes Jul 5, 2019

View reviewed changes

remove comparision with null

73c4580

fossasia deleted a comment Jul 6, 2019

abhinavk96 approved these changes Jul 6, 2019

View reviewed changes

niranjan94 approved these changes Jul 6, 2019

View reviewed changes

niranjan94 merged commit 1415ddb into fossasia:development Jul 6, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: Add CFS filter to sidebar filters in explore route. #3144

feat: Add CFS filter to sidebar filters in explore route. #3144

Anupam-dagar commented Jun 14, 2019 •

edited

Loading

Anupam-dagar commented Jun 14, 2019

mrsaicharan1 Jun 15, 2019

Anupam-dagar Jun 15, 2019

kushthedude commented Jun 15, 2019

abhinavk96 Jun 15, 2019

Anupam-dagar Jun 15, 2019

Anupam-dagar commented Jun 15, 2019

kushthedude commented Jun 15, 2019

Anupam-dagar commented Jun 15, 2019 •

edited

Loading

mariobehling commented Jun 17, 2019

abhinavk96 Jun 18, 2019

Anupam-dagar Jun 18, 2019

niranjan94 Jun 19, 2019

Anupam-dagar Jun 20, 2019

niranjan94 Jun 21, 2019

Anupam-dagar Jun 21, 2019

Anupam-dagar Jun 24, 2019

abhinavk96 left a comment •

edited

Loading

Anupam-dagar commented Jun 26, 2019

niranjan94 left a comment

Anupam-dagar commented Jun 27, 2019 •

edited

Loading

niranjan94 commented Jun 28, 2019

Anupam-dagar commented Jun 28, 2019

niranjan94 Jun 29, 2019

niranjan94 Jun 29, 2019

kushthedude Jun 30, 2019

Anupam-dagar Jul 1, 2019

Anupam-dagar commented Jun 29, 2019

abhinavk96 Jul 4, 2019

Anupam-dagar Jul 5, 2019

abhinavk96 Jul 5, 2019 •

edited

Loading

abhinavk96 Jul 4, 2019

abhinavk96 Jul 5, 2019 •

edited

Loading

Anupam-dagar commented Jul 6, 2019

feat: Add CFS filter to sidebar filters in explore route. #3144

feat: Add CFS filter to sidebar filters in explore route. #3144

Conversation

Anupam-dagar commented Jun 14, 2019 • edited Loading

Short description of what this resolves:

Changes proposed in this pull request:

Checklist

Anupam-dagar commented Jun 14, 2019

Choose a reason for hiding this comment

Choose a reason for hiding this comment

kushthedude commented Jun 15, 2019

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Anupam-dagar commented Jun 15, 2019

kushthedude commented Jun 15, 2019

Anupam-dagar commented Jun 15, 2019 • edited Loading

mariobehling commented Jun 17, 2019

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

abhinavk96 left a comment • edited Loading

Choose a reason for hiding this comment

Anupam-dagar commented Jun 26, 2019

niranjan94 left a comment

Choose a reason for hiding this comment

Anupam-dagar commented Jun 27, 2019 • edited Loading

niranjan94 commented Jun 28, 2019

Anupam-dagar commented Jun 28, 2019

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Anupam-dagar commented Jun 29, 2019

Choose a reason for hiding this comment

Choose a reason for hiding this comment

abhinavk96 Jul 5, 2019 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

abhinavk96 Jul 5, 2019 • edited Loading

Choose a reason for hiding this comment

Anupam-dagar commented Jul 6, 2019

Anupam-dagar commented Jun 14, 2019 •

edited

Loading

Anupam-dagar commented Jun 15, 2019 •

edited

Loading

abhinavk96 left a comment •

edited

Loading

Anupam-dagar commented Jun 27, 2019 •

edited

Loading

abhinavk96 Jul 5, 2019 •

edited

Loading

abhinavk96 Jul 5, 2019 •

edited

Loading