Remove Select2

uyuni-project · Oct 23, 2023 · dd1be74 · dd1be74
1 parent 36381d0
commit dd1be74
Show file tree

Hide file tree

Showing 14 changed files with 4 additions and 78 deletions.
diff --git a/java/code/webapp/WEB-INF/decorators/layout_error.jsp b/java/code/webapp/WEB-INF/decorators/layout_error.jsp
@@ -45,7 +45,6 @@
 
     <script src="/javascript/jquery.js?cb=${cb_version}"></script>
     <script src="/javascript/bootstrap.js?cb=${cb_version}"></script>
-    <script src="/javascript/select2/select2.js?cb=${cb_version}"></script>
     <script src="/javascript/spacewalk-essentials.js?cb=${cb_version}"></script>
     <script src="/javascript/spacewalk-checkall.js?cb=${cb_version}"></script>
 

diff --git a/java/code/webapp/WEB-INF/decorators/layout_head.jsp b/java/code/webapp/WEB-INF/decorators/layout_head.jsp
@@ -29,8 +29,6 @@
     <!-- import plugins styles -->
     <link rel="stylesheet" href="/css/legacy/jquery.timepicker.css?cb=${cb_version}" />
     <link rel="stylesheet" href="/css/bootstrap-datepicker.css?cb=${cb_version}" />
-    <link rel="stylesheet" href="/javascript/select2/select2.css?cb=${cb_version}" />
-    <link rel="stylesheet" href="/javascript/select2/select2-bootstrap.css?cb=${cb_version}" />
 
     <!-- import styles -->
     <c:set var="webTheme" value="${GlobalInstanceHolder.USER_PREFERENCE_UTILS.getCurrentWebTheme(pageContext)}"/>
@@ -71,7 +69,6 @@
 
     <script src="/javascript/legacy/jquery.min.js?cb=${cb_version}"></script>
     <script src="/javascript/legacy/bootstrap.min.js?cb=${cb_version}"></script>
-    <script src="/javascript/select2/select2.js?cb=${cb_version}"></script>
     <script src="/javascript/spacewalk-essentials.js?cb=${cb_version}"></script>
     <script src="/javascript/spacewalk-checkall.js?cb=${cb_version}"></script>
     <script src="/javascript/ajax.js?cb=${cb_version}"></script>

diff --git a/java/spacewalk-java.changes.eth.select2 b/java/spacewalk-java.changes.eth.select2
@@ -0,0 +1 @@
+- Remove Select2
diff --git a/web/html/src/branding/css/base/visualization.less b/web/html/src/branding/css/base/visualization.less
@@ -102,14 +102,6 @@
       margin-right: 5px;
       vertical-align: sub;
     }
