foreman-tasks 0.16.3 → 0.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a4810cb5f72cb95e222c01826c0849c45a8a098e1eb2fb5139d9bbc0abdb8823
-  data.tar.gz: 4f53e3c82ab8a1c6b0999cb4fd99652ce3f9984e7e6a8cf5b3ee7b91d59cd808
+  metadata.gz: 289b729c99fef5c4047a025dd9deabfe4421ea2f5c457922f22ebababf0bf4e9
+  data.tar.gz: 4c571c09518c2b3ce576b4cf31be1b62e5cae4c15bc8d8401a4ce8886bd60e4f
 SHA512:
-  metadata.gz: 7f2dd82c93ef2a26e4f1a591eb3e7778d1aa33f9dbd5971995025f7dca355b9aba7e5f8d014dc7187b152649234685af1518a7078bd4eb68242bfa8cc3f0b7f9
-  data.tar.gz: 1278492ef015ddda14c6138655e4f2bcf50d7ce7e9fc3debeff2df5e0faf5906bf4a1159b99776370ef15a395273875a143a0068ba8b28153bf7dc4fc26107bc
+  metadata.gz: 5b751006f3adf4e24870a916e4ba5e13a67234d10bb977e1d66df84c626059c544179b4042d631acd50481b831eb38bfe20c6739cb3c9e1efda83e35805e2b34
+  data.tar.gz: cb353429cb48a625176818a3625be9da6e0c7f4deede573c2e614364d4b20d263b2476f614fa2b45813131b1cfbf113e5d736ceb7522dbd2b8dd889f02ff920b

data/app/controllers/foreman_tasks/tasks_controller.rb

@@ -16,8 +16,7 @@ module ForemanTasks
     end
 
     def summary
-      scope = resource_base.search_for(current_taxonomy_search).select(:id)
-      render json: Task::Summarizer.new(Task.where(:id => scope), params[:recent_timeframe].to_i).summary
+      render json: Task::Summarizer.new(resource_base, params[:recent_timeframe].to_i).summary
     end
 
     def sub_tasks

data/app/models/foreman_tasks/task.rb

@@ -49,12 +49,10 @@ module ForemanTasks
     scoped_search :on => :user_id,
                   :complete_value => true,
                   :rename => 'user.id',
-                  :validator => ->(value) { ScopedSearch::Validators::INTEGER.call(value) },
-                  :value_translation => ->(value) { value == 'current_user' ? User.current.id : value },
-                  :special_values => %w[current_user],
-                  :aliases => ['owner.id'], :only_explicit => true
-    scoped_search :relation => :user, :on => :login, :complete_value => true, :aliases => ['owner.login', 'user'], :only_explicit => true
-    scoped_search :relation => :user, :on => :firstname, :rename => 'user.firstname', :complete_value => true, :aliases => ['owner.firstname'], :only_explicit => true
+                  :validator => ->(value) { ScopedSearch::Validators::INTEGER.call(value) || value == 'current_user' },
+                  :aliases => ['owner.id'], :ext_method => :search_by_owner, :only_explicit => true
+    scoped_search :relation => :user, :on => :login, :rename => 'user.login', :complete_value => true, :aliases => ['owner.login', 'user'], :ext_method => :search_by_owner, :only_explicit => true
+    scoped_search :relation => :user, :on => :firstname, :rename => 'user.firstname', :complete_value => true, :aliases => ['owner.firstname'], :ext_method => :search_by_owner, :only_explicit => true
     scoped_search :relation => :task_groups, :on => :id, :complete_value => true, :rename => 'task_group.id', :validator => ScopedSearch::Validators::INTEGER
 
     scope :active, -> {  where('foreman_tasks_tasks.state != ?', :stopped) }

data/app/models/foreman_tasks/task/search.rb

@@ -22,6 +22,31 @@ module ForemanTasks
         sql = "foreman_tasks_locks_taxonomy#{uniq_suffix}.resource_id #{operator} ? OR foreman_tasks_locks_taxonomy#{uniq_suffix}.resource_id IS NULL"
         { :conditions => sanitize_sql_for_conditions([sql, value]), :joins => joins }
       end
