From 21c1d026aaf587c57901374e057577ac3310c2a4 Mon Sep 17 00:00:00 2001
From: Postema Max <max@elynor.com>
Date: Wed, 23 Aug 2023 13:03:06 +0200
Subject: [PATCH] fix(settings): Have a better email input in membersettings

---
 apps/molgenis-components/lib/main.js          |  1 +
 apps/molgenis-components/src/client/client.ts |  2 +-
 .../src/components/forms/Info.vue             | 10 ++---
 .../src/components/forms/InputEmail.vue       | 22 +++++----
 .../forms/baseInputs/BaseInputProps.ts        | 45 ++++++++++++++-----
 apps/settings/src/components/Members.vue      | 30 +++++++++++--
 6 files changed, 83 insertions(+), 27 deletions(-)

diff --git a/apps/molgenis-components/lib/main.js b/apps/molgenis-components/lib/main.js
index 6b735e351b..9f37f30da6 100644
--- a/apps/molgenis-components/lib/main.js
+++ b/apps/molgenis-components/lib/main.js
@@ -192,6 +192,7 @@ export {
   InputDate,
   InputDateTime,
   InputDecimal,
+  InputEmail,
   InputFile,
   InputGroup,
   InputInt,
diff --git a/apps/molgenis-components/src/client/client.ts b/apps/molgenis-components/src/client/client.ts
index 865b41a20d..df195caeda 100644
--- a/apps/molgenis-components/src/client/client.ts
+++ b/apps/molgenis-components/src/client/client.ts
@@ -272,7 +272,7 @@ const fetchSchemaMetaData = async (
     .post(graphqlURL(schemaName), { query: metaDataQuery })
     .then((result: AxiosResponse<{ data: { _schema: ISchemaMetaData } }>) => {
       const schema = result.data.data._schema;
-      if(schemaName == null) {
+      if (schemaName == null) {
         schemaCache.set(currentSchemaName, schema);
       }
       schemaCache.set(schema.name, schema);
diff --git a/apps/molgenis-components/src/components/forms/Info.vue b/apps/molgenis-components/src/components/forms/Info.vue
index 98a49ca0cf..b28343fcec 100644
--- a/apps/molgenis-components/src/components/forms/Info.vue
+++ b/apps/molgenis-components/src/components/forms/Info.vue
@@ -1,10 +1,8 @@
 <template>
   <div>
-    <i
-      class="fa fa-question-circle text-primary"
-      @mouseenter="show = true"
-      @mouseleave="show = false"
-    ></i>
+    <span @mouseenter="show = true" @mouseleave="show = false">
+      <i class="fa fa-question-circle text-primary" />
+    </span>
     <div class="tooltip bs-tooltip-top" :class="{ show: show }">
       <span class="tooltip-inner">
         <span> <slot /></span>
@@ -17,6 +15,8 @@
 <style>
 .tooltip {
   margin-top: -50px;
+  pointer-events: none;
+  white-space: nowrap;
 }
 </style>
 
diff --git a/apps/molgenis-components/src/components/forms/InputEmail.vue b/apps/molgenis-components/src/components/forms/InputEmail.vue
index 9fad3c3b03..cdb94ee224 100644
--- a/apps/molgenis-components/src/components/forms/InputEmail.vue
+++ b/apps/molgenis-components/src/components/forms/InputEmail.vue
@@ -36,14 +36,20 @@ import FormGroup from "./FormGroup.vue";
 import InputGroup from "./InputGroup.vue";
 import BaseInputProps from "./baseInputs/BaseInputProps";
 
-interface InputProps extends BaseInputProps {
-  stringLength?: number;
-  additionalValidValidationStrings?: string[];
-  modelValue: string | null;
-}
-let props = withDefaults(defineProps<InputProps>(), {
-  additionalValidValidationStrings: () => [],
-  stringLength: 255,
+let props = defineProps({
+  ...BaseInputProps,
+  modelValue: {
+    type: String,
+    default: null,
+  },
+  stringLength: {
+    type: Number,
+    default: 255,
+  },
+  additionalValidValidationStrings: {
+    type: Array,
+    default: [],
+  },
 });
 
 const emit = defineEmits(["update:modelValue"]);
diff --git a/apps/molgenis-components/src/components/forms/baseInputs/BaseInputProps.ts b/apps/molgenis-components/src/components/forms/baseInputs/BaseInputProps.ts
index 7ce719955b..51724ff89e 100644
--- a/apps/molgenis-components/src/components/forms/baseInputs/BaseInputProps.ts
+++ b/apps/molgenis-components/src/components/forms/baseInputs/BaseInputProps.ts
@@ -1,14 +1,39 @@
-export default interface BaseInputProps {
+export default {
   /**
    * Unique identifier https://developer.mozilla.org/en-US/docs/Web/HTML/Global_attributes/id
    * Has no direct EMX2 implementation but can be constructed by concatenating the table name with the field name
    */
-  id: string;
-  name?: string;
-  label?: string;
-  placeholder?: string;
-  description?: string;
-  required?: boolean;
-  readonly?: boolean;
-  errorMessage?: string;
-}
+  id: {
+    type: String,
+    required: true,
+  },
+  name: {
+    type: String,
+    required: false,
+  },
+  label: {
+    type: String,
+    required: false,
+  },
+  placeholder: {
+    type: String,
+    required: false,
+  },
+  description: {
+    type: String,
+    required: false,
+  },
+  required: {
+    type: Boolean,
+    default: false,
+  },
+  readonly: {
+    type: Boolean,
+    default: false,
+  },
+  errorMessage: {
+    type: String,
+    required: false,
+    default: () => null,
+  },
+};
diff --git a/apps/settings/src/components/Members.vue b/apps/settings/src/components/Members.vue
index d601045461..4a5e2848f9 100644
--- a/apps/settings/src/components/Members.vue
+++ b/apps/settings/src/components/Members.vue
@@ -15,13 +15,21 @@
       <h5 class="card-title">Manage members</h5>
       <p>Use table below to add, edit or remove members</p>
       <form v-if="canEdit" class="form-inline">
-        <InputString
+        <InputEmail
           id="member-email"
-          class="mb-2 mr-sm-4"
+          class="mb-2 mr-2 mr-sm-4 email-input"
           v-model="editMember['email']"
           placeholder="email address"
           label="Email:"
-        />
+          :additionalValidValidationStrings="['user', 'anonymous']"
+        >
+          <template v-slot:prepend>
+            <Info class="mr-1">
+              Enter valid user email address or use the specials group: 'user'
+              or 'anonymous'
+            </Info>
+          </template>
+        </InputEmail>
         <InputSelect
           id="member-role"
           class="mb-2 mr-sm-4"
@@ -56,10 +64,12 @@ import {
   ButtonAction,
   ButtonAlt,
   TableSimple,
+  Info,
   InputCheckbox,
   InputFile,
   InputSelect,
   InputString,
+  InputEmail,
   LayoutCard,
   MessageError,
   MessageSuccess,
@@ -77,8 +87,10 @@ export default {
     MessageSuccess,
     Spinner,
     LayoutCard,
+    Info,
     InputCheckbox,
     InputString,
+    InputEmail,
     InputSelect,
   },
   props: {
@@ -165,3 +177,15 @@ export default {
   },
 };
 </script>
+
+<style>
+.email-input input {
+  min-width: 20rem !important;
+}
+.email-input .text-danger {
+  margin-left: 0.5rem;
+}
+.email-input .input-group {
+  flex-wrap: nowrap;
+}
+</style>