zendesk_apps_support 4.11.2 → 4.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c9188517f4a57a804b4648f6d4efbe06ec79ed6510b2acc95366aea3419691cb
-  data.tar.gz: e7c7235e7ba466161d93d0ceb5e3f43c1a4c28ee30eeecbddcd698d948ea900b
+  metadata.gz: b15fb4519e8970b7d758ba52fb983894d0453f763d10949c24881298997aaf80
+  data.tar.gz: 67bc5ddfa7ecbd027a953c89272bdce33d2265cf956a793212f946519bd2c956
 SHA512:
-  metadata.gz: 5072150921ee6e3eb4f8d070079aedea3854a20a3ab7c55d6e7a2b6715422109e9b7fbf60f82fb2ae9aa6ad73e55f5adbfbdb62ee2ad09d24b095571311eb0ee
-  data.tar.gz: 046b5813b2fc8e18d8b3514834eadd4d886036fde06750013ffa1b9c2aa1bbdb58edc01dbce9bbdb803f614e555f8c77b2e185e960cb9a6f8221d450d72493a7
+  metadata.gz: 1b3b5456c6c059dc6b196115746930319066327074eadbad36f38e92173acae0ef76650cdc827f99e67d9de1059f093e5a166ac147cf02958a06ee2639d80494
+  data.tar.gz: 8d789571704c1164d949cd4eb9395b42301f5919b9547f58f45226b235abf771f9b4576ec4094b8a2d5e4e394d7fe34a2b6cd4d7bb234f3ce711bc985f5c5cdb

data/config/locales/en.yml

@@ -54,6 +54,9 @@ en:
               other: 'requirements.json contains invalid types: %{invalid_types}'
             multiple_channel_integrations: Specifying multiple channel integrations
               in requirements.json is not supported.
+            invalid_cr_schema_keys:
+              one: 'Custom resources schema contains an invalid key: %{invalid_keys}'
+              other: 'Custom resources schema contains invalid keys: %{invalid_keys}'
             banner:
               invalid_format: Banner image must be a PNG file.
               invalid_size: Invalid banner image dimensions. Must be %{required_banner_width}x%{required_banner_height}px.

data/config/locales/translations/zendesk_apps_support.yml

@@ -8,7 +8,7 @@ packages:
 
 parts:
   - translation:
-      key: "txt.apps.admin.error.app_build.jshint.one" 
+      key: "txt.apps.admin.error.app_build.jshint.one"
       title: "App builder job: JSHint error message"
       value: "JSHint error in %{file}: %{errors}"
   - translation:
@@ -119,6 +119,16 @@ parts:
       key: "txt.apps.admin.error.app_build.multiple_channel_integrations"
       title: "App builder job: requirements file contains multiple channel integrations, leave requirements.json as is (file name)"
       value: "Specifying multiple channel integrations in requirements.json is not supported."
+  - translation:
+      key: "txt.apps.admin.error.app_build.invalid_cr_schema_keys.one"
+      title: "App builder job: custom resources schema contains invalid key error"
+      value: "Custom resources schema contains an invalid key: %{invalid_keys}"
+      screenshot: "https://drive.google.com/open?id=1-CHVDcmr5mf1DKKeWqiOuGWrW25gDY4y"
+  - translation:
+      key: "txt.apps.admin.error.app_build.invalid_cr_schema_keys.other"
+      title: "App builder job: custom resources schema contains invalid keys error"
+      value: "Custom resources schema contains invalid keys: %{invalid_keys}"
+      screenshot: "https://drive.google.com/open?id=1iEx7f7PYnum_qDQESD3Gz2PwLDza3zI0"
   - translation:
       key: "txt.apps.admin.error.app_build.banner.invalid_format"
       title: "App builder job: Banner image invalid format error"

data/lib/zendesk_apps_support/app_requirement.rb

@@ -2,8 +2,7 @@
 
 module ZendeskAppsSupport
   class AppRequirement
-    TYPES = %w[automations channel_integrations
-               macros targets views ticket_fields triggers
-               user_fields organization_fields].freeze
+    TYPES = %w[automations channel_integrations custom_resources_schema macros targets views ticket_fields
+               triggers user_fields organization_fields].freeze
   end
 end

