Fix copylink, and member picker

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>

4 files changed, 57 insertions, 28 deletions

diff --git a/src/models/circle.d.ts b/src/models/circle.d.ts
index 2e98fb0c..a51a56a8 100644
--- a/src/models/circle.d.ts
+++ b/src/models/circle.d.ts
@@ -43,6 +43,10 @@ export default class Circle {
      */
     get displayName(): string;
     /**
+     * Set the display name
+     */
+    set displayName(text: string);
+    /**
      * Circle creation date
      */
     get creation(): number;
diff --git a/src/models/circle.ts b/src/models/circle.ts
index 8c0012a3..3a5880e3 100644
--- a/src/models/circle.ts
+++ b/src/models/circle.ts
@@ -78,6 +78,13 @@ export default class Circle {
 	}
 
 	/**
+	 * Set the display name
+	 */
+	set displayName(text: string) {
+		this._data.displayName = text
+	}
+
+	/**
 	 * Circle creation date
 	 */
 	get creation(): number {
diff --git a/src/models/constants.d.ts b/src/models/constants.d.ts
index e4a258fb..219de065 100644
--- a/src/models/constants.d.ts
+++ b/src/models/constants.d.ts
@@ -42,11 +42,10 @@ export declare const PUBLIC_CIRCLE_CONFIG: {
 export declare const CIRCLES_MEMBER_GROUPING: {
     id: string;
     label: string;
+    share: any;
     type: number;
 }[];
-export declare const SHARES_TYPES_MEMBER_MAP: {
-    [x: number]: number;
-};
+export declare const SHARES_TYPES_MEMBER_MAP: {};
 export declare enum MemberLevels {
     NONE,
     MEMBER,
diff --git a/src/models/constants.ts b/src/models/constants.ts
index 520e4b63..20a990de 100644
--- a/src/models/constants.ts
+++ b/src/models/constants.ts
@@ -116,31 +116,50 @@ export const PUBLIC_CIRCLE_CONFIG = {
 
 // Represents the picker options but also the 
 // sorting of the members list
-export const CIRCLES_MEMBER_GROUPING = [{
-	id: `picker-${OC.Share.SHARE_TYPE_USER}`,
-	label: t('contacts', 'Users'),
-	type: MEMBER_TYPE_USER
-}, {
-	id: `picker-${OC.Share.SHARE_TYPE_EMAIL}`,
-	label: t('contacts', 'Emails'),
-	type: MEMBER_TYPE_MAIL
-}, {
-	id: `picker-${OC.Share.SHARE_TYPE_GROUP}`,
-	label: t('contacts', 'Groups'),
-	type: MEMBER_TYPE_GROUP
-}, {
-	id: `picker-${OC.Share.SHARE_TYPE_CIRCLE}`,
-	label: t('contacts', 'Circles'),
-	type: MEMBER_TYPE_CIRCLE
-}]
-
-export const SHARES_TYPES_MEMBER_MAP = {
-	[OC.Share.SHARE_TYPE_CIRCLE]: MEMBER_TYPE_SINGLEID,
-	[OC.Share.SHARE_TYPE_USER]: MEMBER_TYPE_USER,
-	[OC.Share.SHARE_TYPE_GROUP]: MEMBER_TYPE_GROUP,
-	[OC.Share.SHARE_TYPE_EMAIL]: MEMBER_TYPE_MAIL,
-	// []: MEMBER_TYPE_CONTACT,
-}
+export const CIRCLES_MEMBER_GROUPING = [
+	{
+		id: `picker-${OC.Share.SHARE_TYPE_USER}`,
+		label: t('contacts', 'Users'),
+		share: OC.Share.SHARE_TYPE_USER,
+		type: MEMBER_TYPE_USER
+	},
+	{
+		id: `picker-${OC.Share.SHARE_TYPE_GROUP}`,
+		label: t('contacts', 'Groups'),
+		share: OC.Share.SHARE_TYPE_GROUP,
+		type: MEMBER_TYPE_GROUP
+	},
+	{
+		id: `picker-${OC.Share.SHARE_TYPE_REMOTE}`,
+		label: t('contacts', 'Federated users'),
+		share: OC.Share.SHARE_TYPE_REMOTE,
+		type: MEMBER_TYPE_USER
+	},
+	{
+		id: `picker-${OC.Share.SHARE_TYPE_REMOTE_GROUP}`,
+		label: t('contacts', 'Federated groups'),
+		share: OC.Share.SHARE_TYPE_REMOTE_GROUP,
+		type: MEMBER_TYPE_GROUP
+	},
+	{
+		id: `picker-${OC.Share.SHARE_TYPE_CIRCLE}`,
+		label: t('contacts', 'Circles'),
+		share: OC.Share.SHARE_TYPE_CIRCLE,
+		type: MEMBER_TYPE_CIRCLE
+	},
+	{
+		id: `picker-${OC.Share.SHARE_TYPE_EMAIL}`,
+		label: t('contacts', 'Emails'),
+		share: OC.Share.SHARE_TYPE_EMAIL,
+		type: MEMBER_TYPE_MAIL
+	},
+]
+
+// Generating a map between share types and circle member types 
+export const SHARES_TYPES_MEMBER_MAP = CIRCLES_MEMBER_GROUPING.reduce((list, entry) => {
+	list[entry.share] = entry.type
+	return list
+}, {})
 
 export enum MemberLevels {
 	NONE = MEMBER_LEVEL_NONE,