Merge branch 'main' into aggregation

api/package.json

@@ -97,7 +97,7 @@
 		"exif-reader": "^1.0.3",
 		"express": "^4.17.1",
 		"express-pino-logger": "^6.0.0",
-		"express-session": "^1.17.1",
+		"express-session": "^1.17.2",
 		"fs-extra": "^9.1.0",
 		"grant": "^5.4.14",
 		"graphql": "^15.5.0",
@@ -128,7 +128,7 @@
 		"qs": "^6.9.4",
 		"rate-limiter-flexible": "^2.2.2",
 		"resolve-cwd": "^3.0.0",
-		"sharp": "^0.27.1",
+		"sharp": "^0.28.3",
 		"stream-json": "^1.7.1",
 		"uuid": "^8.3.2",
 		"uuid-validate": "0.0.3"

api/src/env.ts

@@ -48,7 +48,7 @@ const defaults: Record<string, any> = {
 
 	CACHE_ENABLED: false,
 	CACHE_STORE: 'memory',
-	CACHE_TTL: '30m',
+	CACHE_TTL: '10m',
 	CACHE_NAMESPACE: 'system-cache',
 	CACHE_AUTO_PURGE: false,
 

app/package.json

@@ -42,7 +42,7 @@
 		"@types/codemirror": "^0.0.109",
 		"@types/color": "^3.0.1",
 		"@types/diff": "^5.0.0",
-		"@types/dompurify": "^2.2.1",
+		"@types/dompurify": "^2.2.2",
 		"@types/lodash": "^4.14.170",
 		"@types/markdown-it": "^12.0.1",
 		"@types/marked": "^2.0.2",
@@ -52,7 +52,7 @@
 		"@types/tiny-async-pool": "^1.0.0",
 		"@vue/cli-plugin-babel": "^4.5.13",
 		"@vue/cli-plugin-router": "^4.5.8",
-		"@vue/cli-plugin-typescript": "^4.5.8",
+		"@vue/cli-plugin-typescript": "^4.5.13",
 		"@vue/cli-plugin-vuex": "^4.5.8",
 		"@vue/cli-service": "^4.5.13",
 		"@vue/composition-api": "^0.6.7",
@@ -79,16 +79,16 @@
 		"pretty-ms": "^7.0.1",
 		"qrcode": "^1.4.4",
 		"raw-loader": "^4.0.2",
-		"resize-observer": "^1.0.0",
+		"resize-observer": "^1.0.2",
 		"rimraf": "^3.0.2",
-		"sass": "^1.32.13",
+		"sass": "^1.34.0",
 		"sass-loader": "^9.0.2",
 		"stylelint": "^13.13.1",
 		"tiny-async-pool": "^1.2.0",
-		"tinymce": "^5.5.1",
+		"tinymce": "^5.8.1",
 		"vue": "^2.6.12",
 		"vue-cli-plugin-yaml": "^1.0.2",
-		"vue-i18n": "^8.22.1",
+		"vue-i18n": "^8.24.4",
 		"vue-loader": "^15.9.3",
 		"vue-router": "^3.4.8",
 		"vue-template-compiler": "^2.6.10",

app/src/lang/translations/et-EE.yaml

@@ -22,6 +22,7 @@ create_webhook: Loo veebikonks
 invite_users: Kutsu kasutajaid
 email_examples: 'admin@example.com, user@example.com...'
 invite: Kutsu
+email_already_invited: Meilile "{email}" on kutse juba saadetud
 emails: E-mail
 connection_excellent: Suurepärane ühendus
 connection_good: Hea ühendus
@@ -83,6 +84,8 @@ validationError:
 all_access: Ligipääs kõigele
 no_access: Ei ole ligipääsu
 use_custom: Kasuta kohandatud
+nullable: Nullitav
+allow_null_value: Luba NULL väärtus
 field_standard: Standard
 field_presentation: Kujundus ja aliased
 field_file: Üksik fail
@@ -137,11 +140,13 @@ decimal: Decimal
 float: Float
 integer: Integer
 json: JSON
+xml: XML
 string: String
 text: Tekst
 time: Kellaaeg
 timestamp: Timestamp
 uuid: UUID
+hash: Hash (räsi)
 not_available_for_type: Pole selle tüübi korral saadaval
 create_translations: Lisa tõlkeid
 auto_refresh: Automaatne värskendamine
@@ -312,6 +317,9 @@ save_and_create_new: Salvesta ja Lisa Uus
 save_and_stay: Salvesta ja jää
 save_as_copy: Salvesta koopiana
 add_existing: Lisa olemasolev
+creating_items: Kirjete loomine
+enable_create_button: Luba lisamise nupp
+enable_select_button: Luba valimise nupp
 comments: Kommentaarid
 no_comments: Kommentaarid puuduvad
 click_to_expand: Kliki suurendamiseks
@@ -326,6 +334,7 @@ interface_not_found: '"{interface}" liidest ei leitud.'
 reset_interface: Nulli liides
 display_not_found: 'Vaadet "{display}" ei leitud.'
 reset_display: Nulli vaade
+list-m2a: Ehitaja (M2A)
 item_count: 'Kirjeid pole | Üks kirje | {count} kirjed'
 no_items_copy: Selles kogus pole veel ühtegi kiret.
 file_count: 'Faile pole | Leiti 1 fail | {count} faili'
@@ -362,7 +371,7 @@ file_moved: Fail on liigutatud
 collection_created: Andmekogu on lisatud
 modified_on: Muudetud
 card_size: Kaardi suurus
-sort_field: Sorteeti välja
+sort_field: Sorteerimisväli
 add_sort_field: "Lisa sorteerimisväli\n"
 sort: Sorteeri
 status: Staatus
@@ -392,6 +401,8 @@ errors:
   ITEM_NOT_FOUND: Kirjet ei leitud
   ROUTE_NOT_FOUND: Ei leitud
   RECORD_NOT_UNIQUE: Kirje pole unikaalne
+  USER_SUSPENDED: Kasutajakonto on suletud
+  CONTAINS_NULL_VALUES: Väli sisaldab tühje väärtusi
   UNKNOWN: Ootamatu viga
   INTERNAL_SERVER_ERROR: Ootamatu viga
 value_hashed: Väärtus salastati
@@ -425,6 +436,7 @@ one_item: '1 kirje'
 one_filtered_item: '1 filtreeritud kirje'
 delete_collection_are_you_sure: >-
   Kas sa kindlasti soovid selle andmekogu täielikult kustutada? Seda ei saa hiljem enam taastada!
+collections_shown: Nähtavad andmekogud
 visible_collections: Nähtavad andmekogud
 hidden_collections: Peidetud andmekogud
 show_hidden_collections: Näita peidetud andmekogusid
@@ -468,6 +480,8 @@ operators:
   has: Sisaldab neid võtmeid
 loading: Laadimine...
 drop_to_upload: Lohista üleslaadimiseks
+item: Kirje
+items: Kirjed
 upload_file: Lae fail üles
 upload_file_indeterminate: Laen faili...
 upload_file_success: Fail on laetud
@@ -485,6 +499,8 @@ value_unique: Väärtus peab olema unikaalne
 all_activity: Kõik tegevused
 create_item: Loo kirje
 display_template: Vaate mall
+language_display_template: Keele templiit
+translations_display_template: Tõlgete templiit
 n_items_selected: 'Kirjeid pole valitud | Valitud 1 kirje | {n} kirjet valitud'
 per_page: Lehe kohta
 all_files: Kõik failid
@@ -523,8 +539,10 @@ height: Kõrgus
 source: Allikas
 url_placeholder: Sisesta URL
 display_text: Kuva teksti
+display_text_placeholder: Sisesta kuvamise tekst...
 tooltip: Vihje
 tooltip_placeholder: Sisesta vihje...
+unlimited: Piiramatu
 open_link_in: Ava link
 new_tab: Uus vahekaart
 current_tab: Praegune vahekaart
@@ -571,18 +589,45 @@ wysiwyg_options:
   removeformat: Eemalda vormistus
   selectall: Vali Kõik
   table: Tabel
+  visualaid: Vaata peidetud elemente
+  source_code: Muuda lähtekoodi
   fullscreen: Täisekraan
+  directionality: Suund
 dropdown: Rippmenüü
 choices: Valikud
+choices_option_configured_incorrectly: Valikud pole korrektselt seadistatud
 deselect: Tühista valik
+deselect_all: Tühista kõik valikud
+other: Muu...
+adding_user: Kasutaja lisamine
+unknown_user: Tundmatu kasutaja
+creating_in: 'Kirje loomine: {collection}'
+editing_in: 'Kirje muutmine: {collection}'
+creating_unit: 'Lisa {unit}'
+editing_unit: '{unit} muutmine'
 editing_in_batch: '{count} kirje hulgi muutmine'
+no_options_available: Valikud puuduvad
+settings_data_model: Andmemudel
 settings_permissions: Rollid ja õigused
 settings_project: Projekti seaded
 settings_webhooks: Webhooks
+settings_presets: Eelseaded ja järjehoidjad
+one_or_more_options_are_missing: Üks või mitu valikut puuduvad
+scope: Ulatus
+select: Vali...
+layout: Paigutus
+tree_view: Puuvaade
+changes_are_permanent: Muudatused on lõplikud
+preset_name_placeholder: Toimib vaikeväärtusena, kui puudub...
+preset_search_placeholder: Otsingupäring...
+editing_preset: Muuda eelseadistust
+layout_preview: Paigutuse eelvaade
+layout_setup: Paigutuse seadistus
 unsaved_changes: Salvestamata muudatused
 unsaved_changes_copy: Oled sa kindel, et soovid sellelt lehelt lahkuda?
 discard_changes: Loobu muudatustest
 keep_editing: Jätka muutmist
+page_help_collections_overview: '**Andmekogude ülevaade** — Nimekiri andmekogudest, millele sul on ligipääs'
 add_new: Lisa uus
 create_new: Loo Uus
 all: Kõik
@@ -607,14 +652,18 @@ fields:
     note: Märkus
     display_template: Vaate mall
     hidden: Peidetud
-    sort_field: Sorteeti välja
+    sort_field: Sorteerimisväli
   directus_files:
     title: Pealkiri
     description: Kirjeldus
     tags: Sildid
     location: Asukoht
+    filename_disk: Failinimi (kettal)
+    filename_download: Faili nimi (alla laadimisel)
     metadata: Metaandmed
+    type: MIME tüüp
     filesize: Failisuurus
+    modified_by: Muutja
     modified_on: Muudetud
     created_on: Loodud
     created_by: Autor
@@ -641,10 +690,20 @@ fields:
     tfa_secret: Kaheastmeline autentimine
     status: Staatus
     role: Roll
+    token: Kontrollkood
     last_page: Viimane leht
     last_access: Viimati vaadatud
   directus_settings:
     project_name: Projekti nimi
+    project_url: Projekti URL
+    project_color: Projekti värv
+    project_logo: Projekti logo
+    public_foreground: Avalik põhivärv
+    public_background: Avalik taustavärv
+    public_note: Avalik märkus
+    auth_password_policy: Salasõna reeglid
+    auth_login_attempts: Sisselogimise katseid
+    custom_css: Kohandatud CSS
   directus_fields:
     note: Märkus
     hidden: Peidetud
@@ -653,6 +712,11 @@ fields:
   directus_roles:
     name: Rolli nimi
     description: Kirjeldus
+field_options:
+  directus_collections:
+    track_activity_revisions: Salvesta muudatuste statistika
+block: Blokeeri
+inline: Tekstisisene
 comment: Kommentaar
 continue: Continue
 default: Vaikimisi
@@ -694,8 +758,10 @@ sign_out: Logi välja
 sign_out_confirm: Kas oled kindel, et soovid välja logida?
 something_went_wrong: Midagi läks valesti.
 sort_direction: Sorteerimise suund
+sort_asc: Sorteeri kasvavalt
+sort_desc: Sorteeri kahanevalt
 template: Mall
-translation: Tõlkija
+translation: Tõlge
 value: Väärtus
 interfaces:
   presentation-links:
@@ -722,6 +788,8 @@ interfaces:
     file: Fail
   files:
     files: Failid
+  input-hash:
+    hash: Hash (räsi)
   select-icon:
     icon: Ikoon
   system-interface:

app/src/lang/translations/fr-FR.yaml

@@ -503,6 +503,8 @@ value_unique: La valeur doit être unique
 all_activity: Toutes les activités
 create_item: Créer un élément
 display_template: Modèle d'affichage
+language_display_template: Modèle d'affichage de la langue
+translations_display_template: Modèle d'affichage des traductions
 n_items_selected: 'Aucun élément sélectionné | 1 élément sélectionné | {n} éléments sélectionnés'
 per_page: Par page
 all_files: Tous les fichiers
@@ -784,6 +786,14 @@ save_current_datetime: Enregistrer la date/heure actuelle
 block: Bloc
 inline: En ligne
 comment: Commentaire
+relational_triggers: Déclencheurs relationnels
+referential_action_field_label_m2o: Lors de la suppression d'un(e) {collection} ...
+referential_action_field_label_o2m: Lors de la dé-sélection d'un(e) {collection} ...
+referential_action_no_action: Empêcher la suppression
+referential_action_cascade: Supprimer l'objet {collection} (cascade)
+referential_action_set_null: Vider le champ {field}
+referential_action_set_default: Remettre {field} à sa valeur par défaut
+choose_action: Choisir une action
 continue: Continuer
 continue_as: >-
   <b>{name}</b> est actuellement authentifié. Si vous reconnaissez ce compte, cliquez sur continuer.
@@ -845,6 +855,7 @@ template: Modèle
 translation: Traduction
 value: Valeur
 view_project: Voir le projet
+weeks: { }
 report_error: Signaler l'erreur
 interfaces:
   presentation-links:

app/src/lang/translations/pl-PL.yaml

@@ -503,6 +503,8 @@ value_unique: Wartość musi być unikalna
 all_activity: Wszystkie aktywności
 create_item: Utwórz element
 display_template: Wyświetl szablon
+language_display_template: Szablon wyświetlanego języka
+translations_display_template: Szablon wyświetlania tłumaczeń
 n_items_selected: 'Nie wybrano elementów | 1 wybrany element | {n} wybranych elementów'
 per_page: Na stronę
 all_files: Wszystkie pliki
@@ -784,6 +786,14 @@ save_current_datetime: Zapisz bieżącą datę/czas
 block: Zablokuj
 inline: W lini
 comment: Komentarz
+relational_triggers: Wyzwalacze relacji
+referential_action_field_label_m2o: Po usunięciu {collection}...
+referential_action_field_label_o2m: Po odznaczeniu {collection}...
+referential_action_no_action: Zapobiegaj usunięciu
+referential_action_cascade: Usuń {collection} element (kaskada)
+referential_action_set_null: Pola oznaczone jako bez wartości {field}
+referential_action_set_default: Ustaw {field} na wartość domyślną
+choose_action: Wybierz akcję
 continue: Kontynuuj
 continue_as: >-
   <b>{name}</b> jest obecnie uwierzytelniony. Jeśli rozpoznajesz to konto, naciśnij przycisk Kontynuuj.
@@ -845,6 +855,7 @@ template: Szablon
 translation: Tłumaczenia
 value: Wartość
 view_project: Zobacz projekt
+weeks: { }
 report_error: Zgłoś błąd
 interfaces:
   presentation-links:

app/src/modules/files/components/folder-picker-list-item.vue

@@ -1,30 +1,32 @@
 <template>
-	<v-list-item
-		v-if="folder.children.length === 0"
-		@click="clickHandler(folder.id)"
-		:active="currentFolder === folder.id"
-		:disabled="disabled"
-	>
-		<v-list-item-icon><v-icon :name="currentFolder === folder.id ? 'folder_open' : 'folder'" /></v-list-item-icon>
-		<v-list-item-content>{{ folder.name }}</v-list-item-content>
-	</v-list-item>
-	<v-list-group v-else @click="clickHandler(folder.id)" :active="currentFolder === folder.id" :disabled="disabled">
-		<template #activator>
-			<v-list-item-icon>
-				<v-icon :name="currentFolder === folder.id ? 'folder_open' : 'folder'" />
-			</v-list-item-icon>
+	<div class="folder-picker-list-item">
+		<v-list-item
+			v-if="folder.children.length === 0"
+			@click="clickHandler(folder.id)"
+			:active="currentFolder === folder.id"
+			:disabled="disabled"
+		>
+			<v-list-item-icon><v-icon :name="currentFolder === folder.id ? 'folder_open' : 'folder'" /></v-list-item-icon>
 			<v-list-item-content>{{ folder.name }}</v-list-item-content>
-		</template>
-		<folder-picker-list-item
-			v-for="childFolder in folder.children"
-			:key="childFolder.id"
-			:folder="childFolder"
-			:current-folder="currentFolder"
-			:click-handler="clickHandler"
-			:disabled="disabledFolders.includes(childFolder.id)"
-			:disabled-folders="disabledFolders"
-		/>
-	</v-list-group>
+		</v-list-item>
+		<v-list-group v-else @click="clickHandler(folder.id)" :active="currentFolder === folder.id" :disabled="disabled">
+			<template #activator>
+				<v-list-item-icon>
+					<v-icon :name="currentFolder === folder.id ? 'folder_open' : 'folder'" />
+				</v-list-item-icon>
+				<v-list-item-content>{{ folder.name }}</v-list-item-content>
+			</template>
+			<folder-picker-list-item
+				v-for="childFolder in folder.children"
+				:key="childFolder.id"
+				:folder="childFolder"
+				:current-folder="currentFolder"
+				:click-handler="clickHandler"
+				:disabled="disabledFolders.includes(childFolder.id)"
+				:disabled-folders="disabledFolders"
+			/>
+		</v-list-group>
+	</div>
 </template>
 
 <script lang="ts">
@@ -62,3 +64,10 @@ export default defineComponent({
 	},
 });
 </script>
