Skip to content
Merged

fix #114

Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions dist/doboard-widget-bundle.js
Original file line number Diff line number Diff line change
Expand Up @@ -10144,7 +10144,7 @@ class CleanTalkWidgetDoboard {

const loggedUserNameBlock = document.querySelector('.doboard_task_widget-logged-user-name');
if(loggedUserNameBlock) {
if(localStorage.getItem('spotfix_session_id')) {
if(localStorage.getItem('spotfix_session_id') && !(localStorage.getItem('spotfix_email')?.includes('spotfix_'))) {
loggedUserNameBlock.style.display = 'flex';
} else loggedUserNameBlock.style.display = 'none';
}
Expand Down Expand Up @@ -10430,7 +10430,7 @@ class CleanTalkWidgetDoboard {
const hasUpdates = !!(notifications?.find(item => +item?.task_id === elTask?.taskId));
const isDone = elTask.taskStatus === 'DONE';
const meta = JSON.parse(elTask.taskMeta);
const isNoRelevant = meta.nodePath && !spotFixRetrieveNodeFromPath(meta.nodePath);
const isNoRelevant = meta.pageURL && meta.pageURL === window.location.href && meta.nodePath && !spotFixRetrieveNodeFromPath(meta.nodePath);
const isTaskWithoutReference = !((meta.nodePath || meta.selectedText) && meta?.pageURL);

const elementBgCSSClass = isFinishedGroup
Expand Down Expand Up @@ -10872,7 +10872,7 @@ class CleanTalkWidgetDoboard {
}

if (isPageUrlString || issueLinkElement) {
if (meta.nodePath && !spotFixRetrieveNodeFromPath(meta.nodePath)) {
if (meta.pageURL && meta.pageURL === window.location.href && meta.nodePath && !spotFixRetrieveNodeFromPath(meta.nodePath)) {
templateVariables.taskFormattedPageUrl = `<span>The link to the content has been lost because the content was changed, deleted, or moved to another URL.</span>`;
} else if ((meta.nodePath || meta.selectedText) && meta?.pageURL) {
const safeUrl = this.escapeHtml(getSafeUrl(meta.pageURL));
Expand Down
6 changes: 3 additions & 3 deletions dist/doboard-widget-bundle.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/doboard-widget-bundle.min.js.map

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions js/src/widget.js
Original file line number Diff line number Diff line change
Expand Up @@ -884,7 +884,7 @@ class CleanTalkWidgetDoboard {

const loggedUserNameBlock = document.querySelector('.doboard_task_widget-logged-user-name');
if(loggedUserNameBlock) {
if(localStorage.getItem('spotfix_session_id')) {
if(localStorage.getItem('spotfix_session_id') && !(localStorage.getItem('spotfix_email')?.includes('spotfix_'))) {
loggedUserNameBlock.style.display = 'flex';
} else loggedUserNameBlock.style.display = 'none';
Comment on lines +887 to 889
}
Expand Down Expand Up @@ -1170,7 +1170,7 @@ class CleanTalkWidgetDoboard {
const hasUpdates = !!(notifications?.find(item => +item?.task_id === elTask?.taskId));
const isDone = elTask.taskStatus === 'DONE';
const meta = JSON.parse(elTask.taskMeta);
const isNoRelevant = meta.nodePath && !spotFixRetrieveNodeFromPath(meta.nodePath);
const isNoRelevant = meta.pageURL && meta.pageURL === window.location.href && meta.nodePath && !spotFixRetrieveNodeFromPath(meta.nodePath);
const isTaskWithoutReference = !((meta.nodePath || meta.selectedText) && meta?.pageURL);

const elementBgCSSClass = isFinishedGroup
Expand Down Expand Up @@ -1612,7 +1612,7 @@ class CleanTalkWidgetDoboard {
}

if (isPageUrlString || issueLinkElement) {
if (meta.nodePath && !spotFixRetrieveNodeFromPath(meta.nodePath)) {
if (meta.pageURL && meta.pageURL === window.location.href && meta.nodePath && !spotFixRetrieveNodeFromPath(meta.nodePath)) {
templateVariables.taskFormattedPageUrl = `<span>The link to the content has been lost because the content was changed, deleted, or moved to another URL.</span>`;
} else if ((meta.nodePath || meta.selectedText) && meta?.pageURL) {
const safeUrl = this.escapeHtml(getSafeUrl(meta.pageURL));
Expand Down
Loading