Skip to content

Commit 68c3f0f

Browse files
committed
Merge branch 'release/23.08.0'
2 parents eb27042 + 52e8fd3 commit 68c3f0f

File tree

423 files changed

+8356
-6616
lines changed

Some content is hidden

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

423 files changed

+8356
-6616
lines changed

CHANGELOG.md

+6
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@ 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+
## [23.08.0] - 2023-07-13
8+
### Changed
9+
- Removed remaining Bootstrap components
10+
- Added JSON-LD metadata to registration overview page for Google structured data markup
11+
712
## [23.07.0] - 2023-05-01
813
### Changed
914
- Fix some deprecations
@@ -1927,6 +1932,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
19271932
### Added
19281933
- Quick Files
19291934

1935+
[23.08.0]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/23.08.0
19301936
[23.07.0]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/23.07.0
19311937
[23.06.1]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/23.06.1
19321938
[23.06.0]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/23.06.0
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
.modal-title {
2+
margin: 0;
3+
line-height: $tall-line-height;
4+
}
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,33 @@
1-
{{#if (and this.shouldShowModal this.userEmail)}}
2-
<BsModal
3-
@backdropClose={{false}}
4-
as |modal|
5-
>
6-
<modal.header @closeButton={{false}}>
7-
<h3 class='modal-title'>{{t this.translationKeys.header}}</h3>
8-
</modal.header>
9-
<modal.body>
10-
<p data-test-verify-email-prompt>
11-
{{t this.translationKeys.body email=this.userEmail.emailAddress htmlSafe=true}}
12-
</p>
13-
</modal.body>
14-
<modal.footer data-analytics-scope='Verify email modal'>
15-
<BsButton
16-
data-test-deny-email
17-
data-analytics-name='Deny'
18-
disabled={{this.disableButtons}}
19-
@onClick={{action this.deny}}
20-
>
21-
{{t this.translationKeys.denyButton}}
22-
</BsButton>
23-
<BsButton
24-
data-test-verify-email
25-
data-analytics-name='Verify'
26-
disabled={{this.disableButtons}}
27-
@type='primary'
28-
@onClick={{action this.verify}}
29-
>
30-
{{t this.translationKeys.verifyButton}}
31-
</BsButton>
32-
</modal.footer>
33-
</BsModal>
34-
{{/if}}
1+
<OsfDialog
2+
@closeOnOutsideClick={{false}}
3+
@isOpen={{and this.shouldShowModal this.userEmail}}
4+
as |dialog|
5+
>
6+
<dialog.heading>
7+
<h3 local-class='modal-title'>{{t this.translationKeys.header}}</h3>
8+
</dialog.heading>
9+
<dialog.main>
10+
<p data-test-verify-email-prompt>
11+
{{t this.translationKeys.body email=this.userEmail.emailAddress htmlSafe=true}}
12+
</p>
13+
</dialog.main>
14+
<dialog.footer data-analytics-scope='Verify email modal'>
15+
<Button
16+
data-test-deny-email
17+
data-analytics-name='Deny'
18+
disabled={{this.disableButtons}}
19+
{{on 'click' (action this.deny)}}
20+
>
21+
{{t this.translationKeys.denyButton}}
22+
</Button>
23+
<Button
24+
data-test-verify-email
25+
data-analytics-name='Verify'
26+
disabled={{this.disableButtons}}
27+
@type='primary'
28+
{{on 'click' (action this.verify)}}
29+
>
30+
{{t this.translationKeys.verifyButton}}
31+
</Button>
32+
</dialog.footer>
33+
</OsfDialog>

app/dashboard/controller.ts

+11-2
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import { all, restartableTask, task, timeout } from 'ember-concurrency';
99
import { taskFor } from 'ember-concurrency-ts';
1010
import config from 'ember-get-config';
1111
import $ from 'jquery';
12+
import Media from 'ember-responsive';
1213

1314
import Institution from 'ember-osf-web/models/institution';
1415
import Node from 'ember-osf-web/models/node';
@@ -29,6 +30,7 @@ export default class Dashboard extends Controller {
2930
@service analytics!: Analytics;
3031
@service currentUser!: CurrentUser;
3132
@service store!: Store;
33+
@service media!: Media;
3234

3335
page = 1;
3436
loading = false;
@@ -155,9 +157,16 @@ export default class Dashboard extends Controller {
155157
taskFor(this.findNodes).perform();
156158
}
157159

158-
@action
159-
projectCreated(newNode: Node) {
160+
@task
161+
async projectCreated(newNode: Node) {
162+
this.set('modalOpen', false);
163+
await timeout(1);
160164
this.set('newNode', newNode);
161165
this.set('showNewNodeNavigation', true);
166+
this.set('modalOpen', true);
167+
}
168+
169+
get isMobile() {
170+
return this.media.isMobile;
162171
}
163172
}

0 commit comments

Comments
 (0)