Merge branch 'hotfix/21.5.1'

fabmiz · fabmiz · commit 7a3bc8de31de · 2021-06-21T12:08:24.000-04:00
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -23,8 +23,8 @@ jobs:
       uses: actions/cache@v2
       with:
         path: ./node_modules
-        key: cached_node_modules_${{ hashFiles('**/yarn.lock') }}
-        restore-keys: cached_node_modules_
+        key: cached_node_modules_${{ secrets.CACHE_VERSION }}_${{ hashFiles('**/yarn.lock') }}
+        restore-keys: cached_node_modules_${{ secrets.CACHE_VERSION }}_
     - if: steps.cache-node-modules.outputs.cache-hit != 'true'
       run: yarn --prefer-offline --frozen-lockfile --ignore-engines
 
@@ -38,8 +38,8 @@ jobs:
       uses: actions/cache@v2
       with:
         path: ./node_modules
-        key: cached_node_modules_${{ hashFiles('**/yarn.lock') }}
-        restore-keys: cached_node_modules_
+        key: cached_node_modules_${{ secrets.CACHE_VERSION }}_${{ hashFiles('**/yarn.lock') }}
+        restore-keys: cached_node_modules_${{ secrets.CACHE_VERSION }}_
     - run: yarn build:test
     - uses: actions/upload-artifact@v2
       with:
@@ -55,8 +55,8 @@ jobs:
       uses: actions/cache@v2
       with:
         path: ./node_modules
-        key: cached_node_modules_${{ hashFiles('**/yarn.lock') }}
-        restore-keys: cached_node_modules_
+        key: cached_node_modules_${{ secrets.CACHE_VERSION }}_${{ hashFiles('**/yarn.lock') }}
+        restore-keys: cached_node_modules_${{ secrets.CACHE_VERSION }}_
     - run: yarn lint:es
     - run: yarn lint:ts
     - run: yarn lint:style
@@ -76,8 +76,8 @@ jobs:
       uses: actions/cache@v2
       with:
         path: ./node_modules
-        key: cached_node_modules_${{ hashFiles('**/yarn.lock') }}
-        restore-keys: cached_node_modules_
+        key: cached_node_modules_${{ secrets.CACHE_VERSION }}_${{ hashFiles('**/yarn.lock') }}
+        restore-keys: cached_node_modules_${{ secrets.CACHE_VERSION }}_
     - uses: percy/exec-action@v0.3.1
       with:
         custom-command: yarn test --path ./dist --partition 1
@@ -101,8 +101,8 @@ jobs:
       uses: actions/cache@v2
       with:
         path: ./node_modules
-        key: cached_node_modules_${{ hashFiles('**/yarn.lock') }}
-        restore-keys: cached_node_modules_
+        key: cached_node_modules_${{ secrets.CACHE_VERSION }}_${{ hashFiles('**/yarn.lock') }}
+        restore-keys: cached_node_modules_${{ secrets.CACHE_VERSION }}_
     - uses: percy/exec-action@v0.3.1
       with:
         custom-command: yarn test --path ./dist --partition 2
@@ -126,8 +126,8 @@ jobs:
       uses: actions/cache@v2
       with:
         path: ./node_modules
-        key: cached_node_modules_${{ hashFiles('**/yarn.lock') }}
-        restore-keys: cached_node_modules_
+        key: cached_node_modules_${{ secrets.CACHE_VERSION }}_${{ hashFiles('**/yarn.lock') }}
+        restore-keys: cached_node_modules_${{ secrets.CACHE_VERSION }}_
     - uses: percy/exec-action@v0.3.1
       with:
         custom-command: yarn test --path ./dist --partition 3
@@ -151,8 +151,8 @@ jobs:
       uses: actions/cache@v2
       with:
         path: ./node_modules
-        key: cached_node_modules_${{ hashFiles('**/yarn.lock') }}
-        restore-keys: cached_node_modules_
+        key: cached_node_modules_${{ secrets.CACHE_VERSION }}_${{ hashFiles('**/yarn.lock') }}
+        restore-keys: cached_node_modules_${{ secrets.CACHE_VERSION }}_
     - uses: percy/exec-action@v0.3.1
       with:
         custom-command: yarn test --path ./dist --partition 4
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,16 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [21.5.1] - 2021-06-21
+### Added
+- Character Lab: Add new fields for Character Lab ( Study Design and School Type) on Collections Discover page and Collection Submission page. Users should be able to filter by these new fields and see them visible on Collection search cards on the discover page
+
+### Fixed
+- Keen analytics: Don't load keen twice on load
+
+### Changed
+- Character Lab: Allow moderators to add new registrations when `allowSubmissions` is `false`
+
 ## [21.5.0] - 2021-05-27
 ### Fixed
 - registration Detail Page: longer license types spill out of bounds
