Fiks for #1478 (#1494)

Puzzlepart · Apr 5, 2024 · d597b3e · d597b3e
1 parent df6690f
commit d597b3e
Show file tree

Hide file tree

Showing 4 changed files with 1,348 additions and 32 deletions.
diff --git a/.gitignore b/.gitignore
@@ -25,3 +25,4 @@ common/temp
 **/package-lock.json
 .vscode/launch.json*
 SharePointFramework/**/.vscode/chrome-debug-user-data
+SharePointFramework/ProjectExtensions/.gitmoji.json
diff --git a/...nts/RiskAction/RiskActionPopover/NewRiskActionPanel/ResponsibleField/ResponsibleField.tsx b/...nts/RiskAction/RiskActionPopover/NewRiskActionPanel/ResponsibleField/ResponsibleField.tsx
@@ -4,6 +4,8 @@ import { FieldContainer } from 'pp365-shared-library'
 import React, { FC, useEffect, useState } from 'react'
 import { useRiskActionFieldCustomizerContext } from '../../../../../riskAction/context'
 import { IResponsibleFieldProps } from './types'
+import { format } from '@fluentui/react'
+import { stringIsNullOrEmpty } from '@pnp/core'
 
 export const ResponsibleField: FC<IResponsibleFieldProps> = (props) => {
   const context = useRiskActionFieldCustomizerContext()
@@ -19,6 +21,8 @@ export const ResponsibleField: FC<IResponsibleFieldProps> = (props) => {
   return (
     <FieldContainer label={strings.ResponsibleFieldLabel} iconName='Person'>
       <Combobox
+        freeform
+        value={value}
         onOptionSelect={(_e, data) => {
           props.onChange(data.optionValue)
         }}
@@ -38,11 +42,11 @@ export const ResponsibleField: FC<IResponsibleFieldProps> = (props) => {
             />
           </Option>
         ))}
-        {matchingUsers.length === 0 ? (
-          <Option key='no-results' text=''>
-            {strings.ResponsibleFieldNoResults}
+        {(!stringIsNullOrEmpty(value) && matchingUsers.length === 0) && (
+          <Option key='ResponsibleFieldNoResults' text=''>
+            {format(strings.ResponsibleFieldNoResults, value)}
           </Option>
-        ) : null}
+        )}
       </Combobox>
     </FieldContainer>
   )

diff --git a/SharePointFramework/ProjectExtensions/src/loc/nb-no.js b/SharePointFramework/ProjectExtensions/src/loc/nb-no.js
@@ -27,7 +27,7 @@ define([], function () {
     DueDateLabel: 'Forfallsdato',
     NewRiskActionPanelTitle: 'Legg til nytt tiltak for {0}',
     NewRiskActionPanelAddNewRiskAction: 'Legg til nytt tiltak',
-    ResponsibleFieldNoResults: 'Fant ingen brukere',
+    ResponsibleFieldNoResults: 'Fant ingen brukere som matcher søket \'{0}\'.',
     ResponsibleFieldLabel: 'Ansvarlig',
     ApplyExtensionHooks: 'Kjører hooks definert i prosjekttillegg',
     ApplyExtensionText: 'Legger på prosjekttilegg {0}',