github/directus
1
0
Fork 0
mirror of https://github.com/directus/directus.git synced 2026-01-30 06:18:09 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix translations not refreshing on save (#10410)

Browse Source 
* fix translations not refreshing on save

* remove unused imports
This commit is contained in:
Azri Kahar
2021-12-10 07:17:12 +08:00
committed by GitHub
parent 71a5fb6c2c
commit bc04d76774
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/src/interfaces/translations/translations.vue
View File

@@ -57,7 +57,7 @@ import { useI18n } from 'vue-i18n';
import api from '@/api';
import { useCollection } from '@directus/shared/composables';
import { unexpectedError } from '@/utils/unexpected-error';
import { cloneDeep, isEqual, assign, isNil } from 'lodash';
import { cloneDeep, isEqual, assign } from 'lodash';
import { notEmpty } from '@/utils/is-empty';
import { useWindowSize } from '@/composables/use-window-size';
import useRelation from '@/composables/use-m2m';
@@ -278,6 +278,7 @@ export default defineComponent({
const items = ref<Record<string, any>[]>([]);
const loading = ref(false);
const error = ref(null);
const isUndo = ref(false);
const firstItem = computed(() => getEditedValue(firstLang));
const secondItem = computed(() => getEditedValue(secondLang));
@@ -290,8 +291,9 @@ export default defineComponent({
(newVal, oldVal) => {
if (
newVal &&
isNil(newVal) !== isNil(oldVal) &&
newVal?.every((item) => typeof item === 'string' || typeof item === 'number')
!isEqual(newVal, oldVal) &&
newVal.every((item) => typeof item === 'string' || typeof item === 'number') &&
isUndo.value === false
) {
loadItems();
}
@@ -383,9 +385,11 @@ export default defineComponent({
if (!pkField || !langField) return;
isUndo.value = false;
let copyValue = cloneDeep(value.value ?? []);
if (pkField in values === false) {
if (pkField in values === false && langField in values === false) {
const newIndex = copyValue.findIndex((item) => typeof item === 'object' && item[langField] === lang);
if (newIndex !== -1) {
@@ -413,6 +417,7 @@ export default defineComponent({
} else {
if (values[pkField] === item[pkField]) {
if (isEqual(initialValues, { ...initialValues, ...values })) {
isUndo.value = true;
return values[pkField];
} else {
return values;