diff --git a/ayanova/devdocs/todo.txt b/ayanova/devdocs/todo.txt index 732ea9e6..9a06be81 100644 --- a/ayanova/devdocs/todo.txt +++ b/ayanova/devdocs/todo.txt @@ -49,10 +49,8 @@ CURRENT TODOs @@@@@@@@@@@ ROADMAP STAGE 2: -todo: widgets list form needs search link - -todo: if (res.error != undefined) could be changed to if(res.error) everywhere todo: what is vm.loading used for? + - generally preventing a loading a second time, but it's not checked for at the start in all cases so need to pick through and ensure that todo: RECORD HISTORY - implement in stubbed out separate page diff --git a/ayanova/src/api/initialize.js b/ayanova/src/api/initialize.js index b9c71449..158ed3bb 100644 --- a/ayanova/src/api/initialize.js +++ b/ayanova/src/api/initialize.js @@ -744,7 +744,7 @@ export default function initialize() { .get("UserOptions/" + window.$gz.store.state.userId) // eslint-disable-next-line .then((res) => { - if (res.error != undefined) { + if (res.error) { //In a form this would trigger a bunch of validation or error display code but for here and now: //convert error to human readable string for display and popup a notification to user let msg = window.$gz.api.apiErrorToHumanString(res.error); @@ -799,7 +799,7 @@ export default function initialize() { .get("GlobalBizSettings/client") // eslint-disable-next-line .then((res) => { - if (res.error != undefined) { + if (res.error) { //In a form this would trigger a bunch of validation or error display code but for here and now: //convert error to human readable string for display and popup a notification to user let msg = window.$gz.api.apiErrorToHumanString(res.error); diff --git a/ayanova/src/components/gz-data-table.vue b/ayanova/src/components/gz-data-table.vue index e81db0d1..672888ae 100644 --- a/ayanova/src/components/gz-data-table.vue +++ b/ayanova/src/components/gz-data-table.vue @@ -518,7 +518,7 @@ export default { listView: untokenizedListView }) .then(res => { - if (res.error != undefined) { + if (res.error) { throw res.error; } else { //NOTE: This is how to call an async function and await it from sync code @@ -774,7 +774,7 @@ function populateSelectionLists(vm) { return window.$gz.api .get("DataListView/ViewList?ListKey=" + vm.dataListKey) .then(res => { - if (res.error != undefined) { + if (res.error) { window.$gz.errorHandler.handleFormError(res.error, vm); } else { vm.selectLists.listViews = res.data; @@ -792,7 +792,7 @@ function fetchListView(vm) { return; } return window.$gz.api.get("DataListView/" + vm.listViewId).then(res => { - if (res.error != undefined) { + if (res.error) { window.$gz.errorHandler.handleFormError(res.error, vm); } else { vm.listView = res.data.listView; diff --git a/ayanova/src/views/adm-global-select-templates.vue b/ayanova/src/views/adm-global-select-templates.vue index ebada2a1..5bb19560 100644 --- a/ayanova/src/views/adm-global-select-templates.vue +++ b/ayanova/src/views/adm-global-select-templates.vue @@ -251,7 +251,7 @@ export default { window.$gz.api .get(API_BASE_URL + "ListFields/" + vm.templateId) .then(res => { - if (res.error != undefined) { + if (res.error) { vm.formState.serverError = res.error; window.$gz.form.setErrorBoxErrors(vm); } else { @@ -267,7 +267,7 @@ export default { //weirdly, this wasn't working properly until I put it in a function, it was just executing immediately before translations were resolved from fetch above //get current edited template window.$gz.api.get(API_BASE_URL + vm.templateId).then(res => { - if (res.error != undefined) { + if (res.error) { vm.formState.serverError = res.error; window.$gz.form.setErrorBoxErrors(vm); } else { @@ -321,7 +321,7 @@ export default { .upsert(url, newObj) .then(res => { vm.formState.loading = false; - if (res.error != undefined) { + if (res.error) { vm.formState.serverError = res.error; window.$gz.form.setErrorBoxErrors(vm); } else { @@ -352,7 +352,7 @@ export default { window.$gz.api .remove(url) .then(res => { - if (res.error != undefined) { + if (res.error) { vm.formState.serverError = res.error; window.$gz.form.setErrorBoxErrors(vm); } else { @@ -471,7 +471,7 @@ function fetchTranslatedText(vm) { // function populateSelectionLists(vm) { return window.$gz.api.get(API_BASE_URL + "List").then(res => { - if (res.error != undefined) { + if (res.error) { window.$gz.errorHandler.handleFormError(res.error, vm); } else { vm.selectLists.pickListTemplates = res.data; diff --git a/ayanova/src/views/ay-about.vue b/ayanova/src/views/ay-about.vue index 51d47277..4622448f 100644 --- a/ayanova/src/views/ay-about.vue +++ b/ayanova/src/views/ay-about.vue @@ -301,7 +301,7 @@ function fetchTranslatedText(vm) { // function getServerInfo(vm) { return window.$gz.api.get("ServerInfo").then(res => { - if (res.error != undefined) { + if (res.error) { throw res.error; } else { vm.serverInfo = res.data; diff --git a/ayanova/src/views/ay-customize.vue b/ayanova/src/views/ay-customize.vue index eed99217..e4ae689d 100644 --- a/ayanova/src/views/ay-customize.vue +++ b/ayanova/src/views/ay-customize.vue @@ -198,7 +198,7 @@ export default { .upsert(url, newObj) .then(res => { vm.formState.loading = false; - if (res.error != undefined) { + if (res.error) { vm.formState.serverError = res.error; window.$gz.form.setErrorBoxErrors(vm); } else { diff --git a/ayanova/src/views/ay-data-list-view.vue b/ayanova/src/views/ay-data-list-view.vue index e986d744..8fdc17dd 100644 --- a/ayanova/src/views/ay-data-list-view.vue +++ b/ayanova/src/views/ay-data-list-view.vue @@ -731,7 +731,7 @@ export default { .upsert(url, lvSave) .then(res => { vm.formState.loading = false; - if (res.error != undefined) { + if (res.error) { vm.formState.serverError = res.error; window.$gz.form.setErrorBoxErrors(vm); } else { @@ -798,7 +798,7 @@ export default { window.$gz.api .remove(url) .then(res => { - if (res.error != undefined) { + if (res.error) { vm.formState.serverError = res.error; window.$gz.form.setErrorBoxErrors(vm); } else { @@ -845,7 +845,7 @@ export default { .then(res => { // debugger; vm.formState.loading = false; - if (res.error != undefined) { + if (res.error) { vm.formState.serverError = res.error; window.$gz.form.setErrorBoxErrors(vm); } else { @@ -1184,7 +1184,7 @@ function populateFieldDefinitions(vm) { return window.$gz.api .get("DataList/ListFields?DataListKey=" + vm.dataListKey) .then(res => { - if (res.error != undefined) { + if (res.error) { throw res.error; } else { vm.fieldDefinitions = res.data; @@ -1241,7 +1241,7 @@ function setEffectiveListView(vm) { return window.$gz.api .get("DataListView/default/" + vm.dataListKey) .then(res => { - if (res.error != undefined) { + if (res.error) { throw res.error; } else { vm.effectiveListView = JSON.parse(res.data); @@ -1251,7 +1251,7 @@ function setEffectiveListView(vm) { } else { //listview has an id value return window.$gz.api.get("DataListView/" + vm.listViewId).then(res => { - if (res.error != undefined) { + if (res.error) { throw res.error; } else { vm.effectiveListView = JSON.parse(res.data.listView); diff --git a/ayanova/src/views/home-password.vue b/ayanova/src/views/home-password.vue index 8981c4ee..561af16c 100644 --- a/ayanova/src/views/home-password.vue +++ b/ayanova/src/views/home-password.vue @@ -205,7 +205,7 @@ export default { .upsert(url, vm.obj) .then(res => { vm.formState.loading = false; - if (res.error != undefined) { + if (res.error) { vm.formState.serverError = res.error; window.$gz.form.setErrorBoxErrors(vm); } else { diff --git a/ayanova/src/views/home-search.vue b/ayanova/src/views/home-search.vue index 401c40b7..1c97dd74 100644 --- a/ayanova/src/views/home-search.vue +++ b/ayanova/src/views/home-search.vue @@ -227,7 +227,7 @@ export default { max ) .then(res => { - if (res.error != undefined) { + if (res.error) { vm.formState.serverError = res.error; window.$gz.form.setErrorBoxErrors(vm); } else { @@ -280,7 +280,7 @@ export default { }) .then(res => { - if (res.error != undefined) { + if (res.error) { vm.formState.serverError = res.error; window.$gz.form.setErrorBoxErrors(vm); } else { diff --git a/ayanova/src/views/home-user-settings.vue b/ayanova/src/views/home-user-settings.vue index 0ab6acb7..cf8545bb 100644 --- a/ayanova/src/views/home-user-settings.vue +++ b/ayanova/src/views/home-user-settings.vue @@ -244,7 +244,7 @@ export default { window.$gz.api .get(url) .then(res => { - if (res.error != undefined) { + if (res.error) { //Not found? if (res.error.code == "2010") { //notify not found error then navigate backwards @@ -297,7 +297,7 @@ export default { .upsert(url, vm.obj) .then(res => { vm.formState.loading = false; - if (res.error != undefined) { + if (res.error) { vm.formState.serverError = res.error; window.$gz.form.setErrorBoxErrors(vm); } else { @@ -439,7 +439,7 @@ function fetchTranslatedText(vm) { function populateSelectionLists(vm) { //http://localhost:7575/api/v8/Translation/List return window.$gz.api.get("Translation/List").then(res => { - if (res.error != undefined) { + if (res.error) { window.$gz.errorHandler.handleFormError(res.error, vm); } else { vm.selectLists.translations = res.data; diff --git a/ayanova/src/views/login.vue b/ayanova/src/views/login.vue index d935261c..54900ec8 100644 --- a/ayanova/src/views/login.vue +++ b/ayanova/src/views/login.vue @@ -325,7 +325,7 @@ export default { // // .then(res => { // // debugger; // // vm.formState.ready = true; -// // if (res.error != undefined) { +// // if (res.error) { // // vm.formState.serverError = res.error; // // window.$gz.form.setErrorBoxErrors(vm); // // } else { diff --git a/ayanova/src/views/ops-server-state.vue b/ayanova/src/views/ops-server-state.vue index 00da82e6..a20ecf0a 100644 --- a/ayanova/src/views/ops-server-state.vue +++ b/ayanova/src/views/ops-server-state.vue @@ -145,7 +145,7 @@ export default { .get(url) .then(res => { vm.formState.ready = true; - if (res.error != undefined) { + if (res.error) { vm.formState.serverError = res.error; window.$gz.form.setErrorBoxErrors(vm); } else { @@ -184,7 +184,7 @@ export default { .upsert(url, vm.obj) .then(res => { vm.formState.loading = false; - if (res.error != undefined) { + if (res.error) { vm.formState.serverError = res.error; window.$gz.form.setErrorBoxErrors(vm); } else { diff --git a/ayanova/src/views/widget.vue b/ayanova/src/views/widget.vue index 45538523..c6541b58 100644 --- a/ayanova/src/views/widget.vue +++ b/ayanova/src/views/widget.vue @@ -387,7 +387,7 @@ export default { window.$gz.api .get(url) .then(res => { - if (res.error != undefined) { + if (res.error) { //Not found? if (res.error.code == "2010") { //notify not found error then navigate backwards @@ -438,7 +438,7 @@ export default { .upsert(url, vm.obj) .then(res => { vm.formState.loading = false; - if (res.error != undefined) { + if (res.error) { vm.formState.serverError = res.error; window.$gz.form.setErrorBoxErrors(vm); } else { @@ -488,7 +488,7 @@ export default { window.$gz.api .remove(url) .then(res => { - if (res.error != undefined) { + if (res.error) { vm.formState.serverError = res.error; window.$gz.form.setErrorBoxErrors(vm); } else { @@ -525,7 +525,7 @@ export default { .then(res => { // debugger; vm.formState.loading = false; - if (res.error != undefined) { + if (res.error) { vm.formState.serverError = res.error; window.$gz.form.setErrorBoxErrors(vm); } else {