Skip to content
Snippets Groups Projects
Commit 7ff79db6 authored by Davor's avatar Davor
Browse files

fix issue with editing users without 'name'

parent 281a0ed4
No related branches found
No related tags found
1 merge request!38fix issue with editing users without 'name'
Pipeline #20130 passed with stages
in 4 minutes
# [1.0.0]
# [1.0.1]
## Bug fixes
* Resolve "New dashboard user management blocks all apps for admin user" #61
* Resolve "App access role is not persistent" #63
annotations:
category: Dashboard
apiVersion: v2
appVersion: 0.2.4
appVersion: 0.2.5
dependencies:
- name: common
# https://artifacthub.io/packages/helm/bitnami/common
......@@ -23,4 +23,4 @@ name: stackspin-dashboard
sources:
- https://open.greenhost.net/stackspin/dashboard/
- https://open.greenhost.net/stackspin/dashboard-backend/
version: 1.0.0
version: 1.0.1
......@@ -2,7 +2,7 @@ import React from 'react';
import { useController } from 'react-hook-form';
/* eslint-disable react/react-in-jsx-scope */
export const Input = ({ control, name, type = 'text', label, ...props }: InputProps) => {
export const Input = ({ control, name, type = 'text', label, required, ...props }: InputProps) => {
const {
field,
// fieldState: { invalid, isTouched, isDirty },
......@@ -10,7 +10,7 @@ export const Input = ({ control, name, type = 'text', label, ...props }: InputPr
} = useController({
name,
control,
rules: { required: true },
rules: { required },
defaultValue: '',
});
......
......@@ -116,11 +116,18 @@ export const UserModal = ({ open, onClose, userId, setUserId }: UserModalProps)
<div className="mt-6 grid grid-cols-1 gap-y-6 gap-x-4 sm:grid-cols-6">
<div className="sm:col-span-3">
<Input control={control} name="name" label="Name" onKeyPress={handleKeyPress} />
<Input control={control} name="name" label="Name" onKeyPress={handleKeyPress} required={false} />
</div>
<div className="sm:col-span-3">
<Input control={control} name="email" label="Email" type="email" onKeyPress={handleKeyPress} />
<Input
control={control}
name="email"
label="Email"
type="email"
onKeyPress={handleKeyPress}
required
/>
</div>
{isAdmin && (
<>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment