Search bug fixes

app/institutions/discover/template.hbs

@@ -1,3 +1,5 @@
+{{page-title this.model.name}}
+
 <SearchPage
     @route='search'
     @query={{this.q}}

app/models/preprint-provider.ts

@@ -2,7 +2,7 @@ import { attr, hasMany, AsyncHasMany, belongsTo, AsyncBelongsTo } from '@ember-d
 import { computed } from '@ember/object';
 import { alias } from '@ember/object/computed';
 import { inject as service } from '@ember/service';
-import config from 'ember-get-config';
+import config from 'ember-osf-web/config/environment';
 import Intl from 'ember-intl/services/intl';
 import BrandModel from 'ember-osf-web/models/brand';
 

app/settings/account/-components/opt-out/component.ts

@@ -4,7 +4,7 @@ import { tracked } from '@glimmer/tracking';
 import CurrentUserService from 'ember-osf-web/services/current-user';
 import { restartableTask } from 'ember-concurrency';
 import { waitFor } from '@ember/test-waiters';
-import config from 'ember-get-config';
+import config from 'ember-osf-web/config/environment';
 import IntlService from 'ember-intl/services/intl';
 
 import captureException, { getApiErrorMessage } from 'ember-osf-web/utils/capture-exception';

lib/app-components/addon/components/branded-navbar/component.ts

@@ -3,7 +3,7 @@ import Component from '@ember/component';
 import { action, computed } from '@ember/object';
 import { alias } from '@ember/object/computed';
 import { inject as service } from '@ember/service';
-import config from 'ember-get-config';
+import config from 'ember-osf-web/config/environment';
 import Intl from 'ember-intl/services/intl';
 import Media from 'ember-responsive';
 import Session from 'ember-simple-auth/services/session';

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

@@ -209,15 +209,17 @@ export default class SearchPage extends Component<SearchArgs> {
             if (this.args.onSearch) {
                 this.args.onSearch({cardSearchText, sort, resourceType, activeFilters});
             }
-            let filterQueryObject = activeFilters.reduce((acc, filter) => {
+            const filterQueryObject = activeFilters.reduce((acc, filter) => {
                 // boolean filters should look like cardSearchFilter[hasDataResource][is-present]
                 if (filter.suggestedFilterOperator === SuggestedFilterOperators.IsPresent) {
                     acc[filter.propertyPathKey] = {};
                     acc[filter.propertyPathKey][filter.value] = true;
                     return acc;
                 }
-                // other filters should look like cardSearchFilter[propertyName]=IRI
                 const currentValue = acc[filter.propertyPathKey];
+                // other filters should look like cardSearchFilter[propertyName]=IRI
+                // or cardSearchFilter[propertyName] = IRI1, IRI2
+                // Logic below is to handle the case where there are multiple filters for the same property
                 acc[filter.propertyPathKey] = currentValue ? currentValue.concat(filter.value) : [filter.value];
                 return acc;
             }, {} as { [key: string]: any });
@@ -227,7 +229,15 @@ export default class SearchPage extends Component<SearchArgs> {
                 resourceTypeFilter = Object.values(ResourceTypeFilterValue).join(',');
             }
             filterQueryObject['resourceType'] = resourceTypeFilter;
-            filterQueryObject = { ...filterQueryObject, ...this.args.defaultQueryOptions };
+            if (this.args.defaultQueryOptions) {
+                const { defaultQueryOptions } = this.args;
+                const defaultQueryOptionKeys = Object.keys(this.args.defaultQueryOptions);
+                defaultQueryOptionKeys.forEach(key => {
+                    const currentValue = filterQueryObject[key];
+                    const defaultValue = defaultQueryOptions[key];
+                    filterQueryObject[key] = currentValue ? currentValue.concat(defaultValue) : [defaultValue];
+                });
+            }
             this.filterQueryObject = filterQueryObject;
             const searchResult = await this.store.queryRecord('index-card-search', {
                 cardSearchText,

lib/registries/addon/branded/discover/controller.ts

@@ -8,8 +8,7 @@ import Media from 'ember-responsive';
 import { tracked } from '@glimmer/tracking';
 import { Filter, OnSearchParams } from 'osf-components/components/search-page/component';
 import pathJoin from 'ember-osf-web/utils/path-join';
-import config from 'ember-get-config';
-
+import config from 'ember-osf-web/config/environment';
 export default class BrandedDiscover extends Controller.extend() {
     @service media!: Media;
     @service intl!: Intl;

lib/registries/addon/branded/index/route.ts

@@ -1,5 +1,5 @@
 import Route from '@ember/routing/route';
-import config from 'ember-get-config';
+import config from 'ember-osf-web/config/environment';
 export default class BrandedRegistriesIndexRoute extends Route {
     beforeModel() {
         const params: { providerId?: string } = this.paramsFor('branded');

mirage/serializers/preprint-provider.ts

@@ -1,5 +1,5 @@
 import { ModelInstance } from 'ember-cli-mirage';
-import config from 'ember-get-config';
+import config from 'ember-osf-web/config/environment';
 import PreprintProvider from 'ember-osf-web/models/preprint-provider';
 import ApplicationSerializer, { SerializedRelationships } from './application';