This commit is contained in:
2021-03-12 00:48:37 +00:00
parent 3c726defa6
commit 765c25987a

View File

@@ -34,7 +34,7 @@
<v-spacer></v-spacer>
<v-btn color="primary" text @click="authenticate()">{{
$ay.t("OK")
$ay.t("Save")
}}</v-btn>
</v-card-actions>
</v-card>
@@ -88,17 +88,6 @@ export default {
window.$gz.errorHandler.handleFormError(err, vm);
}
},
async beforeRouteLeave(to, from, next) {
if (!this.formState.dirty) {
next();
return;
}
if ((await window.$gz.dialog.confirmLeaveUnsaved()) === true) {
next();
} else {
next(false);
}
},
beforeDestroy() {
window.$gz.eventBus.$off("menu-click", clickHandler);
},
@@ -125,37 +114,37 @@ export default {
};
},
//WATCHERS
watch: {
formState: {
handler: function(val) {
//,oldval is available here too if necessary
if (this.formState.loading) {
return;
}
// watch: {
// formState: {
// handler: function(val) {
// //,oldval is available here too if necessary
// if (this.formState.loading) {
// return;
// }
//enable / disable save button
let canSave = val.dirty && val.valid && !val.readOnly;
if (canSave) {
window.$gz.eventBus.$emit("menu-enable-item", FORM_KEY + ":save");
} else {
window.$gz.eventBus.$emit("menu-disable-item", FORM_KEY + ":save");
}
},
deep: true
}
},
// //enable / disable save button
// let canSave = val.dirty && val.valid && !val.readOnly;
// if (canSave) {
// window.$gz.eventBus.$emit("menu-enable-item", FORM_KEY + ":save");
// } else {
// window.$gz.eventBus.$emit("menu-disable-item", FORM_KEY + ":save");
// }
// },
// deep: true
// }
// },
computed: {
canSave: function() {
return this.formState.valid && this.formState.dirty;
},
// canSave: function() {
// return this.formState.valid && this.formState.dirty;
// },
qCode: function() {
return `data:image/png;base64,${this.obj.qr}`;
}
},
methods: {
translation() {
return window.$gz.translation;
},
// translation() {
// return window.$gz.translation;
// },
form() {
return window.$gz.form;
},
@@ -164,35 +153,34 @@ export default {
window.$gz.form.fieldValueChanged(this, ref);
}
},
async authenticate() {
let vm = this;
if (vm.canSave) {
vm.formState.loading = true;
//always submit from this form for the current logged in user id
let url = API_BASE_URL;
vm.formState.loading = true;
//clear any errors vm might be around from previous submit
window.$gz.form.deleteAllErrorBoxErrors(vm);
try {
let res = await window.$gz.api.upsert(url, vm.pin);
//clear any errors vm might be around from previous submit
window.$gz.form.deleteAllErrorBoxErrors(vm);
try {
let res = await window.$gz.api.post("auth/totp-validate", {
pin: vm.pin
});
if (res.error) {
vm.formState.serverError = res.error;
window.$gz.form.setErrorBoxErrors(vm);
} else {
//Only a post, no data returned
window.$gz.form.setFormState({
vm: vm,
dirty: false
});
}
} catch (error) {
window.$gz.errorHandler.handleFormError(error, vm);
} finally {
vm.loading = false;
if (res.error) {
vm.formState.serverError = res.error;
window.$gz.form.setErrorBoxErrors(vm);
} else {
console.log(res);
//Only a post, no data returned
window.$gz.form.setFormState({
vm: vm,
dirty: false
});
}
} catch (error) {
window.$gz.errorHandler.handleFormError(error, vm);
} finally {
vm.loading = false;
}
}
}
@@ -208,9 +196,9 @@ function clickHandler(menuItem) {
let m = window.$gz.menu.parseMenuItem(menuItem);
if (m.owner == FORM_KEY && !m.disabled) {
switch (m.key) {
case "save":
m.vm.submit();
break;
// case "save":
// m.vm.submit();
// break;
default:
window.$gz.eventBus.$emit(
@@ -236,17 +224,17 @@ function generateMenu(vm) {
menuItems: []
};
if (vm.rights.change) {
menuOptions.menuItems.push({
title: "Save",
icon: "$ayiSave",
surface: true,
key: FORM_KEY + ":save",
vm: vm
});
}
// if (vm.rights.change) {
// menuOptions.menuItems.push({
// title: "Save",
// icon: "$ayiSave",
// surface: true,
// key: FORM_KEY + ":save",
// vm: vm
// });
// }
window.$gz.eventBus.$emit("menu-change", menuOptions);
// window.$gz.eventBus.$emit("menu-change", menuOptions);
}
/////////////////////////////////
@@ -266,7 +254,9 @@ async function fetchTranslatedText(vm) {
"AuthConnectAppSubTitle",
"AuthConnectAppManualEntry",
"AuthEnterPin",
"AuthTwoFactor"
"AuthTwoFactor",
"AuthPinInvalid",
"AuthConnectCompleted"
]);
}
</script>