feat(admin): Change member status with expiration

* Changing status also includes the expiration options and no longer
  need multiple steps

Author: bodnara

.gitignore

@@ -41,6 +41,9 @@ testem.log
 .DS_Store
 Thumbs.db
 
+# Cache
+/.eslintcache
+
 # The instance specific configuration should not be part of the repository
 apps/admin-gui/src/assets/config/instanceConfig.json
 apps/admin-gui/src/assets/config/instanceFavicon.ico

apps/admin-gui/src/app/shared/components/dialogs/create-sponsored-member-dialog/create-sponsored-member-dialog.component.html

@@ -139,7 +139,10 @@ <h5 class="mt-2">
             </app-choose-sponsor>
 
             <h6 class="mt-4">{{'DIALOGS.CREATE_SPONSORED_MEMBER.EXPIRATION' | translate}}</h6>
-            <perun-web-apps-expiration-select (datePicker)="setExpiration($event)" class="mt-2">
+            <perun-web-apps-expiration-select
+              [minDate]="minDate"
+              (datePicker)="setExpiration($event)"
+              class="mt-2">
             </perun-web-apps-expiration-select>
           </div>
         </mat-step>

apps/admin-gui/src/app/shared/components/dialogs/create-sponsored-member-dialog/create-sponsored-member-dialog.component.ts

