cyclid-ui 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7c825bc53e4d80b21910dc57748dbc5fd875eb7f
-  data.tar.gz: ea890e1cc6d3f8ec89652cec593e57555dbc25b2
+  metadata.gz: 149e04846774e4747d1536102a1c02ccce49fd55
+  data.tar.gz: a6f68dca217f538ba9d663f4e22a899c406c3ccb
 SHA512:
-  metadata.gz: 43f2bbd8bad9a2e0b0e73a40202fce843c05b3179db44d3cb60aa487eff9e184236baeb1ad1af85dd375b92f603b519055cf2fb7e9197222bc93866457bac342
-  data.tar.gz: b7c8add78e315865b33af006ff5e026ee93eb536be156bc7f277c654e9c770c740f6eb90c6d720800f050d582a0899b63d4039ff93942a37a43b541cd154c72e
+  metadata.gz: fe51e9570ecbbeb8b99157fe38075ca3dcf79fd6df17f2e65c7bb9118d310edca8cf674a0baea402decbc56f182a9b0da0f32132fd6e949e9d1714967db98649
+  data.tar.gz: 5cd1e04814d5be7d64cbd619df01cc2f73516702a93c6d3c54c94e3bab62efb628ab437ed6aab23404a187b9986b87f2435bbff9aa3650f24fc3ed728c661708

data/app/cyclid_ui/config.rb

@@ -20,7 +20,7 @@ module Cyclid
   module UI
     # Cyclid UI configuration
     class Config
-      attr_reader :memcached, :log, :server_api, :client_api
+      attr_reader :memcached, :log, :server_api, :client_api, :signup
 
       def initialize(path)
         # Try to load the configuration file. If it can't be loaded, we'll
@@ -56,6 +56,8 @@ module Cyclid
           @client_api = URI(api['client'])
         end
 
+        # URL of the signup link, if one is defined
+        @signup = manage['signup'] || nil
       rescue StandardError => ex
         abort "Failed to load configuration file #{path}: #{ex}"
       end

data/app/cyclid_ui/controllers/auth.rb

@@ -23,6 +23,7 @@ module Cyclid
       class Auth < Base
         get '/login' do
           @message = flash[:login_error]
+          @signup = Cyclid.config.signup
           mustache :login, layout: false
         end
 

data/app/cyclid_ui/controllers/organization.rb

@@ -58,6 +58,26 @@ module Cyclid
 
           mustache :job
         end
+
+        get '/:name/config' do
+          authenticate!
+
+          # Build breadcrumbs
+          name = params[:name]
+
+          @crumbs = []
+          @crumbs << { 'url' => "/#{name}", 'name' => name.capitalize }
+          @crumbs << { 'name' => 'Configuration' }
+
+          @organization = name
+          @linkback_url = "/#{name}"
+
+          api_server = Cyclid.config.client_api
+          @org_url = "#{api_server}/organizations/#{params[:name]}"
+          @current_user = current_user
+
+          mustache :config
+        end
       end
     end
   end

data/app/cyclid_ui/controllers/user.rb

@@ -32,6 +32,8 @@ module Cyclid
           @user_url = "#{@api_url}/users/#{params[:username]}"
           @current_user = current_user
 
+          @organization = current_user.organizations.first
+
           mustache :user
         end
       end

data/app/cyclid_ui/templates/config.mustache

@@ -0,0 +1,63 @@
+<div class="alert alert-danger alert-dismissible hidden" role="alert" id="config_failure">
+  <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+  <div id="error_message"></div>
+</div>
+
+<div class="container">
+
+  <div class="panel panel-default" id="config">
+    <div class="panel-heading">
+      <h3 class="panel-title"><span id="config_plugin_name" style="text-transform:capitalize;"></span></h3>
+    </div>
+
+    <div class="panel-body">
+
+      <div class="row">
+        <div class="col-md-2">
+          <ul class="list-group" id="plugin-list">
+          </ul>
+        </div>
+
+        <div class="col-md-10">
+          <div class="row">
+            <form id="config_form">
+            </form>
+          </div>
+        </div>
+      </div>
+
+    </div>
+
+  </div>
+</div>
+
+<!-- "success" modal -->
+<div class="modal fade" id="config_success_modal">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header">
+        <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+        <h4 class="modal-title">Configuration saved</h4>
+      </div>
+
+      <div class="modal-body">
+        The configuration was successfully saved.
+      </div>
+
+      <div class="modal-footer">
+        <button type="button" class="btn btn-success" data-dismiss="modal">Okay</button>
+      </div>
+    </div>
+  </div>
+</div>
+
+<script type="text/javascript" src="/js/cyclid.js"></script>
+<script type="text/javascript" src="/js/api.js"></script>
+<script type="text/javascript" src="/js/config.js"></script>
+<script>
+  var gblUsername = '{{username}}';
+  var gblOrgUrl = '{{org_url}}';
+  var url = `${gblOrgUrl}/configs`;
+
+  api_get(url, gblUsername, config_update_list, config_get_failed);
+</script>

