Skip to content

Fix/skip empty array - PLUG-2825 #154

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

Merged
mas-iota merged 3 commits into from
Jun 6, 2024
Merged

Fix/skip empty array - PLUG-2825 #154

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5d0e236
fix(analytics): skip empty array when processing
AlaaN-Smadi May 30, 2024
20365da
Merge branch 'master' of github.com:BuildFire/pluginMediaCenterRSS in…
AlaaN-Smadi May 30, 2024
f5224cc
fix(cp): duplicate feeds
AlaaN-Smadi Jun 2, 2024
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
22 changes: 12 additions & 10 deletions control/content/controllers/content.home.controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,10 +237,10 @@
if (isConfirmed) {
// unregister analytics
ContentHome.deletingFeed = options.item;
if (ContentHome.deletingFeed.advancedConfig.enableFeedAnalytics) {
if (ContentHome.deletingFeed.type === 'rss' && ContentHome.deletingFeed.id !== 'default' && ContentHome.deletingFeed.advancedConfig.enableFeedAnalytics) {
ContentHome.handleLoaderDialog("Deleting Analytics", "Deleting analytics, this may take a while please wait...", true);
ContentHome.getIndexedFeedItems(`rss_feed_${options.item.id}`, options.item.url, (err, indexedFeedItems) => {
if(err || !indexedFeedItems || !indexedFeedItems.length) {
if(err) {
ContentHome.deletingFeed = null;
ContentHome.handleLoaderDialog();
handleSearchEngineErrors('deleting');
Expand All @@ -253,7 +253,7 @@
ContentHome.deletingFeed = null;
ContentHome.handleLoaderDialog();
handleSearchEngineErrors('deleting');
return console.error(err);
return console.error(error);
}

handleDeleteSearchEngineData(options.item);
Expand Down Expand Up @@ -318,9 +318,8 @@
_item.src = mediaTagData.src;
}
return _item;
});
}).filter(_item => _item); // to remove all null and undefined items

indexedFeedItems = indexedFeedItems.filter(_item => _item !== null);
callback(null, indexedFeedItems);
}).catch((err) => {
callback(err);
Expand Down Expand Up @@ -358,7 +357,7 @@
} else {
ContentHome.data.content.feeds.push(feed);
}
ContentHome.sortableList.remove('default');
ContentHome.sortableList.clear();
ContentHome.sortableList.append(ContentHome.prepareFeeds(ContentHome.data.content.feeds));
} else {
ContentHome.data.content.feeds[index] = feed;
Expand All @@ -369,6 +368,7 @@
if (!ContentHome.data.content.feeds) ContentHome.data.content.feeds = [feed];
else ContentHome.data.content.feeds.push(feed);
ContentHome.subPages[type].close();
ContentHome.sortableList.clear();
ContentHome.sortableList.append(ContentHome.prepareFeeds(ContentHome.data.content.feeds));
}
ContentHome.data.content.rssUrl = ContentHome.rssFeedUrl;
Expand Down Expand Up @@ -402,13 +402,14 @@
return;
}

ContentHome.activeRssFeed = feed;
ContentHome.handleLoaderDialog("Validating Feed", "Validating feed URL, please wait...", true);
ContentHome.validateFeedUrl(values.rssFeedUrl, (errors) => {
if (errors) {
ContentHome.activeRssFeed = null;
ContentHome.handleLoaderDialog();
ContentHome.subPages[type].showInvalidFeedMessage("rss", errors);
} else {
ContentHome.activeRssFeed = feed;
if (item) {
ContentHome.activeRssFeed.isAnalyticsFlagChanged = item.advancedConfig.enableFeedAnalytics !== feed.advancedConfig.enableFeedAnalytics;
searchEngine.hasFeedConfigChanged(feed, (err, isChanged) => {
Expand All @@ -424,7 +425,7 @@
if (item.advancedConfig.enableFeedAnalytics) {
// do unregister analytics
ContentHome.getIndexedFeedItems(`rss_feed_${item.id}`, item.url, (err, indexedFeedItems) => {
if(err || !indexedFeedItems || !indexedFeedItems.length) {
if(err) {
ContentHome.handleLoaderDialog();
handleSearchEngineErrors('updating');
console.error(err);
Expand Down Expand Up @@ -465,7 +466,7 @@
// unregister analytics
ContentHome.handleLoaderDialog("Deleting Analytics", "Deleting analytics, this may take a while please wait...", true);
ContentHome.getIndexedFeedItems(`rss_feed_${item.id}`, item.url, (err, indexedFeedItems) => {
if(err || !indexedFeedItems || !indexedFeedItems.length) {
if(err) {
ContentHome.handleLoaderDialog();
handleSearchEngineErrors('updating');
console.error(err);
Expand Down Expand Up @@ -541,7 +542,7 @@
console.error(err);
} else {
ContentHome.getIndexedFeedItems(`rss_feed_${ContentHome.activeRssFeed.id}`, ContentHome.activeRssFeed.url, (err, indexedFeedItems) => {
if(err || !indexedFeedItems || !indexedFeedItems.length) {
if(err) {
ContentHome.activeRssFeed = null;
ContentHome.handleLoaderDialog();
handleSearchEngineErrors('analytics');
Expand Down Expand Up @@ -686,6 +687,7 @@
let updateAnalyticsError = false;
const syncFeedAnalytics = (feeds) => {
if (!feeds.length) {
if (ContentHome.activeRssFeed || ContentHome.deletingFeed) return; // if there is a feed under processing then keep dialog open
ContentHome.handleLoaderDialog();
if (updateAnalyticsError) {
handleSearchEngineErrors('analyticsUpdates');
Expand Down