mno-enterprise-api 3.3.1 → 3.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 59481a633a5a28ae2dd38005cdb551b228c5b5bf
-  data.tar.gz: 76d54cd45bca2dffce920a50202d31688509389e
+  metadata.gz: 846a1b37e09b4377d95942c2a767e6940b6accf9
+  data.tar.gz: 523280be7a240646691ccacb1b9da059154ac75c
 SHA512:
-  metadata.gz: dc8fe919ad098561ade8eed41579e5395d89d88bc84187f5d1b582b333bd2142d8f8f1995032a356caa5017b0f63b2c652698a4d687ba2411961c212936a5461
-  data.tar.gz: bf5fc80d57d306d94a89444444af57687f8e7ff870817c8a530e27fd3388032efc253be7c3a7c15f021ee9eb2e621b7f401d248ce730164c8dc14a97640da2c6
+  metadata.gz: 6f52fd948f00c51ea0d3b450864ee3ca443fc3f57f82c45b93994b5be7a1ee9e91fdfc0e91c93aa589225f156a26bb28b3037707f10a279a4a8db79b273cabd7
+  data.tar.gz: 57243387693928174a98c694054fbfdbd4e788101656800674a4297b4556c3a9cfd4ede660bd0d5323c65b0b0968cefb95d68f5ec338392dea89cde4b4f1c8e0

data/app/assets/javascripts/mno_enterprise/config.js.coffee.erb

@@ -24,3 +24,4 @@ angular.module('mnoEnterprise.configuration', [])
   .constant('INTERCOM_ID', <%= MnoEnterprise.intercom_app_id.to_json %>)
   .constant('APP_NAME', <%= MnoEnterprise.app_name.to_json %>)
   .constant('URL_CONFIG', <%= Hash(Settings.url_config).to_json %>)
+  .constant('DEVISE_CONFIG', <%= Hash(Settings.devise).to_json %>)

data/app/controllers/mno_enterprise/impersonate_controller.rb

@@ -11,7 +11,11 @@ module MnoEnterprise
       session[:impersonator_redirect_path] = params[:redirect_path].presence
       @user = MnoEnterprise::User.find(params[:user_id])
       if @user.present?
-        impersonate(@user)
+        if @user.admin_role.present?
+          flash[:notice] = 'User is a staff member'
+        else
+          impersonate(@user)
+        end
       else
         flash[:notice] = "User doesn't exist"
       end

data/app/controllers/mno_enterprise/jpi/v1/admin/impac/dashboard_templates_controller.rb

