From 91815c9f00d71cfa259da5eeb720088566c93fdf Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Thu, 1 Dec 2016 13:54:21 -0500 Subject: [PATCH] FIX: Remove Deprecated Views --- .../components/explorer-container.js.es6 | 76 +++++ .../templates/admin/plugins-explorer.hbs | 259 +++++++++--------- .../templates/modal/import-query.hbs | 18 +- .../views/admin-plugins-explorer.js.es6 | 70 ----- .../discourse/views/import-query.js.es6 | 6 - 5 files changed, 217 insertions(+), 212 deletions(-) create mode 100644 assets/javascripts/discourse/components/explorer-container.js.es6 delete mode 100644 assets/javascripts/discourse/views/import-query.js.es6 diff --git a/assets/javascripts/discourse/components/explorer-container.js.es6 b/assets/javascripts/discourse/components/explorer-container.js.es6 new file mode 100644 index 0000000..28a299b --- /dev/null +++ b/assets/javascripts/discourse/components/explorer-container.js.es6 @@ -0,0 +1,76 @@ +import { observes } from 'ember-addons/ember-computed-decorators'; + +export default Ember.Component.extend({ + + @observes('hideSchema') + _onHideSchema() { + this.appEvents.trigger('ace:resize'); + }, + + @observes('everEditing') + _onInsertEditor() { + Ember.run.schedule('afterRender', this, () => this._bindControls()); + }, + + _bindControls() { + if (this._state !== "inDOM") { + return; + } + const $editPane = this.$().find('.query-editor'); + if (!$editPane.length) { + return; + } + const oldGrippie = this.get('grippie'); + if (oldGrippie) { + oldGrippie.off('mousedown mousemove mouseup'); + $editPane.off('mousemove mouseup'); + } + + const $grippie = $editPane.find('.grippie'); + const $targets = $editPane.find('.ace-wrapper,.grippie-target'); + const $body = $('body'); + const self = this; + + this.set('grippie', $grippie); + + const mousemove = function(e) { + const diff = self.get('startY') - e.screenY; + const newHeight = self.get('startSize') - diff; + //Em.Logger.debug("new height", newHeight); + $targets.height(newHeight); + self.appEvents.trigger('ace:resize'); + }; + + let mouseup; + mouseup = function(e) { + mousemove(e); + $body.off('mousemove', mousemove); + $body.off('mouseup', mouseup); + self.set('startY', null); + self.set('startSize', null); + }; + + $grippie.on('mousedown', function(e) { + self.set('startY', e.screenY); + self.set('startSize', $targets.height()); + + $body.on('mousemove', mousemove); + $body.on('mouseup', mouseup); + e.preventDefault(); + }); + }, + + didInsertElement() { + this._super(); + this._bindControls(); + }, + + willDestroyElement() { + this._super(); + if (this.get('everEditing')) { + this.get('grippie').off('mousedown'); + this.set('grippie', null); + } + } +}); + diff --git a/assets/javascripts/discourse/templates/admin/plugins-explorer.hbs b/assets/javascripts/discourse/templates/admin/plugins-explorer.hbs index ff80dfd..4a8cd07 100644 --- a/assets/javascripts/discourse/templates/admin/plugins-explorer.hbs +++ b/assets/javascripts/discourse/templates/admin/plugins-explorer.hbs @@ -1,136 +1,139 @@ -{{#if disallow}} -

{{i18n "explorer.admins_only"}}

-{{else}} -
- {{combo-box valueAttribute="id" value=selectedQueryId nameProperty="listName" content=content castInteger="true" nameChanges="true"}} - {{d-button action="showCreate" icon="plus" class="no-text"}} - {{d-button action="importQuery" label="explorer.import.label" icon="upload"}} -
+{{#explorer-container hideSchema=hideSchema everEditing=everEditing}} - {{#if showCreate}} -
- {{text-field value=newQueryName placeholderKey="explorer.create_placeholder"}} - {{d-button action="create" label="explorer.create" icon="plus" class="btn-primary"}} -
- {{/if}} - - {{#if othersDirty}} -
- {{fa-icon "warning"}} - {{i18n "explorer.others_dirty"}} -
- {{/if}} - -
- - {{#if selectedItem.fake}} - {{i18n "explorer.no_queries"}} {{i18n "explorer.no_queries_hook"}} + {{#if disallow}} +

{{i18n "explorer.admins_only"}}

{{else}} -
- {{#if selectedItem}} - {{#if editing}} -
- {{text-field value=selectedItem.name}} -
-
- {{textarea value=selectedItem.description}} -
- {{else}} -
-

{{selectedItem.name}}

- {{d-button action="editName" icon="pencil" class="no-text btn-small"}} -
-
- {{selectedItem.description}} -
- {{/if}} - - {{! the SQL editor will show the first time you }} - {{#if everEditing}} -
-
-
- {{explorer-schema schema=schema hideSchema=hideSchema}} -
-
-
- {{ace-editor content=selectedItem.sql mode="sql"}} -
-
-
-
- {{else}} -
- {{hljs-code-view value=selectedItem.sql codeClass="sql"}} -
- {{/if}} - - - -
-
- {{#if everEditing}} - {{d-button action="save" label="explorer.save" disabled=saveDisabled class="btn-primary"}} - {{else}} - {{d-button action="editName" label="explorer.edit" icon="pencil" class="btn-primary"}} - {{/if}} - {{d-button action="download" label="explorer.export" disabled=runDisabled icon="download"}} -
-
- {{#if selectedItem.destroyed}} - {{d-button action="recover" class="" icon="undo" label="explorer.recover"}} - {{else}} - {{#if everEditing}} - {{d-button action="discard" class="btn-danger" icon="undo" label="explorer.undo" disabled=saveDisabled}} - {{/if}} - {{d-button action="destroy" class="btn-danger" icon="trash" label="explorer.delete"}} - {{/if}} -
-
- {{/if}} +
+ {{combo-box valueAttribute="id" value=selectedQueryId nameProperty="listName" content=content castInteger="true" nameChanges="true"}} + {{d-button action="showCreate" icon="plus" class="no-text"}} + {{d-button action="importQuery" label="explorer.import.label" icon="upload"}}
-
- {{#if selectedItem.hasParams}} -
- {{#each selectedItem.param_info as |pinfo|}} - {{param-input params=selectedItem.params info=pinfo}} - {{!
- {{param-field params=selectedItem.params pname=pinfo.identifier type=pinfo.type} - {{pinfo.identifier} -
}} - {{/each}} -
- {{/if}} - {{#if runDisabled}} - {{#if saveDisabled}} - {{d-button label="explorer.run" disabled="true" class="btn-primary"}} - {{else}} - {{d-button action="saverun" label="explorer.saverun"}} - {{/if}} - {{else}} - {{d-button action="run" label="explorer.run" disabled=runDisabled class="btn-primary" type="submit"}} - {{/if}} - -
- -
- {{/if}} - {{conditional-loading-spinner condition=loading}} - {{#unless selectedItem.fake}} - {{#if results}} -
- {{#if showResults}} - {{query-result query=selectedItem content=results}} - {{else}} - {{#each results.errors as |err|}} - 
{{~err}}
- {{/each}} - {{/if}} + {{#if showCreate}} +
+ {{text-field value=newQueryName placeholderKey="explorer.create_placeholder"}} + {{d-button action="create" label="explorer.create" icon="plus" class="btn-primary"}}
{{/if}} - {{/unless}} -
+ {{#if othersDirty}} +
+ {{fa-icon "warning"}} + {{i18n "explorer.others_dirty"}} +
+ {{/if}} -{{/if}} +
+ + {{#if selectedItem.fake}} + {{i18n "explorer.no_queries"}} {{i18n "explorer.no_queries_hook"}} + {{else}} +
+ {{#if selectedItem}} + {{#if editing}} +
+ {{text-field value=selectedItem.name}} +
+
+ {{textarea value=selectedItem.description}} +
+ {{else}} +
+

{{selectedItem.name}}

+ {{d-button action="editName" icon="pencil" class="no-text btn-small"}} +
+
+ {{selectedItem.description}} +
+ {{/if}} + + {{! the SQL editor will show the first time you }} + {{#if everEditing}} +
+
+
+ {{explorer-schema schema=schema hideSchema=hideSchema}} +
+
+
+ {{ace-editor content=selectedItem.sql mode="sql"}} +
+
+
+
+ {{else}} +
+ {{hljs-code-view value=selectedItem.sql codeClass="sql"}} +
+ {{/if}} + + + +
+
+ {{#if everEditing}} + {{d-button action="save" label="explorer.save" disabled=saveDisabled class="btn-primary"}} + {{else}} + {{d-button action="editName" label="explorer.edit" icon="pencil" class="btn-primary"}} + {{/if}} + {{d-button action="download" label="explorer.export" disabled=runDisabled icon="download"}} +
+
+ {{#if selectedItem.destroyed}} + {{d-button action="recover" class="" icon="undo" label="explorer.recover"}} + {{else}} + {{#if everEditing}} + {{d-button action="discard" class="btn-danger" icon="undo" label="explorer.undo" disabled=saveDisabled}} + {{/if}} + {{d-button action="destroy" class="btn-danger" icon="trash" label="explorer.delete"}} + {{/if}} +
+
+ {{/if}} +
+ +
+ {{#if selectedItem.hasParams}} +
+ {{#each selectedItem.param_info as |pinfo|}} + {{param-input params=selectedItem.params info=pinfo}} + {{!
+ {{param-field params=selectedItem.params pname=pinfo.identifier type=pinfo.type} + {{pinfo.identifier} +
}} + {{/each}} +
+ {{/if}} + {{#if runDisabled}} + {{#if saveDisabled}} + {{d-button label="explorer.run" disabled="true" class="btn-primary"}} + {{else}} + {{d-button action="saverun" label="explorer.saverun"}} + {{/if}} + {{else}} + {{d-button action="run" label="explorer.run" disabled=runDisabled class="btn-primary" type="submit"}} + {{/if}} + +
+ +
+ {{/if}} + {{conditional-loading-spinner condition=loading}} + {{#unless selectedItem.fake}} + {{#if results}} +
+ {{#if showResults}} + {{query-result query=selectedItem content=results}} + {{else}} + {{#each results.errors as |err|}} + 
{{~err}}
+ {{/each}} + {{/if}} +
+ {{/if}} + {{/unless}} + +
+ + {{/if}} +{{/explorer-container}} diff --git a/assets/javascripts/discourse/templates/modal/import-query.hbs b/assets/javascripts/discourse/templates/modal/import-query.hbs index eb245e9..1f766d0 100644 --- a/assets/javascripts/discourse/templates/modal/import-query.hbs +++ b/assets/javascripts/discourse/templates/modal/import-query.hbs @@ -1,8 +1,10 @@ -
-
- {{json-file-uploader value=queryFile extension=".dcquery.json"}} -
-
- {{d-button class='btn-primary' action='doImport' type='submit' disabled=notReady icon="plus" label='explorer.import.label'}} -
-
+{{#d-modal-body title="explorer.import.modal"}} +
+
+ {{json-file-uploader value=queryFile extension=".dcquery.json"}} +
+
+ {{d-button class='btn-primary' action='doImport' type='submit' disabled=notReady icon="plus" label='explorer.import.label'}} +
+
+{{/d-modal-body}} diff --git a/assets/javascripts/discourse/views/admin-plugins-explorer.js.es6 b/assets/javascripts/discourse/views/admin-plugins-explorer.js.es6 index 660bc81..e69de29 100644 --- a/assets/javascripts/discourse/views/admin-plugins-explorer.js.es6 +++ b/assets/javascripts/discourse/views/admin-plugins-explorer.js.es6 @@ -1,70 +0,0 @@ - -export default Ember.View.extend({ - - _onHideSchema: function() { - this.appEvents.trigger('ace:resize'); - }.observes('controller.hideSchema'), - - _onInsertEditor: function() { - const self = this; - Em.run.schedule('afterRender', this, function() { - self.trigger('didInsertEditor'); - }); - }.observes('controller.everEditing'), - - _bindGrippie: function() { - if (this._state !== "inDOM") { - return; - } - const $editPane = this.$().find('.query-editor'); - if (!$editPane.length) { - return; - } - const oldGrippie = this.get('grippie'); - if (oldGrippie) { - oldGrippie.off('mousedown mousemove mouseup'); - $editPane.off('mousemove mouseup'); - } - - const $grippie = $editPane.find('.grippie'); - const $targets = $editPane.find('.ace-wrapper,.grippie-target'); - const $body = $('body'); - const self = this; - - this.set('grippie', $grippie); - - const mousemove = function(e) { - const diff = self.get('startY') - e.screenY; - const newHeight = self.get('startSize') - diff; - //Em.Logger.debug("new height", newHeight); - $targets.height(newHeight); - self.appEvents.trigger('ace:resize'); - }; - - let mouseup; - mouseup = function(e) { - mousemove(e); - $body.off('mousemove', mousemove); - $body.off('mouseup', mouseup); - self.set('startY', null); - self.set('startSize', null); - }; - - $grippie.on('mousedown', function(e) { - self.set('startY', e.screenY); - self.set('startSize', $targets.height()); - - $body.on('mousemove', mousemove); - $body.on('mouseup', mouseup); - e.preventDefault(); - }); - - }.on('didInsertElement', 'didInsertEditor'), - - _cleanup: function() { - if (this.get('controller.everEditing')) { - this.get('grippie').off('mousedown'); - this.set('grippie', null); - } - }.on('willDestroyElement') -}); diff --git a/assets/javascripts/discourse/views/import-query.js.es6 b/assets/javascripts/discourse/views/import-query.js.es6 deleted file mode 100644 index b145a4c..0000000 --- a/assets/javascripts/discourse/views/import-query.js.es6 +++ /dev/null @@ -1,6 +0,0 @@ -import ModalBodyView from "discourse/views/modal-body"; - -export default ModalBodyView.extend({ - templateName: 'modal/import-query', - title: I18n.t('explorer.import.modal') -});