github/directus
1
0
Fork 0
mirror of https://github.com/directus/directus.git synced 2026-01-25 19:38:25 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #218 from directus/view-layout

Browse Source 
Rename view -> layout in db
This commit is contained in:
Rijk van Zanten
2020-09-08 11:23:25 -04:00
committed by GitHub
parent 53ed9bc0f8 d0e897d735
commit e473281fa8
89 changed files with 486 additions and 640 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
api/src/database/seeds/system.yaml
View File

@@ -366,13 +366,13 @@ tables:
length: 100
filters:
type: json
view_type:
layout:
type: string
length: 100
default: tabular
view_query:
layout_query:
type: json
view_options:
layout_options:
type: json
directus_relations:
@@ -1560,12 +1560,12 @@ rows:
locked: true
special: json
- collection: directus_presets
field: view_query
field: layout_query
hidden: true
locked: true
special: json
- collection: directus_presets
field: view_options
field: layout_options
hidden: true
locked: true
special: json
@@ -1905,17 +1905,17 @@ rows:
collection: null
search: null
filters: '[]'
view_type: tabular
view_query: null
view_options: null
layout: tabular
layout_query: null
layout_options: null
data:
- collection: directus_files
view_type: cards
view_query:
layout: cards
layout_query:
cards:
sort: -uploaded_on
view_options:
layout_options:
cards:
icon: insert_drive_file
title: '{{ title }}'
@@ -1924,8 +1924,8 @@ rows:
imageFit: crop
- collection: directus_users
view_type: cards
view_options:
layout: cards
layout_options:
cards:
icon: account_circle
title: '{{ first_name }} {{ last_name }}'
@@ -1933,8 +1933,8 @@ rows:
size: 4
- collection: directus_activity
view_type: tabular
view_query:
layout: tabular
layout_query:
tabular:
sort: -action_on
fields:
@@ -1942,7 +1942,7 @@ rows:
- collection
- action_on
- action_by
view_options:
layout_options:
tabular:
widths:
action: 100

30
app/.storybook/mock-data/collections.json
View File