@@ -0,0 +1,93 @@
+module MnoEnterprise
+  class Jpi::V1::Admin::Impac::DashboardTemplatesController < Jpi::V1::Admin::BaseResourceController
+
+    #==================================================================
+    # Instance methods
+    #==================================================================
+    # GET /mnoe/jpi/v1/admin/impac/dashboard_templates
+    def index
+      if params[:terms]
+        # For search mode
+        @dashboard_templates = []
+        JSON.parse(params[:terms]).map { |t| @dashboard_templates = @dashboard_templates | dashboard_templates.where(Hash[*t]) }
+        response.headers['X-Total-Count'] = @dashboards_templates.count
+      else
+        @dashboard_templates = dashboard_templates
+        @dashboard_templates = @dashboard_templates.limit(params[:limit]) if params[:limit]
+        @dashboard_templates = @dashboard_templates.skip(params[:offset]) if params[:offset]
+        @dashboard_templates = @dashboard_templates.order_by(params[:order_by]) if params[:order_by]
+        @dashboard_templates = @dashboard_templates.where(params[:where]) if params[:where]
+        @dashboard_templates = @dashboard_templates.all.fetch
+        response.headers['X-Total-Count'] = @dashboard_templates.metadata[:pagination][:count]
+      end
+    end
+
+    # GET /mnoe/jpi/v1/admin/impac/dashboard_templates/1
+    def show
+      render json: { errors: { message: 'Dashboard template not found' } }, status: :not_found unless dashboard_template.present?
+    end
+
+    # POST /mnoe/jpi/v1/admin/impac/dashboard_templates
+    def create
+      @dashboard_template = MnoEnterprise::Impac::Dashboard.new(dashboard_template_params.merge(dashboard_type: 'template'))
+
+      # Abort on failure
+      unless @dashboard_template.save
+        return render json: { errors: dashboard_template.errors }, status: :bad_request
+      end
+        
+      MnoEnterprise::EventLogger.info('dashboard_template_create', current_user.id, 'Dashboard Template Creation', dashboard_template)
+      render 'show'
+    end
+
+    # PATCH/PUT /mnoe/jpi/v1/admin/impac/dashboard_templates/1
+    def update
+      return render json: { errors: { message: 'Dashboard template not found' } }, status: :not_found unless dashboard_template
+
+      # Abort on failure
+      unless dashboard_template.update(dashboard_template_params)
+        return render json: { errors: dashboard_template.errors }, status: :bad_request
+      end
+
+      MnoEnterprise::EventLogger.info('dashboard_template_update', current_user.id, 'Dashboard Template Update', dashboard_template)
+      render 'show'
+    end
+
+    # DELETE /mnoe/jpi/v1/admin/impac/dashboard_templates/1
+    def destroy
+      return render json: { errors: { message: 'Dashboard template not found' } }, status: :not_found unless dashboard_template
+
+      # Abort on failure
+      unless dashboard_template.destroy
+        return render json: { errors: 'Cannot destroy dashboard template' }, status: :bad_request
+      end
+
+      MnoEnterprise::EventLogger.info('dashboard_template_delete', current_user.id, 'Dashboard Template Deletion', dashboard_template)
+      head status: :ok
+    end
+
+    private
+
+    def dashboard_templates
+      @dashboard_templates ||= MnoEnterprise::Impac::Dashboard.templates
+    end
+
+    def dashboard_template
+      @dashboard_template ||= dashboard_templates.find(params[:id].to_i)
+    end
+
+    def whitelisted_params
+      [:name, :currency, { widgets_order: [] }, { organization_ids: [] }, :published]
+    end
+
+    # Allows all metadata attrs to be permitted, and maps it to :settings
+    # for the Her "meta_data" issue.
+    def dashboard_template_params
+      params.require(:dashboard).permit(*whitelisted_params).tap do |whitelisted|
+        whitelisted[:settings] = params[:dashboard][:metadata] || {}
+      end
+      .except(:metadata)
+    end
+  end
+end
+

data/app/controllers/mno_enterprise/jpi/v1/admin/impac/kpis_controller.rb

@@ -0,0 +1,71 @@
+module MnoEnterprise
+  # From the Admin panel, an admin can create/update/delete kpis to/from a dashboard template
+  class Jpi::V1::Admin::Impac::KpisController < Jpi::V1::Admin::BaseResourceController
+    before_filter :find_valid_kpi, only: [:update, :delete]
+
+    # POST /mnoe/jpi/v1/admin/impac/dashboard_templates/:id/kpis
+    def create
+      return render json: { errors: { message: 'Dashboard template not found' } }, status: :not_found unless template.present?
+
+      @kpi = template.kpis.create(kpi_create_params)
+      return render json: { errors: (@kpi && @kpi.errors).to_a }, status: :bad_request unless @kpi.present? && @kpi.valid?
+
+      MnoEnterprise::EventLogger.info('kpi_create', current_user.id, 'Template KPI Creation', @kpi)
+      @no_content = true
+      render 'show'
+    end
+
+    # PUT /mnoe/jpi/v1/admin/impac/kpis/:id
+    def update
+      unless kpi.present? && kpi.update(kpi_update_params)
+        return render json: { errors: 'Cannot update kpi' }, status: :bad_request
+      end
+
+      MnoEnterprise::EventLogger.info('kpi_update', current_user.id, 'Template KPI Update', kpi)
+      @nocontent = !params['metadata']
+      render 'show'
+    end
+
+    # DELETE /mnoe/jpi/v1/admin/impac/kpis/:id
+    def destroy
+      unless kpi.present? && kpi.destroy
+        return render json: { errors: 'Cannot delete kpi' }, status: :bad_request
+      end
+
+      MnoEnterprise::EventLogger.info('kpi_delete', current_user.id, 'Template KPI Deletion', kpi)
+      head status: :ok
+    end
+
+    private
+
+    def template
+      MnoEnterprise::Impac::Dashboard.templates.find(params[:dashboard_template_id].to_i)
+    end
+
+    def kpi
+      @kpi ||= MnoEnterprise::Impac::Kpi.find(params[:id].to_i)
+    end
+
+    def kpi_create_params
+      whitelist = [:dashboard_id, :widget_id, :endpoint, :source, :element_watched, { extra_watchables: [] }]
+      extract_params(whitelist)
+    end
+
+    def kpi_update_params
+      whitelist = [:element_watched, {extra_watchables: []}]
+      extract_params(whitelist)
+    end
+
+    def extract_params(whitelist)
+      (p = params).require(:kpi).permit(*whitelist).tap do |whitelisted|
+        whitelisted[:settings] = p[:kpi][:metadata] || {}
+        # TODO: strong params for targets & extra_params attributes (keys will depend on the kpi).
+        whitelisted[:targets] = p[:kpi][:targets] if p[:kpi][:targets].present?
+        whitelisted[:extra_params] = p[:kpi][:extra_params] if p[:kpi][:extra_params].present?
+      end
+      .except(:metadata)
+    end
+
+    alias :find_valid_kpi  :kpi
+  end
+end

