This commit is contained in:
2020-06-20 00:20:09 +00:00
parent 534d47132d
commit 10693a9bc3
3 changed files with 235 additions and 256 deletions

View File

@@ -194,20 +194,17 @@ export default {
window.$gz.form.fieldValueChanged(this, ref);
}
},
getBackupStatus() {
async getBackupStatus() {
let vm = this;
// vm.formState.loading = true;
let url = "backup/status";
window.$gz.form.deleteAllErrorBoxErrors(vm);
window.$gz.api
.get(url)
.then(res => {
try {
let res = await window.$gz.api.get(url);
if (res.error) {
if (res.error.code == "2010") {
window.$gz.eventBus.$emit(
"notify-error",
vm.$ay.t("ErrorAPI2010")
);
window.$gz.eventBus.$emit("notify-error", vm.$ay.t("ErrorAPI2010"));
window.$gz._.delay(function() {
vm.$router.go(-1);
}, 2000);
@@ -241,29 +238,25 @@ export default {
vm.backupFileList = [];
}
}
})
.catch(function handleGetBackupFileListError(error) {
} catch (error) {
window.$gz.form.setFormState({
vm: vm,
loading: false
});
window.$gz.errorHandler.handleFormError(error, vm);
});
}
},
getDataFromApi() {
async getDataFromApi() {
let vm = this;
vm.formState.loading = true;
let url = "global-ops-backup-setting";
window.$gz.form.deleteAllErrorBoxErrors(vm);
window.$gz.api
.get(url)
.then(res => {
try {
let res = await window.$gz.api.get(url);
if (res.error) {
if (res.error.code == "2010") {
window.$gz.eventBus.$emit(
"notify-error",
vm.$ay.t("ErrorAPI2010")
);
window.$gz.eventBus.$emit("notify-error", vm.$ay.t("ErrorAPI2010"));
window.$gz._.delay(function() {
vm.$router.go(-1);
}, 2000);
@@ -280,24 +273,23 @@ export default {
});
generateMenu(vm);
}
})
.catch(function handleGetDataFromAPIError(error) {
} catch (error) {
window.$gz.form.setFormState({
vm: vm,
loading: false
});
window.$gz.errorHandler.handleFormError(error, vm);
});
}
},
submit() {
async submit() {
let vm = this;
try {
if (vm.canSave) {
vm.formState.loading = true;
let url = "global-ops-backup-setting";
window.$gz.form.deleteAllErrorBoxErrors(vm);
window.$gz.api
.upsert(url, vm.obj)
.then(res => {
let res = await window.$gz.api.upsert(url, vm.obj);
vm.formState.loading = false;
if (res.error) {
vm.formState.serverError = res.error;
@@ -309,31 +301,28 @@ export default {
dirty: false
});
}
})
.catch(function handleSubmitError(error) {
}
} catch (error) {
vm.formState.loading = false;
window.$gz.errorHandler.handleFormError(error, vm);
});
}
},
backupNow() {
async backupNow() {
let vm = this;
vm.formState.loading = true;
let url = "backup/backup-now";
window.$gz.form.deleteAllErrorBoxErrors(vm);
window.$gz.api
.upsert(url, {})
.then(res => {
try {
let res = await window.$gz.api.upsert(url, {});
vm.formState.loading = false;
if (res.error) {
vm.formState.serverError = res.error;
window.$gz.form.setErrorBoxErrors(vm);
}
})
.catch(function handleSubmitError(error) {
} catch (error) {
vm.formState.loading = false;
window.$gz.errorHandler.handleFormError(error, vm);
});
}
}
}
};
@@ -341,7 +330,7 @@ export default {
/////////////////////////////
//
//
function clickHandler(menuItem) {
async function clickHandler(menuItem) {
if (!menuItem) {
return;
}
@@ -352,13 +341,14 @@ function clickHandler(menuItem) {
m.vm.submit();
break;
case "backupnow":
window.$gz.dialog
.confirmGeneric("AreYouSureBackupNow", "warning")
.then(dialogResult => {
if (dialogResult == true) {
if (
(await window.$gz.dialog.confirmGeneric(
"AreYouSureBackupNow",
"warning"
)) === true
) {
m.vm.backupNow();
}
});
break;
default:
window.$gz.eventBus.$emit(

View File

@@ -36,21 +36,21 @@
const FORM_KEY = "ops-jobs";
export default {
created() {
async created() {
let vm = this;
initForm(vm)
.then(() => {
try {
await initForm(vm);
vm.rights = window.$gz.role.getRights(window.$gz.type.ServerJob);
vm.formState.readOnly = !vm.rights.change;
vm.formState.ready = true;
window.$gz.eventBus.$on("menu-click", clickHandler);
vm.getDataFromApi();
vm.formState.loading = false;
})
.catch(err => {
} catch (err) {
vm.formState.ready = true;
window.$gz.errorHandler.handleFormError(err, vm);
});
}
},
data() {
return {
@@ -87,20 +87,17 @@ export default {
window.$gz.form.fieldValueChanged(this, ref);
}
},
getDataFromApi() {
async getDataFromApi() {
let vm = this;
vm.formState.loading = true;
let url = "job-operations/logs/all-jobs";
window.$gz.form.deleteAllErrorBoxErrors(vm);
window.$gz.api
.get(url)
.then(res => {
try {
let res = await window.$gz.api.get(url);
if (res.error) {
if (res.error.code == "2010") {
window.$gz.eventBus.$emit(
"notify-error",
vm.$ay.t("ErrorAPI2010")
);
window.$gz.eventBus.$emit("notify-error", vm.$ay.t("ErrorAPI2010"));
window.$gz._.delay(function() {
vm.$router.go(-1);
}, 2000);
@@ -142,33 +139,30 @@ export default {
});
generateMenu(vm);
}
})
.catch(function handleGetDataFromAPIError(error) {
} catch (error) {
window.$gz.form.setFormState({
vm: vm,
loading: false
});
window.$gz.errorHandler.handleFormError(error, vm);
});
}
},
testJob() {
async testJob() {
let vm = this;
vm.formState.loading = true;
let url = "job-operations/test-job";
window.$gz.form.deleteAllErrorBoxErrors(vm);
window.$gz.api
.upsert(url, {})
.then(res => {
try {
let res = await window.$gz.api.upsert(url, {});
vm.formState.loading = false;
if (res.error) {
vm.formState.serverError = res.error;
window.$gz.form.setErrorBoxErrors(vm);
}
})
.catch(function handleSubmitError(error) {
} catch (error) {
vm.formState.loading = false;
window.$gz.errorHandler.handleFormError(error, vm);
});
}
}
}
};

View File

@@ -37,20 +37,20 @@
const FORM_KEY = "ops-logs";
export default {
created() {
async created() {
let vm = this;
initForm(vm)
.then(() => {
try {
await initForm(vm);
vm.formState.ready = true;
window.$gz.eventBus.$on("menu-click", clickHandler);
generateMenu(vm);
vm.getDataFromApi();
vm.formState.loading = false;
})
.catch(err => {
} catch (err) {
vm.formState.ready = true;
window.$gz.errorHandler.handleFormError(err, vm);
});
}
},
data() {
return {
@@ -93,7 +93,7 @@ export default {
logSelected: function() {
this.getDataFromApi();
},
getDataFromApi() {
async getDataFromApi() {
let vm = this;
if (!vm.selectedLog) {
return;
@@ -101,15 +101,12 @@ export default {
vm.formState.loading = true;
let url = "log-file/" + vm.selectedLog;
window.$gz.form.deleteAllErrorBoxErrors(vm);
window.$gz.api
.get(url)
.then(res => {
try {
let res = await window.$gz.api.get(url);
if (res.error) {
if (res.error.code == "2010") {
window.$gz.eventBus.$emit(
"notify-error",
vm.$ay.t("ErrorAPI2010")
);
window.$gz.eventBus.$emit("notify-error", vm.$ay.t("ErrorAPI2010"));
window.$gz._.delay(function() {
vm.$router.go(-1);
}, 2000);
@@ -131,14 +128,13 @@ export default {
});
// generateMenu(vm);
}
})
.catch(function handleGetDataFromAPIError(error) {
} catch (error) {
window.$gz.form.setFormState({
vm: vm,
loading: false
});
window.$gz.errorHandler.handleFormError(error, vm);
});
}
}
}
};
@@ -220,13 +216,12 @@ async function fetchTranslatedText(vm) {
//////////////////////
//
//
function populateSelectionLists(vm) {
return window.$gz.api.get("log-file").then(res => {
async function populateSelectionLists(vm) {
let res = await window.$gz.api.get("log-file");
if (res.error) {
window.$gz.errorHandler.handleFormError(res.error, vm);
} else {
vm.selectLists.serverLogs = res.data;
}
});
}
</script>