data/app/cyclid_ui/templates/layout.mustache

@@ -51,6 +51,11 @@
               </li>
             </ul>
 
+            <ul class="nav navbar-nav">
+              <li><a href="/{{organization}}">Jobs</a></li>
+              <li><a href="/{{organization}}/config">Configuration</a></li>
+            </ul>
+
             <ul class="nav navbar-nav navbar-right">
               <li class="dropdown">
                 <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">{{username}}&nbsp;<span class="caret"></span></a>

data/app/cyclid_ui/templates/login.mustache

@@ -51,6 +51,9 @@
                 <input type="password" class="form-control" name="password" placeholder="Password">
               </div>
               <input type="submit" class="btn btn-default" value="Login">
+              {{#signup}}
+              <small><a class="btn btn-sm" style="float:right;" href="{{signup}}">Don't have an account? Create one now.</a></small>
+              {{/signup}}
             </form>
           </div>
         </div>

data/app/cyclid_ui/views/config.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+# Copyright 2016 Liqwyd Ltd.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+module Cyclid
+  module UI
+    module Views
+      # Plugin config view
+      class Config < Layout
+        attr_reader :org_url
+      end
+    end
+  end
+end

data/app/cyclid_ui/views/login.rb

@@ -18,7 +18,11 @@ module Cyclid
     module Views
       # Login view. This is a non-Layout view.
       class Login < Mustache
-        attr_reader :message
+        attr_reader :message, :signup
+
+        def title
+          @title || 'Cyclid'
+        end
       end
     end
   end

data/lib/cyclid_ui/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 module Cyclid
   module UI
-    VERSION = '0.1.1'
+    VERSION = '0.2.0'
   end
 end

data/public/js/api.js

@@ -21,6 +21,7 @@ function api_put(url, data, username, success, error) {
     type: 'PUT',
     url: encodeURI(url),
     data: JSON.stringify(data),
+    dataType: 'text',
     contentType: 'application/json',
     crossDomain: true,
     beforeSend: function(xhr) {

data/public/js/config.js

@@ -0,0 +1,183 @@
+/* Submit the current configuration data to the API */
+function config_save(){
+  console.log('saving config...');
+
+  event.preventDefault();
+
+  var form_elements = new Array();
+  $('#config_form :input').each(
+    function(){
+      form_elements.push($(this));
+    }
+  );
+
+  var length = form_elements.length;
+  var config_data = new Object();
+  for(var i=0; i < length; i++){
+    var input = form_elements[i];
+    console.log(input);
+
+    if(input.attr('type') == 'text' || input.attr('type') == 'password') {
+      var name = input.attr('name');
+      var value = input.val();
+      var config_value = value == '' ? null : value;
+
+      console.log(`${name}=${config_value}`);
+      config_data[name] = config_value;
+    } 
+  }
+  console.log(`configuration is ${JSON.stringify(config_data)}`);
+
+  /* Write the configuration data to the API */
+  var plugin_name = $('#config_form').data('plugin_name');
+  var plugin_type = $('#config_form').data('plugin_type');
+
+  var url = `${gblOrgUrl}/configs/${plugin_type}/${plugin_name}`;
+  api_put(url, config_data, gblUsername, config_set_success, config_set_failed);
+}
+
+/* Add a "string" schema element to the configuration data form */
+function config_append_string(elem, schema, config){
+  var default_data = schema.default == null ? '' : schema.default;
+  var config_data = config == undefined ? default_data : config;
+  var row = `<div class="form-group"><label for="${schema.name}">${schema.description}</label><input type="text" class="form-control" name="${schema.name}" value="${config_data}"></div>`
+
+  elem.append(row);
+}
+
+/* Add a "password" schema element to the configuration data form */
+function config_append_password(elem, schema, config){
+  var default_data = schema.default == null ? '' : schema.default;
+  var config_data = config == undefined ? default_data : config;
+  var row = `<div class="form-group"><label for="${schema.name}">${schema.description}</label><input type="password" class="form-control" name="${schema.name}" value="${config_data}"></div>`
+
+  elem.append(row);
+}
+
+/* Add a button as a link to a URL to the configuration data form */
+function config_append_link(elem, schema, url){
+  var row = `<div class="form-group"><a href="${url}" id="${schema.name}" class="btn btn-default" role="button">${schema.description}</a></div>`
+
+  elem.append(row);
+}
+
+/* Add a "link-relative" (I.e. a link relative to the plugin API) schema element to the configuration data form */
+function config_append_link_relative(elem, schema, config){
+  var plugin_name = $('#config_form').data('plugin_name');
+  var url = `${gblOrgUrl}/plugins/${plugin_name}${schema.default}`;
+
+  config_append_link(elem, schema, url);
+}
+
+/* Add a "link-absolute" (I.e. a link to a fully qualified URL) schema element to the configuration data form */
+function config_append_link_absolute(elem, schema, config){
+  config_append_link(elem, schema, config);
+}
+
+function config_update_plugin(data) {
+  console.log(JSON.stringify(data));
+
+  var schema = data.schema;
+  var config = data.config;
+  var form = $('#config_form');
+
+  /* Clear any existing form elements */
+  form.empty();
+
+  /* Walk the schema and insert each element */
+  var length = schema.length;
+  for(var i=0; i < length; i++){
+    var item_schema = schema[i];
+    var item_config = config[item_schema.name];
+
+    switch(item_schema.type){
+      case 'string': {
+        console.log(`${item_schema.name} is a string`);
+        config_append_string(form, item_schema, item_config);
+        break;
+      }
+      case 'password': {
+        console.log(`${item_schema.name} is a password`);
+        config_append_password(form, item_schema, item_config);
+        break;
+      }
+      case 'integer': {
+        console.log(`${item_schema.name} is an integer`);
+        config_append_string(form, item_schema, item_config);
+        break;
+      }
+      case 'hash-list': {
+        console.log(`${item_schema.name} is a hash-list`);
+        break;
+      }
+      case 'link-relative': {
+        console.log(`${item_schema.name} is a link-relative`);
+        config_append_link_relative(form, item_schema, item_config);
+        break;
+      }
+      default: {
+        console.log(`don't know what ${item_schema.name} is`);
+        break;
+      }
+    }
+  }
+
+  /* Add the "Save" button */
+  form.append('<input type="submit" class="btn btn-primary" onclick="config_save()" value="Save">');
+}
+
+function config_select(plugin_type, plugin_name) {
+  console.log(`select ${plugin_type}/${plugin_name}`);
+
+  var form = $('#config_form');
+  form.data('plugin_type', plugin_type);
+  form.data('plugin_name', plugin_name);
+
+  $('#config_plugin_name').html(plugin_name)
+
+  var url = `${gblOrgUrl}/configs/${plugin_type}/${plugin_name}`;
+  api_get(url, gblUsername, config_update_plugin, config_get_failed);
+}
+
+function config_show_failure(failure_message){
+  $('#config_failure > #error_message').html(failure_message);
+  $('#config_failure').removeClass('hidden');
+}
+
+function config_get_failed(xhr) {
+  var failure_message = `<p>
+                           <h2>Failed to retrieve configuration data</h2><br>
+                           <strong>${xhr.status}:</strong> ${xhr.responseText}
+                         </p>`
+  config_show_failure(failure_message);
+}
+
+function config_set_failed(xhr) {
+  var failure_message = `<p>
+                           <h2>Failed to save configuration data</h2><br>
+                           <strong>${xhr.status}:</strong> ${xhr.responseText}
+                         </p>`
+  config_show_failure(failure_message);
+}
+
+function config_set_success(xhr){
+  $('#config_success_modal').modal();
+}
+
+function config_update_list(data) {
+  console.log(JSON.stringify(data));
+
+  var length = data.length;
+  for(var i=0; i < length; i++ ){
+    var plugin = data[i];
+    var type = plugin.type
+    var name = plugin.name
+
+    var item = `<a href="#" class="list-group-item list-group-item-action" style="text-transform:capitalize;" onclick="config_select('${type}', '${name}')">${name}</a>`
+    $('#plugin-list').append(item);
+  }
+
+  // Select the first item in the list
+  plugin = data[0];
+  config_select(plugin.type, plugin.name);
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cyclid-ui
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Kristian Van Der Vliet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-05 00:00:00.000000000 Z
+date: 2016-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: require_all
@@ -212,6 +212,7 @@ files:
 - app/cyclid_ui/helpers.rb
 - app/cyclid_ui/memcache.rb
 - app/cyclid_ui/models/user.rb
+- app/cyclid_ui/templates/config.mustache
 - app/cyclid_ui/templates/footer.mustache
 - app/cyclid_ui/templates/job.mustache
 - app/cyclid_ui/templates/job_info.mustache
@@ -219,6 +220,7 @@ files:
 - app/cyclid_ui/templates/login.mustache
 - app/cyclid_ui/templates/organization.mustache
 - app/cyclid_ui/templates/user.mustache
+- app/cyclid_ui/views/config.rb
 - app/cyclid_ui/views/job.rb
 - app/cyclid_ui/views/layout.rb
 - app/cyclid_ui/views/login.rb
@@ -235,6 +237,7 @@ files:
 - public/images/favicon64.png
 - public/images/favicon96.png
 - public/js/api.js
+- public/js/config.js
 - public/js/cyclid.js
 - public/js/job.js
 - public/js/organization.js