+
+      def search_by_owner(key, operator, value)
+        return { :conditions => '0 = 1' } if value == 'current_user' && User.current.nil?
+
+        key = 'owners.login' if key == 'user'
+        # using uniq suffix to avoid colisions when searching by two different owners via ScopedSearch
+        uniq_suffix = SecureRandom.hex(3)
+        key_name = connection.quote_column_name(key.sub(/^.*\./, ''))
+        value.sub!('*', '%%')
+        condition = if key.blank?
+                      sanitize_sql_for_conditions(["users_#{uniq_suffix}.login #{operator} ? or users_#{uniq_suffix}.firstname #{operator} ? ", value, value])
+                    elsif key =~ /\.id\Z/
+                      value = User.current.id if value == 'current_user'
+                      sanitize_sql_for_conditions(["foreman_tasks_tasks.user_id #{operator} ?", value])
+                    else
+                      placeholder, value = operator == 'IN' ? ['(?)', value.split(',').map(&:strip)] : ['?', value]
+                      sanitize_sql_for_conditions(["users_#{uniq_suffix}.#{key_name} #{operator} #{placeholder}", value])
+                    end
+        { :conditions => condition, :joins => joins_for_user_search(key, uniq_suffix) }
+      end
+
+      def joins_for_user_search(key, uniq_suffix)
+        return '' if key =~ /\.id\Z/
+        "INNER JOIN users AS users_#{uniq_suffix} ON users_#{uniq_suffix}.id = foreman_tasks_tasks.user_id"
+      end
     end
   end
 end

data/db/migrate/20180927120509_add_user_id.foreman_tasks.rb

@@ -5,10 +5,8 @@ class AddUserId < ActiveRecord::Migration[5.0]
     return if User.unscoped.find_by(:login => User::ANONYMOUS_ADMIN).nil?
     User.as_anonymous_admin do
       user_locks.select(:resource_id).distinct.pluck(:resource_id).each do |owner_id|
-        if User.exists?(:id => owner_id)
-          tasks = ForemanTasks::Task.joins(:locks).where(:locks => user_locks.where(:resource_id => owner_id))
-          tasks.update_all(:user_id => owner_id)
-        end
+        tasks = ForemanTasks::Task.joins(:locks).where(:locks => user_locks.where(:resource_id => owner_id))
+        tasks.update_all(:user_id => owner_id)
         user_locks.where(:resource_id => owner_id).delete_all
       end
     end

data/lib/foreman_tasks/engine.rb

@@ -41,7 +41,7 @@ module ForemanTasks
 
     initializer 'foreman_tasks.register_plugin', :before => :finisher_hook do |_app|
       Foreman::Plugin.register :"foreman-tasks" do
-        requires_foreman '>= 1.16.0'
+        requires_foreman '>= 1.24.0'
         divider :top_menu, :parent => :monitor_menu, :last => true, :caption => N_('Foreman Tasks')
         menu :top_menu, :tasks,
              :url_hash => { :controller => 'foreman_tasks/tasks', :action => :index },

data/lib/foreman_tasks/version.rb

@@ -1,3 +1,3 @@
 module ForemanTasks
-  VERSION = '0.16.3'.freeze
+  VERSION = '0.17.0'.freeze
 end

data/package.json

@@ -22,8 +22,7 @@
     "url": "http://projects.theforeman.org/projects/foreman-tasks/issues"
   },
   "dependencies": {
-    "@theforeman/vendor": "^0.1.1",
-    "c3": "^0.4.11",
+    "@theforeman/vendor": "^1.4.0",
     "humanize-duration": "^3.20.1",
     "react-intl": "^2.8.0"
   },
@@ -31,7 +30,7 @@
     "@storybook/addon-actions": "^5.0.1",
     "@storybook/addon-knobs": "^5.0.1",
     "@storybook/react": "^5.0.1",
-    "@theforeman/vendor-dev": "^0.1.1",
+    "@theforeman/vendor-dev": "^1.4.0",
     "babel-cli": "^6.10.1",
     "babel-core": "^6.26.3",
     "babel-eslint": "^8.2.3",

data/test/controllers/tasks_controller_test.rb

@@ -41,41 +41,6 @@ module ForemanTasks
           response = JSON.parse(@response.body)
           assert_equal 0, response['stopped']['total']
         end
-
-        describe 'taxonomy scoping' do
-          before do
-            @organizations = [0, 0].map { FactoryBot.create(:organization) }
-            @locations = [0, 0].map { FactoryBot.create(:location) }
-            @tasks = [0, 0].map { FactoryBot.create(:some_task) }
-            @tasks.zip(@organizations, @locations).each do |task, org, loc|
-              Lock.link!(org, task.id)
-              Lock.link!(loc, task.id)
-            end
-          end
-
-          it 'does not limit if unset' do
-            get(:summary, params: { recent_timeframe: 24 }, session: set_session_user)
-            assert_response :success
-            response = JSON.parse(@response.body)
-            assert_equal 2, response['stopped']['total']
-          end
-
-          it 'finds only tasks with matching taxonomies' do
-            get(:summary, params: { recent_timeframe: 24 },
-                          session: set_session_user.merge(:organization_id => @organizations.first, :location_id => @locations.first))
-            assert_response :success
-            response = JSON.parse(@response.body)
-            assert_equal 1, response['stopped']['total']
-          end
-
-          it 'find no tasks when taxonomy combination contains no tasks' do
-            get(:summary, params: { recent_timeframe: 24 },
-                          session: set_session_user.merge(:organization_id => @organizations.first, :location_id => @locations.last))
-            assert_response :success
-            response = JSON.parse(@response.body)
-            assert_equal 0, response['stopped']['total']
-          end
-        end
       end
 
       it 'supports csv export' do

