Skip to content

Commit 079faac

Browse files
committed
Merge tag '22.7.0' into develop
Files page bug fixes
2 parents a08781c + 0c9c73b commit 079faac

File tree

22 files changed

+161
-112
lines changed

22 files changed

+161
-112
lines changed

CHANGELOG.md

Lines changed: 10 additions & 0 deletions
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+
## [22.7.0] - 2022-7-20
8+
### Added
9+
- Show extra information on files detail page for dataverse files
10+
### Changed
11+
- Prevent users from using special characters when renaming files
12+
- Hide left navbar links when users don't have permissions
13+
- Update registries landing page
14+
15+
716
## [22.6.2] - 2022-6-24
817
### Hotfix
918
- Fix long file name display issue
@@ -1858,6 +1867,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
18581867
### Added
18591868
- Quick Files
18601869

1870+
[22.7.0]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/22.7.0
18611871
[22.6.0]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/22.6.0
18621872
[22.5.0]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/22.5.0
18631873
[22.4.0]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/22.4.0

app/models/file.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ export interface FileLinks extends BaseFileLinks {
2323
}
2424

2525
// Character that need to be excluded: ()<>~!@$&*:;,'"\|/?
26-
export const forbiddenFileNameCharacters = /[()<>~!@$&*:;,"\\|/?]/;
26+
export const forbiddenFileNameCharacters = /[()<>~!@$&*:;,"'\\|/?]/;
2727

2828
export default class FileModel extends BaseFileItem {
2929
@attr() links!: FileLinks;

lib/osf-components/addon/components/file-browser/add-new/create-folder-modal/template.hbs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@
1010
<label>
1111
<p>{{t 'osf-components.file-browser.create_folder.new_folder_name'}}</p>
1212
<Input
13-
@enter={{queue
13+
@enter={{unless this.isInvalid (queue
1414
(perform @manager.createNewFolder this.newFolderName)
1515
(action (mut @isOpen) false)
1616
(action (mut this.newFolderName) '')
17-
}}
17+
)}}
1818
@value={{this.newFolderName}}
1919
local-class='RenameInput'
2020
/>

lib/osf-components/addon/components/file-browser/file-rename-modal/component.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,12 +68,12 @@ export default class FileRenameModal extends Component<Args> {
6868
async updateFileName() {
6969
const newName = this.newFileName;
7070
const successMessage = this.intl.t('osf-components.file-browser.file_rename_modal.success_message');
71-
if (!newName) {
71+
if (!this.isValid) {
7272
return;
7373
}
7474

7575
try {
76-
const trimmedName = newName.trim();
76+
const trimmedName = newName!.trim();
7777
await this.args.item.rename(trimmedName, '');
7878
this.toast.success(successMessage);
7979
this.args.manager.reload();

lib/osf-components/addon/components/file-browser/file-rename-modal/template.hbs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
aria-label={{t 'osf-components.file-browser.file_rename_modal.input_aria'}}
1616
@value={{this.newFileName}}
1717
@type='text'
18-
@enter={{queue
18+
@enter={{if this.isValid (queue
1919
(perform this.updateFileName)
2020
dialog.close
21-
}}
21+
)}}
2222
/>
2323
{{#unless this.isValid}}
2424
<p local-class='ErrorText'>

lib/registries/addon/components/hero-overlay/styles.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030

3131
&::after {
3232
@include primary-color-bg;
33+
opacity: 0.4;
3334
display: block;
3435
z-index: -1; /* should be in front of the ::before defined below */
3536
}

lib/registries/addon/components/registries-advisory-board/styles.scss

Lines changed: 0 additions & 14 deletions
This file was deleted.

lib/registries/addon/components/registries-advisory-board/template.hbs

Lines changed: 0 additions & 32 deletions
This file was deleted.

lib/registries/addon/components/registries-services-list/component.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import Component from '@ember/component';
22
import { inject as service } from '@ember/service';
3+
import config from 'ember-get-config';
34

45
import { layout } from 'ember-osf-web/decorators/component';
56
import Analytics from 'ember-osf-web/services/analytics';
@@ -9,4 +10,5 @@ import template from './template';
910
@layout(template)
1011
export default class RegistriesServiceList extends Component {
1112
@service analytics!: Analytics;
13+
assetsPrefix = config.assetsPrefix;
1214
}

lib/registries/addon/components/registries-services-list/styles.scss

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,6 @@
2727

2828
.ServicesList__ProviderLogo {
2929
height: 120px;
30-
background-size: contain;
31-
background-repeat: no-repeat;
32-
background-position: center;
33-
34-
&.provider-egap {
35-
background-image: url('img/provider_logos/EGAP_evidence_logo_white_0.png');
36-
}
37-
38-
&.provider-prereg {
39-
background-image: url('img/provider_logos/prereg.png');
40-
}
30+
width: 100%;
31+
object-fit: contain;
4132
}

0 commit comments

Comments
 (0)