zuora_connect_ui 0.11.7 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f061efa44938f00cc2b259ffc548502a91ae1d7b8568edcbe8d72306c990029
-  data.tar.gz: 8ce50a81592f64d295dc06298453ca9b7b523638f3ac2dfa3d47a66dc55b2c1b
+  metadata.gz: faa039a8e3a2c5c8677899d9b3efa7621afde9061f3c73cc6e43c8fcafe154d1
+  data.tar.gz: b918e77cfd652de7b612014509d819f5ac211b3cb379eac84a6cc5b90b1c40c0
 SHA512:
-  metadata.gz: 7dc5b791b42a5c38b9df65eb943d5ec53dfc11b3cf2cb54439b420824b227d6023fb50026764ece9a11ecefac4fe6db4cd84b41951595ba87f2fa8cc7333794d
-  data.tar.gz: ebb00a347b67e6d6ede6d087a70cc71274df318020113cc161b58fb13f2268137b440d6ccdf1bd7e300bc041d16b9257b78cc18ac04ece6b487639f505f8cf8f
+  metadata.gz: e9238494ff53bdcc8b66e2ae693072f6db3376f109f3b78644ffd397061adc6fb447d8e43149d46044b04165120ac5ddf4419197fbf564d23efbb213d3818de4
+  data.tar.gz: f2fe8a38cea09e962c36e1de8437bea217920ca306d22d461ad3d87ea7f617080e947497277dc9e18d1d70055fcb55256773c67ce32b32ad165e1c3b7bc9ae21

data/Rakefile

@@ -1,4 +1,14 @@
+# frozen_string_literal: true
+
+require 'bundler/setup'
+
+APP_RAKEFILE = File.expand_path('spec/dummy/Rakefile', __dir__)
+load 'rails/tasks/engine.rake'
+
+load 'rails/tasks/statistics.rake'
+
 require 'bundler/gem_tasks'
+
 require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)

data/app/assets/javascripts/zuora_connect_ui/app.js.erb

@@ -1,6 +1,6 @@
 const process = {
   env: {
-    APP_NAME: "<%= Rails.application.class.parent_name %>",
+    APP_NAME: "<%= ZuoraConnectUi.app_parent_name %>",
     NODE_ENV: "<%= Rails.env %>",
     ZUORA_CONNECT_UI: true
   }

data/app/helpers/zuora_connect_ui/application_helper.rb

@@ -4,50 +4,7 @@ module ZuoraConnectUi
   # General helpers for application level
   module ApplicationHelper
     def zuo_parameterize(string)
-      if Rails::VERSION::STRING.start_with? '5'
-        string.parameterize(separator: '_')
-      else
-        string.parameterize('_')
-      end
+      string.parameterize(separator: '_')
     end
-
-    def zuo_include_tag
-      script_tag(type: 'module', src: anjuna(ANJUNA_VERSION, true)) +
-        script_tag(nomodule: '', src: anjuna(ANJUNA_VERSION, false)) +
-        script_tag(type: 'module', src: charts(ANJUNA_VERSION, true)) +
-        script_tag(nomodule: '', src: charts(ANJUNA_VERSION, false)) +
-        link_tag(href: theme(THEME_VERSION, 'application'), rel: 'stylesheet') +
-        link_tag(href: theme(THEME_VERSION, 'theme'), rel: 'stylesheet') +
-        link_tag(href: theme(THEME_VERSION, 'icons'), rel: 'stylesheet')
-    end
-
-    def script_tag(attrs)
-      attr_map = attrs.map { |key, value| " #{key}=\"#{value}\"" }
-
-      "<script#{attr_map.join('')}></script>".html_safe
-    end
-
-    def anjuna(version, esm)
-      "https://cdn.zuora.com/@anjuna/core@#{version}" \
-        "/anjuna-core/anjuna-core#{'.esm' if esm}.js"
-    end
-
-    def charts(version, esm)
-      "https://cdn.zuora.com/@anjuna/charts@#{version}" \
-        "/anjuna-charts/anjuna-charts#{'.esm' if esm}.js"
-    end
-
-    def link_tag(attrs)
-      attr_map = attrs.map { |key, value| " #{key}=\"#{value}\"" }
-
-      "<link#{attr_map.join('')}>".html_safe
-    end
-
-    def theme(version, file)
-      "https://cdn.zuora.com/@anjuna/theme@#{version}/css/#{file}.css"
-    end
-
-    ANJUNA_VERSION = '1.2.14'
-    THEME_VERSION = '1.2.14'
   end
 end

data/app/helpers/zuora_connect_ui/asset_helper.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+module ZuoraConnectUi
+  # Helper methods for including CDN links in views
+  module AssetHelper
+    ANJUNA_VERSION = '1.2.14'
+    ANJUNA_CORE_URL = "https://cdn.zuora.com/@anjuna/core@#{ANJUNA_VERSION}/anjuna-core/anjuna-core.js"
+    ANJUNA_CHARTS_URL = "https://cdn.zuora.com/@anjuna/charts@#{ANJUNA_VERSION}/anjuna-charts/anjuna-charts.js"
+
+    def zuo_include_tag
+      anjuna_core + anjuna_charts + anjuna_theme
+    end
+
+    private
+
+    def to_esm(url)
+      url.gsub('.js', '.esm.js')
+    end
+
+    # NOTE(hartley): nomodule was added as an explict boolean attribute in Rails
+    # 6.1, meaning 'nomodule: true' should be used once minimum version is 6.1
+    # However, for consistency with older versions we have to specify 'nomodule'
+    # as the value
+    def anjuna_core
+      tag.script(type: 'module', src: to_esm(ANJUNA_CORE_URL)) +
+        tag.script(nomodule: 'nomodule', src: ANJUNA_CORE_URL)
+    end
+
+    def anjuna_charts
+      tag.script(type: 'module', src: to_esm(ANJUNA_CHARTS_URL)) +
+        tag.script(nomodule: 'nomodule', src: ANJUNA_CHARTS_URL)
+    end
+
+    def anjuna_theme
+      tag.link(href: anjuna_theme_url('application'), rel: 'stylesheet') +
+        tag.link(href: anjuna_theme_url('theme'), rel: 'stylesheet') +
+        tag.link(href: anjuna_theme_url('icons'), rel: 'stylesheet')
+    end
+
+    def anjuna_theme_url(file)
+      "https://cdn.zuora.com/@anjuna/theme@#{ANJUNA_VERSION}/css/#{file}.css"
+    end
+  end
+end

data/app/views/partials/_table.html.erb

@@ -75,7 +75,7 @@
     '<%= table_name %>',
     {
       columns: <%= raw columns.to_json %>,
-      filters: <%= raw table_filters.to_json %>,
+      filters: <%= json_escape table_filters.to_json.html_safe %>,
       view: '<%= table_views.select { |k, v| v == true }.first[0].to_s %>',
       size: <%= initial_size %>,
       sort: <%= raw sort %>
@@ -258,7 +258,7 @@
       '<%= table_name %>',
       { view, size },
       columns,
-      <%= raw table_filters.to_json %>
+      <%= json_escape table_filters.to_json.html_safe %>
     );
 
   }

