mno-enterprise-core 2.0.9 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 748a400cbedca5730ebe83903f295b1461174db1
-  data.tar.gz: 45866c6a9f5ca4773d38b5ffeb2820bbc75c858d
+  metadata.gz: dfe546808d905e473abc105da4fbe5234f124896
+  data.tar.gz: 7e8dd015d9a5b54ee9ba1fce03695f7a67af9702
 SHA512:
-  metadata.gz: 8c46b8cd5303418e5b5f38dc8fd42828308395221dacb39482c81034d788deb690d37a764f93c529bbfba85ab38a41e1ec5005329f0768c0ff98a08a61f059fb
-  data.tar.gz: 6b3bc383d8335d22e52e62161ac597edf029363a03e7d6f5a3a141cbf73dd66f4d3be9297b91234dfeb073ee43ac238fd0a6f7dab3fd1ef526eb43fc50582f1a
+  metadata.gz: 5e36dd230d6124d058ee0f1cee11c5557df773693728292d401698d833f4332b242a8eab68e5f1ef4c6d4e60bcaf994e5697381cf9279d4eac1efcda4d91fb3e
+  data.tar.gz: 8ffb8ac19763e88b91288a3aeb665a12d38e6eaffbcc45b63bf97a99f151283649823df6909b7d42a4412323abf6680813fc704cfc585b01b0d8eacbc4b99d98

data/app/controllers/mno_enterprise/application_controller.rb

@@ -8,6 +8,12 @@ module MnoEnterprise
     before_filter :store_location
     before_filter :perform_return_to
 
+
+    # I18n
+    if MnoEnterprise.i18n_enabled
+      include MnoEnterprise::Concerns::Controllers::I18n
+    end
+
     # Angular CSRF
     if MnoEnterprise.include_angular_csrf
       include MnoEnterprise::Concerns::Controllers::AngularCSRF
@@ -92,41 +98,25 @@ module MnoEnterprise
     # Redirect to previous url and reset it
     def after_sign_in_path_for(resource)
       previous_url = session.delete(:previous_url)
-      url = mno_enterprise.respond_to?(:myspace_url) ? mno_enterprise.myspace_url : main_app.root_url
+      url = MnoEnterprise.router.dashboard_path || main_app.root_url
       return (return_to_url(resource) || previous_url || url)
     end
 
     # Some controllers needs to redirect to 'MySpace' which breaks if you dont use mnoe-frontend
-    # Rather than relying on the MainApp to define myspace_path we check it here
+    # Rather than relying on the MainApp to define dashboard_path we check it here
     # The MainApp can redefine this two methods to fit its structure
     # Some of these are extracted to individuals methods like after_provision_path.
     def mnoe_home_path
-      mno_enterprise.respond_to?(:myspace_path) ? mno_enterprise.myspace_path : main_app.root_path
+      MnoEnterprise.router.dashboard_path || main_app.root_path
     end
 
     def mnoe_home_url
-      mno_enterprise.respond_to?(:myspace_url) ? mno_enterprise.myspace_url : main_app.root_url
+      MnoEnterprise.router.dashboard_path || main_app.root_url
     end
 
     # Overwriting the sign_out redirect path method
     def after_sign_out_path_for(resource_or_scope)
       MnoEnterprise.router.after_sign_out_url || super
     end
-
-    private
-
-    # Append params to the fragment part of an existing url String
-    #   add_param("/#/platform/accounts", 'foo', 'bar')
-    #     => "/#/platform/accounts?foo=bar"
-    #   add_param("/#/platform/dashboard/he/43?en=690", 'foo', 'bar')
-    #     => "/#/platform/dashboard/he/43?en=690&foo=bar"
-    def add_param_to_fragment(url, param_name, param_value)
-      uri = URI(url)
-      fragment = URI(uri.fragment || "")
-      params = URI.decode_www_form(fragment.query || "") << [param_name, param_value]
-      fragment.query = URI.encode_www_form(params)
-      uri.fragment = fragment.to_s
-      uri.to_s
-    end
   end
 end

data/app/models/mno_enterprise/base_resource.rb

@@ -142,8 +142,7 @@ module MnoEnterprise
       if perform_validations(options)
         ret = super()
         process_response_errors
