Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(orb-ui): Table checkboxes adjustments #2779

Merged
merged 1 commit into from
Oct 24, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -240,9 +240,10 @@ export class AgentPolicyListComponent
{
name: '',
prop: 'checkbox',
width: 1,
width: 62,
minWidth: 62,
canAutoResize: true,
canAutoResize: false,
resizeable: false,
sortable: false,
cellTemplate: this.checkboxTemplateCell,
headerTemplate: this.checkboxTemplateHeader,
Expand Down Expand Up @@ -306,7 +307,7 @@ export class AgentPolicyListComponent
},
name: 'Last Modified',
minWidth: 110,
width: 150,
width: 160,
resizeable: true,
},
{
Expand Down
23 changes: 12 additions & 11 deletions ui/src/app/pages/fleet/agents/list/agent.list.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -226,16 +226,17 @@ export class AgentListComponent implements AfterViewInit, AfterViewChecked, OnDe
{
name: '',
prop: 'checkbox',
width: 1,
width: 62,
minWidth: 62,
canAutoResize: true,
canAutoResize: false,
resizeable: false,
sortable: false,
cellTemplate: this.checkboxTemplateCell,
headerTemplate: this.checkboxTemplateHeader,
},
{
prop: 'name',
width: 250,
width: 280,
canAutoResize: true,
minWidth: 150,
name: 'Name',
Expand All @@ -244,7 +245,7 @@ export class AgentListComponent implements AfterViewInit, AfterViewChecked, OnDe
},
{
prop: 'state',
width: 100,
width: 120,
minWidth: 90,
canAutoResize: true,
name: 'Status',
Expand All @@ -253,7 +254,7 @@ export class AgentListComponent implements AfterViewInit, AfterViewChecked, OnDe
},
{
prop: 'policy_agg_info',
width: 170,
width: 190,
canAutoResize: true,
minWidth: 150,
name: 'Policies',
Expand All @@ -262,7 +263,7 @@ export class AgentListComponent implements AfterViewInit, AfterViewChecked, OnDe
},
{
prop: 'combined_tags',
width: 300,
width: 340,
canAutoResize: true,
name: 'Tags',
cellTemplate: this.agentTagsTemplateCell,
Expand All @@ -279,7 +280,7 @@ export class AgentListComponent implements AfterViewInit, AfterViewChecked, OnDe
},
{
prop: 'version',
width: 200,
width: 210,
minWidth: 150,
canAutoResize: true,
name: 'Version',
Expand All @@ -289,8 +290,8 @@ export class AgentListComponent implements AfterViewInit, AfterViewChecked, OnDe
},
{
prop: 'ts_last_hb',
width: 150,
minWidth: 150,
width: 170,
minWidth: 160,
canAutoResize: true,
name: 'Last Activity',
sortable: true,
Expand All @@ -300,8 +301,8 @@ export class AgentListComponent implements AfterViewInit, AfterViewChecked, OnDe
{
name: '',
prop: 'actions',
width: 150,
minWidth: 150,
width: 145,
minWidth: 145,
canAutoResize: true,
sortable: false,
cellTemplate: this.actionsTemplateCell,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -198,9 +198,10 @@ export class AgentGroupListComponent
{
name: '',
prop: 'checkbox',
width: 1,
width: 62,
minWidth: 62,
canAutoResize: true,
canAutoResize: false,
resizeable: false,
sortable: false,
cellTemplate: this.checkboxTemplateCell,
headerTemplate: this.checkboxTemplateHeader,
Expand Down Expand Up @@ -235,7 +236,7 @@ export class AgentGroupListComponent
},
{
prop: 'tags',
width: 450,
width: 460,
canAutoResize: true,
resizeable: true,
cellTemplate: this.agentGroupTagsTemplateCell,
Expand Down
17 changes: 9 additions & 8 deletions ui/src/app/pages/sinks/list/sink.list.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -180,9 +180,10 @@ export class SinkListComponent implements AfterViewInit, AfterViewChecked, OnDes
{
name: '',
prop: 'checkbox',
width: 1,
width: 62,
minWidth: 62,
canAutoResize: true,
canAutoResize: false,
resizeable: false,
sortable: false,
cellTemplate: this.checkboxTemplateCell,
headerTemplate: this.checkboxTemplateHeader,
Expand All @@ -192,23 +193,23 @@ export class SinkListComponent implements AfterViewInit, AfterViewChecked, OnDes
name: 'Name',
canAutoResize: true,
resizeable: true,
width: 220,
width: 250,
minWidth: 150,
cellTemplate: this.sinkNameTemplateCell,
},
{
prop: 'state',
name: 'Status',
resizeable: true,
width: 150,
width: 160,
cellTemplate: this.sinkStateTemplateCell,
},
{
prop: 'backend',
name: 'Backend',
resizeable: true,
minWidth: 120,
width: 150,
width: 160,
cellTemplate: this.sinkNameTemplateCell,
},
{
Expand All @@ -222,7 +223,7 @@ export class SinkListComponent implements AfterViewInit, AfterViewChecked, OnDes
{
prop: 'tags',
name: 'Tags',
width: 350,
width: 370,
resizeable: true,
cellTemplate: this.sinkTagsTemplateCell,
comparator: (a, b) =>
Expand All @@ -238,10 +239,10 @@ export class SinkListComponent implements AfterViewInit, AfterViewChecked, OnDes
{
name: '',
prop: 'actions',
minWidth: 150,
minWidth: 140,
resizeable: true,
sortable: false,
width: 150,
width: 140,
cellTemplate: this.actionsTemplateCell,
},
];
Expand Down
Loading