Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

UI: Apply custom config defaults based on build options #3215

Merged
merged 2 commits into from
Jan 6, 2023
+42 −45
Merged

UI: Apply custom config defaults based on build options #3215

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b7246cb
UI: Apply custom config defaults based on build options
blckmn Jan 6, 2023
82092f5
Incorrect message key
blckmn Jan 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,4 @@ nbproject/
.project
.settings/
test-results-junit/
/src/package.json
blckmn marked this conversation as resolved.
Show resolved Hide resolved
2 changes: 1 addition & 1 deletion src/js/BuildApi.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ export default class BuildApi {

const url = `${this._url}${path}`;
$.get(url, function (data) {
GUI.log(i18n.getMessage('buildServerLoaded', [path]));
GUI.log(i18n.getMessage('buildServerSuccess', [path]));
onSuccess(data);
}).fail(xhr => {
GUI.log(i18n.getMessage('buildServerFailure', [path, `HTTP ${xhr.status}`]));
Expand Down
84 changes: 40 additions & 44 deletions src/js/tabs/firmware_flasher.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ firmware_flasher.initialize = function (callback) {
}

function setBoardConfig(config, filename) {
self.config = config;
self.config = config.join('\n');
self.isConfigLocal = filename !== undefined;
self.configFilename = filename !== undefined ? filename : null;
}
Expand Down Expand Up @@ -271,18 +271,18 @@ firmware_flasher.initialize = function (callback) {

const target = $('select[name="board"] option:selected').val();

function onTargetDetail(summary) {
self.summary = summary;
function onTargetDetail(response) {
self.targetDetail = response;

if (summary.cloudBuild === true) {
if (response.cloudBuild === true) {
$('div.build_configuration').slideDown();

const expertMode = $('.tab-firmware_flasher input.expert_mode').is(':checked');
if (expertMode) {
$('div.expertOptions').show();

if (summary.releaseType === 'Unstable') {
self.releaseLoader.loadCommits(summary.release, (commits) => {
if (response.releaseType === 'Unstable') {
self.releaseLoader.loadCommits(response.release, (commits) => {
const select_e = $('select[name="commits"]');
select_e.empty();
commits.forEach((commit) => {
Expand All @@ -299,8 +299,8 @@ firmware_flasher.initialize = function (callback) {
}
}

if (summary.configuration && !self.isConfigLocal) {
setBoardConfig(summary.configuration.join('\n'));
if (response.configuration && !self.isConfigLocal) {
setBoardConfig(response.configuration);
}

$("a.load_remote_file").removeClass('disabled');
Expand Down Expand Up @@ -424,7 +424,7 @@ firmware_flasher.initialize = function (callback) {
function cleanUnifiedConfigFile(input) {
let output = [];
let inComment = false;
for (let i=0; i < input.length; i++) {
for (let i = 0; i < input.length; i++) {
if (input.charAt(i) === "\n" || input.charAt(i) === "\r") {
inComment = false;
}
Expand All @@ -445,7 +445,7 @@ firmware_flasher.initialize = function (callback) {
output.push(input.charAt(i));
}
}
return output.join('');
return output.join('').split('\n');
}

const portPickerElement = $('div#port-picker #port');
Expand Down Expand Up @@ -779,18 +779,31 @@ firmware_flasher.initialize = function (callback) {
$('.buildProgress').val(val);
}

function requestCloudBuild(summary) {
function processBuildStatus(response, statusResponse, retries) {
if (statusResponse.status === 'success') {
updateStatus(retries <= 0 ? 'SuccessCached' : "Success", response.key, 100, true);
if (statusResponse.configuration !== undefined && !self.isConfigLocal) {
setBoardConfig(statusResponse.configuration);
}
self.releaseLoader.loadTargetHex(response.url, (hex) => onLoadSuccess(hex, response.file), onLoadFailed);
} else {
updateStatus(retries > 10 ? 'TimedOut' : "Failed", response.key, 0, true);
onLoadFailed();
}
}

function requestCloudBuild(targetDetail) {
let request = {
target: summary.target,
release: summary.release,
target: targetDetail.target,
release: targetDetail.release,
options: [],
classicBuild: false,
client: {
version: CONFIGURATOR.version,
},
};

request.classicBuild = !summary.cloudBuild || $('input[name="classicBuildModeCheckbox"]').is(':checked');
request.classicBuild = !targetDetail.cloudBuild || $('input[name="classicBuildModeCheckbox"]').is(':checked');
if (!request.classicBuild) {
$('select[name="radioProtocols"] option:selected').each(function () {
request.options.push($(this).val());
Expand All @@ -809,7 +822,7 @@ firmware_flasher.initialize = function (callback) {
});

if ($('input[name="expertModeCheckbox"]').is(':checked')) {
if (summary.releaseType === "Unstable") {
if (targetDetail.releaseType === "Unstable") {
request.commit = $('select[name="commits"] option:selected').val();
}

Expand All @@ -824,45 +837,28 @@ firmware_flasher.initialize = function (callback) {
console.info("Build response:", response);

// Complete the summary object to be used later
summary.file = response.file;
self.targetDetail.file = response.file;

if (!summary.cloudBuild) {
if (!targetDetail.cloudBuild) {
// it is a previous release, so simply load the hex
self.releaseLoader.loadTargetHex(response.url, (hex) => onLoadSuccess(hex, response.file), onLoadFailed);
return;
}

updateStatus('Pending', response.key, 0, false);
let retries = 1;
self.releaseLoader.requestBuildStatus(response.key, (status) => {
if (status.status !== "queued") {
self.releaseLoader.requestBuildStatus(response.key, (statusResponse) => {
if (statusResponse.status !== "queued") {
// will be cached already, no need to wait.
if (status.status === 'success') {
updateStatus('SuccessCached', response.key, 100, true);
$('.buildProgress').val(100);
self.releaseLoader.loadTargetHex(response.url, (hex) => onLoadSuccess(hex, response.file), onLoadFailed);
} else {
updateStatus('Failed', response.key, 0, true);
onLoadFailed();
}
processBuildStatus(response, statusResponse, 0);
return;
}

const timer = setInterval(() => {
self.releaseLoader.requestBuildStatus(response.key, (status) => {
if (status.status !== 'queued' || retries > 10) {
self.releaseLoader.requestBuildStatus(response.key, (statusResponse) => {
if (statusResponse.status !== 'queued' || retries > 10) {
clearInterval(timer);
if (status.status === 'success') {
updateStatus('Success', response.key, 100, true);
self.releaseLoader.loadTargetHex(response.url, (hex) => onLoadSuccess(hex, response.file), onLoadFailed);
} else {
if (retries > 10) {
updateStatus('TimedOut', response.key, 0, true);
} else {
updateStatus('Failed', response.key, 0, true);
}
onLoadFailed();
}
processBuildStatus(response, statusResponse, retries);
return;
}

Expand All @@ -874,13 +870,13 @@ firmware_flasher.initialize = function (callback) {
}, onLoadFailed);
}

if (self.summary) { // undefined while list is loading or while running offline
if (self.targetDetail) { // undefined while list is loading or while running offline
$("a.load_remote_file").text(i18n.getMessage('firmwareFlasherButtonDownloading'));
$("a.load_remote_file").addClass('disabled');

showReleaseNotes(self.summary);
showReleaseNotes(self.targetDetail);

requestCloudBuild(self.summary);
requestCloudBuild(self.targetDetail);
} else {
$('span.progressLabel').attr('i18n','firmwareFlasherFailedToLoadOnlineFirmware').removeClass('i18n-replaced');
i18n.localizePage();
Expand Down Expand Up @@ -1021,7 +1017,7 @@ firmware_flasher.initialize = function (callback) {
}

$('span.progressLabel').on('click', 'a.save_firmware', function () {
chrome.fileSystem.chooseEntry({type: 'saveFile', suggestedName: self.summary.file, accepts: [{description: 'HEX files', extensions: ['hex']}]}, function (fileEntry) {
chrome.fileSystem.chooseEntry({type: 'saveFile', suggestedName: self.targetDetail.file, accepts: [{description: 'HEX files', extensions: ['hex']}]}, function (fileEntry) {
if (checkChromeRuntimeError()) {
return;
}
Expand Down