From 3e72d09f450c69cf3bdd19d70308affe3de9e417 Mon Sep 17 00:00:00 2001
From: rijkvanzanten <rijkvanzanten@me.com>
Date: Thu, 10 Sep 2020 15:14:04 -0400
Subject: [PATCH] Add correct form layout to webhooks

---
 api/src/database/seeds/system.yaml            | 80 ++++++++++++++++++-
 api/src/services/items.ts                     |  1 +
 .../interfaces/_system/collection/index.ts    |  2 +-
 .../_system/collections/collections.vue       |  5 +-
 app/src/lang/en-US/index.json                 |  1 +
 .../settings/routes/webhooks/browse.vue       |  4 +-
 6 files changed, 88 insertions(+), 5 deletions(-)

diff --git a/api/src/database/seeds/system.yaml b/api/src/database/seeds/system.yaml
index e18ceee482..640924816a 100644
--- a/api/src/database/seeds/system.yaml
+++ b/api/src/database/seeds/system.yaml
@@ -1836,7 +1836,85 @@ rows:
         hidden: true
         locked: true
 
-      # directus_webhooks TBD
+      - collection: directus_webhooks
+        field: id
+        hidden: true
+        locked: true
+      - collection: directus_webhooks
+        field: name
+        interface: text-input
+        locked: true
+        sort: 1
+        width: full
+      - collection: directus_webhooks
+        field: method
+        interface: dropdown
+        locked: true
+        options:
+          choices:
+            - GET
+            - POST
+        sort: 2
+        width: half
+      - collection: directus_webhooks
+        field: url
+        interface: text-input
+        locked: true
+        options:
+          iconRight: link
+        sort: 3
+        width: half
+      - collection: directus_webhooks
+        field: status
+        interface: dropdown
+        locked: true
+        options:
+          choices:
+            - text: Active
+              value: active
+            - text: Inactive
+              value: inactive
+        sort: 4
+        width: half
+      - collection: directus_webhooks
+        field: data
+        interface: toggle
+        locked: true
+        options:
+          choices:
+            label: Include item data in request
+        sort: 5
+        width: half
+      - collection: directus_webhooks
+        field: triggers_divider
+        interface: divider
+        options:
+          icon: api
+          title: Triggers
+          color: '#2F80ED'
+        special: alias
+        sort: 6
+        width: full
+      - collection: directus_webhooks
+        field: actions
+        interface: checkboxes
+        options:
+          choices:
+            - text: Create
+              value: create
+            - text: Update
+              value: update
+            - text: Delete
+              value: delete
+        special: csv
+        sort: 7
+        width: full
+      - collection: directus_webhooks
+        field: collections
+        interface: collections
+        special: csv
+        sort: 8
+        width: full
 
       - collection: directus_activity
         field: action
diff --git a/api/src/services/items.ts b/api/src/services/items.ts
index ce716e5edd..b46b7fe9bc 100644
--- a/api/src/services/items.ts
+++ b/api/src/services/items.ts
@@ -175,6 +175,7 @@ export default class ItemsService implements AbstractService {
 		}
 
 		const records = await runAST(ast);
+
 		return records;
 	}
 
diff --git a/app/src/interfaces/_system/collection/index.ts b/app/src/interfaces/_system/collection/index.ts
index 3f1e2e2bd0..99bb3c673c 100644
--- a/app/src/interfaces/_system/collection/index.ts
+++ b/app/src/interfaces/_system/collection/index.ts
@@ -2,7 +2,7 @@ import { defineInterface } from '@/interfaces/define';
 import InterfaceCollection from './collection.vue';
 
 export default defineInterface(({ i18n }) => ({
-	id: 'collections',
+	id: 'collection',
 	name: i18n.t('interfaces.collection.collection'),
 	description: i18n.t('interfaces.collection.description'),
 	icon: 'featured_play_list',
diff --git a/app/src/interfaces/_system/collections/collections.vue b/app/src/interfaces/_system/collections/collections.vue
index 60563684b0..2c57a74067 100644
--- a/app/src/interfaces/_system/collections/collections.vue
+++ b/app/src/interfaces/_system/collections/collections.vue
@@ -1,5 +1,8 @@
 <template>
-	<interface-checkboxes :choices="items" @input="$listeners.input" :value="value" :disabled="disabled" />
+	<v-notice v-if="items.length === 0">
+		{{ $t('no_collections') }}
+	</v-notice>
+	<interface-checkboxes v-else :choices="items" @input="$listeners.input" :value="value" :disabled="disabled" />
 </template>
 
 <script lang="ts">
diff --git a/app/src/lang/en-US/index.json b/app/src/lang/en-US/index.json
index 03e2aa5411..42cd3b31d3 100644
--- a/app/src/lang/en-US/index.json
+++ b/app/src/lang/en-US/index.json
@@ -17,6 +17,7 @@
 	"create_preset": "Create Preset",
 	"create_role": "Create Role",
 	"create_user": "Create User",
+	"create_webhook": "Create Webhook",
 
 	"rename_folder": "Rename Folder",
 	"delete_folder": "Delete Folder",
diff --git a/app/src/modules/settings/routes/webhooks/browse.vue b/app/src/modules/settings/routes/webhooks/browse.vue
index acf688e878..cf1fa4b282 100644
--- a/app/src/modules/settings/routes/webhooks/browse.vue
+++ b/app/src/modules/settings/routes/webhooks/browse.vue
@@ -75,11 +75,11 @@
 			</template>
 
 			<template #no-items>
-				<v-info :title="$tc('webhooks_count', 0)" icon="people_alt" center>
+				<v-info :title="$tc('webhooks_count', 0)" icon="anchor" center>
 					{{ $t('no_webhooks_copy') }}
 
 					<template #append>
-						<v-button :to="{ path: '/settings/webhooks/+', query: queryFilters }">{{ $t('create_webhook') }}</v-button>
+						<v-button :to="{ path: '/settings/webhooks/+' }">{{ $t('create_webhook') }}</v-button>
 					</template>
 				</v-info>
 			</template>