data/test/unit/task_test.rb

@@ -30,66 +30,20 @@ class TasksTest < ActiveSupport::TestCase
       assert_equal [@task_one], ForemanTasks::Task.search_for("user = #{@user_one.login}")
     end
 
-    test 'cannot search by arbitrary key' do
-      proc { ForemanTasks::Task.search_for('user.my_key ~ 5') }.must_raise(ScopedSearch::QueryNotSupported)
-      proc { ForemanTasks::Task.search_for('user. = 5') }.must_raise(ScopedSearch::QueryNotSupported)
-    end
-
-    test 'can search the tasks by negated user' do
-      assert_equal [@task_one], ForemanTasks::Task.search_for("user != #{@user_two.login}")
-      assert_equal [@task_one], ForemanTasks::Task.search_for("user <> #{@user_two.login}")
-      SecureRandom.stubs(:hex).returns('abc')
-      assert_equal ForemanTasks::Task.search_for("user != #{@user_two.login}").to_sql,
-                   ForemanTasks::Task.search_for("user <> #{@user_two.login}").to_sql
-    end
-
     test 'can search the tasks by user\'s id' do
       assert_equal [@task_one], ForemanTasks::Task.search_for("user.id = #{@user_one.id}")
       assert_equal [@task_one], ForemanTasks::Task.search_for("owner.id = #{@user_one.id}")
-      assert_equal [@task_one], ForemanTasks::Task.search_for("user.id != #{@user_two.id}")
-      assert_equal [@task_one], ForemanTasks::Task.search_for("owner.id != #{@user_two.id}")
-    end
-
-    test 'can search by array of user ids' do
-      assert_equal [@task_one], ForemanTasks::Task.search_for("user.id ^ (#{@user_one.id})")
-      assert_equal [@task_one], ForemanTasks::Task.search_for("owner.id ^ (#{@user_one.id})")
-      assert_equal [@task_one], ForemanTasks::Task.search_for("user.id !^ (#{@user_two.id})")
-      assert_equal [@task_one], ForemanTasks::Task.search_for("owner.id !^ (#{@user_two.id})")
-    end
-
-    test 'cannot glob on user\'s id' do
-      proc { ForemanTasks::Task.search_for("user.id ~ something") }.must_raise(ScopedSearch::QueryNotSupported)
-      proc { ForemanTasks::Task.search_for("user.id ~ 5") }.must_raise(ScopedSearch::QueryNotSupported)
     end
 
     test 'can search the tasks by user with wildcards' do
-      part = @user_one.login[1..-1] # search for '*ser1' if login is 'user1'
-      # The following two should be equivalent
-      assert_equal [@task_one], ForemanTasks::Task.search_for("user ~ #{part}")
-      assert_equal [@task_one], ForemanTasks::Task.search_for("user ~ *#{part}*")
-      SecureRandom.stubs(:hex).returns('abc')
-      assert_equal ForemanTasks::Task.search_for("user ~ #{part}").to_sql,
-                   ForemanTasks::Task.search_for("user ~ *#{part}*").to_sql
-    end
-
-    test 'can search the tasks by user with negated wildcards' do
-      part = @user_two.login[1..-1] # search for '*ser1' if login is 'user1'
-      # The following two should be equivalent
-      assert_equal [@task_one], ForemanTasks::Task.search_for("user !~ #{part}")
-      assert_equal [@task_one], ForemanTasks::Task.search_for("user !~ *#{part}*")
-      SecureRandom.stubs(:hex).returns('abc')
-      assert_equal ForemanTasks::Task.search_for("user !~ #{part}").to_sql,
-                   ForemanTasks::Task.search_for("user !~ *#{part}*").to_sql
+      glob = '*' + @user_one.login[1..-1] # search for '*ser1' if login is 'user1'
+      assert_equal [@task_one], ForemanTasks::Task.search_for("user ~ #{glob}")
     end
 
     test 'can search the tasks by array' do
       assert_equal [@task_one], ForemanTasks::Task.search_for("user ^ (this_user, #{@user_one.login}, that_user)")
     end
 
-    test 'can search the tasks by negated array' do
-      assert_equal [@task_one], ForemanTasks::Task.search_for("user !^ (this_user, #{@user_two.login}, that_user)")
-    end
-
     test 'properly returns username' do
       assert_equal @task_one.username, @user_one.login
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman-tasks
 version: !ruby/object:Gem::Version
-  version: 0.16.3
+  version: 0.17.0
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-08 00:00:00.000000000 Z
+date: 2019-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foreman-tasks-core