Skip to content

Bug fix rel 33 #97

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
veronika-tseleva-cleantalk merged 2 commits into from
Apr 10, 2026
Merged

Bug fix rel 33 #97

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
267c229
Fix. fix spot menu
veronika-tseleva-cleantalk Apr 10, 2026
83787ef
Fix.fixed attachments styles
veronika-tseleva-cleantalk Apr 10, 2026
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
75 changes: 38 additions & 37 deletions dist/doboard-widget-bundle.js
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions dist/doboard-widget-bundle.min.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/doboard-widget-bundle.min.js.map
View file
Open in desktop

Large diffs are not rendered by default.

73 changes: 37 additions & 36 deletions js/src/widget.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -521,17 +521,17 @@ class CleanTalkWidgetDoboard {
}
})
}

const registerOnlyButton = document.getElementById('doboard_task_widget-register_only_button');
if (registerOnlyButton) {
registerOnlyButton.addEventListener('click', async () => {
const userNameElement = document.getElementById('doboard_task_widget-user_name');
const userEmailElement = document.getElementById('doboard_task_widget-user_email');

const userName = userNameElement?.value?.trim();
const userEmail = userEmailElement?.value?.trim();
const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;

if (!userName) {
userNameElement.style.borderColor = 'red';
userNameElement.focus();
Expand All @@ -540,7 +540,7 @@ class CleanTalkWidgetDoboard {
});
return;
}

// Validate email
if (!userEmail) {
userEmailElement.style.borderColor = 'red';
Expand All @@ -557,25 +557,25 @@ class CleanTalkWidgetDoboard {
});
return;
}

registerOnlyButton.disabled = true;
registerOnlyButton.innerText = 'Signing up...';

try {
const taskDetails = {
userName: userName,
userEmail: userEmail,
projectToken: this.params.projectToken,
accountId: this.params.accountId,
};

const response = await registerUser(taskDetails)(this.registrationShowMessage);

if (response && response.accountExists) {
const loginContainer = document.getElementById('doboard_task_widget-input-container-login');
const phantomContainer = document.querySelector('.doboard_task_widget-input-container-phantom');
const loginEmailElement = document.getElementById('doboard_task_widget-login_email');

if (phantomContainer) {
phantomContainer.classList.add('doboard_task_widget-hidden');
}
Expand All @@ -587,7 +587,7 @@ class CleanTalkWidgetDoboard {
loginEmailElement.classList.add('has-value');
}
registerOnlyButton.classList.add('doboard_task_widget-hidden');

this.registrationShowMessage('Account already exists. Please login with your password.', 'notice');
} else if (localStorage.getItem('spotfix_session_id')) {
// Redraw widget after successful registration
Expand All @@ -596,7 +596,7 @@ class CleanTalkWidgetDoboard {
} catch (error) {
this.registrationShowMessage(error.message, 'error');
}

registerOnlyButton.disabled = false;
registerOnlyButton.innerText = 'Sign up';
});
Expand Down Expand Up @@ -765,7 +765,7 @@ class CleanTalkWidgetDoboard {
const visibilityToggle = document.querySelector('.doboard_task_widget-visibility-toggle');

const registerOnlyButton = document.getElementById('doboard_task_widget-register_only_button');

if (requireFullRegistration && !sessionIdExists) {
if (titleContainer) titleContainer.style.display = '';
if (descriptionContainer) descriptionContainer.style.display = '';
Expand Down Expand Up @@ -1019,7 +1019,7 @@ class CleanTalkWidgetDoboard {
const currentUserId = localStorage.getItem('spotfix_user_id') || 0;

const users = await spotfixIndexedDB.getAll(SPOTFIX_TABLE_USERS);
const usersFiltered = users.filter(user => currentTask.viewers.includes(user.user_id));
const usersFiltered = users.filter(user => currentTask?.viewers?.includes(user.user_id));

templateVariables.viewersCount = `${usersFiltered.length || 0} members`;

Expand All @@ -1034,7 +1034,7 @@ class CleanTalkWidgetDoboard {
widgetContainer.innerHTML = this.loadTemplate('spot_menu', templateVariables);
document.body.appendChild(widgetContainer);

if(currentTask.viewers.includes(+currentUserId)){
if(currentTask?.viewers?.includes(+currentUserId)){
document.getElementById('unsubscribe_from_spot').checked = true;
}
if (currentUserId) {
Expand Down Expand Up @@ -1354,32 +1354,33 @@ class CleanTalkWidgetDoboard {
}) || '';

document.querySelector('#unsubscribe_from_spot')?.addEventListener('change', () => {
const currentUserId = localStorage.getItem('spotfix_user_id');

if (currentUserId) {
const task = this.allTasksData.find(task => +task.taskId === +this.currentActiveTaskId);
const viewers = task?.viewers || [];
const currentUserId = +localStorage.getItem('spotfix_user_id');

let newViewers;
if (!currentUserId) return;

if (viewers.includes(+currentUserId)) {
newViewers = viewers.filter(item => +item !== +currentUserId);
} else {
newViewers = [...viewers, +currentUserId];
}
const task = this.allTasksData.find(task => +task.taskId === +this.currentActiveTaskId);
const viewers = task?.viewers || [];

const filteredUsersIds = newViewers.join(',');
let newViewers;

if (filteredUsersIds.length) {
updateViewersDoboard(filteredUsersIds, this.currentActiveTaskId, this.params.projectToken, this.params.accountId)
.then(() => {
let timer = setTimeout(() => {
this.createWidgetElement(this.socket_type_name, true);
clearTimeout(timer);
}, 500);
})
}
if (viewers.includes(currentUserId)) {
newViewers = viewers.filter(item => +item !== currentUserId);
} else {
newViewers = [...viewers, currentUserId];
}

const filteredUsersIds = newViewers.join(',');

updateViewersDoboard(
filteredUsersIds,
this.currentActiveTaskId,
this.params.projectToken,
this.params.accountId
).then(() => {
setTimeout(() => {
this.createWidgetElement(this.socket_type_name, true);
}, 500);
});
}) || '';

document.querySelector('#highlight_the_spot')?.addEventListener('change', (e) => {
Expand Down Expand Up @@ -1629,7 +1630,7 @@ class CleanTalkWidgetDoboard {
}

const taskCountElement = document.getElementById('doboard_task_widget-task_count');
if ( taskCountElement && tasksCount ) {
if ( taskCountElement && +tasksCount ) {
taskCountElement.innerText = ksesFilter(tasksCount);
taskCountElement.classList.remove('hidden');
}
Expand Down
Loading
Loading