From 8df2b55c9d01b2ac54613001029d96e8a73f82de Mon Sep 17 00:00:00 2001
From: dklimpel <5740567+dklimpel@users.noreply.github.com>
Date: Fri, 19 Nov 2021 10:15:09 +0100
Subject: [PATCH] Add edit `user_type` to user

---
 README.md                   |  2 +-
 src/components/users.js     | 38 ++++++++++++++++++++++++++-----------
 src/i18n/de.js              |  1 +
 src/i18n/en.js              |  1 +
 src/synapse/dataProvider.js |  3 ++-
 5 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/README.md b/README.md
index dbc4ded..54a433c 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@
 
 This project is built using [react-admin](https://marmelab.com/react-admin/).
 
-It needs at least Synapse v1.41.0 for all functions to work as expected!
+It needs at least Synapse v1.46.0 for all functions to work as expected!
 
 You get your server version with the request `/_synapse/admin/v1/server_version`.
 See also [Synapse version API](https://matrix-org.github.io/synapse/develop/admin_api/version_api.html).
diff --git a/src/components/users.js b/src/components/users.js
index ff29fdf..7a109cb 100644
--- a/src/components/users.js
+++ b/src/components/users.js
@@ -71,6 +71,16 @@ const useStyles = makeStyles({
   },
 });
 
+const choices_medium = [
+  { id: "email", name: "resources.users.email" },
+  { id: "msisdn", name: "resources.users.msisdn" },
+];
+
+const choices_type = [
+  { id: "bot", name: "bot" },
+  { id: "support", name: "support" },
+];
+
 const UserListActions = ({
   currentSort,
   className,
@@ -261,15 +271,19 @@ export const UserCreate = props => (
         autoComplete="new-password"
         validate={maxLength(512)}
       />
+      <SelectInput
+        source="user_type"
+        choices={choices_type}
+        translateChoice={false}
+        allowEmpty={true}
+        resettable
+      />
       <BooleanInput source="admin" />
       <ArrayInput source="threepids">
         <SimpleFormIterator>
           <SelectInput
             source="medium"
-            choices={[
-              { id: "email", name: "resources.users.email" },
-              { id: "msisdn", name: "resources.users.msisdn" },
-            ]}
+            choices={choices_medium}
             validate={required()}
           />
           <TextInput source="address" validate={validateAddress} />
@@ -300,6 +314,7 @@ const UserTitle = ({ record }) => {
     </span>
   );
 };
+
 export const UserEdit = props => {
   const classes = useStyles();
   const translate = useTranslate();
@@ -318,6 +333,13 @@ export const UserEdit = props => {
           <TextInput source="id" disabled />
           <TextInput source="displayname" />
           <PasswordInput source="password" autoComplete="new-password" />
+          <SelectInput
+            source="user_type"
+            choices={choices_type}
+            translateChoice={false}
+            allowEmpty={true}
+            resettable
+          />
           <BooleanInput source="admin" />
           <BooleanInput
             source="deactivated"
@@ -345,13 +367,7 @@ export const UserEdit = props => {
         >
           <ArrayInput source="threepids">
             <SimpleFormIterator>
-              <SelectInput
-                source="medium"
-                choices={[
-                  { id: "email", name: "resources.users.email" },
-                  { id: "msisdn", name: "resources.users.msisdn" },
-                ]}
-              />
+              <SelectInput source="medium" choices={choices_medium} />
               <TextInput source="address" />
             </SimpleFormIterator>
           </ArrayInput>
diff --git a/src/i18n/de.js b/src/i18n/de.js
index 66a8a05..700e32e 100644
--- a/src/i18n/de.js
+++ b/src/i18n/de.js
@@ -121,6 +121,7 @@ const de = {
         creation_ts_ms: "Zeitpunkt der Erstellung",
         consent_version: "Zugestimmte Geschäftsbedingungen",
         auth_provider: "Provider",
+        user_type: "Benutzertyp",
       },
       helper: {
         deactivate:
diff --git a/src/i18n/en.js b/src/i18n/en.js
index 51ba6ca..e1f7822 100644
--- a/src/i18n/en.js
+++ b/src/i18n/en.js
@@ -120,6 +120,7 @@ const en = {
         creation_ts_ms: "Creation timestamp",
         consent_version: "Consent version",
         auth_provider: "Provider",
+        user_type: "User type",
       },
       helper: {
         deactivate: "You must provide a password to re-activate an account.",
diff --git a/src/synapse/dataProvider.js b/src/synapse/dataProvider.js
index 5b11139..2a97bd2 100644
--- a/src/synapse/dataProvider.js
+++ b/src/synapse/dataProvider.js
@@ -279,7 +279,8 @@ const resourceMap = {
 
 function filterNullValues(key, value) {
   // Filtering out null properties
-  if (value === null) {
+  // to reset user_type from user, it must be null
+  if (value === null && key !== "user_type") {
     return undefined;
   }
   return value;