From fb756f75f491800a5caa4ac21f8db8891da8f251 Mon Sep 17 00:00:00 2001
From: Nitwel <nitwel@arcor.de>
Date: Thu, 8 Oct 2020 11:35:06 +0200
Subject: [PATCH 1/2] support unnamed collection navigations and fix repeater
 naming

---
 .../database/seeds/03-fields/02-roles.yaml    |  6 ++--
 .../collections/components/navigation.vue     | 35 ++++++++++++-------
 2 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/api/src/database/seeds/03-fields/02-roles.yaml b/api/src/database/seeds/03-fields/02-roles.yaml
index 91ccdc4b79..af90ce9496 100644
--- a/api/src/database/seeds/03-fields/02-roles.yaml
+++ b/api/src/database/seeds/03-fields/02-roles.yaml
@@ -77,7 +77,7 @@ fields:
     locked: true
     options:
       template: '{{ name }}'
-      createItemText: Add Module
+      addLabel: Add New Module...
       fields:
         - name: Icon
           field: icon
@@ -112,7 +112,7 @@ fields:
     locked: true
     options:
       template: '{{ group_name }}'
-      createItemText: Add Group
+      addLabel: Add New Group...
       fields:
         - name: Group Name
           field: group_name
@@ -145,7 +145,7 @@ fields:
           meta:
             interface: repeater
             options:
-              createItemText: Add Collection
+              addLabel: Add New Collection...
               template: '{{ collection }}'
               fields:
                 - name: Collection
diff --git a/app/src/modules/collections/components/navigation.vue b/app/src/modules/collections/components/navigation.vue
index 85492ec7e0..447de604be 100644
--- a/app/src/modules/collections/components/navigation.vue
+++ b/app/src/modules/collections/components/navigation.vue
@@ -1,19 +1,28 @@
 <template>
 	<v-list large>
 		<template v-if="customNavItems && customNavItems.length > 0">
-			<v-detail
-				:active="group.accordion === 'always_open' || undefined"
-				:disabled="group.accordion === 'always_open'"
-				:start-open="group.accordion === 'start_open'"
-				:label="group.name"
-				:key="group.name"
-				v-for="group in customNavItems"
-			>
-				<v-list-item :exact="exact" v-for="navItem in group.items" :key="navItem.to" :to="navItem.to">
-					<v-list-item-icon><v-icon :name="navItem.icon" /></v-list-item-icon>
-					<v-list-item-content>{{ navItem.name }}</v-list-item-content>
-				</v-list-item>
-			</v-detail>
+			<template v-for="(group, index) in customNavItems">
+				<template v-if="(group.name === undefined || group.name === null) && group.accordion === 'always_open' && index === 0">
+					<v-list-item :exact="exact" v-for="navItem in group.items" :key="navItem.to" :to="navItem.to">
+						<v-list-item-icon><v-icon :name="navItem.icon" /></v-list-item-icon>
+						<v-list-item-content>{{ navItem.name }}</v-list-item-content>
+					</v-list-item>
+				</template>
+				<template v-else>
+					<v-detail
+						:active="group.accordion === 'always_open' || undefined"
+						:disabled="group.accordion === 'always_open'"
+						:start-open="group.accordion === 'start_open'"
+						:label="group.name || null"
+						:key="group.name"
+					>
+						<v-list-item :exact="exact" v-for="navItem in group.items" :key="navItem.to" :to="navItem.to">
+							<v-list-item-icon><v-icon :name="navItem.icon" /></v-list-item-icon>
+							<v-list-item-content>{{ navItem.name }}</v-list-item-content>
+						</v-list-item>
+					</v-detail>
+				</template>
+			</template>
 		</template>
 
 		<v-list-item v-else :exact="exact" v-for="navItem in navItems" :key="navItem.to" :to="navItem.to">

From 7753b79f02a55af6da8fc62554eb309499c3c1ae Mon Sep 17 00:00:00 2001
From: Nitwel <nitwel@arcor.de>
Date: Fri, 9 Oct 2020 18:42:42 +0200
Subject: [PATCH 2/2] add headerPlaceholder prop to repeater

---
 api/src/database/seeds/03-fields/02-roles.yaml      | 6 +++++-
 app/src/interfaces/repeater/repeater-row-header.vue | 2 +-
 app/src/interfaces/repeater/repeater-row.vue        | 5 +++++
 app/src/interfaces/repeater/repeater.vue            | 5 +++++
 4 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/api/src/database/seeds/03-fields/02-roles.yaml b/api/src/database/seeds/03-fields/02-roles.yaml
index af90ce9496..3a59c5936e 100644
--- a/api/src/database/seeds/03-fields/02-roles.yaml
+++ b/api/src/database/seeds/03-fields/02-roles.yaml
@@ -123,7 +123,9 @@ fields:
             options:
               iconRight: title
               placeholder: Label this group...
-        - name: Accordion
+          schema:
+            is_nullable: false
+        - name: Type
           field: accordion
           type: string
           schema:
@@ -154,6 +156,8 @@ fields:
                   meta:
                     interface: collection
                     width: full
+                  schema:
+                    is_nullable: false
     special: json
     sort: 10
     width: full
diff --git a/app/src/interfaces/repeater/repeater-row-header.vue b/app/src/interfaces/repeater/repeater-row-header.vue
index 69552018aa..e349408bf5 100644
--- a/app/src/interfaces/repeater/repeater-row-header.vue
+++ b/app/src/interfaces/repeater/repeater-row-header.vue
@@ -25,7 +25,7 @@ export default defineComponent({
 		},
 		placeholder: {
 			type: String,
-			default: i18n.t('empty_item'),
+			default: null,
 		},
 		toggle: {
 			type: Function,
diff --git a/app/src/interfaces/repeater/repeater-row.vue b/app/src/interfaces/repeater/repeater-row.vue
index 936abf26f6..049ab459d3 100644
--- a/app/src/interfaces/repeater/repeater-row.vue
+++ b/app/src/interfaces/repeater/repeater-row.vue
@@ -7,6 +7,7 @@
 			:toggle="toggle"
 			@delete="$emit('delete')"
 			:disabled="disabled"
+			:placeholder="headerPlaceholder"
 		/>
 		<transition-expand>
 			<div v-if="active">
@@ -46,6 +47,10 @@ export default defineComponent({
 			type: Boolean,
 			default: false,
 		},
+		headerPlaceholder: {
+			type: String,
+			default: null
+		}
 	},
 });
 </script>
diff --git a/app/src/interfaces/repeater/repeater.vue b/app/src/interfaces/repeater/repeater.vue
index d34de04600..2644d07f30 100644
--- a/app/src/interfaces/repeater/repeater.vue
+++ b/app/src/interfaces/repeater/repeater.vue
@@ -10,6 +10,7 @@
 				@input="updateValues(index, $event)"
 				@delete="removeItem(row)"
 				:disabled="disabled"
+				:headerPlaceholder="headerPlaceholder"
 			/>
 		</draggable>
 		<button @click="addNew" class="add-new" v-if="showAddNew">
@@ -54,6 +55,10 @@ export default defineComponent({
 			type: Boolean,
 			default: false,
 		},
+		headerPlaceholder: {
+			type: String,
+			default: i18n.t('empty_item'),
+		}
 	},
 	setup(props, { emit }) {
 		const selection = ref<number[]>([]);