From 1aeaebea316955ef98e879dfd9132dc933bd054e Mon Sep 17 00:00:00 2001 From: Nitwel Date: Mon, 21 Aug 2023 11:40:04 +0200 Subject: [PATCH] Use technical collection/field names in settings (#19444) * temp commit * change to non translated names * Add changeset * Fix linter warning * Update related collection selection as well Unfortunately, modifiying the font via css var doesn't work so we need to pass it down via prop. See https://github.com/vuejs/core/issues/7312 --------- Co-authored-by: Pascal Jufer Co-authored-by: Rijk van Zanten --- .changeset/tame-dolphins-begin.md | 5 ++++ .../v-field-list/v-field-list-item.vue | 28 +++++++++++++++--- .../components/v-field-list/v-field-list.vue | 3 ++ .../v-select/select-list-item-group.vue | 3 ++ .../components/v-select/select-list-item.vue | 9 ++++++ app/src/components/v-select/v-select.vue | 8 ++--- .../_system/system-filter/nodes.vue | 19 ++++++++++-- .../_system/system-filter/system-filter.vue | 4 +++ ...field-detail-advanced-relationship-m2a.vue | 29 +++++++++---------- .../relationship-configuration.vue | 29 +++++++++---------- .../data-model/field-detail/field-detail.vue | 6 ++-- .../routes/data-model/fields/fields.vue | 3 +- .../modules/settings/routes/presets/item.vue | 3 +- .../components/permissions-overview-row.vue | 6 ++-- .../permissions-detail/components/fields.vue | 6 +++- .../components/permissions.vue | 1 + .../components/validation.vue | 1 + .../permissions-detail/permissions-detail.vue | 13 ++------- 18 files changed, 114 insertions(+), 62 deletions(-) create mode 100644 .changeset/tame-dolphins-begin.md diff --git a/.changeset/tame-dolphins-begin.md b/.changeset/tame-dolphins-begin.md new file mode 100644 index 0000000000000..f5fca630c4bad --- /dev/null +++ b/.changeset/tame-dolphins-begin.md @@ -0,0 +1,5 @@ +--- +"@directus/app": patch +--- + +Switched to technical collection/field names in settings for clarity diff --git a/app/src/components/v-field-list/v-field-list-item.vue b/app/src/components/v-field-list/v-field-list-item.vue index 74316a5c81caf..9a397e17f04e1 100644 --- a/app/src/components/v-field-list/v-field-list-item.vue +++ b/app/src/components/v-field-list/v-field-list-item.vue @@ -3,11 +3,15 @@ v-if="field.children || supportedFunctions.length > 0" :clickable="!field.disabled && (relationalFieldSelectable || !field.relatedCollection)" :value="field.path" + :class="{ 'raw-field-names': rawFieldNames }" @click="$emit('add', [field.key])" > @@ -24,7 +28,7 @@ @@ -50,13 +54,23 @@ :relational-field-selectable="relationalFieldSelectable" :parent="field.field" :allow-select-all="allowSelectAll" + :raw-field-names="rawFieldNames" @add="$emit('add', $event)" /> - + - + @@ -86,6 +100,7 @@ interface Props { relationalFieldSelectable?: boolean; allowSelectAll?: boolean; parent?: string | null; + rawFieldNames?: boolean; } const props = withDefaults(defineProps(), { @@ -94,6 +109,7 @@ const props = withDefaults(defineProps(), { relationalFieldSelectable: true, allowSelectAll: false, parent: null, + rawFieldNames: false, }); const emit = defineEmits(['add']); @@ -129,4 +145,8 @@ const addAll = () => { --v-icon-color: var(--primary); --v-list-item-color: var(--primary); } + +.raw-field-names { + --v-list-item-content-font-family: var(--family-monospace); +} diff --git a/app/src/components/v-field-list/v-field-list.vue b/app/src/components/v-field-list/v-field-list.vue index 9186fc2b03592..98ab8d48454a3 100644 --- a/app/src/components/v-field-list/v-field-list.vue +++ b/app/src/components/v-field-list/v-field-list.vue @@ -27,6 +27,7 @@ :include-functions="includeFunctions" :relational-field-selectable="relationalFieldSelectable" :allow-select-all="allowSelectAll" + :raw-field-names="rawFieldNames" @add="$emit('add', $event)" /> @@ -49,6 +50,7 @@ interface Props { includeRelations?: boolean; relationalFieldSelectable?: boolean; allowSelectAll?: boolean; + rawFieldNames?: boolean; } const props = withDefaults(defineProps(), { @@ -58,6 +60,7 @@ const props = withDefaults(defineProps(), { includeRelations: true, relationalFieldSelectable: true, allowSelectAll: false, + rawFieldNames: false, }); const emit = defineEmits(['add']); diff --git a/app/src/components/v-select/select-list-item-group.vue b/app/src/components/v-select/select-list-item-group.vue index 8dc7391a34e0c..bfcdf8b423a18 100644 --- a/app/src/components/v-select/select-list-item-group.vue +++ b/app/src/components/v-select/select-list-item-group.vue @@ -27,6 +27,7 @@ {{ item.text }} (), { + itemLabelFontFamily: 'var(--v-select-font-family)', modelValue: null, multiple: true, allowOther: false, @@ -58,3 +61,9 @@ const isActive = computed(() => { } }); + + diff --git a/app/src/components/v-select/v-select.vue b/app/src/components/v-select/v-select.vue index d9956e1edfcf8..bcb1cc5e5c4bd 100644 --- a/app/src/components/v-select/v-select.vue +++ b/app/src/components/v-select/v-select.vue @@ -68,6 +68,7 @@
  • -
    +
    - {{ getFieldPreview(element) }} + + {{ getFieldPreview(element) }} +