Skip to content

Commit

Permalink
[qa] Switched to prettier for CSS/JS formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
youhaveme9 authored and nemesifier committed Jan 28, 2025
1 parent f20f6a2 commit af5effb
Show file tree
Hide file tree
Showing 9 changed files with 64 additions and 83 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ jobs:
pip install -U -r requirements-test.txt
pip install -U -e .
pip install -U ${{ matrix.django-version }}
sudo npm install -g jshint stylelint
sudo npm install -g prettier
- name: QA checks
run: |
Expand Down
22 changes: 0 additions & 22 deletions .jshintrc

This file was deleted.

2 changes: 1 addition & 1 deletion docs/developer/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ Install development dependencies:
pip install -e .
pip install -r requirements-test.txt
sudo npm install -g jshint stylelint
sudo npm install -g prettier
Install WebDriver for Chromium for your browser version from
https://chromedriver.chromium.org/home and Extract ``chromedriver`` to one
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#main div[id*=upgrade_options_jsoneditor] .controls {
#main div[id*="upgrade_options_jsoneditor"] .controls {
display: none;
}
.field-readonly_upgrade_options .readonly-upgrade-options {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ form .errorlist {
.errorlist > li {
visibility: hidden;
}
.errorlist ul li{
.errorlist ul li {
visibility: visible;
}
#ow-loading {
Expand Down
16 changes: 8 additions & 8 deletions openwisp_firmware_upgrader/static/firmware-upgrader/js/build.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
'use strict';
"use strict";

django.jQuery(function ($) {
function initSelect2() {
$('select[id^="id_firmwareimage_set"][id$="type"]')
.not('select[name*="__prefix__"]')
.select2();
}
$('.add-row > a').click(initSelect2);
initSelect2();
function initSelect2() {
$('select[id^="id_firmwareimage_set"][id$="type"]')
.not('select[name*="__prefix__"]')
.select2();
}
$(".add-row > a").click(initSelect2);
initSelect2();
});
Original file line number Diff line number Diff line change
@@ -1,37 +1,42 @@
'use strict';
"use strict";

django.jQuery(function ($) {
if(firmwareUpgraderSchema === null) {
if (firmwareUpgraderSchema === null) {
return;
}
var firmwareImageChanged = false;
// Do not render JSONSchema form if the image field is not changed.
// The "change" event is also emitted when the form is rendered.
// The "firmwareImageChanged" variable is used as flag to prevent this
// behavior.
if (
$("#id_devicefirmware-0-upgrade_options").val() &&
$("#id_devicefirmware-0-upgrade_options").val() !== "null"
) {
firmwareImageChanged = true;
}
$("#devicefirmware-group").on(
"change",
"#id_devicefirmware-0-image",
function (event) {
if (!$(event.target).val()) {
$("#id_devicefirmware-0-upgrade_options_jsoneditor").hide();
return;
}
var firmwareImageChanged = false;
// Do not render JSONSchema form if the image field is not changed.
// The "change" event is also emitted when the form is rendered.
// The "firmwareImageChanged" variable is used as flag to prevent this
// behavior.
if (
$('#id_devicefirmware-0-upgrade_options').val() && $('#id_devicefirmware-0-upgrade_options').val() !== 'null'
) {
}
$("#id_devicefirmware-0-upgrade_options_jsoneditor").show();
if (firmwareImageChanged) {
django._loadJsonSchemaUi(
$("#id_devicefirmware-0-upgrade_options").get(0),
false,
firmwareUpgraderSchema,
true,
);
} else {
firmwareImageChanged = true;
}
$('#devicefirmware-group').on('change', '#id_devicefirmware-0-image', function (event) {
if (!$(event.target).val()) {
$('#id_devicefirmware-0-upgrade_options_jsoneditor').hide();
return;
}
$('#id_devicefirmware-0-upgrade_options_jsoneditor').show();
if (firmwareImageChanged) {
django._loadJsonSchemaUi(
$('#id_devicefirmware-0-upgrade_options').get(0),
false,
firmwareUpgraderSchema,
true
);
} else {
firmwareImageChanged = true;
}
});
$('#devicefirmware-group .add-row a').click(function() {
firmwareImageChanged = true;
});
}
},
);
$("#devicefirmware-group .add-row a").click(function () {
firmwareImageChanged = true;
});
});
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
'use strict';
"use strict";

django.jQuery(function ($) {
if(firmwareUpgraderSchema === null) {
$('.form-row').hide();

} else {
django._loadJsonSchemaUi(
$('textarea[name="upgrade_options"]').get(0),
false,
firmwareUpgraderSchema,
true
);
}
$('#ow-loading').hide();
if (firmwareUpgraderSchema === null) {
$(".form-row").hide();
} else {
django._loadJsonSchemaUi(
$('textarea[name="upgrade_options"]').get(0),
false,
firmwareUpgraderSchema,
true,
);
}
$("#ow-loading").hide();
});
7 changes: 3 additions & 4 deletions run-qa-checks
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,9 @@
set -e
openwisp-qa-check \
--migration-path ./openwisp_firmware_upgrader/migrations \
--migration-module firmware_upgrader

# JShint checks
jshint openwisp_firmware_upgrader/static/firmware-upgrader/js/*.js
--migration-module firmware_upgrader \
--csslinter \
--jslinter

echo ''
echo 'Running checks for SAMPLE_APP'
Expand Down

0 comments on commit af5effb

Please # to comment.