Skip to content

Commit 69ea1a8

Browse files
fabik111fabik111
committed
add error message no writable prop and fix check timefilter
1 parent 794d09b commit 69ea1a8

File tree

3 files changed

+52
-44
lines changed

3 files changed

+52
-44
lines changed

‎arduino-cloud.html

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
}
3131

3232
function validateTime(v) {
33-
return (v !== null && v !== "" && v !== undefined && Number.isInteger(parseInt(v)) && parseInt(v) !== 0);
33+
return (v !== null && v !== "" && v !== undefined && Number.isInteger(parseInt(v)) && parseInt(v) > 0);
3434
}
3535

3636
function getDefaults(nodeName) {
@@ -231,9 +231,16 @@
231231
} else if ((properties && Array.isArray(properties) && properties.length !== 0)) {
232232
msg= label_func("arduino-cloud.config.node.placeholders.property-select");
233233
$("<option value='" + "" + "'> " + msg + "</option>").appendTo("#node-input-property");
234+
var elem_added = 0;
234235
for (const p of properties) {
235-
if (outs > 0 || p.permission === "READ_WRITE")
236-
$("<option value='" + p.id + "' variablename='"+p.variable_name+"'>" + p.name + "</option>").appendTo("#node-input-property");
236+
if (outs > 0 || p.permission === "READ_WRITE"){
237+
elem_added++;
238+
$("<option value='" + p.id + "' variablename='"+p.variable_name+"'>" + p.name + "</option>").appendTo("#node-input-property");
239+
}
240+
}
241+
if(elem_added === 0){
242+
msg = label_func("arduino-cloud.config.node.placeholders.no-property-writable-av")
243+
$('#node-input-property option:contains("")').text(msg);
237244
}
238245
if (property_id !== undefined) {
239246
$("#node-input-property").val(property_id);

‎arduino-cloud.js

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -96,11 +96,11 @@ module.exports = function (RED) {
9696
this.status({});
9797
} catch (err) {
9898
if(err.response && err.response.res && err.response.request){
99-
console.log('statusCode: '+ err.response.res.statusCode +'\r'+
100-
'statusMessage: ' + err.response.res.statusMessage + '\r' +
101-
'text: ' + err.response.res.text + '\r'+
102-
'HTTP method: ' + err.response.request.method + '\r' +
103-
'URL request: ' + err.response.request.url
99+
console.log('statusCode: '+ err.response.res.statusCode +'\n'+
100+
'statusMessage: ' + err.response.res.statusMessage + '\n' +
101+
'text: ' + err.response.res.text + '\n'+
102+
'HTTP method: ' + err.response.request.method + '\n' +
103+
'URL request: ' + err.response.request.url + '\n'
104104
);
105105
}else{
106106
console.log(err);
@@ -118,11 +118,11 @@ module.exports = function (RED) {
118118
}
119119
} catch (err) {
120120
if(err.response && err.response.res && err.response.request){
121-
console.log('statusCode: '+ err.response.res.statusCode +'\r'+
122-
'statusMessage: ' + err.response.res.statusMessage + '\r' +
123-
'text: ' + err.response.res.text + '\r'+
124-
'HTTP method: ' + err.response.request.method + '\r' +
125-
'URL request: ' + err.response.request.url
121+
console.log('statusCode: '+ err.response.res.statusCode +'\n'+
122+
'statusMessage: ' + err.response.res.statusMessage + '\n' +
123+
'text: ' + err.response.res.text + '\n'+
124+
'HTTP method: ' + err.response.request.method + '\n' +
125+
'URL request: ' + err.response.request.url + '\n'
126126
);
127127
}else{
128128
console.log(err);
@@ -188,11 +188,11 @@ module.exports = function (RED) {
188188
}
189189
}catch (err) {
190190
if(err.response && err.response.res && err.response.request){
191-
console.log('statusCode: '+ err.response.res.statusCode +'\r'+
192-
'statusMessage: ' + err.response.res.statusMessage + '\r' +
193-
'text: ' + err.response.res.text + '\r'+
194-
'HTTP method: ' + err.response.request.method + '\r' +
195-
'URL request: ' + err.response.request.url
191+
console.log('statusCode: '+ err.response.res.statusCode +'\n'+
192+
'statusMessage: ' + err.response.res.statusMessage + '\n' +
193+
'text: ' + err.response.res.text + '\n'+
194+
'HTTP method: ' + err.response.request.method + '\n' +
195+
'URL request: ' + err.response.request.url + '\n'
196196
);
197197
}else{
198198
console.log(err);
@@ -211,11 +211,11 @@ module.exports = function (RED) {
211211
}
212212
} catch (err) {
213213
if(err.response && err.response.res && err.response.request){
214-
console.log('statusCode: '+ err.response.res.statusCode +'\r'+
215-
'statusMessage: ' + err.response.res.statusMessage + '\r' +
216-
'text: ' + err.response.res.text + '\r'+
217-
'HTTP method: ' + err.response.request.method + '\r' +
218-
'URL request: ' + err.response.request.url
214+
console.log('statusCode: '+ err.response.res.statusCode +'\n'+
215+
'statusMessage: ' + err.response.res.statusMessage + '\n' +
216+
'text: ' + err.response.res.text + '\n'+
217+
'HTTP method: ' + err.response.request.method + '\n' +
218+
'URL request: ' + err.response.request.url + '\n'
219219
);
220220
}else{
221221
console.log(err);
@@ -261,11 +261,11 @@ module.exports = function (RED) {
261261
}
262262
} catch (err) {
263263
if(err.response && err.response.res && err.response.request){
264-
console.log('statusCode: '+ err.response.res.statusCode +'\r'+
265-
'statusMessage: ' + err.response.res.statusMessage + '\r' +
266-
'text: ' + err.response.res.text + '\r'+
267-
'HTTP method: ' + err.response.request.method + '\r' +
268-
'URL request: ' + err.response.request.url
264+
console.log('statusCode: '+ err.response.res.statusCode +'\n'+
265+
'statusMessage: ' + err.response.res.statusMessage + '\n' +
266+
'text: ' + err.response.res.text + '\n'+
267+
'HTTP method: ' + err.response.request.method + '\n' +
268+
'URL request: ' + err.response.request.url + '\n'
269269
);
270270
}else{
271271
console.log(err);
@@ -295,11 +295,11 @@ module.exports = function (RED) {
295295
this.pollTimeoutPoll = setTimeout(() => { this.poll(connectionConfig, pollTime) }, pollTime * 1000);
296296
} catch (err) {
297297
if(err.response && err.response.res && err.response.request){
298-
console.log('statusCode: '+ err.response.res.statusCode +'\r'+
299-
'statusMessage: ' + err.response.res.statusMessage + '\r' +
300-
'text: ' + err.response.res.text + '\r'+
301-
'HTTP method: ' + err.response.request.method + '\r' +
302-
'URL request: ' + err.response.request.url
298+
console.log('statusCode: '+ err.response.res.statusCode +'\n'+
299+
'statusMessage: ' + err.response.res.statusMessage + '\n' +
300+
'text: ' + err.response.res.text + '\n'+
301+
'HTTP method: ' + err.response.request.method + '\n' +
302+
'URL request: ' + err.response.request.url + '\n'
303303
);
304304
}else{
305305
console.log(err);
@@ -346,11 +346,11 @@ module.exports = function (RED) {
346346
this.status({});
347347
} catch (err) {
348348
if(err.response && err.response.res && err.response.request){
349-
console.log('statusCode: '+ err.response.res.statusCode +'\r'+
350-
'statusMessage: ' + err.response.res.statusMessage + '\r' +
351-
'text: ' + err.response.res.text + '\r'+
352-
'HTTP method: ' + err.response.request.method + '\r' +
353-
'URL request: ' + err.response.request.url
349+
console.log('statusCode: '+ err.response.res.statusCode +'\n'+
350+
'statusMessage: ' + err.response.res.statusMessage + '\n' +
351+
'text: ' + err.response.res.text + '\n'+
352+
'HTTP method: ' + err.response.request.method + '\n' +
353+
'URL request: ' + err.response.request.url + '\n'
354354
);
355355
}else{
356356
console.log(err);
@@ -368,11 +368,11 @@ module.exports = function (RED) {
368368
}
369369
} catch (err) {
370370
if(err.response && err.response.res && err.response.request){
371-
console.log('statusCode: '+ err.response.res.statusCode +'\r'+
372-
'statusMessage: ' + err.response.res.statusMessage + '\r' +
373-
'text: ' + err.response.res.text + '\r'+
374-
'HTTP method: ' + err.response.request.method + '\r' +
375-
'URL request: ' + err.response.request.url
371+
console.log('statusCode: '+ err.response.res.statusCode +'\n'+
372+
'statusMessage: ' + err.response.res.statusMessage + '\n' +
373+
'text: ' + err.response.res.text + '\n'+
374+
'HTTP method: ' + err.response.request.method + '\n' +
375+
'URL request: ' + err.response.request.url + '\n'
376376
);
377377
}else{
378378
console.log(err);

‎locales/en-US/arduino-cloud.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@
1414
"thing-select":"Select a thing",
1515
"no-things-available":"No things available",
1616
"property-select":"Select a property",
17-
"no-property-available":"No properties available"
17+
"no-property-available":"No properties available",
18+
"no-property-writable-av":"No writable properties available"
1819
}
1920
},
2021
"time":{

0 commit comments

Comments
 (0)