From edc641b246acd5d631072d137bf33a18b35f93f4 Mon Sep 17 00:00:00 2001 From: Jason House Date: Sat, 15 Aug 2020 11:22:41 +0900 Subject: [PATCH] Working telegram test --- .../main/resources/static/js/configuration.js | 3 +- .../resources/static/js/configuration.min.js | 2 +- .../js/modules/telegram-notifications.js | 36 ++++++------------- .../resources/templates/configuration.html | 4 +-- 4 files changed, 15 insertions(+), 30 deletions(-) diff --git a/GapsWeb/src/main/resources/static/js/configuration.js b/GapsWeb/src/main/resources/static/js/configuration.js index 4a07318..5eae68f 100755 --- a/GapsWeb/src/main/resources/static/js/configuration.js +++ b/GapsWeb/src/main/resources/static/js/configuration.js @@ -11,7 +11,7 @@ 'use strict'; import {Payload} from '/js/modules/payload.min.js'; -import {saveTelegramNotifications} from '/js/modules/telegram-notifications.min.js' +import {saveTelegramNotifications, testTelegramNotifications} from '/js/modules/telegram-notifications.min.js' let plexSpinner, plexSaveSuccess, plexSaveError, plexTestSuccess, plexTestError, plexDeleteSuccess, plexDeleteError, plexDuplicateError; @@ -101,6 +101,7 @@ document.addEventListener('DOMContentLoaded', function () { //Exposing function for onClick() from module window.saveTelegram = saveTelegramNotifications; + window.testTelegram = testTelegramNotifications; }); function testTmdbKey() { diff --git a/GapsWeb/src/main/resources/static/js/configuration.min.js b/GapsWeb/src/main/resources/static/js/configuration.min.js index 5b357dc..e526945 100755 --- a/GapsWeb/src/main/resources/static/js/configuration.min.js +++ b/GapsWeb/src/main/resources/static/js/configuration.min.js @@ -1 +1 @@ -import{Payload}from"/js/modules/payload.min.js";let plexSpinner,plexSaveSuccess,plexSaveError,plexTestSuccess,plexTestError,plexDeleteSuccess,plexDeleteError,plexDuplicateError,tmdbSpinner,tmdbSaveSuccess,tmdbSaveError,tmdbTestSuccess,tmdbTestError,scheduleSpinner,scheduleSaveSuccess,scheduleSaveError,deleteAllError,deleteAllSuccess;function testTmdbKey(){if(hideAllAlertsAndSpinners(),!$("#tmdbConfiguration")[0].checkValidity())return!1;tmdbSpinner.show(),$.ajax({type:"PUT",url:`/configuration/test/tmdbKey/${$("#movieDbApiKey").val()}`,contentType:"application/json",dataType:"json",success:function(result){hideAllAlertsAndSpinners(),result&&result.code===Payload.TMDB_KEY_VALID?tmdbTestSuccess.show():tmdbTestError.show()},error:function(){hideAllAlertsAndSpinners(),tmdbTestError.show()}})}function saveTmdbKey(){if(hideAllAlertsAndSpinners(),!$("#tmdbConfiguration")[0].checkValidity())return!1;tmdbSpinner.show(),$.ajax({type:"POST",url:`/configuration/save/tmdbKey/${$("#movieDbApiKey").val()}`,contentType:"application/json; charset=utf-8",dataType:"json",success:function(result){hideAllAlertsAndSpinners(),result&&result.code===Payload.TMDB_KEY_SAVE_SUCCESSFUL?tmdbSaveSuccess.show():tmdbSaveError.show()},error:function(){hideAllAlertsAndSpinners(),tmdbSaveError.show()}})}function testPlexServer(){if(hideAllAlertsAndSpinners(),!$("#plexConfiguration")[0].checkValidity())return!1;plexSpinner.show(),$.ajax({type:"PUT",url:"/configuration/test/plex",data:{plexToken:$("#plexToken").val(),address:$("#address").val(),port:$("#port").val()},dataType:"json",success:function(result){hideAllAlertsAndSpinners(),result&&result.code===Payload.PLEX_CONNECTION_SUCCEEDED?plexTestSuccess.show():plexTestError.show()},error:function(){hideAllAlertsAndSpinners(),plexTestError.show()}})}function addPlexServer(){if(hideAllAlertsAndSpinners(),!$("#plexConfiguration")[0].checkValidity())return!1;plexSpinner.show(),$.ajax({type:"POST",url:"/configuration/add/plex",data:{plexToken:$("#plexToken").val(),address:$("#address").val(),port:$("#port").val()},error:function(){hideAllAlertsAndSpinners(),plexSaveError.show()}})}function testExistingPlexServer(machineIdentifier){hideAllAlertsAndSpinners(),plexSpinner.show(),$.ajax({type:"PUT",url:`/configuration/test/plex/${machineIdentifier}`,dataType:"json",success:function(result){hideAllAlertsAndSpinners(),result&&result.success?plexTestSuccess.show():plexTestError.show()},error:function(){hideAllAlertsAndSpinners(),plexTestError.show()}})}function removePlexServer(machineIdentifier){hideAllAlertsAndSpinners(),plexSpinner.show(),$.ajax({type:"DELETE",url:`/configuration/delete/plex/${machineIdentifier}`,success:function(result){hideAllAlertsAndSpinners(),result&&result.success?($("#"+machineIdentifier).remove(),plexDeleteSuccess.show()):plexDeleteError.show()},error:function(){hideAllAlertsAndSpinners(),plexDeleteError.show()}})}function saveSchedule(){hideAllAlertsAndSpinners();const id=$("#setSchedule").val();$.ajax({type:"PUT",url:`/schedule/${id}`,success:function(result){hideAllAlertsAndSpinners(),result&&result.code===Payload.SCHEDULE_UPDATED?scheduleSaveSuccess.show():scheduleSaveError.show()},error:function(){hideAllAlertsAndSpinners(),scheduleSaveError.show()}})}function setDeleteAllEnabledOrDisabled(){$("#deleteAll").prop("disabled",!$("#confirmDeleteAll").is(":checked"))}function nuke(){$.ajax({type:"PUT",url:"/nuke",success:function(result){hideAllAlertsAndSpinners(),result&&result.code===Payload.NUKE_SUCCESSFUL?(deleteAllSuccess.show(),$("#movieDbApiKey").val(""),$("#plexServers").html("")):deleteAllError.show()},error:function(){hideAllAlertsAndSpinners(),deleteAllError.show()}})}function hideAllAlertsAndSpinners(){plexSpinner.hide(),tmdbSpinner.hide(),plexTestSuccess.hide(),plexTestError.hide(),plexSaveSuccess.hide(),plexSaveError.hide(),plexDeleteSuccess.hide(),plexDeleteError.hide(),tmdbTestSuccess.hide(),tmdbTestError.hide(),tmdbSaveSuccess.hide(),tmdbSaveError.hide(),deleteAllSuccess.hide(),deleteAllError.hide()}window.addEventListener("load",function(){const forms=document.getElementsByClassName("needs-validation");Array.prototype.filter.call(forms,function(form){form.addEventListener("click",function(event){!1===form.checkValidity()&&(event.preventDefault(),event.stopPropagation()),form.classList.add("was-validated")},!1)})},!1),document.addEventListener("DOMContentLoaded",function(){plexSpinner=$("#plexSpinner"),plexSaveSuccess=$("#plexSaveSuccess"),plexSaveError=$("#plexSaveError"),plexTestSuccess=$("#plexTestSuccess"),plexTestError=$("#plexTestError"),plexDeleteSuccess=$("#plexDeleteSuccess"),plexDeleteError=$("#plexDeleteError"),tmdbSpinner=$("#tmdbSpinner"),tmdbSaveSuccess=$("#tmdbSaveSuccess"),tmdbSaveError=$("#tmdbSaveError"),tmdbTestSuccess=$("#tmdbTestSuccess"),tmdbTestError=$("#tmdbTestError"),plexDuplicateError=$("#plexDuplicateError"),scheduleSpinner=$("#scheduleSpinner"),scheduleSaveSuccess=$("#scheduleSaveSuccess"),scheduleSaveError=$("#scheduleSaveError"),deleteAllError=$("#deleteAllError"),deleteAllSuccess=$("#deleteAllSuccess");const socket=new SockJS("/gs-guide-websocket"),stompClient=Stomp.over(socket);stompClient.connect({},function(frame){console.log("Connected: "+frame),stompClient.subscribe("/configuration/plex/complete",function(message){const payload=JSON.parse(message.body);if(hideAllAlertsAndSpinners(),payload&&payload.code===Payload.PLEX_LIBRARIES_FOUND){plexSaveSuccess.show(),$("#plexToken").val(""),$("#address").val(""),$("#port").val("32400");const plexServerCard=$("#plexServerCard").html(),theCompiledHtml=Handlebars.compile(plexServerCard)(payload.extras);$("#plexServers").append(theCompiledHtml)}else plexSaveError.show()}),stompClient.subscribe("/configuration/plex/duplicate",function(){hideAllAlertsAndSpinners(),plexDuplicateError.show()})}),window.testTmdbKey=testTmdbKey,window.saveTmdbKey=saveTmdbKey,window.testPlexServer=testPlexServer,window.addPlexServer=addPlexServer,window.testExistingPlexServer=testExistingPlexServer,window.removePlexServer=removePlexServer,window.saveSchedule=saveSchedule,window.setDeleteAllEnabledOrDisabled=setDeleteAllEnabledOrDisabled,window.nuke=nuke}),$(function(){$("[data-hide]").on("click",function(){$(this).closest("."+$(this).attr("data-hide")).hide()})}); \ No newline at end of file +"use strict";import{Payload}from"/js/modules/payload.min.js";import{saveTelegramNotifications,testTelegramNotifications}from"/js/modules/telegram-notifications.min.js";let plexSpinner,plexSaveSuccess,plexSaveError,plexTestSuccess,plexTestError,plexDeleteSuccess,plexDeleteError,plexDuplicateError,tmdbSpinner,tmdbSaveSuccess,tmdbSaveError,tmdbTestSuccess,tmdbTestError,scheduleSpinner,scheduleSaveSuccess,scheduleSaveError,deleteAllError,deleteAllSuccess;function testTmdbKey(){if(hideAllAlertsAndSpinners(),!$("#tmdbConfiguration")[0].checkValidity())return!1;tmdbSpinner.show(),$.ajax({type:"PUT",url:`/configuration/test/tmdbKey/${$("#movieDbApiKey").val()}`,contentType:"application/json",dataType:"json",success:function(result){hideAllAlertsAndSpinners(),result&&result.code===Payload.TMDB_KEY_VALID?tmdbTestSuccess.show():tmdbTestError.show()},error:function(){hideAllAlertsAndSpinners(),tmdbTestError.show()}})}function saveTmdbKey(){if(hideAllAlertsAndSpinners(),!$("#tmdbConfiguration")[0].checkValidity())return!1;tmdbSpinner.show(),$.ajax({type:"POST",url:`/configuration/save/tmdbKey/${$("#movieDbApiKey").val()}`,contentType:"application/json; charset=utf-8",dataType:"json",success:function(result){hideAllAlertsAndSpinners(),result&&result.code===Payload.TMDB_KEY_SAVE_SUCCESSFUL?tmdbSaveSuccess.show():tmdbSaveError.show()},error:function(){hideAllAlertsAndSpinners(),tmdbSaveError.show()}})}function testPlexServer(){if(hideAllAlertsAndSpinners(),!$("#plexConfiguration")[0].checkValidity())return!1;plexSpinner.show(),$.ajax({type:"PUT",url:"/configuration/test/plex",data:{plexToken:$("#plexToken").val(),address:$("#address").val(),port:$("#port").val()},dataType:"json",success:function(result){hideAllAlertsAndSpinners(),result&&result.code===Payload.PLEX_CONNECTION_SUCCEEDED?plexTestSuccess.show():plexTestError.show()},error:function(){hideAllAlertsAndSpinners(),plexTestError.show()}})}function addPlexServer(){if(hideAllAlertsAndSpinners(),!$("#plexConfiguration")[0].checkValidity())return!1;plexSpinner.show(),$.ajax({type:"POST",url:"/configuration/add/plex",data:{plexToken:$("#plexToken").val(),address:$("#address").val(),port:$("#port").val()},error:function(){hideAllAlertsAndSpinners(),plexSaveError.show()}})}function testExistingPlexServer(machineIdentifier){hideAllAlertsAndSpinners(),plexSpinner.show(),$.ajax({type:"PUT",url:`/configuration/test/plex/${machineIdentifier}`,dataType:"json",success:function(result){hideAllAlertsAndSpinners(),result&&result.success?plexTestSuccess.show():plexTestError.show()},error:function(){hideAllAlertsAndSpinners(),plexTestError.show()}})}function removePlexServer(machineIdentifier){hideAllAlertsAndSpinners(),plexSpinner.show(),$.ajax({type:"DELETE",url:`/configuration/delete/plex/${machineIdentifier}`,success:function(result){hideAllAlertsAndSpinners(),result&&result.success?($("#"+machineIdentifier).remove(),plexDeleteSuccess.show()):plexDeleteError.show()},error:function(){hideAllAlertsAndSpinners(),plexDeleteError.show()}})}function saveSchedule(){hideAllAlertsAndSpinners();const id=$("#setSchedule").val();$.ajax({type:"PUT",url:`/schedule/${id}`,success:function(result){hideAllAlertsAndSpinners(),result&&result.code===Payload.SCHEDULE_UPDATED?scheduleSaveSuccess.show():scheduleSaveError.show()},error:function(){hideAllAlertsAndSpinners(),scheduleSaveError.show()}})}function setDeleteAllEnabledOrDisabled(){$("#deleteAll").prop("disabled",!$("#confirmDeleteAll").is(":checked"))}function nuke(){$.ajax({type:"PUT",url:"/nuke",success:function(result){hideAllAlertsAndSpinners(),result&&result.code===Payload.NUKE_SUCCESSFUL?(deleteAllSuccess.show(),$("#movieDbApiKey").val(""),$("#plexServers").html("")):deleteAllError.show()},error:function(){hideAllAlertsAndSpinners(),deleteAllError.show()}})}function hideAllAlertsAndSpinners(){plexSpinner.hide(),tmdbSpinner.hide(),plexTestSuccess.hide(),plexTestError.hide(),plexSaveSuccess.hide(),plexSaveError.hide(),plexDeleteSuccess.hide(),plexDeleteError.hide(),tmdbTestSuccess.hide(),tmdbTestError.hide(),tmdbSaveSuccess.hide(),tmdbSaveError.hide(),deleteAllSuccess.hide(),deleteAllError.hide()}window.addEventListener("load",function(){const forms=document.getElementsByClassName("needs-validation");Array.prototype.filter.call(forms,function(form){form.addEventListener("click",function(event){!1===form.checkValidity()&&(event.preventDefault(),event.stopPropagation()),form.classList.add("was-validated")},!1)})},!1),document.addEventListener("DOMContentLoaded",function(){plexSpinner=$("#plexSpinner"),plexSaveSuccess=$("#plexSaveSuccess"),plexSaveError=$("#plexSaveError"),plexTestSuccess=$("#plexTestSuccess"),plexTestError=$("#plexTestError"),plexDeleteSuccess=$("#plexDeleteSuccess"),plexDeleteError=$("#plexDeleteError"),tmdbSpinner=$("#tmdbSpinner"),tmdbSaveSuccess=$("#tmdbSaveSuccess"),tmdbSaveError=$("#tmdbSaveError"),tmdbTestSuccess=$("#tmdbTestSuccess"),tmdbTestError=$("#tmdbTestError"),plexDuplicateError=$("#plexDuplicateError"),scheduleSpinner=$("#scheduleSpinner"),scheduleSaveSuccess=$("#scheduleSaveSuccess"),scheduleSaveError=$("#scheduleSaveError"),deleteAllError=$("#deleteAllError"),deleteAllSuccess=$("#deleteAllSuccess");const socket=new SockJS("/gs-guide-websocket"),stompClient=Stomp.over(socket);stompClient.connect({},function(frame){console.log("Connected: "+frame),stompClient.subscribe("/configuration/plex/complete",function(message){const payload=JSON.parse(message.body);if(hideAllAlertsAndSpinners(),payload&&payload.code===Payload.PLEX_LIBRARIES_FOUND){plexSaveSuccess.show(),$("#plexToken").val(""),$("#address").val(""),$("#port").val("32400");const plexServerCard=$("#plexServerCard").html(),theCompiledHtml=Handlebars.compile(plexServerCard)(payload.extras);$("#plexServers").append(theCompiledHtml)}else plexSaveError.show()}),stompClient.subscribe("/configuration/plex/duplicate",function(){hideAllAlertsAndSpinners(),plexDuplicateError.show()})}),window.testTmdbKey=testTmdbKey,window.saveTmdbKey=saveTmdbKey,window.testPlexServer=testPlexServer,window.addPlexServer=addPlexServer,window.testExistingPlexServer=testExistingPlexServer,window.removePlexServer=removePlexServer,window.saveSchedule=saveSchedule,window.setDeleteAllEnabledOrDisabled=setDeleteAllEnabledOrDisabled,window.nuke=nuke,window.saveTelegram=saveTelegramNotifications,window.testTelegram=testTelegramNotifications}),$(function(){$("[data-hide]").on("click",function(){$(this).closest("."+$(this).attr("data-hide")).hide()})}); \ No newline at end of file diff --git a/GapsWeb/src/main/resources/static/js/modules/telegram-notifications.js b/GapsWeb/src/main/resources/static/js/modules/telegram-notifications.js index 8f70992..4597867 100644 --- a/GapsWeb/src/main/resources/static/js/modules/telegram-notifications.js +++ b/GapsWeb/src/main/resources/static/js/modules/telegram-notifications.js @@ -10,38 +10,23 @@ import {getNotificationTypes} from '/js/modules/notification-types.min.js'; -export function testTelegram() { +export async function testTelegramNotifications() { 'use strict'; - getUserAsync('yourUsernameHere').then(data => console.log(data)); - - $.ajax({ - type: "PUT", - url: `/configuration/test/plex/${machineIdentifier}`, - dataType: "json", - success: function (result) { - hideAllAlertsAndSpinners(); - if (result && result.success) { - plexTestSuccess.show(); - } else { - plexTestError.show(); - } - }, error: function () { - hideAllAlertsAndSpinners(); - plexTestError.show(); - } - }); -} - -async function testTelegramNotifications() { let response = await fetch('/notifications/test/0', { method: 'put', }); let data = await response.json() - return data; + if (response.ok) { + //Good + } else { + //Show errors + } } export async function saveTelegramNotifications() { + 'use strict'; + const body = {}; body.botId = document.getElementById('telegramBotId').value; body.chatId = document.getElementById('telegramChatId').value; @@ -60,12 +45,11 @@ export async function saveTelegramNotifications() { }, body: JSON.stringify(body) }); - + let data = await response.json() if (response.ok) { //Good } else { //Show errors } - let data = await response.json() - return data; + } diff --git a/GapsWeb/src/main/resources/templates/configuration.html b/GapsWeb/src/main/resources/templates/configuration.html index 995b65c..80e7851 100755 --- a/GapsWeb/src/main/resources/templates/configuration.html +++ b/GapsWeb/src/main/resources/templates/configuration.html @@ -388,10 +388,10 @@
- Test Save + Test