Merge pull request #108 from aestoltm/replace_jquery

Replacing jQuery with native JS
ubccr · May 14, 2024 · 04a7393 · 04a7393
2 parents fe20eb6 + 2508ea5
commit 04a7393
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 21 deletions.
diff --git a/html/.eslintrc.json b/html/.eslintrc.json
@@ -1,8 +1,7 @@
 {
   "env": {
     "browser": true,
-    "es6": true,
-    "jquery": true
+    "es2018": true
   },
   "globals": {
     "AppKernel": false,

diff --git a/html/gui/js/modules/app_kernels/AppKernelViewer.js b/html/gui/js/modules/app_kernels/AppKernelViewer.js
@@ -1,4 +1,4 @@
-/* global XDMoD, CCR, Ext, document, jQuery */
+/* global XDMoD, CCR, Ext, document */
 /**
  * This class contains functionality for the App Kernels tab.
  *
@@ -555,14 +555,13 @@ Ext.extend(XDMoD.Module.AppKernels.AppKernelViewer, XDMoD.PortalModule, {
                             height: height,
                             appkernels: true
                         },
-                        data: [],
                         credits: {
                             enabled: true
                         }
                     };
 
                     var chartOptions = r.get('hc_jsonstore');
-                    jQuery.extend(true, chartOptions, baseChartOptions);
+                    chartOptions = XDMoD.utils.deepExtend({}, chartOptions, baseChartOptions);
 
                     if (isMenu) {
                         chartOptions.layout.thumbnail = true;

diff --git a/html/internal_dashboard/js/Arr/ControlRegionsPanel.js b/html/internal_dashboard/js/Arr/ControlRegionsPanel.js
@@ -734,14 +734,13 @@ XDMoD.Arr.ControlRegionsPanel=Ext.extend(XDMoD.PortalModule,
                             width: isMenu ? CCR.xdmod.ui.thumbWidth * this.chartThumbScale : this.chartWidth * this.chartScale,
                             height: isMenu ? CCR.xdmod.ui.thumbHeight * this.chartThumbScale : this.chartHeight * this.chartScale
                         },
-                        data: [],
                         credits: {
                             enabled: true
                         }
                     }; //baseChartOptions
 
                     var chartOptions = r.get('hc_jsonstore');
-                    jQuery.extend(true, chartOptions, baseChartOptions);
+                    chartOptions = XDMoD.utils.deepExtend({}, chartOptions, baseChartOptions);
 
                     chartOptions.layout.hovermode = chartOptions.swapXY ? 'y unified' : 'x unified';
                     if (chartOptions.data && chartOptions.data.length !== 0) {

diff --git a/html/internal_dashboard/js/Arr/SchedulePanel.js b/html/internal_dashboard/js/Arr/SchedulePanel.js
@@ -133,25 +133,24 @@ XDMoD.Arr.SchedulePanel = Ext.extend(Ext.FormPanel, {
                     scope: this,
                     handler: function () {
                         if (self.getForm().active_record) {
-
-                            var url =  XDMoD.REST.url + '/akrr/tasks/scheduled/' +
-                                self.getForm().active_record.data.task_id +
-                                '?token=' + XDMoD.REST.token;
-
-                            jQuery.ajax({
-                                method: 'DELETE',
-                                url: url,
-                                success: function (data, textStatus, jqXHR) {
-                                    self.fireEvent('task_removed', self.getForm().active_record);
-                                },
-                                error: function (jqXHR, textStatus, errorThrown) {
-                                    console.log('An Exception has occurred: ' + textStatus + ' ' + errorThrown);
+                            fetch(`${XDMoD.REST.url}/akrr/tasks/scheduled/${self.getForm().active_record.data.task_id}?token=${XDMoD.REST.token}`, {
+                                method: 'DELETE'
+                            })
+                            .then((response) => {
+                                if (!response.ok) {
+                                    throw new Error(`An Exception has occurred: [${response.status}] ${response.statusText}`);
                                 }
+                                return response.json();
+                            })
+                            .then((data) => {
+                                self.fireEvent('task_removed', self.getForm().active_record);
+                            })
+                            .catch((error) => {
+                                console.log(error);
                             });
                         } else {
                             console.log("No record selected for deletion.");
                         }
-
                     }
                 },
                 {