diff --git a/frontend/bec_atlas/src/app/app.config.ts b/frontend/bec_atlas/src/app/app.config.ts index 7a4fdfc..ebaa61d 100644 --- a/frontend/bec_atlas/src/app/app.config.ts +++ b/frontend/bec_atlas/src/app/app.config.ts @@ -20,9 +20,13 @@ import { AuthInterceptor } from './core/auth.interceptor'; import { StarRatingModule } from 'angular-star-rating'; import { GridstackComponent } from 'gridstack/dist/angular'; import { DeviceBoxComponent } from './device-box/device-box.component'; +import { QueueTableComponent } from './queue-table/queue-table.component'; const gridconstructor = () => { - GridstackComponent.addComponentToSelectorType([DeviceBoxComponent]); + GridstackComponent.addComponentToSelectorType([ + DeviceBoxComponent, + QueueTableComponent, + ]); }; export const appConfig: ApplicationConfig = { diff --git a/frontend/bec_atlas/src/app/overview-grid/overview-grid.component.ts b/frontend/bec_atlas/src/app/overview-grid/overview-grid.component.ts index 8a1e1bb..f255359 100644 --- a/frontend/bec_atlas/src/app/overview-grid/overview-grid.component.ts +++ b/frontend/bec_atlas/src/app/overview-grid/overview-grid.component.ts @@ -27,12 +27,13 @@ export class OverviewGridComponent { { w: 1000, c: 10 }, ], }, - // disableResize: true, + disableResize: true, + disableDrag: true, children: [ // or call load()/addWidget() with same data { x: 1, - y: 10, + y: 5, minW: 1, selector: 'app-device-box', input: { device: 'samx', signal_name: 'samx' }, @@ -45,11 +46,11 @@ export class OverviewGridComponent { input: { device: 'samy', signal_name: 'samy' }, }, { - x: 3, - y: 5, - minW: 1, - selector: 'app-device-box', - input: { device: 'samx', signal_name: 'samx' }, + x: 0, + y: 0, + minW: 12, + minH: 3, + selector: 'app-queue-table', }, // {x:1, y:0, minW:2, selector:'app-a', input: { text: 'bar' }}, // custom input that works using BaseWidget.deserialize() Object.assign(this, w.input) // {x:2, y:0, selector:'app-b'}, diff --git a/frontend/bec_atlas/src/app/queue-table/queue-table.component.ts b/frontend/bec_atlas/src/app/queue-table/queue-table.component.ts index 237c644..2b27908 100644 --- a/frontend/bec_atlas/src/app/queue-table/queue-table.component.ts +++ b/frontend/bec_atlas/src/app/queue-table/queue-table.component.ts @@ -5,6 +5,7 @@ import { MatToolbarModule } from '@angular/material/toolbar'; import { RedisConnectorService } from '../core/redis-connector.service'; import { MessageEndpoints } from '../core/redis_endpoints'; import { CommonModule } from '@angular/common'; +import { BaseWidget } from 'gridstack/dist/angular'; @Component({ selector: 'app-queue-table', @@ -12,12 +13,14 @@ import { CommonModule } from '@angular/common'; templateUrl: './queue-table.component.html', styleUrl: './queue-table.component.scss', }) -export class QueueTableComponent { +export class QueueTableComponent extends BaseWidget { tableSignal!: Signal; tableData!: Signal; displayedColumns: string[] = ['queue_id', 'scan_id', 'scan_number', 'status']; - constructor(private redisConnector: RedisConnectorService) {} + constructor(private redisConnector: RedisConnectorService) { + super(); + } ngOnInit(): void { this.tableSignal = this.redisConnector.register(