From d0e897d735ed297258085a0603dfc843cc609d2a Mon Sep 17 00:00:00 2001 From: rijkvanzanten Date: Tue, 8 Sep 2020 11:22:18 -0400 Subject: [PATCH] Rename view -> layout in db --- api/src/database/seeds/system.yaml | 32 ++-- app/.storybook/mock-data/collections.json | 30 ++-- app/.storybook/mock-data/fields.json | 24 +-- app/src/composables/use-preset/types.ts | 6 +- app/src/composables/use-preset/use-preset.ts | 50 +++--- app/src/lang/af-ZA/index.json | 2 +- app/src/lang/af-ZA/interfaces.json | 12 +- app/src/lang/ar-SA/index.json | 2 +- app/src/lang/ar-SA/interfaces.json | 12 +- app/src/lang/ca-ES/index.json | 2 +- app/src/lang/ca-ES/interfaces.json | 12 +- app/src/lang/cs-CZ/index.json | 2 +- app/src/lang/cs-CZ/interfaces.json | 12 +- app/src/lang/da-DK/index.json | 2 +- app/src/lang/da-DK/interfaces.json | 12 +- app/src/lang/de-DE/index.json | 2 +- app/src/lang/de-DE/interfaces.json | 12 +- app/src/lang/el-GR/index.json | 2 +- app/src/lang/el-GR/interfaces.json | 12 +- app/src/lang/es-419/index.json | 2 +- app/src/lang/es-419/interfaces.json | 12 +- app/src/lang/es-CL/index.json | 2 +- app/src/lang/es-CL/interfaces.json | 12 +- app/src/lang/es-ES/index.json | 2 +- app/src/lang/es-ES/interfaces.json | 12 +- app/src/lang/fi-FI/index.json | 2 +- app/src/lang/fi-FI/interfaces.json | 12 +- app/src/lang/fr-FR/index.json | 2 +- app/src/lang/fr-FR/interfaces.json | 12 +- app/src/lang/he-IL/index.json | 2 +- app/src/lang/he-IL/interfaces.json | 12 +- app/src/lang/hu-HU/index.json | 2 +- app/src/lang/hu-HU/interfaces.json | 12 +- app/src/lang/id-ID/index.json | 2 +- app/src/lang/id-ID/interfaces.json | 12 +- app/src/lang/is-IS/index.json | 2 +- app/src/lang/is-IS/interfaces.json | 12 +- app/src/lang/it-IT/index.json | 2 +- app/src/lang/it-IT/interfaces.json | 12 +- app/src/lang/ja-JP/index.json | 2 +- app/src/lang/ja-JP/interfaces.json | 12 +- app/src/lang/ko-KR/index.json | 2 +- app/src/lang/ko-KR/interfaces.json | 12 +- app/src/lang/lt-LT/index.json | 2 +- app/src/lang/lt-LT/interfaces.json | 12 +- app/src/lang/ms-MY/index.json | 2 +- app/src/lang/ms-MY/interfaces.json | 12 +- app/src/lang/nl-NL/index.json | 2 +- app/src/lang/nl-NL/interfaces.json | 12 +- app/src/lang/no-NO/index.json | 2 +- app/src/lang/no-NO/interfaces.json | 12 +- app/src/lang/pl-PL/index.json | 2 +- app/src/lang/pl-PL/interfaces.json | 12 +- app/src/lang/pt-BR/index.json | 2 +- app/src/lang/pt-BR/interfaces.json | 12 +- app/src/lang/pt-PT/index.json | 2 +- app/src/lang/pt-PT/interfaces.json | 12 +- app/src/lang/ro-RO/index.json | 2 +- app/src/lang/ro-RO/interfaces.json | 12 +- app/src/lang/ru-RU/index.json | 2 +- app/src/lang/ru-RU/interfaces.json | 12 +- app/src/lang/sr-SP/index.json | 2 +- app/src/lang/sr-SP/interfaces.json | 12 +- app/src/lang/sv-SE/index.json | 2 +- app/src/lang/sv-SE/interfaces.json | 12 +- app/src/lang/tr-TR/index.json | 2 +- app/src/lang/tr-TR/interfaces.json | 12 +- app/src/lang/uk-UA/index.json | 2 +- app/src/lang/uk-UA/interfaces.json | 12 +- app/src/lang/vi-VN/index.json | 2 +- app/src/lang/vi-VN/interfaces.json | 12 +- app/src/lang/zh-CN/index.json | 2 +- app/src/lang/zh-CN/interfaces.json | 12 +- app/src/lang/zh-TW/index.json | 2 +- app/src/lang/zh-TW/interfaces.json | 12 +- app/src/layouts/cards/cards.vue | 46 ++--- app/src/layouts/tabular/tabular.vue | 60 +++---- app/src/modules/activity/routes/browse.vue | 21 +-- app/src/modules/collections/routes/browse.vue | 56 +++--- app/src/modules/collections/routes/detail.vue | 7 +- app/src/modules/files/routes/browse.vue | 24 +-- .../settings/routes/presets/browse/browse.vue | 6 +- .../settings/routes/presets/detail.vue | 48 ++--- .../settings/routes/webhooks/browse.vue | 165 +----------------- app/src/modules/users/routes/browse.vue | 24 +-- app/src/stores/presets.ts | 7 +- app/src/types/presets.ts | 6 +- .../layout-drawer-detail.vue | 6 +- .../components/modal-browse/modal-browse.vue | 18 +- 89 files changed, 486 insertions(+), 640 deletions(-) diff --git a/api/src/database/seeds/system.yaml b/api/src/database/seeds/system.yaml index d51e26ef0e..c6f7d3a9a3 100644 --- a/api/src/database/seeds/system.yaml +++ b/api/src/database/seeds/system.yaml @@ -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 diff --git a/app/.storybook/mock-data/collections.json b/app/.storybook/mock-data/collections.json index 8fd79dc1cc..29c7eab2fe 100644 --- a/app/.storybook/mock-data/collections.json +++ b/app/.storybook/mock-data/collections.json @@ -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, diff --git a/app/.storybook/mock-data/fields.json b/app/.storybook/mock-data/fields.json index 1b544bdbe1..1bffe614df 100644 --- a/app/.storybook/mock-data/fields.json +++ b/app/.storybook/mock-data/fields.json @@ -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, diff --git a/app/src/composables/use-preset/types.ts b/app/src/composables/use-preset/types.ts index baa49cb166..6b28d71146 100644 --- a/app/src/composables/use-preset/types.ts +++ b/app/src/composables/use-preset/types.ts @@ -14,8 +14,8 @@ export type Preset = { title: string | null; user: number | null; - view_options: Record; + layout_options: Record; - view_query: Record; - view_type: string | null; + layout_query: Record; + layout: string | null; }; diff --git a/app/src/composables/use-preset/use-preset.ts b/app/src/composables/use-preset/use-preset.ts index bef17c2505..a8544f9d58 100644 --- a/app/src/composables/use-preset/use-preset.ts +++ b/app/src/composables/use-preset/use-preset.ts @@ -57,19 +57,19 @@ export function usePreset(collection: Ref, bookmark: Ref initLocalPreset(); }); - const viewOptions = computed>({ + const layoutOptions = computed>({ 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, bookmark: Ref }, }); - const viewQuery = computed>({ + const layoutQuery = computed>({ 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, bookmark: Ref }, }); - const viewType = computed({ + const layout = computed({ 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, bookmark: Ref return { bookmarkExists, - viewType, - viewOptions, - viewQuery, + layout, + layoutOptions, + layoutQuery, filters, searchQuery, savePreset, @@ -173,9 +173,9 @@ export function usePreset(collection: Ref, bookmark: Ref 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, bookmark: Ref }; } - if (!localPreset.value.view_type) { + if (!localPreset.value.layout) { localPreset.value = { ...localPreset.value, - view_type: 'tabular', + layout: 'tabular', }; } diff --git a/app/src/lang/af-ZA/index.json b/app/src/lang/af-ZA/index.json index d338df1cde..32e2b1c0b1 100644 --- a/app/src/lang/af-ZA/index.json +++ b/app/src/lang/af-ZA/index.json @@ -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": { diff --git a/app/src/lang/af-ZA/interfaces.json b/app/src/lang/af-ZA/interfaces.json index 1a1390b9b0..e083af9c71 100644 --- a/app/src/lang/af-ZA/interfaces.json +++ b/app/src/lang/af-ZA/interfaces.json @@ -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", diff --git a/app/src/lang/ar-SA/index.json b/app/src/lang/ar-SA/index.json index e6c8fe6777..541d16d824 100644 --- a/app/src/lang/ar-SA/index.json +++ b/app/src/lang/ar-SA/index.json @@ -523,7 +523,7 @@ "values": "قيم", "version": "إصدار", "version_and_updates": "إصدار وتحديثات", - "view_type": "معاية كـ...", + "layout": "معاية كـ...", "visible_all_users": "مرئية لجميع المستخدمين", "webhook_count": "لاتوجد روابط ويب | رابط ويب | {count} روابط ويب", "weeks": { diff --git a/app/src/lang/ar-SA/interfaces.json b/app/src/lang/ar-SA/interfaces.json index f1cfc199a9..951e2cfa16 100644 --- a/app/src/lang/ar-SA/interfaces.json +++ b/app/src/lang/ar-SA/interfaces.json @@ -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", diff --git a/app/src/lang/ca-ES/index.json b/app/src/lang/ca-ES/index.json index b3f1181eb8..ede476512d 100644 --- a/app/src/lang/ca-ES/index.json +++ b/app/src/lang/ca-ES/index.json @@ -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": { diff --git a/app/src/lang/ca-ES/interfaces.json b/app/src/lang/ca-ES/interfaces.json index a9a42ce763..56ac88cbfe 100644 --- a/app/src/lang/ca-ES/interfaces.json +++ b/app/src/lang/ca-ES/interfaces.json @@ -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", diff --git a/app/src/lang/cs-CZ/index.json b/app/src/lang/cs-CZ/index.json index d611489a8d..b382263119 100644 --- a/app/src/lang/cs-CZ/index.json +++ b/app/src/lang/cs-CZ/index.json @@ -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": { diff --git a/app/src/lang/cs-CZ/interfaces.json b/app/src/lang/cs-CZ/interfaces.json index c50a34f399..a8b83ca4f1 100644 --- a/app/src/lang/cs-CZ/interfaces.json +++ b/app/src/lang/cs-CZ/interfaces.json @@ -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", diff --git a/app/src/lang/da-DK/index.json b/app/src/lang/da-DK/index.json index d338df1cde..32e2b1c0b1 100644 --- a/app/src/lang/da-DK/index.json +++ b/app/src/lang/da-DK/index.json @@ -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": { diff --git a/app/src/lang/da-DK/interfaces.json b/app/src/lang/da-DK/interfaces.json index 1a1390b9b0..e083af9c71 100644 --- a/app/src/lang/da-DK/interfaces.json +++ b/app/src/lang/da-DK/interfaces.json @@ -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", diff --git a/app/src/lang/de-DE/index.json b/app/src/lang/de-DE/index.json index 709c462acb..1c6b21d02c 100644 --- a/app/src/lang/de-DE/index.json +++ b/app/src/lang/de-DE/index.json @@ -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": { diff --git a/app/src/lang/de-DE/interfaces.json b/app/src/lang/de-DE/interfaces.json index 5a627222a6..55737b0248 100644 --- a/app/src/lang/de-DE/interfaces.json +++ b/app/src/lang/de-DE/interfaces.json @@ -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", diff --git a/app/src/lang/el-GR/index.json b/app/src/lang/el-GR/index.json index 052e88b636..6378262896 100644 --- a/app/src/lang/el-GR/index.json +++ b/app/src/lang/el-GR/index.json @@ -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": { diff --git a/app/src/lang/el-GR/interfaces.json b/app/src/lang/el-GR/interfaces.json index 9075e3713f..64ea746cac 100644 --- a/app/src/lang/el-GR/interfaces.json +++ b/app/src/lang/el-GR/interfaces.json @@ -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", diff --git a/app/src/lang/es-419/index.json b/app/src/lang/es-419/index.json index c7e3b4f9d7..1f1d6f5322 100644 --- a/app/src/lang/es-419/index.json +++ b/app/src/lang/es-419/index.json @@ -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": { diff --git a/app/src/lang/es-419/interfaces.json b/app/src/lang/es-419/interfaces.json index d03599441e..d1999d1fb0 100644 --- a/app/src/lang/es-419/interfaces.json +++ b/app/src/lang/es-419/interfaces.json @@ -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", diff --git a/app/src/lang/es-CL/index.json b/app/src/lang/es-CL/index.json index ae04efb923..541197aa97 100644 --- a/app/src/lang/es-CL/index.json +++ b/app/src/lang/es-CL/index.json @@ -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": { diff --git a/app/src/lang/es-CL/interfaces.json b/app/src/lang/es-CL/interfaces.json index da171ca279..fd4eaf590c 100644 --- a/app/src/lang/es-CL/interfaces.json +++ b/app/src/lang/es-CL/interfaces.json @@ -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", diff --git a/app/src/lang/es-ES/index.json b/app/src/lang/es-ES/index.json index 253e57c11e..7857338fbb 100644 --- a/app/src/lang/es-ES/index.json +++ b/app/src/lang/es-ES/index.json @@ -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": { diff --git a/app/src/lang/es-ES/interfaces.json b/app/src/lang/es-ES/interfaces.json index da171ca279..fd4eaf590c 100644 --- a/app/src/lang/es-ES/interfaces.json +++ b/app/src/lang/es-ES/interfaces.json @@ -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", diff --git a/app/src/lang/fi-FI/index.json b/app/src/lang/fi-FI/index.json index d338df1cde..32e2b1c0b1 100644 --- a/app/src/lang/fi-FI/index.json +++ b/app/src/lang/fi-FI/index.json @@ -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": { diff --git a/app/src/lang/fi-FI/interfaces.json b/app/src/lang/fi-FI/interfaces.json index 1a1390b9b0..e083af9c71 100644 --- a/app/src/lang/fi-FI/interfaces.json +++ b/app/src/lang/fi-FI/interfaces.json @@ -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", diff --git a/app/src/lang/fr-FR/index.json b/app/src/lang/fr-FR/index.json index 14bcbb4cab..1fc1ed5d51 100644 --- a/app/src/lang/fr-FR/index.json +++ b/app/src/lang/fr-FR/index.json @@ -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": { diff --git a/app/src/lang/fr-FR/interfaces.json b/app/src/lang/fr-FR/interfaces.json index a172f1c82e..b0d84eb00b 100644 --- a/app/src/lang/fr-FR/interfaces.json +++ b/app/src/lang/fr-FR/interfaces.json @@ -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", diff --git a/app/src/lang/he-IL/index.json b/app/src/lang/he-IL/index.json index f28e94c47f..02bcb98efa 100644 --- a/app/src/lang/he-IL/index.json +++ b/app/src/lang/he-IL/index.json @@ -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": { diff --git a/app/src/lang/he-IL/interfaces.json b/app/src/lang/he-IL/interfaces.json index 1a1390b9b0..e083af9c71 100644 --- a/app/src/lang/he-IL/interfaces.json +++ b/app/src/lang/he-IL/interfaces.json @@ -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", diff --git a/app/src/lang/hu-HU/index.json b/app/src/lang/hu-HU/index.json index cf22b00a14..1e6b99af7b 100644 --- a/app/src/lang/hu-HU/index.json +++ b/app/src/lang/hu-HU/index.json @@ -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": { diff --git a/app/src/lang/hu-HU/interfaces.json b/app/src/lang/hu-HU/interfaces.json index d4beec0c7b..a289fc748b 100644 --- a/app/src/lang/hu-HU/interfaces.json +++ b/app/src/lang/hu-HU/interfaces.json @@ -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", diff --git a/app/src/lang/id-ID/index.json b/app/src/lang/id-ID/index.json index 5a8d57b06d..1a736068c2 100644 --- a/app/src/lang/id-ID/index.json +++ b/app/src/lang/id-ID/index.json @@ -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": { diff --git a/app/src/lang/id-ID/interfaces.json b/app/src/lang/id-ID/interfaces.json index d7eeedc3ae..73169ca987 100644 --- a/app/src/lang/id-ID/interfaces.json +++ b/app/src/lang/id-ID/interfaces.json @@ -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", diff --git a/app/src/lang/is-IS/index.json b/app/src/lang/is-IS/index.json index 31b5367970..82e199fd33 100644 --- a/app/src/lang/is-IS/index.json +++ b/app/src/lang/is-IS/index.json @@ -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": { diff --git a/app/src/lang/is-IS/interfaces.json b/app/src/lang/is-IS/interfaces.json index 1a1390b9b0..e083af9c71 100644 --- a/app/src/lang/is-IS/interfaces.json +++ b/app/src/lang/is-IS/interfaces.json @@ -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", diff --git a/app/src/lang/it-IT/index.json b/app/src/lang/it-IT/index.json index 1a3936b369..f55cfa099f 100644 --- a/app/src/lang/it-IT/index.json +++ b/app/src/lang/it-IT/index.json @@ -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": { diff --git a/app/src/lang/it-IT/interfaces.json b/app/src/lang/it-IT/interfaces.json index 0011a889b5..eca55009e0 100644 --- a/app/src/lang/it-IT/interfaces.json +++ b/app/src/lang/it-IT/interfaces.json @@ -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", diff --git a/app/src/lang/ja-JP/index.json b/app/src/lang/ja-JP/index.json index 11e565302e..ae641eb406 100644 --- a/app/src/lang/ja-JP/index.json +++ b/app/src/lang/ja-JP/index.json @@ -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": { diff --git a/app/src/lang/ja-JP/interfaces.json b/app/src/lang/ja-JP/interfaces.json index 9d460232c2..d65157e298 100644 --- a/app/src/lang/ja-JP/interfaces.json +++ b/app/src/lang/ja-JP/interfaces.json @@ -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", diff --git a/app/src/lang/ko-KR/index.json b/app/src/lang/ko-KR/index.json index d338df1cde..32e2b1c0b1 100644 --- a/app/src/lang/ko-KR/index.json +++ b/app/src/lang/ko-KR/index.json @@ -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": { diff --git a/app/src/lang/ko-KR/interfaces.json b/app/src/lang/ko-KR/interfaces.json index 1a1390b9b0..e083af9c71 100644 --- a/app/src/lang/ko-KR/interfaces.json +++ b/app/src/lang/ko-KR/interfaces.json @@ -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", diff --git a/app/src/lang/lt-LT/index.json b/app/src/lang/lt-LT/index.json index d31c4b9182..21e81ef387 100644 --- a/app/src/lang/lt-LT/index.json +++ b/app/src/lang/lt-LT/index.json @@ -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": { diff --git a/app/src/lang/lt-LT/interfaces.json b/app/src/lang/lt-LT/interfaces.json index 82309e5400..75b9752809 100644 --- a/app/src/lang/lt-LT/interfaces.json +++ b/app/src/lang/lt-LT/interfaces.json @@ -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", diff --git a/app/src/lang/ms-MY/index.json b/app/src/lang/ms-MY/index.json index 45faab7ffa..5f1d69b10b 100644 --- a/app/src/lang/ms-MY/index.json +++ b/app/src/lang/ms-MY/index.json @@ -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": { diff --git a/app/src/lang/ms-MY/interfaces.json b/app/src/lang/ms-MY/interfaces.json index 3d9b445cf5..e24a07e9ba 100644 --- a/app/src/lang/ms-MY/interfaces.json +++ b/app/src/lang/ms-MY/interfaces.json @@ -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", diff --git a/app/src/lang/nl-NL/index.json b/app/src/lang/nl-NL/index.json index fa4ef9c02e..67abab21fc 100644 --- a/app/src/lang/nl-NL/index.json +++ b/app/src/lang/nl-NL/index.json @@ -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": { diff --git a/app/src/lang/nl-NL/interfaces.json b/app/src/lang/nl-NL/interfaces.json index 8ad8c93287..facfdb2f47 100644 --- a/app/src/lang/nl-NL/interfaces.json +++ b/app/src/lang/nl-NL/interfaces.json @@ -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", diff --git a/app/src/lang/no-NO/index.json b/app/src/lang/no-NO/index.json index 81c3580b46..b22aac9353 100644 --- a/app/src/lang/no-NO/index.json +++ b/app/src/lang/no-NO/index.json @@ -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": { diff --git a/app/src/lang/no-NO/interfaces.json b/app/src/lang/no-NO/interfaces.json index 0773cc1d37..27cd6b3f83 100644 --- a/app/src/lang/no-NO/interfaces.json +++ b/app/src/lang/no-NO/interfaces.json @@ -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", diff --git a/app/src/lang/pl-PL/index.json b/app/src/lang/pl-PL/index.json index 8334b8d5e9..4a78cc3f94 100644 --- a/app/src/lang/pl-PL/index.json +++ b/app/src/lang/pl-PL/index.json @@ -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": { diff --git a/app/src/lang/pl-PL/interfaces.json b/app/src/lang/pl-PL/interfaces.json index b7b9da8e51..d5b8baf4ee 100644 --- a/app/src/lang/pl-PL/interfaces.json +++ b/app/src/lang/pl-PL/interfaces.json @@ -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", diff --git a/app/src/lang/pt-BR/index.json b/app/src/lang/pt-BR/index.json index 4a605f4872..97076ac832 100644 --- a/app/src/lang/pt-BR/index.json +++ b/app/src/lang/pt-BR/index.json @@ -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": { diff --git a/app/src/lang/pt-BR/interfaces.json b/app/src/lang/pt-BR/interfaces.json index 22a62959eb..6ec15b5941 100644 --- a/app/src/lang/pt-BR/interfaces.json +++ b/app/src/lang/pt-BR/interfaces.json @@ -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", diff --git a/app/src/lang/pt-PT/index.json b/app/src/lang/pt-PT/index.json index 699229119d..53fb321538 100644 --- a/app/src/lang/pt-PT/index.json +++ b/app/src/lang/pt-PT/index.json @@ -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": { diff --git a/app/src/lang/pt-PT/interfaces.json b/app/src/lang/pt-PT/interfaces.json index fa77f6a4f4..739f63bd63 100644 --- a/app/src/lang/pt-PT/interfaces.json +++ b/app/src/lang/pt-PT/interfaces.json @@ -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", diff --git a/app/src/lang/ro-RO/index.json b/app/src/lang/ro-RO/index.json index a8060cd3a6..1f9fa1b84d 100644 --- a/app/src/lang/ro-RO/index.json +++ b/app/src/lang/ro-RO/index.json @@ -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": { diff --git a/app/src/lang/ro-RO/interfaces.json b/app/src/lang/ro-RO/interfaces.json index 50f8b15b5f..4886bc49bf 100644 --- a/app/src/lang/ro-RO/interfaces.json +++ b/app/src/lang/ro-RO/interfaces.json @@ -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", diff --git a/app/src/lang/ru-RU/index.json b/app/src/lang/ru-RU/index.json index afe5399255..5dce0b87f2 100644 --- a/app/src/lang/ru-RU/index.json +++ b/app/src/lang/ru-RU/index.json @@ -523,7 +523,7 @@ "values": "Значения", "version": "Версия", "version_and_updates": "Версия и Обновления", - "view_type": "Посмотреть как...", + "layout": "Посмотреть как...", "visible_all_users": "Видно всем пользователям", "webhook_count": "Нет вебхуков | 1 вебхук | {count} вебхуков", "weeks": { diff --git a/app/src/lang/ru-RU/interfaces.json b/app/src/lang/ru-RU/interfaces.json index 130fac9040..7d3c3c80ff 100644 --- a/app/src/lang/ru-RU/interfaces.json +++ b/app/src/lang/ru-RU/interfaces.json @@ -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": "Принимать типы файлов", diff --git a/app/src/lang/sr-SP/index.json b/app/src/lang/sr-SP/index.json index b1eda43556..559d8380e7 100644 --- a/app/src/lang/sr-SP/index.json +++ b/app/src/lang/sr-SP/index.json @@ -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": { diff --git a/app/src/lang/sr-SP/interfaces.json b/app/src/lang/sr-SP/interfaces.json index 32029496d1..638afbf377 100644 --- a/app/src/lang/sr-SP/interfaces.json +++ b/app/src/lang/sr-SP/interfaces.json @@ -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", diff --git a/app/src/lang/sv-SE/index.json b/app/src/lang/sv-SE/index.json index 2bf9c35ad3..8d01f4681f 100644 --- a/app/src/lang/sv-SE/index.json +++ b/app/src/lang/sv-SE/index.json @@ -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": { diff --git a/app/src/lang/sv-SE/interfaces.json b/app/src/lang/sv-SE/interfaces.json index bafb22852e..8c811eb7a8 100644 --- a/app/src/lang/sv-SE/interfaces.json +++ b/app/src/lang/sv-SE/interfaces.json @@ -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", diff --git a/app/src/lang/tr-TR/index.json b/app/src/lang/tr-TR/index.json index 60bafbfd0a..c0f7530183 100644 --- a/app/src/lang/tr-TR/index.json +++ b/app/src/lang/tr-TR/index.json @@ -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": { diff --git a/app/src/lang/tr-TR/interfaces.json b/app/src/lang/tr-TR/interfaces.json index f2ffcfb7f0..67f40135a4 100644 --- a/app/src/lang/tr-TR/interfaces.json +++ b/app/src/lang/tr-TR/interfaces.json @@ -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", diff --git a/app/src/lang/uk-UA/index.json b/app/src/lang/uk-UA/index.json index 05c6777672..eb3359c280 100644 --- a/app/src/lang/uk-UA/index.json +++ b/app/src/lang/uk-UA/index.json @@ -523,7 +523,7 @@ "values": "Значення", "version": "Версія", "version_and_updates": "Версія та оновлення", - "view_type": "Переглянути як...", + "layout": "Переглянути як...", "visible_all_users": "Видимі для всіх користувачів", "webhook_count": "Немає Вебхуків | Один Вебхук | {count} вебхуків", "weeks": { diff --git a/app/src/lang/uk-UA/interfaces.json b/app/src/lang/uk-UA/interfaces.json index 0ab3d65f58..469132c917 100644 --- a/app/src/lang/uk-UA/interfaces.json +++ b/app/src/lang/uk-UA/interfaces.json @@ -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", diff --git a/app/src/lang/vi-VN/index.json b/app/src/lang/vi-VN/index.json index 87d19dcf02..05820cdd69 100644 --- a/app/src/lang/vi-VN/index.json +++ b/app/src/lang/vi-VN/index.json @@ -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": { diff --git a/app/src/lang/vi-VN/interfaces.json b/app/src/lang/vi-VN/interfaces.json index 1a1390b9b0..e083af9c71 100644 --- a/app/src/lang/vi-VN/interfaces.json +++ b/app/src/lang/vi-VN/interfaces.json @@ -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", diff --git a/app/src/lang/zh-CN/index.json b/app/src/lang/zh-CN/index.json index 862deeb736..5f3ef7ec64 100644 --- a/app/src/lang/zh-CN/index.json +++ b/app/src/lang/zh-CN/index.json @@ -523,7 +523,7 @@ "values": "值", "version": "版本", "version_and_updates": "版本与升级", - "view_type": "查看为...", + "layout": "查看为...", "visible_all_users": "所有用户可见", "webhook_count": "没有Webhook | 1个Webhook | {count} 个Webhook", "weeks": { diff --git a/app/src/lang/zh-CN/interfaces.json b/app/src/lang/zh-CN/interfaces.json index 04647f781b..d6df8f2be2 100644 --- a/app/src/lang/zh-CN/interfaces.json +++ b/app/src/lang/zh-CN/interfaces.json @@ -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": "允许的文件类型", diff --git a/app/src/lang/zh-TW/index.json b/app/src/lang/zh-TW/index.json index 1b63bf9d90..c948ba307f 100644 --- a/app/src/lang/zh-TW/index.json +++ b/app/src/lang/zh-TW/index.json @@ -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": { diff --git a/app/src/lang/zh-TW/interfaces.json b/app/src/lang/zh-TW/interfaces.json index d149da4ee2..9ed725d6d1 100644 --- a/app/src/lang/zh-TW/interfaces.json +++ b/app/src/lang/zh-TW/interfaces.json @@ -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", diff --git a/app/src/layouts/cards/cards.vue b/app/src/layouts/cards/cards.vue index 9c63c52dba..04b573207a 100644 --- a/app/src/layouts/cards/cards.vue +++ b/app/src/layouts/cards/cards.vue @@ -133,7 +133,7 @@ import { clone } from 'lodash'; type Item = Record; -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, default: undefined, }, - viewOptions: { - type: Object as PropType, + layoutOptions: { + type: Object as PropType, default: null, }, - viewQuery: { - type: Object as PropType, + layoutQuery: { + type: Object as PropType, default: null, }, filters: { @@ -195,8 +195,8 @@ export default defineComponent({ const mainElement = inject('main-element', ref(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('size', 4); const icon = createViewOption('icon', 'box'); const title = createViewOption('title', null); @@ -312,14 +312,14 @@ export default defineComponent({ return { size, icon, imageSource, title, subtitle, imageFit }; - function createViewOption(key: keyof ViewOptions, defaultValue: any) { + function createViewOption(key: keyof layoutOptions, defaultValue: any) { return computed({ 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('sort', availableFields.value[0].field); - const limit = createViewQueryOption('limit', 25); + const sort = createlayoutQueryOption('sort', availableFields.value[0].field); + const limit = createlayoutQueryOption('limit', 25); const fields = computed(() => { if (!primaryKeyField.value) return []; @@ -369,15 +369,15 @@ export default defineComponent({ return { sort, limit, page, fields }; - function createViewQueryOption(key: keyof ViewQuery, defaultValue: any) { + function createlayoutQueryOption(key: keyof layoutQuery, defaultValue: any) { return computed({ 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, }; }, diff --git a/app/src/layouts/tabular/tabular.vue b/app/src/layouts/tabular/tabular.vue index 97f38a1eb9..183f3d42d9 100644 --- a/app/src/layouts/tabular/tabular.vue +++ b/app/src/layouts/tabular/tabular.vue @@ -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, default: undefined, }, - viewOptions: { - type: Object as PropType, + layoutOptions: { + type: Object as PropType, default: () => ({}), }, - viewQuery: { - type: Object as PropType, + layoutQuery: { + type: Object as PropType, default: () => ({}), }, filters: { @@ -215,8 +215,8 @@ export default defineComponent({ const mainElement = inject('main-element', ref(null)); const _selection = useSync(props, 'selection', emit); - const _viewOptions: Ref = useSync(props, 'viewOptions', emit); - const _viewQuery: Ref = useSync(props, 'viewQuery', emit); + const _layoutOptions: Ref = useSync(props, 'layoutOptions', emit); + const _layoutQuery: Ref = 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, }; }, diff --git a/app/src/modules/activity/routes/browse.vue b/app/src/modules/activity/routes/browse.vue index 7d57878547..067c48aed4 100644 --- a/app/src/modules/activity/routes/browse.vue +++ b/app/src/modules/activity/routes/browse.vue @@ -20,11 +20,10 @@
- + @@ -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(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, diff --git a/app/src/modules/collections/routes/browse.vue b/app/src/modules/collections/routes/browse.vue index 16be7d057d..b52dcaea7f 100644 --- a/app/src/modules/collections/routes/browse.vue +++ b/app/src/modules/collections/routes/browse.vue @@ -29,7 +29,12 @@ - + @@ -271,7 +276,7 @@ export default defineComponent({ setup(props) { const userStore = useUserStore(); const permissionsStore = usePermissionsStore(); - const layout = ref(null); + const layoutRef = ref(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); + } } diff --git a/app/src/modules/collections/routes/detail.vue b/app/src/modules/collections/routes/detail.vue index 6764179fee..4b36a144e7 100644 --- a/app/src/modules/collections/routes/detail.vue +++ b/app/src/modules/collections/routes/detail.vue @@ -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() { diff --git a/app/src/modules/files/routes/browse.vue b/app/src/modules/files/routes/browse.vue index b6829b2655..da5050b0b6 100644 --- a/app/src/modules/files/routes/browse.vue +++ b/app/src/modules/files/routes/browse.vue @@ -93,12 +93,12 @@
- + @@ -175,12 +175,12 @@ export default defineComponent({ }, setup(props) { const { folders } = useFolders(); - const layout = ref(null); + const layoutRef = ref(null); const selection = ref([]); 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() { diff --git a/app/src/modules/settings/routes/presets/browse/browse.vue b/app/src/modules/settings/routes/presets/browse/browse.vue index a94077c99e..df18aa9d0c 100644 --- a/app/src/modules/settings/routes/presets/browse/browse.vue +++ b/app/src/modules/settings/routes/presets/browse/browse.vue @@ -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, }, diff --git a/app/src/modules/settings/routes/presets/detail.vue b/app/src/modules/settings/routes/presets/detail.vue index 2bb4329321..c0830bdba6 100644 --- a/app/src/modules/settings/routes/presets/detail.vue +++ b/app/src/modules/settings/routes/presets/detail.vue @@ -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 | null; + layout_query: Record | null; - view_options: Record | null; + layout_options: Record | 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() { diff --git a/app/src/modules/settings/routes/webhooks/browse.vue b/app/src/modules/settings/routes/webhooks/browse.vue index e29c96c2ac..2e9b58f4ee 100644 --- a/app/src/modules/settings/routes/webhooks/browse.vue +++ b/app/src/modules/settings/routes/webhooks/browse.vue @@ -12,51 +12,8 @@ - -
- - Pre-Release: Feature not yet available - + Pre-Release: Feature not yet available