@ieeesa-npm/groups 0.13.5 → 0.13.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/esm2022/lib/components/add-user-roster/add-user-roster.component.mjs +2 -8
- package/esm2022/lib/components/edit-user-roles/edit-user-roles.component.mjs +2 -8
- package/esm2022/lib/models/group-types.model.mjs +1 -1
- package/esm2022/lib/models/roster-type.model.mjs +2 -1
- package/esm2022/lib/services/groups.service.mjs +5 -2
- package/fesm2022/ieeesa-npm-groups.mjs +7 -15
- package/fesm2022/ieeesa-npm-groups.mjs.map +1 -1
- package/lib/models/group-types.model.d.ts +3 -0
- package/lib/models/roster-type.model.d.ts +2 -1
- package/package.json +1 -1
|
@@ -416,6 +416,7 @@ var GroupRosterType;
|
|
|
416
416
|
(function (GroupRosterType) {
|
|
417
417
|
GroupRosterType["INDIVIDUAL"] = "Individual";
|
|
418
418
|
GroupRosterType["SYSTEM_USER"] = "User";
|
|
419
|
+
GroupRosterType["ENTITY"] = "Entity";
|
|
419
420
|
})(GroupRosterType || (GroupRosterType = {}));
|
|
420
421
|
|
|
421
422
|
/* eslint-disable no-unused-vars */
|
|
@@ -1164,7 +1165,10 @@ class GroupsService {
|
|
|
1164
1165
|
* @memberof GroupsService
|
|
1165
1166
|
*/
|
|
1166
1167
|
getBusinessRuleOfSelectedGroup() {
|
|
1167
|
-
|
|
1168
|
+
const businessRule = this.getLoadedGroupTypes()?.find((group) => group?.configFieldId === this.getSelectedGroupInfo()?.groupType)?.configFieldValue?.businessRule;
|
|
1169
|
+
if (businessRule?.rosterType === GroupRosterType.ENTITY)
|
|
1170
|
+
businessRule.rosterType = GroupRosterType.INDIVIDUAL;
|
|
1171
|
+
return businessRule;
|
|
1168
1172
|
}
|
|
1169
1173
|
/**
|
|
1170
1174
|
* Enables or disables the form submit button based on passed parameters.
|
|
@@ -2668,13 +2672,7 @@ class EditUserRolesComponent {
|
|
|
2668
2672
|
*/
|
|
2669
2673
|
onEditUserRoleFormSubmit(form) {
|
|
2670
2674
|
form[0]?.markAllAsTouched();
|
|
2671
|
-
|
|
2672
|
-
.filter((controlName) => controlName !== 'representingOrg')
|
|
2673
|
-
.every((controlName) => form[0].get(controlName)?.status === FormStatus?.VALID);
|
|
2674
|
-
if ((form[0].get('representingOrg')?.status === FormStatus?.INVALID &&
|
|
2675
|
-
isAllOtherControlsValid &&
|
|
2676
|
-
this.representingOrganizations.length > 0) ||
|
|
2677
|
-
form[0].status === FormStatus?.VALID) {
|
|
2675
|
+
if (form[0].status === FormStatus?.VALID) {
|
|
2678
2676
|
this.groupsService
|
|
2679
2677
|
.editGroupsUserRole(this.getEditUserRolePayload(form[0]?.getRawValue()))
|
|
2680
2678
|
.pipe(takeUntil(this.destroy$))
|
|
@@ -3373,13 +3371,7 @@ class AddUserRosterComponent {
|
|
|
3373
3371
|
*/
|
|
3374
3372
|
onAddUserFormSubmit(form) {
|
|
3375
3373
|
form[0]?.markAllAsTouched();
|
|
3376
|
-
|
|
3377
|
-
.filter((controlName) => controlName !== 'representingOrg')
|
|
3378
|
-
.every((controlName) => form[0].get(controlName)?.status === FormStatus?.VALID);
|
|
3379
|
-
if ((form[0].get('representingOrg')?.status === FormStatus?.INVALID &&
|
|
3380
|
-
isAllOtherControlsValid &&
|
|
3381
|
-
this.selectedOrganizations.length > 0) ||
|
|
3382
|
-
form[0].status === FormStatus?.VALID) {
|
|
3374
|
+
if (form[0].status === FormStatus.VALID) {
|
|
3383
3375
|
this.groupService
|
|
3384
3376
|
.addNewGroupUser(this.getAddNewUserPayload(form[0]?.getRawValue()))
|
|
3385
3377
|
.pipe(takeUntil$1(this.destroy$))
|