@@ -59,6 +59,8 @@ export class CreateSponsoredMemberDialogComponent implements OnInit {
   submitAllowed = false;
   groupsToAssign: Subject<void> = new Subject<void>();
 
+  minDate = new Date();
+
   private namespaceRules: NamespaceRules[] = [];
   private parsedRules: Map<string, { login: string; password: string }> = new Map<
     string,

apps/admin-gui/src/app/shared/components/dialogs/generate-sponsored-members-dialog/generate-sponsored-members-dialog.component.html

@@ -111,6 +111,7 @@ <h5 class="mb-4">
             <h5 class="mb-4">{{'DIALOGS.GENERATE_SPONSORED_MEMBERS.EXPIRATION' | translate}}</h5>
             <perun-web-apps-expiration-select
               (datePicker)="setExpiration($event)"
+              [minDate]="minDate"
               [expiration]="expiration">
             </perun-web-apps-expiration-select>
           </div>

apps/admin-gui/src/app/shared/components/dialogs/generate-sponsored-members-dialog/generate-sponsored-members-dialog.component.ts

@@ -71,6 +71,8 @@ export class GenerateSponsoredMembersDialogComponent implements OnInit {
   languages = ['en'];
   currentLanguage = 'en';
 
+  minDate = new Date();
+
   namespaceRules: NamespaceRules[] = [];
   private resultData: MemberData[] = [];
 

apps/admin-gui/src/app/shared/components/dialogs/sponsor-existing-member-dialog/sponsor-existing-member-dialog.component.html

@@ -55,7 +55,7 @@ <h1 mat-dialog-title>{{'DIALOGS.SPONSOR_EXISTING_MEMBER.TITLE' | translate}}</h1
     <div>
       <br />
       <h6>{{'DIALOGS.SPONSOR_EXISTING_MEMBER.EXPIRATION' | translate}}</h6>
-      <perun-web-apps-expiration-select (datePicker)="setExpiration($event)">
+      <perun-web-apps-expiration-select [minDate]="minDate" (datePicker)="setExpiration($event)">
       </perun-web-apps-expiration-select>
     </div>
   </div>

apps/admin-gui/src/app/shared/components/dialogs/sponsor-existing-member-dialog/sponsor-existing-member-dialog.component.ts

@@ -38,6 +38,7 @@ export class SponsorExistingMemberDialogComponent implements OnInit {
   serviceMemberId: number;
   selectedSponsor: User = null;
   sponsorType = 'self';
+  minDate = new Date();
 
   constructor(
     private dialogRef: MatDialogRef<SponsorExistingMemberDialogComponent>,

apps/admin-gui/src/assets/i18n/en.json

@@ -1570,18 +1570,17 @@
     },
     "CHANGE_STATUS": {
       "TITLE": "Change status",
-      "CURRENT_STATUS": "Current status: ",
+      "CURRENT_STATUS": "Current status",
       "VALID_DESCRIPTION": "Member is properly configured and has access to all provided resources.",
-      "INVALID_DESCRIPTION": "Member has configuration error and DOESN'T have access to provided resources. You can check what is wrong by changing the member's status to ACTIVE. If possible, the procedure will configure all necessary settings by itself.",
+      "INVALID_DESCRIPTION": "Member has configuration error and DOES NOT have access to provided resources. You can check what is wrong by changing the member's status to ACTIVE. If possible, the procedure will configure all necessary settings by itself.",
       "EXPIRED_DESCRIPTION": "Member didn't extend membership and might NOT have access to all services.",
-      "DISABLED_DESCRIPTION": "Member was manually disabled and DON'T have access to provided resources.",
-      "NEW_STATUS": "New status: ",
-      "SELECT_STATUS": "Select status",
-      "CHANGE_VALID_TO_INVALID": "Changing status to INVALID will <b>prevent the member from accessing all services.</b>\n\nINVALID members might not have the correct configuration (required by services) and have to be validated before accessing them.",
+      "DISABLED_DESCRIPTION": "Member was manually disabled and DOES NOT have access to provided resources.",
+      "NEW_STATUS": "New status",
+      "CHANGE_VALID_TO_INVALID": "Changing status to INCOMPLETE will <b>prevent the member from accessing all services.</b>\n\nINCOMPLETE members might not have the correct configuration (required by services) and have to be validated before accessing them.",
       "CHANGE_VALID_TO_EXPIRED": "Changing status to EXPIRED <b>might prevent the member from accessing some of the services (based on provided service's rules).</b>\n\nEXPIRED status means, that member didn't extend his membership in the organization, but it's still possible for him to do so.",
       "CHANGE_VALID_TO_DISABLED": "Changing status to DISABLED will <b>prevent the member from accessing all of the services. </b>\n\nDISABLED status means that the member is archived and is not allowed to any services.",
       "CHANGE_NO_VALID_TO_VALID": "Changing status to ACTIVE <b>will trigger attribute validation</b>. \n\n<b>If successful</b>, the member will have access to all services. \n\n<b>If not</b>, see the displayed error message and do a manual configuration of invalid attributes.",
-      "CHANGE_NO_VALID_TO_INVALID": "INVALID status means there is a configuration error, which prevents the member from accessing provided services.",
+      "CHANGE_NO_VALID_TO_INVALID": "INCOMPLETE status means there is a configuration error, which prevents the member from accessing provided services.",
       "CHANGE_NO_VALID_TO_EXPIRED": "EXPIRED status means, that member didn't extend his membership in the organization, but it's still possible for him to do so.",
       "CHANGE_NO_VALID_TO_DISABLED": "DISABLED status means that the member is archived and is not allowed to any services. Member can't enable/extend membership by himself.",
       "SUCCESS": "Member status was changed",

libs/perun/components/src/index.ts

@@ -11,7 +11,6 @@ export * from './lib/user-ext-sources-list/user-ext-sources-list.component';
 export * from './lib/password-reset/password-reset.component';
 export * from './lib/groups-list/groups-list.component';
 export * from './lib/groups-tree/groups-tree.component';
-export * from './lib/expiration-select/expiration-select.component';
 export * from './lib/perun-footer/perun-footer.component';
 export * from './lib/create-group-form/create-group-form.component';
 export * from './lib/app-form-item-search-select/app-form-item-search-select.component';

libs/perun/components/src/lib/expiration-select/expiration-select.component.ts

@@ -100,15 +100,13 @@ export class MemberOverviewGroupsComponent implements OnChanges {
       });
   }
 
-  changeExpiration(statusChanged = false): void {
+  changeExpiration(): void {
     const config = getDefaultDialogConfig();
     config.width = '400px';
     config.data = {
       memberId: this.member.id,
       groupId: this.selectedGroup.id,
       expirationAttr: this.expirationAtt,
-      status: this.selectedMember.groupStatus,
-      statusChanged: statusChanged,
       backButton: this.openedInDialog,
     };
 
@@ -117,8 +115,6 @@ export class MemberOverviewGroupsComponent implements OnChanges {
       if (result.success) {
         this.groupIsSelected(this.selectedGroup);
         this.dialog.closeAll();
-      } else if (statusChanged) {
-        this.statusChanged.emit(statusChanged);
       }
     });
   }
@@ -130,14 +126,17 @@ export class MemberOverviewGroupsComponent implements OnChanges {
       member: this.selectedMember,
       voId: this.voId,
       groupId: this.selectedGroup.id,
+      expirationAttr: this.expirationAtt,
       backButton: this.openedInDialog,
     };
 
     const dialogRef = this.dialog.open(ChangeMemberStatusDialogComponent, config);
     dialogRef.afterClosed().subscribe((member: RichMember) => {
       if (member) {
         this.selectedMember = member;
-        this.changeExpiration(true);
+        this.groupIsSelected(this.selectedGroup);
+        this.dialog.closeAll();
+        this.statusChanged.emit(true);
       }
     });
   }

libs/perun/components/src/lib/member-overview-groups/member-overview-groups.component.ts

@@ -42,7 +42,7 @@ <h1 *ngIf="openedInDialog" mat-dialog-title>
             </i>
             <button
               *ngIf="authResolver.isThisVoAdmin(voId) && !(member | memberStatusDisabled)"
-              (click)="changeVoExpiration(false)"
+              (click)="changeVoExpiration()"
               mat-icon-button>
               <mat-icon>edit</mat-icon>
             </button>

libs/perun/components/src/lib/member-overview-membership/member-overview-membership.component.html

@@ -49,35 +49,31 @@ export class MemberOverviewMembershipComponent implements OnChanges {
   changeStatus(): void {
     const config = getDefaultDialogConfig();
     config.width = '600px';
-    config.data = { member: this.member, voId: this.voId, backButton: this.openedInDialog };
-    const oldStatus = this.member.status;
+    config.data = {
+      member: this.member,
+      voId: this.voId,
+      backButton: this.openedInDialog,
+      expirationAttr: this.voExpirationAtt,
+    };
 
     const dialogRef = this.dialog.open(ChangeMemberStatusDialogComponent, config);
     dialogRef.afterClosed().subscribe((member: RichMember) => {
       if (member) {
         this.member = member;
-        if (
-          (oldStatus === 'VALID' &&
-            (member.status === 'EXPIRED' || member.status === 'DISABLED')) ||
-          member.status === 'VALID'
-        ) {
-          this.changeVoExpiration(true);
-        } else {
-          this.dialog.closeAll();
-        }
+        this.dialog.closeAll();
+        this.refreshVoExpiration();
       }
     });
   }
 
-  changeVoExpiration(statusChanged: boolean): void {
+  changeVoExpiration(): void {
     const config = getDefaultDialogConfig();
     config.width = '400px';
     config.data = {
       voId: this.voId,
       memberId: this.member.id,
       expirationAttr: this.voExpirationAtt,
       status: this.member.status,
-      statusChanged: statusChanged,
       backButton: this.openedInDialog,
     };
 
@@ -89,8 +85,6 @@ export class MemberOverviewMembershipComponent implements OnChanges {
         }
         this.refreshVoExpiration();
         this.dialog.closeAll();
-      } else if (statusChanged) {
-        this.statusChanged.emit(statusChanged);
       }
     });
   }

