Search products instead apps (#47)

* feat: search products instead apps * fix: code cleanup * fix: update package versions, fix code smells
onecx · Apr 5, 2024 · b81e8cb · b81e8cb
1 parent 84b765b
commit b81e8cb
Show file tree

Hide file tree

Showing 18 changed files with 2,862 additions and 6,610 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -79,18 +79,18 @@
     "@angular/language-service": "15.2.7",
     "@commitlint/cli": "^17.6.3",
     "@commitlint/config-conventional": "^17.6.3",
-    "@docusaurus/module-type-aliases": "~2.4.0",
+    "@docusaurus/module-type-aliases": "~3.2.0",
     "@jscutlery/semver": "^2.30.1",
     "@openapitools/openapi-generator-cli": "^2.9.0",
     "@schematics/angular": "15.2.6",
     "@storybook/addon-essentials": "7.0.4",
-    "@storybook/angular": "7.6.14",
+    "@storybook/angular": "8.0.5",
     "@storybook/core-server": "7.6.17",
     "@svgr/webpack": "^7.0.0",
     "@swc-node/register": "^1.6.5",
     "@swc/cli": "~0.3.12",
     "@swc/core": "^1.3.56",
-    "@swc/helpers": "0.5.6",
+    "@swc/helpers": "0.5.8",
     "@types/jasmine": "~3.10.0",
     "@types/node": "18.16.3",
     "@typescript-eslint/eslint-plugin": "5.48.2",

diff --git a/src/app/permission/app-detail/app-detail.component.html b/src/app/permission/app-detail/app-detail.component.html
@@ -14,14 +14,14 @@
 
   <ocx-page-content>
     <p-message
-      *ngIf="loadingServerIssue"
+      *ngIf="loadingExceptionKey"
       id="app_detail_permission_table_data_access_issue"
       severity="error"
       styleClass="m-3"
       [text]="loadingExceptionKey | translate"
     ></p-message>
 
-    <ng-container *ngIf="!loadingServerIssue">
+    <ng-container *ngIf="!loadingExceptionKey">
       <p-table
         #permissionTable
         id="app_detail_permission_table"
@@ -189,8 +189,8 @@
               id="app_detail_permission_table_header_permission_filter_product"
               class="pt-2 pb-1 px-2 vertical-align-bottom border-bottom-primary white-space-nowrap"
             >
-              <div *ngIf="currentApp.isApp">{{ 'PERMISSION.SEARCH.FILTER.PRODUCT' | translate }}</div>
-              <div *ngIf="!currentApp.isApp" class="flex">
+              <div *ngIf="currentApp.isProduct">{{ 'PERMISSION.SEARCH.FILTER.PRODUCT' | translate }}</div>
+              <div *ngIf="!currentApp.isProduct" class="flex">
                 <span #filterProduct class="p-float-label inline-block">
                   <p-dropdown
                     id="app_detail_permission_table_filter_product_name"
@@ -220,14 +220,6 @@
               </div>
             </th>
             <th
-              *ngIf="currentApp.isApp"
-              id="app_detail_permission_table_header_permission_filter_app_id"
-              class="pt-2 pb-1 px-2 vertical-align-bottom border-bottom-primary white-space-nowrap border-right-primary"
-            >
-              {{ 'PERMISSION.SEARCH.FILTER.APPS' | translate }}
-            </th>
-            <th
-              *ngIf="!currentApp.isApp"
               id="app_detail_permission_table_header_permission_filter_app_id"
               class="pt-2 pb-1 px-2 vertical-align-bottom border-bottom-primary white-space-nowrap border-right-primary"
             >
@@ -334,13 +326,12 @@
               <div class="mt-1 text-xs">{{ limitText(rowData.description, 60) }}</div>
             </td>
             <td id="app_detail_permission_table_data_product_name" class="text-left p-2">
-              <div *ngIf="currentApp.isApp">{{ rowData.productName }}</div>
-              <div *ngIf="!currentApp.isApp">{{ rowData.productDisplayName }}</div>
-              <div *ngIf="!currentApp.isApp" class="mt-1 text-xs">{{ rowData.productName }}</div>
+              <div>{{ rowData.productDisplayName }}</div>
+              <div class="mt-1 text-xs">{{ rowData.productName }}</div>
             </td>
             <td id="app_detail_permission_table_data_app_id" class="text-left p-2 border-right-primary">
               <div>{{ rowData.appDisplayName }}</div>
-              <div *ngIf="!currentApp.isApp" class="mt-1 text-xs">{{ rowData.appId }}</div>
+              <div class="mt-1 text-xs">{{ rowData.appId }}</div>
             </td>
             <!-- ASSIGNMENTS -->
             <td

diff --git a/src/app/permission/app-detail/app-detail.component.scss b/src/app/permission/app-detail/app-detail.component.scss
@@ -3,6 +3,7 @@
 @include correct-data-view-control;
 @include table-inline-buttons;
 @include compact-dropdown-list-items;
+@include danger-action;
 
 :host ::ng-deep {
   .p-datatable .p-datatable-header {