Skip to content

Commit f55c8b0

Browse files
author
Rafael Grigorian
committed
Fixed #106 
1 parent 5164988 commit f55c8b0

File tree

12 files changed

+59
-9
lines changed

12 files changed

+59
-9
lines changed

‎src/skin/adminhtml/base/default/js/cloudflare/common.js‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,36 @@ function loadSections ( additional = "" ) {
1111
},
1212
success: ( response ) => {
1313
$(section).removeClass ("loading")
14+
hasErrors = response => {
15+
if ( "code" in response && response.code == 1009 ) {
16+
return true
17+
}
18+
if ( "success" in response ) {
19+
return response.success === false
20+
}
21+
if ( "state" in response && "success" in response.state ) {
22+
return response.state.success === false
23+
}
24+
if ( "webp" in response && "success" in response.webp ) {
25+
return response.webp.success === false
26+
}
27+
return false
28+
}
29+
if ( hasErrors ( response ) ) {
30+
$(section).find (".row:nth-child( n + 2 )").remove ()
31+
$(section).find (".wrapper_bottom").remove ()
32+
$(section).find (".wrapper_right").remove ()
33+
$(section).find (".wrapper_left *:nth-child( n + 3 )").remove ()
34+
$(section).find (".row").append (`
35+
<div class="wrapper_right" >
36+
<div>
37+
<h5 class="error" >Authorization Error</h5>
38+
<p>It appears that the configured Cloudflare token does not have sufficient permissions to render this section.</p>
39+
</div>
40+
</div>
41+
`)
42+
return
43+
}
1444
notification.showMessages ( response )
1545
var event = {
1646
"target": {

‎src/skin/adminhtml/base/default/js/cloudflare/core/notification.js‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,9 @@ function addError ( message ) {
6060
}
6161

6262
function showMessages ( data ) {
63+
if ( data.error ) {
64+
data.errors = [{ code: data.code, message: data.error }]
65+
}
6366
if ( data.errors ) {
6467
addError ( data.errors.map ( i => `${i.code}: ${i.message}` ) )
6568
}

‎src/skin/adminhtml/base/default/js/cloudflare/crypto/disable_universal_ssl.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ function triggerChange ( data ) {
2222
type: "POST",
2323
data: { "form_key": data.form.key, "state": value },
2424
success: function ( response ) {
25+
notification.showMessages ( response )
2526
$("section.cloudflare.crypto.ssl").addClass ("loading")
2627
common.loadSections (".crypto.disable_universal_ssl")
2728
}

‎src/skin/adminhtml/base/default/js/cloudflare/crypto/http_strict_transport_security.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,7 @@ $(document).on ( "cloudflare.crypto.http_strict_transport_security.update", func
150150
type: "POST",
151151
data: { "form_key": data.form.key, "value": config },
152152
success: function ( response ) {
153+
notification.showMessages ( response )
153154
configure.close ()
154155
common.loadSections (".crypto.http_strict_transport_security")
155156
}

‎src/skin/adminhtml/base/default/js/cloudflare/dns/dns_records.js‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ function secondsToAppropriate ( seconds ) {
3535

3636
function filterResults ( term, results ) {
3737
let searchTerm = ( term + "" ).toLowerCase ().trim ()
38-
return results.filter ( entry => {
38+
return !results ? [] : results.filter ( entry => {
3939
return ( entry.name + "" ).toLowerCase ().indexOf ( searchTerm ) > -1 ||
4040
( entry.content + "" ).toLowerCase ().indexOf ( searchTerm ) > -1
4141
})
@@ -216,6 +216,7 @@ $(document).on ( "cloudflare.dns.dns_records.delete", function ( event, data ) {
216216
type: "POST",
217217
data: { "form_key": data.form.key, "id": id },
218218
success: function ( response ) {
219+
notification.showMessages ( response )
219220
common.loadSections (".dns_records")
220221
}
221222
})
@@ -537,6 +538,7 @@ $(document).on ( "cloudflare.dns.dns_records.export", function ( event, data ) {
537538
type: "POST",
538539
data: { "form_key": data.form.key },
539540
success: function ( response ) {
541+
notification.showMessages ( response )
540542
let blob = new Blob ( [ response ], { type: "octet/stream" } )
541543
let url = window.URL.createObjectURL ( blob )
542544
let a = document.createElement ("a")
@@ -577,7 +579,7 @@ $(document).on ( "cloudflare.dns.dns_records.upload", function ( event, data ) {
577579
.on ( "submit", ( event ) => {
578580
event.preventDefault ()
579581
$(prompt.components.modal).addClass ("loading")
580-
let formData = new FormData ( form )
582+
let formData = new FormData ( form [ 0 ] )
581583
formData.set ( "form_key", data.form.key )
582584
formData.set ( "file", ($(fileInput)) [ 0 ].files [ 0 ] )
583585
$.ajax ({
@@ -588,6 +590,7 @@ $(document).on ( "cloudflare.dns.dns_records.upload", function ( event, data ) {
588590
contentType: false,
589591
processData: false,
590592
success: ( response ) => {
593+
notification.showMessages ( response )
591594
if ( response.success && response.result.recs_added == response.result.total_records_parsed ) {
592595
prompt.close ()
593596
$(data.section).addClass ("loading")
@@ -675,6 +678,7 @@ $(document).on ( "change", ".editable, .proxied, td.ttl", ( event ) => {
675678
"priority": priority == "" ? 0 : priority
676679
},
677680
success: ( response ) => {
681+
notification.showMessages ( response )
678682
$(section).find ("[contenteditable]").prop ( "contenteditable", true )
679683
common.loadSections (".dns.dns_records")
680684
}

‎src/skin/adminhtml/base/default/js/cloudflare/firewall/access_rules.js‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -229,6 +229,7 @@ $(document).on ( "cloudflare.firewall.access_rules.add", function ( event, data
229229
"note": note
230230
},
231231
success: function ( response ) {
232+
notification.showMessages ( response )
232233
$(data.section).addClass ("loading")
233234
$(data.section).find ("[name='value']").val ("")
234235
$(data.section).find ("[name='mode']").val ("block")
@@ -252,6 +253,7 @@ $(document).on ( "cloudflare.firewall.access_rules.delete", function ( event, da
252253
type: "POST",
253254
data: { "form_key": data.form.key, "id": id },
254255
success: function ( response ) {
256+
notification.showMessages ( response )
255257
common.loadSections (".access_rules")
256258
}
257259
})
@@ -269,6 +271,7 @@ $(document).on ( "cloudflare.firewall.access_rules.mode", function ( event, data
269271
type: "POST",
270272
data: { "form_key": data.form.key, "id": id, "mode": mode },
271273
success: function ( response ) {
274+
notification.showMessages ( response )
272275
common.loadSections (".access_rules")
273276
}
274277
})
@@ -292,6 +295,7 @@ $(document).on ( "cloudflare.firewall.access_rules.edit", function ( event, data
292295
type: "POST",
293296
data: { "form_key": data.form.key, "id": $(data.trigger).data ("id"), "note": notes.val () },
294297
success: function ( response ) {
298+
notification.showMessages ( response )
295299
common.loadSections (".access_rules")
296300
}
297301
})

‎src/skin/adminhtml/base/default/js/cloudflare/firewall/user_agent_blocking.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,8 +167,8 @@ $(document).on ( "cloudflare.firewall.user_agent_blocking.create", function ( ev
167167
"value": agent
168168
},
169169
success: function ( response ) {
170+
$(prompt.components.modal).removeClass ("loading")
170171
if ( response.success ) {
171-
$(prompt.components.modal).removeClass ("loading")
172172
prompt.close ()
173173
}
174174
notification.showMessages ( response )
@@ -201,8 +201,8 @@ $(document).on ( "cloudflare.firewall.user_agent_blocking.edit", function ( even
201201
"value": $(modal).find ("[name='agent']").val ()
202202
},
203203
success: ( response ) => {
204+
$(modal).removeClass ("loading")
204205
if ( response.success ) {
205-
$(modal).removeClass ("loading")
206206
prompt.close ()
207207
}
208208
notification.showMessages ( response )

‎src/skin/adminhtml/base/default/js/cloudflare/overview/status.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ const $ = require ("jquery")
22
const notification = require ("cloudflare/core/notification")
33

44
$(document).on ( "cloudflare.overview.status.initialize", function ( event, data ) {
5-
if ( data.response.result.paused ) {
5+
if ( data.response && data.response.result && data.response.result.paused ) {
66
$(data.section).find (".section_title").text ("Resume")
77
$(data.section).find (".wrapper_left > p").text ("Cloudflare has been temporarily deactivated for your domain. Cloudflare will continue to resolve DNS for your website, but all requests will go directly to your origin which means you will not receive the performance and security benefits. All of your settings have been saved.")
88
$(data.section).find (".trigger").val ("Resume")
@@ -28,7 +28,7 @@ $(document).on ( "cloudflare.overview.status.pause", function ( event, data ) {
2828
// }
2929
$(data.section).removeClass ("loading")
3030
notification.showMessages ( response )
31-
if ( response.result.paused ) {
31+
if ( response.result && response.result.paused ) {
3232
$(data.section).find (".section_title").text ("Resume")
3333
$(data.section).find (".wrapper_left > p").text ("Cloudflare has been temporarily deactivated for your domain. Cloudflare will continue to resolve DNS for your website, but all requests will go directly to your origin which means you will not receive the performance and security benefits. All of your settings have been saved.")
3434
$(data.section).find (".trigger").val ("Resume")
@@ -47,7 +47,7 @@ $(document).on ( "cloudflare.overview.status.resume", function ( event, data ) {
4747
success: function ( response ) {
4848
$(data.section).removeClass ("loading")
4949
notification.showMessages ( response )
50-
if ( !response.result.paused ) {
50+
if ( response.result && !response.result.paused ) {
5151
$(data.section).find (".section_title").text ("Pause Website")
5252
$(data.section).find (".wrapper_left > p").text ("Pause will temporarily deactivate Cloudflare for your domain. Cloudflare will continue to resolve DNS for your website, but all requests will go directly to your origin which means you will not receive performance and security benefits. All of your settings will be saved.")
5353
$(data.section).find (".trigger").val ("Pause")

‎src/skin/adminhtml/base/default/js/cloudflare/page_rules/page_rules.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -455,6 +455,7 @@ $(document).on ( "cloudflare.page_rules.page_rules.delete", function ( event, da
455455
type: "POST",
456456
data: { "form_key": data.form.key, "id": id },
457457
success: function ( response ) {
458+
notification.showMessages ( response )
458459
common.loadSections (".page_rules")
459460
}
460461
})

‎src/skin/adminhtml/base/default/js/cloudflare/speed/auto_minify.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
const $ = require ("jquery")
22
const cloudflare = require ("cloudflare/common")
33
const notification = require ("cloudflare/core/notification")
4+
const common = require ("cloudflare/common")
45

56
$(document).on ( "cloudflare.speed.auto_minify.initialize", ( event, data ) => {
67
var jsState = data.response.result.value.js === "on"
@@ -21,8 +22,8 @@ $(document).on ( "cloudflare.speed.auto_minify.change", ( event, data ) => {
2122
type: "POST",
2223
data: { "form_key": data.form.key, "js": jsVal, "css": cssVal, "html": htmlVal },
2324
success: ( response ) => {
24-
$(data.section).removeClass ("loading")
2525
notification.showMessages ( response )
26+
common.loadSections (".auto_minify")
2627
}
2728
})
2829
})

0 commit comments

Comments
 (0)