foreman-tasks 3.0.3 → 3.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6442bb42dbd73e86c09da30b7b10651a055108a43169ec9aa99b6ee9afe67cc4
-  data.tar.gz: b65ed0dbeac486d6cfce23e4af226a1c87289284d4c4962482e6f74ad4f24a36
+  metadata.gz: '09cfa50efbe1f8e34246268b386aa7f2cdc0e6f723beda8aedf60a6edf372cbb'
+  data.tar.gz: 6124d140e2ddd581ff85c7d4c44bb6c3fed01a9e64050e39bf595bff485ca7bb
 SHA512:
-  metadata.gz: 7f1f2cc08a2d6a1d312c302d27f965ce9bcf5c1dafb8de0d63299952f598478a1b9c5637f2b940e840d31836ec4a6a236cf176de53d25e980001efa41871dd7e
-  data.tar.gz: 671329ba2b9539fd586d82092e77458b482a445e34c4cbed18d9d9e9854b4573a59f7e475aa7ae2ec41f1959938020a376a4adf2f48e09747023109fb518d1ae
+  metadata.gz: 5ee3cd1aee581db4ab76b9278624d00b28271965655cc9c154d2cd18ac3d9284244886d74bd6f6654847d5ae19f9dc8245eb517227ee1b4c8b88281066f43a19
+  data.tar.gz: 67c6b3edfd673e60489884f2dbb18fec2a03c7a2a33a04933f1a087686c2b18324038ca2f283a3c07608cae8d335b1f4e441ceffa92dad094468a3ac77cccaaa

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

@@ -20,7 +20,7 @@ module ForemanTasks
             foreman_tasks_locks_taxonomy#{uniq_suffix}.resource_type = '#{resource_type}')
         SQL
         # Select only those tasks which either have the correct taxonomy or are not related to any
-        sql = "foreman_tasks_locks_taxonomy#{uniq_suffix}.resource_id #{operator} ? OR foreman_tasks_locks_taxonomy#{uniq_suffix}.resource_id IS NULL"
+        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
 

data/lib/foreman_tasks/version.rb

@@ -1,3 +1,3 @@
 module ForemanTasks
-  VERSION = '3.0.3'.freeze
+  VERSION = '3.0.4'.freeze
 end

data/test/unit/task_test.rb

@@ -129,6 +129,14 @@ class TasksTest < ActiveSupport::TestCase
         _ { proc { ForemanTasks::Task.search_for('duration = "25 potatoes"') } }.must_raise ScopedSearch::QueryNotSupported
       end
     end
+
+    context 'by taxonomies' do
+      test 'can search by taxonomies using IN' do
+        assert_nothing_raised(PG::SyntaxError) { ForemanTasks::Task.search_for('location_id ^ (1)').first }
+        assert_nothing_raised(PG::SyntaxError) { ForemanTasks::Task.search_for('organization_id ^ (1)').first }
+        assert_nothing_raised(PG::SyntaxError) { ForemanTasks::Task.search_for('organization_id = 1').first }
+      end
+    end
   end
 
   describe 'users' do

data/webpack/ForemanTasks/Components/TasksTable/TasksTableHelpers.js

@@ -14,14 +14,6 @@ export const getApiPathname = url => {
   return uri.pathname().replace('foreman_tasks/', 'foreman_tasks/api/');
 };
 
-export const resolveSearchQuery = (search, history) => {
-  const uriQuery = {
-    search,
-    page: 1,
-  };
-  updateURlQuery(uriQuery, history);
-};
-
 export const getCSVurl = (path, query) => {
   let url = new URI(path);
   url = url.pathname(`${url.pathname()}.csv`);

data/webpack/ForemanTasks/Components/TasksTable/TasksTablePage.js

@@ -1,5 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
+import URI from 'urijs';
 import { getURIsearch } from 'foremanReact/common/urlHelpers';
 import { Spinner, Button, Icon } from 'patternfly-react';
 import PageLayout from 'foremanReact/routes/common/PageLayout/PageLayout';
@@ -10,7 +11,7 @@ import { STATUS } from 'foremanReact/constants';
 import { useForemanModal } from 'foremanReact/components/ForemanModal/ForemanModalHooks';
 import TasksDashboard from '../TasksDashboard';
 import TasksTable from './TasksTable';
-import { resolveSearchQuery, getCSVurl } from './TasksTableHelpers';
+import { getCSVurl, updateURlQuery } from './TasksTableHelpers';
 import ConfirmModal from './Components/ConfirmModal/';
 import {
   TASKS_SEARCH_PROPS,
@@ -35,8 +36,17 @@ const TasksTablePage = ({
 }) => {
   const url = history.location.pathname + history.location.search;
   const uriQuery = getURIQuery(url);
-  const onSearch = searchQuery => {
-    resolveSearchQuery(searchQuery, history);
+  const onSearch = search => {
+    const uri = new URI(url);
+    if (uri.search(true).search === search && uri.search(true).page === '1') {
+      props.getTableItems(uri);
+    } else {
+      const newUriQuery = {
+        search,
+        page: 1,
+      };
+      updateURlQuery(newUriQuery, history);
+    }
   };
 
   const { setModalOpen, setModalClosed } = useForemanModal({

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman-tasks
 version: !ruby/object:Gem::Version
-  version: 3.0.3
+  version: 3.0.4
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-07 00:00:00.000000000 Z
+date: 2021-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dynflow