zuora_connect_ui 0.11.8 → 0.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b75f3d3cf14a7411bdead1cd83dbbc4047ee7666dcb8f345f5d04877cff44da7
-  data.tar.gz: 6946aab23da7a0b10f7944db7e4a9a94d4e6de6f2e3d1e75665596880c470d06
+  metadata.gz: af05f9c154c0a34817597e9adf7229897d218a74dc31e8f3913701224c608453
+  data.tar.gz: fc815683a22743e2f346cb57f1f7072f54c4ff3c2f7fcdc089e08b82ce6901bc
 SHA512:
-  metadata.gz: 21f7d99ad494bca3070d15ad2f16aa841744efbb71a2f27887e0983156584fb07e292f2c30c40fb2fd8b2fb14afeae1f9b41e57d0c3b6145470e57994d160a7a
-  data.tar.gz: b354f52d8864d0d5a232955a095eb93b2669cb8bb2783a94be7a630391825e1e2943cee590c47da56b786ab65c9066e571250704966483a0c991405d7f43759b
+  metadata.gz: 7e4141390d9ed416295554014ae6529bc1bce7dc0cdca4d2ea8e6f99410ef20f61a7ce1c8c46aee57d115f05473f5a2bd908a08331f1751776ba42d1c452128e
+  data.tar.gz: 0ecfba913b5f1a6d2ddf2966b1fcf325b90465692dc32faa85fd8c22bc6c011946a136fd4194f77c980738e38ae9ce9389b0bd8a0288c10e461fd071df10fb12

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

@@ -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/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-v2>
+    <div slot="breadcrumbContent">
+      <%= yield %>
+    </div>
+  </z-unified-nav-v2>
+  <script type="text/javascript" crossorigin="anonymous" src="https://cdn.zuora.com/@platform-ui/nav-v2/main.js"></script>
+<% end %>
+

data/lib/zuora_connect_ui/version.rb

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

data/lib/zuora_connect_ui.rb

@@ -11,4 +11,13 @@ require 'peek/views/connect'
 
 # UI for Connect Applications
 module ZuoraConnectUi
+  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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect_ui
 version: !ruby/object:Gem::Version
-  version: 0.11.8
+  version: 0.12.1
 platform: ruby
 authors:
 - Connect Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-20 00:00:00.000000000 Z
+date: 2021-10-29 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