From a059c4c333c7a54661bff10bad5b8cb5ae9a676b Mon Sep 17 00:00:00 2001
From: Aleksy <psychologianauki@gmail.com>
Date: Thu, 16 Nov 2023 07:46:09 +0100
Subject: [PATCH 01/10] small changes, manage users documentation init

---
 .../users-managment/users-managment.md        | 20 +++++++++++++++++++
 .../src/pages/UserListDetail/UserDetail.tsx   |  2 +-
 .../src/pages/UserListDetail/index.tsx        |  2 +-
 mkdocs.yml                                    |  1 +
 4 files changed, 23 insertions(+), 2 deletions(-)
 create mode 100644 docs/working-with-dqo/users-managment/users-managment.md

diff --git a/docs/working-with-dqo/users-managment/users-managment.md b/docs/working-with-dqo/users-managment/users-managment.md
new file mode 100644
index 0000000000..27d8615095
--- /dev/null
+++ b/docs/working-with-dqo/users-managment/users-managment.md
@@ -0,0 +1,20 @@
+# Manage users
+
+In configuration section you are able to manage DQO users. 
+
+![Users-List](https://dqops.com/docs/images/working-with-dqo/users-managment/usersList.png)
+
+There are 5 types of user roles:
+- Admin (Administrator of the account who can manage users and perform all actions)
+- Editor (Editor who can configure and run data quality checks)
+- Operator (The user can run data quality checks, but cannot make changes)
+- Viewer (Read-only viewer)
+- None (No access rights role)
+
+Admin can add new users by clicking Add new user button, that will open then tab where it is possible to set users email and role. To add the user click the Save button
+
+![Add-user](https://dqops.com/docs/images/working-with-dqo/users-managment/addUser.png)
+
+Users with admin role can also edit acounts by clinking edit button on existing user, then it will be possible to change role. DQO does not support changing users emails. After making changes click the Save button. Admin can also delete each user and change each user password by clicking change password button. This action will open the pop-up with random generated password. It is possible to type own password that will be at least 8 characters long and contain small letters, capital letters and digits. 
+
+![Change-users-password](https://dqops.com/docs/images/working-with-dqo/users-managment/changePassword.png)
\ No newline at end of file
diff --git a/dqops/src/main/frontend/src/pages/UserListDetail/UserDetail.tsx b/dqops/src/main/frontend/src/pages/UserListDetail/UserDetail.tsx
index 08ee2a3f89..a7fc1ef356 100644
--- a/dqops/src/main/frontend/src/pages/UserListDetail/UserDetail.tsx
+++ b/dqops/src/main/frontend/src/pages/UserListDetail/UserDetail.tsx
@@ -50,7 +50,7 @@ export default function UserDetail() {
   return (
     <DefinitionLayout>
       <div className='w-full border-b border-b-gray-400 flex justify-end '>  
-        <Button label={(create===true || email === undefined) ? 'Add user' : 'Edit user'}
+        <Button label={'Save'}
          color='primary'
          variant='contained'
          className=' w-40 mr-10 my-3'
diff --git a/dqops/src/main/frontend/src/pages/UserListDetail/index.tsx b/dqops/src/main/frontend/src/pages/UserListDetail/index.tsx
index 5c967867fe..7ef9ae3785 100644
--- a/dqops/src/main/frontend/src/pages/UserListDetail/index.tsx
+++ b/dqops/src/main/frontend/src/pages/UserListDetail/index.tsx
@@ -27,7 +27,7 @@ export default function UserListDetail() {
     useEffect(() => {
         setLoading(true)
         UsersApi.getAllUsers()
-        .then((res) => setDqoCloudUsers(res.data))
+        .then((res) => setDqoCloudUsers(res.data.filter((x) => !x.email?.includes("dqops"))))
         .catch((err) => console.error(err))
         .finally(() => setLoading(false))
     }, [reshreshUsersIndicator])
diff --git a/mkdocs.yml b/mkdocs.yml
index ef0c128bd3..6741818bf2 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -89,6 +89,7 @@ nav:
       - Incidents and notifications: "working-with-dqo/incidents-and-notifications/incidents.md"
       - Set up data grouping: "working-with-dqo/set-up-data-grouping/set-up-data-grouping.md"
       - Compare tables: "working-with-dqo/table-comparison/table-comparison.md"
+      - Access managment: "working-with-dqo/users-managment/users-managment.md"
       - Working with DQOps Shell: "working-with-dqo/working-with-dqo-shell/working-with-dqo-shell.md"
   - Integrations:
       - "integrations/index.md"

From 071cdfad4a84bff4d846ac2246e01338a5444346 Mon Sep 17 00:00:00 2001
From: Aleksy <psychologianauki@gmail.com>
Date: Thu, 16 Nov 2023 08:02:48 +0100
Subject: [PATCH 02/10] small improvements in text

---
 docs/working-with-dqo/users-managment/users-managment.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/docs/working-with-dqo/users-managment/users-managment.md b/docs/working-with-dqo/users-managment/users-managment.md
index 27d8615095..f49c291bb3 100644
--- a/docs/working-with-dqo/users-managment/users-managment.md
+++ b/docs/working-with-dqo/users-managment/users-managment.md
@@ -4,7 +4,8 @@ In configuration section you are able to manage DQO users.
 
 ![Users-List](https://dqops.com/docs/images/working-with-dqo/users-managment/usersList.png)
 
-There are 5 types of user roles:
+**There are 5 types of user roles:**
+
 - Admin (Administrator of the account who can manage users and perform all actions)
 - Editor (Editor who can configure and run data quality checks)
 - Operator (The user can run data quality checks, but cannot make changes)
@@ -15,6 +16,6 @@ Admin can add new users by clicking Add new user button, that will open then tab
 
 ![Add-user](https://dqops.com/docs/images/working-with-dqo/users-managment/addUser.png)
 
-Users with admin role can also edit acounts by clinking edit button on existing user, then it will be possible to change role. DQO does not support changing users emails. After making changes click the Save button. Admin can also delete each user and change each user password by clicking change password button. This action will open the pop-up with random generated password. It is possible to type own password that will be at least 8 characters long and contain small letters, capital letters and digits. 
+Users with admin role can also edit acounts by clinking edit button on existing user, then it will be possible to change role. DQO does not support changing users emails. After making changes click the Save button. Admin can also delete each user and change each user password by clicking change password button. This action will open the pop-up with random generated password. It is possible to provide your own password, if it will be at least 8 characters long and contain small letters, capital letters and digits. 
 
 ![Change-users-password](https://dqops.com/docs/images/working-with-dqo/users-managment/changePassword.png)
\ No newline at end of file

From 90955fbf3cb1fc2a284071bc37b8ed3563d94b6a Mon Sep 17 00:00:00 2001
From: Aleksy <psychologianauki@gmail.com>
Date: Tue, 21 Nov 2023 21:04:53 +0100
Subject: [PATCH 03/10] capital letters & new img docs

---
 docs/working-with-dqo/users-managment/users-managment.md   | 2 +-
 dqops/src/main/frontend/src/pages/UserListDetail/index.tsx | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/working-with-dqo/users-managment/users-managment.md b/docs/working-with-dqo/users-managment/users-managment.md
index f49c291bb3..4bca193e87 100644
--- a/docs/working-with-dqo/users-managment/users-managment.md
+++ b/docs/working-with-dqo/users-managment/users-managment.md
@@ -14,7 +14,7 @@ In configuration section you are able to manage DQO users.
 
 Admin can add new users by clicking Add new user button, that will open then tab where it is possible to set users email and role. To add the user click the Save button
 
-![Add-user](https://dqops.com/docs/images/working-with-dqo/users-managment/addUser.png)
+![Add-user](https://dqops.com/docs/images/working-with-dqo/users-managment/addUser2.png)
 
 Users with admin role can also edit acounts by clinking edit button on existing user, then it will be possible to change role. DQO does not support changing users emails. After making changes click the Save button. Admin can also delete each user and change each user password by clicking change password button. This action will open the pop-up with random generated password. It is possible to provide your own password, if it will be at least 8 characters long and contain small letters, capital letters and digits. 
 
diff --git a/dqops/src/main/frontend/src/pages/UserListDetail/index.tsx b/dqops/src/main/frontend/src/pages/UserListDetail/index.tsx
index 7ef9ae3785..89c5ca6c52 100644
--- a/dqops/src/main/frontend/src/pages/UserListDetail/index.tsx
+++ b/dqops/src/main/frontend/src/pages/UserListDetail/index.tsx
@@ -99,18 +99,18 @@ export default function UserListDetail() {
                     <td className='px-6 py-2 text-left block w-100'>{user.email}</td>
                     <td className='px-6 py-2 text-left block w-50'>{user.accountRole}</td>
                     <td className='px-6 py-2 text-left block max-w-100'>
-                        <Button label='edit' variant='text' color='primary' 
+                        <Button label='Edit' variant='text' color='primary' 
                         onClick={() =>user.email ?  editDqoCloudUser(user.email, user.accountRole) : null}
                         disabled={!(userProfile.license_type === 'TEAM' || userProfile.license_type === 'ENTERPRISE' || userProfile.can_manage_users === true)}
                         />
                     </td>
                     <td className="px-6 py-2 text-left block max-w-100">
-                        <Button label='delete' variant='text' color='primary' 
+                        <Button label='Delete' variant='text' color='primary' 
                         onClick={() => setSelectedEmailToDelete(user.email ?? '')}
                         disabled={!(userProfile.license_type === 'TEAM' || userProfile.license_type === 'ENTERPRISE' || userProfile.can_manage_users === true)}/>
                     </td>
                     <td className="px-6 py-2 text-left block max-w-100">
-                        <Button label='change password' variant='text' color='primary' onClick={() => setSelectedEmailToChangePassword(user.email ?? '')} 
+                        <Button label='Change password' variant='text' color='primary' onClick={() => setSelectedEmailToChangePassword(user.email ?? '')} 
                         disabled={userProfile.account_role !== "admin" && !(userProfile.license_type === 'TEAM' || userProfile.license_type === 'ENTERPRISE' || userProfile.can_manage_users === true)}/>
                     </td>
                 </tr>

From 87d6412ae76c280cf7130472073085188b02f287 Mon Sep 17 00:00:00 2001
From: Aleksy <psychologianauki@gmail.com>
Date: Wed, 22 Nov 2023 05:10:18 +0100
Subject: [PATCH 04/10] its imposible to delete own acount & user with free
 acount cannot edit and delete users

---
 .../frontend/src/components/Input/style.css   |  6 +++++
 .../ChangePrincipalPasswordDialog.tsx         |  3 ++-
 .../src/pages/UserListDetail/index.tsx        | 24 ++++++++++++++-----
 3 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/dqops/src/main/frontend/src/components/Input/style.css b/dqops/src/main/frontend/src/components/Input/style.css
index e5b14c81fc..bdcd2e4361 100644
--- a/dqops/src/main/frontend/src/components/Input/style.css
+++ b/dqops/src/main/frontend/src/components/Input/style.css
@@ -4,3 +4,9 @@ input:-webkit-autofill {
     -webkit-box-shadow: none;
     box-shadow: none;
 }   
+input:-webkit-autofill,
+input:-webkit-autofill:hover,
+input:-webkit-autofill:focus,
+input:-webkit-autofill:active {
+    -webkit-box-shadow: 0 0 0px 1000px white inset !important;
+}
diff --git a/dqops/src/main/frontend/src/components/UserProfile/ChangePrincipalPasswordDialog.tsx b/dqops/src/main/frontend/src/components/UserProfile/ChangePrincipalPasswordDialog.tsx
index a8ec22d9c2..cde6964590 100644
--- a/dqops/src/main/frontend/src/components/UserProfile/ChangePrincipalPasswordDialog.tsx
+++ b/dqops/src/main/frontend/src/components/UserProfile/ChangePrincipalPasswordDialog.tsx
@@ -1,6 +1,7 @@
 import React, { useEffect, useState } from 'react';
-import { Dialog, DialogBody, DialogFooter, Input } from '@material-tailwind/react'; 
+import { Dialog, DialogBody, DialogFooter } from '@material-tailwind/react'; 
 import Button from '../../components/Button';
+import Input from '../Input';
 
 interface AddColumnDialogProps {
   open: boolean;
diff --git a/dqops/src/main/frontend/src/pages/UserListDetail/index.tsx b/dqops/src/main/frontend/src/pages/UserListDetail/index.tsx
index 89c5ca6c52..f16d1d378f 100644
--- a/dqops/src/main/frontend/src/pages/UserListDetail/index.tsx
+++ b/dqops/src/main/frontend/src/pages/UserListDetail/index.tsx
@@ -27,7 +27,7 @@ export default function UserListDetail() {
     useEffect(() => {
         setLoading(true)
         UsersApi.getAllUsers()
-        .then((res) => setDqoCloudUsers(res.data.filter((x) => !x.email?.includes("dqops"))))
+        .then((res) => setDqoCloudUsers(res.data))
         .catch((err) => console.error(err))
         .finally(() => setLoading(false))
     }, [reshreshUsersIndicator])
@@ -58,18 +58,24 @@ export default function UserListDetail() {
         .catch((err) => console.error(err))
     }
 
+    const changePrincipalPassword = async (password: string) => {
+        await UsersApi.changeCallerPassword(selectedEmailToChangePassword, password)
+        .then(() => setRefreshUsersIndicator(!reshreshUsersIndicator))
+        .catch((err) => console.error(err))
+    }
+
     const addDqoCloudUser = () => {
          dispatch(
            addFirstLevelTab({
              url: ROUTES.USER_DETAIL("new"),
              value: ROUTES.USER_DETAIL_VALUE("new"),
              label: "Create User",
-             state: {create: true
-             }
+             state: {create: true}
            })
          )
     }
-    if(loading){
+
+    if (loading) {
         return(
         <DefinitionLayout>
             <div className='w-full h-screen flex items-center justify-center'>
@@ -84,6 +90,7 @@ export default function UserListDetail() {
             <thead className='border-b w-full border-b-gray-400 relative flex items-center'>
                 <th className="px-6 py-4 text-left block w-100">User email</th>
                 <th className="px-6 py-4 text-left block w-50">User role</th>
+                {userProfile.license_type?.toLowerCase() !== 'free' ? 
                 <Button label='Add user'
                  color='primary'
                  variant='contained'
@@ -92,6 +99,7 @@ export default function UserListDetail() {
                  disabled={!!(userProfile.users_limit && userProfile.users_limit <= dqoCloudUsers?.length  &&
                  (userProfile.license_type === 'TEAM' || userProfile.license_type === 'ENTERPRISE') || userProfile.can_manage_users !== true)} 
                 />
+                : null}
             </thead>
             <tbody>
                 {dqoCloudUsers?.map((user, index) => 
@@ -99,15 +107,19 @@ export default function UserListDetail() {
                     <td className='px-6 py-2 text-left block w-100'>{user.email}</td>
                     <td className='px-6 py-2 text-left block w-50'>{user.accountRole}</td>
                     <td className='px-6 py-2 text-left block max-w-100'>
+                        {userProfile.license_type?.toLowerCase() !== 'free' ? 
                         <Button label='Edit' variant='text' color='primary' 
                         onClick={() =>user.email ?  editDqoCloudUser(user.email, user.accountRole) : null}
                         disabled={!(userProfile.license_type === 'TEAM' || userProfile.license_type === 'ENTERPRISE' || userProfile.can_manage_users === true)}
                         />
+                        : <div className='w-24'></div> }
                     </td>
                     <td className="px-6 py-2 text-left block max-w-100">
+                        { userProfile.user !== user.email && userProfile.license_type?.toLowerCase() !== 'free' ? 
                         <Button label='Delete' variant='text' color='primary' 
                         onClick={() => setSelectedEmailToDelete(user.email ?? '')}
-                        disabled={!(userProfile.license_type === 'TEAM' || userProfile.license_type === 'ENTERPRISE' || userProfile.can_manage_users === true)}/>
+                        disabled={!(userProfile.license_type === 'TEAM' || userProfile.license_type === 'ENTERPRISE' || userProfile.can_manage_users === true)}/> 
+                        : <div className='w-24'></div> }
                     </td>
                     <td className="px-6 py-2 text-left block max-w-100">
                         <Button label='Change password' variant='text' color='primary' onClick={() => setSelectedEmailToChangePassword(user.email ?? '')} 
@@ -118,7 +130,7 @@ export default function UserListDetail() {
             </tbody>
         </table>
         <ConfirmDialog open={selectedEmailToDelete.length!==0} onClose={() => setSelectedEmailToDelete('')} onConfirm={deleteDqoCloudUser} message={`Are you sure you want to delete ${selectedEmailToDelete} user?`}/>
-        <ChangeUserPasswordDialog open={selectedEmailToChangePassword.length!==0} onClose={() => setSelectedEmailToChangePassword('')} handleSubmit={changeDqoCloudUserPassword}  />
+        <ChangeUserPasswordDialog open={selectedEmailToChangePassword.length!==0} onClose={() => setSelectedEmailToChangePassword('')} handleSubmit={userProfile.user !== selectedEmailToChangePassword ? changeDqoCloudUserPassword : changePrincipalPassword}  />
     </DefinitionLayout>
   )
 }

From 21d53d65e811e512b6840164a37f91835de185a4 Mon Sep 17 00:00:00 2001
From: Aleksy <psychologianauki@gmail.com>
Date: Wed, 22 Nov 2023 05:12:39 +0100
Subject: [PATCH 05/10] deleted default blue color from input field

---
 dqops/src/main/frontend/src/components/Input/style.css      | 6 ------
 .../src/pages/UserListDetail/ChangeUserPasswordDialog.tsx   | 3 ++-
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/dqops/src/main/frontend/src/components/Input/style.css b/dqops/src/main/frontend/src/components/Input/style.css
index bdcd2e4361..e5b14c81fc 100644
--- a/dqops/src/main/frontend/src/components/Input/style.css
+++ b/dqops/src/main/frontend/src/components/Input/style.css
@@ -4,9 +4,3 @@ input:-webkit-autofill {
     -webkit-box-shadow: none;
     box-shadow: none;
 }   
-input:-webkit-autofill,
-input:-webkit-autofill:hover,
-input:-webkit-autofill:focus,
-input:-webkit-autofill:active {
-    -webkit-box-shadow: 0 0 0px 1000px white inset !important;
-}
diff --git a/dqops/src/main/frontend/src/pages/UserListDetail/ChangeUserPasswordDialog.tsx b/dqops/src/main/frontend/src/pages/UserListDetail/ChangeUserPasswordDialog.tsx
index 95245999d7..9769a114b0 100644
--- a/dqops/src/main/frontend/src/pages/UserListDetail/ChangeUserPasswordDialog.tsx
+++ b/dqops/src/main/frontend/src/pages/UserListDetail/ChangeUserPasswordDialog.tsx
@@ -1,6 +1,7 @@
 import React, { useEffect, useState } from 'react';
-import { Dialog, DialogBody, DialogFooter, Input } from '@material-tailwind/react'; 
+import { Dialog, DialogBody, DialogFooter} from '@material-tailwind/react'; 
 import Button from '../../components/Button';
+import Input from '../../components/Input';
 
 interface AddColumnDialogProps {
   open: boolean;

From aa1d4cfc33affb07367c5cfdc7b18bb0414b8d22 Mon Sep 17 00:00:00 2001
From: Aleksy <psychologianauki@gmail.com>
Date: Wed, 22 Nov 2023 05:35:32 +0100
Subject: [PATCH 06/10] changed color of buttons if user cannot perform any
 action

---
 .../users-managment/users-managment.md           |  2 +-
 .../frontend/src/pages/UserListDetail/index.tsx  | 16 +++++++++-------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/docs/working-with-dqo/users-managment/users-managment.md b/docs/working-with-dqo/users-managment/users-managment.md
index 4bca193e87..cda2879271 100644
--- a/docs/working-with-dqo/users-managment/users-managment.md
+++ b/docs/working-with-dqo/users-managment/users-managment.md
@@ -2,7 +2,7 @@
 
 In configuration section you are able to manage DQO users. 
 
-![Users-List](https://dqops.com/docs/images/working-with-dqo/users-managment/usersList.png)
+![Users-List](https://dqops.com/docs/images/working-with-dqo/users-managment/usersList2.png)
 
 **There are 5 types of user roles:**
 
diff --git a/dqops/src/main/frontend/src/pages/UserListDetail/index.tsx b/dqops/src/main/frontend/src/pages/UserListDetail/index.tsx
index f16d1d378f..eec9c1a0fa 100644
--- a/dqops/src/main/frontend/src/pages/UserListDetail/index.tsx
+++ b/dqops/src/main/frontend/src/pages/UserListDetail/index.tsx
@@ -75,6 +75,8 @@ export default function UserListDetail() {
          )
     }
 
+    const canUserPerformActions = userProfile.license_type === 'TEAM' || userProfile.license_type === 'ENTERPRISE' || userProfile.can_manage_users === true
+
     if (loading) {
         return(
         <DefinitionLayout>
@@ -97,7 +99,7 @@ export default function UserListDetail() {
                  className='absolute right-2 top-2 w-40'
                  onClick={addDqoCloudUser}
                  disabled={!!(userProfile.users_limit && userProfile.users_limit <= dqoCloudUsers?.length  &&
-                 (userProfile.license_type === 'TEAM' || userProfile.license_type === 'ENTERPRISE') || userProfile.can_manage_users !== true)} 
+                 canUserPerformActions)} 
                 />
                 : null}
             </thead>
@@ -108,22 +110,22 @@ export default function UserListDetail() {
                     <td className='px-6 py-2 text-left block w-50'>{user.accountRole}</td>
                     <td className='px-6 py-2 text-left block max-w-100'>
                         {userProfile.license_type?.toLowerCase() !== 'free' ? 
-                        <Button label='Edit' variant='text' color='primary' 
+                        <Button label='Edit' variant='text' color={canUserPerformActions ? 'primary' : 'secondary'} 
                         onClick={() =>user.email ?  editDqoCloudUser(user.email, user.accountRole) : null}
-                        disabled={!(userProfile.license_type === 'TEAM' || userProfile.license_type === 'ENTERPRISE' || userProfile.can_manage_users === true)}
+                        disabled={!canUserPerformActions}
                         />
                         : <div className='w-24'></div> }
                     </td>
                     <td className="px-6 py-2 text-left block max-w-100">
                         { userProfile.user !== user.email && userProfile.license_type?.toLowerCase() !== 'free' ? 
-                        <Button label='Delete' variant='text' color='primary' 
+                        <Button label='Delete' variant='text' color={canUserPerformActions ? 'primary' : 'secondary'}  
                         onClick={() => setSelectedEmailToDelete(user.email ?? '')}
-                        disabled={!(userProfile.license_type === 'TEAM' || userProfile.license_type === 'ENTERPRISE' || userProfile.can_manage_users === true)}/> 
+                        disabled={!canUserPerformActions}/> 
                         : <div className='w-24'></div> }
                     </td>
                     <td className="px-6 py-2 text-left block max-w-100">
-                        <Button label='Change password' variant='text' color='primary' onClick={() => setSelectedEmailToChangePassword(user.email ?? '')} 
-                        disabled={userProfile.account_role !== "admin" && !(userProfile.license_type === 'TEAM' || userProfile.license_type === 'ENTERPRISE' || userProfile.can_manage_users === true)}/>
+                        <Button label='Change password' variant='text' color={!(userProfile.account_role !== "admin" && !canUserPerformActions) ? 'primary' : 'secondary'} onClick={() => setSelectedEmailToChangePassword(user.email ?? '')} 
+                        disabled={userProfile.account_role !== "admin" && !canUserPerformActions}/>
                     </td>
                 </tr>
                 )}

From 07f92f767e99c3beb2da9595e491bad863a9572c Mon Sep 17 00:00:00 2001
From: Aleksy <psychologianauki@gmail.com>
Date: Wed, 22 Nov 2023 05:46:12 +0100
Subject: [PATCH 07/10] displaying user roles in table

---
 .../users-managment/users-managment.md              | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/docs/working-with-dqo/users-managment/users-managment.md b/docs/working-with-dqo/users-managment/users-managment.md
index cda2879271..83574e7bfa 100644
--- a/docs/working-with-dqo/users-managment/users-managment.md
+++ b/docs/working-with-dqo/users-managment/users-managment.md
@@ -6,11 +6,14 @@ In configuration section you are able to manage DQO users.
 
 **There are 5 types of user roles:**
 
-- Admin (Administrator of the account who can manage users and perform all actions)
-- Editor (Editor who can configure and run data quality checks)
-- Operator (The user can run data quality checks, but cannot make changes)
-- Viewer (Read-only viewer)
-- None (No access rights role)
+| User role                        | Description                                                                                                                                                                                                                   |
+|:----------------------------------------|:------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| Admin              | Administrator of the account who can manage users and perform all actions                     |
+| Editor            | Editor who can configure and run data quality checksmaintenance.                                                                                                      |
+| Operator           | The user can run data quality checks, but cannot make changes                 |
+| Viewer               | Read-only viewer     |
+| None | No access rights role |
+
 
 Admin can add new users by clicking Add new user button, that will open then tab where it is possible to set users email and role. To add the user click the Save button
 

From abe3dab3fdce445ffe44f5f9d0379a5ffebadcee Mon Sep 17 00:00:00 2001
From: Andrzej Nagalski <andrzej.nagalski@documati.com>
Date: Thu, 23 Nov 2023 11:52:05 +0100
Subject: [PATCH 08/10] Improvement in user management description in docs

---
 .../access-management/access-management.md    | 46 +++++++++++++++++++
 .../users-managment/users-managment.md        | 24 ----------
 mkdocs.yml                                    |  2 +-
 3 files changed, 47 insertions(+), 25 deletions(-)
 create mode 100644 docs/working-with-dqo/access-management/access-management.md
 delete mode 100644 docs/working-with-dqo/users-managment/users-managment.md

diff --git a/docs/working-with-dqo/access-management/access-management.md b/docs/working-with-dqo/access-management/access-management.md
new file mode 100644
index 0000000000..0bf20a0861
--- /dev/null
+++ b/docs/working-with-dqo/access-management/access-management.md
@@ -0,0 +1,46 @@
+# User and access management
+
+DQOps allows you to manage user roles which determine who can operate data quality checks and edit them. The level of 
+access control varies depending on the type of license and is only available in multi-user accounts.
+
+**There are five types of user roles available:**
+
+| User role | Description                                                                                  |
+|:----------|:---------------------------------------------------------------------------------------------|
+| Admin     | An Admin has complete control over the account and can manage users and perform all actions. |
+| Editor    | An Editor can configure and run data quality checks.                                         |
+| Operator  | An Operator can run data quality checks but is unable to make changes.                       |
+| Viewer    | Viewer has read-only access to the data quality checks.                                      |
+| None      | And None represents no access rights role.                                                   |
+
+To manage user, go to the **Configuration** section and click on **Manage users** from the tree view on the left.
+This will display a list of all users along with their roles, and options to edit, delete and change passwords. 
+Note that only a user with an Admin role can change other users, and options to edit or delete would be inactive for 
+other users. If you are using a single-user license, you will see only one user.
+
+
+![Users-List](https://dqops.com/docs/images/working-with-dqo/users-managment/usersList2.png)
+
+
+## Add a new user
+
+Only an Admin has the authority to add a new user. To do so, click on the **Add user** button. This will open a new tab 
+where you can enter a new email address and set a password. Once you have entered the details, click the **Add user** button
+again to create the new user account.
+
+
+![Add-user](https://dqops.com/docs/images/working-with-dqo/users-managment/addUser2.png)
+
+## Change user role
+
+Users with admin roles can edit existing user accounts by clicking on the edit button next to the user's name. This will
+enable you to change the user's role. Please note that DQO does not support changing a user's email address. Once you have
+made the desired changes, click the Save button to save the new settings.
+
+## Delete a user
+
+An admin can also delete user and change user's password by clicking on the change password button. This will open the
+pop-up with a random generated password. You may choose to enter your own password, provided that it is at least 8 characters
+long and contains both uppercase and lowercase letters as well as digits.
+
+![Change-users-password](https://dqops.com/docs/images/working-with-dqo/users-managment/changePassword.png)
\ No newline at end of file
diff --git a/docs/working-with-dqo/users-managment/users-managment.md b/docs/working-with-dqo/users-managment/users-managment.md
deleted file mode 100644
index 83574e7bfa..0000000000
--- a/docs/working-with-dqo/users-managment/users-managment.md
+++ /dev/null
@@ -1,24 +0,0 @@
-# Manage users
-
-In configuration section you are able to manage DQO users. 
-
-![Users-List](https://dqops.com/docs/images/working-with-dqo/users-managment/usersList2.png)
-
-**There are 5 types of user roles:**
-
-| User role                        | Description                                                                                                                                                                                                                   |
-|:----------------------------------------|:------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| Admin              | Administrator of the account who can manage users and perform all actions                     |
-| Editor            | Editor who can configure and run data quality checksmaintenance.                                                                                                      |
-| Operator           | The user can run data quality checks, but cannot make changes                 |
-| Viewer               | Read-only viewer     |
-| None | No access rights role |
-
-
-Admin can add new users by clicking Add new user button, that will open then tab where it is possible to set users email and role. To add the user click the Save button
-
-![Add-user](https://dqops.com/docs/images/working-with-dqo/users-managment/addUser2.png)
-
-Users with admin role can also edit acounts by clinking edit button on existing user, then it will be possible to change role. DQO does not support changing users emails. After making changes click the Save button. Admin can also delete each user and change each user password by clicking change password button. This action will open the pop-up with random generated password. It is possible to provide your own password, if it will be at least 8 characters long and contain small letters, capital letters and digits. 
-
-![Change-users-password](https://dqops.com/docs/images/working-with-dqo/users-managment/changePassword.png)
\ No newline at end of file
diff --git a/mkdocs.yml b/mkdocs.yml
index 6741818bf2..2f180e95ad 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -89,7 +89,7 @@ nav:
       - Incidents and notifications: "working-with-dqo/incidents-and-notifications/incidents.md"
       - Set up data grouping: "working-with-dqo/set-up-data-grouping/set-up-data-grouping.md"
       - Compare tables: "working-with-dqo/table-comparison/table-comparison.md"
-      - Access managment: "working-with-dqo/users-managment/users-managment.md"
+      - User and access management: "working-with-dqo/access-management/access-management.md"
       - Working with DQOps Shell: "working-with-dqo/working-with-dqo-shell/working-with-dqo-shell.md"
   - Integrations:
       - "integrations/index.md"

From 361995d1fe7b389863c478859f8ed4f0bcfe3843 Mon Sep 17 00:00:00 2001
From: Aleksy <psychologianauki@gmail.com>
Date: Sat, 25 Nov 2023 14:01:29 +0100
Subject: [PATCH 09/10] changed image in docs

---
 docs/working-with-dqo/users-managment/users-managment.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/working-with-dqo/users-managment/users-managment.md b/docs/working-with-dqo/users-managment/users-managment.md
index 83574e7bfa..456bdedf98 100644
--- a/docs/working-with-dqo/users-managment/users-managment.md
+++ b/docs/working-with-dqo/users-managment/users-managment.md
@@ -2,7 +2,7 @@
 
 In configuration section you are able to manage DQO users. 
 
-![Users-List](https://dqops.com/docs/images/working-with-dqo/users-managment/usersList2.png)
+![Users-List](https://dqops.com/docs/images/working-with-dqo/users-managment/userList3.png)
 
 **There are 5 types of user roles:**
 

From 7b4c2c2cf79afeae67456f2b72f952eb0abed0ac Mon Sep 17 00:00:00 2001
From: Aleksy <psychologianauki@gmail.com>
Date: Sat, 25 Nov 2023 14:05:45 +0100
Subject: [PATCH 10/10] img docs

---
 docs/working-with-dqo/access-management/access-management.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/working-with-dqo/access-management/access-management.md b/docs/working-with-dqo/access-management/access-management.md
index 0bf20a0861..4f6d969591 100644
--- a/docs/working-with-dqo/access-management/access-management.md
+++ b/docs/working-with-dqo/access-management/access-management.md
@@ -19,7 +19,7 @@ Note that only a user with an Admin role can change other users, and options to
 other users. If you are using a single-user license, you will see only one user.
 
 
-![Users-List](https://dqops.com/docs/images/working-with-dqo/users-managment/usersList2.png)
+![Users-List](https://dqops.com/docs/images/working-with-dqo/users-managment/userList3.png)
 
 
 ## Add a new user