Skip to content

Commit

Permalink
js code refactor
Browse files Browse the repository at this point in the history
  • Loading branch information
codesaur committed Jan 29, 2024
1 parent b394145 commit eae6772
Show file tree
Hide file tree
Showing 16 changed files with 41 additions and 41 deletions.
4 changes: 2 additions & 2 deletions src/account/account-index.html
Original file line number Diff line number Diff line change
Expand Up @@ -172,12 +172,12 @@ <h3 class="text-primary" style="padding-right:10px"><i class="bi bi-people-fill"
return res.json();
}).then(response => {
if (response.status !== 'success') {
throw new Error(response.message ? response.message : 'Invalid response!');
throw new Error(response.message ?? 'Invalid response!');
}

Swal.close();

NotifyTop('success', "{{ 'success'|text|e }}", response.message ? response.message : '');
NotifyTop('success', "{{ 'success'|text|e }}", response.message ?? '');

let row = a.parentNode.parentNode;
if (row && row.parentNode !== null) {
Expand Down
8 changes: 4 additions & 4 deletions src/account/newbie-index-modal.html
Original file line number Diff line number Diff line change
Expand Up @@ -94,10 +94,10 @@ <h5 class="modal-title text-uppercase text-primary"><i class="bi bi-person-plus-
return res.json();
}).then(response => {
if (response.status !== 'success') {
throw new Error(response.message ? response.message : 'Invalid response!');
throw new Error(response.message ?? 'Invalid response!');
}

NotifyTop('success', "{{ 'success'|text|e }}", response.message ? response.message : '');
NotifyTop('success', "{{ 'success'|text|e }}", response.message ?? '');

window.location.href = "{{ 'accounts'|link }}";
})
Expand Down Expand Up @@ -140,10 +140,10 @@ <h5 class="modal-title text-uppercase text-primary"><i class="bi bi-person-plus-
return res.json();
}).then(response => {
if (response.status !== 'success') {
throw new Error(response.message ? response.message : 'Invalid response!');
throw new Error(response.message ?? 'Invalid response!');
}

NotifyTop('success', "{{ 'success'|text|e }}", response.message ? response.message : '');
NotifyTop('success', "{{ 'success'|text|e }}", response.message ?? '');

let row = a.parentNode.parentNode;
if (row && row.parentNode !== null) {
Expand Down
4 changes: 2 additions & 2 deletions src/contents/news-index.html
Original file line number Diff line number Diff line change
Expand Up @@ -81,12 +81,12 @@ <h3 class="text-info" style="padding-right:10px"><i class="bi bi-book"></i> {{ '
return res.json();
}).then(response => {
if (response.status !== 'success') {
throw new Error(response.message ? response.message : 'Invalid response!');
throw new Error(response.message ?? 'Invalid response!');
}

Swal.close();

NotifyTop('success', "{{ 'success'|text|e }}", response.message ? response.message : '');
NotifyTop('success', "{{ 'success'|text|e }}", response.message ?? '');

let row = a.parentNode.parentNode;
if (row && row.parentNode !== null) {
Expand Down
4 changes: 2 additions & 2 deletions src/contents/news-insert.html
Original file line number Diff line number Diff line change
Expand Up @@ -541,12 +541,12 @@ <h6 class="text-success text-uppercase pt-2"><i class="bi bi-book"></i> {{ 'add-
return res.json();
}).then(response => {
if (response.status !== 'success') {
throw new Error(response.message ? response.message : 'Invalid response!');
throw new Error(response.message ?? 'Invalid response!');
}

Swal.close();

NotifyTop('success', "{{ 'success'|text|e }}", response.message ? response.message : '');
NotifyTop('success', "{{ 'success'|text|e }}", response.message ?? '');

let row = a.parentNode.parentNode.parentNode.parentNode;
if (row && row.parentNode !== null) {
Expand Down
4 changes: 2 additions & 2 deletions src/contents/news-update.html
Original file line number Diff line number Diff line change
Expand Up @@ -587,12 +587,12 @@ <h6 class="text-primary text-uppercase pt-2"><i class="bi bi-pencil-square"></i>
return res.json();
}).then(response => {
if (response.status !== 'success') {
throw new Error(response.message ? response.message : 'Invalid response!');
throw new Error(response.message ?? 'Invalid response!');
}

Swal.close();

NotifyTop('success', "{{ 'success'|text|e }}", response.message ? response.message : '');
NotifyTop('success', "{{ 'success'|text|e }}", response.message ?? '');

let row = a.parentNode.parentNode.parentNode.parentNode;
if (row && row.parentNode !== null) {
Expand Down
4 changes: 2 additions & 2 deletions src/contents/page-insert.html
Original file line number Diff line number Diff line change
Expand Up @@ -552,12 +552,12 @@ <h6 class="text-success text-uppercase pt-2"><i class="bi bi-book"></i> {{ 'add-
return res.json();
}).then(response => {
if (response.status !== 'success') {
throw new Error(response.message ? response.message : 'Invalid response!');
throw new Error(response.message ?? 'Invalid response!');
}

Swal.close();

NotifyTop('success', "{{ 'success'|text|e }}", response.message ? response.message : '');
NotifyTop('success', "{{ 'success'|text|e }}", response.message ?? '');

let row = a.parentNode.parentNode.parentNode.parentNode;
if (row && row.parentNode !== null) {
Expand Down
4 changes: 2 additions & 2 deletions src/contents/page-update.html
Original file line number Diff line number Diff line change
Expand Up @@ -594,12 +594,12 @@ <h6 class="text-primary text-uppercase pt-2"><i class="bi bi-pencil-square"></i>
return res.json();
}).then(response => {
if (response.status !== 'success') {
throw new Error(response.message ? response.message : 'Invalid response!');
throw new Error(response.message ?? 'Invalid response!');
}

Swal.close();

NotifyTop('success', "{{ 'success'|text|e }}", response.message ? response.message : '');
NotifyTop('success', "{{ 'success'|text|e }}", response.message ?? '');

let row = a.parentNode.parentNode.parentNode.parentNode;
if (row && row.parentNode !== null) {
Expand Down
4 changes: 2 additions & 2 deletions src/contents/pages-index.html
Original file line number Diff line number Diff line change
Expand Up @@ -85,12 +85,12 @@ <h3 class="text-primary" style="padding-right:10px"><i class="bi bi-book-half"><
return res.json();
}).then(response => {
if (response.status !== 'success') {
throw new Error(response.message ? response.message : 'Invalid response!');
throw new Error(response.message ?? 'Invalid response!');
}

Swal.close();

NotifyTop('success', "{{ 'success'|text|e }}", response.message ? response.message : '');
NotifyTop('success', "{{ 'success'|text|e }}", response.message ?? '');

let row = a.parentNode.parentNode;
if (row && row.parentNode !== null) {
Expand Down
4 changes: 2 additions & 2 deletions src/contents/references-index.html
Original file line number Diff line number Diff line change
Expand Up @@ -67,12 +67,12 @@ <h5 class="text-primary" style="padding-right:10px"><i class="bi bi-layout-wtf">
return res.json();
}).then(response => {
if (response.status !== 'success') {
throw new Error(response.message ? response.message : 'Invalid response!');
throw new Error(response.message ?? 'Invalid response!');
}

Swal.close();

NotifyTop('success', "{{ 'success'|text|e }}", response.message ? response.message : '');
NotifyTop('success', "{{ 'success'|text|e }}", response.message ?? '');

let row = a.parentNode.parentNode;
if (row && row.parentNode !== null) {
Expand Down
6 changes: 3 additions & 3 deletions src/file/files-update-modal.html
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,8 @@ <h6 class="modal-title text-uppercase text-primary"><i class="bi bi-hdd"></i> {{
row.children[3].innerHTML = resp.record.category;
row.children[4].innerHTML = resp.record.keyword;

let type = resp.type ? resp.type : 'success';
let title = resp.title ? resp.title : 'Success';
NotifyTop(type, title, resp.message ? resp.message : 'Record successfully updated');
let type = resp.type ?? 'success';
let title = resp.title ?? 'Success';
NotifyTop(type, title, resp.message ?? 'Record successfully updated');
});
</script>
4 changes: 2 additions & 2 deletions src/file/indo_general_files-index.html
Original file line number Diff line number Diff line change
Expand Up @@ -330,12 +330,12 @@ <h3 class="text-danger" style="padding-right:10px"><i class="bi bi-folder"></i>
return res.json();
}).then(response => {
if (response.status !== 'success') {
throw new Error(response.message ? response.message : 'Invalid response!');
throw new Error(response.message ?? 'Invalid response!');
}

Swal.close();

NotifyTop('success', "{{ 'success'|text|e }}", response.message ? response.message : '');
NotifyTop('success', "{{ 'success'|text|e }}", response.message ?? '');

filesDatatable.row($(a).parents('tr')).remove().draw();
})
Expand Down
4 changes: 2 additions & 2 deletions src/localization/countries-index.html
Original file line number Diff line number Diff line change
Expand Up @@ -73,12 +73,12 @@ <h3 class="text-primary" style="padding-right:10px"><i class="bi bi-flag"></i> {
return res.json();
}).then(response => {
if (response.status !== 'success') {
throw new Error(response.message ? response.message : 'Invalid response!');
throw new Error(response.message ?? 'Invalid response!');
}

Swal.close();

NotifyTop('success', "{{ 'success'|text|e }}", response.message ? response.message : '');
NotifyTop('success', "{{ 'success'|text|e }}", response.message ?? '');

let row = a.parentNode.parentNode;
if (row && row.parentNode !== null) {
Expand Down
4 changes: 2 additions & 2 deletions src/localization/languages-index.html
Original file line number Diff line number Diff line change
Expand Up @@ -79,12 +79,12 @@ <h3 class="text-danger" style="padding-right:10px"><i class="bi bi-flag-fill"></
return res.json();
}).then(response => {
if (response.status !== 'success') {
throw new Error(response.message ? response.message : 'Invalid response!');
throw new Error(response.message ?? 'Invalid response!');
}

Swal.close();

NotifyTop('success', "{{ 'success'|text|e }}", response.message ? response.message : '');
NotifyTop('success', "{{ 'success'|text|e }}", response.message ?? '');

let row = a.parentNode.parentNode;
if (row && row.parentNode !== null) {
Expand Down
4 changes: 2 additions & 2 deletions src/localization/texts-index.html
Original file line number Diff line number Diff line change
Expand Up @@ -78,12 +78,12 @@ <h5 class="text-{{ color }}" style="padding-right:10px"><i class="bi bi-translat
return res.json();
}).then(response => {
if (response.status !== 'success') {
throw new Error(response.message ? response.message : 'Invalid response!');
throw new Error(response.message ?? 'Invalid response!');
}

Swal.close();

NotifyTop('success', "{{ 'success'|text|e }}", response.message ? response.message : '');
NotifyTop('success', "{{ 'success'|text|e }}", response.message ?? '');

let row = a.parentNode.parentNode;
if (row && row.parentNode !== null) {
Expand Down
4 changes: 2 additions & 2 deletions src/organization/organization-index.html
Original file line number Diff line number Diff line change
Expand Up @@ -80,12 +80,12 @@ <h3 class="text-dark" style="padding-right:10px"><i class="bi bi-bank"></i> {{ '
return res.json();
}).then(response => {
if (response.status !== 'success') {
throw new Error(response.message ? response.message : 'Invalid response!');
throw new Error(response.message ?? 'Invalid response!');
}

Swal.close();

NotifyTop('success', "{{ 'success'|text|e }}", response.message ? response.message : '');
NotifyTop('success', "{{ 'success'|text|e }}", response.message ?? '');

let row = a.parentNode.parentNode;
if (row && row.parentNode !== null) {
Expand Down
16 changes: 8 additions & 8 deletions src/rbac/rbac-alias.html
Original file line number Diff line number Diff line change
Expand Up @@ -64,17 +64,17 @@ <h3 class="text-danger" style="padding-right:10px"><i class="bi bi-shield-fill-c
formData.append('role_id',this.getAttribute('role_id'));
formData.append('permission_id', this.getAttribute('permission_id'));
fetch(
'{{ 'rbac-set-role-permission'|link({'alias':alias}) }}',
{
method: this.checked ? 'POST' : 'PUT',
body: formData
}
'{{ 'rbac-set-role-permission'|link({'alias':alias}) }}',
{
method: this.checked ? 'POST' : 'PUT',
body: formData
}
).then(res => {
return res.json();
}).then(response => {
let type = response.type ? response.type : 'warning';
let title = response.title ? response.title : '{{ 'notice'|text|e }}';
NotifyTop(type, title, response.message ? response.message : '');
let type = response.type ?? 'warning';
let title = response.title ?? '{{ 'notice'|text|e }}';
NotifyTop(type, title, response.message ?? '');
$.unblockUI();
})
.catch(error => {
Expand Down

0 comments on commit eae6772

Please sign in to comment.