admin/raven-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HUGE REFACTOR / CLEANUP

Browse Source 
if there is a issue it's probably something in here that was changed
This commit is contained in:
John Cardinal
2021-09-28 20:19:44 +00:00
parent 51eddfede9
commit d0afdd9855
238 changed files with 3127 additions and 8614 deletions
Download Patch File Download Diff File Expand all files Collapse all files

111
ayanova/src/views/adm-translation.vue
View File

@@ -1,7 +1,6 @@
<template>
<div>
<gz-report-selector ref="reportSelector"></gz-report-selector>
<!-- {{ formState }} -->
<v-row justify="center">
<v-dialog v-model="replaceDialog" persistent max-width="600px">
<v-card>
@@ -111,7 +110,7 @@
:return-value.sync="props.item.display"
:cancel-text="$ay.t('Cancel')"
:save-text="$ay.t('OK')"
@save="saveItem(props.item)"
@save="saveItem()"
>
{{ props.item.display }}
<template v-slot:input>
@@ -136,21 +135,14 @@
</v-overlay>
</div>
</template>
<script>
/////////////////////////////////////////////////////////////////////////////////////////////////////////////
/* Xeslint-disable */
//
////////////////////////////////////////////////////////////////////////////////////////////////////////////
//
const FORM_KEY = "translation-edit";
const API_BASE_URL = "translation/";
const FORM_CUSTOM_TEMPLATE_KEY = "Translation"; //<-- Should always be CoreBizObject AyaType name here where possible
const FORM_CUSTOM_TEMPLATE_KEY = "Translation";
export default {
async created() {
//created is called when the route is updated to show a new record even though we don't need to re-init again
let vm = this;
const vm = this;
try {
await initForm(vm);
@@ -166,7 +158,7 @@ export default {
this.obj = this.$route.params.obj;
vm.formState.loading = false; //here we handle it immediately
} else {
await vm.getDataFromApi(vm.$route.params.recordid); //let getdata handle loading
await vm.getDataFromApi(vm.$route.params.recordid);
}
} else {
vm.formState.loading = false; //here we handle it immediately
@@ -224,7 +216,6 @@ export default {
ayaType: window.$gz.type.Translation
};
},
//WATCHERS
watch: {
formState: {
handler: function(val) {
@@ -232,14 +223,12 @@ export default {
return;
}
//enable / disable save button
if (val.dirty && val.valid && !val.readOnly) {
window.$gz.eventBus.$emit("menu-enable-item", FORM_KEY + ":save");
} else {
window.$gz.eventBus.$emit("menu-disable-item", FORM_KEY + ":save");
}
//enable / disable duplicate / new button
if (!val.dirty && val.valid) {
window.$gz.eventBus.$emit(
"menu-enable-item",
@@ -289,16 +278,12 @@ export default {
}
this.replaceDialog = false;
},
saveItem(updatedItem) {
//just called to flag as dirty
saveItem() {
window.$gz.form.setFormState({
vm: this,
dirty: true
});
},
// filteredItems() {
// return this.obj.translationItems;//I don't think anything is calling this
// },
canDuplicate: function() {
return this.formState.valid && !this.formState.dirty && vm.rights.change;
},
@@ -318,19 +303,17 @@ export default {
}
},
async getDataFromApi(recordId) {
let vm = this;
const vm = this;
vm.formState.loading = true;
if (!recordId) {
throw new Error(FORM_KEY + "::getDataFromApi -> Missing recordID!");
}
let url = API_BASE_URL + recordId;
try {
window.$gz.form.deleteAllErrorBoxErrors(vm);
let res = await window.$gz.api.get(url);
const res = await window.$gz.api.get(API_BASE_URL + recordId);
if (res.error) {
//Not found?
if (res.error.code == "2010") {
window.$gz.form.handleObjectNotFound(vm);
}
@@ -339,9 +322,7 @@ export default {
vm.formState.loading = false;
} else {
vm.obj = res.data;
//modify the menu as necessary
generateMenu(vm);
//Update the form status
window.$gz.form.setFormState({
vm: vm,
dirty: false,
@@ -356,30 +337,23 @@ export default {
}
},
async submit() {
let vm = this;
const vm = this;
if (vm.canSave == false) {
return;
}
try {
vm.formState.loading = true;
let url = API_BASE_URL;
//clear any errors vm might be around from previous submit
window.$gz.form.deleteAllErrorBoxErrors(vm);
let res = await window.$gz.api.upsert(url, vm.obj);
const res = await window.$gz.api.upsert(API_BASE_URL, vm.obj);
if (res.error) {
vm.formState.serverError = res.error;
window.$gz.form.setErrorBoxErrors(vm);
} else {
//Logic for detecting if a post or put: if id then it was a post, if no id then it was a put
if (res.data.id) {
//POST - whole new object returned
//POST
vm.obj = res.data;
//Change URL to new record
//NOTE: will not cause a page re-render, almost nothing does unless forced with a KEY property or using router.GO()
this.$router.replace({
name: "adm-translation",
params: {
@@ -388,17 +362,13 @@ export default {
}
});
} else {
//PUT - only concurrency token is returned (**warning, if server changes object other fields then this needs to act more like POST above but is more efficient this way**)
//Handle "put" of an existing record (UPDATE)
//PUT
vm.obj.concurrency = res.data.concurrency;
//Update local copy of translations if that's the same one in use
if (vm.editingActiveTranslation) {
await window.$gz.translation.updateCache(vm.obj);
}
}
//Update the form status
window.$gz.form.setFormState({
vm: vm,
dirty: false,
@@ -412,34 +382,26 @@ export default {
}
},
async remove() {
let vm = this;
const vm = this;
try {
let dialogResult = await window.$gz.dialog.confirmDelete();
const dialogResult = await window.$gz.dialog.confirmDelete();
if (dialogResult != true) {
return;
}
//do the delete
vm.formState.loading = true;
//No need to delete a new record, just abandon it...
if (vm.$route.params.recordid == 0) {
//this should not get offered for delete but to be safe and clear just in case:
JUST_DELETED = true;
// navigate backwards
vm.$router.go(-1);
} else {
let url = API_BASE_URL + vm.$route.params.recordid;
window.$gz.form.deleteAllErrorBoxErrors(vm);
let res = await window.$gz.api.remove(url);
const res = await window.$gz.api.remove(
API_BASE_URL + vm.$route.params.recordid
);
if (res.error) {
vm.formState.serverError = res.error;
window.$gz.form.setErrorBoxErrors(vm);
} else {
//workaround to prevent warning about leaving dirty record
//For some reason I couldn't just reset isdirty in formstate
JUST_DELETED = true;
// navigate backwards
vm.$router.go(-1);
}
}
@@ -450,27 +412,26 @@ export default {
}
},
async duplicate() {
let vm = this;
const vm = this;
if (!vm.canDuplicate || vm.$route.params.recordid == 0) {
return;
}
vm.formState.loading = true;
let url = API_BASE_URL + "duplicate/" + vm.$route.params.recordid;
try {
window.$gz.form.deleteAllErrorBoxErrors(vm);
vm.duplicating = true;
let res = await window.$gz.api.upsert(url);
const res = await window.$gz.api.upsert(
API_BASE_URL + "duplicate/" + vm.$route.params.recordid
);
if (res.error) {
vm.formState.serverError = res.error;
window.$gz.form.setErrorBoxErrors(vm);
} else {
//Navigate to new record
this.$router.push({
name: "adm-translation",
params: {
recordid: res.data.id,
obj: res.data // pass data object to new form
obj: res.data
}
});
}
@@ -491,7 +452,7 @@ async function clickHandler(menuItem) {
if (!menuItem) {
return;
}
let m = window.$gz.menu.parseMenuItem(menuItem);
const m = window.$gz.menu.parseMenuItem(menuItem);
if (m.owner == FORM_KEY && !m.disabled) {
switch (m.key) {
case "save":
@@ -516,7 +477,7 @@ async function clickHandler(menuItem) {
m.vm.duplicate();
break;
case "report":
let res = await m.vm.$refs.reportSelector.open(
const res = await m.vm.$refs.reportSelector.open(
{
AType: window.$gz.type.Translation,
selectedRowIds: [m.vm.obj.id]
@@ -529,7 +490,6 @@ async function clickHandler(menuItem) {
window.$gz.form.setLastReport(FORM_KEY, res);
generateMenu(m.vm);
break;
default:
window.$gz.eventBus.$emit(
"notify-warning",
@@ -543,7 +503,7 @@ async function clickHandler(menuItem) {
//
//
function generateMenu(vm) {
let menuOptions = {
const menuOptions = {
isMain: false,
readOnly: vm.formState.readOnly,
icon: "$ayiLanguage",
@@ -552,12 +512,10 @@ function generateMenu(vm) {
formData: {
ayaType: window.$gz.type.Translation,
recordId: vm.$route.params.recordid,
// formCustomTemplateKey: FORM_CUSTOM_TEMPLATE_KEY,
recordName: vm.obj.name
},
menuItems: []
};
if (vm.rights.change && vm.obj.stock != true) {
menuOptions.menuItems.push({
title: "Save",
@@ -567,7 +525,6 @@ function generateMenu(vm) {
vm: vm
});
}
if (
vm.rights.delete &&
vm.$route.params.recordid != 0 &&
@@ -581,18 +538,13 @@ function generateMenu(vm) {
vm: vm
});
}
//STUB REPORTS
//Report not Print, print is a further option
menuOptions.menuItems.push({
title: "Report",
icon: "$ayiFileAlt",
key: FORM_KEY + ":report",
vm: vm
});
//get last report selected
let lastReport = window.$gz.form.getLastReport(FORM_KEY);
const lastReport = window.$gz.form.getLastReport(FORM_KEY);
if (lastReport != null) {
menuOptions.menuItems.push({
title: lastReport.name,
@@ -602,7 +554,6 @@ function generateMenu(vm) {
vm: vm
});
}
if (vm.rights.change && vm.$route.params.recordid != 0) {
menuOptions.menuItems.push({
title: "Duplicate",
@@ -612,7 +563,6 @@ function generateMenu(vm) {
});
}
menuOptions.menuItems.push({ divider: true, inset: false });
if (vm.rights.change && vm.obj.stock != true) {
menuOptions.menuItems.push({
title: "FindAndReplace",
@@ -624,10 +574,9 @@ function generateMenu(vm) {
//EXPORT
if (vm.$route.params.recordid != 0) {
let href = window.$gz.api.genericDownloadUrl(
const href = window.$gz.api.genericDownloadUrl(
"translation/download/" + vm.$route.params.recordid
);
menuOptions.menuItems.push({
title: "Export",
icon: "$ayiFileDownload",
@@ -650,7 +599,6 @@ let JUST_DELETED = false;
//
async function initForm(vm) {
await fetchTranslatedText(vm);
//await window.$gz.formCustomTemplate.get(FORM_CUSTOM_TEMPLATE_KEY, vm);
await setEditingActiveTranslation(vm);
}
@@ -662,6 +610,7 @@ async function fetchTranslatedText(vm) {
await window.$gz.translation.cacheTranslations([
"Translation",
"Name",
"ReadOnly",
"TranslationKey",
"TranslationDisplayText",
"FindAndReplace",
@@ -677,7 +626,9 @@ async function fetchTranslatedText(vm) {
//
async function setEditingActiveTranslation(vm) {
if (vm.$route.params.recordid != 0) {
let res = await window.$gz.api.get("user-option/" + vm.$store.state.userId);
const res = await window.$gz.api.get(
"user-option/" + vm.$store.state.userId
);
vm.editingActiveTranslation =
res.data.translationId == vm.$route.params.recordid;
}