zuora_connect_ui 0.11.10 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b814d8ac542159f70adac2108817708c5683225157c53383cde242f973b91d87
-  data.tar.gz: 306c03c601123b736c92f374526f0cb8ec7da13f41d8b449087e223b4ff3f686
+  metadata.gz: faa039a8e3a2c5c8677899d9b3efa7621afde9061f3c73cc6e43c8fcafe154d1
+  data.tar.gz: b918e77cfd652de7b612014509d819f5ac211b3cb379eac84a6cc5b90b1c40c0
 SHA512:
-  metadata.gz: d16cc771c62d344017a08cfb1435b097ff1fda7fd30b0de4468722918517f60efb03e671067dc807b02ec1d059a6c841a1059012b6a56566df6487a5b85b8339
-  data.tar.gz: 1961b81766f8c652a9d61f64f5a2ed195a82251cee7ae61ec23c2536e44edc6fa19c83555f2aa1427169ef25128d475126b3a8bacf42a3a6f9be3229c9452143
+  metadata.gz: e9238494ff53bdcc8b66e2ae693072f6db3376f109f3b78644ffd397061adc6fb447d8e43149d46044b04165120ac5ddf4419197fbf564d23efbb213d3818de4
+  data.tar.gz: f2fe8a38cea09e962c36e1de8437bea217920ca306d22d461ad3d87ea7f617080e947497277dc9e18d1d70055fcb55256773c67ce32b32ad165e1c3b7bc9ae21

data/app/helpers/zuora_connect_ui/application_helper.rb

@@ -6,44 +6,5 @@ module ZuoraConnectUi
     def zuo_parameterize(string)
       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

@@ -3,5 +3,42 @@
 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/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/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect_ui
 version: !ruby/object:Gem::Version
-  version: 0.11.10
+  version: 0.12.0
 platform: ruby
 authors:
 - Connect Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-06 00:00:00.000000000 Z
+date: 2021-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bootstrap-sass
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: select2-rails
   requirement: !ruby/object:Gem::Requirement
@@ -358,6 +358,7 @@ files:
 - 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