fix: fixed some bugs after rebase

* Fixed bootstrap5 migration after rebase (ml, mr, pl, pr, font-weight -> ms, me, ps, pe, fw) * Fixed broken facility allowed users and facility tasks results after rebase * Fixed style for spinner in dialog to be compatible with new Angular 15
CESNET · Mar 8, 2023 · 22586d4 · 22586d4
1 parent a8449d9
commit 22586d4
Show file tree

Hide file tree

Showing 169 changed files with 475 additions and 619 deletions.
diff --git a/apps/admin-gui/src/_styles.scss b/apps/admin-gui/src/_styles.scss
@@ -843,7 +843,7 @@ textarea.cdk-textarea-autosize-measuring {
   flex-direction: column;
   margin-left: 2rem;
   margin-bottom: 2rem;
-  //d-flex flex-column ml-5 pb-4
+  //d-flex flex-column ms-5 pb-4
 }
 
 .page-subtitle {
@@ -1435,28 +1435,12 @@ td.mat-mdc-cell {
   bottom: 0;
   right: 0;
   background: rgba(0, 0, 0, 0.15);
-  z-index: 1;
+  z-index: 999;
   display: flex;
   align-items: center;
   justify-content: center;
 }
 
-// TODO: check this style after the migration to Angular 15
-// make the whole dialog grey (including padding space) while the spinner is active
-mat-dialog-container:has(#loading-dialog-spinner) {
-  box-shadow: 0 0 0 24px rgba(0, 0, 0, 0.15) inset;
-  padding-bottom: 0;
-  .position-relative {
-    padding-bottom: 24px;
-  }
-  .spinner-container {
-    margin-bottom: 24px;
-  }
-  .mat-dialog-actions {
-    padding-bottom: 16px;
-  }
-}
-
 #preloader {
   position: fixed;
   top: 0;

diff --git a/...admin-gui/src/app/admin/pages/admin-page/admin-attributes/admin-attributes.component.html b/...admin-gui/src/app/admin/pages/admin-page/admin-attributes/admin-attributes.component.html
@@ -4,7 +4,7 @@ <h1 class="page-subtitle">{{'ADMIN.ATTRIBUTES.TITLE' | translate}}</h1>
   <button
     *ngIf="authResolver.isPerunAdmin()"
     (click)="onCreate()"
-    class="mr-2 action-button"
+    class="me-2 action-button"
     color="accent"
     data-cy="new-attr-definition-button"
     mat-flat-button>
@@ -13,7 +13,7 @@ <h1 class="page-subtitle">{{'ADMIN.ATTRIBUTES.TITLE' | translate}}</h1>
   <button
     *ngIf="authResolver.isPerunAdmin()"
     (click)="onImport()"
-    class="mr-2 action-button"
+    class="me-2 action-button"
     color="accent"
     mat-flat-button>
     {{'ADMIN.ATTRIBUTES.IMPORT' | translate}}
@@ -23,7 +23,7 @@ <h1 class="page-subtitle">{{'ADMIN.ATTRIBUTES.TITLE' | translate}}</h1>
     (click)="onDelete()"
     color="warn"
     [disabled]="selected.selected.length === 0"
-    class="mr-2"
+    class="me-2"
     data-cy="delete-attr-definition-button"
     mat-flat-button>
     {{'ADMIN.ATTRIBUTES.DELETE' | translate}}

diff --git a/...n-gui/src/app/admin/pages/admin-page/admin-consent-hubs/admin-consent-hubs.component.html b/...n-gui/src/app/admin/pages/admin-page/admin-consent-hubs/admin-consent-hubs.component.html
@@ -12,7 +12,7 @@ <h1 class="page-subtitle">{{'ADMIN.CONSENT_HUBS.TITLE' | translate}}</h1>
       (click)="evaluateConsents()"
       [disabled]="!globalForceConsents || selection.selected.length === 0"
       color="accent"
-      class="action-button mr-2"
+      class="action-button me-2"
       mat-flat-button>
       {{'ADMIN.CONSENT_HUBS.EVALUATE_CONSENTS' | translate}}
     </button>

diff --git a/apps/admin-gui/src/app/admin/pages/admin-page/admin-owners/admin-owners.component.html b/apps/admin-gui/src/app/admin/pages/admin-page/admin-owners/admin-owners.component.html
@@ -5,14 +5,14 @@ <h1 class="page-subtitle">{{'ADMIN.OWNERS.TITLE' | translate}}</h1>
     *ngIf="addAuth"
     (click)="addOwner()"
     color="accent"
-    class="mr-2 action-button"
+    class="me-2 action-button"
     mat-flat-button>
     {{'ADMIN.OWNERS.ADD' | translate}}
   </button>
 
   <button
     (click)="removeOwner()"
-    class="mr-2"
+    class="me-2"
     color="warn"
     *ngIf="removeAuth"
     [disabled]="!selected.selected.length"

diff --git a/apps/admin-gui/src/app/admin/pages/admin-page/admin-services/admin-services.component.html b/apps/admin-gui/src/app/admin/pages/admin-page/admin-services/admin-services.component.html
@@ -5,7 +5,7 @@ <h1 class="page-subtitle">{{'ADMIN.SERVICES.TITLE' | translate}}</h1>
     *ngIf="authResolver.isPerunAdmin()"
     (click)="createService()"
     color="accent"
-    class="action-button mr-2"
+    class="action-button me-2"
     data-cy="service-create-button"
     mat-flat-button>
     {{'ADMIN.SERVICES.CREATE' | translate}}
@@ -14,7 +14,7 @@ <h1 class="page-subtitle">{{'ADMIN.SERVICES.TITLE' | translate}}</h1>
     *ngIf="authResolver.isPerunAdmin()"
     (click)="deleteService()"
     [disabled]="selection.selected.length === 0"
-    class="mr-2"
+    class="me-2"
     color="warn"
     data-cy="service-delete-button"
     mat-flat-button>

diff --git a/...min-services/service-detail-page/service-destinations/service-destinations.component.html b/...min-services/service-detail-page/service-destinations/service-destinations.component.html
@@ -6,15 +6,15 @@ <h1 class="page-subtitle">{{ 'SERVICE_DETAIL.DESTINATIONS.TITLE' | translate}}</
     (click)="onRemove()"
     color="warn"
     [disabled]="selection.selected.length === 0"
-    class="mr-2"
+    class="me-2"
     mat-flat-button>
     {{ 'SERVICE_DETAIL.DESTINATIONS.REMOVE' | translate}}
   </button>
   <button
     *ngIf="authResolver.isPerunAdmin()"
     (click)="onAllow()"
     [disabled]="selection.selected.length === 0"
-    class="mr-2"
+    class="me-2"
     color="accent"
     mat-flat-button>
     {{ 'SERVICE_DETAIL.DESTINATIONS.ALLOW' | translate}}
@@ -23,7 +23,7 @@ <h1 class="page-subtitle">{{ 'SERVICE_DETAIL.DESTINATIONS.TITLE' | translate}}</
     *ngIf="authResolver.isPerunAdmin()"
     (click)="onBlock()"
     [disabled]="selection.selected.length === 0"
-    class="mr-2"
+    class="me-2"
     color="warn"
     mat-flat-button>
     {{ 'SERVICE_DETAIL.DESTINATIONS.BLOCK' | translate}}

diff --git a/...ervice-detail-page/service-required-attributes/service-required-attributes.component.html b/...ervice-detail-page/service-required-attributes/service-required-attributes.component.html
@@ -5,15 +5,15 @@ <h1 class="page-subtitle">{{ 'SERVICE_DETAIL.REQUIRED_ATTRIBUTES.TITLE' | transl
     *ngIf="authResolver.isPerunAdmin()"
     (click)="onAdd()"
     color="accent"
-    class="mr-2 action-button"
+    class="me-2 action-button"
     mat-flat-button>
     {{ 'SERVICE_DETAIL.REQUIRED_ATTRIBUTES.ADD' | translate}}
   </button>
   <button
     *ngIf="authResolver.isPerunAdmin()"
     (click)="onRemove()"
     [disabled]="selection.selected.length === 0"
-    class="mr-2"
+    class="me-2"
     color="warn"
     mat-flat-button>
     {{ 'SERVICE_DETAIL.REQUIRED_ATTRIBUTES.REMOVE' | translate}}

diff --git a/...p/facilities/pages/facility-configuration-page/facility-configuration-page.component.html b/...p/facilities/pages/facility-configuration-page/facility-configuration-page.component.html
@@ -66,15 +66,15 @@ <h1 class="page-subtitle">{{'FACILITY_CONFIGURATION.SERVICE_CONFIG' | translate}
         <div class="filters">
           <button
             (click)="onRemoveAttributes()"
-            class="mr-2"
+            class="me-2"
             color="warn"
             [disabled]="attSelection.selected.length === 0"
             mat-flat-button>
             {{'FACILITY_CONFIGURATION.REMOVE' | translate}}
           </button>
           <button
             (click)="onSaveAttributes()"
-            class="mr-2"
+            class="me-2"
             color="accent"
             [disabled]="attSelection.selected.length === 0"
             mat-flat-button>
@@ -140,7 +140,7 @@ <h1 class="page-subtitle">{{'FACILITY_CONFIGURATION.SERVICE_CONFIG' | translate}
           <mat-expansion-panel [disabled]="owners.length === 0">
             <mat-expansion-panel-header [class.cursor-default]="owners.length === 0">
               <mat-panel-title>
-                <mat-icon class="mr-2" svgIcon="perun-owner-grey"></mat-icon>
+                <mat-icon class="me-2" svgIcon="perun-owner-grey"></mat-icon>
                 {{'FACILITY_CONFIGURATION.OWNERS' | translate}}
               </mat-panel-title>
             </mat-expansion-panel-header>
@@ -159,7 +159,7 @@ <h1 class="page-subtitle">{{'FACILITY_CONFIGURATION.OWNERS' | translate}}</h1>
           <mat-expansion-panel [disabled]="hosts.length === 0">
             <mat-expansion-panel-header [class.cursor-default]="hosts.length === 0">
               <mat-panel-title>
-                <mat-icon class="mr-2" svgIcon="perun-hosts"></mat-icon>
+                <mat-icon class="me-2" svgIcon="perun-hosts"></mat-icon>
                 {{'FACILITY_CONFIGURATION.HOSTS' | translate}}
               </mat-panel-title>
             </mat-expansion-panel-header>
@@ -179,7 +179,7 @@ <h1 class="page-subtitle">{{'FACILITY_CONFIGURATION.HOSTS' | translate}}</h1>
           <mat-expansion-panel [disabled]="selection.selected.length === 0">
             <mat-expansion-panel-header [class.cursor-default]="selection.selected.length === 0">
               <mat-panel-title>
-                <mat-icon class="mr-2" svgIcon="perun-service"></mat-icon>
+                <mat-icon class="me-2" svgIcon="perun-service"></mat-icon>
                 {{'FACILITY_CONFIGURATION.SERVICES' | translate}}
               </mat-panel-title>
             </mat-expansion-panel-header>
@@ -195,7 +195,7 @@ <h1 class="page-subtitle">{{'FACILITY_CONFIGURATION.SERVICES' | translate}}</h1>
             [disabled]="selection.selected.length === 0">
             <mat-expansion-panel-header [class.cursor-default]="selection.selected.length === 0">
               <mat-panel-title>
-                <mat-icon class="mr-2" svgIcon="perun-hosts"></mat-icon>
+                <mat-icon class="me-2" svgIcon="perun-hosts"></mat-icon>
                 {{'FACILITY_CONFIGURATION.SERVICE_CONFIG' | translate}}
               </mat-panel-title>
             </mat-expansion-panel-header>
@@ -212,7 +212,7 @@ <h1 class="page-subtitle">{{'FACILITY_CONFIGURATION.ATTS' | translate}}</h1>
             <mat-expansion-panel-header
               [class.cursor-default]="selection.selected.length === 0 && destinations.length === 0">
               <mat-panel-title>
-                <mat-icon class="mr-2" svgIcon="perun-service_destination"></mat-icon>
+                <mat-icon class="me-2" svgIcon="perun-service_destination"></mat-icon>
                 {{'FACILITY_CONFIGURATION.DESTINATION_CONFIG' | translate}}
               </mat-panel-title>
             </mat-expansion-panel-header>
@@ -232,7 +232,7 @@ <h1 class="page-subtitle">{{'FACILITY_CONFIGURATION.DESTINATION' | translate}}</
           <mat-expansion-panel>
             <mat-expansion-panel-header>
               <mat-panel-title>
-                <mat-icon class="mr-2" svgIcon="perun-manager"></mat-icon>
+                <mat-icon class="me-2" svgIcon="perun-manager"></mat-icon>
                 {{'FACILITY_CONFIGURATION.MANAGERS' | translate}}
               </mat-panel-title>
             </mat-expansion-panel-header>
@@ -257,23 +257,23 @@ <h1 class="page-subtitle">{{'FACILITY_CONFIGURATION.DESTINATION' | translate}}</
     <button
       *ngIf="stepper !== undefined && stepper.selectedIndex !== 0"
       (click)="back()"
-      class="ml-auto mr-2"
+      class="ms-auto me-2"
       mat-flat-button>
       {{'FACILITY_CONFIGURATION.BACK' | translate}}
     </button>
     <button
       *ngIf="stepper !== undefined && stepper.selectedIndex !== stepper.steps.length - 1"
       (click)="next()"
-      [class.mr-2]="stepper !== undefined && stepper.selectedIndex !== 0"
-      [class.ml-auto]="!(stepper !== undefined && stepper.selectedIndex !== 0)"
+      [class.me-2]="stepper !== undefined && stepper.selectedIndex !== 0"
+      [class.ms-auto]="!(stepper !== undefined && stepper.selectedIndex !== 0)"
       color="accent"
       mat-flat-button>
       {{'FACILITY_CONFIGURATION.NEXT' | translate}}
     </button>
     <button
       *ngIf="stepper !== undefined && stepper.selectedIndex === stepper.steps.length -1"
       (click)="onFinish()"
-      class="mr-2"
+      class="me-2"
       color="accent"
       mat-flat-button>
       {{'FACILITY_CONFIGURATION.FINISH' | translate}}

diff --git a/...pages/facility-detail-page/facility-allowed-groups/facility-allowed-groups.component.html b/...pages/facility-detail-page/facility-allowed-groups/facility-allowed-groups.component.html
@@ -1,7 +1,7 @@
 <div>
   <h1 class="page-subtitle">{{'MENU_ITEMS.FACILITY.ALLOWED_GROUPS' | translate}}</h1>
   <perun-web-apps-refresh-button (refresh)="refreshTable()"></perun-web-apps-refresh-button>
-  <mat-form-field class="mr-2">
+  <mat-form-field class="me-2">
     <mat-label>{{'FACILITY_DETAIL.ALLOWED_GROUPS.SHOW_VOS_GROUPS' | translate}}</mat-label>
     <mat-select (selectionChange)="showGroup()" [(value)]="selected">
       <mat-option value="all">{{'FACILITY_DETAIL.ALLOWED_GROUPS.ALL' | translate}}</mat-option>

diff --git a/...s/pages/facility-detail-page/facility-allowed-users/facility-allowed-users.component.html b/...s/pages/facility-detail-page/facility-allowed-users/facility-allowed-users.component.html
@@ -76,10 +76,10 @@ <h1 class="page-subtitle">{{'FACILITY_DETAIL.ALLOWED_USERS.TITLE' | translate}}<
       [onlyAllowed]="allowed"
       [facilityId]="facility.id"
       [searchString]="filterValue"
-      [resourceId]="selectedResource.id === -1 ? null : selectedResource.id"
-      [serviceId]="selectedService.id === -1 ? null : selectedService.id"
+      [resourceId]="selectedResource?.id"
+      [serviceId]="selectedService?.id"
       [tableId]="tableId"
-      [voId]="selectedVo.id === -1 ? null : selectedVo.id"
+      [voId]="selectedVo?.id"
       [consentStatuses]="selectedConsentStatuses"
       [includeConsents]="globalForceConsents && facilityForceConsents"
       [updateTable]="update">

diff --git a/...ity-detail-page/facility-hosts/facility-hosts-detail/facility-hosts-detail.component.html b/...ity-detail-page/facility-hosts/facility-hosts-detail/facility-hosts-detail.component.html
@@ -3,12 +3,12 @@ <h1 class="page-subtitle">
     {{'FACILITY_DETAIL.HOSTS.HOSTS_DETAIL.TITLE' | translate}} {{host.hostname}}
   </h1>
   <perun-web-apps-refresh-button (refresh)="refreshTable()"></perun-web-apps-refresh-button>
-  <button (click)="addAttribute()" class="mr-2" color="accent" mat-flat-button>
+  <button (click)="addAttribute()" class="me-2" color="accent" mat-flat-button>
     {{'FACILITY_DETAIL.HOSTS.HOSTS_DETAIL.ADD' | translate}}
   </button>
   <button
     (click)="onSave()"
-    class="mr-2"
+    class="me-2"
     color="accent"
     [disabled]="selected.selected.length === 0"
     mat-flat-button>

diff --git a/...rc/app/facilities/pages/facility-detail-page/facility-hosts/facility-hosts.component.html b/...rc/app/facilities/pages/facility-detail-page/facility-hosts/facility-hosts.component.html
@@ -5,15 +5,15 @@ <h1 class="page-subtitle">{{'FACILITY_DETAIL.HOSTS.TITLE' | translate}}</h1>
     *ngIf="addAuth"
     (click)="addHost()"
     color="accent"
-    class="mr-2 action-button"
+    class="me-2 action-button"
     mat-flat-button>
     {{'FACILITY_DETAIL.HOSTS.ADD' | translate}}
   </button>
   <button
     *ngIf="removeAuth"
     (click)="removeHost()"
     [disabled]="selected.selected.length === 0"
-    class="mr-2"
+    class="me-2"
     color="warn"
     mat-flat-button>
     {{'FACILITY_DETAIL.HOSTS.REMOVE' | translate}}

diff --git a/...acilities/pages/facility-detail-page/facility-resources/facility-resources.component.html b/...acilities/pages/facility-detail-page/facility-resources/facility-resources.component.html
@@ -7,15 +7,15 @@ <h1 class="page-subtitle">{{'FACILITY_DETAIL.RESOURCES.TITLE' | translate}}</h1>
       mat-flat-button
       color="accent"
       data-cy="create-resource-button"
-      class="mr-2 action-button"
+      class="me-2 action-button"
       (click)="createResource()">
       {{'FACILITY_DETAIL.RESOURCES.CREATE' | translate}}
     </button>
     <button
       *ngIf="removeAuth"
       mat-flat-button
       color="warn"
-      class="mr-2"
+      class="me-2"
       data-cy="delete-resource-button"
       [disabled]="selected.selected.length === 0"
       (click)="removeResource()">
@@ -25,7 +25,7 @@ <h1 class="page-subtitle">{{'FACILITY_DETAIL.RESOURCES.TITLE' | translate}}</h1>
       [services]="services"
       (serviceSelected)="serviceSelected($event)"
       [service]="selectedService"
-      class="search-select mr-2">
+      class="search-select me-2">
     </perun-web-apps-service-search-select>
     <perun-web-apps-immediate-filter
       [placeholder]="'SHARED_LIB.PERUN.COMPONENTS.RESOURCES_LIST.TABLE_SEARCH'"

diff --git a/...pages/facility-detail-page/facility-security-teams/facility-security-teams.component.html b/...pages/facility-detail-page/facility-security-teams/facility-security-teams.component.html
@@ -5,15 +5,15 @@ <h1 class="page-subtitle">{{'FACILITY_DETAIL.SECURITY_TEAMS.TITLE' | translate}}
   <!--    *ngIf="!loading && addAuth"-->
   <!--    mat-flat-button -->
   <!--    color="accent" -->
-  <!--    class="mr-2"-->
+  <!--    class="me-2"-->
   <!--    (click)="addSecurityTeam()">-->
   <!--    {{'FACILITY_DETAIL.SECURITY_TEAMS.ADD'| translate}}-->
   <!--  </button>-->
   <!--  <button -->
   <!--    *ngIf="!loading && removeAuth"-->
   <!--    mat-flat-button -->
   <!--    color="warn" -->
-  <!--    class="mr-2"  -->
+  <!--    class="me-2"  -->
   <!--    [disabled]="selected.selected.length === 0" (click)="removeSecurityTeam()">-->
   <!--    {{'FACILITY_DETAIL.SECURITY_TEAMS.REMOVE'| translate}}-->
   <!--  </button>-->

diff --git a/...pages/facility-detail-page/facility-service-status/facility-service-status.component.html b/...pages/facility-detail-page/facility-service-status/facility-service-status.component.html
@@ -5,7 +5,7 @@ <h1 class="page-subtitle">{{'FACILITY_DETAIL.SERVICES_STATUS.TITLE' | translate}
     *ngIf="propagationAuth"
     (click)="forcePropagation()"
     [disabled]="selected.selected.length === 0 || loading"
-    class="mr-2"
+    class="me-2"
     color="accent"
     mat-flat-button>
     {{'FACILITY_DETAIL.SERVICES_STATUS.FORCE_PROPAGATION' | translate}}
@@ -14,15 +14,15 @@ <h1 class="page-subtitle">{{'FACILITY_DETAIL.SERVICES_STATUS.TITLE' | translate}
     *ngIf="allowAuth"
     (click)="allow()"
     [disabled]="selected.selected.length === 0 || this.disableAllowButton || loading"
-    class="mr-2"
+    class="me-2"
     color="accent"
     mat-flat-button>
     {{'FACILITY_DETAIL.SERVICES_STATUS.ALLOW' | translate}}
   </button>
   <button
     *ngIf="blockAuth"
     (click)="block()"
-    class="mr-2"
+    class="me-2"
     color="warn"
     [disabled]="selected.selected.length === 0 || this.disableBlockButton || loading"
     mat-flat-button>
@@ -34,7 +34,7 @@ <h1 class="page-subtitle">{{'FACILITY_DETAIL.SERVICES_STATUS.TITLE' | translate}
     [disabled]="disableRemoveButton || loading"
     [matMenuTriggerFor]="menu"
     [matTooltipDisabled]="!disableRemoveButton"
-    class="mr-2 dropdown-toggle"
+    class="me-2 dropdown-toggle"
     color="warn"
     matTooltip="{{'DIALOGS.REMOVE_SERVICE_FROM_FACILITY.CHECKBOXES_DISABLED' | translate}}">
     {{'FACILITY_DETAIL.SERVICES_STATUS.REMOVE' | translate}}