Skip to content
Merged
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
34 changes: 32 additions & 2 deletions dist/doboard-widget-bundle.js
Original file line number Diff line number Diff line change
Expand Up @@ -8378,6 +8378,7 @@ const getProjectDoboard = async (projectToken, accountId) => {
const sessionId = localStorage.getItem('spotfix_session_id');
const data = {
project_token: projectToken,
with_account_status: 1,
};
if (sessionId) {
data.session_id = sessionId;
Expand Down Expand Up @@ -10206,6 +10207,7 @@ class CleanTalkWidgetDoboard {
if (window.DescriptionEditorIframe.iframe && !this.nonRequesting) {
window.DescriptionEditorIframe.remove();
}

if (!this.nonRequesting) {
// Create description editor iframe
window.DescriptionEditorIframe.create({
Expand All @@ -10226,6 +10228,19 @@ class CleanTalkWidgetDoboard {
});
}

const spotfix_license_status = localStorage.getItem('spotfix_license_status');
if(spotfix_license_status && spotfix_license_status !== "ACTIVE") {
this.registrationShowMessage('Your license has expired. Please renew it under the organization owner\'s account by navigating to Profile Picture → Company settings', 'error', true);
document.querySelector('.doboard_task_widget-visibility-toggle').style.display = 'none';
document.querySelector('.doboard_task_widget-logged-user-name').style.display = 'none';
document.querySelector('.doboard_task_widget-login').style.display = 'none';
document.getElementById('doboard_task_widget-submit_button').style.display = 'none';
const description = document.getElementById('doboard_task_widget-description-container');
if (description) {
description.style.pointerEvents = 'none';
description.style.opacity = '0.6';
}
}
}
break;
case 'wrap':
Expand Down Expand Up @@ -11070,6 +11085,13 @@ class CleanTalkWidgetDoboard {
sessionId: localStorage.getItem('spotfix_session_id') || ''
};

const spotfix_license_status = localStorage.getItem('spotfix_license_status');
const messageContainer = document.getElementById('spotfix_widget_task_send_message_container');
if(spotfix_license_status && spotfix_license_status !== "ACTIVE") {
this.registrationShowMessage('Your license has expired. Please renew it under the organization owner\'s account by navigating to Profile Picture → Company settings', 'error', true);
if(messageContainer) messageContainer.style.display = 'none';
}

async function clickHandler(mainThis, editor, contentFromIframe) {
const sendButton = document.querySelector('.doboard_task_widget-send_message_button');
const sendMessageContainer = sendButton?.closest('.doboard_task_widget-send_message');
Expand Down Expand Up @@ -11598,7 +11620,7 @@ class CleanTalkWidgetDoboard {
window.addEventListener('resize', this.handleResize.bind(this));
}

registrationShowMessage(messageText, type = 'error') {
registrationShowMessage(messageText, type = 'error', noTitle) {
const titleSpan = document.getElementById('doboard_task_widget-error_message-header');
const messageDiv = document.getElementById('doboard_task_widget-error_message');
const messageWrap = document.querySelector('.doboard_task_widget-message-wrapper');
Expand All @@ -11612,7 +11634,9 @@ class CleanTalkWidgetDoboard {
messageWrap.classList.add('doboard_task_widget-notice_message');
messageDiv.style.color = '#2a5db0';
} else {
titleSpan.innerText = ksesFilter('Registration error');
if(!noTitle) {
titleSpan.innerText = ksesFilter('Registration error');
}
messageWrap.classList.add('doboard_task_widget-error_message');
messageDiv.style.color = 'red';
}
Expand Down Expand Up @@ -11914,7 +11938,9 @@ function spotFixInit() {
getProjectDoboard(projectToken, accountId)
.then(result => {
if (result && result?.projects && result?.projects[0]) {
localStorage.setItem('spotfix_license_status', result.account_status);
const project = result?.projects[0];

if (project?.require_full_registration !== undefined) {
localStorage.setItem('spotfix_require_full_registration', project?.require_full_registration);
}
Expand Down Expand Up @@ -13717,6 +13743,10 @@ class SpotFixTemplatesLoader {
</div>
<div class="doboard_task_widget-concrete_issues-container">
</div>
<div class="doboard_task_widget-message-wrapper hidden" style="margin-bottom: 1px">
<span id="doboard_task_widget-error_message-header"></span>
<div id="doboard_task_widget-error_message"></div>
</div>
<div id="spotfix_widget_task_send_message_container" class="doboard_task_widget-send_message doboard_task_widget-spotfix-editor">
<textarea name="doboard_task_widget_message" id="doboard_task_widget-send_message_input_SpotFix" class="doboard_task_widget-send_message_input" placeholder="Write a message..."></textarea>
</div>
Expand Down
10 changes: 7 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.

1 change: 1 addition & 0 deletions js/src/api.js
Original file line number Diff line number Diff line change
Expand Up @@ -371,6 +371,7 @@ const getProjectDoboard = async (projectToken, accountId) => {
const sessionId = localStorage.getItem('spotfix_session_id');
const data = {
project_token: projectToken,
with_account_status: 1,
};
if (sessionId) {
data.session_id = sessionId;
Expand Down
4 changes: 4 additions & 0 deletions js/src/loaders/SpotFixTemplatesLoader.js
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,10 @@ class SpotFixTemplatesLoader {
</div>
<div class="doboard_task_widget-concrete_issues-container">
</div>
<div class="doboard_task_widget-message-wrapper hidden" style="margin-bottom: 1px">
<span id="doboard_task_widget-error_message-header"></span>
<div id="doboard_task_widget-error_message"></div>
</div>
<div id="spotfix_widget_task_send_message_container" class="doboard_task_widget-send_message doboard_task_widget-spotfix-editor">
<textarea name="doboard_task_widget_message" id="doboard_task_widget-send_message_input_SpotFix" class="doboard_task_widget-send_message_input" placeholder="Write a message..."></textarea>
</div>
Expand Down
2 changes: 2 additions & 0 deletions js/src/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,9 @@ function spotFixInit() {
getProjectDoboard(projectToken, accountId)
.then(result => {
if (result && result?.projects && result?.projects[0]) {
localStorage.setItem('spotfix_license_status', result.account_status);
const project = result?.projects[0];

if (project?.require_full_registration !== undefined) {
localStorage.setItem('spotfix_require_full_registration', project?.require_full_registration);
}
Expand Down
27 changes: 25 additions & 2 deletions js/src/widget.js
Original file line number Diff line number Diff line change
Expand Up @@ -947,6 +947,7 @@ class CleanTalkWidgetDoboard {
if (window.DescriptionEditorIframe.iframe && !this.nonRequesting) {
window.DescriptionEditorIframe.remove();
}

if (!this.nonRequesting) {
// Create description editor iframe
window.DescriptionEditorIframe.create({
Expand All @@ -967,6 +968,19 @@ class CleanTalkWidgetDoboard {
});
}

const spotfix_license_status = localStorage.getItem('spotfix_license_status');
if(spotfix_license_status && spotfix_license_status !== "ACTIVE") {
this.registrationShowMessage('Your license has expired. Please renew it under the organization owner\'s account by navigating to Profile Picture → Company settings', 'error', true);
document.querySelector('.doboard_task_widget-visibility-toggle').style.display = 'none';
Comment thread
veronika-tseleva-cleantalk marked this conversation as resolved.
document.querySelector('.doboard_task_widget-logged-user-name').style.display = 'none';
document.querySelector('.doboard_task_widget-login').style.display = 'none';
document.getElementById('doboard_task_widget-submit_button').style.display = 'none';
const description = document.getElementById('doboard_task_widget-description-container');
if (description) {
description.style.pointerEvents = 'none';
description.style.opacity = '0.6';
}
}
}
break;
case 'wrap':
Expand Down Expand Up @@ -1811,6 +1825,13 @@ class CleanTalkWidgetDoboard {
sessionId: localStorage.getItem('spotfix_session_id') || ''
};

const spotfix_license_status = localStorage.getItem('spotfix_license_status');
const messageContainer = document.getElementById('spotfix_widget_task_send_message_container');
if(spotfix_license_status && spotfix_license_status !== "ACTIVE") {
this.registrationShowMessage('Your license has expired. Please renew it under the organization owner\'s account by navigating to Profile Picture → Company settings', 'error', true);
if(messageContainer) messageContainer.style.display = 'none';
}
Comment thread
veronika-tseleva-cleantalk marked this conversation as resolved.

async function clickHandler(mainThis, editor, contentFromIframe) {
const sendButton = document.querySelector('.doboard_task_widget-send_message_button');
const sendMessageContainer = sendButton?.closest('.doboard_task_widget-send_message');
Expand Down Expand Up @@ -2339,7 +2360,7 @@ class CleanTalkWidgetDoboard {
window.addEventListener('resize', this.handleResize.bind(this));
}

registrationShowMessage(messageText, type = 'error') {
registrationShowMessage(messageText, type = 'error', noTitle) {
const titleSpan = document.getElementById('doboard_task_widget-error_message-header');
const messageDiv = document.getElementById('doboard_task_widget-error_message');
const messageWrap = document.querySelector('.doboard_task_widget-message-wrapper');
Expand All @@ -2353,7 +2374,9 @@ class CleanTalkWidgetDoboard {
messageWrap.classList.add('doboard_task_widget-notice_message');
messageDiv.style.color = '#2a5db0';
} else {
titleSpan.innerText = ksesFilter('Registration error');
if(!noTitle) {
titleSpan.innerText = ksesFilter('Registration error');
}
messageWrap.classList.add('doboard_task_widget-error_message');
messageDiv.style.color = 'red';
}
Expand Down
Loading