Marmelator/common-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix rebase

Browse Source
This commit is contained in:
Dan Percic 2021-09-28 16:19:07 +03:00
parent 7361e685f2
commit 4ffdb4e413
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/lib/listing/listing-component.directive.ts
View File

@ -6,7 +6,7 @@ import { SortingService } from '../sorting';
import { AutoUnsubscribe } from '../utils'; import { AutoUnsubscribe } from '../utils';
import { SearchService } from '../search'; import { SearchService } from '../search';
import { EntitiesService } from './services'; import { EntitiesService } from './services';
import { IListable, TableColumnConfig } from './models'; import { IListable, ListingMode, ListingModes, TableColumnConfig } from './models';
export const DefaultListingServices = [FilterService, SearchService, EntitiesService, SortingService] as const; export const DefaultListingServices = [FilterService, SearchService, EntitiesService, SortingService] as const;
@ -30,6 +30,7 @@ export abstract class ListingComponent<T extends IListable> extends AutoUnsubscr
abstract readonly tableHeaderLabel: string; abstract readonly tableHeaderLabel: string;
private readonly _listingMode$ = new BehaviorSubject<ListingMode>(ListingModes.table); private readonly _listingMode$ = new BehaviorSubject<ListingMode>(ListingModes.table);
protected constructor(protected readonly _injector: Injector) { protected constructor(protected readonly _injector: Injector) {
super(); super();
this.listingMode$ = this._listingMode$.asObservable(); this.listingMode$ = this._listingMode$.asObservable();

4
src/lib/listing/table-header/table-header.component.ts
View File

@ -2,7 +2,7 @@ import { ChangeDetectionStrategy, Component, Input, TemplateRef } from '@angular
import { Required } from '../../utils'; import { Required } from '../../utils';
import { FilterService } from '../../filtering'; import { FilterService } from '../../filtering';
import { EntitiesService } from '../services'; import { EntitiesService } from '../services';
import { Listable, ListingMode, ListingModes, TableColumnConfig } from '../models'; import { IListable, ListingMode, ListingModes, TableColumnConfig } from '../models';
@Component({ @Component({
selector: 'iqser-table-header', selector: 'iqser-table-header',
@ -10,7 +10,7 @@ import { Listable, ListingMode, ListingModes, TableColumnConfig } from '../model
styleUrls: ['./table-header.component.scss'], styleUrls: ['./table-header.component.scss'],
changeDetection: ChangeDetectionStrategy.OnPush changeDetection: ChangeDetectionStrategy.OnPush
}) })
export class TableHeaderComponent<T extends Listable> { export class TableHeaderComponent<T extends IListable> {
readonly listingModes = ListingModes; readonly listingModes = ListingModes;
@Input() @Required() tableHeaderLabel!: string; @Input() @Required() tableHeaderLabel!: string;

4
src/lib/listing/table/table.component.ts
View File

@ -13,7 +13,7 @@ import {
} from '@angular/core'; } from '@angular/core';
import { CdkVirtualScrollViewport } from '@angular/cdk/scrolling'; import { CdkVirtualScrollViewport } from '@angular/cdk/scrolling';
import { Required } from '../../utils'; import { Required } from '../../utils';
import { Listable, ListingModes, TableColumnConfig } from '../models'; import { IListable, ListingModes, TableColumnConfig } from '../models';
import { ListingComponent } from '../listing-component.directive'; import { ListingComponent } from '../listing-component.directive';
const SCROLLBAR_WIDTH = 11; const SCROLLBAR_WIDTH = 11;
@ -24,7 +24,7 @@ const SCROLLBAR_WIDTH = 11;
styleUrls: ['./table.component.scss'], styleUrls: ['./table.component.scss'],
changeDetection: ChangeDetectionStrategy.OnPush changeDetection: ChangeDetectionStrategy.OnPush
}) })
export class TableComponent<T extends Listable> implements OnInit { export class TableComponent<T extends IListable> implements OnInit {
readonly listingModes = ListingModes; readonly listingModes = ListingModes;
@Input() bulkActions?: TemplateRef<unknown>; @Input() bulkActions?: TemplateRef<unknown>;

4
src/lib/listing/workflow/workflow.component.ts
View File

@ -12,10 +12,10 @@ import {
ViewChildren ViewChildren
} from '@angular/core'; } from '@angular/core';
import { ListingComponent } from '../listing-component.directive'; import { ListingComponent } from '../listing-component.directive';
import { Listable } from '../models';
import { CdkDrag, CdkDragDrop, CdkDropList } from '@angular/cdk/drag-drop'; import { CdkDrag, CdkDragDrop, CdkDropList } from '@angular/cdk/drag-drop';
import { Required } from '../../utils'; import { Required } from '../../utils';
import { LoadingService } from '../../loading'; import { LoadingService } from '../../loading';
import { IListable } from '../models';
interface WorkflowColumn<T, K> { interface WorkflowColumn<T, K> {
key: K; key: K;
@ -38,7 +38,7 @@ export interface WorkflowConfig<T, K> {
styleUrls: ['./workflow.component.scss'], styleUrls: ['./workflow.component.scss'],
changeDetection: ChangeDetectionStrategy.OnPush changeDetection: ChangeDetectionStrategy.OnPush
}) })
export class WorkflowComponent<T extends Listable, K extends string> implements OnInit { export class WorkflowComponent<T extends IListable, K extends string> implements OnInit {
@Input() headerTemplate?: TemplateRef<unknown>; @Input() headerTemplate?: TemplateRef<unknown>;
@Input() @Required() itemTemplate!: TemplateRef<T>; @Input() @Required() itemTemplate!: TemplateRef<T>;
@Input() @Required() config!: WorkflowConfig<T, K>; @Input() @Required() config!: WorkflowConfig<T, K>;