Show invalid url error on UI, add test case

This commit is contained in:
rejas
2021-03-16 13:47:48 +01:00
parent 2ec275957f
commit a269b5cd93
6 changed files with 68 additions and 9 deletions

View File

@@ -66,6 +66,7 @@ Module.register("newsfeed", {
this.newsItems = [];
this.loaded = false;
this.error = null;
this.activeItem = 0;
this.scrollPosition = 0;
@@ -87,8 +88,10 @@ Module.register("newsfeed", {
}
this.loaded = true;
this.error = null;
} else if (notification === "INCORRECT_URL") {
Log.error("Newsfeed Error. Incorrect url: " + payload.url);
this.error = "Newsfeed Error. Incorrect url: " + payload.url;
this.scheduleUpdateInterval();
}
},
@@ -110,15 +113,20 @@ Module.register("newsfeed", {
url: this.getActiveItemURL()
};
}
if (this.error) {
return {
error: this.error
};
}
if (this.newsItems.length === 0) {
return {
loaded: false
};
}
if (this.activeItem >= this.newsItems.length) {
this.activeItem = 0;
}
const item = this.newsItems[this.activeItem];
return {

View File

@@ -6,7 +6,7 @@
{{ sourceTitle }}{% if config.showPublishDate %}, {% else %}: {% endif %}
{% endif %}
{% if config.showPublishDate %}
{{ publishDate }}:
{{ publishDate }}:
{% endif %}
</div>
{% endif %}
@@ -21,8 +21,12 @@
{% endif %}
</div>
</div>
{% elseif error %}
<div class="small dimmed">
{{ error }}
</div>
{% else %}
<div class="small dimmed">
{{ "LOADING" | translate | safe }}
</div>
{% endif %}
{% endif %}

View File

@@ -38,7 +38,7 @@ module.exports = NodeHelper.create({
try {
new URL(url);
} catch (error) {
this.sendSocketNotification("INCORRECT_URL", { url: url });
this.sendSocketNotification("INCORRECT_URL", { url });
return;
}