Skip to content

Commit 977a0bc

Browse files
adliusadlius
committed
Merge branch 'release/21.9.0'
2 parents 7c36962 + 800d1a8 commit 977a0bc

File tree

64 files changed

+443
-200
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+443
-200
lines changed

‎CHANGELOG.md‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,15 @@ All notable changes to this project will be documented in this file.
44
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
55
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
66

7+
## [21.9.0] - 2021-11-08
8+
### Changed
9+
- Misc a11y fixes
10+
- Removed RIDIE from registries dashboard
11+
- Replace help guide link on project registrations tab
12+
- Hide link to wiki on Registration overview page if registration has wiki disabled
13+
- Remove registration templates that are only for community oriented registries from the Registries Discover page registration-type facet
14+
- Fix registration overview page subjects search
15+
716
## [21.8.0] - 2021-10-04
817
### Added
918
- bulk upload component `Branded::Moderation::-Components::UploadCsv`
@@ -1801,7 +1810,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
18011810
### Added
18021811
- Quick Files
18031812

1804-
[Unreleased]: https://github.com/CenterForOpenScience/ember-osf-web/compare/21.7.0...develop
1813+
[21.8.0]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/21.9.0
1814+
[21.8.0]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/21.8.0
18051815
[21.7.0]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/21.7.0
18061816
[21.6.3]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/21.6.3
18071817
[21.6.2]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/21.6.2

‎app/guid-node/registrations/controller.ts‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -55,20 +55,15 @@ export default class GuidNodeRegistrations extends Controller {
5555
this.set('schemas', schemas);
5656
}
5757

58-
@computed('tab')
59-
get activeTab() {
60-
return this.tab ? this.tab : 'registrations';
61-
}
62-
6358
@computed('node.{id,root.id,root.userHasAdminPermission}')
6459
get isComponentRootAdmin() {
6560
return this.node && this.node.id !== this.node.root.get('id') && this.node.root.get('userHasAdminPermission');
6661
}
6762

