@ieeesa-npm/groups 0.11.9 → 0.12.0

package/fesm2022/ieeesa-npm-groups.mjs

@@ -437,6 +437,14 @@ var PermissionType;
     PermissionType["MANAGE_ALL_ROSTERS"] = "MANAGE_ALL_ROSTERS";
 })(PermissionType || (PermissionType = {}));
 
+/* eslint-disable no-unused-vars */
+var RoleType;
+(function (RoleType) {
+    RoleType["OFFICER"] = "Officer";
+    RoleType["SYSTEM"] = "System";
+    RoleType["MEMBER_LEVEL"] = "Member Level";
+})(RoleType || (RoleType = {}));
+
 class GroupPermissionsMapService {
     constructor() {
         this.groupPermissions = [
@@ -838,15 +846,22 @@ class GroupsService {
             .getData(`${this.apiBaseUrl}/groups/config/rolesByGroupType/${groupTypeId}`)
             .pipe(map((response) => {
             const rolesOption = [];
+            const memberTypes = [];
             response?.body?.forEach((role) => {
-                rolesOption.push({
-                    id: role.roleId,
-                    name: role.roleName,
-                    disabled: false,
-                    checked: false,
-                });
+                if (role?.roleTypeName === RoleType.MEMBER_LEVEL) {
+                    memberTypes.push(role);
+                }
+                else {
+                    rolesOption.push({
+                        id: role.roleId,
+                        name: role.roleName,
+                        disabled: false,
+                        checked: false,
+                    });
+                }
             });
             this.setGroupTypeUserRoles(rolesOption);
+            this.setMemberTypes(memberTypes);
             return rolesOption;
         }), catchError((errorRes) => {
             throw errorRes;
@@ -866,20 +881,6 @@ class GroupsService {
             throw errorRes;
         }));
     }
-    /**
-     * Fetches the member types master data from configuration and returns.
-     * @return {Observable<MemberTypeResponse>}
-     * @memberof GroupsService
-     */
-    getMemberTypes() {
-        return this.httpService
-            .getData(`${this.apiBaseUrl}/groups/roster/memberStatus`)
-            .pipe(map((response) => {
-            return response;
-        }), catchError((errorRes) => {
-            throw errorRes;
-        }));
-    }
     /**
      * Returns the true if logged in user is admin.
      * @return {boolean}
@@ -897,24 +898,32 @@ class GroupsService {
     transformUserRolesNameAsString(response) {
         const users = [];
         response?.body?.forEach((item) => {
-            const roles = [];
             const classificationDesc = item.classification?.classificationName +
                 ' (' +
                 item.classification?.classificationDesc +
                 ')';
-            item?.rolesList?.forEach((role) => roles.push(role?.roleName));
+            const rolesList = item?.rolesList?.reduce(
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            (roleList, role) => {
+                roleList[role.roleTypeName === RoleType.MEMBER_LEVEL ? 'memberType' : 'roles'].push(role?.roleName);
+                return roleList;
+            }, { memberType: [], roles: [] });
             users.push({
                 userId: item.userId,
                 name: item.name,
                 email: item.email,
-                role: roles.length ? roles.join(', ') : null,
+                role: rolesList?.roles?.length ? rolesList?.roles?.join(', ') : null,
                 classification: item.classification?.classificationId
                     ? classificationDesc
                     : null,
-                memberStatus: item.memberStatus?.memberStatusDesc ?? null,
+                memberStatus: rolesList?.memberType?.length
+                    ? rolesList?.memberType[0]
+                    : null,
                 organization: item.organization?.orgName ?? null,
                 employer: item.employer?.orgName ?? null,
-                canDelete: !(item?.userId === this.userInfo?.userId && this.isAdminUser() && this.getBusinessRuleOfSelectedGroup()?.isAdmin),
+                canDelete: !(item?.userId === this.userInfo?.userId &&
+                    this.isAdminUser() &&
+                    this.getBusinessRuleOfSelectedGroup()?.isAdmin),
             });
         });
         return users;
@@ -1173,6 +1182,22 @@ class GroupsService {
     getParentGroupChangeStatus() {
         return this.isParentGroupChanged;
     }
+    /**
+     * Sets the member types.
+     * @param {Role[]} memberTypes
+     * @memberof GroupsService
+     */
+    setMemberTypes(memberTypes) {
+        this.memberTypes = memberTypes;
+    }
+    /**
+     * Returns the member types.
+     * @return {Role[]}
+     * @memberof GroupsService
+     */
+    getMemberTypes() {
+        return this.memberTypes;
+    }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: GroupsService, deps: [{ token: i2.HttpService }, { token: UserPermissionsService }, { token: GroupPermissionsMapService }, { token: i2.AlertsService }], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.12", ngImport: i0, type: GroupsService, providedIn: 'root' }); }
 }
@@ -2648,11 +2673,6 @@ class EditUserRolesComponent {
                     email: this.selectedUserInfo?.email,
                     roles: this.selectedUserRoleIds,
                     groupId: this.groupsService.selectedGroupInfo?.groupId,
-                    memberStatus: {
-                        memberStatusId: formData?.memberType
-                            ? formData?.memberType?.id
-                            : '',
-                    },
                     organization: {
                         orgId: formData?.representingOrg?.id ?? '',
                         orgName: formData?.representingOrg?.name ?? formData?.representingOrg,
@@ -2665,6 +2685,9 @@ class EditUserRolesComponent {
                         ? formData?.classification?.id
                         : '',
                 };
+            if (formData?.memberType &&
+                !payload.payload.roles?.includes(formData?.memberType?.id))
+                payload.payload.roles?.push(formData?.memberType?.id);
         }
         else
             payload = {
@@ -2735,24 +2758,14 @@ class EditUserRolesComponent {
      * @memberof EditUserRolesComponent
      */
     getMemberTypes() {
-        this.groupsService
-            .getMemberTypes()
-            .pipe(takeUntil(this.destroy$))
-            .subscribe({
-            next: (response) => {
-                response?.body?.forEach((option) => {
-                    this.memberTypes?.push({
-                        id: option.memberStatusId,
-                        name: option.memberStatusDesc,
-                    });
-                });
-                this.updateFormControlOptions('memberType', 'dropdownOptions', this.memberTypes, this.selectedUserInfo?.memberStatus);
-            },
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any
-            error: (error) => {
-                this.handleErrors(error);
-            },
+        const memberTypes = this.groupsService.getMemberTypes();
+        memberTypes?.forEach((option) => {
+            this.memberTypes?.push({
+                id: option.roleId,
+                name: option.roleName,
+            });
         });
+        this.updateFormControlOptions('memberType', 'dropdownOptions', this.memberTypes, this.selectedUserInfo?.memberStatus);
     }
     /**
      * Gets the representing Organizations.
@@ -2766,7 +2779,9 @@ class EditUserRolesComponent {
         this.updateFormControlOptions('representingOrg', 'autoCompleteOptions', []);
         if (!orgName)
             return;
-        const orgRequestPayload = { payload: { orgName: orgName } };
+        const orgRequestPayload = {
+            payload: { orgName: orgName },
+        };
         this.groupsService
             .getOrganizations(orgRequestPayload)
             .pipe(takeUntil(this.destroy$))
@@ -3390,24 +3405,14 @@ class AddUserRosterComponent {
      * @memberof AddUserRosterComponent
      */
     getMemberTypes() {
-        this.groupService
-            .getMemberTypes()
-            .pipe(takeUntil$1(this.destroy$))
-            .subscribe({
-            next: (response) => {
-                response?.body?.forEach((option) => {
-                    this.memberTypes?.push({
-                        id: option.memberStatusId,
-                        name: option.memberStatusDesc,
-                    });
-                });
-                this.updateFormControlOptions('memberType', 'dropdownOptions', this.memberTypes);
-            },
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any
-            error: (error) => {
-                this.handleErrors(error);
-            },
+        const memberTypes = this.groupService.getMemberTypes();
+        memberTypes?.forEach((option) => {
+            this.memberTypes?.push({
+                id: option.roleId,
+                name: option.roleName,
+            });
         });
+        this.updateFormControlOptions('memberType', 'dropdownOptions', this.memberTypes);
     }
     /**
      * Gets the representing Organizations.
@@ -3421,7 +3426,9 @@ class AddUserRosterComponent {
         this.updateFormControlOptions('representingOrg', 'autoCompleteOptions', []);
         if (!orgName)
             return;
-        const orgRequestPayload = { payload: { orgName: orgName } };
+        const orgRequestPayload = {
+            payload: { orgName: orgName },
+        };
         this.groupService
             .getOrganizations(orgRequestPayload)
             .pipe(takeUntil$1(this.destroy$))
@@ -3503,11 +3510,6 @@ class AddUserRosterComponent {
                         : formData?.emailSearch,
                     roles: this.selectedUserRoles,
                     groupId: this.groupService.selectedGroupInfo?.groupId,
-                    memberStatus: {
-                        memberStatusId: formData?.memberType
-                            ? formData?.memberType?.id
-                            : '',
-                    },
                     organization: {
                         orgId: formData?.representingOrg?.id ?? '',
                         orgName: formData?.representingOrg?.name ?? formData?.representingOrg,
@@ -3520,6 +3522,9 @@ class AddUserRosterComponent {
                         ? formData?.classification?.id
                         : '',
                 };
+            if (formData?.memberType &&
+                !payload.payload.roles?.includes(formData?.memberType?.id))
+                payload.payload.roles?.push(formData?.memberType?.id);
         }
         else
             payload = {
@@ -3962,24 +3967,14 @@ class ViewRosterComponent {
      * @memberof ViewUserRosterComponent
      */
     getMemberTypes() {
-        this.groupService
-            .getMemberTypes()
-            .pipe(takeUntil(this.destroy$))
-            .subscribe({
-            next: (response) => {
-                response?.body?.forEach((option) => {
-                    this.memberTypes?.push({
-                        id: option.memberStatusId,
-                        name: option.memberStatusDesc,
-                        checked: false,
-                        disabled: false,
-                    });
-                });
-            },
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any
-            error: (error) => {
-                this.handleErrors(error);
-            },
+        const memberTypes = this.groupService.getMemberTypes();
+        memberTypes?.forEach((option) => {
+            this.memberTypes?.push({
+                id: option.roleId,
+                name: option.roleName,
+                checked: false,
+                disabled: false,
+            });
         });
     }
     /**
@@ -4222,7 +4217,8 @@ class ViewRosterComponent {
     openUserDeleteConfirmationModal(selectedUsers) {
         const userIds = selectedUsers.map((user) => user?.userId);
         if (userIds.includes(this.userInfo?.userId) &&
-            this.groupService.isAdminUser() && this.groupService?.getBusinessRuleOfSelectedGroup()?.isAdmin) {
+            this.groupService.isAdminUser() &&
+            this.groupService?.getBusinessRuleOfSelectedGroup()?.isAdmin) {
             this.showAlertMessage(`${errors?.[1039]}`, AlertType.ERROR);
         }
         else {
@@ -4963,5 +4959,5 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImpo
  * Generated bundle index. Do not edit.
  */
 
-export { CreateGroupComponent, EditUserRolesComponent, FilterType, FormStatus, GroupAction, GroupFunctionType, GroupNode, GroupRosterType, Groups, GroupsComponent, GroupsDataSource, GroupsModule, GroupsService, GroupsValidationPatterns, RosterFunctionType, TableColumnSchemaUserGroup, TreeViewComponent };
+export { CreateGroupComponent, EditUserRolesComponent, FilterType, FormStatus, GroupAction, GroupFunctionType, GroupNode, GroupRosterType, Groups, GroupsComponent, GroupsDataSource, GroupsModule, GroupsService, GroupsValidationPatterns, RoleType, RosterFunctionType, TableColumnSchemaUserGroup, TreeViewComponent };
 //# sourceMappingURL=ieeesa-npm-groups.mjs.map