libs/perun/components/src/lib/member-overview-membership/member-overview-membership.component.ts

@@ -64,7 +64,6 @@ import { ResourceSearchSelectComponent } from './resource-search-select/resource
 import { MemberSearchSelectComponent } from './member-search-select/member-search-select.component';
 import { FacilitySearchSelectComponent } from './facility-search-select/facility-search-select.component';
 import { UserSearchSelectComponent } from './user-search-select/user-search-select.component';
-import { ExpirationSelectComponent } from './expiration-select/expiration-select.component';
 import { ScrollingModule } from '@angular/cdk/scrolling';
 import { RecentlyViewedIconComponent } from './recently-viewed-icon/recently-viewed-icon.component';
 import { FacilitiesListComponent } from './facilities-list/facilities-list.component';
@@ -102,13 +101,9 @@ import { MailingListsComponent } from './settings-mailing-lists/mailing-lists.co
 import { DataQuotasComponent } from './settings-data-quotas/data-quotas.component';
 import { LoaderDirective } from '@perun-web-apps/perun/directives';
 import { SettingsSSHKeysComponent } from './settings-ssh-keys/settings-ssh-keys.component';
-import { AddSshDialogComponent } from '@perun-web-apps/perun/dialogs';
-import { RemoveStringValueDialogComponent } from '@perun-web-apps/perun/dialogs';
-import { ShowSshDialogComponent } from '@perun-web-apps/perun/dialogs';
 import { RoleSearchSelectComponent } from './role-search-select/role-search-select.component';
 import { PerunHeaderComponent } from './perun-header/perun-header.component';
 import { MatBadgeModule } from '@angular/material/badge';
-import { ShowNotificationHistoryDialogComponent } from '@perun-web-apps/perun/dialogs';
 import { QueryParamsHandlingDirective } from '@perun-web-apps/perun/directives';
 import { BanSpecificationComponent } from './ban-specification/ban-specification.component';
 import { BanOnEntityListComponent } from './ban-on-entity-list/ban-on-entity-list.component';
@@ -117,6 +112,10 @@ import { ChangeMemberStatusOrExpirationDialogComponent } from './change-member-s
 import { MemberOverviewGroupsComponent } from './member-overview-groups/member-overview-groups.component';
 import { DeselectButtonComponent } from './deselect-button/deselect-button.component';
 import { AuditLogSearchSelectComponent } from './audit-log-search-select/audit-log-search-select.component';
