Merge branch 'hotfix/25.06.3'

Author: brianjgeiger

app/models/collection-submission.ts

@@ -19,6 +19,7 @@ export const choiceFields = tuple(
     'programArea',
     'status',
     'volume',
+    'gradeLevels',
     'studyDesign',
     'schoolType',
     'dataType',
@@ -78,6 +79,7 @@ export default class CollectionSubmissionModel extends OsfModel.extend(Validatio
     @attr('string') programArea?: string;
     @attr('string') status?: string;
     @attr('string') volume?: string;
+    @attr('string') gradeLevels?: string;
     @attr('string') studyDesign?: string; // custom field for Character Lab
     @attr('string') schoolType?: string; // custom field for Character Lab
     @attr('string') dataType?: string;

app/models/collection.ts

@@ -13,6 +13,7 @@ export type ChoicesFields =
     'programAreaChoices' |
     'statusChoices' |
     'volumeChoices' |
+    'gradeLevelsChoices' |
     'studyDesignChoices' |
     'schoolTypeChoices' |
     'dataTypeChoices' |
@@ -32,6 +33,7 @@ export default class CollectionModel extends OsfModel {
     @attr('array') programAreaChoices!: string[];
     @attr('array') statusChoices!: string[];
     @attr('array') volumeChoices!: string[];
+    @attr('array') gradeLevelsChoices!: string[];
     @attr('array') studyDesignChoices!: string[]; // custom field for Character Lab
     @attr('array') schoolTypeChoices!: string[]; // custom field for Character Lab
     @attr('array') dataTypeChoices!: string[];

lib/collections/addon/components/discover-page/active-filters/grade-levels/component.ts

@@ -0,0 +1,9 @@
+import { layout } from 'ember-osf-web/decorators/component';
+
+import Base from '../base/component';
+import styles from './styles';
+import template from './template';
+
+@layout(template, styles)
+export default class ActiveFilterStatus extends Base {
+}

lib/collections/addon/components/discover-page/active-filters/grade-levels/styles.scss

@@ -0,0 +1,8 @@
+{{#each @context.activeFilter as |item|}}
+    <DiscoverPage::ActiveFilters::Filter
+        @item={{item}}
+        @text={{item}}
+        @ariaLabel={{t 'collections.discover_page.active_filters.remove_grade_levels'}}
+        @removeFilterItem={{action this.removeFilterItem item}}
+    />
+{{/each}}

lib/collections/addon/components/discover-page/active-filters/grade-levels/template.hbs

@@ -0,0 +1,13 @@
+import Collection from 'ember-osf-web/models/collection';
+import SearchFacetChecklist from '../checklist/component';
+
+class GradeLevels extends SearchFacetChecklist {
+    get modelAttribute(): keyof Collection {
+        return 'gradeLevelsChoices';
+    }
+    get filterProperty() {
+        return 'gradeLevels';
+    }
+}
+
+export default GradeLevels;

lib/collections/addon/components/discover-page/facets/grade-levels/component.ts

@@ -71,6 +71,7 @@ export default class Discover extends Controller {
                     ['program-area', 'program-area'],
                     ['status', 'status'],
                     ['volume', 'volume'],
+                    ['grade-levels', 'grade-levels'],
                     ['study-design', 'study-design'],
                     ['school-type', 'school-type'],
                     ['data-type', 'data-type'],
@@ -105,6 +106,7 @@ export default class Discover extends Controller {
     programArea = '';
     status = '';
     volume = '';
+    gradeLevels = '';
     studyDesign = '';
     schoolType = '';
     dataType = '';

lib/collections/addon/discover/controller.ts

@@ -72,6 +72,10 @@ export default Factory.extend<MirageCollectionSubmission>({
             const volume = faker.random.arrayElement(collectionSubmission.collection.volumeChoices);
             collectionSubmission.update({ volume });
         }
+        if (!collectionSubmission.gradeLevels) {
+            const gradeLevels = faker.random.arrayElement(collectionSubmission.collection.gradeLevelsChoices);
+            collectionSubmission.update({ gradeLevels });
+        }
         if (!collectionSubmission.studyDesign) {
             const studyDesign = faker.random.arrayElement(collectionSubmission.collection.studyDesignChoices);
             collectionSubmission.update({ studyDesign });

mirage/factories/collection-submission.ts

@@ -22,6 +22,7 @@ export default Factory.extend<MirageCollection>({
     issueChoices: [faker.lorem.word(), faker.lorem.word()],
     statusChoices: [faker.lorem.word(), faker.lorem.word()],
     programAreaChoices: [faker.lorem.word(), faker.lorem.word()],
+    gradeLevelsChoices: [faker.lorem.word(), faker.lorem.word()],
     studyDesignChoices: [faker.lorem.word(), faker.lorem.word()],
     schoolTypeChoices: [faker.lorem.word(), faker.lorem.word()],
     dataTypeChoices: [faker.lorem.word(), faker.lorem.word()],

mirage/factories/collection.ts

@@ -18,6 +18,7 @@ export function searchCollections(this: HandlerContext, schema: Schema, request:
                 status,
                 volume,
                 schoolType,
+                gradeLevels,
                 studyDesign,
                 dataType,
                 disease,
@@ -78,6 +79,13 @@ export function searchCollections(this: HandlerContext, schema: Schema, request:
             ),
         );
     }
+    if (gradeLevels) {
+        collectionSubmissions = collectionSubmissions.filter(
+            (item: ModelInstance<CollectionSubmission>) => gradeLevels.any(
+                (value: string) => item.attrs.gradeLevels === value,
+            ),
+        );
+    }
     if (studyDesign) {
         collectionSubmissions = collectionSubmissions.filter(
             (item: ModelInstance<CollectionSubmission>) => studyDesign.any(