zendesk_apps_support 4.9.0 → 4.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3f4d28565423156f88d573489b07e68cf0853197
-  data.tar.gz: 0dd0be8bec4987676ad7dda8bf4c367507294e5a
+  metadata.gz: 7dbd4a9dbbf9424033bd8c1194985d61b1df4b13
+  data.tar.gz: b911d0565982c5fc80b676e2ddb0af99bd17ea9d
 SHA512:
-  metadata.gz: ed4bdb41cf026f6ea27b01b18b5870483687bce59120be9d8f62685b301179a111047008fae12965713f284ba26bb6d52a00e2c704d5b7fd089b37213f13ec45
-  data.tar.gz: dfa4571930b6eada61eb8422e05691ce5b3a7a87fc5810db83756342e69f18780cf9c3ffcbbacf7c229ebd1bfc7a73359f3b2e89bfaeba7bf8b7c9f17c439026
+  metadata.gz: 9e0518cb6f9c12ae6645de44eb7bf245db885acc9e62e0d295c481a14fb4514a875d1b58da064deefe3d24f5166e8c595cd8ff51a2c28df9885bb2c0d0fb8bb8
+  data.tar.gz: 21373506c95063e03c5497188c5988ab33eedfd5f6d3de74ce5a0923e6e6548952644f5a37ba1cf7504f10ef576ac6dee6491f0ade50b8b42edb1e951ad28bc1

data/config/locales/en.yml

@@ -97,6 +97,8 @@ en:
               not_json: "%{file} is not valid JSON. %{errors}"
               not_json_object: "%{file} is not a JSON object."
               missing_required_key: 'Missing required key from %{file}: %{missing_key}'
+              missing_required_key_on_leaf: Missing required key %{missing_key} on
+                leaf %{leaf} from %{file}
               missing_required_key_for_product: 'Missing required key from %{file}
                 for %{product}: %{missing_key}'
               products_do_not_match_manifest_products: Products in manifest (%{manifest_products})

data/config/locales/translations/zendesk_apps_support.yml

@@ -254,6 +254,11 @@ parts:
       key: "txt.apps.admin.error.app_build.translation.missing_required_key"
       title: "App builder job: required key missing from translation file"
       value: "Missing required key from %{file}: %{missing_key}"
+  - translation:
+      key: "txt.apps.admin.error.app_build.translation.missing_required_key_on_leaf"
+      title: "App builder job: required key missing from translation file."
+      screenshot: "https://zendesk.box.com/s/m6yr2j0vai0a7qkimj2gcqiy61jznmn4"
+      value: "Missing required key %{missing_key} on leaf %{leaf} from %{file}"
   - translation:
       key: "txt.apps.admin.error.app_build.translation.missing_required_key_for_product"
       title: "App builder job: required key missing from translation file for a specific product"

data/lib/zendesk_apps_support/app_version.rb

@@ -11,12 +11,12 @@ module ZendeskAppsSupport
   #                  newly created or updates apps MAY target it, but it
   #                  may change without notice
   class AppVersion
-    DEPRECATED = '0.5'
-    SUNSETTING = '1.0'
+    DEPRECATED = ['0.5', '1.0'].freeze
+    SUNSETTING = nil
     CURRENT    = '2.0'
     FUTURE     = nil
 
-    TO_BE_SERVED     = [DEPRECATED, SUNSETTING, CURRENT, FUTURE].compact.freeze
+    TO_BE_SERVED     = [DEPRECATED, SUNSETTING, CURRENT, FUTURE].flatten.compact.freeze
     VALID_FOR_UPDATE = [SUNSETTING, CURRENT, FUTURE].compact.freeze
     VALID_FOR_CREATE = [CURRENT, FUTURE].compact.freeze
 
@@ -41,7 +41,7 @@ module ZendeskAppsSupport
     end
 
     def deprecated?
-      @version == DEPRECATED
+      DEPRECATED.include?(@version)
     end
 
     def sunsetting?

data/lib/zendesk_apps_support/package.rb

@@ -130,7 +130,7 @@ module ZendeskAppsSupport
         location_icons: location_icons,
         app_class_name: app_class_name,
         author: manifest.author,
-        translations: runtime_translations(translations_for(locale)),
+        translations: manifest.iframe_only? ? nil : runtime_translations(translations_for(locale)),
         framework_version: manifest.framework_version,
         templates: templates,
         modules: commonjs_modules,

data/lib/zendesk_apps_support/validations/manifest.rb

@@ -58,7 +58,7 @@ module ZendeskAppsSupport
             errors << invalid_v1_location(package)
             errors << missing_framework_version(manifest)
             errors << location_framework_mismatch(manifest)
-            errors << invalid_version_error(manifest, package)
+            errors << invalid_version_error(manifest)
           end
 
           errors << ban_no_template(manifest) if manifest.iframe_only?
@@ -293,14 +293,10 @@ module ZendeskAppsSupport
           missing_keys_validation_error([RUBY_TO_JSON[:framework_version]]) if manifest.framework_version.nil?
         end
 
-        def invalid_version_error(manifest, package)
+        def invalid_version_error(manifest)
           valid_to_serve = AppVersion::TO_BE_SERVED
           target_version = manifest.framework_version
 
-          if target_version == AppVersion::DEPRECATED
-            package.warnings << I18n.t('txt.apps.admin.warning.app_build.deprecated_version')
-          end
-
           unless valid_to_serve.include?(target_version)
             return ValidationError.new(:invalid_version,
                                        target_version: target_version,

data/lib/zendesk_apps_support/validations/translations.rb

@@ -16,7 +16,7 @@ module ZendeskAppsSupport
           package.files.each_with_object([]) do |file, errors|
             path_match = TRANSLATIONS_PATH.match(file.relative_path)
             next unless path_match
-            errors << locale_error(file, path_match[1]) << json_error(file)
+            errors << locale_error(file, path_match[1]) << json_error(file) << format_error(file)
             next unless errors.compact.empty?
             errors.push(*validate_marketplace_content(file, package)) if file.relative_path == 'translations/en.json'
           end.compact
@@ -29,9 +29,23 @@ module ZendeskAppsSupport
           ValidationError.new('translation.invalid_locale', file: file.relative_path)
         end
 
+        def format_error(file)
+          with_valid_json(file) do |json|
+            if json['app'] && json['app']['parameters']
+              parameters_node = json['app']['parameters']
+              parameters_node.keys.map do |param|
+                unless parameters_node[param].is_a?(Hash) && parameters_node[param].keys.include?('label')
+                  return ValidationError.new('translation.missing_required_key_on_leaf',
+                                             file: file.relative_path, missing_key: 'label', leaf: param)
+                end
+              end
+            end
+          end
+          nil
+        end
+
         def json_error(file)
-          json = JSON.parse(file.read)
-          if json.is_a?(Hash)
+          with_valid_json(file) do |json|
             if json['app'] && json['app']['package']
               json['app'].delete('package')
               begin
@@ -41,6 +55,13 @@ module ZendeskAppsSupport
                 ValidationError.new('translation.invalid_format', field: e.message)
               end
             end
+          end
+        end
+
+        def with_valid_json(file)
+          json = JSON.parse(file.read)
+          if json.is_a?(Hash)
+            yield json
           else
             ValidationError.new('translation.not_json_object', file: file.relative_path)
           end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zendesk_apps_support
 version: !ruby/object:Gem::Version
-  version: 4.9.0
+  version: 4.9.1
 platform: ruby
 authors:
 - James A. Rosen
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-01 00:00:00.000000000 Z
+date: 2018-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n