-    .select2-container-multi .select2-choices .select2-search-field input {
-      height: 28px;
-      padding: 2px 4px;
-    }
-    .select2-container-multi .select2-choices .select2-search-choice {
-      margin-top: 4px;
-      margin-bottom: 1px;
-    }
     .toggle-grouping-level i{
       margin: 0px 4px;
       vertical-align: middle;

diff --git a/web/html/src/branding/css/susemanager/components/inputs.less b/web/html/src/branding/css/susemanager/components/inputs.less
@@ -50,36 +50,3 @@ select[size] {
 .input-group-addon {
   border-color: @eos-bc-gray-700 !important;
 }
-
-.select2-container {
-  padding: 0 !important;
-}
-
-.select2-choices {
-  border-radius: 0 !important;
-  border: none !important;
-  outline: none !important;
-  box-shadow: none !important;
-}
-
-.select2-search-field {
-  width: 100%;
-}
-
-.select2-input {
-  width: 100% !important;
-  height: @input-height !important;
-  padding: 8px !important;
-  border: 1px solid @eos-bc-gray-700 !important;
-  border-radius: @border-radius-base !important;
-
-  .select2-container-active & {
-    border-color: @eos-bc-blue-500 !important;
-    outline: none !important;
-  }
-}
-
-.select2-drop-active {
-  border-color: @eos-bc-blue-500 !important;
-  border-radius: 0 !important;
-}
diff --git a/web/html/src/build/webpack.config.js b/web/html/src/build/webpack.config.js
@@ -64,14 +64,6 @@ module.exports = (env, argv) => {
         to: path.resolve(__dirname, "../dist/javascript/legacy"),
       },
       // TODO: Take only what we need after we've confirmed it works fine, otherwise there's a lot of fluff in this
-      {
-        from: path.resolve(__dirname, "../node_modules/select2"),
-        to: path.resolve(__dirname, "../dist/javascript/legacy/select2"),
-      },
-      {
-        from: path.resolve(__dirname, "../node_modules/select2-bootstrap-css/select2-bootstrap.css"),
-        to: path.resolve(__dirname, "../dist/javascript/legacy/select2"),
-      },
       {
         from: path.resolve(__dirname, "../node_modules/timepicker/jquery.timepicker.js"),
         to: path.resolve(__dirname, "../dist/javascript/legacy"),

diff --git a/web/html/src/manager/visualization/ui/components.ts b/web/html/src/manager/visualization/ui/components.ts
@@ -1,11 +1,5 @@
 import * as d3 from "d3";
 
-declare global {
-  interface JQuery {
-    select2: (...args: any[]) => JQuery;
-  }
-}
-
 // D3 UI "components" used for visualization
 
 // Add a filter to given selection

diff --git a/web/html/src/package.json b/web/html/src/package.json
@@ -103,8 +103,6 @@
     "react-toastify": "6.0.5",
     "react-virtuoso": "^2.5.1",
     "regenerator-runtime": "^0.13.7",
-    "select2": "3.4.5",
-    "select2-bootstrap-css": "1.4.6",
     "semver": "^7.3.8",
     "senna": "^2.7.8",
     "shelljs": "0.8.5",

diff --git a/web/html/src/styleguide/template.js b/web/html/src/styleguide/template.js
@@ -15,8 +15,6 @@ module.exports = {
       `/fonts/font-spacewalk/css/spacewalk-font.css?cb=${noCache}`,
       `/css/jquery.timepicker.css?cb=${noCache}`,
       `/css/bootstrap-datepicker.css?cb=${noCache}`,
-      `/javascript/select2/select2.css?cb=${noCache}`,
-      `/javascript/select2/select2-bootstrap.css?cb=${noCache}`,
     ]
       .map(relativeToProxyUrl)
       .map((url) => ({
@@ -29,7 +27,6 @@ module.exports = {
       // `/javascript/frontend-log.js`,
       `/javascript/legacy/jquery.min.js?cb=${noCache}`,
       `/javascript/legacy/bootstrap.min.js?cb=${noCache}`,
-      `/javascript/select2/select2.js?cb=${noCache}`,
       `/javascript/spacewalk-essentials.js?cb=${noCache}`,
       `/javascript/spacewalk-checkall.js?cb=${noCache}`,
       `/javascript/legacy/jquery.timepicker.js?cb=${noCache}`,

diff --git a/web/html/src/vendors/npm.licenses.structured.js b/web/html/src/vendors/npm.licenses.structured.js
diff --git a/web/html/src/vendors/npm.licenses.txt b/web/html/src/vendors/npm.licenses.txt
@@ -2458,7 +2458,7 @@ THE SOFTWARE.
 
 
 --------------------------------------------------------------------------------
-prop-types v15.8.1
+prop-types v15.7.2
 facebook/prop-types
 --------------------------------------------------------------------------------
 

diff --git a/web/html/src/yarn.lock b/web/html/src/yarn.lock
@@ -11337,16 +11337,6 @@ select-hose@^2.0.0:
   resolved "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca"
   integrity sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo=
 
-select2-bootstrap-css@1.4.6:
-  version "1.4.6"
-  resolved "https://registry.yarnpkg.com/select2-bootstrap-css/-/select2-bootstrap-css-1.4.6.tgz#5cfb68246f5299ca1858e01efd788804c734997e"
-  integrity sha512-BBsisfivUYjwhj3QdWNS15sBqC/DHoszRC4B3GIzJwMNO1pT1uVvwDm5u2TLXi7oj/3S4vIeQ6yAuMa86d7c9A==
-
-select2@3.4.5:
-  version "3.4.5"
-  resolved "https://registry.yarnpkg.com/select2/-/select2-3.4.5.tgz#c0555ed77da22b1d402ec9e1a69687abc15e747a"
-  integrity sha512-M+XNsLYyQ8oML8cRqqcPWuRs90gOxbS0O+OZtZycJ8ybJuJ1m/B/I3DJ5HlLWEXH1s6rZPsa0j2392XWdOQAaQ==
-
 selfsigned@^1.10.8:
   version "1.10.14"
   resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-1.10.14.tgz#ee51d84d9dcecc61e07e4aba34f229ab525c1574"

diff --git a/web/spacewalk-web.changes.eth.select2 b/web/spacewalk-web.changes.eth.select2
@@ -0,0 +1 @@
+- Remove Select2
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
@@ -269,8 +269,6 @@ sed -i -e 's/^web.theme_default =.*$/web.theme_default = susemanager-light/' $RP
 %{www_path}/javascript/manager/*.{js,js.LICENSE.txt,css}
 %dir %{www_path}/javascript/legacy
 %{www_path}/javascript/legacy/*.{js,js.LICENSE.txt,css}
-%dir %{www_path}/javascript/legacy/select2
-%{www_path}/javascript/legacy/select2/*
 %dir %{www_path}/javascript/legacy/ace-editor
 %{www_path}/javascript/legacy/ace-editor/*
 %license LICENSE