data/app/controllers/mno_enterprise/jpi/v1/admin/impac/widgets_controller.rb

@@ -0,0 +1,70 @@
+module MnoEnterprise
+  # From the Admin panel, an admin can:
+  # - add widgets to template dashboards (passing the dashboard template id)
+  # - update any widget (passing its id)
+  # - delete any widget (passing its id)
+  class Jpi::V1::Admin::Impac::WidgetsController < Jpi::V1::Admin::BaseResourceController
+
+    # POST /mnoe/jpi/v1/admin/impac/dashboard_templates/:id/widgets
+    def create
+      return render json: { errors: { message: 'Dashboard template not found' } }, status: :not_found unless template.present?
+
+      @widget = template.widgets.create(widget_create_params)
+      return render json: { errors: (widget && widget.errors).to_a }, status: :bad_request unless widget.present? && widget.valid?
+
+      MnoEnterprise::EventLogger.info('widget_create', current_user.id, 'Template Widget Creation', widget)
+      @no_content = true
+      render 'show'
+    end
+
+    # PUT /mnoe/jpi/v1/admin/impac/widgets/:id
+    def update
+      unless widget.present? && widget.update(widget_update_params)
+        return render json: { errors: 'Cannot update widget' }, status: :bad_request
+      end
+
+      MnoEnterprise::EventLogger.info('widget_update', current_user.id, 'Template Widget Update', widget)
+      @nocontent = !params['metadata']
+      render 'show'
+    end
+
+    # DELETE /mnoe/jpi/v1/admin/impac/widgets/:id
+    def destroy
+      unless widget.present? && widget.destroy
+        return render json: { errors: 'Cannot delete widget' }, status: :bad_request
+      end
+
+      MnoEnterprise::EventLogger.info('widget_delete', current_user.id, 'Template Widget Deletion', widget)
+      head status: :ok
+    end
+
+    private
+
+    def template
+      MnoEnterprise::Impac::Dashboard.templates.find(params[:dashboard_template_id].to_i)
+    end
+
+    def widget
+      @widget ||= MnoEnterprise::Impac::Widget.find(params[:id].to_i)
+    end
+
+    def widget_create_params
+      params.require(:widget).permit(:endpoint, :name, :width).tap do |whitelisted|
+        whitelisted[:settings] = params[:widget][:metadata] || {}
+        # TODO: remove when all deployed versions of Impac! Angular will be above v1.5.0
+        # When this is done:
+        # - :widget_category can definitively be renamed to :endpoint in mnohub and mnoe
+        # - the widget templates can be completely removed from mnohub and mnoe
+        whitelisted[:widget_category] = params[:widget][:endpoint]
+      end
+      .except(:metadata)
+    end
+
+    def widget_update_params
+      params.require(:widget).permit(:name, :width).tap do |whitelisted|
+        whitelisted[:settings] = params[:widget][:metadata] || {}
+      end
+      .except(:metadata)
+    end
+  end
+end

data/app/controllers/mno_enterprise/jpi/v1/impac/dashboard_templates_controller.rb

@@ -0,0 +1,5 @@
+module MnoEnterprise
+  class Jpi::V1::Impac::DashboardTemplatesController < Jpi::V1::BaseResourceController
+    include MnoEnterprise::Concerns::Controllers::Jpi::V1::Impac::DashboardTemplatesController
+  end
+end

data/app/views/mno_enterprise/auth/confirmations/_form.html.haml

