tqt
/
Ghost-Admin
mirror of https://github.com/TryGhost/Ghost-Admin.git
1
0
Fork 0
Code Issues Releases Wiki Activity

✨ Added YAML file support for redirects (#1703) 

refs https://github.com/TryGhost/Ghost/issues/11085
refs https://github.com/TryGhost/Ghost/pull/12187

- YAML file support has been added to Ghost's API through referenced above PR. YAML will become a default supported file in the next version of Ghost replacing JSON redirects
This commit is contained in:
Kukhyeon Heo 2021-02-22 09:27:00 +09:00 committed by GitHub
parent c917c4f647
commit 198f111524
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/controllers/settings/labs.js
View File

@ -49,8 +49,8 @@ export default Controller.extend({
uploadButtonText: 'Import',
importMimeType: null,
jsonExtension: null,
jsonMimeType: null,
redirectsFileExtensions: null,
redirectsFileMimeTypes: null,
yamlExtension: null,
yamlMimeType: null,
@ -59,8 +59,9 @@ export default Controller.extend({
init() {
this._super(...arguments);
this.importMimeType = IMPORT_MIME_TYPES;
this.jsonExtension = JSON_EXTENSION;
this.jsonMimeType = JSON_MIME_TYPE;
this.redirectsFileExtensions = [...JSON_EXTENSION, ...YAML_EXTENSION];
// .yaml is added below for file dialogs to show .yaml by default.
this.redirectsFileMimeTypes = [...JSON_MIME_TYPE, ...YAML_MIME_TYPE, '.yaml'];
this.yamlExtension = YAML_EXTENSION;
this.yamlMimeType = YAML_MIME_TYPE;
// (macOS) Safari only allows files with the `yml` extension to be selected with the specified MIME types

10
app/templates/settings/labs.hbs
View File

@ -84,8 +84,8 @@
<div class="gh-expandable">
<div class="gh-expandable-block">
<GhUploader
@extensions={{this.jsonExtension}}
@uploadUrl="/redirects/json/"
@extensions={{this.redirectsFileExtensions}}
@uploadUrl="/redirects/upload/"
@paramName="redirects"
@onUploadSuccess={{perform this.redirectUploadResult true}}
@onUploadFailure={{perform this.redirectUploadResult false}}
@ -112,11 +112,11 @@
{{else if this.redirectFailure}}
{{svg-jar "retry"}} Upload Failed
{{else}}
Upload redirects JSON
Upload redirects YAML/JSON
{{/if}}
</span>
</button>
<div><a href="#" {{action "downloadFile" "redirects/json"}} data-test-link="download-redirects">Download current redirects</a></div>
<div><a href="#" {{action "downloadFile" "redirects/download"}} data-test-link="download-redirects">Download current redirects</a></div>
{{/if}}
{{#each uploader.errors as |error|}}
@ -124,7 +124,7 @@
{{/each}}
<div style="display:none">
<GhFileInput @multiple={{false}} @action={{uploader.setFiles}} @accept={{this.jsonMimeType}} data-test-file-input="redirects" />
<GhFileInput @multiple={{false}} @action={{uploader.setFiles}} @accept={{this.redirectsFileMimeTypes}} data-test-file-input="redirects" />
</div>
</div>
</div>

8
tests/acceptance/settings/labs-test.js
View File

@ -82,7 +82,7 @@ describe('Acceptance: Settings - Labs', function () {
await visit('/settings/labs');
// successful upload
this.server.post('/redirects/json/', {}, 200);
this.server.post('/redirects/upload/', {}, 200);
await fileUpload(
'[data-test-file-input="redirects"] input',
@ -123,7 +123,7 @@ describe('Acceptance: Settings - Labs', function () {
).to.have.string('Upload redirects');
// failed upload
this.server.post('/redirects/json/', {
this.server.post('/redirects/upload/', {
errors: [{
type: 'BadRequestError',
message: 'Test failure message'
@ -175,7 +175,7 @@ describe('Acceptance: Settings - Labs', function () {
).to.have.string('Upload redirects');
// successful upload clears error
this.server.post('/redirects/json/', {}, 200);
this.server.post('/redirects/upload/', {}, 200);
await fileUpload(
'[data-test-file-input="redirects"] input',
['test'],
@ -188,7 +188,7 @@ describe('Acceptance: Settings - Labs', function () {
await click('[data-test-link="download-redirects"]');
let iframe = document.querySelector('#iframeDownload');
expect(iframe.getAttribute('src')).to.have.string('/redirects/json/');
expect(iframe.getAttribute('src')).to.have.string('/redirects/download/');
});
it('can upload/download routes.yaml', async function () {