[WIP] Fix "Order filtering by status does not always refresh properly" bug #2902

[efalayi]

Resolves #2902
After selecting one status then another, sometimes orders that are valid do not show up

query contains filter information sent to the server. From previous implementation, Object.assign is used to update this.state.query in Orders react component. However, this not only updates but also merges query keys in state. Hence a wrong query is parsed on to the server.

let query = OrderHelper.makeQuery(value);
query = Object.assign({}, this.state.query, query);

Fix

To update filter query and search query, current search query is also parsed to state. We can update query with just the current search query (if it exists)

let query = OrderHelper.makeQuery(value);
   if (this.state.query._id) {
     query._id = this.state.query._id;
   }

Test

Add some orders
Set some orders to different states
Select a filter for which no orders should show up ("Captured" or "Approved")
Select a filter for which some orders should show up
Observe orders shown
Search filtered orders

[spencern]

@kieckhafer @joykare Can you guys review this please

[kieckhafer]

Following the instructions here, I am able to do everything I should be able to.

However, I cannot click on the Shipping Status dropdown... nothing happens when I click. Is this normal? I know we were still building that out.

[efalayi]

@kieckhafer, the Shipping Status dropdown wasn't included for this PR. I think @joykare is working on that.

[joykare]

@kieckhafer wasn't already in marketplace there's a PR for that: #2914

However, LGTM

[kieckhafer]

@joykare OK, I just checked #2914 so i know it works there. In that case, this also LGTM. There are some linting errors, however they are the same as the errors that were in #2893 and various other PR's and I fixed them in my PR, and I think they are fixed in others, so I'll merge this as is to avoid conflicts on fixes that are already done.

[spencern]

@kieckhafer is this good to go now?

[kieckhafer]

Yes... good to go... was waiting on tests/linting to pass

…

-- Erik Kieckhafer Software Engineer, Reaction Commerce <http://www.reactioncommerce.com>

On September 26, 2017 at 6:54:33 PM, Spencer Norman ( ***@***.***) wrote: @kieckhafer <https://github.com/kieckhafer> is this good to go now? — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub <#2925 (comment)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/AERk19Hzt-xrEBAPOYyRpeBHF_jd3gWnks5smarZgaJpZM4Pgn2j> .

[kieha]

Fixed by #2972