This commit is contained in:
2020-06-19 23:58:52 +00:00
parent f02888fae7
commit 5e1efbab24
18 changed files with 431 additions and 479 deletions

View File

@@ -284,7 +284,7 @@ export default {
window.$gz.errorHandler.handleFormError(error, vm); window.$gz.errorHandler.handleFormError(error, vm);
} }
}, },
submit() { async submit() {
let vm = this; let vm = this;
let url = API_BASE_URL; let url = API_BASE_URL;
//clear any errors vm might be around from previous submit //clear any errors vm might be around from previous submit
@@ -306,11 +306,11 @@ export default {
}); });
} }
} }
try {
//now set the template as a json string //now set the template as a json string
newObj.template = JSON.stringify(temp); newObj.template = JSON.stringify(temp);
window.$gz.api let res = await window.$gz.api.upsert(url, newObj);
.upsert(url, newObj)
.then(res => {
vm.formState.loading = false; vm.formState.loading = false;
if (res.error) { if (res.error) {
vm.formState.serverError = res.error; vm.formState.serverError = res.error;
@@ -323,18 +323,22 @@ export default {
dirty: false dirty: false
}); });
} }
}) } catch (error) {
.catch(function handleSubmitError(error) {
vm.formState.loading = false; vm.formState.loading = false;
window.$gz.errorHandler.handleFormError(error, vm); window.$gz.errorHandler.handleFormError(error, vm);
}); }
}, },
remove() { async remove() {
let vm = this; let vm = this;
window.$gz.dialog if (
.confirmGeneric("ResetToDefault", "warning") (await window.$gz.dialog.confirmGeneric(
.then(dialogResult => { "ResetToDefault",
if (dialogResult == true) { "warning"
)) !== true
) {
return;
}
try {
//do the delete //do the delete
vm.formState.loading = true; vm.formState.loading = true;
//No need to delete a new record, just abandon it... //No need to delete a new record, just abandon it...
@@ -342,9 +346,8 @@ export default {
let url = API_BASE_URL + vm.templateId; let url = API_BASE_URL + vm.templateId;
window.$gz.form.deleteAllErrorBoxErrors(vm); window.$gz.form.deleteAllErrorBoxErrors(vm);
window.$gz.api let res = await window.$gz.api.remove(url);
.remove(url)
.then(res => {
if (res.error) { if (res.error) {
vm.formState.serverError = res.error; vm.formState.serverError = res.error;
window.$gz.form.setErrorBoxErrors(vm); window.$gz.form.setErrorBoxErrors(vm);
@@ -352,19 +355,16 @@ export default {
//trigger reload of form //trigger reload of form
this.getDataFromApi(); this.getDataFromApi();
} }
}) }
.catch(function handleGetDataFromAPIError(error) { } catch (error) {
//Update the form status //Update the form status
window.$gz.form.setFormState({ window.$gz.form.setFormState({
vm: vm, vm: vm,
loading: false loading: false
}); });
window.$gz.errorHandler.handleFormError(error, vm); window.$gz.errorHandler.handleFormError(error, vm);
});
} }
} }
});
}
} }
}; };
@@ -453,24 +453,21 @@ function initForm(vm) {
// //
// Ensures UI translated text is available // Ensures UI translated text is available
// //
function fetchTranslatedText(vm) { async function fetchTranslatedText(vm) {
let tKeysRequired = ["Include", "ResetToDefault"]; await window.$gz.translation.cacheTranslations(["Include", "ResetToDefault"]);
return window.$gz.translation.cacheTranslations(tKeysRequired);
} }
////////////////////// //////////////////////
// //
// //
function populateSelectionLists(vm) { async function populateSelectionLists(vm) {
return window.$gz.api.get(API_BASE_URL + "List").then(res => { let res = await window.$gz.api.get(API_BASE_URL + "List");
if (res.error) { if (res.error) {
window.$gz.errorHandler.handleFormError(res.error, vm); window.$gz.errorHandler.handleFormError(res.error, vm);
} else { } else {
vm.selectLists.pickListTemplates = res.data; vm.selectLists.pickListTemplates = res.data;
window.$gz.form.addNoSelectionItem(vm.selectLists.pickListTemplates); window.$gz.form.addNoSelectionItem(vm.selectLists.pickListTemplates);
} }
});
} }
//////////////////// ////////////////////

View File

@@ -28,10 +28,11 @@ export default {
} }
}); });
}, },
created() { async created() {
let vm = this; let vm = this;
initForm(vm) try {
.then(() => { initForm(vm);
vm.rights = window.$gz.role.getRights(window.$gz.type.UserOptions); vm.rights = window.$gz.role.getRights(window.$gz.type.UserOptions);
vm.formState.ready = true; vm.formState.ready = true;
// window.$gz.eventBus.$on("menu-click", clickHandler); // window.$gz.eventBus.$on("menu-click", clickHandler);
@@ -43,11 +44,10 @@ export default {
// //id 0 means create a new record don't load one but thats not applicable here // //id 0 means create a new record don't load one but thats not applicable here
// vm.getDataFromApi(); // vm.getDataFromApi();
}) } catch (err) {
.catch(err => {
vm.formState.ready = true; vm.formState.ready = true;
window.$gz.errorHandler.handleFormError(err, vm); window.$gz.errorHandler.handleFormError(err, vm);
}); }
}, },
data() { data() {
return { return {
@@ -86,8 +86,8 @@ function initForm(vm) {
// //
// Ensures UI translated text is available // Ensures UI translated text is available
// //
function fetchTranslatedText(vm) { async function fetchTranslatedText(vm) {
return window.$gz.translation.cacheTranslations([ await window.$gz.translation.cacheTranslations([
"UserInterfaceSettings", "UserInterfaceSettings",
"PickListTemplates" "PickListTemplates"
]); ]);

View File

@@ -203,20 +203,19 @@ const API_BASE_URL = null;
const FORM_CUSTOM_TEMPLATE_KEY = null; const FORM_CUSTOM_TEMPLATE_KEY = null;
export default { export default {
created() { async created() {
let vm = this; let vm = this;
initForm(vm) try {
.then(() => { initForm(vm);
vm.rights = window.$gz.role.getRights(window.$gz.type.License); vm.rights = window.$gz.role.getRights(window.$gz.type.License);
generateMenu(vm); generateMenu(vm);
vm.formState.loading = false; vm.formState.loading = false;
vm.formState.ready = true; vm.formState.ready = true;
window.$gz.eventBus.$on("menu-click", clickHandler); window.$gz.eventBus.$on("menu-click", clickHandler);
}) } catch (err) {
.catch(err => {
vm.formState.ready = true; vm.formState.ready = true;
window.$gz.errorHandler.handleFormError(err, vm); window.$gz.errorHandler.handleFormError(err, vm);
}); }
}, },
beforeDestroy() { beforeDestroy() {
window.$gz.eventBus.$off("menu-click", clickHandler); window.$gz.eventBus.$off("menu-click", clickHandler);
@@ -586,8 +585,8 @@ function initForm(vm) {
// //
// Ensures UI translated text is available // Ensures UI translated text is available
// //
function fetchTranslatedText(vm) { async function fetchTranslatedText(vm) {
return window.$gz.translation.cacheTranslations([ await window.$gz.translation.cacheTranslations([
"RegisteredUser", "RegisteredUser",
"DatabaseID", "DatabaseID",
"LicenseSerial", "LicenseSerial",

View File

@@ -127,19 +127,18 @@
import ayaNovaVersion from "../api/ayanova-version"; import ayaNovaVersion from "../api/ayanova-version";
export default { export default {
created() { async created() {
let vm = this; let vm = this;
initForm(vm) try {
.then(() => { initForm(vm);
vm.formState.ready = true; vm.formState.ready = true;
window.$gz.eventBus.$on("menu-click", clickHandler); window.$gz.eventBus.$on("menu-click", clickHandler);
generateMenu(vm); generateMenu(vm);
vm.formState.loading = false; vm.formState.loading = false;
}) } catch (err) {
.catch(err => {
vm.formState.ready = true; vm.formState.ready = true;
window.$gz.errorHandler.handleFormError(err, vm); window.$gz.errorHandler.handleFormError(err, vm);
}); }
}, },
beforeDestroy() { beforeDestroy() {
window.$gz.eventBus.$off("menu-click", clickHandler); window.$gz.eventBus.$off("menu-click", clickHandler);
@@ -270,8 +269,8 @@ function initForm(vm) {
// //
// Ensures UI translated text is available // Ensures UI translated text is available
// //
function fetchTranslatedText(vm) { async function fetchTranslatedText(vm) {
let tKeysRequired = [ await window.$gz.translation.cacheTranslations([
"HelpAboutAyaNova", "HelpAboutAyaNova",
"CopySupportInfo", "CopySupportInfo",
"Server", "Server",
@@ -293,22 +292,19 @@ function fetchTranslatedText(vm) {
"LanguageCode", "LanguageCode",
"TimeZone", "TimeZone",
"CurrencyCode" "CurrencyCode"
]; ]);
return window.$gz.translation.cacheTranslations(tKeysRequired);
} }
//////////////////// ////////////////////
// //
function getServerInfo(vm) { async function getServerInfo(vm) {
return window.$gz.api.get("server-info").then(res => { let res = await window.$gz.api.get("server-info");
//We never expect there to be no data here //We never expect there to be no data here
if (!res.data) { if (!res.data) {
throw res; throw res;
} else { } else {
vm.serverInfo = res.data; vm.serverInfo = res.data;
} }
});
} }
//////////////////// ////////////////////

View File

@@ -63,28 +63,25 @@
const FORM_KEY = "customize"; const FORM_KEY = "customize";
const API_BASE_URL = "form-custom/"; const API_BASE_URL = "form-custom/";
export default { export default {
beforeRouteLeave(to, from, next) { async beforeRouteLeave(to, from, next) {
//let vm = this; if (!this.formState.dirty) {
if (this.formState.dirty) { next();
window.$gz.dialog.confirmLeaveUnsaved().then(dialogResult => { return;
if (dialogResult == true) { }
if ((await window.$gz.dialog.confirmLeaveUnsaved()) === true) {
next(); next();
} else { } else {
next(false); next(false);
} }
});
} else {
next();
}
}, },
beforeDestroy() { beforeDestroy() {
window.$gz.eventBus.$off("menu-click", clickHandler); window.$gz.eventBus.$off("menu-click", clickHandler);
}, },
created() { async created() {
let vm = this; let vm = this;
try {
initForm(vm);
initForm(vm)
.then(() => {
vm.formState.readOnly = !vm.rights.change; vm.formState.readOnly = !vm.rights.change;
window.$gz.eventBus.$on("menu-click", clickHandler); window.$gz.eventBus.$on("menu-click", clickHandler);
//NOTE: this would normally be in getDataFromAPI but this form doesn't really need that function so doing it here //NOTE: this would normally be in getDataFromAPI but this form doesn't really need that function so doing it here
@@ -92,14 +89,12 @@ export default {
generateMenu(vm, false); //default is never read only and passing in this vm generateMenu(vm, false); //default is never read only and passing in this vm
//init disable save button so it can be enabled only on edit to show dirty form //init disable save button so it can be enabled only on edit to show dirty form
window.$gz.eventBus.$emit("menu-disable-item", FORM_KEY + ":save"); window.$gz.eventBus.$emit("menu-disable-item", FORM_KEY + ":save");
}) } catch (err) {
.catch(err => {
window.$gz.errorHandler.handleFormError(err, vm); window.$gz.errorHandler.handleFormError(err, vm);
}) } finally {
.finally(function() {
vm.formState.ready = true; vm.formState.ready = true;
vm.formState.loading = false; vm.formState.loading = false;
}); }
}, },
data() { data() {
return { return {
@@ -170,7 +165,7 @@ export default {
//nothing to scan here just set form dirty //nothing to scan here just set form dirty
this.formState.dirty = true; this.formState.dirty = true;
}, },
submit() { async submit() {
let vm = this; let vm = this;
vm.formState.loading = true; vm.formState.loading = true;
@@ -217,13 +212,10 @@ export default {
} }
} }
} }
try {
//now set the template as a json string //now set the template as a json string
newObj.template = JSON.stringify(temp); newObj.template = JSON.stringify(temp);
let res = await window.$gz.api.upsert(url, newObj);
window.$gz.api
.upsert(url, newObj)
.then(res => {
if (res.error) { if (res.error) {
vm.formState.serverError = res.error; vm.formState.serverError = res.error;
window.$gz.form.setErrorBoxErrors(vm); window.$gz.form.setErrorBoxErrors(vm);
@@ -246,13 +238,11 @@ export default {
dirty: false dirty: false
}); });
} }
}) } catch (error) {
.catch(function handleSubmitError(error) {
window.$gz.errorHandler.handleFormError(error, vm); window.$gz.errorHandler.handleFormError(error, vm);
}) } finally {
.finally(function() {
vm.formState.loading = false; vm.formState.loading = false;
}); }
} }
} }
}; };
@@ -341,11 +331,11 @@ function initForm(vm) {
// //
// Ensures UI translated text is available // Ensures UI translated text is available
// //
function fetchTranslatedText(vm) { async function fetchTranslatedText(vm) {
//NOTE: This form expects to arrive here from the form being customized //NOTE: This form expects to arrive here from the form being customized
//so it does *not* attempt to fetch the translations for the field names of the form in question //so it does *not* attempt to fetch the translations for the field names of the form in question
//since they should already be set by that form. //since they should already be set by that form.
let tKeysRequired = [ await window.$gz.translation.cacheTranslations([
"FormFieldEntryRequired", "FormFieldEntryRequired",
"FormFieldVisible", "FormFieldVisible",
"UiFieldDataType", "UiFieldDataType",
@@ -357,9 +347,7 @@ function fetchTranslatedText(vm) {
"UiFieldDataTypesText", "UiFieldDataTypesText",
"UiFieldDataTypesTimeOnly", "UiFieldDataTypesTimeOnly",
"UiFieldDataTypesTrueFalse" "UiFieldDataTypesTrueFalse"
]; ]);
return window.$gz.translation.cacheTranslations(tKeysRequired);
} }
///////////////////////////////// /////////////////////////////////
@@ -392,15 +380,14 @@ function ensureTemplateIsInStore(vm) {
//////////////////// ////////////////////
// //
function initDataObject(vm) { async function initDataObject(vm) {
//Get all the fields *available* to this form (all the fields for the object defined in AyaFormFieldDefinitions.cs as SERVER) //Get all the fields *available* to this form (all the fields for the object defined in AyaFormFieldDefinitions.cs as SERVER)
//Note: this is not the actual customization data, just the list of fields that could be customized (or not if required mandatory) //Note: this is not the actual customization data, just the list of fields that could be customized (or not if required mandatory)
let url = "form-field-definition/" + vm.$route.params.formCustomTemplateKey; let url = "form-field-definition/" + vm.$route.params.formCustomTemplateKey;
return window.$gz.api.get(url).then(res => { let res = await window.$gz.api.get(url);
if (res.error) { if (res.error) {
throw res.error; throw res.error;
} }
//set vm.obj to the combined synthesized snapshot array of template and availble fields for working data for this form //set vm.obj to the combined synthesized snapshot array of template and availble fields for working data for this form
// - {key, ltdisplay, hideable, custom, required, hide, type} // - {key, ltdisplay, hideable, custom, required, hide, type}
//Iterate ObjectFields //Iterate ObjectFields
@@ -440,6 +427,5 @@ function initDataObject(vm) {
vm.formCustomTemplateKey vm.formCustomTemplateKey
); );
} }
});
} }
</script> </script>

View File

@@ -428,18 +428,15 @@ export default {
beforeDestroy() { beforeDestroy() {
window.$gz.eventBus.$off("menu-click", clickHandler); window.$gz.eventBus.$off("menu-click", clickHandler);
}, },
created() { async created() {
let vm = this; let vm = this;
try {
//set route values in data object so init form can handle //set route values in data object so init form can handle
vm.dataListKey = this.$route.params.dataListKey; vm.dataListKey = this.$route.params.dataListKey;
vm.listViewId = this.$route.params.listViewId; vm.listViewId = this.$route.params.listViewId;
vm.formKey = this.$route.params.formKey; vm.formKey = this.$route.params.formKey;
await initForm(vm);
initForm(vm)
.then(() => {
vm.formState.ready = true; vm.formState.ready = true;
window.$gz.eventBus.$on("menu-click", clickHandler); window.$gz.eventBus.$on("menu-click", clickHandler);
//NOTE: this would normally be in getDataFromAPI but this form doesn't really need that function so doing it here //NOTE: this would normally be in getDataFromAPI but this form doesn't really need that function so doing it here
//modify the menu as necessary //modify the menu as necessary
@@ -447,11 +444,10 @@ export default {
//init disable save button so it can be enabled only on edit to show dirty form //init disable save button so it can be enabled only on edit to show dirty form
window.$gz.eventBus.$emit("menu-disable-item", FORM_KEY + ":save"); window.$gz.eventBus.$emit("menu-disable-item", FORM_KEY + ":save");
vm.formState.loading = false; vm.formState.loading = false;
}) } catch (err) {
.catch(err => {
vm.formState.ready = true; vm.formState.ready = true;
window.$gz.errorHandler.handleFormError(err, vm); window.$gz.errorHandler.handleFormError(err, vm);
}); }
}, },
data() { data() {
return { return {
@@ -678,7 +674,7 @@ export default {
window.$gz.form.fieldValueChanged(this, ref); window.$gz.form.fieldValueChanged(this, ref);
} }
}, },
submit() { async submit() {
if (this.canSave) { if (this.canSave) {
let vm = this; let vm = this;
//check that "unsaved filter" is not the name //check that "unsaved filter" is not the name
@@ -709,9 +705,9 @@ export default {
//clear any errors vm might be around from previous submit //clear any errors vm might be around from previous submit
window.$gz.form.deleteAllErrorBoxErrors(this); window.$gz.form.deleteAllErrorBoxErrors(this);
window.$gz.api try {
.upsert(url, lvSave) let res = await window.$gz.api.upsert(url, lvSave);
.then(res => {
vm.formState.loading = false; vm.formState.loading = false;
if (res.error) { if (res.error) {
vm.formState.serverError = res.error; vm.formState.serverError = res.error;
@@ -752,17 +748,18 @@ export default {
}); });
} }
} }
}) } catch (error) {
.catch(function handleSubmitError(error) {
vm.formState.loading = false; vm.formState.loading = false;
window.$gz.errorHandler.handleFormError(error, vm); window.$gz.errorHandler.handleFormError(error, vm);
}); }
} }
}, },
remove() { async remove() {
let vm = this; let vm = this;
window.$gz.dialog.confirmDelete().then(dialogResult => { try {
if (dialogResult == true) { if ((await window.$gz.dialog.confirmDelete()) !== true) {
return;
}
//do the delete //do the delete
vm.formState.loading = true; vm.formState.loading = true;
//No need to delete a non saved record, just abandon it... //No need to delete a non saved record, just abandon it...
@@ -775,9 +772,8 @@ export default {
let url = API_BASE_URL + vm.listViewId; let url = API_BASE_URL + vm.listViewId;
window.$gz.form.deleteAllErrorBoxErrors(vm); window.$gz.form.deleteAllErrorBoxErrors(vm);
window.$gz.api let res = await window.$gz.api.remove(url);
.remove(url)
.then(res => {
if (res.error) { if (res.error) {
vm.formState.serverError = res.error; vm.formState.serverError = res.error;
window.$gz.form.setErrorBoxErrors(vm); window.$gz.form.setErrorBoxErrors(vm);
@@ -787,31 +783,25 @@ export default {
JUST_DELETED = true; JUST_DELETED = true;
//set it to the default list view so the caller doesn't try to load the non-existant deleted view it was just working with //set it to the default list view so the caller doesn't try to load the non-existant deleted view it was just working with
let formSettings = window.$gz.form.getFormSettings( let formSettings = window.$gz.form.getFormSettings(vm.formKey);
vm.formKey
);
formSettings.temp.cachedListView = null; formSettings.temp.cachedListView = null;
formSettings.saved.dataTable.unsavedListView = null; formSettings.saved.dataTable.unsavedListView = null;
formSettings.saved.dataTable.listViewId = 0; formSettings.saved.dataTable.listViewId = 0;
window.$gz.form.setFormSettings(vm.formKey, formSettings); window.$gz.form.setFormSettings(vm.formKey, formSettings);
// navigate backwards // navigate backwards
vm.$router.go(-1); vm.$router.go(-1);
} }
}) }
.catch(function handleGetDataFromAPIError(error) { } catch (error) {
//Update the form status //Update the form status
window.$gz.form.setFormState({ window.$gz.form.setFormState({
vm: vm, vm: vm,
loading: false loading: false
}); });
window.$gz.errorHandler.handleFormError(error, vm); window.$gz.errorHandler.handleFormError(error, vm);
});
} }
}
});
}, },
duplicate() { async duplicate() {
let vm = this; let vm = this;
if (this.canDuplicate && vm.listViewId > 0) { if (this.canDuplicate && vm.listViewId > 0) {
this.formState.loading = true; this.formState.loading = true;
@@ -820,9 +810,9 @@ export default {
//clear any errors vm might be around from previous submit //clear any errors vm might be around from previous submit
window.$gz.form.deleteAllErrorBoxErrors(this); window.$gz.form.deleteAllErrorBoxErrors(this);
window.$gz.api try {
.duplicate(url) let res = await window.$gz.api.duplicate(url);
.then(res => {
vm.formState.loading = false; vm.formState.loading = false;
if (res.error) { if (res.error) {
vm.formState.serverError = res.error; vm.formState.serverError = res.error;
@@ -849,11 +839,10 @@ export default {
// ) // )
); );
} }
}) } catch (error) {
.catch(function handleDuplicateError(error) {
vm.formState.loading = false; vm.formState.loading = false;
window.$gz.errorHandler.handleFormError(error, vm); window.$gz.errorHandler.handleFormError(error, vm);
}); }
} }
} }
} }
@@ -958,8 +947,8 @@ function initForm(vm) {
// //
// Ensures UI translated text is available // Ensures UI translated text is available
// //
function fetchTranslatedText(vm) { async function fetchTranslatedText(vm) {
let tKeysRequired = [ await window.$gz.translation.cacheTranslations([
"DataListView", "DataListView",
"GridFilterName", "GridFilterName",
"Include", "Include",
@@ -1004,9 +993,7 @@ function fetchTranslatedText(vm) {
"True", "True",
"False", "False",
"Name" "Name"
]; ]);
return window.$gz.translation.cacheTranslations(tKeysRequired);
} }
///////////////////////////////// /////////////////////////////////
@@ -1158,39 +1145,35 @@ function populateSelectionLists(vm) {
//////////////////// ////////////////////
// //
function populateFieldDefinitions(vm) { async function populateFieldDefinitions(vm) {
//http://localhost:7575/api/v8/data-list/listfields?DataListKey=TestWidgetDataList //http://localhost:7575/api/v8/data-list/listfields?DataListKey=TestWidgetDataList
return window.$gz.api let res = await window.$gz.api.get(
.get("data-list/listfields?DataListKey=" + vm.dataListKey) "data-list/listfields?DataListKey=" + vm.dataListKey
.then(res => { );
if (res.error) { if (res.error) {
throw res.error; throw res.error;
} else { } else {
vm.fieldDefinitions = res.data; vm.fieldDefinitions = res.data;
} }
});
} }
////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////
// //
// Ensures column names are present in translation table // Ensures column names are present in translation table
// //
function fetchTranslatedFieldNames(vm) { async function fetchTranslatedFieldNames(vm) {
let columnKeys = []; let columnKeys = [];
for (let i = 1; i < vm.fieldDefinitions.length; i++) { for (let i = 1; i < vm.fieldDefinitions.length; i++) {
let cm = vm.fieldDefinitions[i]; let cm = vm.fieldDefinitions[i];
columnKeys.push(cm.tKey); columnKeys.push(cm.tKey);
} }
//Now fetch all the keys and await the response before returning await window.$gz.translation.cacheTranslations(columnKeys);
return window.$gz.translation.cacheTranslations(columnKeys).then(() => {
return;
});
} }
///////////////////////////////// /////////////////////////////////
// //
// //
function setEffectiveListView(vm) { async function setEffectiveListView(vm) {
/* /*
effectiveListView effectiveListView
- Second get the ListView that is currently in use so can setup the page view - Second get the ListView that is currently in use so can setup the page view
@@ -1217,19 +1200,19 @@ function setEffectiveListView(vm) {
} else if (vm.listViewId == 0) { } else if (vm.listViewId == 0) {
//get default list view //get default list view
//http://localhost:7575/api/v8/DataListView/default/TestWidgetDataList //http://localhost:7575/api/v8/DataListView/default/TestWidgetDataList
return window.$gz.api let res = await window.$gz.api.get(
.get("data-list-view/default/" + vm.dataListKey) "data-list-view/default/" + vm.dataListKey
.then(res => { );
if (res.error) { if (res.error) {
throw res.error; throw res.error;
} else { } else {
vm.effectiveListView = JSON.parse(res.data); vm.effectiveListView = JSON.parse(res.data);
vm.obj.name = vm.$ay.t("FilterUnsaved"); vm.obj.name = vm.$ay.t("FilterUnsaved");
} }
});
} else { } else {
//listview has an id value //listview has an id value
return window.$gz.api.get("data-list-view/" + vm.listViewId).then(res => { let res = await window.$gz.api.get("data-list-view/" + vm.listViewId);
if (res.error) { if (res.error) {
throw res.error; throw res.error;
} else { } else {
@@ -1239,7 +1222,6 @@ function setEffectiveListView(vm) {
vm.obj.concurrency = res.data.concurrency; vm.obj.concurrency = res.data.concurrency;
vm.obj.userId = res.data.userId; vm.obj.userId = res.data.userId;
} }
});
} }
} }

View File

@@ -79,10 +79,11 @@
const FORM_KEY = "ay-evaluate"; const FORM_KEY = "ay-evaluate";
export default { export default {
created() { async created() {
let vm = this; let vm = this;
initForm(vm) try {
.then(() => { await initForm(vm);
vm.obj.timeZoneOffset = vm.obj.timeZoneOffset =
Math.floor(new Date().getTimezoneOffset() / 60) * -1; Math.floor(new Date().getTimezoneOffset() / 60) * -1;
//get rights to generate sample data and erase db I guess //get rights to generate sample data and erase db I guess
@@ -93,11 +94,10 @@ export default {
vm.formState.ready = true; vm.formState.ready = true;
vm.formState.loading = false; vm.formState.loading = false;
window.$gz.eventBus.$on("menu-click", clickHandler); window.$gz.eventBus.$on("menu-click", clickHandler);
}) } catch (err) {
.catch(err => {
vm.formState.ready = true; vm.formState.ready = true;
window.$gz.errorHandler.handleFormError(err, vm); window.$gz.errorHandler.handleFormError(err, vm);
}); }
}, },
beforeDestroy() { beforeDestroy() {
@@ -300,8 +300,8 @@ function initForm(vm) {
// //
// Ensures UI translated text is available // Ensures UI translated text is available
// //
function fetchTranslatedText(vm) { async function fetchTranslatedText(vm) {
return window.$gz.translation.cacheTranslations([ await window.$gz.translation.cacheTranslations([
"Welcome", "Welcome",
"GenerateSampleData", "GenerateSampleData",
"EvaluationGuide", "EvaluationGuide",

View File

@@ -465,8 +465,8 @@ function populateEventTypeList(vm) {
// //
// Ensures UI translated text is available // Ensures UI translated text is available
// //
function fetchTranslatedText(vm) { async function fetchTranslatedText(vm) {
return window.$gz.translation.cacheTranslations([ await window.$gz.translation.cacheTranslations([
"EventDeleted", "EventDeleted",
"EventCreated", "EventCreated",
"EventRetrieved", "EventRetrieved",

View File

@@ -310,8 +310,8 @@ function initForm(vm) {
// //
// Ensures UI translated text is available // Ensures UI translated text is available
// //
function fetchTranslatedText(vm) { async function fetchTranslatedText(vm) {
return window.$gz.translation.cacheTranslations([ await window.$gz.translation.cacheTranslations([
"UserLogin", "UserLogin",
"OldPassword", "OldPassword",
"NewPassword", "NewPassword",

View File

@@ -375,8 +375,8 @@ function initForm(vm) {
// //
// Ensures UI translated text is available // Ensures UI translated text is available
// //
function fetchTranslatedText(vm) { async function fetchTranslatedText(vm) {
return window.$gz.translation.cacheTranslations([ await window.$gz.translation.cacheTranslations([
"TooManyResults", "TooManyResults",
"NoResults", "NoResults",
"Object" "Object"

View File

@@ -430,8 +430,8 @@ function initForm(vm) {
// //
// Ensures UI translated text is available // Ensures UI translated text is available
// //
function fetchTranslatedText(vm) { async function fetchTranslatedText(vm) {
return window.$gz.translation.cacheTranslations([ await window.$gz.translation.cacheTranslations([
"CurrencyCode", "CurrencyCode",
"LanguageCode", "LanguageCode",
"TimeZone", "TimeZone",

View File

@@ -427,8 +427,8 @@ function initForm(vm) {
////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////
// //
// //
function fetchTranslatedText(vm) { async function fetchTranslatedText(vm) {
return window.$gz.translation.cacheTranslations([ await window.$gz.translation.cacheTranslations([
"BackupSettings", "BackupSettings",
"BackupTime", "BackupTime",
"BackupLast", "BackupLast",

View File

@@ -257,9 +257,7 @@ function initForm(vm) {
// //
// Ensures UI translated text is available // Ensures UI translated text is available
// //
function fetchTranslatedText(vm) { async function fetchTranslatedText(vm) {
let tKeysRequired = ["OpsTestJob"]; await window.$gz.translation.cacheTranslations(["OpsTestJob"]);
return window.$gz.translation.cacheTranslations(tKeysRequired);
} }
</script> </script>

View File

@@ -213,10 +213,8 @@ function initForm(vm) {
// //
// Ensures UI translated text is available // Ensures UI translated text is available
// //
function fetchTranslatedText(vm) { async function fetchTranslatedText(vm) {
let tKeysRequired = ["OpsTestJob", "Log"]; await window.$gz.translation.cacheTranslations(["OpsTestJob", "Log"]);
return window.$gz.translation.cacheTranslations(tKeysRequired);
} }
////////////////////// //////////////////////

View File

@@ -543,8 +543,8 @@ function populateSelectionLists(vm) {
// //
// Ensures UI translated text is available // Ensures UI translated text is available
// //
function fetchTranslatedText(vm) { async function fetchTranslatedText(vm) {
let tKeysRequired = [ await window.$gz.translation.cacheTranslations([
"DateRangePast6Hours", "DateRangePast6Hours",
"DateRangePast24Hours", "DateRangePast24Hours",
"DateRangePast7Days", "DateRangePast7Days",
@@ -563,8 +563,6 @@ function fetchTranslatedText(vm) {
"MetricAllocatedMemory", "MetricAllocatedMemory",
"MetricWorkingSet", "MetricWorkingSet",
"MetricPrivateBytes" "MetricPrivateBytes"
]; ]);
return window.$gz.translation.cacheTranslations(tKeysRequired);
} }
</script> </script>

View File

@@ -149,9 +149,7 @@ function initForm(vm) {
// //
// Ensures UI translated text is available // Ensures UI translated text is available
// //
function fetchTranslatedText(vm) { async function fetchTranslatedText(vm) {
let tKeysRequired = ["ServerProfiler"]; await window.$gz.translation.cacheTranslations(["ServerProfiler"]);
return window.$gz.translation.cacheTranslations(tKeysRequired);
} }
</script> </script>

View File

@@ -299,8 +299,8 @@ function initForm(vm) {
// //
// Ensures UI translated text is available // Ensures UI translated text is available
// //
function fetchTranslatedText(vm) { async function fetchTranslatedText(vm) {
return window.$gz.translation.cacheTranslations([ await window.$gz.translation.cacheTranslations([
"ServerStateOpen", "ServerStateOpen",
"ServerStateOps", "ServerStateOps",
"ServerStateReason" "ServerStateReason"

View File

@@ -738,8 +738,8 @@ function initForm(vm) {
// //
// Ensures UI translated text is available // Ensures UI translated text is available
// //
function fetchTranslatedText(vm) { async function fetchTranslatedText(vm) {
return window.$gz.translation.cacheTranslations([ await window.$gz.translation.cacheTranslations([
"Widget", "Widget",
"WidgetName", "WidgetName",
"WidgetSerial", "WidgetSerial",