+import { AddSshDialogComponent } from '@perun-web-apps/perun/dialogs';
+import { RemoveStringValueDialogComponent } from '@perun-web-apps/perun/dialogs';
+import { ShowSshDialogComponent } from '@perun-web-apps/perun/dialogs';
+import { ShowNotificationHistoryDialogComponent } from '@perun-web-apps/perun/dialogs';
 import { ApplicationStateSelectorComponent } from './application-state-selector/application-state-selector.component';
 import { AuthorizedGroupsCellComponent } from './authorized-groups-cell/authorized-groups-cell.component';
 
@@ -220,7 +219,6 @@ export const APP_DATE_FORMATS: MatDateFormats = {
     MemberSearchSelectComponent,
     FacilitySearchSelectComponent,
     UserSearchSelectComponent,
-    ExpirationSelectComponent,
     RecentlyViewedIconComponent,
     FacilitiesListComponent,
     EntitySearchSelectComponent,
@@ -254,12 +252,8 @@ export const APP_DATE_FORMATS: MatDateFormats = {
     MailingListsComponent,
     DataQuotasComponent,
     SettingsSSHKeysComponent,
-    AddSshDialogComponent,
-    RemoveStringValueDialogComponent,
-    ShowSshDialogComponent,
     RoleSearchSelectComponent,
     PerunHeaderComponent,
-    ShowNotificationHistoryDialogComponent,
     QueryParamsHandlingDirective,
     BanSpecificationComponent,
     BanOnEntityListComponent,
@@ -270,6 +264,10 @@ export const APP_DATE_FORMATS: MatDateFormats = {
     AuditLogSearchSelectComponent,
     ApplicationStateSelectorComponent,
     AuthorizedGroupsCellComponent,
+    AddSshDialogComponent,
+    RemoveStringValueDialogComponent,
+    ShowSshDialogComponent,
+    ShowNotificationHistoryDialogComponent,
   ],
   exports: [
     VosListComponent,
@@ -301,7 +299,6 @@ export const APP_DATE_FORMATS: MatDateFormats = {
     MemberSearchSelectComponent,
     FacilitySearchSelectComponent,
     UserSearchSelectComponent,
-    ExpirationSelectComponent,
     RecentlyViewedIconComponent,
     FacilitiesListComponent,
     EntitySearchSelectComponent,
@@ -330,12 +327,8 @@ export const APP_DATE_FORMATS: MatDateFormats = {
     MailingListsComponent,
     DataQuotasComponent,
     SettingsSSHKeysComponent,
-    AddSshDialogComponent,
-    RemoveStringValueDialogComponent,
-    ShowSshDialogComponent,
     RoleSearchSelectComponent,
     PerunHeaderComponent,
-    ShowNotificationHistoryDialogComponent,
     QueryParamsHandlingDirective,
     BanSpecificationComponent,
     BanOnEntityListComponent,
@@ -347,6 +340,10 @@ export const APP_DATE_FORMATS: MatDateFormats = {
     ApplicationStateSelectorComponent,
     LoaderDirective,
     AuthorizedGroupsCellComponent,
+    AddSshDialogComponent,
+    RemoveStringValueDialogComponent,
+    ShowSshDialogComponent,
+    ShowNotificationHistoryDialogComponent,
   ],
   providers: [
     { provide: DateAdapter, useClass: AppDateAdapter },

libs/perun/components/src/lib/perun-components.module.ts

@@ -8,15 +8,13 @@ import {
 import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
 import { TranslateService } from '@ngx-translate/core';
 import { NotificatorService } from '@perun-web-apps/perun/services';
-import { formatDate } from '@angular/common';
 import { Urns } from '@perun-web-apps/perun/urns';
 
 export interface ChangeGroupExpirationDialogData {
   groupId: number;
   memberId: number;
   expirationAttr: Attribute;
   status: string;
-  statusChanged?: boolean;
   backButton?: boolean;
 }
 
@@ -74,15 +72,6 @@ export class ChangeGroupExpirationDialogComponent implements OnInit {
     this.currentExpiration = (this.expirationAttr?.value as string) ?? 'never';
     this.newExpiration = this.currentExpiration;
 
-    if (this.data.statusChanged) {
-      if (this.data.status !== 'VALID') {
-        this.newExpiration = formatDate(currentDate, 'yyyy-MM-dd', 'en');
-        this.maxDate = currentDate;
-      } else {
-        this.newExpiration = 'never';
-      }
-    }
-
     if (this.data.status === 'VALID') {
       this.attributesManagerService
         .getGroupAttributeByName(this.data.groupId, Urns.GROUP_DEF_EXPIRATION_RULES)