Skip to content

Commit

Permalink
fix: manage iam is not available (#288)
Browse files Browse the repository at this point in the history
  • Loading branch information
HenryT-CG authored Nov 26, 2024
1 parent 18109de commit 6d108cf
Show file tree
Hide file tree
Showing 4 changed files with 30 additions and 8 deletions.
22 changes: 14 additions & 8 deletions src/app/permission/app-detail/app-detail.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -148,11 +148,15 @@
pFrozenColumn
id="apm_app_detail_permission_table_header_permissions"
[attr.colspan]="(currentApp.isProduct ? 2 : 3) + (showPermissionTools ? 2 : 0)"
class="py-2 border-right-primary"
[ngClass]="
myPermissions.includes('PERMISSION#EDIT') || myPermissions.includes('PERMISSION#DELETE') ? 'py-0' : 'py-1'
"
class="py-2 px-0 border-right-primary"
>
<!-- summary -->
<div *ngIf="!currentApp.isProduct" class="absolute pl-2 flex flex-column row-gap-1 text-sm">
<div>{{ 'PERMISSION.LABEL' | translate }}: {{ permissions.length }}</div>
<div>
{{ 'DIALOG.DETAIL.HEADER_PRODUCTS' | translate }}{{ currentApp.workspaceDetails?.products?.length }}
</div>
</div>
<div class="flex flex-row justify-content-evenly">
<div class="flex flex-row align-items-center column-gap-2">
<span
Expand Down Expand Up @@ -323,8 +327,10 @@
id="apm_app_detail_permission_table_header_permission_key"
class="p-2 vertical-align-bottom border-bottom-primary sm:white-space-nowrap"
>
{{ 'PERMISSION.KEY' | translate }}
<p-sortIcon field="key"></p-sortIcon>
<div class="flex flex-column sm:flex-row justify-content-end sm:justify-content-start">
<span class="pb-4 sm:pb-0 white-space-nowrap">{{ 'PERMISSION.KEY' | translate }}</span>
<p-sortIcon field="key"></p-sortIcon>
</div>
</th>
<th
pFrozenColumn
Expand All @@ -333,7 +339,7 @@
class="p-2 vertical-align-bottom border-bottom-primary white-space-nowrap"
>
<div *ngIf="currentApp.isProduct">{{ 'DIALOG.DETAIL.FILTER.PRODUCT' | translate }}</div>
<div *ngIf="!currentApp.isProduct" class="flex">
<div *ngIf="!currentApp.isProduct" class="flex flex-wrap sm:white-space-nowrap">
<span #filterProduct class="p-float-label inline-block">
<p-dropdown
id="apm_app_detail_permission_table_filter_product_name"
Expand Down Expand Up @@ -371,7 +377,7 @@
id="apm_app_detail_permission_table_header_permission_filter_app_id"
class="p-2 vertical-align-bottom border-bottom-primary white-space-nowrap border-right-primary"
>
<div class="flex">
<div class="flex flex-wrap sm:white-space-nowrap">
<span #filterApp class="p-float-label inline-block">
<p-dropdown
id="apm_app_detail_permission_table_filter_app_id"
Expand Down
8 changes: 8 additions & 0 deletions src/app/permission/app-detail/app-detail.component.scss
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,21 @@
.word-break-all {
word-break: break-all;
}
.p-datatable .p-datatable-header {
padding-left: 0;
padding-right: 0;
}
.p-datatable {
.p-datatable-wrapper {
margin-top: 0.5rem;
}
.p-datatable-thead > tr:first-of-type > th {
border-bottom: unset;
}
.p-datatable-thead > tr > th:last-of-type,
.p-datatable-tbody > tr > td:last-of-type {
border-right: unset;
}
}
.button-letter-icon {
padding: 1px 4px !important;
Expand Down
4 changes: 4 additions & 0 deletions src/assets/i18n/de.json
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,7 @@
"DETAIL": {
"HEADER_WORKSPACE": "Workspace: ",
"HEADER_PRODUCT": "Applikation: ",
"HEADER_PRODUCTS": "Applikationen: ",
"HEADER_APP": "App: ",
"SUBHEADER_WORKSPACE": "Verwalten von Berechtigungen für den Workspace und den Apps der registrierten Applikationen",
"SUBHEADER_PRODUCT": "Verwalten von Berechtigungen für die Applikation und deren Apps",
Expand Down Expand Up @@ -362,6 +363,9 @@
"ASSIGNMENTS": "Es konnten keine Berechtigungen gefunden werden.",
"WORKSPACE": "Es konnten keine Daten zu diesem Workspace gefunden werden"
},
"HTTP_STATUS_418": {
"ROLES": "Eine Rollenauswahl ist nicht möglich da IAM nicht zur Verfügung steht."
},
"HTTP_STATUS_500": {
"APP": "Unbekanntes Problem beim Abrufen von Apps. Bitte versuchen sie es erneut.",
"APPS": "Unbekanntes Problem beim Abrufen von Apps. Bitte versuchen sie es erneut.",
Expand Down
4 changes: 4 additions & 0 deletions src/assets/i18n/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,7 @@
"DETAIL": {
"HEADER_WORKSPACE": "Workspace: ",
"HEADER_PRODUCT": "Application: ",
"HEADER_PRODUCTS": "Applicationen: ",
"HEADER_APP": "App: ",
"SUBHEADER_WORKSPACE": "Managing Business Roles and Permissions of Workspace and all Apps of the registered Applications",
"SUBHEADER_PRODUCT": "Managing Business Roles and Permissions of the Application including all of its Apps",
Expand Down Expand Up @@ -362,6 +363,9 @@
"ASSIGNMENTS": "No Permissions could be found.",
"WORKSPACE": "No data could be found for this Workspace."
},
"HTTP_STATUS_418": {
"ROLES": "A role selection is not possible because IAM is not available."
},
"HTTP_STATUS_500": {
"APP": "Unknown problem retrieving Application data. Please try again.",
"APPS": "Unknown problem retrieving Applications data. Please try again.",
Expand Down

0 comments on commit 6d108cf

Please sign in to comment.