Merge pull request #22 from AcalephStorage/release/0.1.2

Release/0.1.2

Author: darkcrux

.jshintrc

@@ -3,7 +3,10 @@
     "document",
     "window",
     "-Promise",
-    "moment"
+    "moment",
+    "ace",
+    "ansi_up",
+    "Base64"
   ],
   "browser": true,
   "boss": true,

app/components/build-stage.js

@@ -26,6 +26,11 @@ export default Ember.Component.extend({
     this.sendAction('selectStage', this.get('model'));
   },
 
+  willDestroyElement() {
+    this._super(...arguments);
+    this.removeObserver('model.status', this, this.fetchLogs);
+  },
+
   fetchLogs() {
     let stage = this.get('model');
 
@@ -35,6 +40,12 @@ export default Ember.Component.extend({
       logFetcher.then((logFiles) => {
         stage.set('logFiles', logFiles);
       });
+
+      if (stage.get('status') === 'PENDING') {
+        this.addObserver('model.status', this, this.fetchLogs);
+      } else {
+        this.removeObserver('model.status', this, this.fetchLogs);
+      }
     }
   },
 

app/components/main-menu.js

@@ -2,7 +2,7 @@ import Ember from 'ember';
 
 export default Ember.Component.extend({
 
-  classNames: Ember.String.w('ui borderless attached menu main-menu'),
+  classNames: Ember.String.w('ui attached secondary menu'),
 
   session: Ember.inject.service(),
   appNamespace: Ember.inject.service(),

app/components/pipeline-build.js

@@ -3,7 +3,7 @@ import {task,timeout} from 'ember-concurrency';
 
 export default Ember.Component.extend({
 
-  classNames: Ember.String.w('ui grid main-content'),
+  classNames: Ember.String.w('ui columned grid'),
 
   build: Ember.inject.service(),
   notify: Ember.inject.service(),
@@ -18,6 +18,14 @@ export default Ember.Component.extend({
       build_number: this.get('buildNumber'),
     };
   }),
+  isViewingStage: Ember.computed.bool('selectedStage'),
+  infoBoxVisible: Ember.computed.or('isViewingPipelineDetails', 'isEditingPipeline', 'isViewingStage'),
+
+  init() {
+    this._super(...arguments);
+    this.set('isViewingPipelineDetails', false);
+    this.set('isEditingPipeline', false);
+  },
 
   willInsertElement() {
     this.addObserver('buildNumber', this, this.getBuildDetails);
@@ -38,6 +46,7 @@ export default Ember.Component.extend({
   },
 
   getBuildDetails() {
+    this.set('model', undefined);
     this.get('stagesPoller').cancelAll();
     this.get('stagesPoller').perform();
   },
@@ -51,10 +60,8 @@ export default Ember.Component.extend({
 
   buildFetcher: task(function * () {
     if (this.get('buildNumber')) {
-      yield this.get('build').find(this.get('buildQuery'))
-        .then((build) => {
-          this.set('model', build);
-        });
+      let build = yield this.get('build').find(this.get('buildQuery'));
+      this.set('model', build);
     }
   }).drop(),
 
@@ -99,24 +106,34 @@ export default Ember.Component.extend({
   }).drop(),
 
   actions: {
+    historyHide() {
+      return Ember.isPresent(this.get('model'));
+    },
     selectBuild() {
       this.send('unselectStage');
+      this.send('closePipelineDetails');
+      this.send('closePipelineEditor');
     },
     confirmCreateBuild() {
+      this.send('unselectStage');
+      this.send('closePipelineDetails');
+      this.send('closePipelineEditor');
       this.$('.ui.modal.create-build-confirmation').modal('show');
     },
     createBuild() {
       this.get('buildCreator').perform();
     },
     selectStage(stage) {
       this.send('closePipelineDetails');
+      this.send('closePipelineEditor');
       this.set('selectedStage', stage);
     },
     unselectStage() {
       this.set('selectedStage', null);
     },
     viewPipelineDetails() {
       this.send('unselectStage');
+      this.send('closePipelineEditor');
       this.set('isViewingPipelineDetails', true);
     },
     closePipelineDetails() {

app/components/pipeline-details.js

@@ -2,7 +2,7 @@ import Ember from 'ember';
 
 export default Ember.Component.extend({
 
-  classNames: Ember.String.w('ui right internal rail stage-details'),
+  classNames: Ember.String.w('ui right internal rail info-box'),
 
   actions: {
     close() {

app/components/pipeline-editor.js

@@ -4,13 +4,15 @@ import Configuration from '../config/environment';
 
 export default Ember.Component.extend({
 
-  classNames: Ember.String.w('ui right internal rail stage-details'),
+  classNames: Ember.String.w('ui right internal rail info-box'),
 
   pipeline: Ember.inject.service(),
   store: Ember.inject.service(),
   session: Ember.inject.service(),
   notify: Ember.inject.service(),
 
+  aceEditor: null,
+
   willPullRequest: Ember.computed.equal('commitOption.option', 'pull_request'),
   editorAction: Ember.computed('definition', function() {
     let definition = this.get('definition');
@@ -27,9 +29,43 @@ export default Ember.Component.extend({
   },
 
   didRender() {
-    if (this.$('input[name="commitOption"][checked="checked"]').length === 0) {
+    if (this.$('input[name="commit-option"][checked="checked"]').length === 0) {
       let commitOption = this.get('commitOption.option');
-      this.$(`input[name="commitOption"][value="${commitOption}"]`).attr("checked", "checked")
+      this.$(`input[name="commit-option"][value="${commitOption}"]`).attr("checked", "checked");
+    }
+    this.aceEditorInit();
+  },
+
+  willDestroyElement() {
+    this.removeObserver('definition.content', this, this.aceEditorContentChange);
+    if (this.aceEditor) {
+      this.aceEditor.destroy();
+      this.aceEditor.container.remove();
+    }
+  },
+
+  aceEditorInit() {
+    let textEditor = this.$("div#definition-content");
+    if (textEditor.length && !textEditor.hasClass('ace_editor')) {
+      let editorID = textEditor.attr('id');
+      this.aceEditor = ace.edit(editorID);
+      this.aceEditor.getSession().setTabSize(2);
+      this.aceEditor.getSession().setMode("ace/mode/yaml");
+      this.aceEditor.on('change', () => {
+        this.set('definition.content', this.aceEditor.getSession().getValue());
+      });
+      this.aceEditor.$blockScrolling = Infinity;
+      this.addObserver('definition.content', this, this.aceEditorContentChange);
+      this.notifyPropertyChange('definition.content');
+    }
+  },
+
+  aceEditorContentChange() {
+    if (!this.get('definition.content')) {
+      this.aceEditor.getSession().setValue('');
+    }
+    else if (this.aceEditor.getSession().getValue() !== this.get('definition.content')) {
+      this.aceEditor.getSession().setValue(this.get('definition.content'));
     }
   },
 
@@ -85,10 +121,8 @@ export default Ember.Component.extend({
   },
 
   definitionFetcher: task(function*(ajaxOptions) {
-    yield Ember.$.ajax(ajaxOptions)
-      .then((definition) => {
-        this.serializeDefinition(definition);
-      });
+    let definition = yield Ember.$.ajax(ajaxOptions);
+    this.serializeDefinition(definition);
   }).drop(),
 
   definitionUpdater: task(function*(ajaxOptions) {
@@ -107,6 +141,7 @@ export default Ember.Component.extend({
     let action = this.get('editorAction').toLowerCase();
     yield Ember.$.ajax(ajaxOptions)
       .then((definition) => {
+        this.get('model').reload();
         this.get('notify').success(`Successfully ${action}d the definition file for the pipeline`);
         this.serializeDefinition(definition);
       }, (res) => {

app/components/pipeline-list.js

@@ -3,17 +3,27 @@ import {task,timeout} from 'ember-concurrency';
 
 export default Ember.Component.extend({
 
-  classNames: Ember.String.w('ui grid main-content'),
+  classNames: Ember.String.w('ui columned grid'),
 
   pipeline: Ember.inject.service(),
 
+  init() {
+    this._super(...arguments);
+    this.set('isLoaded', false);
+  },
+
   pipelinesPoller: task(function*() {
     while (true) {
-      yield this.get('pipeline').fetchAll();
+      this.get('pipelinesFetcher').perform();
       yield timeout(60000); // 1-minute interval
     }
   }).on('init').drop(),
 
+  pipelinesFetcher: task(function*() {
+    yield this.get('pipeline').fetchAll();
+    this.set('isLoaded', true);
+  }),
+
   didInsertElement() {
     this.$(".in-header.icon.button").popup({
       variation: "small inverted",

app/components/stage-details.js

@@ -3,7 +3,7 @@ import {task,timeout} from 'ember-concurrency';
 
 export default Ember.Component.extend({
 
-  classNames: Ember.String.w('ui right internal rail stage-details'),
+  classNames: Ember.String.w('ui right internal rail info-box'),
 
   isRunning: Ember.computed.equal('model.status', 'RUNNING'),
   isDone: Ember.computed.match('model.status', /^(SUCCESS|FAIL)$/),
@@ -12,11 +12,9 @@ export default Ember.Component.extend({
     let tabs = this.$(".stage-tabs .item");
     let activeTab = this.$(".stage-tabs .active.item");
     if (tabs.length && !activeTab.length) {
-      let log = this.get('model.logFiles.firstObject');
-      this.send('showLogs', log);
+      this.changeTab('details');
     }
   },
-
   actions: {
     showLogs(log) {
       this.get('logsPoller').cancelAll();

app/components/ui-promise-dropdown.js

@@ -3,7 +3,7 @@ import SemanticDropdown from 'semantic-ui-ember/components/ui-dropdown';
 export default SemanticDropdown.extend({
 
   firstShow: true,
-  classNameBindings: ['waitList.isPending:loading'],
+  classNameBindings: ['waitList.isPending:loading', 'disabled:disabled'],
 
   didInsertElement() {
     this._super();

app/components/ui-spinkit-3.js

@@ -0,0 +1,5 @@
+import Ember from 'ember';
+
+export default Ember.Component.extend({
+  classNames: ['spinner']
+});

app/helpers/ansi.js

@@ -0,0 +1,11 @@
+import Ember from 'ember';
+
+export function ansi(params) {
+  let content = params[0];
+  let converted = ansi_up.ansi_to_html(content);
+
+  return Ember.String.htmlSafe(converted);
+
+}
+
+export default Ember.Helper.helper(ansi);

app/routes/login.js

@@ -1,5 +1,6 @@
 import Ember from 'ember';
 import UnauthenticatedRouteMixin from 'ember-simple-auth/mixins/unauthenticated-route-mixin';
+import {task} from 'ember-concurrency';
 
 export default Ember.Route.extend(UnauthenticatedRouteMixin, {
 
@@ -8,13 +9,17 @@ export default Ember.Route.extend(UnauthenticatedRouteMixin, {
   actions: {
     login() {
       this.set('session.errorMessage', null);
-      this.get('session').authenticate('authenticator:kontinuous', 'github-kontinuous')
-        .catch((resp) => {
-          this.set('session.errorMessage', resp || "Failed to login.");
-        });
+      this.get('loginTask').perform();
     }
   },
 
+  loginTask: task(function*() {
+    yield this.get('session').authenticate('authenticator:kontinuous', 'github-kontinuous')
+      .catch((resp) => {
+        this.set('session.errorMessage', resp || "Failed to login.");
+      });
+  }).cancelOn('deactivate').drop(),
+
   renderTemplate: function() {
     this.render({
       outlet: 'login'

app/serializers/log.js

@@ -7,7 +7,8 @@ export default JSONSerializer.extend({
   normalize(modelClass, resourceHash) {
     if (resourceHash && resourceHash.filename) {
       var filename = resourceHash.filename.split('/');
-      resourceHash.title = filename.objectAt(filename.length - 1).replace(/\.log$/, '');
+      let title = filename.objectAt(filename.length - 1);
+      resourceHash.title = title.endsWith('.log') ? title : title.concat('.log');
     }
     return this._super(modelClass, resourceHash);
   },