Skip to content

Commit 3e53326

Browse files
adliusadlius
committed
Merge remote-tracking branch 'upstream/develop' into dependency_upgrades
2 parents 11e9bea + b8fb32a commit 3e53326

File tree

334 files changed

+7950
-1638
lines changed

Some content is hidden

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

334 files changed

+7950
-1638
lines changed

‎.github/PULL_REQUEST_TEMPLATE.md‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
Ticketd PRs should be prefixed with the ticket id, e.g. `[FOO-123] some really great stuff`
88
-->
99

10-
- Ticket: []
11-
- Feature flag: n/a
10+
- Ticket: []
11+
- Feature flag: n/a
1212

1313
## Purpose
1414

@@ -18,6 +18,10 @@
1818

1919
<!-- Briefly describe or list your changes. -->
2020

21+
## Screenshot(s)
22+
23+
<!-- Attach screenshots if applicable. -->
24+
2125
## Side Effects
2226

2327
<!-- Any possible side effects? (https://en.wikipedia.org/wiki/Side_effect_%28computer_science%29) -->

‎.github/dependabot.yml‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: npm
4+
directory: "/"
5+
schedule:
6+
interval: daily
7+
open-pull-requests-limit: 10
8+
target-branch: dependency_upgrades
9+
versioning-strategy: increase-if-necessary
10+
ignore:
11+
- dependency-name: ember-cli
12+
- dependency-name: ember-source
13+
- dependency-name: ember-data
14+
- dependency-name: ember-cli-htmlbars
15+
- dependency-name: ember-cli-typescript
16+
- dependency-name: ember-cli-babel
17+
- dependency-name: ember-auto-import
18+
- dependency-name: ember-resolver

‎.github/workflows/CI.yml‎

Lines changed: 17 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -161,54 +161,20 @@ jobs:
161161
PERCY_TOKEN: ${{ secrets.PERCY_TOKEN }}
162162
timeout-minutes: 10
163163

164-
# Coverage disabled while these are worked out:
165-
# https://github.com/babel/ember-cli-babel/issues/350
166-
# https://github.com/ember-cli/babel-plugin-ember-modules-api-polyfill/issues/112
167-
# test-with-coverage:
168-
# runs-on: ubuntu-latest
169-
# timeout-minutes: 10
170-
# needs: build
171-
# steps:
172-
# - uses: actions/checkout@v2
173-
# - uses: volta-cli/action@v1
174-
# - uses: actions/download-artifact@v2
175-
# with:
176-
# name: dist
177-
# path: ./dist
178-
# - id: cache-node-modules
179-
# uses: actions/cache@v2
180-
# with:
181-
# path: ./node_modules
182-
# key: cached_node_modules_${{ secrets.CACHE_VERSION }}_${{ hashFiles('**/yarn.lock') }}
183-
# restore-keys: cached_node_modules_${{ secrets.CACHE_VERSION }}_
184-
# - run: yarn test:cover --path ./dist
185-
# - name: Save code coverage artifact
186-
# uses: actions/upload-artifact@v2
187-
# with:
188-
# name: coverage-info
189-
# path: ./coverage/lcov.info
190-
#
191-
# send-coverage:
192-
# runs-on: ubuntu-latest
193-
# timeout-minutes: 10
194-
# needs: test
195-
# steps:
196-
# - uses: volta-cli/action@v1
197-
# - uses: actions/download-artifact@v2
198-
# with:
199-
# name: coverage-info
200-
# path: ./lcov.info
201-
# - uses: actions/cache@v2
202-
# with:
203-
# path: ./node_modules
204-
# key: cached_node_modules_${{ secrets.CACHE_VERSION }}_${{ hashFiles('**/yarn.lock') }}
205-
# restore-keys: cached_node_modules_${{ secrets.CACHE_VERSION }}_
206-
# - name: Generate coverage report
207-
# env:
208-
# COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
209-
# run: yarn coveralls
210-
#
211-
# - name: Send coverage report to coveralls
212-
# uses: coverallsapp/github-action@master
213-
# with:
214-
# github-token: ${{ secrets.GITHUB_TOKEN }}
164+
test-with-coverage:
165+
needs: fetch-dependencies
166+
runs-on: ubuntu-latest
167+
steps:
168+
- uses: actions/checkout@v2
169+
- uses: volta-cli/action@v1
170+
- id: cache-node-modules
171+
uses: actions/cache@v2
172+
with:
173+
path: ./node_modules
174+
key: cached_node_modules_${{ secrets.CACHE_VERSION }}_${{ hashFiles('**/yarn.lock') }}
175+
restore-keys: cached_node_modules_${{ secrets.CACHE_VERSION }}_
176+
- run: yarn test:ember:cover
177+
- name: Send coverage report to coveralls
178+
uses: coverallsapp/github-action@master
179+
with:
180+
github-token: ${{ secrets.GITHUB_TOKEN }}

‎CHANGELOG.md‎

Lines changed: 92 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,84 @@ 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.11.0] - 2021-12-21
8+
### Changed
9+
- Misc a11y and bug fixes
10+
- Added new error types for registration bulk upload
11+
12+
## [21.10.0] - 2021-11-30
13+
### Added
14+
- Registration versioning
15+
16+
## [21.9.0] - 2021-11-08
17+
### Changed
18+
- Misc a11y fixes
19+
- Removed RIDIE from registries dashboard
20+
- Replace help guide link on project registrations tab
21+
- Hide link to wiki on Registration overview page if registration has wiki disabled
22+
- Remove registration templates that are only for community oriented registries from the Registries Discover page registration-type facet
23+
- Fix registration overview page subjects search
24+
25+
## [21.8.0] - 2021-10-04
26+
### Added
27+
- bulk upload component `Branded::Moderation::-Components::UploadCsv`
28+
- `registries.branded.moderation.settings` route
29+
30+
### Changed
31+
- bump ember-template-lint
32+
33+
### Remove
34+
- `registries.branded.moderation.notifications` route (now under `registries.branded.moderation.settings`)
35+
36+
## [21.7.0] - 2021-09-14
37+
### Fixed
38+
- A11y: Draft Registration Metadata Page - Critical WCAG 2A Rule Violations - Third Party Libraries
39+
- A11y: Draft Registration Metadata Page - Serious WCAG 2AA Rule Violation
40+
- autosave failed message for draft registrations page
41+
- ensure users are properly logged out when using Log Out link from User Dropdown menu
42+
- clicking "Leave this view" on the VOL of Registration doesn't clear VOL hash from url
43+
44+
### Added
45+
- collection provider description on provider's discover page
46+
- sorting meeting submissions by download count
47+
- add data test locators to elements on My Registrations Page
48+
49+
### Removed
50+
- Feedback button on quickfiles page
51+
52+
### Changed
53+
- (IA/IMLS) update registration creation modal language
54+
- (IA/IMLS) update registration completion modal language
55+
56+
## [21.6.3] - 2021-07-09
57+
### Fixed
58+
- [hotfix] Do not serialize empty node-license
59+
60+
## [21.6.2] - 2021-07-02
61+
### Fixed
62+
- [hotfix] draft-registration's node-license validations
63+
64+
### Removed
65+
- node-license year validator (issues with multiple validator assigned to same value path)
66+
67+
## [21.6.1] - 2021-06-29
68+
### Fixed
69+
- Fix missing save/cancel buttons on the registration's license/node-license editable field
70+
71+
## [21.6.0] - 2021-06-28
72+
### Changed
73+
- Upgraded ember-* to v3.26 (https://github.com/CenterForOpenScience/ember-osf-web/pull/1203)
74+
75+
## [21.5.1] - 2021-06-21
76+
### Added
77+
- 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
78+
79+
### Fixed
80+
- Keen analytics: Don't load keen twice on load
81+
82+
### Changed
83+
- Character Lab: Allow moderators to add new registrations when `allowSubmissions` is `false`
84+
785
## [21.5.0] - 2021-05-27
886
### Fixed
987
- registration Detail Page: longer license types spill out of bounds
@@ -1741,7 +1819,20 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
17411819
### Added
17421820
- Quick Files
17431821

1744-
[Unreleased]: https://github.com/CenterForOpenScience/ember-osf-web/compare/21.5.0...develop
1822+
[21.11.0]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/21.11.0
1823+
[21.10.2]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/21.10.2
1824+
[21.10.1]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/21.10.1
1825+
[21.10.0]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/21.10.0
1826+
[21.9.2]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/21.9.2
1827+
[21.9.1]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/21.9.1
1828+
[21.9.0]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/21.9.0
1829+
[21.8.0]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/21.8.0
1830+
[21.7.0]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/21.7.0
1831+
[21.6.3]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/21.6.3
1832+
[21.6.2]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/21.6.2
1833+
[21.6.1]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/21.6.1
1834+
[21.6.0]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/21.6.0
1835+
[21.5.1]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/21.5.1
17451836
[21.5.0]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/21.5.0
17461837
[21.4.1]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/21.4.1
17471838
[21.4.0]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/21.4.0

‎app/adapters/collected-metadatum.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ export default class CollectedMetadatumAdapter extends OsfAdapter {
1919
}
2020

2121
urlForCreateRecord(_: string | number, { record }: DS.Snapshot): string {
22-
return `${this.urlPrefix()}/collections/${record.collection.id}/collected_metadata/`;
22+
const collectionId = record.belongsTo('collection').id();
23+
return `${this.urlPrefix()}/collections/${collectionId}/collected_metadata/`;
2324
}
2425

2526
urlForFindRecord(id: string): string {

‎app/adapters/schema-response-action.ts‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
import OsfAdapter from './osf-adapter';
2+
3+
export default class SchemaResponseActionAdapter extends OsfAdapter {
4+
parentRelationship = 'target';
5+
}
6+
7+
declare module 'ember-data/types/registries/adapter' {
8+
export default interface AdapterRegistry {
9+
'schema-response-action': SchemaResponseActionAdapter;
10+
} // eslint-disable-line semi
11+
}

‎app/adapters/schema-response.ts‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
import OsfAdapter from './osf-adapter';
2+
3+
export default class SchemaResponseAdapter extends OsfAdapter {
4+
}
5+
6+
declare module 'ember-data/types/registries/adapter' {
7+
export default interface AdapterRegistry {
8+
'schema-response': SchemaResponseAdapter;
9+
} // eslint-disable-line semi
10+
}

‎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'>

0 commit comments

Comments
 (0)