Flatten nested components (#854)

no issue
- the upcoming Module Unification re-organisation in Ember will no longer support nested components
- this PR pre-emptively moves our usage of nested components into a flat file structure

app/components/gh-fullscreen-modal.js

@@ -15,7 +15,7 @@ const FullScreenModalComponent = Component.extend({
     dropdown: injectService(),
 
     modalPath: computed('modal', function () {
-        return `modals/${this.get('modal') || 'unknown'}`;
+        return `modal-${this.get('modal') || 'unknown'}`;
     }),
 
     modalClasses: computed('modifiers', function () {

app/components/modal-copy-html.js

@@ -1,4 +1,4 @@
-import ModalComponent from 'ghost-admin/components/modals/base';
+import ModalComponent from 'ghost-admin/components/modal-base';
 import {alias} from '@ember/object/computed';
 
 export default ModalComponent.extend({

app/components/modal-delete-all.js

@@ -1,4 +1,4 @@
-import ModalComponent from 'ghost-admin/components/modals/base';
+import ModalComponent from 'ghost-admin/components/modal-base';
 import {inject as injectService} from '@ember/service';
 import {task} from 'ember-concurrency';
 

app/components/modal-delete-post.js

@@ -1,4 +1,4 @@
-import ModalComponent from 'ghost-admin/components/modals/base';
+import ModalComponent from 'ghost-admin/components/modal-base';
 import {alias} from '@ember/object/computed';
 import {inject as injectService} from '@ember/service';
 import {task} from 'ember-concurrency';

app/components/modal-delete-subscriber.js

@@ -1,4 +1,4 @@
-import ModalComponent from 'ghost-admin/components/modals/base';
+import ModalComponent from 'ghost-admin/components/modal-base';
 import {alias} from '@ember/object/computed';
 import {invokeAction} from 'ember-invoke-action';
 import {task} from 'ember-concurrency';

app/components/modal-delete-tag.js

@@ -1,4 +1,4 @@
-import ModalComponent from 'ghost-admin/components/modals/base';
+import ModalComponent from 'ghost-admin/components/modal-base';
 import {alias} from '@ember/object/computed';
 import {computed} from '@ember/object';
 import {invokeAction} from 'ember-invoke-action';

app/components/modal-delete-theme.js

@@ -1,4 +1,4 @@
-import ModalComponent from 'ghost-admin/components/modals/base';
+import ModalComponent from 'ghost-admin/components/modal-base';
 import {alias} from '@ember/object/computed';
 import {invokeAction} from 'ember-invoke-action';
 import {task} from 'ember-concurrency';

app/components/modal-delete-user.js

@@ -1,4 +1,4 @@
-import ModalComponent from 'ghost-admin/components/modals/base';
+import ModalComponent from 'ghost-admin/components/modal-base';
 import {alias} from '@ember/object/computed';
 import {invokeAction} from 'ember-invoke-action';
 import {task} from 'ember-concurrency';

app/components/modal-import-subscribers.js

@@ -1,4 +1,4 @@
-import ModalComponent from 'ghost-admin/components/modals/base';
+import ModalComponent from 'ghost-admin/components/modal-base';
 import ghostPaths from 'ghost-admin/utils/ghost-paths';
 import {computed} from '@ember/object';
 import {invokeAction} from 'ember-invoke-action';

app/components/modal-invite-new-user.js

@@ -1,4 +1,4 @@
-import ModalComponent from 'ghost-admin/components/modals/base';
+import ModalComponent from 'ghost-admin/components/modal-base';
 import RSVP from 'rsvp';
 import ValidationEngine from 'ghost-admin/mixins/validation-engine';
 import {A as emberA} from '@ember/array';

app/components/modal-leave-editor.js

@@ -1,4 +1,4 @@
-import ModalComponent from 'ghost-admin/components/modals/base';
+import ModalComponent from 'ghost-admin/components/modal-base';
 import {invokeAction} from 'ember-invoke-action';
 
 export default ModalComponent.extend({

app/components/modal-markdown-help.js

@@ -0,0 +1,4 @@
+import ModalComponent from 'ghost-admin/components/modal-base';
+
+export default ModalComponent.extend({
+});

app/components/modal-new-subscriber.js

@@ -1,4 +1,4 @@
-import ModalComponent from 'ghost-admin/components/modals/base';
+import ModalComponent from 'ghost-admin/components/modal-base';
 import {A as emberA} from '@ember/array';
 import {isInvalidError} from 'ember-ajax/errors';
 import {task} from 'ember-concurrency';

app/components/modal-re-authenticate.js

@@ -1,5 +1,5 @@
 import $ from 'jquery';
-import ModalComponent from 'ghost-admin/components/modals/base';
+import ModalComponent from 'ghost-admin/components/modal-base';
 import ValidationEngine from 'ghost-admin/mixins/validation-engine';
 import {computed} from '@ember/object';
 import {htmlSafe} from '@ember/string';

app/components/modal-suspend-user.js

@@ -1,4 +1,4 @@
-import ModalComponent from 'ghost-admin/components/modals/base';
+import ModalComponent from 'ghost-admin/components/modal-base';
 import {alias} from '@ember/object/computed';
 import {invokeAction} from 'ember-invoke-action';
 import {task} from 'ember-concurrency';

app/components/modal-theme-warnings.js

@@ -1,4 +1,4 @@
-import ModalComponent from 'ghost-admin/components/modals/base';
+import ModalComponent from 'ghost-admin/components/modal-base';
 import {reads} from '@ember/object/computed';
 
 export default ModalComponent.extend({

app/components/modal-transfer-owner.js

@@ -1,4 +1,4 @@
-import ModalComponent from 'ghost-admin/components/modals/base';
+import ModalComponent from 'ghost-admin/components/modal-base';
 import {invokeAction} from 'ember-invoke-action';
 import {task} from 'ember-concurrency';
 

app/components/modal-unsuspend-user.js

@@ -1,4 +1,4 @@
-import ModalComponent from 'ghost-admin/components/modals/base';
+import ModalComponent from 'ghost-admin/components/modal-base';
 import {alias} from '@ember/object/computed';
 import {invokeAction} from 'ember-invoke-action';
 import {task} from 'ember-concurrency';

app/components/modal-upload-image.js

@@ -1,4 +1,4 @@
-import ModalComponent from 'ghost-admin/components/modals/base';
+import ModalComponent from 'ghost-admin/components/modal-base';
 import cajaSanitizers from 'ghost-admin/utils/caja-sanitizers';
 import {computed} from '@ember/object';
 import {inject as injectService} from '@ember/service';

app/components/modal-upload-theme.js

@@ -1,4 +1,4 @@
-import ModalComponent from 'ghost-admin/components/modals/base';
+import ModalComponent from 'ghost-admin/components/modal-base';
 import ghostPaths from 'ghost-admin/utils/ghost-paths';
 import {
     UnsupportedMediaTypeError,
@@ -126,7 +126,7 @@ export default ModalComponent.extend({
 
                 // to have a proper grouping of fatal errors and none fatal, we need to check
                 // our errors for the fatal property
-                if (errors.length > 0) {
+                if (errors && errors.length > 0) {
                     for (let i = 0; i < errors.length; i++) {
                         if (errors[i].fatal) {
                             fatalErrors.push(errors[i]);

app/components/modals/markdown-help.js

@@ -1,4 +0,0 @@
-import ModalComponent from 'ghost-admin/components/modals/base';
-
-export default ModalComponent.extend({
-});

app/templates/components/gh-search-input.hbs

@@ -5,9 +5,9 @@
     onopen=(action "onFocus")
     onclose=(action "onBlur")
     searchEnabled=false
-    triggerComponent="gh-search-input/trigger"
+    triggerComponent="gh-search-input-trigger"
     renderInPlace=true
     loadingMessage="Loading"
     as |name select|}}
     {{highlighted-text name.title select.searchText}}
-{{/power-select}}
+{{/power-select}}

tests/integration/components/modals/delete-subscriber-test.js

@@ -4,8 +4,8 @@ import {describe, it} from 'mocha';
 import {expect} from 'chai';
 import {setupComponentTest} from 'ember-mocha';
 
-describe('Integration: Component: modals/delete-subscriber', function() {
-    setupComponentTest('modals/delete-subscriber', {
+describe('Integration: Component: modal-delete-subscriber', function() {
+    setupComponentTest('modal-delete-subscriber', {
         integration: true
     });
 
@@ -14,12 +14,12 @@ describe('Integration: Component: modals/delete-subscriber', function() {
         // Handle any actions with this.on('myAction', function(val) { ... });
         // Template block usage:
         // this.render(hbs`
-        //   {{#modals/delete-subscriber}}
+        //   {{#modal-delete-subscriber}}
         //     template content
-        //   {{/modals/delete-subscriber}}
+        //   {{/modal-delete-subscriber}}
         // `);
 
-        this.render(hbs`{{modals/delete-subscriber}}`);
+        this.render(hbs`{{modal-delete-subscriber}}`);
         expect(this.$()).to.have.length(1);
     });
 });

tests/integration/components/modals/import-subscribers-test.js

@@ -4,8 +4,8 @@ import {describe, it} from 'mocha';
 import {expect} from 'chai';
 import {setupComponentTest} from 'ember-mocha';
 
-describe('Integration: Component: modals/import-subscribers', function() {
-    setupComponentTest('modals/import-subscribers', {
+describe('Integration: Component: modal-import-subscribers', function() {
+    setupComponentTest('modal-import-subscribers', {
         integration: true
     });
 
@@ -14,12 +14,12 @@ describe('Integration: Component: modals/import-subscribers', function() {
         // Handle any actions with this.on('myAction', function(val) { ... });
         // Template block usage:
         // this.render(hbs`
-        //   {{#modals/import-subscribers}}
+        //   {{#modal-import-subscribers}}
         //     template content
-        //   {{/modals/import-subscribers}}
+        //   {{/modal-import-subscribers}}
         // `);
 
-        this.render(hbs`{{modals/import-subscribers}}`);
+        this.render(hbs`{{modal-import-subscribers}}`);
         expect(this.$()).to.have.length(1);
     });
 });

tests/integration/components/modals/new-subscriber-test.js

@@ -4,8 +4,8 @@ import {describe, it} from 'mocha';
 import {expect} from 'chai';
 import {setupComponentTest} from 'ember-mocha';
 
-describe('Integration: Component: modals/new-subscriber', function() {
-    setupComponentTest('modals/new-subscriber', {
+describe('Integration: Component: modal-new-subscriber', function() {
+    setupComponentTest('modal-new-subscriber', {
         integration: true
     });
 
@@ -14,12 +14,12 @@ describe('Integration: Component: modals/new-subscriber', function() {
         // Handle any actions with this.on('myAction', function(val) { ... });
         // Template block usage:
         // this.render(hbs`
-        //   {{#modals/new-subscriber}}
+        //   {{#modal-new-subscriber}}
         //     template content
-        //   {{/modals/new-subscriber}}
+        //   {{/modal-new-subscriber}}
         // `);
 
-        this.render(hbs`{{modals/new-subscriber}}`);
+        this.render(hbs`{{modal-new-subscriber}}`);
         expect(this.$()).to.have.length(1);
     });
 });

tests/integration/components/modals/upload-theme-test.js

@@ -4,8 +4,8 @@ import {describe, it} from 'mocha';
 import {expect} from 'chai';
 import {setupComponentTest} from 'ember-mocha';
 
-describe('Integration: Component: modals/upload-theme', function() {
-    setupComponentTest('modals/upload-theme', {
+describe('Integration: Component: modal-upload-theme', function() {
+    setupComponentTest('modal-upload-theme', {
         integration: true
     });
 
@@ -14,12 +14,12 @@ describe('Integration: Component: modals/upload-theme', function() {
         // Handle any actions with this.on('myAction', function(val) { ... });
         // Template block usage:
         // this.render(hbs`
-        //   {{#modals/upload-theme}}
+        //   {{#modal-upload-theme}}
         //     template content
-        //   {{/modals/upload-theme}}
+        //   {{/modal-upload-theme}}
         // `);
 
-        this.render(hbs`{{modals/upload-theme}}`);
+        this.render(hbs`{{modal-upload-theme}}`);
         expect(this.$()).to.have.length(1);
     });
 });

tests/integration/components/transfer-owner-test.js

@@ -7,7 +7,7 @@ import {expect} from 'chai';
 import {run} from '@ember/runloop';
 import {setupComponentTest} from 'ember-mocha';
 
-describe('Integration: Component: modals/transfer-owner', function() {
+describe('Integration: Component: modal-transfer-owner', function() {
     setupComponentTest('transfer-owner', {
         integration: true
     });
@@ -21,7 +21,7 @@ describe('Integration: Component: modals/transfer-owner', function() {
         this.on('confirm', confirm);
         this.on('closeModal', closeModal);
 
-        this.render(hbs`{{modals/transfer-owner confirm=(action 'confirm') closeModal=(action 'closeModal')}}`);
+        this.render(hbs`{{modal-transfer-owner confirm=(action 'confirm') closeModal=(action 'closeModal')}}`);
 
         run(() => {
             this.$('.gh-btn.gh-btn-red').click();