feat(admin): service propagation of expired members

* added option to change service's usage of expired group members

Author: Johaney-s

apps/admin-gui/src/app/admin/pages/admin-page/admin-services/service-detail-page/service-detail-page.component.html

@@ -39,12 +39,16 @@
         {{'SERVICE_DETAIL.STATUS' | translate}}:
         <span>
           {{service.enabled ? ('SERVICE_DETAIL.ENABLED' | translate) : ('SERVICE_DETAIL.DISABLED' | translate)}}
-          <button (click)="changeServiceStatus()" mat-icon-button>
-            <mat-icon class="align-content-center">
+          <button (click)="changeServiceStatus()" class="icon-button mr-2" mat-icon-button>
+            <mat-icon class="align-bottom">
               {{service.enabled ? "check_circle_outline" : "block"}}
             </mat-icon>
           </button>
         </span>
+        {{'SERVICE_DETAIL.EXPIRED_MEMBERS' | translate}}:
+        <span>
+          {{service.useExpiredMembers ? ('SERVICE_DETAIL.PROPAGATED' | translate) : ('SERVICE_DETAIL.NOT_PROPAGATED' | translate)}}
+        </span>
         <button
           *ngIf="authResolver.isPerunAdmin()"
           (click)="evaluateConsents()"
@@ -53,9 +57,6 @@
           mat-flat-button>
           {{'SERVICE_DETAIL.EVALUATE_CONSENTS' | translate}}
         </button>
-        <span class="mt-1 ml-2 entity-info">
-          {{service.useExpiredMembers ? ('SERVICE_DETAIL.USE_EXPIRED_MEMBERS_ENABLED' | translate) : ('SERVICE_DETAIL.USE_EXPIRED_MEMBERS_DISABLED' | translate)}}
-        </span>
       </div>
     </div>
   </div>

apps/admin-gui/src/app/admin/pages/admin-page/admin-services/service-detail-page/service-detail-page.component.scss

@@ -0,0 +1,5 @@
+.icon-button {
+  line-height: inherit !important;
+  width: inherit !important;
+  height: inherit !important;
+}

apps/admin-gui/src/app/shared/components/dialogs/create-edit-service-dialog/create-edit-service-dialog.component.html

@@ -56,6 +56,15 @@ <h1 mat-dialog-title>{{title}}</h1>
         >{{'DIALOGS.CREATE_EDIT_SERVICE.STATUS_HINT' | translate}}</mat-checkbox
       >
     </span>
+
+    <span class="d-flex"
+      >{{'DIALOGS.CREATE_EDIT_SERVICE.EXPIRED_MEMBERS' | translate}}
+      <mat-checkbox
+        class="ml-3"
+        [(ngModel)]="propagateExpiredMembers"
+        >{{'DIALOGS.CREATE_EDIT_SERVICE.EXPIRED_MEMBERS_HINT' | translate}}</mat-checkbox
+      >
+    </span>
   </div>
   <div *ngIf="!loading" mat-dialog-actions>
     <button (click)="onCancel()" class="ml-auto" mat-flat-button>

apps/admin-gui/src/app/shared/components/dialogs/create-edit-service-dialog/create-edit-service-dialog.component.ts

@@ -21,6 +21,7 @@ export class CreateEditServiceDialogComponent implements OnInit {
 
   description: string;
   status = true;
+  propagateExpiredMembers = true;
 
   nameControl = new FormControl('', [Validators.required, Validators.pattern('^[a-zA-Z0-9_]+$')]);
   delayControl = new FormControl(10, [Validators.pattern('^[0-9]*$')]);
@@ -50,6 +51,7 @@ export class CreateEditServiceDialogComponent implements OnInit {
       this.recurrenceControl.setValue(this.data.service.recurrence);
       this.pathControl.setValue(this.data.service.script);
       this.status = this.data.service.enabled;
+      this.propagateExpiredMembers = this.data.service.useExpiredMembers;
 
       this.title = this.translate.instant('DIALOGS.CREATE_EDIT_SERVICE.EDIT_TITLE') as string;
       this.buttonText = this.translate.instant('DIALOGS.CREATE_EDIT_SERVICE.EDIT') as string;
@@ -70,7 +72,7 @@ export class CreateEditServiceDialogComponent implements OnInit {
           recurrence: this.recurrenceControl.value as number,
           enabled: this.status,
           script: this.pathControl.value as string,
-          useExpiredMembers: false,
+          useExpiredMembers: this.propagateExpiredMembers,
           id: 0,
           beanName: '',
         },
@@ -95,7 +97,7 @@ export class CreateEditServiceDialogComponent implements OnInit {
           recurrence: this.recurrenceControl.value as number,
           enabled: this.status,
           script: this.pathControl.value as string,
-          useExpiredMembers: this.data.service.useExpiredMembers,
+          useExpiredMembers: this.propagateExpiredMembers,
           id: this.data.service.id,
           beanName: this.data.service.beanName,
         },

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

@@ -824,8 +824,9 @@
     "STATUS_CHANGE_SUCCESS": "Service status was successfully changed",
     "ENABLED": "Enabled",
     "DISABLED": "Disabled",
-    "USE_EXPIRED_MEMBERS_ENABLED": "This service is using expired members as well",
-    "USE_EXPIRED_MEMBERS_DISABLED": "This service is not using expired members",
+    "EXPIRED_MEMBERS": "Expired members",
+    "PROPAGATED": "Propagated",
+    "NOT_PROPAGATED": "Not propagated",
     "DESCRIPTION": "Description",
     "REQUIRED_ATTRIBUTES": {
       "TITLE": "Required attributes",
@@ -1697,6 +1698,8 @@
       "RECURRENCE": "Recurrence:",
       "PATH": "Script path:",
       "STATUS_HINT": "Enabled/Disabled",
+      "EXPIRED_MEMBERS": "Expired members:",
+      "EXPIRED_MEMBERS_HINT": "Propagated/Not propagated",
       "RESTRICTION_NAME": "Name cannot be empty and must contain only letters, digits and _",
       "REQUIRE_PATH": "Script path cannot be empty",
       "INVALID_DELAY": "Delay must be a number",