gitlab_support_readiness 1.0.86 → 1.0.88

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 849c69934c1a08ad5f0aebf4c7d76603ffa71a15335485fa2a786e31e187ac4e
-  data.tar.gz: 6bece7519407c6e398fe2b5127ed2558f8ef0ab55690dcea1957f66b0ab67868
+  metadata.gz: 1e9057a70ad9cef062f6a7f361ea61039f315e0b2aa3f25737947dc94f018339
+  data.tar.gz: bfc92891940e54725a794db15f49b67f4f6d44a03925fa70966ef1ecb26267b2
 SHA512:
-  metadata.gz: 4f2bbab55afdec7bcfb39621747d96341feed2cd93650ea64af260d67c4182918a4467dbe6f0a649a96c2a8567d86db9fc545297f78a18d7fc6852533d1ca355
-  data.tar.gz: 7736d26f017d16a35771c9bdacd412765e8404471b081a4a0c0f2e9f7b9d1b13e1eeb4cf09016c6b25a3637eaae048733197c8e39d53f3f1d2cb2c23a2c4a367
+  metadata.gz: 6993482077689597bab8f3b5d5867602075bb6b8abb36c684a6a813b501bd8a996b3f0e437e91c143a46b2c5608ca5b49a1abd4c1cfedb8ad9352188ca119bbf
+  data.tar.gz: 683c8a3ac2efce0c6b5b61f78478cf3bae2029fcd43f6f6a679887b5bd292f46359c22e3f23ad097071234291006963fba96b99cbef972c03ff1e10a0d7f020c

data/lib/support_readiness/repos/ticket_fields.rb

@@ -58,9 +58,9 @@ module Readiness
               end
             end
             zd_options.each do |zd_option|
-              repo_option = repo.custom_field_options.detect { |rp_o| rp_o.name == zd_option.name }
+              repo_option = repo.custom_field_options.detect { |rp_o| rp_o.value == zd_option.value }
               if repo_option.nil?
-                @diffs[:option_deletes].push({ "#{repo.title}" => zd_option })
+                @diffs[:option_deletes].push({ "#{repo.value}" => zd_option })
               end
             end
           end

data/lib/support_readiness/support_super_form_processor/create_macro.rb

@@ -25,9 +25,123 @@ module Readiness
         issue.description = message(file_path)
         create = Readiness::GitLab::Issues.create!(@gitlab_client, project, issue)
         puts "Issue created: #{create.web_url}"
+        create_yaml_file(create, file_path) if advanced == 'no'
         exit 0
       end
 
+      ##
+      # Create the macro YAML file
+      #
+      # @author Jason Colyer
+      # @since 1.0.88
+      def self.create_yaml_file(issue, path)
+        macro_project_id = if instance == 'Zendesk Global'
+                             53382019
+                           else
+                             53561342
+                           end
+        macro_project = Readiness::GitLab::Projects.find!(@gitlab_client, macro_project_id)
+        commit_params = {
+          branch: 'master',
+          commit_message: 'Creating new macro',
+          actions: [
+            {
+              file_path: path,
+              content: yaml_contents,
+              action: 'create'
+            }
+          ]
+        }
+        Readiness::GitLab::Repositories.create_commit!(@gitlab_client, macro_project, commit_params)
+        comment_params = {
+          body: macro_created_message
+        }
+        comment = Readiness::GitLab::Issues.create_comment!(@gitlab_client, project, issue, comment_params)
+      end
+
+      ##
+      # Return a String for a macro creation comment
+      #
+      # @author Jason Colyer
+      # @since 1.0.88
+      def self.macro_created_message
+        <<~STRING
+          Greetings @#{requester.username} !
+
+          Your macro has now been created on the #{instance} instance. Keep in mind a hard refresh of your Zendesk tab might be required to see the macro listed.
+
+          If using a managed content file for this new macro and you had not populated it before your submission, a placeholder file was created for you (and you will need to make a MR on it to update the macro's wording).
+
+          If you have any problems, please reopen this issue and ping the Support Readiness team for assistance.
+
+          /label ~"Readiness::Completed"
+
+          /close
+        STRING
+      end
+
+      ##
+      # Sets the contents for a YAML file
+      #
+      # @author Jason Colyer
+      # @since 1.0.88
+      def self.yaml_contents
+        {
+          'title' => name,
+          'active' => true,
+          'description' => '',
+          'actions' => determine_actions,
+          'restriction' => nil,
+          'contains_managed_content' => (comment != 'none')
+        }.to_yaml
+      end
+
+      ##
+      # Determine the actions for a YAML file
+      #
+      # @author Jason Colyer
+      # @since 1.0.88
+      def self.determine_actions
+        actions = []
+        if ticket_state != 'none'
+          actions.push({ 'field' => 'status', 'value' => ticket_state })
+        end
+        if assignee == 'Unassign'
+          actions.push({ 'field' => 'assignee_id', 'value' => '' })
+        end
+        if assignee == 'Current User'
+          actions.push({ 'field' => 'assignee_id', 'value' => 'current_user' })
+        end
+        if tag != 'None'
+          actions.push({ 'field' => 'current_tags', 'value' => tag })
+        end
+        if comment == 'Public'
+          actions.push({ 'field' => 'comment_mode_is_public', 'value' => true })
+        end
+        if comment == 'Private'
+          actions.push({ 'field' => 'comment_mode_is_public', 'value' => false })
+        end
+        actions
+      end
+
+      ##
+      # Sets the global variable ticket_state
+      #
+      # @author Jason Colyer
+      # @since 1.0.88
+      def self.ticket_state
+        @ticket_state ||= ENV.fetch('CREATE_MACRO_STATE', 'none')
+      end
+
+      ##
+      # Sets the global variable advanced
+      #
+      # @author Jason Colyer
+      # @since 1.0.88
+      def self.advanced
+        @advanced ||= ENV.fetch('CREATE_MACRO_ADVANCED', 'yes')
+      end
+
       def self.create_macro_file_if_needed
         return nil if comment == 'none'
 
@@ -161,6 +275,7 @@ module Readiness
           - Assigne change: #{assignee}
           - Tag to add: #{tag}
           - Type of comment: #{comment}
+          - Ticket state to set: #{ticket_state}
           - Managed content file: #{file_path.nil? ? 'N/A' : file_path}
 
           Some other details are:

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gitlab_support_readiness
 version: !ruby/object:Gem::Version
-  version: 1.0.86
+  version: 1.0.88
 platform: ruby
 authors:
 - Jason Colyer