Skip to content

Commit

Permalink
Merge branch 'main' into releases/1.5.1
Browse files Browse the repository at this point in the history
  • Loading branch information
frascuchon committed Mar 30, 2023
2 parents 96fca71 + 6fb3ce2 commit c89153e
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 9 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Fixes

- Allow URL to be clickable in Jupyter notebook again. Closes [#2527](https://github.com/argilla-io/argilla/issues/2527)
- Remove sorting by score in labels, keeping natural sorting [#2623](https://github.com/argilla-io/argilla/pull/2623)

### Removed

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -93,11 +93,8 @@ export default {
query() {
return this.dataset.query.text;
},
sortedLabels() {
return this.labels.slice().sort((a, b) => (a.score > b.score ? -1 : 1));
},
filteredLabels() {
return this.sortedLabels.filter((label) =>
return this.labels.filter((label) =>
label.class.toLowerCase().match(this.searchText)
);
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ export default {
shownLabels: {
get: function () {
return this.allowToShowAllLabels
? this.sortedLabels.length
? this.labels.length
: this.idState.shownLabels;
},
set: function (newValue) {
Expand Down Expand Up @@ -162,13 +162,10 @@ export default {
});
},
filteredLabels() {
return this.sortedLabels.filter((label) =>
return this.labels.filter((label) =>
label.class.toLowerCase().match(this.searchText.toLowerCase())
);
},
sortedLabels() {
return this.labels.slice().sort((a, b) => (a.score > b.score ? -1 : 1));
},
appliedLabels() {
return this.labels.filter((l) => l.selected).map((label) => label.class);
},
Expand Down

0 comments on commit c89153e

Please sign in to comment.