From 727cb6d234e5d754d212d130e6718c174c94a824 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Sat, 20 Jun 2020 13:21:04 +0000 Subject: [PATCH] --- ayanova/src/components/gz-data-table.vue | 15 ++------ .../src/views/adm-global-select-templates.vue | 15 ++------ ayanova/src/views/adm-global-settings.vue | 13 ++----- ayanova/src/views/adm-license.vue | 35 +++++++------------ ayanova/src/views/ay-about.vue | 17 +++------ ayanova/src/views/ay-customize.vue | 21 ++++------- ayanova/src/views/ay-data-list-view.vue | 25 +++++-------- ayanova/src/views/ay-evaluate.vue | 15 ++------ ayanova/src/views/ay-history.vue | 17 +++------ ayanova/src/views/home-password.vue | 13 ++----- ayanova/src/views/home-search.vue | 15 ++------ ayanova/src/views/home-user-settings.vue | 15 ++------ ayanova/src/views/ops-backup.vue | 13 ++----- ayanova/src/views/ops-jobs.vue | 13 ++----- ayanova/src/views/ops-log.vue | 15 ++------ ayanova/src/views/ops-metrics.vue | 15 ++------ ayanova/src/views/ops-profile.vue | 13 ++----- ayanova/src/views/ops-server-state.vue | 13 ++----- ayanova/src/views/widget.vue | 17 +++------ 19 files changed, 72 insertions(+), 243 deletions(-) diff --git a/ayanova/src/components/gz-data-table.vue b/ayanova/src/components/gz-data-table.vue index 3b0076ad..084b001e 100644 --- a/ayanova/src/components/gz-data-table.vue +++ b/ayanova/src/components/gz-data-table.vue @@ -746,18 +746,9 @@ async function fetchEnums(columnData) { ///////////////////////////////// // // -function initForm(vm) { - return new Promise(function(resolve, reject) { - (async function() { - try { - await populateSelectionLists(vm); - await loadFormSettings(vm); - } catch (err) { - reject(err); - } - resolve(); - })(); - }); +async function initForm(vm) { + await populateSelectionLists(vm); + await loadFormSettings(vm); } //////////////////// diff --git a/ayanova/src/views/adm-global-select-templates.vue b/ayanova/src/views/adm-global-select-templates.vue index a237e810..3f7afc9b 100644 --- a/ayanova/src/views/adm-global-select-templates.vue +++ b/ayanova/src/views/adm-global-select-templates.vue @@ -435,18 +435,9 @@ function generateMenu(vm) { ///////////////////////////////// // // -function initForm(vm) { - return new Promise(function(resolve, reject) { - (async function() { - try { - await fetchTranslatedText(vm); - await populateSelectionLists(vm); - } catch (err) { - reject(err); - } - resolve(); - })(); - }); +async function initForm(vm) { + await fetchTranslatedText(vm); + await populateSelectionLists(vm); } ////////////////////////////////////////////////////////// diff --git a/ayanova/src/views/adm-global-settings.vue b/ayanova/src/views/adm-global-settings.vue index 064ce274..ff200306 100644 --- a/ayanova/src/views/adm-global-settings.vue +++ b/ayanova/src/views/adm-global-settings.vue @@ -69,17 +69,8 @@ export default { ///////////////////////////////// // // -function initForm(vm) { - return new Promise(function(resolve, reject) { - (async function() { - try { - await fetchTranslatedText(vm); - } catch (err) { - reject(err); - } - resolve(); - })(); - }); +async function initForm(vm) { + await fetchTranslatedText(vm); } ////////////////////////////////////////////////////////// diff --git a/ayanova/src/views/adm-license.vue b/ayanova/src/views/adm-license.vue index 17d2e28d..ec9b3cb6 100644 --- a/ayanova/src/views/adm-license.vue +++ b/ayanova/src/views/adm-license.vue @@ -556,29 +556,20 @@ function generateMenu(vm) { // // async function initForm(vm) { - return new Promise(async function(resolve, reject) { - // (async function() { - try { - await fetchTranslatedText(vm); - let res = await window.$gz.api.get("license"); - //We never expect there to be no data here - if (!res.data) { - throw res; - } - vm.currentLicenseInfo = res.data.license; + await fetchTranslatedText(vm); + let res = await window.$gz.api.get("license"); + //We never expect there to be no data here + if (!res.data) { + throw res; + } + vm.currentLicenseInfo = res.data.license; - res = await window.$gz.api.get("license/database-empty"); - //We never expect there to be no data here - if (!res.data) { - throw res; - } - vm.dbIsEmpty = res.data; - } catch (err) { - reject(err); - } - resolve(); - // })(); - }); + res = await window.$gz.api.get("license/database-empty"); + //We never expect there to be no data here + if (!res.data) { + throw res; + } + vm.dbIsEmpty = res.data; } ////////////////////////////////////////////////////////// diff --git a/ayanova/src/views/ay-about.vue b/ayanova/src/views/ay-about.vue index ea06872a..50c615bf 100644 --- a/ayanova/src/views/ay-about.vue +++ b/ayanova/src/views/ay-about.vue @@ -250,19 +250,10 @@ function clickHandler(menuItem) { ///////////////////////////////// // // -function initForm(vm) { - return new Promise(function(resolve, reject) { - (async function() { - try { - await fetchTranslatedText(vm); - await getServerInfo(vm); - await getBrowserInfo(vm); - } catch (err) { - reject(err); - } - resolve(); - })(); - }); +async function initForm(vm) { + await fetchTranslatedText(vm); + await getServerInfo(vm); + await getBrowserInfo(vm); } ////////////////////////////////////////////////////////// diff --git a/ayanova/src/views/ay-customize.vue b/ayanova/src/views/ay-customize.vue index 044e62e3..7fb77d30 100644 --- a/ayanova/src/views/ay-customize.vue +++ b/ayanova/src/views/ay-customize.vue @@ -80,7 +80,7 @@ export default { async created() { let vm = this; try { - await initForm(vm); + await initForm(vm); vm.formState.readOnly = !vm.rights.change; window.$gz.eventBus.$on("menu-click", clickHandler); @@ -311,20 +311,11 @@ function generateMenu(vm) { ///////////////////////////////// // // -function initForm(vm) { - return new Promise(function(resolve, reject) { - (async function() { - try { - await fetchTranslatedText(vm); - await populateSelectionLists(vm); - await ensureTemplateIsInStore(vm); - await initDataObject(vm); - } catch (err) { - reject(err); - } - resolve(); - })(); - }); +async function initForm(vm) { + await fetchTranslatedText(vm); + await populateSelectionLists(vm); + await ensureTemplateIsInStore(vm); + await initDataObject(vm); } ////////////////////////////////////////////////////////// diff --git a/ayanova/src/views/ay-data-list-view.vue b/ayanova/src/views/ay-data-list-view.vue index 28026826..a8ff4641 100644 --- a/ayanova/src/views/ay-data-list-view.vue +++ b/ayanova/src/views/ay-data-list-view.vue @@ -924,23 +924,14 @@ function generateMenu(vm) { ///////////////////////////////// // // -function initForm(vm) { - return new Promise(function(resolve, reject) { - (async function() { - try { - await fetchTranslatedText(vm); - await populateSelectionLists(vm); - await populateFieldDefinitions(vm); - await fetchTranslatedFieldNames(vm); - await setEffectiveListView(vm); - await initDataObject(vm); - await fetchEnums(vm); - } catch (err) { - reject(err); - } - resolve(); - })(); - }); +async function initForm(vm) { + await fetchTranslatedText(vm); + await populateSelectionLists(vm); + await populateFieldDefinitions(vm); + await fetchTranslatedFieldNames(vm); + await setEffectiveListView(vm); + await initDataObject(vm); + await fetchEnums(vm); } ////////////////////////////////////////////////////////// diff --git a/ayanova/src/views/ay-evaluate.vue b/ayanova/src/views/ay-evaluate.vue index 7cb43e4d..6c25b67c 100644 --- a/ayanova/src/views/ay-evaluate.vue +++ b/ayanova/src/views/ay-evaluate.vue @@ -282,18 +282,9 @@ function generateMenu(vm) { ///////////////////////////////// // // -function initForm(vm) { - return new Promise(async function(resolve, reject) { - // (async function() { - try { - await fetchTranslatedText(vm); - await populateSelectionLists(vm); - } catch (err) { - reject(err); - } - resolve(); - // })(); - }); +async function initForm(vm) { + await fetchTranslatedText(vm); + await populateSelectionLists(vm); } ////////////////////////////////////////////////////////// diff --git a/ayanova/src/views/ay-history.vue b/ayanova/src/views/ay-history.vue index f1f18bdf..2b43d561 100644 --- a/ayanova/src/views/ay-history.vue +++ b/ayanova/src/views/ay-history.vue @@ -362,19 +362,10 @@ function generateMenu(vm) { ///////////////////////////////// // // -function initForm(vm) { - return new Promise(function(resolve, reject) { - (async function() { - try { - await fetchTranslatedText(vm); - await populateAyaTypeList(vm); - await populateEventTypeList(vm); - } catch (err) { - reject(err); - } - resolve(); - })(); - }); +async function initForm(vm) { + await fetchTranslatedText(vm); + await populateAyaTypeList(vm); + await populateEventTypeList(vm); } ////////////////////// // diff --git a/ayanova/src/views/home-password.vue b/ayanova/src/views/home-password.vue index 4a1d35ee..698dfcef 100644 --- a/ayanova/src/views/home-password.vue +++ b/ayanova/src/views/home-password.vue @@ -288,17 +288,8 @@ function generateMenu(vm) { ///////////////////////////////// // // -function initForm(vm) { - return new Promise(function(resolve, reject) { - (async function() { - try { - await fetchTranslatedText(vm); - } catch (err) { - reject(err); - } - resolve(); - })(); - }); +async function initForm(vm) { + await fetchTranslatedText(vm); } ////////////////////////////////////////////////////////// diff --git a/ayanova/src/views/home-search.vue b/ayanova/src/views/home-search.vue index 1244f071..422fe895 100644 --- a/ayanova/src/views/home-search.vue +++ b/ayanova/src/views/home-search.vue @@ -345,18 +345,9 @@ function generateMenu(vm) { ///////////////////////////////// // // -function initForm(vm) { - return new Promise(function(resolve, reject) { - (async function() { - try { - await fetchTranslatedText(vm); - await populateSelectionLists(vm); - } catch (err) { - reject(err); - } - resolve(); - })(); - }); +async function initForm(vm) { + await fetchTranslatedText(vm); + await populateSelectionLists(vm); } ////////////////////////////////////////////////////////// diff --git a/ayanova/src/views/home-user-settings.vue b/ayanova/src/views/home-user-settings.vue index 2846c4dc..253e6f88 100644 --- a/ayanova/src/views/home-user-settings.vue +++ b/ayanova/src/views/home-user-settings.vue @@ -403,18 +403,9 @@ function generateMenu(vm) { ///////////////////////////////// // // -function initForm(vm) { - return new Promise(function(resolve, reject) { - (async function() { - try { - await fetchTranslatedText(vm); - await populateSelectionLists(vm); - } catch (err) { - reject(err); - } - resolve(); - })(); - }); +async function initForm(vm) { + await fetchTranslatedText(vm); + await populateSelectionLists(vm); } ////////////////////////////////////////////////////////// diff --git a/ayanova/src/views/ops-backup.vue b/ayanova/src/views/ops-backup.vue index 862c4b5f..88f7a68f 100644 --- a/ayanova/src/views/ops-backup.vue +++ b/ayanova/src/views/ops-backup.vue @@ -399,17 +399,8 @@ function generateMenu(vm) { ///////////////////////////////// // // -function initForm(vm) { - return new Promise(function(resolve, reject) { - (async function() { - try { - await fetchTranslatedText(vm); - } catch (err) { - reject(err); - } - resolve(); - })(); - }); +async function initForm(vm) { + await fetchTranslatedText(vm); } ////////////////////////////////////////////////////////// diff --git a/ayanova/src/views/ops-jobs.vue b/ayanova/src/views/ops-jobs.vue index 5d0e48ff..3fc5f4f8 100644 --- a/ayanova/src/views/ops-jobs.vue +++ b/ayanova/src/views/ops-jobs.vue @@ -234,17 +234,8 @@ function clickHandler(menuItem) { ///////////////////////////////// // // -function initForm(vm) { - return new Promise(function(resolve, reject) { - (async function() { - try { - await fetchTranslatedText(vm); - } catch (err) { - reject(err); - } - resolve(); - })(); - }); +async function initForm(vm) { + await fetchTranslatedText(vm); } ////////////////////////////////////////////////////////// diff --git a/ayanova/src/views/ops-log.vue b/ayanova/src/views/ops-log.vue index efeb8892..5689fd6f 100644 --- a/ayanova/src/views/ops-log.vue +++ b/ayanova/src/views/ops-log.vue @@ -191,18 +191,9 @@ function clickHandler(menuItem) { ///////////////////////////////// // // -function initForm(vm) { - return new Promise(function(resolve, reject) { - (async function() { - try { - await fetchTranslatedText(vm); - await populateSelectionLists(vm); - } catch (err) { - reject(err); - } - resolve(); - })(); - }); +async function initForm(vm) { + await fetchTranslatedText(vm); + await populateSelectionLists(vm); } ////////////////////////////////////////////////////////// diff --git a/ayanova/src/views/ops-metrics.vue b/ayanova/src/views/ops-metrics.vue index d85e5778..b19c0e7f 100644 --- a/ayanova/src/views/ops-metrics.vue +++ b/ayanova/src/views/ops-metrics.vue @@ -501,18 +501,9 @@ function clickHandler(menuItem) { ///////////////////////////////// // // -function initForm(vm) { - return new Promise(function(resolve, reject) { - (async function() { - try { - await fetchTranslatedText(vm); - await populateSelectionLists(vm); - } catch (err) { - reject(err); - } - resolve(); - })(); - }); +async function initForm(vm) { + await fetchTranslatedText(vm); + await populateSelectionLists(vm); } ///////////////////////////////// diff --git a/ayanova/src/views/ops-profile.vue b/ayanova/src/views/ops-profile.vue index 05c2d54d..f3968d83 100644 --- a/ayanova/src/views/ops-profile.vue +++ b/ayanova/src/views/ops-profile.vue @@ -131,17 +131,8 @@ function clickHandler(menuItem) { ///////////////////////////////// // // -function initForm(vm) { - return new Promise(function(resolve, reject) { - (async function() { - try { - await fetchTranslatedText(vm); - } catch (err) { - reject(err); - } - resolve(); - })(); - }); +async function initForm(vm) { + await fetchTranslatedText(vm); } ////////////////////////////////////////////////////////// diff --git a/ayanova/src/views/ops-server-state.vue b/ayanova/src/views/ops-server-state.vue index b00859ec..2ffaecf7 100644 --- a/ayanova/src/views/ops-server-state.vue +++ b/ayanova/src/views/ops-server-state.vue @@ -267,17 +267,8 @@ function generateMenu(vm) { ///////////////////////////////// // // -function initForm(vm) { - return new Promise(function(resolve, reject) { - (async function() { - try { - await fetchTranslatedText(vm); - } catch (err) { - reject(err); - } - resolve(); - })(); - }); +async function initForm(vm) { + await fetchTranslatedText(vm); } ////////////////////////////////////////////////////////// diff --git a/ayanova/src/views/widget.vue b/ayanova/src/views/widget.vue index ecb2d252..7ba836ca 100644 --- a/ayanova/src/views/widget.vue +++ b/ayanova/src/views/widget.vue @@ -719,19 +719,10 @@ let JUST_DELETED = false; ///////////////////////////////// // // -function initForm(vm) { - return new Promise(function(resolve, reject) { - (async function() { - try { - await fetchTranslatedText(vm); - await window.$gz.formCustomTemplate.get(FORM_CUSTOM_TEMPLATE_KEY); - await populateSelectionLists(vm); - } catch (err) { - reject(err); - } - resolve(); - })(); - }); +async function initForm(vm) { + await fetchTranslatedText(vm); + await window.$gz.formCustomTemplate.get(FORM_CUSTOM_TEMPLATE_KEY); + await populateSelectionLists(vm); } //////////////////////////////////////////////////////////