+
+<style scoped>
+.folder-picker-list-item {
+	--v-list-item-background-color-hover: var(--background-normal-alt);
+	--v-list-item-background-color-active: var(--background-normal-alt);
+}
+</style>

docs/reference/api/items.md

@@ -197,6 +197,13 @@ Supports all [global query parameters](/reference/api/query).
 
 An array of partial [item objects](#the-item-object).
 
+::: tip Nested Data (Relations)
+
+Relational data needs to be correctly nested to add new items successfully. Check out the
+[relational data section](/reference/api/introduction/#relational-data) for more information
+
+:::
+
 ### Returns
 
 Returns the [item objects](#the-item-object) of the item that were created.

package.json

@@ -28,7 +28,7 @@
 		"@types/listr": "^0.14.3",
 		"@types/node": "^15.6.0",
 		"@types/supertest": "^2.0.11",
-		"@typescript-eslint/eslint-plugin": "^4.22.0",
+		"@typescript-eslint/eslint-plugin": "^4.25.0",
 		"@typescript-eslint/parser": "^4.23.0",
 		"axios": "^0.21.1",
 		"dockerode": "^3.3.0",
@@ -60,7 +60,7 @@
 		"supertest": "^6.1.3",
 		"tedious": "^11.0.8",
 		"ts-jest": "^26.5.6",
-		"ts-node": "^9.1.1"
+		"ts-node": "^10.0.0"
 	},
 	"simple-git-hooks": {
 		"pre-commit": "npx lint-staged"

packages/cli/package.json

@@ -58,7 +58,7 @@
 		"figlet": "^1.5.0",
 		"fs-extra": "^8.1.0",
 		"gluegun": "^4.6.1",
-		"indent-string": "^4.0.0",
+		"indent-string": "^5.0.0",
 		"jaro-winkler": "^0.2.8",
 		"joi": "^17.4.0",
 		"js-yaml": "^4.1.0",
@@ -70,7 +70,7 @@
 		"open": "^8.0.8",
 		"pretty-ms": "^7.0.1",
 		"shimmer": "^1.2.1",
-		"strip-ansi": "^6.0.0",
+		"strip-ansi": "^7.0.0",
 		"strip-indent": "^4.0.0",
 		"yargs": "^17.0.1",
 		"yargs-parser": "^20.2.7"
@@ -87,7 +87,7 @@
 		"prettier": "^2.2.1",
 		"rimraf": "^3.0.2",
 		"ts-jest": "^26.5.6",
-		"ts-node": "^9.1.1",
+		"ts-node": "^10.0.0",
 		"typescript": "^4.2.2"
 	},
 	"gitHead": "24621f3934dc77eb23441331040ed13c676ceffd"

packages/format-title/package.json

@@ -37,7 +37,7 @@
 		"@rollup/plugin-json": "^4.1.0",
 		"@rollup/plugin-node-resolve": "^13.0.0",
 		"rimraf": "^3.0.2",
-		"rollup": "^2.47.0",
+		"rollup": "^2.50.3",
 		"rollup-plugin-sourcemaps": "^0.6.3",
 		"rollup-plugin-terser": "^7.0.2",
 		"rollup-plugin-typescript2": "^0.30.0",

packages/gatsby-source-directus/package.json

@@ -13,7 +13,7 @@
 		"@directus/sdk-js": "^9.0.0-rc.53",
 		"@lnfusion/gatsby-source-graphql": "0.0.4",
 		"chalk": "^4.1.1",
-		"gatsby-source-filesystem": "^3.5.0",
+		"gatsby-source-filesystem": "^3.6.0",
 		"invariant": "^2.2.4",
 		"ms": "^2.1.3"
 	},

packages/sdk/package.json

@@ -60,13 +60,13 @@
 		"nock": "^13.0.10",
 		"npm-run-all": "^4.1.5",
 		"rimraf": "^3.0.2",
-		"rollup": "^2.47.0",
+		"rollup": "^2.50.3",
 		"rollup-plugin-copy": "^3.4.0",
 		"rollup-plugin-sourcemaps": "^0.6.3",
 		"rollup-plugin-terser": "^7.0.2",
 		"rollup-plugin-typescript2": "^0.30.0",
 		"ts-jest": "^26.5.6",
-		"ts-node": "^9.1.1",
+		"ts-node": "^10.0.0",
 		"typescript": "^4.2.2"
 	},
 	"gitHead": "24621f3934dc77eb23441331040ed13c676ceffd"