data/lib/zendesk_apps_support/validations/requirements.rb

@@ -5,7 +5,7 @@ module ZendeskAppsSupport
     module Requirements
       MAX_REQUIREMENTS = 5000
 
-      class <<self
+      class << self
         def call(package)
           if package.manifest.requirements_only? && !package.has_requirements?
             return [ValidationError.new(:missing_requirements)]
@@ -26,6 +26,7 @@ module ZendeskAppsSupport
             errors << excessive_requirements(requirements)
             errors << invalid_channel_integrations(requirements)
             errors << invalid_custom_fields(requirements)
+            errors << invalid_custom_resources_schema(requirements)
             errors << missing_required_fields(requirements)
             errors.flatten!
             errors.compact!
@@ -43,10 +44,12 @@ module ZendeskAppsSupport
         def missing_required_fields(requirements)
           [].tap do |errors|
             requirements.each do |requirement_type, requirement|
-              next if requirement_type == 'channel_integrations'
+              next if %w[channel_integrations custom_resources_schema].include? requirement_type
               requirement.each do |identifier, fields|
                 next if fields.include? 'title'
-                errors << ValidationError.new(:missing_required_fields, field: 'title', identifier: identifier)
+                errors << ValidationError.new(:missing_required_fields,
+                                              field: 'title',
+                                              identifier: identifier)
               end
             end
           end
@@ -65,7 +68,9 @@ module ZendeskAppsSupport
             [user_fields, organization_fields].compact.each do |field_group|
               field_group.each do |identifier, fields|
                 next if fields.include? 'key'
-                errors << ValidationError.new(:missing_required_fields, field: 'key', identifier: identifier)
+                errors << ValidationError.new(:missing_required_fields,
+                                              field: 'key',
+                                              identifier: identifier)
               end
             end
           end
@@ -76,19 +81,40 @@ module ZendeskAppsSupport
           return unless channel_integrations
           [].tap do |errors|
             if channel_integrations.size > 1
-              errors << ValidationError.new(:multiple_channel_integrations, count: channel_integrations.size)
+              errors << ValidationError.new(:multiple_channel_integrations)
             end
             channel_integrations.each do |identifier, fields|
-              unless fields.include? 'manifest_url'
-                errors << ValidationError.new(:missing_required_fields, field: 'manifest_url', identifier: identifier)
-              end
+              next if fields.include? 'manifest_url'
+              errors << ValidationError.new(:missing_required_fields,
+                                            field: 'manifest_url',
+                                            identifier: identifier)
+            end
+          end
+        end
+
+        def invalid_custom_resources_schema(requirements)
+          custom_resources_schema = requirements['custom_resources_schema']
+          return unless custom_resources_schema
+          valid_schema_keys = %w[resource_types relationship_types]
+          [].tap do |errors|
+            invalid_keys = custom_resources_schema.keys - valid_schema_keys
+            unless invalid_keys.empty?
+              errors << ValidationError.new(:invalid_cr_schema_keys,
+                                            invalid_keys: invalid_keys.join(', '),
+                                            count: invalid_keys.length)
+            end
+
+            valid_schema_keys.each do |required_key|
+              next if custom_resources_schema.keys.include? required_key
+              errors << ValidationError.new(:missing_required_fields,
+                                            field: required_key,
+                                            identifier: 'custom_resources_schema')
             end
           end
         end
 
         def invalid_requirements_types(requirements)
           invalid_types = requirements.keys - ZendeskAppsSupport::AppRequirement::TYPES
-
           unless invalid_types.empty?
             ValidationError.new(:invalid_requirements_types,
                                 invalid_types: invalid_types.join(', '),

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zendesk_apps_support
 version: !ruby/object:Gem::Version
-  version: 4.11.2
+  version: 4.12.0
 platform: ruby
 authors:
 - James A. Rosen
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-22 00:00:00.000000000 Z
+date: 2018-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -274,7 +274,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Support to help you develop Zendesk Apps.