@@ -1,4 +1,4 @@
-%div{ 'ng-init' => "user = { $pwdScore: {}, name: '#{resource.name}', surname: '#{resource.surname}', phone: '#{resource.phone}' }" }
+%div{ 'ng-init' => "user = { $pwdScore: {}, name: '#{resource.name}', surname: '#{resource.surname}', phone: '#{resource.phone}'}" }
 
 = form_for(resource, as: resource_name, :url => mno_enterprise.user_confirmation_finalize_path, :html => { 'name' => 'loginForm', :class => 'autofill-detect text-center' }) do |f|
 
@@ -39,6 +39,15 @@
 
   = f.hidden_field :confirmation_token, value: @confirmation_token
 
+  - unless @user[:meta_data][:tos_accepted_at]
+    %br
+    .row
+      .col-sm-12
+        .checkbox-section.text-center
+          = check_box_tag 'tos', 'accept', false, required: true, style: "margin-top: -3px;", 'ng-model' => 'acceptTos'
+          %label{for: 'tos'}= t('mno_enterprise.auth.registrations.new.user_accept')
+          = link_to t('mno_enterprise.auth.registrations.new.tos'), MnoEnterprise.router.terms_url, target: '_blank'
+
   %br/
   %div
     %button{ :class => "btn btn-warning btn-login", :type => "submit", 'ng-click' => 'hasClicked = true', 'ng-disabled' => 'loginForm.$invalid', 'ng-hide' => 'hasClicked' }= t('mno_enterprise.auth.confirmations.show.confirm')

data/app/views/mno_enterprise/jpi/v1/admin/base_resource/_member.json.jbuilder

@@ -2,6 +2,7 @@ if member.is_a?(MnoEnterprise::User)
   json.uid member.uid
   json.entity 'User'
   json.role member.role(organization) if organization
+  json.admin_role member.admin_role
 
   status = case
            when member.confirmed? then 'active'

data/app/views/mno_enterprise/jpi/v1/admin/impac/dashboard_templates/_template.json.jbuilder

@@ -0,0 +1,16 @@
+json.extract! template, :id, :name, :full_name, :currency
+
+json.metadata template.settings
+
+json.data_sources template.organizations(current_user.organizations).compact.map do |org|
+  json.id org.id
+  json.uid org.uid
+  json.label org.name
+end
+
+json.kpis template.kpis, partial: 'mno_enterprise/jpi/v1/admin/impac/kpis/kpi', as: :kpi
+json.widgets template.widgets, partial: 'mno_enterprise/jpi/v1/admin/impac/widgets/widget', as: :widget
+
+json.created_at template.created_at
+json.updated_at template.updated_at
+json.published template.published

data/app/views/mno_enterprise/jpi/v1/admin/impac/dashboard_templates/index.json.jbuilder

@@ -0,0 +1 @@
+json.array! @dashboard_templates, partial: 'template', as: :template

data/app/views/mno_enterprise/jpi/v1/admin/impac/dashboard_templates/show.json.jbuilder

@@ -0,0 +1 @@
+json.partial! 'template', template: @dashboard_template

data/app/views/mno_enterprise/jpi/v1/admin/impac/kpis/_kpi.json.jbuilder

@@ -0,0 +1,2 @@
+json.ignore_nil!
+json.extract! kpi, :id, :element_watched, :endpoint, :source, :targets, :settings, :extra_watchables, :extra_params

data/app/views/mno_enterprise/jpi/v1/admin/impac/kpis/show.json.jbuilder

@@ -0,0 +1 @@
+json.partial! 'kpi', kpi: @kpi

data/app/views/mno_enterprise/jpi/v1/admin/impac/widgets/_widget.json.jbuilder

@@ -0,0 +1,7 @@
+json.id widget.id
+json.name widget.name
+json.endpoint (widget.endpoint || widget.widget_category)
+json.width widget.width
+json.metadata widget.settings
+
+json.kpis widget.kpis, partial: 'mno_enterprise/jpi/v1/admin/impac/kpis/kpi', as: :kpi

data/app/views/mno_enterprise/jpi/v1/admin/impac/widgets/show.json.jbuilder

@@ -0,0 +1 @@
+json.partial! 'widget', widget: @widget

data/app/views/mno_enterprise/jpi/v1/app_feedbacks/_resource.json.jbuilder

