New member button and virtual list

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
nextcloud · Mar 15, 2021 · a11fb4d · a11fb4d
1 parent 6c90835
commit a11fb4d
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 11 deletions.
diff --git a/src/components/MemberList.vue b/src/components/MemberList.vue
@@ -21,22 +21,30 @@
   -->
 
 <template>
-	<VirtualList class="member-list app-content-list"
-		data-key="id"
-		:data-sources="list"
-		:data-component="MemberListItem"
-		:estimate-size="68"
-		item-class="member-list__item" />
+	<AppContentList>
+		<Actions>
+			<ActionButton></ActionButton>
+		</Actions>
+		<VirtualList class="members-list"
+			data-key="id"
+			:data-sources="list"
+			:data-component="MembersListItem"
+			:estimate-size="68"
+			item-class="members-list__item" />
+	</AppContentList>
 </template>
 
 <script>
-import MemberListItem from './MemberList/MemberListItem'
+import AppContentList from '@nextcloud/vue/dist/Components/AppContentList'
 import VirtualList from 'vue-virtual-scroll-list'
 
+import MembersListItem from './MembersList/MembersListItem'
+
 export default {
 	name: 'MemberList',
 
 	components: {
+		AppContentList,
 		VirtualList,
 	},
 
@@ -49,7 +57,7 @@ export default {
 
 	data() {
 		return {
-			MemberListItem,
+			MembersListItem,
 		}
 	},
 

diff --git a/src/components/MemberList/MemberListItem.vue → ...omponents/MembersList/MembersListItem.vue b/src/components/MemberList/MemberListItem.vue → ...omponents/MembersList/MembersListItem.vue
@@ -95,7 +95,7 @@ import Member from '../../models/member'
 import RouterMixin from '../../mixins/RouterMixin'
 
 export default {
-	name: 'MemberListItem',
+	name: 'MembersListItem',
 
 	components: {
 		Actions,
@@ -188,9 +188,11 @@ export default {
 		canChangeLevel() {
 			// we can change if the member is at the same
 			// or lower level as the current user
+			// BUT not an owner as there can/must always be one
 			return this.availableLevelsChange.length > 0
 				&& this.currentUserLevel >= this.source.level
 				&& this.circle.canManageMembers
+				&& !(this.circle.isOwner && this.isCurrentUser)
 		},
 
 		/**
@@ -200,6 +202,7 @@ export default {
 		canDelete() {
 			return this.currentUserLevel > MEMBER_LEVEL_MEMBER
 				&& this.source.level <= this.currentUserLevel
+				&& !this.isCurrentUser
 		},
 	},
 	methods: {
@@ -252,7 +255,7 @@ export default {
 }
 </script>
 <style lang="scss">
-.member-list__item {
+.members-list__item {
 	padding: 8px;
 }
 </style>
diff --git a/src/services/circles.js b/src/services/circles.js
@@ -90,7 +90,18 @@ export const leaveCircle = async function(circleId) {
  */
 export const getCircleMembers = async function(circleId) {
 	const response = await axios.get(baseApi + `circles/${circleId}/members`)
-	return Object.values(response.data.ocs.data)
+	return response.data.ocs.data
+}
+
+/**
+ * Search a potential circle member
+ *
+ * @param {string} term the search query
+ * @returns {Array}
+ */
+export const searchMember = async function(term) {
+	const response = await axios.get(baseApi + `search?term=${term}`)
+	return response.data.ocs.data
 }
 
 /**