Merge pull request #9438 from jrafanie/revert-jquery-371-upgrade

Revert jquery 3.7.1 upgrade

Author: GilbertCherrie

.yarnrc.yml

@@ -19,5 +19,10 @@ npmAuditExcludePackages:
 # pending | moderate | GHSA-9mvj-f7w8-pvh2 | bootstrap >=2.0.0 <=3.4.1 | 3.4.1 brought in by eonasdan-bootstrap-datetimepicker@virtual:6557af66f1a3f9d81b30dd080e0c619c011728fa0bded31959e34111c8a06d5f82c760d19a3100c59f98831cc7e73d48a91c41d41de6db59b14a282cb6169d79#npm:4.17.49
 - bootstrap-sass
 # pending | moderate | GHSA-9mvj-f7w8-pvh2 | bootstrap-sass >=2.0.0 <=3.4.3 | 3.4.3 brought in by patternfly@npm:3.59.5
+- jquery
+# pending | moderate | GHSA-rmxg-73gg-4p98 | jquery >=1.12.3 <3.0.0 | 2.2.4 brought in by manageiq-ui-classic@workspace:.
+# pending | moderate | GHSA-gxr4-xjj5-5px2 | jquery >=1.2.0 <3.5.0  | 2.2.4, 3.4.1 brought in by manageiq-ui-classic@workspace:., patternfly@npm:3.59.5
+# pending | moderate | GHSA-6c3j-c64m-qhgq | jquery >=1.1.4 <3.4.0  | 2.2.4 brought in by manageiq-ui-classic@workspace:.
+# pending | moderate | GHSA-jpcq-cgw6-v4j6 | jquery >=1.0.3 <3.5.0  | 2.2.4, 3.4.1 brought in by manageiq-ui-classic@workspace:., patternfly@npm:3.59.5
 
 yarnPath: .yarn/releases/yarn-4.9.1.cjs

app/javascript/oldjs/import.js

