From 9cfb16a7e757ddf301cc0dd0add04fd3b1ce9ff8 Mon Sep 17 00:00:00 2001
From: Luka Radenovic <luka@init.hr>
Date: Wed, 15 Jun 2022 14:50:35 +0200
Subject: [PATCH] Fixed role management while changing own role and removed No
 access from dashboard dropdown role

---
 src/components/UserModal/UserModal.tsx | 67 +++++++++++++-------------
 1 file changed, 33 insertions(+), 34 deletions(-)

diff --git a/src/components/UserModal/UserModal.tsx b/src/components/UserModal/UserModal.tsx
index a810f30..00fcb9b 100644
--- a/src/components/UserModal/UserModal.tsx
+++ b/src/components/UserModal/UserModal.tsx
@@ -122,42 +122,41 @@ export const UserModal = ({ open, onClose, userId, setUserId }: UserModalProps)
                 <div className="sm:col-span-3">
                   <Input control={control} name="email" label="Email" type="email" onKeyPress={handleKeyPress} />
                 </div>
-
-                <div className="sm:col-span-3">
-                  {fields
-                    .filter((field) => field.name === 'dashboard')
-                    .map((item, index) => (
-                      <Select
-                        key={item.name}
-                        control={control}
-                        name={`app_roles.${index}.role`}
-                        label="Role"
-                        options={[
-                          { value: UserRole.NoAccess, name: 'No access' },
-                          { value: UserRole.User, name: 'User' },
-                          { value: UserRole.Admin, name: 'Admin' },
-                        ]}
-                      />
-                    ))}
-                </div>
-
                 {isAdmin && (
-                  <div className="sm:col-span-3 opacity-40 cursor-default pointer-events-none select-none">
-                    <label htmlFor="status" className="block text-sm font-medium text-gray-700">
-                      Status
-                    </label>
-                    <div className="mt-1">
-                      <select
-                        id="status"
-                        name="status"
-                        className="shadow-sm focus:ring-primary-500 focus:border-primary-500 block w-full sm:text-sm border-gray-300 rounded-md"
-                      >
-                        <option>Active</option>
-                        <option>Inactive</option>
-                        <option>Banned</option>
-                      </select>
+                  <>
+                    <div className="sm:col-span-3">
+                      {fields
+                        .filter((field) => field.name === 'dashboard')
+                        .map((item, index) => (
+                          <Select
+                            key={item.name}
+                            control={control}
+                            name={`app_roles.${index}.role`}
+                            label="Role"
+                            options={[
+                              { value: UserRole.User, name: 'User' },
+                              { value: UserRole.Admin, name: 'Admin' },
+                            ]}
+                          />
+                        ))}
                     </div>
-                  </div>
+                    <div className="sm:col-span-3 opacity-40 cursor-default pointer-events-none select-none">
+                      <label htmlFor="status" className="block text-sm font-medium text-gray-700">
+                        Status
+                      </label>
+                      <div className="mt-1">
+                        <select
+                          id="status"
+                          name="status"
+                          className="shadow-sm focus:ring-primary-500 focus:border-primary-500 block w-full sm:text-sm border-gray-300 rounded-md"
+                        >
+                          <option>Active</option>
+                          <option>Inactive</option>
+                          <option>Banned</option>
+                        </select>
+                      </div>
+                    </div>
+                  </>
                 )}
               </div>
             </div>