-        raise_record_invalid if self.errors.any?
-        ret
+        raise_record_invalid
       else
         false
       end

data/app/models/mno_enterprise/impac/dashboard.rb

@@ -3,29 +3,31 @@ module MnoEnterprise
 
     attributes :name, :widgets_order, :organization_ids, :widgets_templates, :currency
 
-    has_many :widgets, class_name: 'MnoEnterprise::Impac::Widget', dependent: :destroy
-    has_many :kpis, class_name: 'MnoEnterprise::Impac::Kpi', dependent: :destroy
-    belongs_to :owner, polymorphic: true
+	  has_many :widgets, class_name: 'MnoEnterprise::Impac::Widget', dependent: :destroy
+	  has_many :kpis, class_name: 'MnoEnterprise::Impac::Kpi', dependent: :destroy
+	  belongs_to :owner, polymorphic: true
+	  
+	  #============================================
+	  # Instance methods
+	  #============================================
+	  # Return the full name of this dashboard
+	  # Currently a simple accessor to the dashboard name (used to include the company name)
+	  def full_name
+	    self.name
+	  end
+	  
+	  # Return all the organizations linked to this dashboard and to which
+	  # the user has access
+	  def organizations
+	  	self.organization_ids.map do |uid|
+	    	MnoEnterprise::Organization.find_by(uid: uid)
+	  	end
+	  end
 
-    #============================================
-    # Instance methods
-    #============================================
-    # Return the full name of this dashboard
-    # Currently a simple accessor to the dashboard name (used to include the company name)
-    def full_name
-      self.name
-    end
-
-    # Return all the organizations linked to this dashboard and to which
-    # the user has access
-    def organizations
-      MnoEnterprise::Organization.where('uid.in' => self.organization_ids).to_a
-    end
-
-    def sorted_widgets
-      order = self.widgets_order.map(&:to_i) | self.widgets.map{|w| w.id }
-      order.map { |id| self.widgets.to_a.find{ |w| w.id == id} }.compact
-    end
+	  def sorted_widgets
+	    order = self.widgets_order.map(&:to_i) | self.widgets.map{|w| w.id }
+	    order.map { |id| self.widgets.to_a.find{ |w| w.id == id} }.compact
+	  end
 
     def to_audit_event
       name

data/app/models/mno_enterprise/impac/kpi.rb

@@ -1,7 +1,7 @@
 module MnoEnterprise
   class Impac::Kpi < BaseResource
 
-    attributes :settings, :targets, :extra_params, :endpoint, :source, :element_watched
+    attributes :name, :settings, :targets, :extra_params, :endpoint, :source, :element_watched
 
     belongs_to :dashboard, class_name: 'MnoEnterprise::Impac::Dashboard'
     

data/app/models/mno_enterprise/impac/widget.rb

@@ -1,7 +1,7 @@
 module MnoEnterprise
   class Impac::Widget < BaseResource
 
-    attributes :name, :width, :widget_category, :settings
+  	attributes :name, :width, :widget_category, :settings
 
     belongs_to :dashboard, class_name: 'MnoEnterprise::Impac::Dashboard'
 

data/app/models/mno_enterprise/user.rb

@@ -47,7 +47,7 @@ module MnoEnterprise
       :remember_created_at, :sign_in_count, :current_sign_in_at, :last_sign_in_at, :current_sign_in_ip, 
       :last_sign_in_ip, :confirmation_token, :confirmed_at, :confirmation_sent_at, :unconfirmed_email, 
       :failed_attempts, :unlock_token, :locked_at, :name, :surname, :company, :phone, :phone_country_code, 
-      :geo_country_code, :geo_state_code, :geo_city, :website, :orga_on_create, :sso_session, :current_password_required, :admin_role
+      :geo_country_code, :geo_state_code, :geo_city, :website, :orga_on_create, :sso_session, :current_password_required
     
     define_model_callbacks :validation #required by Devise
     devise :remote_authenticatable, :registerable, :recoverable, :rememberable,
@@ -56,6 +56,7 @@ module MnoEnterprise
     #================================
     # Validation
     #================================
+    validates_uniqueness_of :email, allow_blank: true, if: :email_changed?
 
     if Devise.password_regex
       validates :password, format: { with: Devise.password_regex, message: Devise.password_regex_message }, if: :password_required?