@@ -65,7 +65,8 @@ window.ImportSetup = {
   listenForGitPostMessages: function() {
     window.addEventListener('message', function(event) {
       var messageData = event.data.message;
-      if (messageData && messageData.level === 'error') {
+
+      if (messageData.level === 'error') {
         showErrorMessage(messageData.message);
         $('#git-url-import').prop('disabled', null);
       } else if (event.data.git_branches || event.data.git_tags) {

app/javascript/oldjs/jquery_overrides.js

@@ -24,19 +24,6 @@ jQuery.jsonPayload = function(text, fallback) {
 };
 
 $.ajaxSetup({
-  /* Define two script converters:
-
-  1) script - This is the original converter to evaluate scripts for successful responses.
-  2) miq_script - Define a duplicate but differently named script converter whose purpose is to
-  evaluate scripts for unsuccessful ajax responses.  jQuery 3.5.0 changed the behavior of the script
-  converter, replacing it with a no-op converter for scripts found in unsuccessful ajax responses.
-  Successful responses would continue to be evaluated as previously.
-  See: https://github.com/jquery/jquery/commit/da3dd85b63c4e3a6a768132c2a83a1a6eec24840
-
-  Due to this change starting in 3.5.0, we define a new type of script we can set as the dataType
-  so it's evaluated in the event of unsuccessful responses such as the SSO 401 unauthorized
-  issue we attempted to fix in #9410 and subsequently completed in #9426.
-  */
   accepts: {
     json: 'text/javascript, application/javascript, application/ecmascript, application/x-ecmascript',
   },
@@ -49,15 +36,6 @@ $.ajaxSetup({
         return jQuery.parseJSON(text);
       });
     }),
-    'text miq_script': logError(function(text) {
-      if (text.match(/^{/)) {
-        return jQuery.jsonPayload(text, function(text) {
-          return text;
-        });
-      }  // JavaScript payload
-      jQuery.globalEval(text.slice('throw "error";'.length));
-      return text;
-    }),
     'text script': logError(function(text) {
       if (text.match(/^{/)) {
         return jQuery.jsonPayload(text, function(text) {

app/javascript/oldjs/miq_application.js

@@ -1091,8 +1091,8 @@ window.miqJqueryRequest = function(url, options) {
   };
 
   if (options.dataType === undefined) {
-    ajax_options.accepts = { miq_script: `*/*;q=0.5, ${$.ajaxSettings.accepts.script}` };
-    ajax_options.dataType = 'miq_script';
+    ajax_options.accepts = { script: `*/*;q=0.5, ${$.ajaxSettings.accepts.script}` };
+    ajax_options.dataType = 'script';
   }
 
   // copy selected options over

app/javascript/spec/ops-tenant-form/ops-tenant-form.spec.js

@@ -52,9 +52,6 @@ describe('OpstTenantForm', () => {
   });
 
   it('should mount and set initialValues', async(done) => {
-    fetchMock.getOnce('/api/tenants?filter[]=name=&expand=resources', {
-      resources: [],
-    });
     fetchMock.getOnce('/api/tenants/123?expand=resources&attributes=name,description,use_config_for_attributes,ancestry,divisible', {
       name: 'foo',
     });

config/jest.setup.js

@@ -53,11 +53,7 @@ ManageIQ.redux.store.injectReducers();
 
 Object.defineProperty(Array.prototype, 'flat', {
     value: function(depth = 1) {
-      let array = this;
-      if (typeof this === 'object') {
-        array = Object.keys(this).map((key) => this[key])
-      }
-      return array.reduce(function (flat, toFlatten) {
+      return this.reduce(function (flat, toFlatten) {
         return flat.concat((Array.isArray(toFlatten) && (depth>1)) ? toFlatten.flat(depth-1) : toFlatten);
       }, []);
     }

package.json

@@ -72,7 +72,7 @@
     "eonasdan-bootstrap-datetimepicker": "~4.17.49",
     "es6-shim": "~0.35.3",
     "history": "^4.7.2",
-    "jquery": "~3.7.1",
+    "jquery": "~2.2.4",
     "jquery-ui": "~1.13.2",
     "jquery-ujs": "~1.2.2",
     "jquery.hotkeys": "~0.1.0",
@@ -190,7 +190,6 @@
     "cross-spawn": "~7.0.5",
     "decode-uri-component": "^0.2.2",
     "express": "^4.18.2",
-    "jquery": "~3.7.1",
     "lodash": "~4.17.21",
     "minimatch": "~3.1.2",
     "moment": "^2.30.1",

spec/javascripts/automate_import_export_spec.js

@@ -263,8 +263,8 @@ describe('Automate', function() {
         it('refreshes the selectpicker for git-branches and git-tags', function() {
           Automate.renderGitImport(['branches'], ['tags'], '123', {message: 'the message', level: 'warning'});
           expect($.fn.selectpicker.calls.allArgs()).toEqual([['refresh'], ['refresh']]);
-          expect($.fn.selectpicker.calls.first().object[0].className).toEqual('git-branches');
-          expect($.fn.selectpicker.calls.mostRecent().object[0].className).toEqual('git-tags');
+          expect($.fn.selectpicker.calls.first().object.selector).toEqual('select.git-branches');
+          expect($.fn.selectpicker.calls.mostRecent().object.selector).toEqual('select.git-tags');
         });
       });
 

spec/javascripts/import_spec.js

@@ -120,6 +120,7 @@ describe('import.js', function() {
 
           it('disables the git-url-import', function() {
             expect($.fn.prop).toHaveBeenCalledWith('disabled', null);
+            expect($.fn.prop.calls.mostRecent().object.selector).toEqual('#git-url-import');
           });
 
           it('turns the spinner off', function() {

spec/javascripts/miq_application_spec.js

@@ -6,7 +6,7 @@ describe('miq_application.js', function() {
     });
 
     it('verify serialize method doesnt convert line feed value to windows line feed', function() {
-      expect(miqSerializeForm('form_div')).toEqual('method_data=new%20line%20added%0A%0A');
+      expect(miqSerializeForm('form_div')).toEqual("method_data=new+line+added%0A%0A");
     });
   });