6863
@action
69-
changeTab(activeId: string) {
70-
this.set('tab', activeId === 'registrations' ? undefined : activeId);
71-
this.analytics.click('tab', `Registrations tab - Change tab to: ${activeId}`);
64+
changeTab(activeId: number) {
65+
const tabName = activeId === 0 ? 'registrations' : 'drafts';
66+
this.analytics.click('tab', `Registrations tab - Change tab to: ${tabName}`);
7267
}
7368

7469
@action

‎app/guid-node/registrations/styles.scss‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,3 +69,43 @@ h4:global(.NewRegistrationModal__header) {
6969
:global(.PreRegChallengeModal__consent) {
7070
font-weight: normal;
7171
}
72+
73+
.Tabs {
74+
/* stylelint-disable selector-no-qualifying-type */
75+
ul.TabList {
76+
margin-bottom: 10px;
77+
border-bottom: 1px solid #ddd;
78+
box-sizing: border-box;
79+
color: rgb(51, 51, 51);
80+
display: block;
81+
line-height: 20px;
82+
list-style-image: none;
83+
list-style-position: outside;
84+
list-style-type: none;
85+
height: 41px;
86+
padding: 0;
87+
}
88+
/* stylelint-enable selector-no-qualifying-type */
89+
.TabList {
90+
li {
91+
display: block;
92+
position: relative;
93+
margin-bottom: -1px;
94+
float: left;
95+
height: 41px;
96+
padding: 10px 15px;
97+
}
98+
99+
li:global(.ember-tabs__tab--selected) {
100+
background-color: #f8f8f8;
101+
border-bottom: 2px solid #204762;
102+
}
103+
104+
li:hover {
105+
border-color: transparent;
106+
text-decoration: none;
107+
background-color: #f8f8f8;
108+
color: var(--primary-color);
109+
}
110+
}
111+
}

‎app/guid-node/registrations/template.hbs‎

Lines changed: 21 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,25 @@
88
>
99
<div class='row'>
1010
<div class='col-xs-9 col-sm-8'>
11-
<BsTab
11+
<AriaTabs
1212
data-analytics-scope='Registrations Tab'
13-
@activeId={{this.activeTab}}
14-
@onChange={{action this.changeTab}}
13+
@defaultIndex={{0}}
14+
@onSelect={{action this.changeTab}}
15+
local-class='Tabs'
1516
as |tab|
1617
>
17-
<tab.pane
18-
@id='registrations'
19-
@title={{t 'node.registrations.registrations'}}
18+
<tab.tabList
19+
local-class='TabList'
20+
as |tablist|
2021
>
22+
<tablist.tab>{{t 'node.registrations.registrations'}}</tablist.tab>
23+
{{#if this.node.userHasReadPermission}}
24+
<tablist.tab data-test-drafts-tab>
25+
{{t 'node.registrations.draft_registrations'}}
26+
</tablist.tab>
27+
{{/if}}
28+
</tab.tabList>
29+
<tab.tabPanel>
2130
<div class='row' local-class='RegistrationsPane' data-test-registrations-pane>
2231
<NodeList
2332
@modelTaskInstance={{this.model.taskInstance}}
@@ -37,20 +46,16 @@
3746
{{/if}}
3847
<p>
3948
{{t 'node.registrations.learn_more'
40-
learnMoreLink='https://openscience.zendesk.com/hc/en-us/articles/360019930893'
49+
learnMoreLink='https://help.osf.io/hc/en-us/categories/360001550953-Registrations'
4150
htmlSafe=true
4251
}}
4352
</p>
4453
</nl.empty>
4554
</NodeList>
4655
</div>
47-
</tab.pane>
56+
</tab.tabPanel>
4857
{{#if this.node.userHasReadPermission}}
49-
<tab.pane
50-
data-analytics-scope='Drafts tab'
51-
@id='drafts'
52-
@title={{t 'node.registrations.draft_registrations'}}
53-
>
58+
<tab.tabPanel data-analytics-scope='Drafts tab'>
5459
<div class='row' local-class='RegistrationsPane' data-test-draft-registrations-pane>
5560
<PaginatedList::HasMany
5661
data-analytics-scope='Project Draft Registrations'
@@ -74,16 +79,16 @@
7479
{{/if}}
7580
<p>
7681
{{t 'node.registrations.learn_more'
77-
learnMoreLink='https://openscience.zendesk.com/hc/en-us/articles/360019930893'
82+
learnMoreLink='https://help.osf.io/hc/en-us/categories/360001550953-Registrations'
7883
htmlSafe=true
7984
}}
8085
</p>
8186
</list.empty>
8287
</PaginatedList::HasMany>
8388
</div>
84-
</tab.pane>
89+
</tab.tabPanel>
8590
{{/if}}
86-
</BsTab>
91+
</AriaTabs>
8792
</div>
8893
{{#if this.node.userHasAdminPermission}}
8994
<div class='col-xs-3 col-sm-4'>

‎app/institutions/index/template.hbs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<div
44
data-analytics-scope='Institutions'
55
local-class='Institutions__page'
6+
role='main'
67
>
78
<div
89
data-test-insitutions-header
@@ -97,6 +98,7 @@
9798
{{#if this.hasMore}}
9899
<BsButton
99100
data-test-more-institutions
101+
aria-label={{t 'institutions.load_more'}}
100102
data-analytics-name='Next page'
101103
local-class='Institutions__more'
102104
@type='link'

‎app/meetings/detail/-components/meeting-submissions-list/template.hbs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
@type='text'
55
@placeholder={{t 'meetings.index.meetings-list.search'}}
66
@key-up={{perform this.searchSubmissions}}
7+
aria-label={{t 'meetings.index.meetings-list.search'}}
78
/>
89
</div>
910
</div>
@@ -64,6 +65,7 @@
6465
<div data-test-submissions-list-item-download>
6566
{{#if submission.links.download}}
6667
<BsButton
68+
aria-label={{t 'general.download'}}
6769
@type='success'
6870
class='btn-xs'
6971
@onClick={{action this.downloadFile submission}}

‎app/meetings/index/-components/meetings-hero-banner/styles.scss‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,4 +46,10 @@
4646
h2 {
4747
font-size: 24px;
4848
}
49+
50+
.register-box {
51+
a {
52+
color: $color-link-dark;
53+
}
54+
}
4955
}

‎app/meetings/index/-components/meetings-hero-banner/template.hbs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
</div>
4444
<CpPanel @open={{this.registerPanelOpen}} as |panel| >
4545
<panel.body>
46-
<div data-test-register-panel-text class='m-lg osf-box-lt p-md text-left'>
46+
<div data-test-register-panel-text class='m-lg osf-box-lt p-md text-left' local-class='register-box'>
4747
{{t 'meetings.index.meetings-hero-banner.conference_organizers_register_panel_texts' htmlSafe=true}}
4848
</div>
4949
</panel.body>

‎app/meetings/index/-components/meetings-list/template.hbs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
<div data-test-meetings-list-search local-class='search'>
66
<div class='col-xs-12 col-sm-6 col-sm-offset-6'>
77
<Input
8+
aria-label={{t 'meetings.index.meetings-list.search'}}
89
@type='text'
910
@placeholder={{t 'meetings.index.meetings-list.search'}}
1011
@key-up={{perform this.searchMeetings}}

‎app/models/registration.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ export default class RegistrationModel extends NodeModel.extend(Validations) {
8282
@attr('fixstring') reviewsState?: RegistrationReviewStates;
8383
@attr('fixstring') iaUrl?: string;
8484
@attr('array') providerSpecificMetadata!: ProviderMetadata[];
85+
@attr('boolean') wikiEnabled!: boolean;
8586

8687
// Write-only attributes
8788
@attr('array') includedNodeIds?: string[];

0 commit comments

Comments
 (0)