migration: update seelect2 to latest version

grunt_config.json

@@ -23,6 +23,10 @@
         {
           "src": "<%= dirs.css.src %>/style-polymer.css",
           "dest": "<%= dirs.js.dest %>/src/components/style-polymer.css"
+        },
+        {
+          "src": "<%= dirs.js.src %>/select2/select2.css",
+          "dest": "<%= dirs.css.dest %>/select2.css"
         }
       ]
     }
@@ -41,7 +45,6 @@
         "<%= dirs.js.node_modules %>/sticky-sidebar/dist/jquery.sticky-sidebar.min.js",
         "<%= dirs.js.node_modules %>/waypoints/lib/noframework.waypoints.min.js",
         "<%= dirs.js.node_modules %>/waypoints/lib/jquery.waypoints.min.js",
-        "<%= dirs.js.node_modules %>/tom-select/dist/js/tom-select.complete.min.js",
         "<%= dirs.js.src %>/logging.js",
         "<%= dirs.js.src %>/bootstrap.js",
         "<%= dirs.js.src %>/i18n_utils.js",

package-lock.json

@@ -52,7 +52,6 @@
         "sticky-sidebar": "3.3.1",
         "style-loader": "^0.21.0",
         "sweetalert2": "^9.10.12",
-        "tom-select": "^2.4.3",
         "ts-loader": "^1.3.3",
         "waypoints": "4.0.1",
         "webpack": "4.23.1",
@@ -60,21 +59,6 @@
         "webpack-uglify-js-plugin": "^1.1.9"
       }
     },
-    "node_modules/@orchidjs/sifter": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@orchidjs/sifter/-/sifter-1.1.0.tgz",
-      "integrity": "sha512-mYwHCfr736cIWWdhhSZvDbf90AKt2xyrJspKFC3qyIJG1LtrJeJunYEqCGG4Aq2ijENbc4WkOjszcvNaIAS/pQ==",
-      "dev": true,
-      "dependencies": {
-        "@orchidjs/unicode-variants": "^1.1.2"
-      }
-    },
-    "node_modules/@orchidjs/unicode-variants": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@orchidjs/unicode-variants/-/unicode-variants-1.1.2.tgz",
-      "integrity": "sha512-5DobW1CHgnBROOEpFlEXytED5OosEWESFvg/VYmH0143oXcijYTprRYJTs+55HzGM4IqxiLFSuqEzu9mPNwVsA==",
-      "dev": true
-    },
     "node_modules/@polymer/font-roboto": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/@polymer/font-roboto/-/font-roboto-3.0.2.tgz",
@@ -10537,23 +10521,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/tom-select": {
-      "version": "2.4.3",
-      "resolved": "https://registry.npmjs.org/tom-select/-/tom-select-2.4.3.tgz",
-      "integrity": "sha512-MFFrMxP1bpnAMPbdvPCZk0KwYxLqhYZso39torcdoefeV/NThNyDu8dV96/INJ5XQVTL3O55+GqQ78Pkj5oCfw==",
-      "dev": true,
-      "dependencies": {
-        "@orchidjs/sifter": "^1.1.0",
-        "@orchidjs/unicode-variants": "^1.1.2"
-      },
-      "engines": {
-        "node": "*"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/tom-select"
-      }
-    },
     "node_modules/toposort": {
       "version": "1.0.7",
       "resolved": "https://registry.npmjs.org/toposort/-/toposort-1.0.7.tgz",
@@ -11969,21 +11936,6 @@
     }
   },
   "dependencies": {
-    "@orchidjs/sifter": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@orchidjs/sifter/-/sifter-1.1.0.tgz",
-      "integrity": "sha512-mYwHCfr736cIWWdhhSZvDbf90AKt2xyrJspKFC3qyIJG1LtrJeJunYEqCGG4Aq2ijENbc4WkOjszcvNaIAS/pQ==",
-      "dev": true,
-      "requires": {
-        "@orchidjs/unicode-variants": "^1.1.2"
-      }
-    },
-    "@orchidjs/unicode-variants": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@orchidjs/unicode-variants/-/unicode-variants-1.1.2.tgz",
-      "integrity": "sha512-5DobW1CHgnBROOEpFlEXytED5OosEWESFvg/VYmH0143oXcijYTprRYJTs+55HzGM4IqxiLFSuqEzu9mPNwVsA==",
-      "dev": true
-    },
     "@polymer/font-roboto": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/@polymer/font-roboto/-/font-roboto-3.0.2.tgz",
@@ -20733,16 +20685,6 @@
         "repeat-string": "^1.6.1"
       }
     },
-    "tom-select": {
-      "version": "2.4.3",
-      "resolved": "https://registry.npmjs.org/tom-select/-/tom-select-2.4.3.tgz",
-      "integrity": "sha512-MFFrMxP1bpnAMPbdvPCZk0KwYxLqhYZso39torcdoefeV/NThNyDu8dV96/INJ5XQVTL3O55+GqQ78Pkj5oCfw==",
-      "dev": true,
-      "requires": {
-        "@orchidjs/sifter": "^1.1.0",
-        "@orchidjs/unicode-variants": "^1.1.2"
-      }
-    },
     "toposort": {
       "version": "1.0.7",
       "resolved": "https://registry.npmjs.org/toposort/-/toposort-1.0.7.tgz",

package.json

@@ -52,7 +52,6 @@
     "sticky-sidebar": "3.3.1",
     "style-loader": "^0.21.0",
     "sweetalert2": "^9.10.12",
-    "tom-select": "^2.4.3",
     "ts-loader": "^1.3.3",
     "waypoints": "4.0.1",
     "webpack": "4.23.1",

rhodecode/lib/helpers.py

@@ -2249,7 +2249,8 @@ def dropdownmenu(name, selected, options, enable_filter=False, **attrs):
                   $('#%s').select2({
                       containerCssClass: 'drop-menu %s',
                       dropdownCssClass: 'drop-menu-dropdown',
-                      dropdownAutoWidth: true%s
+                      dropdownAutoWidth: true,
+                      width: 'auto'%s
                   });
             });
         </script>

rhodecode/templates/base/root.mako

@@ -64,6 +64,7 @@ c.template_context['attachment_store'] = {
         ## CSS definitions
         <%def name="css()">
             <link rel="stylesheet" type="text/css" href="${h.asset('css/style.css', ver=c.rhodecode_version_hash)}" media="screen"/>
+            <link rel="stylesheet" type="text/css" href="${h.asset('css/select2.css', ver=c.rhodecode_version_hash)}" media="screen"/>
             ## EXTRA FOR CSS
             ${self.css_extra()}
         </%def>