@@ -1741,7 +1751,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ### Added
 - Quick Files
 
-[Unreleased]: https://github.com/CenterForOpenScience/ember-osf-web/compare/21.5.0...develop
+[Unreleased]: https://github.com/CenterForOpenScience/ember-osf-web/compare/21.5.1...develop
+[21.5.1]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/21.5.1
 [21.5.0]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/21.5.0
 [21.4.1]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/21.4.1
 [21.4.0]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/21.4.0
diff --git a/app/models/collected-metadatum.ts b/app/models/collected-metadatum.ts
@@ -18,6 +18,8 @@ export const choiceFields = tuple(
     'programArea',
     'status',
     'volume',
+    'studyDesign',
+    'schoolType',
 );
 
 const Validations = buildValidations({
@@ -48,6 +50,8 @@ export default class CollectedMetadatumModel extends OsfModel.extend(Validations
     @attr('string') programArea?: string;
     @attr('string') status?: string;
     @attr('string') volume?: string;
+    @attr('string') studyDesign?: string; // custom field for Character Lab
+    @attr('string') schoolType?: string; // custom field for Character Lab
 
     @belongsTo('collection') collection!: Collection;
     @belongsTo('node') guid!: Node;
diff --git a/app/models/collection.ts b/app/models/collection.ts
@@ -14,7 +14,9 @@ export type ChoicesFields =
     'issueChoices' |
     'programAreaChoices' |
     'statusChoices' |
-    'volumeChoices';
+    'volumeChoices' |
+    'studyDesignChoices' |
+    'schoolTypeChoices';
 
 export const choicesFields = choiceFields.map(field => `${field}Choices`) as ChoicesFields[];
 
@@ -30,6 +32,8 @@ export default class CollectionModel extends OsfModel {
     @attr('array') programAreaChoices!: string[];
     @attr('array') statusChoices!: string[];
     @attr('array') volumeChoices!: string[];
+    @attr('array') studyDesignChoices!: string[]; // custom field for Character Lab
+    @attr('array') schoolTypeChoices!: string[]; // custom field for Character Lab
 
     @belongsTo('collection-provider')
     provider!: DS.PromiseObject<CollectionProviderModel> & CollectionProviderModel;
diff --git a/lib/analytics-page/addon/components/analytics-charts/x-chart-wrapper/component.ts b/lib/analytics-page/addon/components/analytics-charts/x-chart-wrapper/component.ts
@@ -71,9 +71,6 @@ export default class ChartWrapper extends Component {
             .title(' '); // Prevent keen-dataviz from adding a default title
 
         this.initSkeletonChart();
-        if (this.chartEnabled) {
-            this.loadKeen.perform();
-        }
     }
 
     didUpdateAttrs() {
diff --git a/lib/collections/addon/components/discover-page/active-filters/school-type/component.ts b/lib/collections/addon/components/discover-page/active-filters/school-type/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 {
+}
diff --git a/lib/collections/addon/components/discover-page/active-filters/school-type/styles.scss b/lib/collections/addon/components/discover-page/active-filters/school-type/styles.scss
diff --git a/lib/collections/addon/components/discover-page/active-filters/school-type/template.hbs b/lib/collections/addon/components/discover-page/active-filters/school-type/template.hbs
@@ -0,0 +1,8 @@
+{{#each @context.activeFilter as |item|}}
+    <DiscoverPage::ActiveFilters::Filter
+        @item={{item}}
+        @text={{item}}
+        @ariaLabel={{t 'collections.discover_page.active_filters.remove_school_type'}}
+        @removeFilterItem={{action this.removeFilterItem item}}
+    />
+{{/each}}
diff --git a/lib/collections/addon/components/discover-page/active-filters/study-design/component.ts b/lib/collections/addon/components/discover-page/active-filters/study-design/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 {
+}
diff --git a/lib/collections/addon/components/discover-page/active-filters/study-design/styles.scss b/lib/collections/addon/components/discover-page/active-filters/study-design/styles.scss
diff --git a/lib/collections/addon/components/discover-page/active-filters/study-design/template.hbs b/lib/collections/addon/components/discover-page/active-filters/study-design/template.hbs
@@ -0,0 +1,8 @@
+{{#each @context.activeFilter as |item|}}
+    <DiscoverPage::ActiveFilters::Filter
+        @item={{item}}
+        @text={{item}}
+        @ariaLabel={{t 'collections.discover_page.active_filters.remove_study_design'}}
+        @removeFilterItem={{action this.removeFilterItem item}}
+    />
+{{/each}}
diff --git a/lib/collections/addon/components/discover-page/facets/school-type/component.ts b/lib/collections/addon/components/discover-page/facets/school-type/component.ts
@@ -0,0 +1,13 @@
+import Collection from 'ember-osf-web/models/collection';
+import SearchFacetChecklist from '../checklist/component';
+
+class SchoolType extends SearchFacetChecklist {
+    get modelAttribute(): keyof Collection {
+        return 'schoolTypeChoices';
+    }
+    get filterProperty() {
+        return 'schoolType';
+    }
+}
+
+export default SchoolType;
diff --git a/lib/collections/addon/components/discover-page/facets/study-design/component.ts b/lib/collections/addon/components/discover-page/facets/study-design/component.ts
@@ -0,0 +1,13 @@
+import Collection from 'ember-osf-web/models/collection';
+import SearchFacetChecklist from '../checklist/component';
+
+class StudyDesign extends SearchFacetChecklist {
+    get modelAttribute(): keyof Collection {
+        return 'studyDesignChoices';
+    }
+    get filterProperty() {
+        return 'studyDesign';
+    }
+}
+
+export default StudyDesign;
diff --git a/lib/collections/addon/discover/controller.ts b/lib/collections/addon/discover/controller.ts
@@ -71,6 +71,8 @@ export default class Discover extends Controller {
                     ['program-area', 'program-area'],
                     ['status', 'status'],
                     ['volume', 'volume'],
+                    ['study-design', 'study-design'],
+                    ['school-type', 'school-type'],
                 ]
         ).map(([key, component, options = {}]: [string, string, any]) => ({
             key,
@@ -101,6 +103,8 @@ export default class Discover extends Controller {
     programArea = '';
     status = '';
     volume = '';
+    studyDesign = '';
+    schoolType = '';
 
     // Pass in the list of queryParams for this component
     queryParams = [
diff --git a/lib/registries/addon/branded/new/route.ts b/lib/registries/addon/branded/new/route.ts
@@ -28,7 +28,7 @@ export default class BrandedRegistriesNewSubmissionRoute extends Route {
         const { href, origin } = window.location;
         const currentUrl = href.replace(origin, '');
 
-        if (!provider.allowSubmissions) {
+        if (!provider.allowSubmissions && !provider.currentUserCanReview) {
             this.transitionTo('page-not-found', currentUrl.slice(1));
         }
 
diff --git a/lib/registries/addon/components/registries-navbar/component.ts b/lib/registries/addon/components/registries-navbar/component.ts
@@ -3,9 +3,7 @@ import { computed } from '@ember/object';
 import { and } from '@ember/object/computed';
 import RouterService from '@ember/routing/router-service';
 import { inject as service } from '@ember/service';
-import { camelize } from '@ember/string';
 import Features from 'ember-feature-flags/services/features';
-import config from 'ember-get-config';
 
 import { layout } from 'ember-osf-web/decorators/component';
 import RegistrationProviderModel from 'ember-osf-web/models/registration-provider';
@@ -18,11 +16,6 @@ import registriesConfig from 'registries/config/environment';
 import template from './template';
 
 const { externalLinks, defaultProviderId } = registriesConfig;
-const {
-    featureFlagNames: {
-        egapAdmins,
-    },
-} = config;
 
 @tagName('')
 @layout(template)
@@ -45,16 +38,13 @@ export default class RegistriesNavbar extends AuthBase {
         return !this.media.isMobile && !this.media.isTablet && this.provider && this.provider.brand;
     }
 
-    @computed('provider.{allowSubmissions,id}')
+    @computed('provider.{allowSubmissions,currentUserCanReview}')
     get showAddRegistrationButton() {
         // Check if this is OSF Registries
         if (!this.provider) {
             return true;
         }
-        if (this.provider.id === 'egap') {
-            return this.features.isEnabled(camelize(egapAdmins));
-        }
-        return this.provider.allowSubmissions;
+        return this.provider.allowSubmissions || this.provider.currentUserCanReview;
     }
 
     services = OSF_SERVICES;
diff --git a/mirage/factories/collected-metadatum.ts b/mirage/factories/collected-metadatum.ts
@@ -29,6 +29,14 @@ export default Factory.extend<CollectedMetadatum>({
             const volume = faker.random.arrayElement(collectedMetadatum.collection.volumeChoices);
             collectedMetadatum.update({ volume });
         }
+        if (!collectedMetadatum.studyDesign) {
+            const studyDesign = faker.random.arrayElement(collectedMetadatum.collection.studyDesignChoices);
+            collectedMetadatum.update({ studyDesign });
+        }
+        if (!collectedMetadatum.schoolType) {
+            const schoolType = faker.random.arrayElement(collectedMetadatum.collection.schoolTypeChoices);
+            collectedMetadatum.update({ schoolType });
+        }
     },
 });
 
diff --git a/mirage/factories/collection.ts b/mirage/factories/collection.ts
@@ -23,6 +23,8 @@ 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()],
+    studyDesignChoices: [faker.lorem.word(), faker.lorem.word()],
+    schoolTypeChoices: [faker.lorem.word(), faker.lorem.word()],
 });
 
 declare module 'ember-cli-mirage/types/registries/model' {
diff --git a/mirage/views/collection-search.ts b/mirage/views/collection-search.ts
@@ -16,6 +16,8 @@ export function searchCollections(this: HandlerContext, schema: Schema, request:
                 programArea,
                 status,
                 volume,
+                schoolType,
+                studyDesign,
             },
         },
     } = JSON.parse(request.requestBody);
@@ -51,6 +53,20 @@ export function searchCollections(this: HandlerContext, schema: Schema, request:
             (item: ModelInstance<CollectedMetadatum>) => volume.any((value: string) => item.attrs.volume === value),
         );
     }
+    if (schoolType) {
+        collectedMetadata = collectedMetadata.filter(
+            (item: ModelInstance<CollectedMetadatum>) => schoolType.any(
+                (value: string) => item.attrs.schoolType === value,
+            ),
+        );
+    }
+    if (studyDesign) {
+        collectedMetadata = collectedMetadata.filter(
+            (item: ModelInstance<CollectedMetadatum>) => studyDesign.any(
+                (value: string) => item.attrs.studyDesign === value,
+            ),
+        );
+    }
     if (request.queryParams.sort) {
         switch (request.queryParams.sort) {
         case 'modified':
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ember-osf-web",
-  "version": "21.5.0",
+  "version": "21.5.1",
   "description": "Ember front-end for the Open Science Framework",
   "license": "Apache-2.0",
   "author": "Center for Open Science <support@cos.io>",
@@ -54,10 +54,10 @@
     "@ember/jquery": "^0.6.0",
     "@ember/optional-features": "^1.3.0",
     "@ember/render-modifiers": "^1.0.0",
-    "@fortawesome/free-regular-svg-icons": "^5.15.2",
-    "@fortawesome/free-solid-svg-icons": "^5.15.2",
     "@fortawesome/ember-fontawesome": "^0.2.3",
     "@fortawesome/free-brands-svg-icons": "^5.15.2",
+    "@fortawesome/free-regular-svg-icons": "^5.15.2",
+    "@fortawesome/free-solid-svg-icons": "^5.15.2",
     "@glimmer/component": "^1.0.0",
     "@glimmer/tracking": "^1.0.0",
     "@types/ace": "^0.0.42",
@@ -88,7 +88,6 @@
     "ember-angle-bracket-invocation-polyfill": "^2.0.2",
     "ember-animated": "^0.9.0",
     "ember-auto-import": "^1.5.3",
-    "ember-basic-dropdown": "^1.0.3",
     "ember-bootstrap": "^3.0.0",
     "ember-bootstrap-datepicker": "^2.0.9",
     "ember-changeset": "^2.1.2",
diff --git a/tests/engines/collections/acceptance/submit/submit-test.ts b/tests/engines/collections/acceptance/submit/submit-test.ts
@@ -163,6 +163,23 @@ module('Collections | Acceptance | submit', hooks => {
             throw new Error('could not find volume option');
         }
 
+        // fields only available for Character Lab
+        await untrackedClick('[data-test-metadata-field="school_type_label"] .ember-power-select-trigger');
+        const firstSchoolTypeOption = document.querySelector('.ember-power-select-option');
+        if (firstSchoolTypeOption) {
+            await untrackedClick(firstSchoolTypeOption);
+        } else {
+            throw new Error('could not find school type option');
+        }
+
+        await untrackedClick('[data-test-metadata-field="study_design_label"] .ember-power-select-trigger');
+        const firstStudyDesignOption = document.querySelector('.ember-power-select-option');
+        if (firstStudyDesignOption) {
+            await untrackedClick(firstStudyDesignOption);
+        } else {
+            throw new Error('could not find study design option');
+        }
+
         assert.dom('[data-test-collection-metadata] [data-test-submit-section-continue]')
             .isNotDisabled('metadata continue is not disabled');
         await untrackedClick('[data-test-collection-metadata] [data-test-submit-section-continue]');
diff --git a/tests/engines/registries/acceptance/branded/new-test.ts b/tests/engines/registries/acceptance/branded/new-test.ts
diff --git a/translations/en-us.yml b/translations/en-us.yml
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -71,9 +71,6 @@ export default class ChartWrapper extends Component {`
`71`	`71`	`.title(' '); // Prevent keen-dataviz from adding a default title`
`72`	`72`
`73`	`73`	`this.initSkeletonChart();`
`74`		`- if (this.chartEnabled) {`
`75`		`- this.loadKeen.perform();`
`76`		`- }`
`77`	`74`	`}`
`78`	`75`
`79`	`76`	`didUpdateAttrs() {`