Infrastructure/ghost
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-01-06 22:40:14 -05:00
Code Issues Activity

Fixed jumping of links on edit in analytics

Browse source 
refs https://github.com/TryGhost/Team/issues/2116

- editing a link caused it to jump in the list as its count is reset to 0
- this forces the order of links same after edit, the new order is only visible on refresh or navigating away and coming back
This commit is contained in:
Rishabh 2022-10-21 13:34:15 +05:30
parent 3203714b3d
commit dcd607ad94
1 changed files with 49 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

84
ghost/admin/app/components/posts/old-analytics.js
View file

@ -98,32 +98,10 @@ export default class Analytics extends Component {
@action
updateLink(linkId, linkTo) {
this.updateLinkId = linkId;
let currentLink;
this.links = this.links?.map((link) => {
if (link.link.link_id === linkId) {
currentLink = new URL(link.link.originalTo);
return {
...link,
link: {
...link.link,
edited: true,
to: this.utils.cleanTrackedUrl(linkTo, false),
title: this.utils.cleanTrackedUrl(linkTo, true)
}
};
}
return link;
});
this.saveLink(currentLink.href, new URL(linkTo).href);
}
@action
saveLink(currentLink, newLink) {
if (this._updateLinks.isRunning) {
return this._updateLinks.last;
}
return this._updateLinks.perform(currentLink, newLink);
return this._updateLinks.perform(linkId, linkTo);
}
@action
@ -142,20 +120,39 @@ export default class Analytics extends Component {
}
updateLinkData(linksData) {
const links = linksData.map((link) => {
return {
...link,
link: {
...link.link,
originalTo: link.link.to,
to: this.utils.cleanTrackedUrl(link.link.to, false),
title: this.utils.cleanTrackedUrl(link.link.to, true)
let updatedLinks;
if (this.links?.length) {
updatedLinks = this.links.map((link) => {
let linkData = linksData.find(l => l.link.link_id === link.link.link_id);
if (linkData) {
return {
...linkData,
link: {
...linkData.link,
originalTo: linkData.link.to,
to: this.utils.cleanTrackedUrl(linkData.link.to, false),
title: this.utils.cleanTrackedUrl(linkData.link.to, true)
}
};
}
};
});
return link;
});
} else {
updatedLinks = linksData.map((link) => {
return {
...link,
link: {
...link.link,
originalTo: link.link.to,
to: this.utils.cleanTrackedUrl(link.link.to, false),
title: this.utils.cleanTrackedUrl(link.link.to, true)
}
};
});
}
// Remove duplicates by title ad merge
const linksByTitle = links.reduce((acc, link) => {
const linksByTitle = updatedLinks.reduce((acc, link) => {
if (!acc[link.link.title]) {
acc[link.link.title] = link;
} else {
@ -182,7 +179,24 @@ export default class Analytics extends Component {
}
@task
*_updateLinks(currentLink, newLink) {
*_updateLinks(linkId, newLink) {
this.updateLinkId = linkId;
let currentLink;
this.links = this.links?.map((link) => {
if (link.link.link_id === linkId) {
currentLink = new URL(link.link.originalTo);
return {
...link,
link: {
...link.link,
to: this.utils.cleanTrackedUrl(newLink, false),
title: this.utils.cleanTrackedUrl(newLink, true)
}
};
}
return link;
});
const filter = `post_id:${this.post.id}+to:'${currentLink}'`;
let bulkUpdateUrl = this.ghostPaths.url.api(`links/bulk`) + `?filter=${encodeURIComponent(filter)}`;
yield this.ajax.put(bulkUpdateUrl, {