data/config/initializers/audit_log.rb

@@ -1,3 +1,5 @@
+# Somehow the whole config/ folder is loaded twice
+# To investigate
 unless defined? AUDIT_LOG_CONFIG
   AUDIT_LOG_CONFIG = Rails.application.config_for('audit_log') rescue {}
 end

data/config/initializers/config.rb

@@ -0,0 +1,3 @@
+Config.setup do |config|
+  config.const_name = "Settings"
+end

data/config/locales/models/app/en.yml

@@ -0,0 +1,25 @@
+en:
+  activemodel:
+    models:
+      mno_enterprise/app: App
+    attributes:
+      mno_enterprise/app:
+        categories: Categories
+        created_at: Created at
+        description: Description
+        id: Id
+        key_benefits: Key benefits
+        key_features: Key features
+        logo: Logo
+        name: Name
+        nid: Nid
+        pictures: Pictures
+        popup_description: Popup description
+        slug: Slug
+        stack: Stack
+        terms_url: Link to terms of use
+        testimonials: Testimonials
+        tiny_description: Short description
+        updated_at: Updated at
+        website: Website
+        worldwide_usage: Worldwide usage

data/config/locales/models/app/id.yml

@@ -0,0 +1,25 @@
+id:
+  activemodel:
+    models:
+      mno_enterprise/app: Aplikasi
+    attributes:
+      mno_enterprise/app:
+        categories: Kategori
+        created_at: Dibuat pada
+        description: Deskripsi
+        id: Id
+        key_benefits: Manfaat utama
+        key_features: Fitur utama
+        logo: Logo
+        name: Nama
+        nid: Nid
+        pictures: Gambar
+        popup_description: Deskripsi popup
+        slug: Slug
+        stack: Susunan
+        terms_url: Tautan ke ketentuan penggunaan
+        testimonials: Testimoni
+        tiny_description: Deskripsi singkat
+        updated_at: Diperbarui pada
+        website: Situs web
+        worldwide_usage: Penggunaan di seluruh dunia

data/config/locales/models/app/zh.yml

@@ -0,0 +1,25 @@
+zh:
+  activemodel:
+    models:
+      mno_enterprise/app: "应用程序"
+    attributes:
+      mno_enterprise/app:
+        categories: "类别"
+        created_at: "创建于"
+        description: "说明"
+        id: Id
+        key_benefits: "主要优点"
+        key_features: "主要特点"
+        logo: "图标"
+        name: "名称"
+        nid: "节点id"
+        pictures: "图片"
+        popup_description: "弹出窗口说明"
+        slug: "别名"
+        stack: "堆叠"
+        terms_url: "使用条款链接"
+        testimonials: "客户见证"
+        tiny_description: "简介"
+        updated_at: "更新于"
+        website: "网址"
+        worldwide_usage: "全球使用"

data/config/locales/models/app_instance/en.yml

@@ -0,0 +1,24 @@
+en:
+  activemodel:
+    models:
+      mno_enterprise/app_instance: App instance
+    attributes:
+      mno_enterprise/app_instance:
+        app_id: App
+        autostop_at: Autostop at
+        autostop_interval: Autostop interval
+        billing_type: Billing type
+        created_at: Created at
+        id: Id
+        name: Name
+        next_status: Next status
+        owner_id: Owner
+        owner_type: Owner type
+        soa_enabled: Soa enabled
+        stack: Stack
+        started_at: Started at
+        status: Status
+        stopped_at: Stopped at
+        terminated_at: Terminated at
+        uid: Uid
+        updated_at: Updated at

data/config/locales/models/app_instance/id.yml

@@ -0,0 +1,24 @@
+id:
+  activemodel:
+    models:
+      mno_enterprise/app_instance: App instance
+    attributes:
+      mno_enterprise/app_instance:
+        app_id: Aplikasi
+        autostop_at: Autostop pada
+        autostop_interval: Interval autostop
+        billing_type: Jenis penagihan
+        created_at: Dibuat pada
+        id: Id
+        name: Nama
+        next_status: Status berikutnya
+        owner_id: Pemilik
+        owner_type: Jenis pemilik
+        soa_enabled: Soa diaktifkan
+        stack: Susunan
+        started_at: Dimulai pada
+        status: Status
+        stopped_at: Berhenti pada
+        terminated_at: Diakhiri pada
+        uid: Uid
+        updated_at: Diperbarui pada

