fix(Admin UI): correct route config for site-settings

Aam-Digital · Jul 2, 2024 · b7877ac · b7877ac
1 parent cfd437c
commit b7877ac
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/src/app/core/admin/admin.routing.ts b/src/app/core/admin/admin.routing.ts
@@ -25,7 +25,7 @@ export const adminRoutes: Routes = [
     component: RoutedViewComponent,
     data: {
       component: "AdminEntityTypes",
-      entity: "Config",
+      entityType: "Config",
       requiredPermissionOperation: "update",
     },
     canActivate: [EntityPermissionGuard],
@@ -35,7 +35,7 @@ export const adminRoutes: Routes = [
     component: RoutedViewComponent,
     data: {
       component: "AdminEntity",
-      entity: "Config",
+      entityType: "Config",
       requiredPermissionOperation: "update",
     },
     canActivate: [EntityPermissionGuard],
@@ -47,7 +47,7 @@ export const adminRoutes: Routes = [
     data: {
       component: "EntityDetails",
       config: {
-        entity: "SiteSettings",
+        entityType: "SiteSettings",
         id: "global",
         panels: [
           {

diff --git a/src/app/core/entity-details/entity-actions-menu/entity-actions-menu.component.ts b/src/app/core/entity-details/entity-actions-menu/entity-actions-menu.component.ts
@@ -111,13 +111,15 @@ export class EntityActionsMenuComponent implements OnChanges {
 
   private filterAvailableActions() {
     this.actions = this.defaultActions.filter((action) => {
+      if (!this.entity) {
+        return false;
+      }
+
       switch (action.action) {
         case "archive":
-          return this.entity?.isActive && !this.entity?.anonymized;
+          return this.entity.isActive && !this.entity.anonymized;
         case "anonymize":
-          return (
-            !this.entity?.anonymized && this.entity?.getConstructor().hasPII
-          );
+          return !this.entity.anonymized && this.entity.getConstructor().hasPII;
         default:
           return true;
       }