update the error message displayed when the user doesn't exist in the hr table

Author: lipalath-ms

UI/web-app/src/components/HRQuerySource/HRQuerySource.base.tsx

@@ -21,7 +21,7 @@ import { updateOrgLeaderDetails, selectOrgLeaderDetails, selectObjectIdEmployeeI
 import { selectJobOwnerFilterSuggestions } from '../../store/jobs.slice';
 import { manageMembershipIsEditingExistingJob } from '../../store/manageMembership.slice';
 import { fetchDefaultSqlMembershipSourceAttributes } from '../../store/sqlMembershipSources.api';
-import { selectAttributes } from '../../store/sqlMembershipSources.slice';
+import { selectAttributes, selectSource } from '../../store/sqlMembershipSources.slice';
 import { SqlMembershipAttribute } from '../../models';
 import { IFilterPart } from '../../models/IFilterPart';
 
@@ -61,6 +61,7 @@ export const HRQuerySourceBase: React.FunctionComponent<HRQuerySourceProps> = (p
   const [children, setChildren] = useState<ChildType[]>([]);
   const excludeLeaderQuery = `EmployeeId <> ${source.manager?.id}`
   const attributes = useSelector(selectAttributes);
+  const hrSource = useSelector(selectSource);
   const [filteredOptions, setFilteredOptions] = useState<FilteredOptionsState>({});
   const [items, setItems] = useState<IFilterPart[]>([]);
   let options: IComboBoxOption[] = [];
@@ -86,6 +87,11 @@ export const HRQuerySourceBase: React.FunctionComponent<HRQuerySourceProps> = (p
     setFilteredOptions({});
   }, [children]);
 
+  useEffect(() => {
+    if (!includeOrg) { setErrorMessage(''); }
+  }, [includeOrg]);
+
+
   useEffect(() => {
     if (children.length > 0) {
       let newStr = "";
@@ -152,18 +158,29 @@ export const HRQuerySourceBase: React.FunctionComponent<HRQuerySourceProps> = (p
     }
   }, [orgLeaderDetails.employeeId, orgLeaderDetails.objectId]);
 
+  useEffect(() => {
+    if (orgLeaderDetails.employeeId === 0 && orgLeaderDetails.maxDepth === 0 && includeOrg && partId === orgLeaderDetails.partId) {
+      setErrorMessage(hrSource?.name && hrSource?.name !== "" ?
+      orgLeaderDetails.text + strings.HROnboarding.customOrgLeaderMissingErrorMessage + hrSource?.name + strings.HROnboarding.source :
+      orgLeaderDetails.text + strings.HROnboarding.orgLeaderMissingErrorMessage);
+    }
+  }, [orgLeaderDetails]);
+
   const getPickerSuggestions = async (
     filterText: string
   ): Promise<IPersonaProps[]> => {
     return filterText && ownerPickerSuggestions ? ownerPickerSuggestions : [];
   };
 
   const handleOrgLeaderInputChange = (input: string): string => {
+    setIncludeOrg(true);
+    setErrorMessage('');
     dispatch(getJobOwnerFilterSuggestions({displayName: input, alias: input}))
     return input;
   }
 
   const handleOrgLeaderChange = (items?: IPersonaProps[] | undefined) => {
+    setIncludeOrg(true);
     setIsDisabled(true);
     if (items !== undefined && items.length > 0) {
       dispatch(fetchOrgLeaderDetails({
@@ -751,6 +768,12 @@ export const HRQuerySourceBase: React.FunctionComponent<HRQuerySourceProps> = (p
       </Stack>
       )}
 
+
+      <div className={classNames.error}>
+        {errorMessage}
+      </div>
+      <br />
+
       <Label>{strings.HROnboarding.includeFilter}</Label>
       <ChoiceGroup
         selectedKey={(includeFilter || source.filter) ? strings.yes : strings.no}
@@ -789,10 +812,6 @@ export const HRQuerySourceBase: React.FunctionComponent<HRQuerySourceProps> = (p
         ) : null
       }
 
-      <div className={classNames.error}>
-        {errorMessage}
-      </div>
-
     </div>
   );
 };

UI/web-app/src/services/localization/IStrings.ts

@@ -40,7 +40,9 @@ export type IStrings = {
     attributeValueInfo: string;
     orAndOperatorInfo: string;
     missingAttributeErrorMessage: string;
+    customOrgLeaderMissingErrorMessage: string;
     orgLeaderMissingErrorMessage: string;
+    source: string;
     invalidInputErrorMessage: string;
   },
   Components: {

UI/web-app/src/services/localization/i18n/locales/en/translations.ts

@@ -43,7 +43,9 @@ export const strings: IStrings = {
     attributeValueInfo: "Select the attribute value",
     orAndOperatorInfo: "Select And/Or",
     missingAttributeErrorMessage: "Please provide missing info in the previous attribute",
-    orgLeaderMissingErrorMessage: "This user doesn't exist in the HR Data source",
+    customOrgLeaderMissingErrorMessage: " doesn't exist in the ",
+    source: " source",
+    orgLeaderMissingErrorMessage: " doesn't exist in the HR Data source",
     invalidInputErrorMessage: "Invalid input. Please enter only numbers."
   },
   Components: {

UI/web-app/src/services/localization/i18n/locales/es/translations.ts

@@ -44,7 +44,9 @@ export const strings: IStrings = {
     attributeValueInfo: "Seleccione el operador de igualdad",
     orAndOperatorInfo: "Seleccione Y/O",
     missingAttributeErrorMessage: "Proporcione la información que falta en el atributo anterior",
+    customOrgLeaderMissingErrorMessage: " no existe en ",
     orgLeaderMissingErrorMessage: "Este usuario no existe en la fuente de datos de RR.HH.",
+    source: " fuente",
     invalidInputErrorMessage: "Entrada inválida. Por favor ingrese solo números."
   },
   Components: {