fix: assigned user default value and clearable

Informasjonsforvaltning · Oct 13, 2023 · f27a6ad · f27a6ad
1 parent 068ef8a
commit f27a6ad
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 8 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/components/fields/field-select/field-select.component.tsx b/src/components/fields/field-select/field-select.component.tsx
@@ -28,7 +28,7 @@ interface ExternalProps {
   showLabel: boolean;
   showRequired: boolean;
   label: string;
-  placeHolder?: string;
+  placeholder?: string;
   onClear: () => void;
   onChange: () => void;
   onInputChange?: (arg: string) => void;
@@ -58,7 +58,7 @@ const SelectFieldPure: FC<Props> = ({
   showRequired,
   defaultValue,
   label,
-  placeHolder,
+  placeholder,
   onClear,
   onChange,
   onInputChange,
@@ -106,7 +106,7 @@ const SelectFieldPure: FC<Props> = ({
         maxMenuHeight={450}
         options={options}
         isClearable
-        placeholder={placeHolder ?? localization.select}
+        placeholder={placeholder ?? localization.select}
         name={name}
         value={defaultValue}
         onChange={option =>

diff --git a/src/pages/concept-registration-page/form-concept/internal-info/index.tsx b/src/pages/concept-registration-page/form-concept/internal-info/index.tsx
@@ -100,7 +100,7 @@ const renderInternalField = (
         <Field
           name={name}
           component={SelectField}
-          placeHolder={localization.selectUser}
+          placeholder={localization.selectUser}
           label={getTranslateText(internalField.label)}
           showLabel
           showCustomOption
@@ -222,11 +222,18 @@ export const InternalInfo: FC<Props> = ({ catalogId, errors }) => {
         <Field
           name='assignedUser'
           component={SelectField}
+          placeholder={localization.selectUser}
           options={userList.map(item => ({
             label: item.name,
             value: item.id
           }))}
+          isClearable
+          onClear={form => form.setFieldValue('assignedUser', '')}
           onChange={(form, f, option) => form.setFieldValue(f, option.value)}
+          defaultValue={{
+            value: values.assignedUser,
+            label: userList.find(user => user.id === values.assignedUser)?.name
+          }}
         />
       </SC.AssignUser>
       <SC.Information>

diff --git a/...ges/concept-registration-page/form-concept/related-concepts/components/relation/index.tsx b/...ges/concept-registration-page/form-concept/related-concepts/components/relation/index.tsx
@@ -201,7 +201,7 @@ const RelationItem: FC<Props> = ({
         <Field
           name={`begrepsRelasjon[${index}].relatertBegrep`}
           component={SelectField}
-          placeHolder={localization.searchConcepts}
+          placeholder={localization.searchConcepts}
           label={localization.relatedConcept}
           showLabel
           showRequired

diff --git a/...es/concept-registration-page/form-concept/related-concepts/related-concepts.component.tsx b/...es/concept-registration-page/form-concept/related-concepts/related-concepts.component.tsx
@@ -109,7 +109,7 @@ const RelatedConceptsPure: FC<Props> = ({
             <Field
               name={field.name}
               component={SelectField}
-              placeHolder={localization.searchConcepts}
+              placeholder={localization.searchConcepts}
               showCustomOption
               options={conceptSuggestionsMap}
               onClear={() => form.setFieldValue(field.name, '')}

diff --git a/src/pages/concept-registration-page/form-concept/validity/validity.component.tsx b/src/pages/concept-registration-page/form-concept/validity/validity.component.tsx
@@ -98,7 +98,7 @@ export const Validity: FC = () => {
             <Field
               name={erstattesAv.name}
               component={SelectField}
-              placeHolder={localization.searchConcepts}
+              placeholder={localization.searchConcepts}
               showCustomOption
               options={conceptSuggestionsMap}
               onClear={() => form.setFieldValue(erstattesAv.name, '')}