[16.0][MIG] web_search_with_and.

Author: Sandip-scs

setup/web_search_with_and/odoo/addons/web_search_with_and

@@ -0,0 +1 @@
+../../../../web_search_with_and

setup/web_search_with_and/setup.py

@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)

web_search_with_and/README.rst

@@ -14,14 +14,14 @@ Use AND conditions on omnibar search
     :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
     :alt: License: AGPL-3
 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fweb-lightgray.png?logo=github
-    :target: https://github.com/OCA/web/tree/15.0/web_search_with_and
+    :target: https://github.com/OCA/web/tree/16.0/web_search_with_and
     :alt: OCA/web
 .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
-    :target: https://translation.odoo-community.org/projects/web-15-0/web-15-0-web_search_with_and
+    :target: https://translation.odoo-community.org/projects/web-16-0/web-16-0-web_search_with_and
     :alt: Translate me on Weblate
-.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png
-    :target: https://runbot.odoo-community.org/runbot/162/15.0
-    :alt: Try me on Runbot
+.. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png
+    :target: https://runboat.odoo-community.org/webui/builds.html?repo=OCA/web&target_branch=16.0
+    :alt: Try me on Runboat
 
 |badge1| |badge2| |badge3| |badge4| |badge5| 
 
@@ -58,7 +58,7 @@ Bug Tracker
 Bugs are tracked on `GitHub Issues <https://github.com/OCA/web/issues>`_.
 In case of trouble, please check there if your issue has already been reported.
 If you spotted it first, help us smashing it by providing a detailed and welcomed
-`feedback <https://github.com/OCA/web/issues/new?body=module:%20web_search_with_and%0Aversion:%2015.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+`feedback <https://github.com/OCA/web/issues/new?body=module:%20web_search_with_and%0Aversion:%2016.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
 
 Do not contact contributors directly about support or help with technical issues.
 
@@ -82,6 +82,7 @@ Contributors
 * Souheil Bejaoui <souheil.bejaoui@acsone.eu>
 * Pedro Guirao <pedro.guirao@ingenieriacloud.com>
 * Nedas Žilinskas <nedas.zilinskas@avoin.systems>
+* Sandip SerpentCS <sandip.v.serpentcs@gmail.com>
 
 Maintainers
 ~~~~~~~~~~~
@@ -96,6 +97,6 @@ OCA, or the Odoo Community Association, is a nonprofit organization whose
 mission is to support the collaborative development of Odoo features and
 promote its widespread use.
 
-This module is part of the `OCA/web <https://github.com/OCA/web/tree/15.0/web_search_with_and>`_ project on GitHub.
+This module is part of the `OCA/web <https://github.com/OCA/web/tree/16.0/web_search_with_and>`_ project on GitHub.
 
 You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

web_search_with_and/__manifest__.py

@@ -4,16 +4,17 @@
 
 {
     "name": "Use AND conditions on omnibar search",
-    "version": "15.0.1.0.0",
-    "author": "Versada UAB, ACSONE SA/NV, Serincloud, Odoo Community Association (OCA)",
+    "version": "16.0.1.0.0",
+    "author": """Sandip SCS, Versada UAB, ACSONE SA/NV, Serincloud,
+    Odoo Community Association (OCA)""",
     "license": "AGPL-3",
     "category": "web",
     "website": "https://github.com/OCA/web",
     "depends": ["web"],
     "assets": {
         "web.assets_backend": [
-            "/web_search_with_and/static/src/js/control_panel_model_extension.js",
-            "/web_search_with_and/static/src/js/search_bar.js",
+            "/web_search_with_and/static/src/js/search_model.esm.js",
+            "/web_search_with_and/static/src/js/search_bar.esm.js",
         ],
     },
 }

web_search_with_and/readme/CONTRIBUTORS.rst

@@ -5,3 +5,4 @@
 * Souheil Bejaoui <souheil.bejaoui@acsone.eu>
 * Pedro Guirao <pedro.guirao@ingenieriacloud.com>
 * Nedas Žilinskas <nedas.zilinskas@avoin.systems>
+* Sandip SerpentCS <sandip.v.serpentcs@gmail.com>

web_search_with_and/static/description/index.html

@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.15.1: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils: http://docutils.sourceforge.net/" />
 <title>Use AND conditions on omnibar search</title>
 <style type="text/css">
 
@@ -367,7 +367,7 @@ <h1 class="title">Use AND conditions on omnibar search</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<p><a class="reference external" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external" href="https://github.com/OCA/web/tree/15.0/web_search_with_and"><img alt="OCA/web" src="https://img.shields.io/badge/github-OCA%2Fweb-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/web-15-0/web-15-0-web_search_with_and"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runbot.odoo-community.org/runbot/162/15.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
+<p><a class="reference external" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external" href="https://github.com/OCA/web/tree/16.0/web_search_with_and"><img alt="OCA/web" src="https://img.shields.io/badge/github-OCA%2Fweb-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/web-16-0/web-16-0-web_search_with_and"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runboat.odoo-community.org/webui/builds.html?repo=OCA/web&amp;target_branch=16.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>When searching for records on same field Odoo joins multiple queries with OR.
 For example:</p>
 <ul class="simple">
@@ -405,7 +405,7 @@ <h1><a class="toc-backref" href="#id2">Bug Tracker</a></h1>
 <p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/web/issues">GitHub Issues</a>.
 In case of trouble, please check there if your issue has already been reported.
 If you spotted it first, help us smashing it by providing a detailed and welcomed
-<a class="reference external" href="https://github.com/OCA/web/issues/new?body=module:%20web_search_with_and%0Aversion:%2015.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
+<a class="reference external" href="https://github.com/OCA/web/issues/new?body=module:%20web_search_with_and%0Aversion:%2016.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
 <p>Do not contact contributors directly about support or help with technical issues.</p>
 </div>
 <div class="section" id="credits">
@@ -428,6 +428,7 @@ <h2><a class="toc-backref" href="#id5">Contributors</a></h2>
 <li>Souheil Bejaoui &lt;<a class="reference external" href="mailto:souheil.bejaoui&#64;acsone.eu">souheil.bejaoui&#64;acsone.eu</a>&gt;</li>
 <li>Pedro Guirao &lt;<a class="reference external" href="mailto:pedro.guirao&#64;ingenieriacloud.com">pedro.guirao&#64;ingenieriacloud.com</a>&gt;</li>
 <li>Nedas Žilinskas &lt;<a class="reference external" href="mailto:nedas.zilinskas&#64;avoin.systems">nedas.zilinskas&#64;avoin.systems</a>&gt;</li>
+<li>Sandip SerpentCS &lt;<a class="reference external" href="mailto:sandip.v.serpentcs&#64;gmail.com">sandip.v.serpentcs&#64;gmail.com</a>&gt;</li>
 </ul>
 </div>
 <div class="section" id="maintainers">
@@ -437,7 +438,7 @@ <h2><a class="toc-backref" href="#id6">Maintainers</a></h2>
 <p>OCA, or the Odoo Community Association, is a nonprofit organization whose
 mission is to support the collaborative development of Odoo features and
 promote its widespread use.</p>
-<p>This module is part of the <a class="reference external" href="https://github.com/OCA/web/tree/15.0/web_search_with_and">OCA/web</a> project on GitHub.</p>
+<p>This module is part of the <a class="reference external" href="https://github.com/OCA/web/tree/16.0/web_search_with_and">OCA/web</a> project on GitHub.</p>
 <p>You are welcome to contribute. To learn how please visit <a class="reference external" href="https://odoo-community.org/page/Contribute">https://odoo-community.org/page/Contribute</a>.</p>
 </div>
 </div>

web_search_with_and/static/src/js/control_panel_model_extension.js

@@ -0,0 +1,23 @@
+/** @odoo-module **/
+
+import {patch} from "@web/core/utils/patch";
+import {SearchBar} from "@web/search/search_bar/search_bar";
+
+patch(SearchBar.prototype, "web_search_with_and/static/src/js/search_bar.js", {
+    selectItem(item) {
+        if (!item.unselectable) {
+            const {searchItemId, label, operator, value} = item;
+            this.env.searchModel.addAutoCompletionValues(searchItemId, {
+                label,
+                operator,
+                value,
+                isShiftKey: this.isShiftKey,
+            });
+        }
+        this.resetState();
+    },
+    onSearchKeydown(ev) {
+        this.isShiftKey = ev.shiftKey || false;
+        this._super(ev);
+    },
+});