@@ -188,14 +188,14 @@
"hidden_browse": false,
"required": false,
"options": {
"viewType": "cards",
"viewOptions": {
"layout": "cards",
"layoutOptions": {
"title": "title",
"subtitle": "type",
"content": "description",
"src": "data"
},
"viewQuery": [],
"layoutQuery": [],
"filters": []
},
"locked": 0,
@@ -316,14 +316,14 @@
"hidden_browse": false,
"required": false,
"options": {
"viewType": "cards",
"viewOptions": {
"layout": "cards",
"layoutOptions": {
"title": "title",
"subtitle": "type",
"content": "description",
"src": "data"
},
"viewQuery": [],
"layoutQuery": [],
"filters": []
},
"locked": 0,
@@ -4183,14 +4183,14 @@
"hidden_browse": false,
"required": false,
"options": {
"viewType": "cards",
"viewOptions": {
"layout": "cards",
"layoutOptions": {
"title": "title",
"subtitle": "type",
"content": "description",
"src": "data"
},
"viewQuery": [],
"layoutQuery": [],
"filters": []
},
"locked": 0,
@@ -6128,9 +6128,9 @@
"group": null,
"length": null
},
"view_type": {
"layout": {
"collection": "directus_collection_presets",
"field": "view_type",
"field": "layout",
"datatype": "VARCHAR",
"unique": false,
"primary_key": false,
@@ -6156,9 +6156,9 @@
"group": null,
"length": "100"
},
"view_query": {
"layout_query": {
"collection": "directus_collection_presets",
"field": "view_query",
"field": "layout_query",
"datatype": "TEXT",
"unique": false,
"primary_key": false,
@@ -6184,9 +6184,9 @@
"group": null,
"length": null
},
"view_options": {
"layout_options": {
"collection": "directus_collection_presets",
"field": "view_options",
"field": "layout_options",
"datatype": "TEXT",
"unique": false,
"primary_key": false,

24
app/.storybook/mock-data/fields.json
View File

@@ -186,14 +186,14 @@
"hidden_browse": false,
"required": false,
"options": {
"viewType": "cards",
"viewOptions": {
"layout": "cards",
"layoutOptions": {
"title": "title",
"subtitle": "type",
"content": "description",
"src": "data"
},
"viewQuery": [],
"layoutQuery": [],
"filters": []
},
"locked": 0,
@@ -317,14 +317,14 @@
"hidden_browse": false,
"required": false,
"options": {
"viewType": "cards",
"viewOptions": {
"layout": "cards",
"layoutOptions": {
"title": "title",
"subtitle": "type",
"content": "description",
"src": "data"
},
"viewQuery": [],
"layoutQuery": [],
"filters": []
},
"locked": 0,
@@ -2078,7 +2078,7 @@
},
{
"collection": "directus_collection_presets",
"field": "view_type",
"field": "layout",
"datatype": "VARCHAR",
"unique": false,
"primary_key": false,
@@ -2107,7 +2107,7 @@
},
{
"collection": "directus_collection_presets",
"field": "view_query",
"field": "layout_query",
"datatype": "TEXT",
"unique": false,
"primary_key": false,
@@ -2136,7 +2136,7 @@
},
{
"collection": "directus_collection_presets",
"field": "view_options",
"field": "layout_options",
"datatype": "TEXT",
"unique": false,
"primary_key": false,
@@ -9473,14 +9473,14 @@
"hidden_browse": false,
"required": false,
"options": {
"viewType": "cards",
"viewOptions": {
"layout": "cards",
"layoutOptions": {
"title": "title",
"subtitle": "type",
"content": "description",
"src": "data"
},
"viewQuery": [],
"layoutQuery": [],
"filters": []
},
"locked": 0,

6
app/src/composables/use-preset/types.ts
View File

@@ -14,8 +14,8 @@ export type Preset = {
title: string | null;
user: number | null;
view_options: Record<string, any>;
layout_options: Record<string, any>;
view_query: Record<string, any>;
view_type: string | null;
layout_query: Record<string, any>;
layout: string | null;
};

50
app/src/composables/use-preset/use-preset.ts
View File

@@ -57,19 +57,19 @@ export function usePreset(collection: Ref<string>, bookmark: Ref<number | null>
initLocalPreset();
});
const viewOptions = computed<Record<string, any>>({
const layoutOptions = computed<Record<string, any>>({
get() {
if (!localPreset.value.view_type) return null;
return localPreset.value.view_options?.[localPreset.value.view_type] || null;
if (!localPreset.value.layout) return null;
return localPreset.value.layout_options?.[localPreset.value.layout] || null;
},
set(val) {
if (!localPreset.value.view_type) return null;
if (!localPreset.value.layout) return null;
localPreset.value = {
...localPreset.value,
view_options: {
...localPreset.value.view_options,
[localPreset.value.view_type]: val,
layout_options: {
...localPreset.value.layout_options,
[localPreset.value.layout]: val,
},
};
@@ -77,18 +77,18 @@ export function usePreset(collection: Ref<string>, bookmark: Ref<number | null>
},
});
const viewQuery = computed<Record<string, any>>({
const layoutQuery = computed<Record<string, any>>({
get() {
if (!localPreset.value.view_type) return null;
return localPreset.value.view_query?.[localPreset.value.view_type] || null;
if (!localPreset.value.layout) return null;
return localPreset.value.layout_query?.[localPreset.value.layout] || null;
},
set(val) {
if (!localPreset.value.view_type) return null;
if (!localPreset.value.layout) return null;
localPreset.value = {
...localPreset.value,
view_query: {
...localPreset.value.view_query,
[localPreset.value.view_type]: val,
layout_query: {
...localPreset.value.layout_query,
[localPreset.value.layout]: val,
},
};
@@ -96,14 +96,14 @@ export function usePreset(collection: Ref<string>, bookmark: Ref<number | null>
},
});
const viewType = computed<string | null>({
const layout = computed<string | null>({
get() {
return localPreset.value.view_type || 'tabular';
return localPreset.value.layout || 'tabular';
},
set(val) {
localPreset.value = {
...localPreset.value,
view_type: val,
layout: val,
};
autoSave();
@@ -155,9 +155,9 @@ export function usePreset(collection: Ref<string>, bookmark: Ref<number | null>
return {
bookmarkExists,
viewType,
viewOptions,
viewQuery,
layout,
layoutOptions,
layoutQuery,
filters,
searchQuery,
savePreset,
@@ -173,9 +173,9 @@ export function usePreset(collection: Ref<string>, bookmark: Ref<number | null>
async function resetPreset() {
localPreset.value = {
...localPreset.value,
view_query: null,
view_options: null,
view_type: 'tabular',
layout_query: null,
layout_options: null,
layout: 'tabular',
filters: null,
search_query: null,
};
@@ -196,10 +196,10 @@ export function usePreset(collection: Ref<string>, bookmark: Ref<number | null>
};
}
if (!localPreset.value.view_type) {
if (!localPreset.value.layout) {
localPreset.value = {
...localPreset.value,
view_type: 'tabular',
layout: 'tabular',
};
}

2
app/src/lang/af-ZA/index.json
View File

@@ -523,7 +523,7 @@
"values": "Values",
"version": "Version",
"version_and_updates": "Version and Updates",
"view_type": "View As...",
"layout": "View As...",
"visible_all_users": "Visible for all users",
"webhook_count": "No Webhooks | 1 Webhook | {count} Webhooks",
"weeks": {

12
app/src/lang/af-ZA/interfaces.json
View File

@@ -172,12 +172,12 @@
},
"file": {
"file": "File",
"view_type": "View Type",
"view_type_comment": "Select in what way you want to view the files",
"view_options": "View Options",
"view_options_comment": "Set the view options to use for the files",
"view_query": "View Query",
"view_query_comment": "Set the view query to use for the files",
"layout": "View Type",
"layout_comment": "Select in what way you want to view the files",
"layout_options": "View Options",
"layout_options_comment": "Set the view options to use for the files",
"layout_query": "View Query",
"layout_query_comment": "Set the view query to use for the files",
"filters": "Filters",
"filters_comment": "What filters to use",
"accept": "Accept File Types",

2
app/src/lang/ar-SA/index.json
View File

@@ -523,7 +523,7 @@
"values": "قيم",
"version": "إصدار",
"version_and_updates": "إصدار وتحديثات",
"view_type": "معاية كـ...",
"layout": "معاية كـ...",
"visible_all_users": "مرئية لجميع المستخدمين",
"webhook_count": "لاتوجد روابط ويب | رابط ويب | {count} روابط ويب",
"weeks": {

12
app/src/lang/ar-SA/interfaces.json
View File

@@ -172,12 +172,12 @@
},
"file": {
"file": "ملف",
"view_type": "View Type",
"view_type_comment": "Select in what way you want to view the files",
"view_options": "View Options",
"view_options_comment": "Set the view options to use for the files",
"view_query": "View Query",
"view_query_comment": "Set the view query to use for the files",
"layout": "View Type",
"layout_comment": "Select in what way you want to view the files",
"layout_options": "View Options",
"layout_options_comment": "Set the view options to use for the files",
"layout_query": "View Query",
"layout_query_comment": "Set the view query to use for the files",
"filters": "Filters",
"filters_comment": "What filters to use",
"accept": "Accept File Types",

2
app/src/lang/ca-ES/index.json
View File

@@ -523,7 +523,7 @@
"values": "Values",
"version": "Version",
"version_and_updates": "Version and Updates",
"view_type": "View As...",
"layout": "View As...",
"visible_all_users": "Visible for all users",
"webhook_count": "No Webhooks | 1 Webhook | {count} Webhooks",
"weeks": {

12
app/src/lang/ca-ES/interfaces.json
View File

@@ -172,12 +172,12 @@
},
"file": {
"file": "File",
"view_type": "View Type",
"view_type_comment": "Select in what way you want to view the files",
"view_options": "View Options",
"view_options_comment": "Set the view options to use for the files",
"view_query": "View Query",
"view_query_comment": "Set the view query to use for the files",
"layout": "View Type",
"layout_comment": "Select in what way you want to view the files",
"layout_options": "View Options",
"layout_options_comment": "Set the view options to use for the files",
"layout_query": "View Query",
"layout_query_comment": "Set the view query to use for the files",
"filters": "Filters",
"filters_comment": "What filters to use",
"accept": "Accept File Types",

2
app/src/lang/cs-CZ/index.json
View File

@@ -523,7 +523,7 @@
"values": "Hodnoty",
"version": "Verze",
"version_and_updates": "Verze a aktualizace",
"view_type": "Zobrazit jako...",
"layout": "Zobrazit jako...",
"visible_all_users": "Zobrazit pro všechny uživatele",
"webhook_count": "Žádné webhooky | 1 Webhook | {count} Webhooků",
"weeks": {

12
app/src/lang/cs-CZ/interfaces.json
View File

@@ -172,12 +172,12 @@
},
"file": {
"file": "Soubor",
"view_type": "View Type",
"view_type_comment": "Select in what way you want to view the files",
"view_options": "View Options",
"view_options_comment": "Set the view options to use for the files",
"view_query": "View Query",
"view_query_comment": "Set the view query to use for the files",
"layout": "View Type",
"layout_comment": "Select in what way you want to view the files",
"layout_options": "View Options",
"layout_options_comment": "Set the view options to use for the files",
"layout_query": "View Query",
"layout_query_comment": "Set the view query to use for the files",
"filters": "Filters",
"filters_comment": "What filters to use",
"accept": "Accept File Types",

2
app/src/lang/da-DK/index.json
View File

@@ -523,7 +523,7 @@
"values": "Values",
"version": "Version",
"version_and_updates": "Version and Updates",
"view_type": "View As...",
"layout": "View As...",
"visible_all_users": "Visible for all users",
"webhook_count": "No Webhooks | 1 Webhook | {count} Webhooks",
"weeks": {

12
app/src/lang/da-DK/interfaces.json
View File

@@ -172,12 +172,12 @@
},
"file": {
"file": "File",
"view_type": "View Type",
"view_type_comment": "Select in what way you want to view the files",
"view_options": "View Options",
"view_options_comment": "Set the view options to use for the files",
"view_query": "View Query",
"view_query_comment": "Set the view query to use for the files",
"layout": "View Type",
"layout_comment": "Select in what way you want to view the files",
"layout_options": "View Options",
"layout_options_comment": "Set the view options to use for the files",
"layout_query": "View Query",
"layout_query_comment": "Set the view query to use for the files",
"filters": "Filters",
"filters_comment": "What filters to use",
"accept": "Accept File Types",

2
app/src/lang/de-DE/index.json
View File

@@ -523,7 +523,7 @@
"values": "Werte",
"version": "Version",
"version_and_updates": "Version und Aktualisierungen",
"view_type": "Ansehen als...",
"layout": "Ansehen als...",
"visible_all_users": "Für alle Benutzer sichtbar",
"webhook_count": "Keine Webhooks | 1 Webhook | {count} Webhooks",
"weeks": {

12
app/src/lang/de-DE/interfaces.json
View File

@@ -172,12 +172,12 @@
},
"file": {
"file": "Datei",
"view_type": "Ansicht",
"view_type_comment": "Select in what way you want to view the files",
"view_options": "View Options",
"view_options_comment": "Set the view options to use for the files",
"view_query": "View Query",
"view_query_comment": "Set the view query to use for the files",
"layout": "Ansicht",
"layout_comment": "Select in what way you want to view the files",
"layout_options": "View Options",
"layout_options_comment": "Set the view options to use for the files",
"layout_query": "View Query",
"layout_query_comment": "Set the view query to use for the files",
"filters": "Filters",
"filters_comment": "What filters to use",
"accept": "Accept File Types",

2
app/src/lang/el-GR/index.json
View File

@@ -523,7 +523,7 @@
"values": "Τιμές",
"version": "Έκδοση",
"version_and_updates": "Version and Updates",
"view_type": "View As...",
"layout": "View As...",
"visible_all_users": "Visible for all users",
"webhook_count": "No Webhooks | 1 Webhook | {count} Webhooks",
"weeks": {

12
app/src/lang/el-GR/interfaces.json
View File

@@ -172,12 +172,12 @@
},
"file": {
"file": "Αρχείο",
"view_type": "View Type",
"view_type_comment": "Select in what way you want to view the files",
"view_options": "View Options",
"view_options_comment": "Set the view options to use for the files",
"view_query": "View Query",
"view_query_comment": "Set the view query to use for the files",
"layout": "View Type",
"layout_comment": "Select in what way you want to view the files",
"layout_options": "View Options",
"layout_options_comment": "Set the view options to use for the files",
"layout_query": "View Query",
"layout_query_comment": "Set the view query to use for the files",
"filters": "Filters",
"filters_comment": "What filters to use",
"accept": "Accept File Types",

2
app/src/lang/es-419/index.json
View File

@@ -523,7 +523,7 @@
"values": "Valores",
"version": "Versión",
"version_and_updates": "Versión y actualizaciones",
"view_type": "Ver como...",
"layout": "Ver como...",
"visible_all_users": "Visible para todos los usuarios",
"webhook_count": "Sin Webhooks | Un Webhook | {count} Webhooks",
"weeks": {

12
app/src/lang/es-419/interfaces.json
View File

@@ -172,12 +172,12 @@
},
"file": {
"file": "Archivo",
"view_type": "Tipo de Vista",
"view_type_comment": "Seleccionar en que forma quieres ver los archivos",
"view_options": "Opciones de Vista",
"view_options_comment": "Establecer las opciones de vista a usar para los archivos",
"view_query": "Ver Consulta",
"view_query_comment": "Establecer la vista de consulta a usar para los archivos",
"layout": "Tipo de Vista",
"layout_comment": "Seleccionar en que forma quieres ver los archivos",
"layout_options": "Opciones de Vista",
"layout_options_comment": "Establecer las opciones de vista a usar para los archivos",
"layout_query": "Ver Consulta",
"layout_query_comment": "Establecer la vista de consulta a usar para los archivos",
"filters": "Filtros",
"filters_comment": "Qué filtros usar",
"accept": "Aceptar los Tipos de Archivo",

2
app/src/lang/es-CL/index.json
View File

@@ -523,7 +523,7 @@
"values": "Valores",
"version": "Versión",
"version_and_updates": "Versión y actualización",
"view_type": "Visto como...",
"layout": "Visto como...",
"visible_all_users": "Visible para todos los usuarios",
"webhook_count": "Sin Webhooks | Un Webhook | {count} Webhooks",
"weeks": {

12
app/src/lang/es-CL/interfaces.json
View File

@@ -172,12 +172,12 @@
},
"file": {
"file": "Archivo",
"view_type": "Tipo de Vista",
"view_type_comment": "Seleccionar en que forma quieres ver los archivos",
"view_options": "Opciones de Vista",
"view_options_comment": "Establecer las opciones de vista a usar para los archivos",
"view_query": "Ver Consulta",
"view_query_comment": "Establecer la vista de consulta a usar para los archivos",
"layout": "Tipo de Vista",
"layout_comment": "Seleccionar en que forma quieres ver los archivos",
"layout_options": "Opciones de Vista",
"layout_options_comment": "Establecer las opciones de vista a usar para los archivos",
"layout_query": "Ver Consulta",
"layout_query_comment": "Establecer la vista de consulta a usar para los archivos",
"filters": "Filtros",
"filters_comment": "Qué filtros usar",
"accept": "Aceptar los Tipos de Archivo",

2
app/src/lang/es-ES/index.json
View File

@@ -523,7 +523,7 @@
"values": "Valores",
"version": "Versión",
"version_and_updates": "Versión y actualizaciones",
"view_type": "Ver como...",
"layout": "Ver como...",
"visible_all_users": "Visible para todos los usuarios",
"webhook_count": "Sin Webhooks | Un Webhook | {count} Webhooks",
"weeks": {

12
app/src/lang/es-ES/interfaces.json
View File

@@ -172,12 +172,12 @@
},
"file": {
"file": "Archivo",
"view_type": "Tipo de Vista",
"view_type_comment": "Seleccionar en que forma quieres ver los archivos",
"view_options": "Opciones de Vista",
"view_options_comment": "Establecer las opciones de vista a usar para los archivos",
"view_query": "Ver Consulta",
"view_query_comment": "Establecer la vista de consulta a usar para los archivos",
"layout": "Tipo de Vista",
"layout_comment": "Seleccionar en que forma quieres ver los archivos",
"layout_options": "Opciones de Vista",
"layout_options_comment": "Establecer las opciones de vista a usar para los archivos",
"layout_query": "Ver Consulta",
"layout_query_comment": "Establecer la vista de consulta a usar para los archivos",
"filters": "Filtros",
"filters_comment": "Qué filtros usar",
"accept": "Aceptar los Tipos de Archivo",

2
app/src/lang/fi-FI/index.json
View File

@@ -523,7 +523,7 @@
"values": "Values",
"version": "Version",
"version_and_updates": "Version and Updates",
"view_type": "View As...",
"layout": "View As...",
"visible_all_users": "Visible for all users",
"webhook_count": "No Webhooks | 1 Webhook | {count} Webhooks",
"weeks": {

12
app/src/lang/fi-FI/interfaces.json
View File

@@ -172,12 +172,12 @@
},
"file": {
"file": "File",
"view_type": "View Type",
"view_type_comment": "Select in what way you want to view the files",
"view_options": "View Options",
"view_options_comment": "Set the view options to use for the files",
"view_query": "View Query",
"view_query_comment": "Set the view query to use for the files",
"layout": "View Type",
"layout_comment": "Select in what way you want to view the files",
"layout_options": "View Options",
"layout_options_comment": "Set the view options to use for the files",
"layout_query": "View Query",
"layout_query_comment": "Set the view query to use for the files",
"filters": "Filters",
"filters_comment": "What filters to use",
"accept": "Accept File Types",

2
app/src/lang/fr-FR/index.json
View File

@@ -523,7 +523,7 @@
"values": "Valeurs",
"version": "Version",
"version_and_updates": "Version et mises à jour",
"view_type": "Voir comme…",
"layout": "Voir comme…",
"visible_all_users": "Visible à tous les utilisateurs",
"webhook_count": "Aucun Webhooks | 1 Webhook | {count} Webhooks",
"weeks": {

12
app/src/lang/fr-FR/interfaces.json
View File

@@ -172,12 +172,12 @@
},
"file": {
"file": "Fichier",
"view_type": "Voir le type",
"view_type_comment": "Sélectionnez la façon dont vous souhaitez afficher les fichiers",
"view_options": "Afficher les options",
"view_options_comment": "Définir les options d'affichage à utiliser pour les fichiers",
"view_query": "Voir la requête",
"view_query_comment": "Définir la requête de vue à utiliser pour les fichiers",
"layout": "Voir le type",
"layout_comment": "Sélectionnez la façon dont vous souhaitez afficher les fichiers",
"layout_options": "Afficher les options",
"layout_options_comment": "Définir les options d'affichage à utiliser pour les fichiers",
"layout_query": "Voir la requête",
"layout_query_comment": "Définir la requête de vue à utiliser pour les fichiers",
"filters": "Filtres",
"filters_comment": "Quels filtres utiliser",
"accept": "Accepter les types de fichier",

2
app/src/lang/he-IL/index.json
View File

@@ -523,7 +523,7 @@
"values": "Values",
"version": "Version",
"version_and_updates": "Version and Updates",
"view_type": "View As...",
"layout": "View As...",
"visible_all_users": "Visible for all users",
"webhook_count": "No Webhooks | 1 Webhook | {count} Webhooks",
"weeks": {

12
app/src/lang/he-IL/interfaces.json
View File

@@ -172,12 +172,12 @@
},
"file": {
"file": "File",
"view_type": "View Type",
"view_type_comment": "Select in what way you want to view the files",
"view_options": "View Options",
"view_options_comment": "Set the view options to use for the files",
"view_query": "View Query",
"view_query_comment": "Set the view query to use for the files",
"layout": "View Type",
"layout_comment": "Select in what way you want to view the files",
"layout_options": "View Options",
"layout_options_comment": "Set the view options to use for the files",
"layout_query": "View Query",
"layout_query_comment": "Set the view query to use for the files",
"filters": "Filters",
"filters_comment": "What filters to use",
"accept": "Accept File Types",

2
app/src/lang/hu-HU/index.json
View File

@@ -523,7 +523,7 @@
"values": "Values",
"version": "Version",
"version_and_updates": "Version and Updates",
"view_type": "View As...",
"layout": "View As...",
"visible_all_users": "Visible for all users",
"webhook_count": "No Webhooks | 1 Webhook | {count} Webhooks",
"weeks": {

12
app/src/lang/hu-HU/interfaces.json
View File

@@ -172,12 +172,12 @@
},
"file": {
"file": "File",
"view_type": "View Type",
"view_type_comment": "Select in what way you want to view the files",
"view_options": "View Options",
"view_options_comment": "Set the view options to use for the files",
"view_query": "View Query",
"view_query_comment": "Set the view query to use for the files",
"layout": "View Type",
"layout_comment": "Select in what way you want to view the files",
"layout_options": "View Options",
"layout_options_comment": "Set the view options to use for the files",
"layout_query": "View Query",
"layout_query_comment": "Set the view query to use for the files",
"filters": "Filters",
"filters_comment": "What filters to use",
"accept": "Accept File Types",

2
app/src/lang/id-ID/index.json
View File

@@ -523,7 +523,7 @@
"values": "Nilai",
"version": "Versi",
"version_and_updates": "Versi dan Pembaruan",
"view_type": "Lihat Sebagai...",
"layout": "Lihat Sebagai...",
"visible_all_users": "Terlihat oleh semua pengguna",
"webhook_count": "No Webhooks | 1 Webhook | {count} Webhooks",
"weeks": {

12
app/src/lang/id-ID/interfaces.json
View File

@@ -172,12 +172,12 @@
},
"file": {
"file": "Berkas",
"view_type": "View Type",
"view_type_comment": "Select in what way you want to view the files",
"view_options": "View Options",
"view_options_comment": "Set the view options to use for the files",
"view_query": "View Query",
"view_query_comment": "Set the view query to use for the files",
"layout": "View Type",
"layout_comment": "Select in what way you want to view the files",
"layout_options": "View Options",
"layout_options_comment": "Set the view options to use for the files",
"layout_query": "View Query",
"layout_query_comment": "Set the view query to use for the files",
"filters": "Filters",
"filters_comment": "What filters to use",
"accept": "Accept File Types",

2
app/src/lang/is-IS/index.json
View File

@@ -523,7 +523,7 @@
"values": "Values",
"version": "Version",
"version_and_updates": "Version and Updates",
"view_type": "View As...",
"layout": "View As...",
"visible_all_users": "Visible for all users",
"webhook_count": "No Webhooks | 1 Webhook | {count} Webhooks",
"weeks": {

12
app/src/lang/is-IS/interfaces.json
View File

@@ -172,12 +172,12 @@
},
"file": {
"file": "File",
"view_type": "View Type",
"view_type_comment": "Select in what way you want to view the files",
"view_options": "View Options",
"view_options_comment": "Set the view options to use for the files",
"view_query": "View Query",
"view_query_comment": "Set the view query to use for the files",
"layout": "View Type",
"layout_comment": "Select in what way you want to view the files",
"layout_options": "View Options",
"layout_options_comment": "Set the view options to use for the files",
"layout_query": "View Query",
"layout_query_comment": "Set the view query to use for the files",
"filters": "Filters",
"filters_comment": "What filters to use",
"accept": "Accept File Types",

2
app/src/lang/it-IT/index.json
View File

@@ -523,7 +523,7 @@
"values": "Valori",
"version": "Versione",
"version_and_updates": "Versione e aggiornamenti",
"view_type": "Visualizza come...",
"layout": "Visualizza come...",
"visible_all_users": "Visibile per tutti gli utenti",
"webhook_count": "Nessun webhook | 1 Webhook | {count} Webhook",
"weeks": {

12
app/src/lang/it-IT/interfaces.json
View File

@@ -172,12 +172,12 @@
},
"file": {
"file": "File",
"view_type": "View Type",
"view_type_comment": "Select in what way you want to view the files",
"view_options": "View Options",
"view_options_comment": "Set the view options to use for the files",
"view_query": "View Query",
"view_query_comment": "Set the view query to use for the files",
"layout": "View Type",
"layout_comment": "Select in what way you want to view the files",
"layout_options": "View Options",
"layout_options_comment": "Set the view options to use for the files",
"layout_query": "View Query",
"layout_query_comment": "Set the view query to use for the files",
"filters": "Filters",
"filters_comment": "What filters to use",
"accept": "Accept File Types",

2
app/src/lang/ja-JP/index.json
View File

@@ -523,7 +523,7 @@
"values": "値",
"version": "バージョン",
"version_and_updates": "バージョンおよび更新",
"view_type": "View As...",
"layout": "View As...",
"visible_all_users": "全ユーザーで閲覧可能",
"webhook_count": "Webhook 無し | 1つのWebhook | {count} 個のWebhook",
"weeks": {

12
app/src/lang/ja-JP/interfaces.json
View File

@@ -172,12 +172,12 @@
},
"file": {
"file": "ファイル",
"view_type": "View Type",
"view_type_comment": "Select in what way you want to view the files",
"view_options": "View Options",
"view_options_comment": "Set the view options to use for the files",
"view_query": "View Query",
"view_query_comment": "Set the view query to use for the files",
"layout": "View Type",
"layout_comment": "Select in what way you want to view the files",
"layout_options": "View Options",
"layout_options_comment": "Set the view options to use for the files",
"layout_query": "View Query",
"layout_query_comment": "Set the view query to use for the files",
"filters": "Filters",
"filters_comment": "What filters to use",
"accept": "Accept File Types",

2
app/src/lang/ko-KR/index.json
View File

@@ -523,7 +523,7 @@
"values": "Values",
"version": "Version",
"version_and_updates": "Version and Updates",
"view_type": "View As...",
"layout": "View As...",
"visible_all_users": "Visible for all users",
"webhook_count": "No Webhooks | 1 Webhook | {count} Webhooks",
"weeks": {

12
app/src/lang/ko-KR/interfaces.json
View File

@@ -172,12 +172,12 @@
},
"file": {
"file": "File",
"view_type": "View Type",
"view_type_comment": "Select in what way you want to view the files",
"view_options": "View Options",
"view_options_comment": "Set the view options to use for the files",
"view_query": "View Query",
"view_query_comment": "Set the view query to use for the files",
"layout": "View Type",
"layout_comment": "Select in what way you want to view the files",
"layout_options": "View Options",
"layout_options_comment": "Set the view options to use for the files",
"layout_query": "View Query",
"layout_query_comment": "Set the view query to use for the files",
"filters": "Filters",
"filters_comment": "What filters to use",
"accept": "Accept File Types",

2
app/src/lang/lt-LT/index.json
View File

@@ -523,7 +523,7 @@
"values": "Values",
"version": "Version",
"version_and_updates": "Version and Updates",
"view_type": "View As...",
"layout": "View As...",
"visible_all_users": "Visible for all users",
"webhook_count": "No Webhooks | 1 Webhook | {count} Webhooks",
"weeks": {

12
app/src/lang/lt-LT/interfaces.json
View File

@@ -172,12 +172,12 @@
},
"file": {
"file": "File",
"view_type": "View Type",
"view_type_comment": "Select in what way you want to view the files",
"view_options": "View Options",
"view_options_comment": "Set the view options to use for the files",
"view_query": "View Query",
"view_query_comment": "Set the view query to use for the files",
"layout": "View Type",
"layout_comment": "Select in what way you want to view the files",
"layout_options": "View Options",
"layout_options_comment": "Set the view options to use for the files",
"layout_query": "View Query",
"layout_query_comment": "Set the view query to use for the files",
"filters": "Filters",
"filters_comment": "What filters to use",
"accept": "Accept File Types",

2
app/src/lang/ms-MY/index.json
View File

@@ -523,7 +523,7 @@
"values": "Nilai-nilai",
"version": "Versi",
"version_and_updates": "Versi dan Kemaskini",
"view_type": "Lihat Sebagai...",
"layout": "Lihat Sebagai...",
"visible_all_users": "Dilihat untuk semua pengguna",
"webhook_count": "No Webhooks | 1 Webhook | {count} Webhooks",
"weeks": {

12
app/src/lang/ms-MY/interfaces.json
View File

@@ -172,12 +172,12 @@
},
"file": {
"file": "Fail",
"view_type": "View Type",
"view_type_comment": "Select in what way you want to view the files",
"view_options": "View Options",
"view_options_comment": "Set the view options to use for the files",
"view_query": "View Query",
"view_query_comment": "Set the view query to use for the files",
"layout": "View Type",
"layout_comment": "Select in what way you want to view the files",
"layout_options": "View Options",
"layout_options_comment": "Set the view options to use for the files",
"layout_query": "View Query",
"layout_query_comment": "Set the view query to use for the files",
"filters": "Filters",
"filters_comment": "What filters to use",
"accept": "Accept File Types",

2
app/src/lang/nl-NL/index.json
View File

@@ -525,7 +525,7 @@
"values": "Waardes",
"version": "Versie",
"version_and_updates": "Versie en Updates",
"view_type": "Bekijk als...",
"layout": "Bekijk als...",
"visible_all_users": "Zichtbaar voor alle gebruikers",
"webhook_count": "Geen webhooks | 1 Webhook | {count} Webhooks",
"weeks": {

12
app/src/lang/nl-NL/interfaces.json
View File

@@ -172,12 +172,12 @@
},
"file": {
"file": "Bestand",
"view_type": "Weergave Type",
"view_type_comment": "Selecteer op welke manier u de bestanden wilt bekijken",
"view_options": "Weergaveopties",
"view_options_comment": "Stel de te gebruiken weergave opties in voor de bestanden",
"view_query": "Weergave Query",
"view_query_comment": "Stel de te gebruiken weergave in voor de bestanden",
"layout": "Weergave Type",
"layout_comment": "Selecteer op welke manier u de bestanden wilt bekijken",
"layout_options": "Weergaveopties",
"layout_options_comment": "Stel de te gebruiken weergave opties in voor de bestanden",
"layout_query": "Weergave Query",
"layout_query_comment": "Stel de te gebruiken weergave in voor de bestanden",
"filters": "Filters",
"filters_comment": "Welke filters te gebruiken",
"accept": "Accepteer bestandstypes",

2
app/src/lang/no-NO/index.json
View File

@@ -523,7 +523,7 @@
"values": "Verdier",
"version": "Versjon",
"version_and_updates": "Versjon og oppdateringer",
"view_type": "Vis som...",
"layout": "Vis som...",
"visible_all_users": "Synlig for alle brukere",
"webhook_count": "No Webhooks | 1 Webhook | {count} Webhooks",
"weeks": {

12
app/src/lang/no-NO/interfaces.json
View File

@@ -172,12 +172,12 @@
},
"file": {
"file": "Fil",
"view_type": "View Type",
"view_type_comment": "Select in what way you want to view the files",
"view_options": "View Options",
"view_options_comment": "Set the view options to use for the files",
"view_query": "View Query",
"view_query_comment": "Set the view query to use for the files",
"layout": "View Type",
"layout_comment": "Select in what way you want to view the files",
"layout_options": "View Options",
"layout_options_comment": "Set the view options to use for the files",
"layout_query": "View Query",
"layout_query_comment": "Set the view query to use for the files",
"filters": "Filters",
"filters_comment": "What filters to use",
"accept": "Accept File Types",

2
app/src/lang/pl-PL/index.json
View File

@@ -523,7 +523,7 @@
"values": "Wartości",
"version": "Wersja",
"version_and_updates": "Wersje i aktualizacje",
"view_type": "Pokaż jako...",
"layout": "Pokaż jako...",
"visible_all_users": "Widoczne dla wszystkich użytkowników",
"webhook_count": "No Webhooks | 1 Webhook | {count} Webhooks",
"weeks": {

12
app/src/lang/pl-PL/interfaces.json
View File

@@ -172,12 +172,12 @@
},
"file": {
"file": "Plik",
"view_type": "View Type",
"view_type_comment": "Select in what way you want to view the files",
"view_options": "View Options",
"view_options_comment": "Set the view options to use for the files",
"view_query": "View Query",
"view_query_comment": "Set the view query to use for the files",
"layout": "View Type",
"layout_comment": "Select in what way you want to view the files",
"layout_options": "View Options",
"layout_options_comment": "Set the view options to use for the files",
"layout_query": "View Query",
"layout_query_comment": "Set the view query to use for the files",
"filters": "Filters",
"filters_comment": "What filters to use",
"accept": "Accept File Types",

2
app/src/lang/pt-BR/index.json
View File

@@ -523,7 +523,7 @@
"values": "Valores",
"version": "Versão",
"version_and_updates": "Versão e alterações",
"view_type": "Ver como...",
"layout": "Ver como...",
"visible_all_users": "Visível para todos os usuários",
"webhook_count": "Sem webhooks | 1 Webhook | {count} Webhooks",
"weeks": {

12
app/src/lang/pt-BR/interfaces.json
View File

@@ -172,12 +172,12 @@
},
"file": {
"file": "Arquivo",
"view_type": "View Type",
"view_type_comment": "Select in what way you want to view the files",
"view_options": "View Options",
"view_options_comment": "Set the view options to use for the files",
"view_query": "View Query",
"view_query_comment": "Set the view query to use for the files",
"layout": "View Type",
"layout_comment": "Select in what way you want to view the files",
"layout_options": "View Options",
"layout_options_comment": "Set the view options to use for the files",
"layout_query": "View Query",
"layout_query_comment": "Set the view query to use for the files",
"filters": "Filters",
"filters_comment": "What filters to use",
"accept": "Accept File Types",

2
app/src/lang/pt-PT/index.json
View File

@@ -523,7 +523,7 @@
"values": "Values",
"version": "Version",
"version_and_updates": "Version and Updates",
"view_type": "View As...",
"layout": "View As...",
"visible_all_users": "Visible for all users",
"webhook_count": "No Webhooks | 1 Webhook | {count} Webhooks",
"weeks": {

12
app/src/lang/pt-PT/interfaces.json
View File

@@ -172,12 +172,12 @@
},
"file": {
"file": "File",
"view_type": "View Type",
"view_type_comment": "Select in what way you want to view the files",
"view_options": "View Options",
"view_options_comment": "Set the view options to use for the files",
"view_query": "View Query",
"view_query_comment": "Set the view query to use for the files",
"layout": "View Type",
"layout_comment": "Select in what way you want to view the files",
"layout_options": "View Options",
"layout_options_comment": "Set the view options to use for the files",
"layout_query": "View Query",
"layout_query_comment": "Set the view query to use for the files",
"filters": "Filters",
"filters_comment": "What filters to use",
"accept": "Accept File Types",

2
app/src/lang/ro-RO/index.json
View File

@@ -523,7 +523,7 @@
"values": "Values",
"version": "Version",
"version_and_updates": "Version and Updates",
"view_type": "View As...",
"layout": "View As...",
"visible_all_users": "Visible for all users",
"webhook_count": "No Webhooks | 1 Webhook | {count} Webhooks",
"weeks": {

12
app/src/lang/ro-RO/interfaces.json
View File

@@ -172,12 +172,12 @@
},
"file": {
"file": "File",
"view_type": "View Type",
"view_type_comment": "Select in what way you want to view the files",
"view_options": "View Options",
"view_options_comment": "Set the view options to use for the files",
"view_query": "View Query",
"view_query_comment": "Set the view query to use for the files",
"layout": "View Type",
"layout_comment": "Select in what way you want to view the files",
"layout_options": "View Options",
"layout_options_comment": "Set the view options to use for the files",
"layout_query": "View Query",
"layout_query_comment": "Set the view query to use for the files",
"filters": "Filters",
"filters_comment": "What filters to use",
"accept": "Accept File Types",

2
app/src/lang/ru-RU/index.json
View File

@@ -523,7 +523,7 @@
"values": "Значения",
"version": "Версия",
"version_and_updates": "Версия и Обновления",
"view_type": "Посмотреть как...",
"layout": "Посмотреть как...",
"visible_all_users": "Видно всем пользователям",
"webhook_count": "Нет вебхуков | 1 вебхук | {count} вебхуков",
"weeks": {

12
app/src/lang/ru-RU/interfaces.json
View File

@@ -172,12 +172,12 @@
},
"file": {
"file": "Файл",
"view_type": "Просмотр типа",
"view_type_comment": "Выберите, каким образом вы хотите просмотреть файлы",
"view_options": "Параметры просмотра",
"view_options_comment": "Установите параметры просмотра для файлов",
"view_query": "Просмотр запроса",
"view_query_comment": "Установить запрос для просмотра файлов",
"layout": "Просмотр типа",
"layout_comment": "Выберите, каким образом вы хотите просмотреть файлы",
"layout_options": "Параметры просмотра",
"layout_options_comment": "Установите параметры просмотра для файлов",
"layout_query": "Просмотр запроса",
"layout_query_comment": "Установить запрос для просмотра файлов",
"filters": "Фильтры",
"filters_comment": "Какие фильтры использовать",
"accept": "Принимать типы файлов",

2
app/src/lang/sr-SP/index.json
View File

@@ -523,7 +523,7 @@
"values": "Values",
"version": "Version",
"version_and_updates": "Version and Updates",
"view_type": "View As...",
"layout": "View As...",
"visible_all_users": "Visible for all users",
"webhook_count": "No Webhooks | 1 Webhook | {count} Webhooks",
"weeks": {

12
app/src/lang/sr-SP/interfaces.json
View File

@@ -172,12 +172,12 @@
},
"file": {
"file": "File",
"view_type": "View Type",
"view_type_comment": "Select in what way you want to view the files",
"view_options": "View Options",
"view_options_comment": "Set the view options to use for the files",
"view_query": "View Query",
"view_query_comment": "Set the view query to use for the files",
"layout": "View Type",
"layout_comment": "Select in what way you want to view the files",
"layout_options": "View Options",
"layout_options_comment": "Set the view options to use for the files",
"layout_query": "View Query",
"layout_query_comment": "Set the view query to use for the files",
"filters": "Filters",
"filters_comment": "What filters to use",
"accept": "Accept File Types",

2
app/src/lang/sv-SE/index.json
View File

@@ -523,7 +523,7 @@
"values": "Värden",
"version": "Version",
"version_and_updates": "Version och uppdateringar",
"view_type": "Visa som...",
"layout": "Visa som...",
"visible_all_users": "Synlig för alla användare",
"webhook_count": "No Webhooks | 1 Webhook | {count} Webhooks",
"weeks": {

12
app/src/lang/sv-SE/interfaces.json
View File

@@ -172,12 +172,12 @@
},
"file": {
"file": "Fil",
"view_type": "View Type",
"view_type_comment": "Select in what way you want to view the files",
"view_options": "View Options",
"view_options_comment": "Set the view options to use for the files",
"view_query": "View Query",
"view_query_comment": "Set the view query to use for the files",
"layout": "View Type",
"layout_comment": "Select in what way you want to view the files",
"layout_options": "View Options",
"layout_options_comment": "Set the view options to use for the files",
"layout_query": "View Query",
"layout_query_comment": "Set the view query to use for the files",
"filters": "Filters",
"filters_comment": "What filters to use",
"accept": "Accept File Types",

2
app/src/lang/tr-TR/index.json
View File

@@ -523,7 +523,7 @@
"values": "Değerler",
"version": "Versiyon",
"version_and_updates": "Versiyon ve Güncellemeler",
"view_type": "Şu Şekilde Görüntüle...",
"layout": "Şu Şekilde Görüntüle...",
"visible_all_users": "Tüm kullanıcılar tarafından görüntülenebilir",
"webhook_count": "Ağ kancası yok | 1 Ağ Kancası | {count} Ağ Kancası",
"weeks": {

12
app/src/lang/tr-TR/interfaces.json
View File

@@ -172,12 +172,12 @@
},
"file": {
"file": "Dosya",
"view_type": "Görünüm Tipi",
"view_type_comment": "Dosyaları hangi yolla görüntülemek istediğinizi seçin",
"view_options": "Görünüm Seçenekleri",
"view_options_comment": "Dosyalar için kullanılacak görünüm seçeneklerini ayarlayın",
"view_query": "Görünüm Sorgusu",
"view_query_comment": "Dosyalar için kullanılacak görünüm sorgusunu ayarlayın",
"layout": "Görünüm Tipi",
"layout_comment": "Dosyaları hangi yolla görüntülemek istediğinizi seçin",
"layout_options": "Görünüm Seçenekleri",
"layout_options_comment": "Dosyalar için kullanılacak görünüm seçeneklerini ayarlayın",
"layout_query": "Görünüm Sorgusu",
"layout_query_comment": "Dosyalar için kullanılacak görünüm sorgusunu ayarlayın",
"filters": "Filtreler",
"filters_comment": "Hangi filtreler kullanılacak",
"accept": "Dosya Türlerini Kabul Et",

2
app/src/lang/uk-UA/index.json
View File

@@ -523,7 +523,7 @@
"values": "Значення",
"version": "Версія",
"version_and_updates": "Версія та оновлення",
"view_type": "Переглянути як...",
"layout": "Переглянути як...",
"visible_all_users": "Видимі для всіх користувачів",
"webhook_count": "Немає Вебхуків | Один Вебхук | {count} вебхуків",
"weeks": {

12
app/src/lang/uk-UA/interfaces.json
View File

@@ -172,12 +172,12 @@
},
"file": {
"file": "Файл",
"view_type": "View Type",
"view_type_comment": "Select in what way you want to view the files",
"view_options": "View Options",
"view_options_comment": "Set the view options to use for the files",
"view_query": "View Query",
"view_query_comment": "Set the view query to use for the files",
"layout": "View Type",
"layout_comment": "Select in what way you want to view the files",
"layout_options": "View Options",
"layout_options_comment": "Set the view options to use for the files",
"layout_query": "View Query",
"layout_query_comment": "Set the view query to use for the files",
"filters": "Filters",
"filters_comment": "What filters to use",
"accept": "Accept File Types",

2
app/src/lang/vi-VN/index.json
View File

@@ -523,7 +523,7 @@
"values": "Values",
"version": "Version",
"version_and_updates": "Version and Updates",
"view_type": "View As...",
"layout": "View As...",
"visible_all_users": "Visible for all users",
"webhook_count": "No Webhooks | 1 Webhook | {count} Webhooks",
"weeks": {

12
app/src/lang/vi-VN/interfaces.json
View File

@@ -172,12 +172,12 @@
},
"file": {
"file": "File",
"view_type": "View Type",
"view_type_comment": "Select in what way you want to view the files",
"view_options": "View Options",
"view_options_comment": "Set the view options to use for the files",
"view_query": "View Query",
"view_query_comment": "Set the view query to use for the files",
"layout": "View Type",
"layout_comment": "Select in what way you want to view the files",
"layout_options": "View Options",
"layout_options_comment": "Set the view options to use for the files",
"layout_query": "View Query",
"layout_query_comment": "Set the view query to use for the files",
"filters": "Filters",
"filters_comment": "What filters to use",
"accept": "Accept File Types",

2
app/src/lang/zh-CN/index.json
View File

@@ -523,7 +523,7 @@
"values": "值",
"version": "版本",
"version_and_updates": "版本与升级",
"view_type": "查看为...",
"layout": "查看为...",
"visible_all_users": "所有用户可见",
"webhook_count": "没有Webhook | 1个Webhook | {count} 个Webhook",
"weeks": {

12
app/src/lang/zh-CN/interfaces.json
View File

@@ -172,12 +172,12 @@
},
"file": {
"file": "文件",
"view_type": "View Type",
"view_type_comment": "选择你要查看文件的方式",
"view_options": "View Options",
"view_options_comment": "设置文件的视图选项",
"view_query": "View Query",
"view_query_comment": "设置用于该文件的视图查询",
"layout": "View Type",
"layout_comment": "选择你要查看文件的方式",
"layout_options": "View Options",
"layout_options_comment": "设置文件的视图选项",
"layout_query": "View Query",
"layout_query_comment": "设置用于该文件的视图查询",
"filters": "Filters",
"filters_comment": "What filters to use",
"accept": "允许的文件类型",

2
app/src/lang/zh-TW/index.json
View File

@@ -523,7 +523,7 @@
"values": "Values",
"version": "版本",
"version_and_updates": "版本更新",
"view_type": "檢視",
"layout": "檢視",
"visible_all_users": "所有使用者皆可檢視",
"webhook_count": "No Webhooks | 1 Webhook | {count} Webhooks",
"weeks": {

12
app/src/lang/zh-TW/interfaces.json
View File

@@ -172,12 +172,12 @@
},
"file": {
"file": "檔案",
"view_type": "View Type",
"view_type_comment": "Select in what way you want to view the files",
"view_options": "View Options",
"view_options_comment": "Set the view options to use for the files",
"view_query": "View Query",
"view_query_comment": "Set the view query to use for the files",
"layout": "View Type",
"layout_comment": "Select in what way you want to view the files",
"layout_options": "View Options",
"layout_options_comment": "Set the view options to use for the files",
"layout_query": "View Query",
"layout_query_comment": "Set the view query to use for the files",
"filters": "Filters",
"filters_comment": "What filters to use",
"accept": "Accept File Types",

46
app/src/layouts/cards/cards.vue
View File

@@ -133,7 +133,7 @@ import { clone } from 'lodash';
type Item = Record<string, any>;
type ViewOptions = {
type layoutOptions = {
size?: number;
icon?: string;
imageSource?: string;
@@ -142,7 +142,7 @@ type ViewOptions = {
imageFit?: 'crop' | 'contain';
};
type ViewQuery = {
type layoutQuery = {
fields?: string[];
sort?: string;
limit?: number;
@@ -159,12 +159,12 @@ export default defineComponent({
type: Array as PropType<Item[]>,
default: undefined,
},
viewOptions: {
type: Object as PropType<ViewOptions>,
layoutOptions: {
type: Object as PropType<layoutOptions>,
default: null,
},
viewQuery: {
type: Object as PropType<ViewQuery>,
layoutQuery: {
type: Object as PropType<layoutQuery>,
default: null,
},
filters: {
@@ -195,8 +195,8 @@ export default defineComponent({
const mainElement = inject('main-element', ref<Element | null>(null));
const _selection = useSync(props, 'selection', emit);
const _viewOptions = useSync(props, 'viewOptions', emit);
const _viewQuery = useSync(props, 'viewQuery', emit);
const _layoutOptions = useSync(props, 'layoutOptions', emit);
const _layoutQuery = useSync(props, 'layoutQuery', emit);
const _filters = useSync(props, 'filters', emit);
const _searchQuery = useSync(props, 'searchQuery', emit);
@@ -221,8 +221,8 @@ export default defineComponent({
});
});
const { size, icon, imageSource, title, subtitle, imageFit } = useViewOptions();
const { sort, limit, page, fields } = useViewQuery();
const { size, icon, imageSource, title, subtitle, imageFit } = uselayoutOptions();
const { sort, limit, page, fields } = uselayoutQuery();
const { items, loading, error, totalPages, itemCount, getItems } = useItems(collection, {
sort,
@@ -230,7 +230,7 @@ export default defineComponent({
page,
fields: fields,
filters: _filters,
searchQuery,
searchQuery: _searchQuery,
});
const newLink = computed(() => {
@@ -302,7 +302,7 @@ export default defineComponent({
});
}
function useViewOptions() {
function uselayoutOptions() {
const size = createViewOption<number>('size', 4);
const icon = createViewOption('icon', 'box');
const title = createViewOption<string>('title', null);
@@ -312,14 +312,14 @@ export default defineComponent({
return { size, icon, imageSource, title, subtitle, imageFit };
function createViewOption<T>(key: keyof ViewOptions, defaultValue: any) {
function createViewOption<T>(key: keyof layoutOptions, defaultValue: any) {
return computed<T>({
get() {
return _viewOptions.value?.[key] !== undefined ? _viewOptions.value?.[key] : defaultValue;
return _layoutOptions.value?.[key] !== undefined ? _layoutOptions.value?.[key] : defaultValue;
},
set(newValue: T) {
_viewOptions.value = {
..._viewOptions.value,
_layoutOptions.value = {
..._layoutOptions.value,
[key]: newValue,
};
},
@@ -327,11 +327,11 @@ export default defineComponent({
}
}
function useViewQuery() {
function uselayoutQuery() {
const page = ref(1);
const sort = createViewQueryOption<string>('sort', availableFields.value[0].field);
const limit = createViewQueryOption<number>('limit', 25);
const sort = createlayoutQueryOption<string>('sort', availableFields.value[0].field);
const limit = createlayoutQueryOption<number>('limit', 25);
const fields = computed<string[]>(() => {
if (!primaryKeyField.value) return [];
@@ -369,15 +369,15 @@ export default defineComponent({
return { sort, limit, page, fields };
function createViewQueryOption<T>(key: keyof ViewQuery, defaultValue: any) {
function createlayoutQueryOption<T>(key: keyof layoutQuery, defaultValue: any) {
return computed<T>({
get() {
return _viewQuery.value?.[key] || defaultValue;
return _layoutQuery.value?.[key] || defaultValue;
},
set(newValue: T) {
page.value = 1;
_viewQuery.value = {
..._viewQuery.value,
_layoutQuery.value = {
..._layoutQuery.value,
[key]: newValue,
};
},

60
app/src/layouts/tabular/tabular.vue
View File

@@ -157,7 +157,7 @@ import i18n from '@/lang';
import adjustFieldsForDisplays from '@/utils/adjust-fields-for-displays';
import hideDragImage from '@/utils/hide-drag-image';
type ViewOptions = {
type layoutOptions = {
widths?: {
[field: string]: number;
};
@@ -165,7 +165,7 @@ type ViewOptions = {
spacing?: 'comfortable' | 'cozy' | 'compact';
};
type ViewQuery = {
type layoutQuery = {
fields?: string[];
sort?: string;
};
@@ -181,12 +181,12 @@ export default defineComponent({
type: Array as PropType<Item[]>,
default: undefined,
},
viewOptions: {
type: Object as PropType<ViewOptions>,
layoutOptions: {
type: Object as PropType<layoutOptions>,
default: () => ({}),
},
viewQuery: {
type: Object as PropType<ViewQuery>,
layoutQuery: {
type: Object as PropType<layoutQuery>,
default: () => ({}),
},
filters: {
@@ -215,8 +215,8 @@ export default defineComponent({
const mainElement = inject('main-element', ref<Element | null>(null));
const _selection = useSync(props, 'selection', emit);
const _viewOptions: Ref<any> = useSync(props, 'viewOptions', emit);
const _viewQuery: Ref<any> = useSync(props, 'viewQuery', emit);
const _layoutOptions: Ref<any> = useSync(props, 'layoutOptions', emit);
const _layoutQuery: Ref<any> = useSync(props, 'layoutQuery', emit);
const _filters = useSync(props, 'filters', emit);
const _searchQuery = useSync(props, 'searchQuery', emit);
@@ -318,12 +318,12 @@ export default defineComponent({
const sort = computed({
get() {
return _viewQuery.value?.sort || primaryKeyField.value?.field;
return _layoutQuery.value?.sort || primaryKeyField.value?.field;
},
set(newSort: string) {
page.value = 1;
_viewQuery.value = {
...(_viewQuery.value || {}),
_layoutQuery.value = {
...(_layoutQuery.value || {}),
sort: newSort,
};
},
@@ -331,12 +331,12 @@ export default defineComponent({
const limit = computed({
get() {
return _viewOptions.value?.limit || 25;
return _layoutOptions.value?.limit || 25;
},
set(newLimit: number) {
page.value = 1;
_viewOptions.value = {
...(_viewOptions.value || {}),
_layoutOptions.value = {
...(_layoutOptions.value || {}),
limit: newLimit,
};
},
@@ -344,18 +344,18 @@ export default defineComponent({
const fields = computed({
get() {
if (_viewQuery.value?.fields) {
if (_layoutQuery.value?.fields) {
// This shouldn't be the case, but double check just in case it's stored
// differently in the DB from previous versions
if (typeof _viewQuery.value.fields === 'string') {
return (_viewQuery.value.fields as string).split(',');
if (typeof _layoutQuery.value.fields === 'string') {
return (_layoutQuery.value.fields as string).split(',');
}
if (Array.isArray(_viewQuery.value.fields)) return _viewQuery.value.fields;
if (Array.isArray(_layoutQuery.value.fields)) return _layoutQuery.value.fields;
}
const fields =
_viewQuery.value?.fields ||
_layoutQuery.value?.fields ||
availableFields.value
.filter((field: Field) => {
return field.schema?.is_primary_key === false;
@@ -366,8 +366,8 @@ export default defineComponent({
return fields;
},
set(newFields: string[]) {
_viewQuery.value = {
...(_viewQuery.value || {}),
_layoutQuery.value = {
...(_layoutQuery.value || {}),
fields: newFields,
};
},
@@ -390,15 +390,15 @@ export default defineComponent({
const localWidths = ref<{ [field: string]: number }>({});
watch(
() => _viewOptions.value,
() => _layoutOptions.value,
() => {
localWidths.value = {};
}
);
const saveWidthsToViewOptions = debounce(() => {
_viewOptions.value = {
...(_viewOptions.value || {}),
const saveWidthsTolayoutOptions = debounce(() => {
_layoutOptions.value = {
...(_layoutOptions.value || {}),
widths: localWidths.value,
};
}, 350);
@@ -419,7 +419,7 @@ export default defineComponent({
return activeFields.value.map((field) => ({
text: field.name,
value: field.field,
width: localWidths.value[field.field] || _viewOptions.value?.widths?.[field.field] || null,
width: localWidths.value[field.field] || _layoutOptions.value?.widths?.[field.field] || null,
field: {
display: field.meta?.display,
displayOptions: field.meta?.display_options,
@@ -441,17 +441,17 @@ export default defineComponent({
localWidths.value = widths;
saveWidthsToViewOptions();
saveWidthsTolayoutOptions();
},
});
const tableSpacing = computed({
get() {
return _viewOptions.value?.spacing || 'cozy';
return _layoutOptions.value?.spacing || 'cozy';
},
set(newSpacing: 'compact' | 'cozy' | 'comfortable') {
_viewOptions.value = {
...(_viewOptions.value || {}),
_layoutOptions.value = {
...(_layoutOptions.value || {}),
spacing: newSpacing,
};
},

21
app/src/modules/activity/routes/browse.vue
View File

@@ -20,11 +20,10 @@
<component
class="layout"
ref="layout"
:is="`layout-${viewType}`"
:is="`layout-${layout}`"
collection="directus_activity"
:view-options.sync="viewOptions"
:view-query.sync="viewQuery"
:layout-options.sync="layoutOptions"
:layout-query.sync="layoutQuery"
:filters="_filters"
:search-query="searchQuery"
@update:filters="filters = $event"
@@ -36,7 +35,7 @@
<drawer-detail icon="info_outline" :title="$t('information')" close>
<div class="page-description" v-html="marked($t('page_help_activity_browse'))" />
</drawer-detail>
<layout-drawer-detail @input="viewType = $event" :value="viewType" />
<layout-drawer-detail @input="layout = $event" :value="layout" />
<portal-target name="drawer" />
</template>
</private-view>
@@ -46,7 +45,6 @@
import { defineComponent, computed, ref } from '@vue/composition-api';
import ActivityNavigation from '../components/navigation.vue';
import { i18n } from '@/lang';
import { LayoutComponent } from '@/layouts/types';
import usePreset from '@/composables/use-preset';
import marked from 'marked';
import FilterDrawerDetail from '@/views/private/components/filter-drawer-detail';
@@ -72,9 +70,7 @@ export default defineComponent({
},
},
setup(props) {
const layout = ref<LayoutComponent | null>(null);
const { viewType, viewOptions, viewQuery, filters, searchQuery } = usePreset(ref('directus_activity'));
const { layout, layoutOptions, layoutQuery, filters, searchQuery } = usePreset(ref('directus_activity'));
const { breadcrumb } = useBreadcrumb();
const _filters = computed(() => {
@@ -97,11 +93,10 @@ export default defineComponent({
return {
breadcrumb,
layout,
marked,
viewType,
viewOptions,
viewQuery,
layout,
layoutOptions,
layoutQuery,
filters,
searchQuery,
_filters,

56
app/src/modules/collections/routes/browse.vue
View File

@@ -29,7 +29,12 @@
<v-icon class="saved" name="bookmark" v-else-if="bookmarkSaved" />
<template v-else-if="bookmarkIsMine">
<v-icon class="save" @click="savePreset()" name="bookmark_save" v-tooltip.bottom="$t('update_bookmark')" />
<v-icon
class="save"
@click="savePreset()"
name="bookmark_save"
v-tooltip.bottom="$t('update_bookmark')"
/>
</template>
<bookmark-add
@@ -166,12 +171,12 @@
<component
v-else
class="layout"
ref="layout"
:is="`layout-${viewType || 'tabular'}`"
ref="layoutRef"
:is="`layout-${layout || 'tabular'}`"
:collection="collection"
:selection.sync="selection"
:view-options.sync="viewOptions"
:view-query.sync="viewQuery"
:layout-options.sync="layoutOptions"
:layout-query.sync="layoutQuery"
:filters.sync="filters"
:search-query.sync="searchQuery"
:reset-preset="resetPreset"
@@ -210,7 +215,7 @@
"
/>
</drawer-detail>
<layout-drawer-detail @input="viewType = $event" :value="viewType" />
<layout-drawer-detail @input="layout = $event" :value="layout" />
<portal-target name="drawer" />
</template>
@@ -271,7 +276,7 @@ export default defineComponent({
setup(props) {
const userStore = useUserStore();
const permissionsStore = usePermissionsStore();
const layout = ref<LayoutComponent | null>(null);
const layoutRef = ref<LayoutComponent | null>(null);
const { collection } = toRefs(props);
const bookmarkID = computed(() => (props.bookmark ? +props.bookmark : null));
@@ -282,9 +287,9 @@ export default defineComponent({
const { breadcrumb } = useBreadcrumb();
const {
viewType,
viewOptions,
viewQuery,
layout,
layoutOptions,
layoutQuery,
filters,
searchQuery,
savePreset,
@@ -319,8 +324,8 @@ export default defineComponent({
watch(
collection,
() => {
if (viewType.value === null) {
viewType.value = 'tabular';
if (layout.value === null) {
layout.value = 'tabular';
}
},
{ immediate: true }
@@ -337,11 +342,11 @@ export default defineComponent({
currentCollection,
deleting,
filters,
layout,
layoutRef,
selection,
viewOptions,
viewQuery,
viewType,
layoutOptions,
layoutQuery,
layout,
searchQuery,
savePreset,
bookmarkExists,
@@ -411,7 +416,7 @@ export default defineComponent({
try {
await api.delete(`/items/${props.collection}/${batchPrimaryKeys}`);
await layout.value?.refresh?.();
await layoutRef.value?.refresh?.();
selection.value = [];
confirmDelete.value = false;
@@ -431,7 +436,7 @@ export default defineComponent({
try {
await api.patch(`/items/${props.collection}/${batchPrimaryKeys}`);
await layout.value?.refresh?.();
await layoutRef.value?.refresh?.();
selection.value = [];
confirmArchive.value = false;
@@ -599,8 +604,11 @@ export default defineComponent({
.save,
.clear {
cursor: pointer;
color: var(--foreground-subdued);
transition: color var(--fast) var(--transition);
}
.add {
color: var(--foreground-subdued);
&:hover {
color: var(--foreground-normal);
@@ -615,17 +623,17 @@ export default defineComponent({
}
}
.saved {
color: var(--primary);
}
.clear {
color: var(--foreground-subdued);
margin-left: 4px;
color: var(--foreground-subdued);
&:hover {
color: var(--warning);
}
}
.saved {
color: var(--primary);
}
}
</style>

7
app/src/modules/collections/routes/detail.vue
View File

@@ -372,7 +372,12 @@ export default defineComponent({
if (saveAllowed.value === false || hasEdits.value === false) return;
await save();
router.push(`/collections/${props.collection}/+`);
if (isNew.value === true) {
refresh();
} else {
router.push(`/collections/${props.collection}/+`);
}
}
async function saveAsCopyAndNavigate() {

24
app/src/modules/files/routes/browse.vue
View File

@@ -93,12 +93,12 @@
<component
class="layout"
ref="layout"
:is="`layout-${viewType}`"
ref="layoutRef"
:is="`layout-${layout}`"
collection="directus_files"
:selection.sync="selection"
:view-options.sync="viewOptions"
:view-query.sync="viewQuery"
:layout-options.sync="layoutOptions"
:layout-query.sync="layoutQuery"
:filters="filtersWithFolderAndType"
:search-query="searchQuery"
@update:filters="filters = $event"
@@ -130,7 +130,7 @@
<drawer-detail icon="info_outline" :title="$t('information')" close>
<div class="page-description" v-html="marked($t('page_help_files_browse'))" />
</drawer-detail>
<layout-drawer-detail @input="viewType = $event" :value="viewType" />
<layout-drawer-detail @input="layout = $event" :value="layout" />
<portal-target name="drawer" />
</template>
</private-view>
@@ -175,12 +175,12 @@ export default defineComponent({
},
setup(props) {
const { folders } = useFolders();
const layout = ref<LayoutComponent | null>(null);
const layoutRef = ref<LayoutComponent | null>(null);
const selection = ref<Item[]>([]);
const userStore = useUserStore();
const { viewType, viewOptions, viewQuery, filters, searchQuery } = usePreset(ref('directus_files'));
const { layout, layoutOptions, layoutQuery, filters, searchQuery } = usePreset(ref('directus_files'));
const { batchLink } = useLinks();
const { confirmDelete, deleting, batchDelete } = useBatchDelete();
const { breadcrumb, title } = useBreadcrumb();
@@ -252,9 +252,9 @@ export default defineComponent({
filters,
layout,
selection,
viewOptions,
viewQuery,
viewType,
layoutOptions,
layoutQuery,
layout,
filtersWithFolderAndType,
searchQuery,
marked,
@@ -281,7 +281,7 @@ export default defineComponent({
await api.delete(`/files/${batchPrimaryKeys}`);
await layout.value?.refresh();
await layoutRef.value?.refresh();
selection.value = [];
deleting.value = false;
@@ -371,7 +371,7 @@ export default defineComponent({
}
function refresh() {
layout.value?.refresh();
layoutRef.value?.refresh();
}
function clearFilters() {

6
app/src/modules/settings/routes/presets/browse/browse.vue
View File

@@ -110,7 +110,7 @@ type PresetRaw = {
user: null | { first_name: string; last_name: string };
role: null | { name: string };
collection: string;
view_type: string;
layout: string;
};
type Preset = {
@@ -176,7 +176,7 @@ export default defineComponent({
}
const collection = collectionsStore.getCollection(preset.collection)?.name;
const layout = layouts.find((l) => l.id === preset.view_type)?.name;
const layout = layouts.find((l) => l.id === preset.layout)?.name;
return {
id: preset.id,
@@ -203,7 +203,7 @@ export default defineComponent({
'user.last_name',
'role.name',
'collection',
'view_type',
'layout',
],
limit: -1,
},

48
app/src/modules/settings/routes/presets/detail.vue
View File

@@ -66,8 +66,8 @@
v-if="values.layout && values.collection"
:is="`layout-${values.layout}`"
:collection="values.collection"
:view-options.sync="viewOptions"
:view-query.sync="viewQuery"
:layout-options.sync="layoutOptions"
:layout-query.sync="layoutQuery"
:filters="values.filters || []"
@update:filters="edits.filters = $event"
readonly
@@ -116,9 +116,9 @@ type FormattedPreset = {
layout: string | null;
name: string | null;
view_query: Record<string, any> | null;
layout_query: Record<string, any> | null;
view_options: Record<string, any> | null;
layout_options: Record<string, any> | null;
filters: readonly Filter[] | null;
};
@@ -141,7 +141,7 @@ export default defineComponent({
const { loading: rolesLoading, roles } = useRoles();
const { loading: presetLoading, error, preset } = usePreset();
const { fields } = useForm();
const { edits, hasEdits, initialValues, values, viewQuery, viewOptions } = useValues();
const { edits, hasEdits, initialValues, values, layoutQuery, layoutOptions } = useValues();
const { save, saving } = useSave();
const { deleting, deleteAndQuit, confirmDelete } = useDelete();
@@ -158,8 +158,8 @@ export default defineComponent({
initialValues,
saving,
save,
viewQuery,
viewOptions,
layoutQuery,
layoutOptions,
hasEdits,
deleting,
deleteAndQuit,
@@ -180,9 +180,9 @@ export default defineComponent({
if (edits.value.name) editsParsed.title = edits.value.name;
if (edits.value.name?.length === 0) editsParsed.title = null;
if (edits.value.collection) editsParsed.collection = edits.value.collection;
if (edits.value.layout) editsParsed.view_type = edits.value.layout;
if (edits.value.view_query) editsParsed.view_query = edits.value.view_query;
if (edits.value.view_options) editsParsed.view_options = edits.value.view_options;
if (edits.value.layout) editsParsed.layout = edits.value.layout;
if (edits.value.layout_query) editsParsed.layout_query = edits.value.layout_query;
if (edits.value.layout_options) editsParsed.layout_options = edits.value.layout_options;
if (edits.value.filters) editsParsed.filters = edits.value.filters;
if (edits.value.scope) {
@@ -253,11 +253,11 @@ export default defineComponent({
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
id: preset.value.id!,
collection: preset.value.collection,
layout: preset.value.view_type,
layout: preset.value.layout,
name: preset.value.title,
scope: scope,
view_query: preset.value.view_query,
view_options: preset.value.view_options,
layout_query: preset.value.layout_query,
layout_options: preset.value.layout_options,
filters: preset.value.filters,
};
@@ -271,43 +271,43 @@ export default defineComponent({
};
});
const viewQuery = computed({
const layoutQuery = computed({
get() {
if (!values.value.view_query) return null;
if (!values.value.layout_query) return null;
if (!values.value.layout) return null;
return values.value.view_query[values.value.layout];
return values.value.layout_query[values.value.layout];
},
set(newQuery) {
edits.value = {
...edits.value,
view_query: {
...edits.value.view_query,
layout_query: {
...edits.value.layout_query,
[values.value.layout]: newQuery,
},
};
},
});
const viewOptions = computed({
const layoutOptions = computed({
get() {
if (!values.value.view_options) return null;
if (!values.value.layout_options) return null;
if (!values.value.layout) return null;
return values.value.view_options[values.value.layout];
return values.value.layout_options[values.value.layout];
},
set(newOptions) {
edits.value = {
...edits.value,
view_options: {
...edits.value.view_options,
layout_options: {
...edits.value.layout_options,
[values.value.layout]: newOptions,
},
};
},
});
return { edits, initialValues, values, viewQuery, viewOptions, hasEdits };
return { edits, initialValues, values, layoutQuery, layoutOptions, hasEdits };
}
function usePreset() {

165
app/src/modules/settings/routes/webhooks/browse.vue
View File

@@ -12,51 +12,8 @@
<settings-navigation />
</template>
<!--
<template #actions>
<v-dialog v-model="confirmDelete">
<template #activator="{ on }">
<v-button rounded icon class="action-delete" v-if="selection.length > 0" @click="on">
<v-icon name="delete" outline />
</v-button>
</template>
<v-card>
<v-card-title>{{ $tc('batch_delete_confirm', selection.length) }}</v-card-title>
<v-card-actions>
<v-button @click="confirmDelete = false" secondary>
{{ $t('cancel') }}
</v-button>
<v-button @click="batchDelete" class="action-delete" :loading="deleting">
{{ $t('delete') }}
</v-button>
</v-card-actions>
</v-card>
</v-dialog>
<v-button rounded icon class="action-batch" v-if="selection.length > 1" :to="batchLink">
<v-icon name="edit" outline />
</v-button>
<v-button rounded icon :to="addNewLink">
<v-icon name="add" />
</v-button>
</template>
<layout-tabular
class="layout"
ref="layout"
collection="directus_webhooks"
:selection.sync="selection"
:view-options.sync="viewOptions"
:view-query.sync="viewQuery"
/> -->
<div class="content">
<v-notice>
Pre-Release: Feature not yet available
</v-notice>
<v-notice>Pre-Release: Feature not yet available</v-notice>
</div>
<template #drawer>
@@ -70,14 +27,9 @@
</template>
<script lang="ts">
import { defineComponent, computed, ref } from '@vue/composition-api';
import { defineComponent } from '@vue/composition-api';
import SettingsNavigation from '../../components/navigation.vue';
import { i18n } from '@/lang';
import api from '@/api';
import { LayoutComponent } from '@/layouts/types';
import usePreset from '@/composables/use-preset';
import marked from 'marked';
import LayoutDrawerDetail from '@/views/private/components/layout-drawer-detail';
type Item = {
@@ -87,123 +39,10 @@ type Item = {
export default defineComponent({
name: 'webhooks-browse',
components: { SettingsNavigation, LayoutDrawerDetail },
props: {},
setup() {
const layout = ref<LayoutComponent | null>(null);
const selection = ref<Item[]>([]);
const { viewType, viewOptions, viewQuery } = usePreset(ref('directus_webhooks'));
const { addNewLink, batchLink } = useLinks();
const { confirmDelete, deleting, batchDelete } = useBatchDelete();
const { breadcrumb } = useBreadcrumb();
if (viewType.value === null) {
viewType.value = 'tabular';
}
if (viewOptions.value === null && viewType.value === 'tabular') {
viewOptions.value = {
widths: {
status: 50,
name: 120,
directus_action: 180,
collection: 220,
},
};
}
if (viewQuery.value === null && viewType.value === 'tabular') {
viewQuery.value = {
fields: ['status', 'name', 'directus_action', 'collection'],
};
}
return {
addNewLink,
batchLink,
selection,
breadcrumb,
confirmDelete,
batchDelete,
deleting,
layout,
viewOptions,
viewQuery,
marked,
};
function useBatchDelete() {
const confirmDelete = ref(false);
const deleting = ref(false);
return { confirmDelete, deleting, batchDelete };
async function batchDelete() {
deleting.value = true;
confirmDelete.value = false;
const batchPrimaryKeys = selection.value.map((item) => item.id).join();
await api.delete(`/settings/webhooks/${batchPrimaryKeys}`);
await layout.value?.refresh();
selection.value = [];
deleting.value = false;
confirmDelete.value = false;
}
}
function useLinks() {
const addNewLink = computed<string>(() => {
return `/settings/webhooks/+`;
});
const batchLink = computed<string>(() => {
const batchPrimaryKeys = selection.value.map((item) => item.id).join();
return `/settings/webhooks/${batchPrimaryKeys}`;
});
return { addNewLink, batchLink };
}
function useBreadcrumb() {
const breadcrumb = computed(() => {
return [
{
name: i18n.tc('collection', 2),
to: `/collections`,
},
];
});
return { breadcrumb };
}
},
});
</script>
<style lang="scss" scoped>
// .action-delete {
// --v-button-background-color: var(--danger-25);
// --v-button-color: var(--danger);
// --v-button-background-color-hover: var(--danger-50);
// --v-button-color-hover: var(--danger);
// }
// .action-batch {
// --v-button-background-color: var(--warning-25);
// --v-button-color: var(--warning);
// --v-button-background-color-hover: var(--warning-50);
// --v-button-color-hover: var(--warning);
// }
// .layout {
// --layout-offset-top: 64px;
// }
.header-icon {
--v-button-color-disabled: var(--warning);
--v-button-background-color-disabled: var(--warning-25);

24
app/src/modules/users/routes/browse.vue
View File

@@ -60,12 +60,12 @@
<component
class="layout"
ref="layout"
:is="`layout-${viewType}`"
ref="layoutRef"
:is="`layout-${layout}`"
collection="directus_users"
:selection.sync="selection"
:view-options.sync="viewOptions"
:view-query.sync="viewQuery"
:layout-options.sync="layoutOptions"
:layout-query.sync="layoutQuery"
:filters="_filters"
:search-query="searchQuery"
@update:filters="filters = $event"
@@ -95,7 +95,7 @@
<drawer-detail icon="info_outline" :title="$t('information')" close>
<div class="page-description" v-html="marked($t('page_help_users_browse'))" />
</drawer-detail>
<layout-drawer-detail @input="viewType = $event" :value="viewType" />
<layout-drawer-detail @input="layout = $event" :value="layout" />
<portal-target name="drawer" />
</template>
</private-view>
@@ -129,11 +129,11 @@ export default defineComponent({
},
setup(props) {
const { roles } = useNavigation();
const layout = ref<LayoutComponent | null>(null);
const layoutRef = ref<LayoutComponent | null>(null);
const selection = ref<Item[]>([]);
const { viewType, viewOptions, viewQuery, filters, searchQuery } = usePreset(ref('directus_users'));
const { layout, layoutOptions, layoutQuery, filters, searchQuery } = usePreset(ref('directus_users'));
const { addNewLink, batchLink } = useLinks();
const { confirmDelete, deleting, batchDelete } = useBatchDelete();
const { breadcrumb, title } = useBreadcrumb();
@@ -167,11 +167,11 @@ export default defineComponent({
confirmDelete,
deleting,
filters,
layout,
layoutRef,
selection,
viewOptions,
viewQuery,
viewType,
layoutOptions,
layoutQuery,
layout,
searchQuery,
marked,
clearFilters,
@@ -192,7 +192,7 @@ export default defineComponent({
await api.delete(`/users/${batchPrimaryKeys}`);
await layout.value?.refresh();
await layoutRef.value?.refresh();
selection.value = [];
deleting.value = false;

7
app/src/stores/presets.ts
View File

@@ -9,9 +9,9 @@ const defaultPreset: Omit<Preset, 'collection'> = {
user: null,
search_query: null,
filters: null,
view_type: null,
view_query: null,
view_options: null,
layout: null,
layout_query: null,
layout_options: null,
};
export const usePresetsStore = createStore({
@@ -186,7 +186,6 @@ export const usePresetsStore = createStore({
this.state.collectionPresets = this.state.collectionPresets.map((preset) => {
if (preset.id === response.data.data.id) {
console.log('replace');
return response.data.data;
}

6
app/src/types/presets.ts
View File

@@ -36,9 +36,9 @@ export type Preset = {
collection: string;
search_query: string | null;
filters: readonly Filter[] | null;
view_type: string | null;
view_query: { [view_type: string]: any } | null;
view_options: { [view_type: string]: any } | null;
layout: string | null;
layout_query: { [layout: string]: any } | null;
layout_options: { [layout: string]: any } | null;
// App flag to indicate that the local copy hasn't been saved to the API yet
$saved?: false;

6
app/src/views/private/components/layout-drawer-detail/layout-drawer-detail.vue
View File

@@ -1,7 +1,7 @@
<template>
<drawer-detail icon="layers" :title="$t('layout_options')">
<div class="option-label">{{ $t('layout') }}</div>
<v-select :items="layouts" item-text="name" item-value="id" v-model="viewType" />
<v-select :items="layouts" item-text="name" item-value="id" v-model="layout" />
<portal-target name="layout-options" class="layout-options" />
</drawer-detail>
</template>
@@ -28,7 +28,7 @@ export default defineComponent({
return layout;
});
const viewType = computed({
const layout = computed({
get() {
return props.value;
},
@@ -37,7 +37,7 @@ export default defineComponent({
},
});
return { currentLayout, layouts, viewType };
return { currentLayout, layouts, layout };
},
});
</script>

18
app/src/views/private/components/modal-browse/modal-browse.vue
View File

@@ -1,12 +1,12 @@
<template>
<v-modal v-model="_active" :title="$t('select_item')" no-padding>
<component
:is="`layout-${layout}`"
:is="`layout-${localLayout}`"
:collection="collection"
:selection="_selection"
:filters="filters"
:view-query.sync="query"
:view-options.sync="options"
:layout-query.sync="localQuery"
:layout-options.sync="localOptions"
@update:selection="onSelect"
select-mode
class="layout"
@@ -64,15 +64,15 @@ export default defineComponent({
const { collection } = toRefs(props);
const { info: collectionInfo } = useCollection(collection);
const { viewType, viewOptions, viewQuery } = usePreset(collection);
const { layout, layoutOptions, layoutQuery } = usePreset(collection);
// This is a local copy of the viewtype. This means that we can sync it the layout without
// This is a local copy of the layout. This means that we can sync it the layout without
// having use-preset auto-save the values
const layout = ref(viewType.value || 'tabular');
const options = ref(viewOptions.value);
const query = ref(viewQuery.value);
const localLayout = ref(layout.value || 'tabular');
const localOptions = ref(layoutOptions.value);
const localQuery = ref(layoutQuery.value);
return { save, cancel, _active, _selection, onSelect, layout, options, query, collectionInfo };
return { save, cancel, _active, _selection, onSelect, localLayout, localOptions, localQuery, collectionInfo };
function useActiveState() {
const localActive = ref(false);