Skip to content

Commit aebb2b8

Browse files
committed
Merge branch 'hotfix/24.03.3'
2 parents a0794fb + e24da94 commit aebb2b8

File tree

6 files changed

+19
-7
lines changed

6 files changed

+19
-7
lines changed

app/router.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ Router.map(function() {
6767
this.route('guid-file', { path: '--file/:guid' }, function() {
6868
this.route('index', { path: '/'});
6969
this.route('metadata', function() {
70-
// this.route('add');
70+
this.route('add');
7171
});
7272
});
7373

@@ -80,7 +80,7 @@ Router.map(function() {
8080
this.route('metadata', function() {
8181
this.route('index', { path: '/'});
8282
this.route('detail', { path: '/:recordId' });
83-
// this.route('add');
83+
this.route('add');
8484
});
8585
this.route('registrations');
8686
this.route('drafts', { path: '/drafts/:draftId' }, function() {

ember-cli-build.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ module.exports = function(defaults) {
113113
app.import('node_modules/dropzone/dist/dropzone.js');
114114

115115
app.import('node_modules/wicg-inert/dist/inert.min.js');
116-
// app.import('node_modules/cedar-embeddable-editor/cedar-embeddable-editor.js');
117-
// app.import('node_modules/cedar-artifact-viewer/cedar-artifact-viewer.js');
116+
app.import('node_modules/cedar-embeddable-editor/cedar-embeddable-editor.js');
117+
app.import('node_modules/cedar-artifact-viewer/cedar-artifact-viewer.js');
118118
return app.toTree();
119119
};

lib/osf-components/addon/components/metadata/metadata-detail/template.hbs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
</div>
77
<div local-class='actions'>
88
<div local-class='add-schema'>
9-
{{!-- {{#if this.hasWritePermission}}
9+
{{#if this.hasWritePermission}}
1010
<div local-class='spacer'>
1111
<FaIcon @icon='plus' />
1212
</div>
@@ -29,7 +29,7 @@
2929
{{/if}}
3030
</OsfLink>
3131
</div>
32-
{{/if}} --}}
32+
{{/if}}
3333
</div>
3434
</div>
3535
</div>

lib/registries/addon/routes.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ export default buildRoutes(function() {
4747
this.route('metadata', function() {
4848
this.route('index', { path: '/'});
4949
this.route('detail', { path: '/:recordId' });
50-
// this.route('add');
50+
this.route('add');
5151
});
5252
});
5353

package.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,8 @@
117117
"babel-eslint": "^8.0.0",
118118
"broccoli-asset-rev": "^3.0.0",
119119
"c3": "^0.6.14",
120+
"cedar-artifact-viewer": "^0.9.3",
121+
"cedar-embeddable-editor": "^1.2.1",
120122
"chai": "^4.1.2",
121123
"coveralls": "^3.0.3",
122124
"dropzone": "5.5.1",

yarn.lock

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9165,6 +9165,16 @@ ccount@^1.0.0:
91659165
resolved "https://registry.yarnpkg.com/ccount/-/ccount-1.1.0.tgz#246687debb6014735131be8abab2d93898f8d043"
91669166
integrity sha512-vlNK021QdI7PNeiUh/lKkC/mNHHfV0m/Ad5JoI0TYtlBnJAslM/JIkm/tGC88bkLIwO6OQ5uV6ztS6kVAtCDlg==
91679167

9168+
cedar-artifact-viewer@^0.9.3:
9169+
version "0.9.5"
9170+
resolved "https://registry.yarnpkg.com/cedar-artifact-viewer/-/cedar-artifact-viewer-0.9.5.tgz#0679b8cff2a2be96c0ef9ac8cc567327aba6e2e6"
9171+
integrity sha512-o23pXLrLBB6ZgZZW79SaE+c41CEGSASZ9YC0qKd8BK8b2EmLwiH18dEQv5pXYSxKKo3Ue7WdnyLoRNEZ+yo9mQ==
9172+
9173+
cedar-embeddable-editor@^1.2.1:
9174+
version "1.2.1"
9175+
resolved "https://registry.yarnpkg.com/cedar-embeddable-editor/-/cedar-embeddable-editor-1.2.1.tgz#e4a27e657b6d63fd4e86506ed4ca77a693b8c51d"
9176+
integrity sha512-XyAgvQimvFBCuLuWIvYpb2fEgCKMgEOj9vHP47Heurycs9B6Wbvk3bIvJ8GbqadKA8j83z1772vF3f+65P89qw==
9177+
91689178
chai-as-promised@^6.0.0:
91699179
version "6.0.0"
91709180
resolved "https://registry.yarnpkg.com/chai-as-promised/-/chai-as-promised-6.0.0.tgz#1a02a433a6f24dafac63b9c96fa1684db1aa8da6"

0 commit comments

Comments
 (0)