data/app/views/zuora_connect_ui/_nav.html.erb

@@ -0,0 +1,14 @@
+<% layout_id = "HTTP_ZUORA_LAYOUT_FETCH_TEMPLATE_ID" %>
+<% ui_path = "HTTP_ZUORA_UI_PATH" %>
+
+<% if request.headers[layout_id].present? || (!request.headers[ui_path].present? && !Rails.env.development?) %>
+  <%= yield %>
+<% else %>
+  <z-unified-nav-for-spas>
+    <div slot="breadcrumbContent">
+      <%= yield %>
+    </div>
+  </z-unified-nav-for-spas>
+  <script type="text/javascript" src="//cdn.zuora.com/@platform-ui/nav/bootstrap.js"></script>
+<% end %>
+

data/lib/zuora_connect_ui.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'zuora_connect_ui/version'
+require 'zuora_connect_ui/engine'
 require 'zuora_connect_ui/serializer'
 require 'bootstrap-sass'
 require 'select2-rails'
@@ -10,6 +11,13 @@ require 'peek/views/connect'
 
 # UI for Connect Applications
 module ZuoraConnectUi
-  class Engine < ::Rails::Engine
+  class << self
+    def app_parent_name
+      if Rails::VERSION::MAJOR >= 6
+        Rails.application.class.module_parent_name
+      else
+        Rails.application.class.parent_name
+      end
+    end
   end
 end

data/lib/zuora_connect_ui/engine.rb

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+module ZuoraConnectUi
+  class Engine < ::Rails::Engine
+  end
+end

data/lib/zuora_connect_ui/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ZuoraConnectUi
-  VERSION = '0.11.7'
+  VERSION = '0.12.0'
 end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect_ui
 version: !ruby/object:Gem::Version
-  version: 0.11.7
+  version: 0.12.0
 platform: ruby
 authors:
 - Connect Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-20 00:00:00.000000000 Z
+date: 2021-08-18 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: bootstrap-sass
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: select2-rails
   requirement: !ruby/object:Gem::Requirement
@@ -137,7 +137,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.16'
 - !ruby/object:Gem::Dependency
-  name: factory_bot
+  name: factory_bot_rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pg
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: puma
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -164,6 +192,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rspec-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec_junit_formatter
   requirement: !ruby/object:Gem::Requirement
@@ -309,15 +351,18 @@ files:
 - app/assets/stylesheets/zuora_connect_ui/tabs.scss
 - app/helpers/datatable_helper.rb
 - app/helpers/zuora_connect_ui/application_helper.rb
+- app/helpers/zuora_connect_ui/asset_helper.rb
 - app/helpers/zuora_connect_ui/input_helper.rb
 - app/views/partials/_admin_menu.html.erb
 - app/views/partials/_filters.html.erb
 - app/views/partials/_row_actions.html.erb
 - app/views/partials/_table.html.erb
 - app/views/peek/views/_connect.html.erb
+- app/views/zuora_connect_ui/_nav.html.erb
 - config/initializers/oj.rb
 - lib/peek/views/connect.rb
 - lib/zuora_connect_ui.rb
+- lib/zuora_connect_ui/engine.rb
 - lib/zuora_connect_ui/serializer.rb
 - lib/zuora_connect_ui/serializer/relationship.rb
 - lib/zuora_connect_ui/version.rb
@@ -378,14 +423,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Summary of Connect UI