Remove Type column

apache · Nov 18, 2024 · ac3e66d · ac3e66d
1 parent 458d3ca
commit ac3e66d
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 8 deletions.
diff --git a/src/app/components/nodes-view/nodes-view.component.ts b/src/app/components/nodes-view/nodes-view.component.ts
@@ -96,7 +96,6 @@ export class NodesViewComponent implements OnInit {
       .concat('indicatorIcon');
 
     this.allocColumnDef = [
-      { colId: 'type', colName: 'Type' },
       { colId: 'displayName', colName: 'Display Name' },
       { colId: 'allocationKey', colName: 'Allocation Key' },
       { colId: 'resource', colName: 'Resource', colFormatter: CommonUtil.resourceColumnFormatter },

diff --git a/src/app/models/alloc-info.model.ts b/src/app/models/alloc-info.model.ts
@@ -18,7 +18,6 @@
 
 export class AllocationInfo {
   constructor(
-    public type: string,
     public displayName: string,
     public allocationKey: string,
     public allocationTags: null | string,

diff --git a/src/app/services/scheduler/scheduler.service.ts b/src/app/services/scheduler/scheduler.service.ts
@@ -30,7 +30,7 @@ import {QueueInfo, QueuePropertyItem} from '@app/models/queue-info.model';
 import {SchedulerResourceInfo} from '@app/models/resource-info.model';
 import {SchedulerHealthInfo} from "@app/models/scheduler-health-info.model";
 import {CommonUtil} from '@app/utils/common.util';
-import {NOT_AVAILABLE, ALLOCTYPE_FOREIGN, ALLOCTYPE_YUNIKORN} from '@app/utils/constants';
+import {NOT_AVAILABLE} from '@app/utils/constants';
 import {Observable} from 'rxjs';
 import {map} from 'rxjs/operators';
 import {EnvconfigService} from '../envconfig/envconfig.service';
@@ -122,7 +122,6 @@ export class SchedulerService {
 
                 appAllocations.push(
                   new AllocationInfo(
-                    ALLOCTYPE_YUNIKORN,
                     alloc['displayName'],
                     alloc['allocationKey'],
                     alloc['allocationTags'],
@@ -228,7 +227,6 @@ export class SchedulerService {
 
                 allocations.push(
                   new AllocationInfo(
-                    ALLOCTYPE_YUNIKORN,
                     alloc['displayName'],
                     alloc['allocationKey'],
                     alloc['allocationTags'],
@@ -260,7 +258,6 @@ export class SchedulerService {
 
                 allocations.push(
                   new AllocationInfo(
-                    ALLOCTYPE_FOREIGN,
                     alloc['displayName'],
                     alloc['allocationKey'],
                     alloc['allocationTags'],

diff --git a/src/app/utils/constants.ts b/src/app/utils/constants.ts
@@ -24,8 +24,6 @@ export const NOT_AVAILABLE = 'n/a';
 export const PARTITION_DEFAULT = 'default';
 export const DEFAULT_BAR_COLOR = 'rgba(66, 133, 244, 1)';
 export const CHART_COLORS = ['rgba(66, 133, 244, 1)', 'rgb(219, 68, 55, 1)', 'rgb(244, 180, 0, 1)', 'rgb(15, 157, 88, 1)', 'rgb(255, 109, 0, 1)', 'rgb(57, 73, 171, 1)', 'rgb(250, 204, 84, 1)', 'rgb(38, 187, 240, 1)', 'rgb(204, 97, 100, 1)', 'rgb(96, 206, 165, 1)']
-export const ALLOCTYPE_FOREIGN = "foreign"
-export const ALLOCTYPE_YUNIKORN = "yunikorn"
 
 export const APP_STATUSES: AppStatus[] = ['New', 'Accepted', 'Starting', 'Running', 'Rejected', 'Completing', 'Completed', 'Failing', 'Failed', 'Expired', 'Resuming'];