Skip to content
Snippets Groups Projects
Commit e202197b authored by Maarten de Waard's avatar Maarten de Waard :angel:
Browse files

Merge branch 'fix/roles-management' into 'main' 

Fixed role management while changing own role and removed No access from dashboard dropdown role

Closes #55 and #56

See merge request !33
parents bca39f10 9cfb16a7
No related branches found
No related tags found
1 merge request!33Fixed role management while changing own role and removed No access from dashboard dropdown role
Pipeline #19712 passed with stages
Stage:
    Stage:
      Stage:
        Stage:
          Stage:
            in 3 minutes and 51 seconds
            Hide whitespace changes
            Inline Side-by-side
            src/components/UserModal/UserModal.tsx
            + 33
            − 34
            View file @ e202197b
            ......@@ -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>
            ......
            0% or .
            You are about to add 0 people to the discussion. Proceed with caution.
            Finish editing this message first!
            Please register or to comment