Show all fields on layouts

Fixes #375
This commit is contained in:
rijkvanzanten
2020-09-21 12:56:48 -04:00
parent 8853bda3e0
commit e4a25ffd1a
2 changed files with 9 additions and 16 deletions

View File

@@ -57,7 +57,7 @@
<template v-if="loading || itemCount > 0">
<cards-header
@select-all="selectAll"
:fields="availableFields"
:fields="fieldsInCollection"
:size.sync="size"
:selection.sync="_selection"
:sort.sync="sort"
@@ -203,10 +203,8 @@ export default defineComponent({
const { collection, searchQuery } = toRefs(props);
const { info, primaryKeyField, fields: fieldsInCollection } = useCollection(collection);
const availableFields = computed(() => fieldsInCollection.value.filter((field) => field.meta?.hidden !== true));
const fileFields = computed(() => {
return availableFields.value.filter((field) => {
return fieldsInCollection.value.filter((field) => {
if (field.field === '$file') return true;
const relation = relationsStore.state.relations.find((relation) => {
@@ -265,7 +263,7 @@ export default defineComponent({
page,
toPage,
itemCount,
availableFields,
fieldsInCollection,
limit,
size,
primaryKeyField,
@@ -277,7 +275,6 @@ export default defineComponent({
getLinkForItem,
imageFit,
sort,
fieldsInCollection,
_filters,
newLink,
info,
@@ -330,7 +327,7 @@ export default defineComponent({
function uselayoutQuery() {
const page = ref(1);
const sort = createlayoutQueryOption<string>('sort', availableFields.value[0].field);
const sort = createlayoutQueryOption<string>('sort', fieldsInCollection.value[0].field);
const limit = createlayoutQueryOption<number>('limit', 25);
const fields = computed<string[]>(() => {

View File

@@ -40,7 +40,7 @@
</draggable>
<v-checkbox
v-for="field in availableFields.filter((field) => fields.includes(field.field) === false)"
v-for="field in fieldsInCollection.filter((field) => fields.includes(field.field) === false)"
v-model="fields"
:key="field.field"
:value="field.field"
@@ -223,10 +223,6 @@ export default defineComponent({
const { collection, searchQuery } = toRefs(props);
const { info, primaryKeyField, fields: fieldsInCollection, sortField } = useCollection(collection);
const availableFields = computed(() =>
fieldsInCollection.value.filter((field) => field.meta?.hidden === false)
);
const { sort, limit, page, fields, fieldsWithRelational } = useItemOptions();
const { items, loading, error, totalPages, itemCount, changeManualSort, getItems } = useItems(collection, {
@@ -279,7 +275,7 @@ export default defineComponent({
page,
toPage,
itemCount,
availableFields,
fieldsInCollection,
fields,
limit,
activeFields,
@@ -356,7 +352,7 @@ export default defineComponent({
const fields =
_layoutQuery.value?.fields ||
availableFields.value
fieldsInCollection.value
.filter((field: Field) => {
return field.schema?.is_primary_key === false;
})
@@ -406,7 +402,7 @@ export default defineComponent({
const activeFields = computed<Field[]>({
get() {
return fields.value
.map((key) => availableFields.value.find((field) => field.field === key))
.map((key) => fieldsInCollection.value.find((field) => field.field === key))
.filter((f) => f) as Field[];
},
set(val) {
@@ -505,7 +501,7 @@ export default defineComponent({
}
function getFieldDisplay(fieldKey: string) {
const field = availableFields.value.find((field) => field.field === fieldKey);
const field = fieldsInCollection.value.find((field) => field.field === fieldKey);
if (field === undefined) return null;
if (!field.meta?.display) return null;