@@ -2,6 +2,7 @@ json.partial! 'app_review', app_review: app_feedback
 
 json.comments do
   json.array! app_feedback[:comments] do |app_comment|
+    next if app_comment['status'] == 'rejected'
     json.partial! 'comment', app_comment: app_comment
   end
 end

data/app/views/mno_enterprise/jpi/v1/app_questions/_resource.json.jbuilder

@@ -2,6 +2,7 @@ json.partial! 'app_review', app_review: app_question, show_rating: false
 
 json.answers do
   json.array! app_question[:answers] do |app_answer|
+    next if app_answer['status'] == 'rejected'
     json.partial! 'answer', app_answer: app_answer
   end
 end

data/app/views/mno_enterprise/jpi/v1/current_users/show.json.jbuilder

@@ -18,6 +18,7 @@ json.cache! ['v1', @user.cache_key] do
     json.avatar_url avatar_url(@user)
     if current_impersonator
       json.current_impersonator true
+      json.current_impersonator_role current_impersonator.admin_role
     end
 
     if @user.respond_to?(:intercom_user_hash)

data/app/views/mno_enterprise/jpi/v1/impac/dashboard_templates/index.json.jbuilder

@@ -0,0 +1 @@
+json.array! @templates, partial: 'mno_enterprise/jpi/v1/impac/dashboards/dashboard', as: :dashboard

data/app/views/mno_enterprise/jpi/v1/impac/kpis/_kpi.json.jbuilder

@@ -1,4 +1,4 @@
 json.ignore_nil!
 json.extract! kpi, :id, :element_watched, :endpoint, :source, :targets, :settings, :extra_watchables, :extra_params
 
-json.alerts kpi.alerts, partial: 'mno_enterprise/jpi/v1/impac/alerts/alert', as: :alert if kpi.alerts.any?
+json.alerts kpi.alerts, partial: 'mno_enterprise/jpi/v1/impac/alerts/alert', as: :alert if kpi.alerts.to_a.any?

data/app/views/mno_enterprise/pages/loading.html.erb

@@ -4,7 +4,7 @@
     <div class="spacer3 hidden-xs hidden-sm"></div>
     <input type="hidden" ng-model="appInstance">
     <div class='align-center'>
-      <%= image_tag 'mno_enterprise/main-logo.png' %>
+      <%= image_tag(main_logo_white_bg_path) %>
 
       <div class="spacer2"></div>
 

data/config/routes.rb

@@ -145,6 +145,8 @@ MnoEnterprise::Engine.routes.draw do
       end
 
       namespace :impac do
+        post 'dashboards/:id/copy', to: 'dashboards#copy'
+
         resources :dashboards, only: [:index, :show, :create, :update, :destroy] do
           resources :widgets, shallow: true, only: [:create, :update, :destroy]
           resources :kpis, shallow: true, only: [:show, :create, :update, :destroy] do
@@ -158,6 +160,8 @@ MnoEnterprise::Engine.routes.draw do
         resources :organizations, only: [] do
           resources :widgets, only: :index
         end
+
+        resources :dashboard_templates, only: :index
       end
 
 
@@ -211,6 +215,14 @@ MnoEnterprise::Engine.routes.draw do
         post 'theme/save'
         post 'theme/reset'
         put 'theme/logo'
+
+        # Dashboard templates designer
+        namespace :impac do
+          resources :dashboard_templates, only: [:index, :show, :destroy, :update, :create] do
+            resources :widgets, shallow: true, only: [:create, :update, :destroy]
+            resources :kpis, shallow: true, only: [:create, :update, :destroy]
+          end
+        end
       end
     end
   end

data/lib/mno_enterprise/concerns/controllers/jpi/v1/impac/dashboard_templates_controller.rb

@@ -0,0 +1,20 @@
+module MnoEnterprise::Concerns::Controllers::Jpi::V1::Impac::DashboardTemplatesController
+  extend ActiveSupport::Concern
+
+  #==================================================================
+  # Included methods
+  #==================================================================
+  # 'included do' causes the included code to be evaluated in the
+  # context where it is included rather than being executed in the module's context
+  included do
+    respond_to :json
+  end
+
+  #==================================================================
+  # Instance methods
+  #==================================================================
+  # GET /mnoe/jpi/v1/impac/dashboard_templates
+  def index
+    @templates = MnoEnterprise::Impac::Dashboard.published_templates
+  end
+end