Setting same sidebar item sorting for the Edit tag request dropdown #2777
Conversation
packages/insomnia-app/app/ui/components/templating/tag-editor.js
Outdated
Show resolved
Hide resolved
packages/insomnia-app/app/ui/components/templating/tag-editor.js
Outdated
Show resolved
Hide resolved
packages/insomnia-app/app/ui/components/templating/tag-editor.js
Outdated
Show resolved
Hide resolved
| @@ -103,6 +103,23 @@ class TagEditor extends React.PureComponent<Props, State> { | |||
| ); | |||
| } | |||
|
|
|||
| _sortRequests(requests: Array<any>, parentId: string) { | |||
There was a problem hiding this comment.
You can use types to specify that this is an array of Requests and RequestGroups. Like suggested here.
There was a problem hiding this comment.
😆 we picked up on the same thing
| @@ -103,6 +103,23 @@ class TagEditor extends React.PureComponent<Props, State> { | |||
| ); | |||
| } | |||
|
|
|||
| _sortRequests(requests: Array<models.request.type | models.requestGroup.type>, parentId: string) { | |||
There was a problem hiding this comment.
You can import the type directly and use it. models.request.type is actually just a string 😆
import type { Request } from '../../../models/request';
import type { RequestGroup } from '../../../models/requestGroup';
...
_sortRequests(models: Array<Request | RequestGroup>, parentId: string) { Also, it seems that using models instead of requests seems more appropriate here for the parameter, since an item in the array can actually be a Request or a RequestGroup. By extension, when iterating through the array it would also change to models.filter(model => ...)
| if (a.metaSortKey === b.metaSortKey) return a._id > b._id ? -1 : 1; | ||
| else return a.metaSortKey < b.metaSortKey ? -1 : 1; | ||
| }) | ||
| .map(request => { |
There was a problem hiding this comment.
Nit picking, but this should likely be a .forEach rather than .map since we don't use the result for anything.
| if (request.type === models.request.type) sortedReqs.push(request); | ||
| if (request.type === models.requestGroup.type) |
There was a problem hiding this comment.
I've created some helpers in packages/insomnia-app/app/models/helpers/is-model.js to make these a little less verbose. It would then change to:
if (isRequest(model)) { }
if (isRequestGroup(model)) { }| .sort((a, b) => { | ||
| if (a.metaSortKey === b.metaSortKey) return a._id > b._id ? -1 : 1; | ||
| else return a.metaSortKey < b.metaSortKey ? -1 : 1; | ||
| }) |
There was a problem hiding this comment.
#2738 is almost complete and it creates a metaSortKeySort helper, linked below. Ideally that is used here, so once that PR is merged in we can update this.
Then, this code would just become:
| .sort((a, b) => { | |
| if (a.metaSortKey === b.metaSortKey) return a._id > b._id ? -1 : 1; | |
| else return a.metaSortKey < b.metaSortKey ? -1 : 1; | |
| }) | |
| .sort(metaSortKeySort) |
There was a problem hiding this comment.
Sorry for the delay, l lost sight of this PR hehe. Anyways I added the required changes :D
|
|
antoine29
force-pushed
the
sortingEditTagRequestList
branch
from
fb49086
to
61f6c6f
Compare
This PR is adding a method to get the same item sorting as is in the request left sideBar, for the tag requests dropdown. For the item sorting I'm using the same sorting criteria found in this selector code.
And as you can see if the sidebar item sorting is rearranged, the change will be reflected in the tag requests dropdown too.
This would close #2745