@ieeesa-npm/groups 0.8.2 → 0.8.3

package/fesm2022/ieeesa-npm-groups.mjs

@@ -28,6 +28,8 @@ var addUserRoster = {
 		leftButtonLabel: "Cancel",
 		saveButtonLabel: "Save",
 		fullName: "Name",
+		firstName: "First Name",
+		lastName: "Last Name",
 		role: "Role",
 		classification: "Classification",
 		representingOrganization: "Representing Organization",
@@ -35,6 +37,8 @@ var addUserRoster = {
 		ariaLabel: {
 			email: "Email Address",
 			fullName: "Full name",
+			firstName: "First Name",
+			lastName: "Last Name",
 			role: "Role",
 			classification: "Classification",
 			memberType: "Member Type",
@@ -43,6 +47,8 @@ var addUserRoster = {
 		ariaDescribedById: {
 			email: "ariaEmailAddress",
 			fullName: "ariaFullName",
+			firstName: "ariaFirstName",
+			lastName: "ariaLastName",
 			role: "ariaRole",
 			classification: "ariaClassification",
 			memberType: "ariaMemberType",
@@ -58,7 +64,8 @@ var addUserRoster = {
 			},
 			pattern: {
 				email: "Please enter valid email.",
-				representingOrganization: "Representing Organization contains invalid characters. Please enter alphanumeric, special characters and whitespace only."
+				representingOrganization: "Representing Organization contains invalid characters. Please enter alphanumeric, special characters and whitespace only.",
+				firstOrLastName: "This field is required."
 			}
 		},
 		success: {
@@ -68,6 +75,8 @@ var addUserRoster = {
 	supportText: {
 		emailAddress: "Please enter valid email address which includes @ symbol, dot (.) and domain. For example, user@ieee.org",
 		fullName: "Enter user full name.",
+		firstName: "Enter user's first name.",
+		lastName: "Enter user's last name.",
 		role: "<strong>Note:</strong> In order to remove all roles, please remove the user from the system user group.",
 		roleForIndividualRoster: "Select Role(s) from the options.",
 		classification: "Select Classification from the dropdown.",
@@ -293,7 +302,9 @@ var errors = {
 	"1032": "No record found!",
 	"1033": "Please enter at least 3 characters to perform search operation.",
 	"1034": "No record(s) found.",
-	"2001": "No user(s) found!",
+	"1035": "First name is required.",
+	"1036": "Last name is required.",
+	"2001": "No user found. Please add details for the new user.",
 	"2002": "Role does not belong to the group type.",
 	"2010": "User not found.",
 	"2011": "User not found.",
@@ -357,6 +368,8 @@ const GroupsValidationPatterns = {
     representingOrgNameMinLength: 3,
     // Representing Organization field regular expression which accept Alpha Numeric, Special Characters and whitespace.
     representingOrganization: /^(?=.*[a-zA-Z])[\w\s!"#$%&'()*+,-.\/\:;<=>?@[\]^_`{|}~\\]+$/i,
+    // First or Last Name field regular expression which does not allow only whitespace or empty string.
+    firstOrLastName: /^(?!\s*$).+/
 };
 
 /* eslint-disable no-unused-vars */
@@ -2523,6 +2536,7 @@ class AddUserRosterComponent {
         this.memberTypes = [];
         this.organizations = [];
         this.hasClassification = false;
+        this.isUserExist = false;
         this.submitFormResponse = new EventEmitter();
         this.formCancel = new EventEmitter();
     }
@@ -2536,12 +2550,7 @@ class AddUserRosterComponent {
         this.hasClassification = groupType?.hasClassification ?? false;
         this.groupRosterType = groupType?.rosterType;
         if (!this.groupRosterType)
-            this.alertService.showMessage({
-                status: 'custom',
-                message: this.constants?.errors?.ER1001,
-                alertType: AlertType.ERROR,
-                isCloseNeeded: true,
-            });
+            this.showAlertMessage(this.constants?.errors?.ER1001, AlertType.ERROR);
         else {
             if (this.groupRosterType === GroupRosterType.INDIVIDUAL) {
                 if (this.hasClassification)
@@ -2605,12 +2614,34 @@ class AddUserRosterComponent {
             next: (res) => {
                 if (res?.status) {
                     this.userInfo = res?.body;
+                    this.isUserExist = true;
                     this.validateUserExistence();
                 }
             },
             // eslint-disable-next-line @typescript-eslint/no-explicit-any
             error: (error) => {
-                this.handleErrors(error);
+                this.isUserExist = false;
+                const errorCodes = error?.error?.body?.errorCodes;
+                if (errorCodes?.includes('2001')) {
+                    this.isSearchUserForm = false;
+                    this.rightButtonLabel =
+                        this.addUserRosterTexts?.label?.saveButtonLabel;
+                    this.isSubmitButtonDisabled = true;
+                    if (!this.isAddUserFormEmailSearch) {
+                        this.createAddUserFormGroup(email);
+                        if (this.groupRosterType === GroupRosterType.INDIVIDUAL) {
+                            this.updateAddUserFormGroup();
+                        }
+                    }
+                    else {
+                        this.addUserFormGroupRef?.get('firstName')?.setValue('');
+                        this.addUserFormGroupRef?.get('lastName')?.setValue('');
+                    }
+                    this.showAlertMessage(this.constants?.errors?.['2001'], AlertType.ERROR);
+                }
+                else {
+                    this.handleErrors(error);
+                }
             },
         });
     }
@@ -2630,12 +2661,7 @@ class AddUserRosterComponent {
             .pipe(takeUntil$1(this.destroy$))
             ?.subscribe({
             next: () => {
-                this.alertService.showMessage({
-                    status: 'custom',
-                    message: this.constants?.errors?.['1022'],
-                    alertType: AlertType.ERROR,
-                    isCloseNeeded: true,
-                });
+                this.showAlertMessage(this.constants?.errors?.['1022'], AlertType.ERROR);
             },
             // eslint-disable-next-line @typescript-eslint/no-explicit-any
             error: (error) => {
@@ -2647,66 +2673,7 @@ class AddUserRosterComponent {
                     if (!this.isAddUserFormEmailSearch) {
                         this.selectedUserRoles = [];
                         this.isSubmitButtonDisabled = true;
-                        this.addUserFormGroup = {
-                            formGroup: [
-                                {
-                                    legend: '',
-                                    controls: [
-                                        {
-                                            type: FormControlType.SEARCH,
-                                            label: this.addUserRosterTexts?.label?.email + '*',
-                                            controlName: 'emailSearch',
-                                            value: this.userInfo?.email,
-                                            searchType: SearchType.ON_CLICK,
-                                            validation: [
-                                                Validators.required,
-                                                Validators.pattern(GroupsValidationPatterns.email),
-                                            ],
-                                            supportMessage: this.addUserRosterTexts?.supportText?.emailAddress,
-                                            requiredErrorMessage: this.addUserRosterTexts?.message?.error?.required,
-                                            patternErrorMessage: this.addUserRosterTexts?.message?.error?.pattern
-                                                ?.email,
-                                            ariaLabel: this.addUserRosterTexts?.label?.ariaLabel?.email,
-                                            ariaDescribedById: this.addUserRosterTexts?.label?.ariaDescribedById
-                                                ?.email,
-                                        },
-                                        {
-                                            type: FormControlType.TEXT_AREA,
-                                            label: this.addUserRosterTexts?.label?.fullName + '*',
-                                            controlName: 'fullName',
-                                            value: this.userInfo?.name,
-                                            validation: [Validators.required],
-                                            requiredErrorMessage: this.addUserRosterTexts?.message?.error?.required,
-                                            isReadonly: true,
-                                            ariaMultiline: false,
-                                            ariaLabel: this.addUserRosterTexts?.label?.ariaLabel?.fullName,
-                                            ariaDescribedById: this.addUserRosterTexts?.label?.ariaDescribedById
-                                                ?.fullName,
-                                        },
-                                        {
-                                            type: FormControlType.CHECKBOX,
-                                            label: this.groupRosterType === GroupRosterType.INDIVIDUAL
-                                                ? this.addUserRosterTexts?.label?.role
-                                                : this.addUserRosterTexts?.label?.role + '*',
-                                            controlName: 'roles',
-                                            checkboxOptions: this.userRoles,
-                                            minSelectionRequired: 1,
-                                            ariaLabel: this.addUserRosterTexts?.label?.ariaLabel?.role,
-                                            ariaDescribedById: this.addUserRosterTexts?.label?.ariaDescribedById
-                                                ?.role,
-                                            supportMessage: this.groupRosterType === GroupRosterType.INDIVIDUAL
-                                                ? this.addUserRosterTexts?.supportText
-                                                    ?.roleForIndividualRoster
-                                                : this.addUserRosterTexts?.supportText?.role,
-                                            requiredErrorMessage: this.addUserRosterTexts?.message?.error?.required,
-                                            validation: this.groupRosterType === GroupRosterType.INDIVIDUAL
-                                                ? []
-                                                : [Validators.required],
-                                        },
-                                    ],
-                                },
-                            ],
-                        };
+                        this.createAddUserFormGroup();
                         if (this.groupRosterType === GroupRosterType.INDIVIDUAL) {
                             this.updateAddUserFormGroup();
                         }
@@ -2727,6 +2694,107 @@ class AddUserRosterComponent {
             },
         });
     }
+    /**
+     * Initialize the add user form group array.
+     * @param {string} [email]
+     * @memberof AddUserRosterComponent
+     */
+    createAddUserFormGroup(email) {
+        this.addUserFormGroup = {
+            formGroup: [
+                {
+                    legend: '',
+                    controls: [
+                        {
+                            type: FormControlType.SEARCH,
+                            label: this.addUserRosterTexts?.label?.email + '*',
+                            controlName: 'emailSearch',
+                            value: this.isUserExist ? this.userInfo?.email : email,
+                            searchType: SearchType.ON_CLICK,
+                            validation: [
+                                Validators.required,
+                                Validators.pattern(GroupsValidationPatterns.email),
+                            ],
+                            supportMessage: this.addUserRosterTexts?.supportText?.emailAddress,
+                            requiredErrorMessage: this.addUserRosterTexts?.message?.error?.required,
+                            patternErrorMessage: this.addUserRosterTexts?.message?.error?.pattern?.email,
+                            ariaLabel: this.addUserRosterTexts?.label?.ariaLabel?.email,
+                            ariaDescribedById: this.addUserRosterTexts?.label?.ariaDescribedById?.email,
+                        },
+                        ...(this.isUserExist
+                            ? [
+                                {
+                                    type: FormControlType.TEXT_AREA,
+                                    label: this.addUserRosterTexts?.label?.fullName + '*',
+                                    controlName: 'fullName',
+                                    value: this.userInfo?.name,
+                                    validation: [Validators.required],
+                                    requiredErrorMessage: this.addUserRosterTexts?.message?.error?.required,
+                                    isReadonly: true,
+                                    ariaMultiline: false,
+                                    ariaLabel: this.addUserRosterTexts?.label?.ariaLabel?.fullName,
+                                    ariaDescribedById: this.addUserRosterTexts?.label?.ariaDescribedById
+                                        ?.fullName,
+                                },
+                            ]
+                            : [
+                                {
+                                    type: FormControlType.INPUT,
+                                    label: this.addUserRosterTexts?.label?.firstName + '*',
+                                    controlName: 'firstName',
+                                    validation: [
+                                        Validators.required,
+                                        Validators.pattern(GroupsValidationPatterns.firstOrLastName),
+                                    ],
+                                    requiredErrorMessage: this.addUserRosterTexts?.message?.error?.required,
+                                    patternErrorMessage: this.addUserRosterTexts?.message?.error?.pattern
+                                        ?.firstOrLastName,
+                                    ariaLabel: this.addUserRosterTexts?.label?.ariaLabel?.firstName,
+                                    ariaDescribedById: this.addUserRosterTexts?.label?.ariaDescribedById
+                                        ?.firstName,
+                                    supportMessage: this.addUserRosterTexts?.supportText?.firstName,
+                                },
+                                {
+                                    type: FormControlType.INPUT,
+                                    label: this.addUserRosterTexts?.label?.lastName + '*',
+                                    controlName: 'lastName',
+                                    validation: [
+                                        Validators.required,
+                                        Validators.pattern(GroupsValidationPatterns.firstOrLastName),
+                                    ],
+                                    requiredErrorMessage: this.addUserRosterTexts?.message?.error?.required,
+                                    patternErrorMessage: this.addUserRosterTexts?.message?.error?.pattern
+                                        ?.firstOrLastName,
+                                    ariaLabel: this.addUserRosterTexts?.label?.ariaLabel?.lastName,
+                                    ariaDescribedById: this.addUserRosterTexts?.label?.ariaDescribedById
+                                        ?.lastName,
+                                    supportMessage: this.addUserRosterTexts?.supportText?.lastName,
+                                },
+                            ]),
+                        {
+                            type: FormControlType.CHECKBOX,
+                            label: this.groupRosterType === GroupRosterType.INDIVIDUAL
+                                ? this.addUserRosterTexts?.label?.role
+                                : this.addUserRosterTexts?.label?.role + '*',
+                            controlName: 'roles',
+                            checkboxOptions: this.userRoles,
+                            minSelectionRequired: 1,
+                            ariaLabel: this.addUserRosterTexts?.label?.ariaLabel?.role,
+                            ariaDescribedById: this.addUserRosterTexts?.label?.ariaDescribedById?.role,
+                            supportMessage: this.groupRosterType === GroupRosterType.INDIVIDUAL
+                                ? this.addUserRosterTexts?.supportText
+                                    ?.roleForIndividualRoster
+                                : this.addUserRosterTexts?.supportText?.role,
+                            requiredErrorMessage: this.addUserRosterTexts?.message?.error?.required,
+                            validation: this.groupRosterType === GroupRosterType.INDIVIDUAL
+                                ? []
+                                : [Validators.required],
+                        },
+                    ],
+                },
+            ],
+        };
+    }
     /**
      * Adds classification, Member Type and Representing Organization form controls while adding new user to an individual group roster.
      * @memberof AddUserRosterComponent
@@ -2965,12 +3033,7 @@ class AddUserRosterComponent {
         if (Array.isArray(errorCodes) && !error?.error?.status) {
             if (errorCodes[0] !== '3004') {
                 const errorMessage = this.groupService.parseErrorMessage(errorCodes);
-                this.alertService.showMessage({
-                    status: 'custom',
-                    message: errorMessage,
-                    alertType: AlertType.ERROR,
-                    isCloseNeeded: true,
-                });
+                this.showAlertMessage(errorMessage, AlertType.ERROR);
             }
         }
         else if (error && error instanceof HttpErrorResponse) {
@@ -2999,8 +3062,9 @@ class AddUserRosterComponent {
         if (this.groupRosterType === GroupRosterType.INDIVIDUAL) {
             payload = {
                 payload: {
-                    email: this.userInfo?.email,
-                    userId: this.userInfo?.userId,
+                    email: this.isUserExist
+                        ? this.userInfo?.email
+                        : formData?.emailSearch,
                     roles: this.selectedUserRoles,
                     groupId: this.groupService.selectedGroupInfo?.groupId,
                     memberStatus: {
@@ -3024,12 +3088,20 @@ class AddUserRosterComponent {
         else
             payload = {
                 payload: {
-                    email: this.userInfo?.email,
+                    email: this.isUserExist
+                        ? this.userInfo?.email
+                        : formData?.emailSearch,
                     roles: this.selectedUserRoles,
-                    userId: this.userInfo?.userId,
                     groupId: this.groupService.selectedGroupInfo?.groupId,
                 },
             };
+        if (this.isUserExist) {
+            payload.payload.userId = this.userInfo?.userId;
+        }
+        else {
+            payload.payload.firstName = formData?.firstName?.trim();
+            payload.payload.lastName = formData?.lastName?.trim();
+        }
         return payload;
     }
     /**
@@ -3040,6 +3112,21 @@ class AddUserRosterComponent {
         this.updateFormControlOptions('representingOrg', 'autoCompleteOptions', []);
         this.isSubmitButtonDisabled = true;
     }
+    /**
+     * Handles alerts for error, warning.
+     * @param {(string | string[])} message -error or warning message
+     * @param {AlertType} alertType
+     * @return -returns nothing
+     * @memberof AddUserRosterComponent
+     */
+    showAlertMessage(message, alertType) {
+        this.alertService?.showMessage({
+            status: 'custom',
+            message: message,
+            alertType: alertType,
+            isCloseNeeded: true,
+        });
+    }
     /**
      * NgOnDestroy performs necessary cleanup tasks, such as unsubscribing from subscription when the component is being destroyed.
      * @memberof AddUserRosterComponent