data/config/locales/models/app_instance/zh.yml

@@ -0,0 +1,24 @@
+zh:
+  activemodel:
+    models:
+      mno_enterprise/app_instance: "应用程序实例"
+    attributes:
+      mno_enterprise/app_instance:
+        app_id: "应用程序"
+        autostop_at: "自动停止于"
+        autostop_interval: "自动停止间隔"
+        billing_type: "计费类型"
+        created_at: "创建于"
+        id: Id
+        name: "名称"
+        next_status: "下一个状态"
+        owner_id: "所有者"
+        owner_type: "所有者类型"
+        soa_enabled: "Soa已启用"
+        stack: "堆叠"
+        started_at: "开始于"
+        status: "状态"
+        stopped_at: "停止于"
+        terminated_at: "终止于"
+        uid: Uid
+        updated_at: "更新于"

data/config/locales/models/credit_card/en.yml

@@ -0,0 +1,23 @@
+en:
+  activemodel:
+    models:
+      mno_enterprise/credit_card: Credit card
+    attributes:
+      mno_enterprise/credit_card:
+        billing_address: Billing address
+        billing_city: City
+        billing_country: Country
+        billing_postcode: Postcode
+        country: Country
+        created_at: Created at
+        first_name: First name
+        id: Id
+        last_name: Last name
+        masked_number: Masked number
+        month: Month
+        number: Number
+        organization_id: Organization
+        title: Title
+        updated_at: Updated at
+        verification_value: CVV
+        year: Year

data/config/locales/models/credit_card/id.yml

@@ -0,0 +1,23 @@
+id:
+  activemodel:
+    models:
+      mno_enterprise/credit_card: Kartu kredit
+    attributes:
+      mno_enterprise/credit_card:
+        billing_address: Alamat penagihan
+        billing_city: Kota
+        billing_country: Negara
+        billing_postcode: Kode pos
+        country: Negara
+        created_at: Dibuat pada
+        first_name: Nama depan
+        id: Id
+        last_name: Nama belakang
+        masked_number: Nomor bermasker
+        month: Bulan
+        number: Nomor
+        organization_id: Organisasi
+        title: Judul
+        updated_at: Diperbarui pada
+        verification_value: Verifikasi Kartu Nilai (CVV)
+        year: Tahun

data/config/locales/models/credit_card/zh.yml

@@ -0,0 +1,23 @@
+zh:
+  activemodel:
+    models:
+      mno_enterprise/credit_card: "信用卡"
+    attributes:
+      mno_enterprise/credit_card:
+        billing_address: "帐单地址"
+        billing_city: "城市"
+        billing_country: "国家"
+        billing_postcode: "邮编"
+        country: "国家"
+        created_at: "创建于"
+        first_name: "名"
+        id: Id
+        last_name: "姓"
+        masked_number: "掩码"
+        month: "月"
+        number: "号码"
+        organization_id: "公司"
+        title: "标题"
+        updated_at: "更新于"
+        verification_value: CVV
+        year: "年"

data/config/locales/models/deletion_request/en.yml

@@ -0,0 +1,9 @@
+en:
+  activemodel:
+    models:
+      mno_enterprise/deletion_request: Deletion request
+    attributes:
+      mno_enterprise/deletion_request:
+        created_at: Created at
+        id: Id
+        updated_at: Updated at

data/config/locales/models/deletion_request/id.yml

@@ -0,0 +1,9 @@
+id:
+  activemodel:
+    models:
+      mno_enterprise/deletion_request: Permintaan penghapusan
+    attributes:
+      mno_enterprise/deletion_request:
+        created_at: Dibuat pada
+        id: Id
+        updated_at: Diperbarui pada

data/config/locales/models/deletion_request/zh.yml

@@ -0,0 +1,9 @@
+zh:
+  activemodel:
+    models:
+      mno_enterprise/deletion_request: "删除要求"
+    attributes:
+      mno_enterprise/deletion_request:
+        created_at: "创建于"
+        id: Id
+        updated_at: "更新于"