Skip to content

Commit 1df6023

Browse files
committed
Merge branch 'hotfix/23.10.2'
2 parents 5257e08 + 25732a2 commit 1df6023

File tree

6 files changed

+8
-7
lines changed

6 files changed

+8
-7
lines changed

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1940,6 +1940,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
19401940
### Added
19411941
- Quick Files
19421942

1943+
[23.10.2]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/23.10.2
1944+
[23.10.1]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/23.10.1
19431945
[23.10.0]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/23.10.0
19441946
[23.09.0]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/23.09.0
19451947
[23.08.0]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/23.08.0

app/institutions/discover/controller.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ export default class InstitutionDiscoverController extends Controller {
1414
@tracked sort?: string = '-relevance';
1515
@tracked resourceType?: ResourceTypeFilterValue | null = null;
1616

17-
queryParams = ['cardSearchText', 'page', 'sort', 'resourceType'];
17+
queryParams = ['cardSearchText', 'sort', 'resourceType'];
1818

1919
get defaultQueryOptions() {
2020
return {

app/preprints/discover/controller.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ export default class PreprintDiscoverController extends Controller {
1717
@tracked cardSearchText?: string = '';
1818
@tracked sort?: string = '-relevance';
1919

20-
queryParams = ['cardSearchText', 'page', 'sort'];
20+
queryParams = ['cardSearchText', 'sort'];
2121

2222
get defaultQueryOptions() {
2323
return {

app/search/controller.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,13 @@ export default class SearchController extends Controller {
77
@tracked q?: string = '';
88
@tracked sort?: string = '-relevance';
99
@tracked resourceType?: ResourceTypeFilterValue | null = null;
10-
@tracked page?: string = '';
1110

12-
queryParams = ['q', 'page', 'sort', 'resourceType'];
11+
queryParams = ['q', 'sort', 'resourceType'];
1312

1413
@action
1514
onSearch(queryOptions: OnSearchParams) {
1615
this.q = queryOptions.cardSearchText;
1716
this.sort = queryOptions.sort;
1817
this.resourceType = queryOptions.resourceType;
19-
this.page = queryOptions.page;
2018
}
2119
}

lib/osf-components/addon/components/search-page/component.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ export default class SearchPage extends Component<SearchArgs> {
234234
this.totalResultCount = searchResult.totalResultCount === ShareMoreThanTenThousand ? '10,000+' :
235235
searchResult.totalResultCount;
236236
if (this.args.onSearch) {
237-
this.args.onSearch({cardSearchText, sort, resourceType, page});
237+
this.args.onSearch({cardSearchText, sort, resourceType});
238238
}
239239
} catch (e) {
240240
this.toast.error(e);
@@ -252,6 +252,7 @@ export default class SearchPage extends Component<SearchArgs> {
252252
@waitFor
253253
async doDebounceSearch() {
254254
await timeout(searchDebounceTime);
255+
this.page = '';
255256
taskFor(this.search).perform();
256257
}
257258

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "ember-osf-web",
3-
"version": "23.10.1",
3+
"version": "23.10.2",
44
"private": true,
55
"description": "Ember front-end for the Open Science Framework",
66
"homepage": "https://github.com/CenterForOpenScience/ember-osf-web#readme",

0 commit comments

Comments
 (0)