Merge branch 'develop' into upstream/addon-services

CenterForOpenScience · May 20, 2024 · b125353 · b125353
2 parents 513e06e + a0aaa10
commit b125353
Show file tree

Hide file tree

Showing 8 changed files with 34 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,10 @@ 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).
 
+## [24.04.0] - 2024-04-30
+### Added
+- Misc bug and a11y fixes
+
 ## [24.03.0] - 2024-02-26
 ### Added
 - Integrate Cedar Embeddable Editor for adding and editing metadata

diff --git a/app/models/preprint-provider.ts b/app/models/preprint-provider.ts
@@ -24,6 +24,8 @@ export default class PreprintProviderModel extends ProviderModel {
     @attr('string') shareSource!: string;
     @attr('string') preprintWord!: PreprintWord;
 
+    @attr('boolean', { defaultValue: true }) advertiseOnDiscoverPage!: boolean;
+
     // Reviews settings
     @attr('array') permissions!: ReviewPermissions[];
     @attr('boolean', { allowNull: true }) reviewsCommentsPrivate!: boolean | null;

diff --git a/app/preprints/index/route.ts b/app/preprints/index/route.ts
@@ -48,7 +48,10 @@ export default class Preprints extends Route {
             let brandedProviders = [];
 
             if (this.theme.id === 'osf') {
-                const allProviders = await this.store.findAll('preprint-provider', { reload: true });
+                const allProviders = await this.store.query('preprint-provider', {
+                    reload: true,
+                    filter: { advertise_on_discover_page: true },
+                });
                 brandedProviders = allProviders.filter(item => item.id !== 'osf');
             }
 

diff --git a/app/preprints/index/template.hbs b/app/preprints/index/template.hbs
@@ -96,16 +96,14 @@
                 </p>
                 <div local-class='preprint-logos-container'>
                     {{#each this.model.brandedProviders as |provider| }}
-                        {{#if (not-eq provider.id 'livedata') }}
-                            <OsfLink
-                                data-test-see-branded-providers-example
-                                data-analytics-name='See Branded Providers Example'
-                                @href={{concat '/preprints/' provider.id }}
-                                title='{{provider.name}}'
-                                local-class='provider-logo'
-                                style={{html-safe (concat 'background-image: url(' provider.assets.wide_white ')' )}}
-                            ></OsfLink>
-                        {{/if}}
+                        <OsfLink
+                            data-test-see-branded-providers-example
+                            data-analytics-name='See Branded Providers Example'
+                            @href={{concat '/preprints/' provider.id }}
+                            title='{{provider.name}}'
+                            local-class='provider-logo'
+                            style={{html-safe (concat 'background-image: url(' provider.assets.wide_white ')' )}}
+                        ></OsfLink>
                     {{/each}}
                 </div>
                 <div local-class='preprint-contact-container'>

diff --git a/...omponents/addon/components/registries/schema-block-renderer/helper-text-icon/template.hbs b/...omponents/addon/components/registries/schema-block-renderer/helper-text-icon/template.hbs
@@ -5,7 +5,8 @@
             tabindex='0'
             id={{id}}
             @icon='question-circle'
-            @ariaHidden={{false}}
+            aria-hidden='false'
+            aria-label={{this.helpText}}
             ...attributes
         />
         <EmberPopover

diff --git a/mirage/fixtures/preprint-providers.ts b/mirage/fixtures/preprint-providers.ts
@@ -16,6 +16,7 @@ const preprintProviders: Array<Partial<PreprintProvider>> = [
     {
         id: 'osf',
         name: 'Open Science Framework',
+        advertiseOnDiscoverPage: true,
         preprintWord: 'preprint',
         assets: randomAssets(1),
         footerLinks: 'fake footer links',
@@ -25,6 +26,7 @@ const preprintProviders: Array<Partial<PreprintProvider>> = [
     {
         id: 'thesiscommons',
         name: 'Thesis Commons',
+        advertiseOnDiscoverPage: true,
         preprintWord: 'thesis',
         assets: randomAssets(2),
         // eslint-disable-next-line max-len
@@ -33,6 +35,7 @@ const preprintProviders: Array<Partial<PreprintProvider>> = [
     {
         id: 'preprintrxiv',
         name: 'PreprintrXiv',
+        advertiseOnDiscoverPage: false,
         preprintWord: 'preprint',
         assets: randomAssets(3),
         // eslint-disable-next-line max-len
@@ -43,6 +46,7 @@ const preprintProviders: Array<Partial<PreprintProvider>> = [
     {
         id: 'paperxiv',
         name: 'PaperXiv',
+        advertiseOnDiscoverPage: true,
         preprintWord: 'paper',
         assets: randomAssets(4),
         // eslint-disable-next-line max-len
@@ -51,6 +55,7 @@ const preprintProviders: Array<Partial<PreprintProvider>> = [
     {
         id: 'thesisrxiv',
         name: 'ThesisrXiv',
+        advertiseOnDiscoverPage: true,
         preprintWord: 'thesis',
         assets: randomAssets(5),
         // eslint-disable-next-line max-len
@@ -59,45 +64,52 @@ const preprintProviders: Array<Partial<PreprintProvider>> = [
     {
         id: 'workrxiv',
         name: 'WorkrXiv',
+        advertiseOnDiscoverPage: true,
         preprintWord: 'work',
         assets: randomAssets(6),
         footerLinks: 'fake footer links',
     },
     {
         id: 'docrxiv',
         name: 'DocrXiv',
+        advertiseOnDiscoverPage: true,
         preprintWord: 'default',
         assets: randomAssets(7),
         footerLinks: 'fake footer links',
     },
     {
         id: 'agrixiv',
         name: 'AgriXiv',
+        advertiseOnDiscoverPage: true,
         preprintWord: 'preprint',
         assets: randomAssets(8),
         reviewsWorkflow: PreprintProviderReviewsWorkFlow.POST_MODERATION,
     },
     {
         id: 'biohackrxiv',
         name: 'BioHackrXiv',
+        advertiseOnDiscoverPage: true,
         preprintWord: 'preprint',
         assets: randomAssets(9),
     },
     {
         id: 'nutrixiv',
         name: 'NutriXiv',
+        advertiseOnDiscoverPage: true,
         preprintWord: 'preprint',
         assets: randomAssets(10),
     },
     {
         id: 'paleorxiv',
         name: 'PaleoRrxiv',
+        advertiseOnDiscoverPage: true,
         preprintWord: 'preprint',
         assets: randomAssets(10, false),
     },
     {
         id: 'sportrxiv',
         name: 'Sport-Rxiv',
+        advertiseOnDiscoverPage: true,
         preprintWord: 'paper',
         assets: randomAssets(10),
     },

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ember-osf-web",
-  "version": "24.03.0",
+  "version": "24.04.0",
   "private": true,
   "description": "Ember front-end for the Open Science Framework",
   "homepage": "https://github.com/CenterForOpenScience/ember-osf-web#readme",

diff --git a/tests/acceptance/preprints/index-test.ts b/tests/acceptance/preprints/index-test.ts
@@ -22,6 +22,7 @@ module('Acceptance | preprints | index', hooks => {
         provider.update({
             brand,
             description: 'This is the description for OSF',
+            advertiseOnDiscoverPage: true,
         });
         this.provider = provider;
     });