From b7e0b5e1ca188b63be292655451a40d4170b95a0 Mon Sep 17 00:00:00 2001 From: Aaron Crosman Date: Sat, 10 May 2025 16:54:05 -0400 Subject: [PATCH 1/3] Updates to remove most JQuery references --- app/render.js | 115 +++++++++++++++++++++++---------------- app/tests/render.test.js | 2 +- 2 files changed, 68 insertions(+), 49 deletions(-) diff --git a/app/render.js b/app/render.js index c3a006f..4c9f696 100644 --- a/app/render.js +++ b/app/render.js @@ -1,40 +1,49 @@ -/* global $ */ -// Initial interface setup using jQuery (since it's around from bootstrap anyway). -$.when($.ready).then(() => { +/* global bootstrap $ */ +// Replace jQuery ready handler +document.addEventListener('DOMContentLoaded', () => { // Get the current application preferences. window.api.send('get_preferences'); // Hide the places for handling responses until we have some. - $('#org-status').hide(); - $('#results-table-wrapper').hide(); - $('#results-object-viewer-wrapper').hide(); + document.getElementById('org-status').style.display = 'none'; + document.getElementById('results-table-wrapper').style.display = 'none'; + document.getElementById('results-object-viewer-wrapper').style.display = 'none'; // Setup next buttons. - $('button.btn-next').on('click', (event) => { - event.preventDefault(); - const tab = $(event.target).data('next'); - $(tab).tab('show'); + document.querySelectorAll('button.btn-next').forEach((button) => { + button.addEventListener('click', (event) => { + event.preventDefault(); + const tab = event.target.dataset.next; + // Bootstrap tab show + const tabEl = document.querySelector(tab); + const bsTab = new bootstrap.Tab(tabEl); + bsTab.show(); + }); }); // Setup prev buttons. - $('button.btn-prev').on('click', (event) => { - event.preventDefault(); - const tab = $(event.target).data('prev'); - $(tab).tab('show'); + document.querySelectorAll('button.btn-prev').forEach((button) => { + button.addEventListener('click', (event) => { + event.preventDefault(); + const tab = event.target.dataset.prev; + const tabEl = document.querySelector(tab); + const bsTab = new bootstrap.Tab(tabEl); + bsTab.show(); + }); }); // Setup Find button. - $('#btn-find-in-page').on('click', (event) => { + document.getElementById('btn-find-in-page').addEventListener('click', (event) => { event.preventDefault(); let searchDir; // Get the search - const searchText = $('#find-in-page-text').val().trim(); + const searchText = document.getElementById('find-in-page-text').value.trim(); // Trigger the search if text was provided. if (searchText) { // Set direction. searchDir = 'forward'; - if ($('#chk-find-direction').prop('checked')) { + if (document.getElementById('chk-find-direction').checked) { searchDir = 'back'; } @@ -46,19 +55,25 @@ $.when($.ready).then(() => { }); // Setup Object Select All - $('#btn-select-all-objects').on('click', (event) => { + document.getElementById('btn-select-all-objects').addEventListener('click', (event) => { event.preventDefault(); - $('#results-table input[type=checkbox]').prop('checked', true); + document.querySelectorAll('#results-table input[type=checkbox]') + .forEach((checkbox) => { + checkbox.checked = true; + }); }); - // Setup Object Select All - $('#btn-deselect-all-objects').on('click', (event) => { + // Setup Object Deselect All + document.getElementById('btn-deselect-all-objects').addEventListener('click', (event) => { event.preventDefault(); - $('#results-table input[type=checkbox]').prop('checked', false); + document.querySelectorAll('#results-table input[type=checkbox]') + .forEach((checkbox) => { + checkbox.checked = false; + }); }); // Hide loader. - $('#loader-indicator').hide(); + document.getElementById('loader-indicator').style.display = 'none'; }); // ============= Helpers ============== @@ -308,20 +323,20 @@ const generateTableCell = (tableRow, content, isText = true, position = -1) => { }; const showLoader = (message) => { - $('#loader-indicator .loader-message').text(message); - $('#loader-indicator').show(); - $('#message-wrapper').hide(); + document.querySelector('#loader-indicator .loader-message').textContent = message; + document.getElementById('loader-indicator').style.display = 'block'; + document.getElementById('message-wrapper').style.display = 'none'; }; const hideLoader = () => { - $('#loader-indicator').hide(); - $('#message-wrapper').show(); + document.getElementById('loader-indicator').style.display = 'none'; + document.getElementById('message-wrapper').style.display = 'block'; }; const updateMessage = (message) => { - $('#message-wrapper').show(); + document.getElementById('message-wrapper').style.display = 'block'; const messageArea = document.getElementById('results-message-only'); - messageArea.innerText = message; + messageArea.textContent = message; }; /** @@ -331,15 +346,13 @@ const updateMessage = (message) => { */ const refreshObjectDisplay = (data) => { showLoader('Refreshing database schema display'); - $('#results-object-viewer-wrapper .results-summary h3').text(data.message); + document.querySelector('#results-object-viewer-wrapper .results-summary h3').textContent = data.message; // When this is displaying a describe add a little helpful summary. if (Object.prototype.hasOwnProperty.call(data, 'response.fields')) { - $('#results-object-viewer-wrapper .results-summary p').text( - `Found ${data.response.fields.length} fields and ${data.response.recordTypeInfos.length} record types.`, - ); + document.querySelector('#results-object-viewer-wrapper .results-summary p').textContent = `Found ${data.response.fields.length} fields and ${data.response.recordTypeInfos.length} record types.`; } else { - $('#results-object-viewer-wrapper .results-summary p').text(''); + document.querySelector('#results-object-viewer-wrapper .results-summary p').textContent = ''; } $('#results-object-viewer').jsonViewer(data.response, { @@ -400,7 +413,7 @@ const handleLogin = (responseData) => { replaceText('login-response-message', responseData.message); // Enable the button to fetch object list. - $('#btn-fetch-objects').prop('disabled', false); + document.getElementById('btn-fetch-objects').disabled = false; }; /** @@ -423,10 +436,10 @@ const displayObjectList = (orgId, sObjectData, selected, sorted = false, sortedC updateMessage(`Object List Retrieved for ${orgUser}`); // Display area. - // @todo: remove jquery use. - $('#results-table-wrapper').show(); - $('#results-object-viewer-wrapper').hide(); - $('#results-summary-count').text('Loading objects...'); + // Replace jQuery show/hide calls + document.getElementById('results-table-wrapper').style.display = 'block'; + document.getElementById('results-object-viewer-wrapper').style.display = 'none'; + document.getElementById('results-summary-count').textContent = 'Loading objects...'; // Get the table. const resultsTable = document.getElementById('results-table'); @@ -572,10 +585,11 @@ const displayObjectList = (orgId, sObjectData, selected, sorted = false, sortedC // Add the whole table body to the table itself. resultsTable.appendChild(tBody); - $('#results-summary-count').text(`Your org contains ${objCount} creatable objects`); + // Replace jQuery text setting + document.getElementById('results-summary-count').textContent = `Your org contains ${objCount} creatable objects`; - // Enable the button to fetch object list. - $('#btn-fetch-details').prop('disabled', false); + // Replace jQuery prop call + document.getElementById('btn-fetch-details').disabled = false; // Interface update complete, hide the loader. hideLoader(); @@ -601,9 +615,15 @@ const displayDraftSchema = (orgId, schema) => { } updateMessage(`Proposed schema from ${orgUser} ready for review.`); - $('#btn-generate-schema').prop('disabled', false); - $('#btn-save-sf-schema').prop('disabled', false); - $('#nav-schema-tab').tab('show'); + // Replace jQuery prop calls + document.getElementById('btn-generate-schema').disabled = false; + document.getElementById('btn-save-sf-schema').disabled = false; + + // Replace jQuery tab show with Bootstrap native + const tabEl = document.querySelector('#nav-schema-tab'); + const tab = new bootstrap.Tab(tabEl); + tab.show(); + hideLoader(); }; @@ -634,8 +654,7 @@ const handleDatabaseFinish = (data) => { updateMessage('Database creation process complete, some tables had error. Review logs for more details'); } - // @todo remove jquery. - $('#btn-save-sql-schema').prop('disabled', false); + document.getElementById('btn-save-sql-schema').disabled = false; hideLoader(); }; diff --git a/app/tests/render.test.js b/app/tests/render.test.js index 307f5c8..7b91aac 100644 --- a/app/tests/render.test.js +++ b/app/tests/render.test.js @@ -127,7 +127,7 @@ test('Test updateMessage', () => { const message = 'Test message'; updateMessage(message); const messageElement = document.getElementById('results-message-only'); - expect(messageElement.innerText).toEqual(message); + expect(messageElement.innerHTML).toEqual(message); }); // test('Test refreshObjectDisplay', () => { From 156caf1d319b77662c762b4443343b9bbc35536a Mon Sep 17 00:00:00 2001 From: Aaron Crosman Date: Sat, 10 May 2025 18:43:23 -0400 Subject: [PATCH 2/3] Swap json viewer plugin for library --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index e88060b..95b35b2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,13 +9,13 @@ "version": "0.10.0", "license": "MIT", "dependencies": { + "@andypf/json-viewer": "^2.1.10", "bootstrap": "^5.1.3", "bootstrap-icons": "^1.5.0", "bootswatch": "^5.1.3", "electron-squirrel-startup": "^1.0.0", "fs-extra": "^8.1.0", "jquery": "^3.5.1", - "jquery.json-viewer": "^1.4.0", "jsforce": "^3", "knex": "^3.1", "minimist": "^1.2.6", @@ -64,6 +64,12 @@ "node": ">=6.0.0" } }, + "node_modules/@andypf/json-viewer": { + "version": "2.1.10", + "resolved": "https://registry.npmjs.org/@andypf/json-viewer/-/json-viewer-2.1.10.tgz", + "integrity": "sha512-z7+z4AehDo1jUPfzjFoXCGbyu1NfpIW/H1g6aPZgFZG5Q+9A6ivlZqf1zP/TVFQ/RujTwyfMQUdUz9xaYliv5Q==", + "license": "MIT" + }, "node_modules/@babel/code-frame": { "version": "7.27.1", "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.27.1.tgz", @@ -11128,12 +11134,6 @@ "integrity": "sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg==", "license": "MIT" }, - "node_modules/jquery.json-viewer": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/jquery.json-viewer/-/jquery.json-viewer-1.5.0.tgz", - "integrity": "sha512-M/mRFXg14V/UUAlz7TBNBIDmQdWt05BunsqC/UjEx5BoFdQpNpfkfDdVn+VtjX951n/an/T9GWB3apBp02x8Mg==", - "license": "MIT" - }, "node_modules/js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", diff --git a/package.json b/package.json index 82039f4..779e18e 100644 --- a/package.json +++ b/package.json @@ -25,13 +25,13 @@ "url": "https://github.com/acrosman/Salesforce2Sql" }, "dependencies": { + "@andypf/json-viewer": "^2.1.10", "bootstrap": "^5.1.3", "bootstrap-icons": "^1.5.0", "bootswatch": "^5.1.3", "electron-squirrel-startup": "^1.0.0", "fs-extra": "^8.1.0", "jquery": "^3.5.1", - "jquery.json-viewer": "^1.4.0", "jsforce": "^3", "knex": "^3.1", "minimist": "^1.2.6", From 3a67d9500cad82ff1280f49c05f2894384e996f6 Mon Sep 17 00:00:00 2001 From: Aaron Crosman Date: Sat, 10 May 2025 18:43:39 -0400 Subject: [PATCH 3/3] HTML and JS Updates to remove JQuery references. --- app/index.html | 10 ++++++---- app/render.js | 24 ++++++------------------ 2 files changed, 12 insertions(+), 22 deletions(-) diff --git a/app/index.html b/app/index.html index 2221378..1d57692 100644 --- a/app/index.html +++ b/app/index.html @@ -7,7 +7,6 @@ - Salesforce ⫸ Sql @@ -223,7 +222,8 @@
Instructions

Last Response:

- 

+                    
                     
                     

@@ -329,7 +329,9 @@ 

                                 

                                 

                             

-                            

+