Skip to content

Commit 6fca8be

Browse files
committed
feat: cleanup default columns
1 parent be0b5b6 commit 6fca8be

File tree

3 files changed

+10
-29
lines changed

3 files changed

+10
-29
lines changed

projects/lib/portal-options/services/custom-global-nodes.service.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ export class CustomGlobalNodesServiceImpl implements CustomGlobalNodesService {
4444
children: [
4545
{
4646
pathSegment: 'overview',
47+
context: {} as PortalNodeContext,
4748
hideSideNav: true,
4849
hideFromNav: true,
4950
defineEntity: {

projects/wc/src/app/components/generic-ui/detail-view/detail-view.component.ts

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
import { processFields } from '../../../utils/proccess-fields';
2+
import { validateKubeconfigProps } from '../../../utils/ts-guargs/validate-kubeconfig-props';
3+
import { ValueCellComponent } from '../value-cell/value-cell.component';
4+
import { kubeConfigTemplate } from './kubeconfig-template';
15
import {
26
ChangeDetectionStrategy,
37
Component,
@@ -10,7 +14,7 @@ import {
1014
} from '@angular/core';
1115
import { LuigiClient } from '@luigi-project/client/luigi-element';
1216
import { EnvConfigService } from '@openmfp/portal-ui-lib';
13-
import { FieldDefinition, Resource } from '@platform-mesh/portal-ui-lib/models';
17+
import { Resource } from '@platform-mesh/portal-ui-lib/models';
1418
import {
1519
GatewayService,
1620
ResourceNodeContext,
@@ -31,18 +35,6 @@ import {
3135
ToolbarButtonComponent,
3236
ToolbarComponent,
3337
} from '@ui5/webcomponents-ngx';
34-
import { processFields } from '../../../utils/proccess-fields';
35-
import { ValueCellComponent } from '../value-cell/value-cell.component';
36-
import { kubeConfigTemplate } from './kubeconfig-template';
37-
import { validateKubeconfigProps } from '../../../utils/ts-guargs/validate-kubeconfig-props';
38-
39-
const defaultFields: FieldDefinition[] = [
40-
{
41-
label: 'Workspace Status',
42-
jsonPathExpression: 'status.conditions[?(@.type=="Ready")].status',
43-
property: ['status.conditions.status', 'status.conditions.type'],
44-
},
45-
];
4638

4739
@Component({
4840
selector: 'detail-view',
@@ -75,7 +67,7 @@ export class DetailViewComponent {
7567

7668
resourceDefinition = computed(() => this.context().resourceDefinition);
7769
resourceFields = computed(
78-
() => this.resourceDefinition()?.ui?.detailView?.fields || defaultFields,
70+
() => this.resourceDefinition()?.ui?.detailView?.fields ?? [],
7971
);
8072
resourceId = computed(() => this.context().entity?.metadata.name);
8173
workspacePath = computed(() =>
@@ -193,4 +185,4 @@ export class DetailViewComponent {
193185

194186
return resourceDefinition;
195187
}
196-
}
188+
}

projects/wc/src/app/components/generic-ui/list-view/list-view.component.ts

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import {
1818
import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
1919
import { LuigiClient } from '@luigi-project/client/luigi-element';
2020
import { LuigiCoreService } from '@openmfp/portal-ui-lib';
21-
import { FieldDefinition, Resource } from '@platform-mesh/portal-ui-lib/models';
21+
import { Resource } from '@platform-mesh/portal-ui-lib/models';
2222
import {
2323
ResourceNodeContext,
2424
ResourceService,
@@ -44,18 +44,6 @@ import {
4444
ToolbarComponent,
4545
} from '@ui5/webcomponents-ngx';
4646

47-
const defaultColumns: FieldDefinition[] = [
48-
{
49-
label: 'Name',
50-
property: 'metadata.name',
51-
},
52-
{
53-
label: 'Workspace Status',
54-
jsonPathExpression: 'status.conditions[?(@.type=="Ready")].status',
55-
property: ['status.conditions.status', 'status.conditions.type'],
56-
},
57-
];
58-
5947
@Component({
6048
selector: 'list-view',
6149
standalone: true,
@@ -98,7 +86,7 @@ export class ListViewComponent implements OnInit {
9886
);
9987
resourceDefinition = computed(() => this.context().resourceDefinition);
10088
columns = computed(
101-
() => this.resourceDefinition()?.ui?.listView?.fields || defaultColumns,
89+
() => this.resourceDefinition()?.ui?.listView?.fields ?? [],
10290
);
10391
viewColomns = computed(() => processFields(this.columns()));
10492
readyCondition = computed(() => this.resourceDefinition()?.readyCondition);

0 commit comments

Comments
 (0)